Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 32713: - Set the BaseObject.hHmgr field in GDIOBJ_AllocObj - rename RGNDATA_ functions to REGION_ to have a consistent naming. - move REGION prototypes to region.h - rename REGION_AllocRgn to REGION_AllocRgnWithHandle and make it return a pointer to a locked region. - rename UnsafeIntGetRgnBox to REGION_GetRgnBox - rename UnsafeIntRectInRegion to REGION_RectInRegion - remove UnsafeIntUnionRectWithRgn maco - implement REGION_SetRectRgn and call it from NtGdiSetRectRgn - reorder some pa
by tkreuzer＠svn.reactos.org 17 Mar '08

17 Mar '08

Author: tkreuzer Date: Mon Mar 17 17:17:48 2008 New Revision: 32713 URL: http://svn.reactos.org/svn/reactos?rev=3D32713&view=3Drev Log: - Set the BaseObject.hHmgr field in GDIOBJ_AllocObj - rename RGNDATA_ functions to REGION_ to have a consistent naming. - move REGION prototypes to region.h - rename REGION_AllocRgn to REGION_AllocRgnWithHandle and make it return a = pointer to a locked region. - rename UnsafeIntGetRgnBox to REGION_GetRgnBox - rename UnsafeIntRectInRegion to REGION_RectInRegion - remove UnsafeIntUnionRectWithRgn maco - implement REGION_SetRectRgn and call it from NtGdiSetRectRgn - reorder some parameters - remove REGION_CropRgn, use REGION_CropAndOffsetRegion instead - Implement UserShowCursor based on the code from NtUserCallOneParam and ca= ll it from inside the switch statement. Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/include/cursoricon.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/eng/engwindow.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/eng/engwindow.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c Mon Mar 17 17:17:= 48 2008 @@ -86,7 +86,7 @@ if (hVisRgn !=3D NULL) { NtGdiOffsetRgn(hVisRgn, Window->Wnd->ClientRect.left, Window->Wnd->Cli= entRect.top); - visRgn =3D RGNDATA_LockRgn(hVisRgn); + visRgn =3D REGION_LockRgn(hVisRgn); if (visRgn !=3D NULL) { if (visRgn->rdh.nCount > 0) @@ -107,7 +107,7 @@ } } } - RGNDATA_UnlockRgn(visRgn); + REGION_UnlockRgn(visRgn); } else { Modified: trunk/reactos/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/cursoricon.h?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/include/cursoricon.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/cursoricon.h Mon Mar 17 1= 7:17:48 2008 @@ -77,6 +77,8 @@ INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFla= gs); PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon); = +int NTAPI UserShowCursor(BOOL bShow); + #define IntGetSysCursorInfo(WinStaObj) \ (PSYSTEM_CURSORINFO)((WinStaObj)->SystemCursor) = Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/intgdi.h?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Mon Mar 17 17:17= :48 2008 @@ -126,29 +126,6 @@ ULONG uVertex, PVOID pMesh, ULONG uMesh, ULONG ulMode); = -/* Rgn functions */ - -int FASTCALL -IntGdiGetClipBox(HDC hDC, - LPRECT rc); - -INT -STDCALL -IntGdiSelectVisRgn(HDC hdc, - HRGN hrgn); - -HRGN FASTCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPO= INT lpPt); -void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn= ); -INT FASTCALL UnsafeIntGetRgnBox(PROSRGNDATA Rgn, LPRECT pRect); -BOOL FASTCALL UnsafeIntRectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc); -INT STDCALL IntGdiGetRgnBox(HRGN, LPRECT); - -#define UnsafeIntCreateRectRgnIndirect(prc) \ - NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) - -#define UnsafeIntUnionRectWithRgn(rgndest, prc) \ - REGION_UnionRectWithRegion((prc), (rgndest)) - /* DC functions */ = BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/include/region.h?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Mon Mar 17 17:17= :48 2008 @@ -21,13 +21,26 @@ = /* Functions *************************************************************= *****/ = -#define RGNDATA_FreeRgn(hRgn) GDIOBJ_FreeObj((HGDIOBJ)hRgn, GDI_OBJECT_T= YPE_REGION) -#define RGNDATA_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn,= GDI_OBJECT_TYPE_REGION)) -#define RGNDATA_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr((POBJ)pRgn) +#define REGION_FreeRgn(hRgn) GDIOBJ_FreeObj((HGDIOBJ)hRgn, GDI_OBJECT_TY= PE_REGION) +#define REGION_LockRgn(hRgn) ((PROSRGNDATA)GDIOBJ_LockObj((HGDIOBJ)hRgn, = GDI_OBJECT_TYPE_REGION)) +#define REGION_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr((POBJ)pRgn) = -HRGN FASTCALL RGNDATA_AllocRgn(INT n); -BOOL INTERNAL_CALL RGNDATA_Cleanup(PVOID ObjectBody); +PROSRGNDATA FASTCALL REGION_AllocRgnWithHandle(INT n); +VOID FASTCALL REGION_UnionRectWithRgn(ROSRGNDATA *rgn, CONST RECT *rect); +INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, LPRECT pRect); +BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc); +BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA r= gnSrc, const PRECT rect, const PPOINT off); +VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRec= t, INT RightRect, INT BottomRect); +BOOL INTERNAL_CALL REGION_Cleanup(PVOID ObjectBody); + +INT STDCALL IntGdiGetRgnBox(HRGN, LPRECT); BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); +int FASTCALL IntGdiGetClipBox(HDC hDC, LPRECT rc); +INT STDCALL IntGdiSelectVisRgn(HDC hdc, HRGN hrgn); + + +#define UnsafeIntCreateRectRgnIndirect(prc) \ + NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom) = #endif /* not __WIN32K_REGION_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/cursoricon.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Mon Mar 17 17= :17:48 2008 @@ -1817,3 +1817,95 @@ UserLeave(); return Ret; } + +/* Called from NtUserCallOneParam with Routine ONEPARAM_ROUTINE_SHOWCURSOR + * User32 macro NtUserShowCursor */ +int +NTAPI +UserShowCursor(BOOL bShow) +{ + PWINSTATION_OBJECT WinSta =3D PsGetCurrentThreadWin32Thread()->Desktop= ->WindowStation; + PSYSTEM_CURSORINFO CurInfo; + + HDC Screen; + PDC dc; + HBITMAP dcbmp; + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + GDIDEVICE *ppdev; + GDIPOINTER *pgp; + int showpointer=3D0; + + if(!(Screen =3D IntGetScreenDC())) + { + return showpointer; /* No mouse */ + } + + dc =3D DC_LockDc(Screen); + + if (!dc) + { + return showpointer; /* No mouse */ + } + + dcbmp =3D dc->w.hBitmap; + DC_UnlockDc(dc); + + BitmapObj =3D BITMAPOBJ_LockBitmap(dcbmp); + if ( !BitmapObj ) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return showpointer; /* No Mouse */ + } + + SurfObj =3D &BitmapObj->SurfObj; + if (SurfObj =3D=3D NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return showpointer; /* No mouse */ + } + + ppdev =3D GDIDEV(SurfObj); + + if(ppdev =3D=3D NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return showpointer; /* No mouse */ + } + + pgp =3D &ppdev->Pointer; + + CurInfo =3D IntGetSysCursorInfo(WinSta); + + if (bShow =3D=3D FALSE) + { + pgp->ShowPointer--; + showpointer =3D pgp->ShowPointer; + + if (showpointer >=3D 0) + { + //ppdev->SafetyRemoveCount =3D 1; + //ppdev->SafetyRemoveLevel =3D 1; + EngMovePointer(SurfObj,-1,-1,NULL); + CurInfo->ShowingCursor =3D 0; + } + + } + else + { + pgp->ShowPointer++; + showpointer =3D pgp->ShowPointer; + + /* Show Cursor */ + if (showpointer < 0) + { + //ppdev->SafetyRemoveCount =3D 0; + //ppdev->SafetyRemoveLevel =3D 0; + EngMovePointer(SurfObj,-1,-1,NULL); + CurInfo->ShowingCursor =3D CURSOR_SHOWING; + } + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + return showpointer; +} Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/misc.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Mar 17 17:17:48= 2008 @@ -145,103 +145,16 @@ DWORD Routine) { DECLARE_RETURN(DWORD); - PDC dc; = DPRINT("Enter NtUserCallOneParam\n"); = - - if (Routine =3D=3D ONEPARAM_ROUTINE_SHOWCURSOR) - { - PWINSTATION_OBJECT WinSta =3D PsGetCurrentThreadWin32Thread()->Deskt= op->WindowStation; - PSYSTEM_CURSORINFO CurInfo; - - HDC Screen; - HBITMAP dcbmp; - SURFOBJ *SurfObj; - BITMAPOBJ *BitmapObj; - GDIDEVICE *ppdev; - GDIPOINTER *pgp; - int showpointer=3D0; - - if(!(Screen =3D IntGetScreenDC())) - { - return showpointer; /* No mouse */ - } - - dc =3D DC_LockDc(Screen); - - if (!dc) - { - return showpointer; /* No mouse */ - } - - dcbmp =3D dc->w.hBitmap; - DC_UnlockDc(dc); - - BitmapObj =3D BITMAPOBJ_LockBitmap(dcbmp); - if ( !BitmapObj ) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - return showpointer; /* No Mouse */ - } - - SurfObj =3D &BitmapObj->SurfObj; - if (SurfObj =3D=3D NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - return showpointer; /* No mouse */ - } - - ppdev =3D GDIDEV(SurfObj); - - if(ppdev =3D=3D NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - return showpointer; /* No mouse */ - } - - pgp =3D &ppdev->Pointer; - - CurInfo =3D IntGetSysCursorInfo(WinSta); - - if (Param =3D=3D FALSE) - { - pgp->ShowPointer--; - showpointer =3D pgp->ShowPointer; - - if (showpointer >=3D 0) - { - //ppdev->SafetyRemoveCount =3D 1; - //ppdev->SafetyRemoveLevel =3D 1; - EngMovePointer(SurfObj,-1,-1,NULL); - CurInfo->ShowingCursor =3D 0; - } - - } - else - { - pgp->ShowPointer++; - showpointer =3D pgp->ShowPointer; - - /* Show Cursor */ - if (showpointer < 0) - { - //ppdev->SafetyRemoveCount =3D 0; - //ppdev->SafetyRemoveLevel =3D 0; - EngMovePointer(SurfObj,-1,-1,NULL); - CurInfo->ShowingCursor =3D CURSOR_SHOWING; - } - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - return showpointer; - } - - UserEnterExclusive(); = switch(Routine) { + case ONEPARAM_ROUTINE_SHOWCURSOR: + RETURN( (DWORD)UserShowCursor((BOOL)Param) ); + case ONEPARAM_ROUTINE_GETDESKTOPMAPPING: { PW32THREADINFO ti; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/painting.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Mon Mar 17 17:1= 7:48 2008 @@ -816,11 +816,11 @@ if (Window->UpdateRegion !=3D NULL) { MsqDecPaintCountQueue(Window->MessageQueue); - Rgn =3D RGNDATA_LockRgn(Window->UpdateRegion); + Rgn =3D REGION_LockRgn(Window->UpdateRegion); if (NULL !=3D Rgn) { - UnsafeIntGetRgnBox(Rgn, &Ps.rcPaint); - RGNDATA_UnlockRgn(Rgn); + REGION_GetRgnBox(Rgn, &Ps.rcPaint); + REGION_UnlockRgn(Rgn); IntGdiIntersectRect(&Ps.rcPaint, &Ps.rcPaint, &Window->Wnd->Clien= tRect); if (! IntGdiIsEmptyRect(&Ps.rcPaint)) { @@ -1042,10 +1042,10 @@ } else { - RgnData =3D RGNDATA_LockRgn(Window->UpdateRegion); + RgnData =3D REGION_LockRgn(Window->UpdateRegion); ASSERT(RgnData !=3D NULL); - RegionType =3D UnsafeIntGetRgnBox(RgnData, &Rect); - RGNDATA_UnlockRgn(RgnData); + RegionType =3D REGION_GetRgnBox(RgnData, &Rect); + REGION_UnlockRgn(RgnData); = if (RegionType !=3D ERROR && RegionType !=3D NULLREGION) IntGdiIntersectRect(&Rect, &Rect, &Window->Wnd->ClientRect); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/window.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Mar 17 17:17:= 48 2008 @@ -4392,10 +4392,10 @@ /* Copy the region into hRgn */ NtGdiCombineRgn(hRgn, VisRgn, NULL, RGN_COPY); = - if((pRgn =3D RGNDATA_LockRgn(hRgn))) + if((pRgn =3D REGION_LockRgn(hRgn))) { Ret =3D pRgn->rdh.iType; - RGNDATA_UnlockRgn(pRgn); + REGION_UnlockRgn(pRgn); } else Ret =3D ERROR; @@ -4431,11 +4431,11 @@ if(Window->WindowRegion && !(Wnd->Style & WS_MINIMIZE)) NtGdiCombineRgn(VisRgn, VisRgn, Window->WindowRegion, RGN_AND); = - if((pRgn =3D RGNDATA_LockRgn(VisRgn))) + if((pRgn =3D REGION_LockRgn(VisRgn))) { Ret =3D pRgn->rdh.iType; *Rect =3D pRgn->rdh.rcBound; - RGNDATA_UnlockRgn(pRgn); + REGION_UnlockRgn(pRgn); } else Ret =3D ERROR; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/ntuser/winpos.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Mon Mar 17 17:17:= 48 2008 @@ -961,16 +961,16 @@ VisBefore =3D VIS_ComputeVisibleRegion(Window, FALSE, FALSE, TRUE= ); VisRgn =3D NULL; = - if (VisBefore !=3D NULL && (VisRgn =3D (PROSRGNDATA)RGNDATA_LockR= gn(VisBefore)) && - UnsafeIntGetRgnBox(VisRgn, &TempRect) =3D=3D NULLREGION) - { - RGNDATA_UnlockRgn(VisRgn); + if (VisBefore !=3D NULL && (VisRgn =3D (PROSRGNDATA)REGION_LockRg= n(VisBefore)) && + REGION_GetRgnBox(VisRgn, &TempRect) =3D=3D NULLREGION) + { + REGION_UnlockRgn(VisRgn); NtGdiDeleteObject(VisBefore); VisBefore =3D NULL; } else if(VisRgn) { - RGNDATA_UnlockRgn(VisRgn); + REGION_UnlockRgn(VisRgn); NtGdiOffsetRgn(VisBefore, -Window->Wnd->WindowRect.left, -Wind= ow->Wnd->WindowRect.top); } } @@ -1111,16 +1111,16 @@ VisAfter =3D VIS_ComputeVisibleRegion(Window, FALSE, FALSE, TRUE); VisRgn =3D NULL; = - if (VisAfter !=3D NULL && (VisRgn =3D (PROSRGNDATA)RGNDATA_LockRgn(V= isAfter)) && - UnsafeIntGetRgnBox(VisRgn, &TempRect) =3D=3D NULLREGION) - { - RGNDATA_UnlockRgn(VisRgn); + if (VisAfter !=3D NULL && (VisRgn =3D (PROSRGNDATA)REGION_LockRgn(Vi= sAfter)) && + REGION_GetRgnBox(VisRgn, &TempRect) =3D=3D NULLREGION) + { + REGION_UnlockRgn(VisRgn); NtGdiDeleteObject(VisAfter); VisAfter =3D NULL; } else if(VisRgn) { - RGNDATA_UnlockRgn(VisRgn); + REGION_UnlockRgn(VisRgn); NtGdiOffsetRgn(VisAfter, -Window->Wnd->WindowRect.left, -Window->= Wnd->WindowRect.top); } = @@ -1149,12 +1149,15 @@ if (!(WinPos.flags & SWP_NOSIZE) && RgnType !=3D ERROR && RgnType !=3D NULLREGION) { + PROSRGNDATA pCopyRgn; RECT ORect =3D OldClientRect; RECT NRect =3D NewClientRect; IntGdiOffsetRect(&ORect, - OldWindowRect.left, - OldWindowRect= .top); IntGdiOffsetRect(&NRect, - NewWindowRect.left, - NewWindowRect= .top); IntGdiIntersectRect(&CopyRect, &ORect, &NRect); - REGION_CropRgn(CopyRgn, CopyRgn, &CopyRect, NULL); + pCopyRgn =3D REGION_LockRgn(CopyRgn); + REGION_CropAndOffsetRegion(pCopyRgn, pCopyRgn, &CopyRect, NULL= ); + REGION_UnlockRgn(pCopyRgn); } = /* No use in copying bits which are in the update region. */ @@ -1170,11 +1173,11 @@ * there's nothing to copy. Also, it's no use copying bits onto * themselves. */ - if ((VisRgn =3D (PROSRGNDATA)RGNDATA_LockRgn(CopyRgn)) && - UnsafeIntGetRgnBox(VisRgn, &CopyRect) =3D=3D NULLREGION) + if ((VisRgn =3D (PROSRGNDATA)REGION_LockRgn(CopyRgn)) && + REGION_GetRgnBox(VisRgn, &CopyRect) =3D=3D NULLREGION) { /* Nothing to copy, clean up */ - RGNDATA_UnlockRgn(VisRgn); + REGION_UnlockRgn(VisRgn); NtGdiDeleteObject(CopyRgn); CopyRgn =3D NULL; } @@ -1183,7 +1186,7 @@ { if(VisRgn) { - RGNDATA_UnlockRgn(VisRgn); + REGION_UnlockRgn(VisRgn); } = /* @@ -1210,7 +1213,7 @@ } else if(VisRgn) { - RGNDATA_UnlockRgn(VisRgn); + REGION_UnlockRgn(VisRgn); } } else Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/cliprgn.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/objects/cliprgn.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Mon Mar 17 17:1= 7:48 2008 @@ -37,7 +37,7 @@ NtGdiCombineRgn(Dc->w.hGCClipRgn, Dc->w.hClipRgn, Dc->w.hVisRgn, RGN= _AND); NtGdiOffsetRgn(Dc->w.hGCClipRgn, Dc->w.DCOrgX, Dc->w.DCOrgY); = - if((CombinedRegion =3D RGNDATA_LockRgn(Dc->w.hGCClipRgn))) + if((CombinedRegion =3D REGION_LockRgn(Dc->w.hGCClipRgn))) { if (Dc->CombinedClip !=3D NULL) IntEngDeleteClipRegion(Dc->CombinedClip); @@ -47,13 +47,13 @@ (PRECTL)CombinedRegion->Buffer, (PRECTL)&CombinedRegion->rdh.rcBound); = - RGNDATA_UnlockRgn(CombinedRegion); + REGION_UnlockRgn(CombinedRegion); } = if ( NULL =3D=3D Dc->CombinedClip ) { - DPRINT1("IntEngCreateClipRegion() failed\n"); - return ERROR; + DPRINT1("IntEngCreateClipRegion() failed\n"); + return ERROR; } = return NtGdiOffsetRgn(Dc->w.hGCClipRgn, -Dc->w.DCOrgX, -Dc->w.DCOrgY); @@ -126,10 +126,10 @@ { PROSRGNDATA Rgn; RECT rect; - if((Rgn =3D RGNDATA_LockRgn(dc->w.hVisRgn))) - { - UnsafeIntGetRgnBox(Rgn, &rect); - RGNDATA_UnlockRgn(Rgn); + if((Rgn =3D REGION_LockRgn(dc->w.hVisRgn))) + { + REGION_GetRgnBox(Rgn, &rect); + REGION_UnlockRgn(Rgn); dc->w.hClipRgn =3D UnsafeIntCreateRectRgnIndirect(&rect); } else @@ -181,13 +181,13 @@ return ERROR; } = - if (!(Rgn =3D RGNDATA_LockRgn(dc->w.hGCClipRgn))) + if (!(Rgn =3D REGION_LockRgn(dc->w.hGCClipRgn))) { DC_UnlockDc(dc); return ERROR; } - retval =3D UnsafeIntGetRgnBox(Rgn, rc); - RGNDATA_UnlockRgn(Rgn); + retval =3D REGION_GetRgnBox(Rgn, rc); + REGION_UnlockRgn(Rgn); IntDPtoLP(dc, (LPPOINT)rc, 2); DC_UnlockDc(dc); = @@ -418,11 +418,11 @@ = if (dc->w.hGCClipRgn) { - if((Rgn =3D (PROSRGNDATA)RGNDATA_LockRgn(dc->w.hGCClipRgn))) + if((Rgn =3D (PROSRGNDATA)REGION_LockRgn(dc->w.hGCClipRgn))) { IntLPtoDP(dc, (LPPOINT)&Rect, 2); - Result =3D UnsafeIntRectInRegion(Rgn, &Rect); - RGNDATA_UnlockRgn(Rgn); + Result =3D REGION_RectInRegion(Rgn, &Rect); + REGION_UnlockRgn(Rgn); } } DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Mon Mar 17 17:17= :48 2008 @@ -72,7 +72,7 @@ {1, sizeof(DC), TAG_DC, DC_Cleanup}, /* 01 DC= */ {1, 0, 0, NULL}, /* 02 UN= USED1 */ {1, 0, 0, NULL}, /* 03 UN= USED2 */ - {1, sizeof(ROSRGNDATA), TAG_REGION, RGNDATA_Cleanup}, /* 04 RG= N */ + {1, sizeof(ROSRGNDATA), TAG_REGION, REGION_Cleanup}, /* 04 RGN= */ {1, sizeof(BITMAPOBJ), TAG_SURFACE, BITMAP_Cleanup}, /* 05 SU= RFACE */ {0, sizeof(DC), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CL= IENTOBJ: METADC,... FIXME: don't use DC struct */ {0, 0, TAG_PATH, NULL}, /* 07 PA= TH, unused */ @@ -537,6 +537,7 @@ _InterlockedIncrement(&W32Process->GDIObjects); } Handle =3D (HGDIOBJ)((Index & 0xFFFF) | (TypeInfo << GDI_E= NTRY_UPPER_SHIFT)); + newObject->hHmgr =3D Handle; = DPRINT("GDIOBJ_AllocObj: 0x%x ob: 0x%x\n", Handle, newObje= ct); return Handle; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/region.c?rev=3D32713&r1=3D32712&r2=3D32713&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/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Mon Mar 17 17:17= :48 2008 @@ -465,7 +465,7 @@ { ROSRGNDATA *Data; = - Data =3D RGNDATA_LockRgn(hRgn); + Data =3D REGION_LockRgn(hRgn); if (Data =3D=3D NULL) { DbgPrint("IntDumpRegion called with invalid region!\n"); @@ -480,7 +480,7 @@ Data->rdh.rcBound.bottom, Data->rdh.iType); = - RGNDATA_UnlockRgn(Data); + REGION_UnlockRgn(Data); } #endif /* not NDEBUG */ = @@ -564,14 +564,19 @@ /*********************************************************************** * REGION_CropAndOffsetRegion */ -static BOOL FASTCALL +BOOL FASTCALL REGION_CropAndOffsetRegion( - const PPOINT off, + PROSRGNDATA rgnDst, + PROSRGNDATA rgnSrc, const PRECT rect, - PROSRGNDATA rgnSrc, - PROSRGNDATA rgnDst -) -{ + const PPOINT offset +) +{ + POINT pt =3D {0,0}; + PPOINT off =3D offset; + + if (!off) off =3D &pt; + if (!rect) // just copy and offset { PRECT xrect; @@ -725,69 +730,6 @@ } EMPTY_REGION(rgnDst); return TRUE; -} - -/*! - * \param - * hSrc: Region to crop and offset. - * lpRect: Clipping rectangle. Can be NULL (no clipping). - * lpPt: Points to offset the cropped region. Can be NULL (no offset). - * - * hDst: Region to hold the result (a new region is created if it's 0). - * Allowed to be the same region as hSrc in which case everything - * will be done in place, with no memory reallocations. - * - * \return hDst if success, 0 otherwise. - */ -HRGN FASTCALL -REGION_CropRgn( - HRGN hDst, - HRGN hSrc, - const PRECT lpRect, - PPOINT lpPt -) -{ - PROSRGNDATA objSrc, rgnDst; - HRGN hRet =3D NULL; - POINT pt =3D { 0, 0 }; - - if (!hDst) - { - if ( !(hDst =3D RGNDATA_AllocRgn(1)) ) - { - return 0; - } - } - - rgnDst =3D RGNDATA_LockRgn(hDst); - if (rgnDst =3D=3D NULL) - { - return NULL; - } - - objSrc =3D RGNDATA_LockRgn(hSrc); - if (objSrc =3D=3D NULL) - { - RGNDATA_UnlockRgn(rgnDst); - return NULL; - } - if (!lpPt) - lpPt =3D &pt; - - if (REGION_CropAndOffsetRegion(lpPt, lpRect, objSrc, rgnDst) =3D=3D FA= LSE) - { - // ve failed cleanup and return - hRet =3D NULL; - } - else // ve are fine. unlock the correct pointer and return correct ha= ndle - { - hRet =3D hDst; - } - - RGNDATA_UnlockRgn(objSrc); - RGNDATA_UnlockRgn(rgnDst); - - return hRet; } = = @@ -1772,35 +1714,29 @@ HRGN htra, htrb; ROSRGNDATA *tra, *trb; = - if (!(htra =3D RGNDATA_AllocRgn(sra->rdh.nCount + 1))) + // FIXME: don't use a handle + tra =3D REGION_AllocRgnWithHandle(sra->rdh.nCount + 1); + if (!tra ) + { return; - if (!(htrb =3D RGNDATA_AllocRgn(srb->rdh.nCount + 1))) - { + } + htra =3D tra->BaseObject.hHmgr; + + // FIXME: don't use a handle + trb =3D REGION_AllocRgnWithHandle(srb->rdh.nCount + 1); + if (!trb) + { + REGION_UnlockRgn(tra); NtGdiDeleteObject(htra); return; } - tra =3D RGNDATA_LockRgn(htra); - if (!tra ) - { - NtGdiDeleteObject(htra); - NtGdiDeleteObject(htrb); - return; - } - - trb =3D RGNDATA_LockRgn(htrb); - if (!trb) - { - RGNDATA_UnlockRgn(tra); - NtGdiDeleteObject(htra); - NtGdiDeleteObject(htrb); - return; - } + htrb =3D trb->BaseObject.hHmgr; = REGION_SubtractRegion(tra, sra, srb); REGION_SubtractRegion(trb, srb, sra); REGION_UnionRegion(dr, tra, trb); - RGNDATA_UnlockRgn(tra); - RGNDATA_UnlockRgn(trb); + REGION_UnlockRgn(tra); + REGION_UnlockRgn(trb); = NtGdiDeleteObject(htra); NtGdiDeleteObject(htrb); @@ -1811,10 +1747,10 @@ /*! * Adds a rectangle to a REGION */ -void FASTCALL -REGION_UnionRectWithRegion( - const RECT *rect, - ROSRGNDATA *rgn +VOID FASTCALL +REGION_UnionRectWithRgn( + ROSRGNDATA *rgn, + const RECT *rect ) { ROSRGNDATA region; @@ -1914,26 +1850,26 @@ PRECT rc; ULONG i; = - if (!(srcObj =3D (PROSRGNDATA)RGNDATA_LockRgn(hSrc))) + if (!(srcObj =3D REGION_LockRgn(hSrc))) { return FALSE; } if (!REGION_NOT_EMPTY(srcObj)) { - RGNDATA_UnlockRgn(srcObj); + REGION_UnlockRgn(srcObj); return FALSE; } - if (!(destObj =3D (PROSRGNDATA)RGNDATA_LockRgn(hDest))) - { - RGNDATA_UnlockRgn(srcObj); + if (!(destObj =3D REGION_LockRgn(hDest))) + { + REGION_UnlockRgn(srcObj); return FALSE; } = EMPTY_REGION(destObj); if (!REGION_CopyRegion(destObj, srcObj)) { - RGNDATA_UnlockRgn(destObj); - RGNDATA_UnlockRgn(srcObj); + REGION_UnlockRgn(destObj); + REGION_UnlockRgn(srcObj); return FALSE; } = @@ -1942,8 +1878,8 @@ if (!REGION_CreateSimpleFrameRgn(destObj, x, y)) { EMPTY_REGION(destObj); - RGNDATA_UnlockRgn(destObj); - RGNDATA_UnlockRgn(srcObj); + REGION_UnlockRgn(destObj); + REGION_UnlockRgn(srcObj); return FALSE; } } @@ -2002,8 +1938,8 @@ REGION_SubtractRegion(destObj, srcObj, destObj); } = - RGNDATA_UnlockRgn(destObj); - RGNDATA_UnlockRgn(srcObj); + REGION_UnlockRgn(destObj); + REGION_UnlockRgn(srcObj); return TRUE; } = @@ -2039,11 +1975,11 @@ goto done; } = - if ( !(srcObj =3D (PROSRGNDATA) RGNDATA_LockRgn(hSrc)) ) + if ( !(srcObj =3D REGION_LockRgn(hSrc)) ) goto done; - if ( !(destObj =3D (PROSRGNDATA) RGNDATA_LockRgn(hDest)) ) - { - RGNDATA_UnlockRgn(srcObj); + if ( !(destObj =3D REGION_LockRgn(hDest)) ) + { + REGION_UnlockRgn(srcObj); goto done; } EMPTY_REGION(destObj); @@ -2070,27 +2006,27 @@ tmpRect.bottom =3D tmp; } = - REGION_UnionRectWithRegion(&tmpRect, destObj); + REGION_UnionRectWithRgn(destObj, &tmpRect); } ret =3D TRUE; = - RGNDATA_UnlockRgn(srcObj); - RGNDATA_UnlockRgn(destObj); + REGION_UnlockRgn(srcObj); + REGION_UnlockRgn(destObj); = done: DC_UnlockDc(dc); return ret; } = -HRGN FASTCALL -RGNDATA_AllocRgn(INT n) +PROSRGNDATA FASTCALL +REGION_AllocRgnWithHandle(INT n) { HRGN hReg; PROSRGNDATA pReg; = if ((hReg =3D (HRGN) GDIOBJ_AllocObj(GDI_OBJECT_TYPE_REGION))) { - if (NULL !=3D (pReg =3D RGNDATA_LockRgn(hReg))) + if (NULL !=3D (pReg =3D REGION_LockRgn(hReg))) { if (1 =3D=3D n) { @@ -2110,14 +2046,12 @@ pReg->rdh.nCount =3D n; pReg->rdh.nRgnSize =3D n*sizeof(RECT); = - RGNDATA_UnlockRgn(pReg); - - return hReg; + return pReg; } } else { - RGNDATA_FreeRgn(hReg); + REGION_FreeRgn(hReg); } } = @@ -2125,7 +2059,7 @@ } = BOOL INTERNAL_CALL -RGNDATA_Cleanup(PVOID ObjectBody) +REGION_Cleanup(PVOID ObjectBody) { PROSRGNDATA pRgn =3D (PROSRGNDATA)ObjectBody; if (pRgn->Buffer && pRgn->Buffer !=3D &pRgn->rdh.rcBound) @@ -2144,10 +2078,10 @@ INT result =3D ERROR; PROSRGNDATA destRgn, src1Rgn, src2Rgn; = - destRgn =3D RGNDATA_LockRgn(hDest); + destRgn =3D REGION_LockRgn(hDest); if (destRgn) { - src1Rgn =3D RGNDATA_LockRgn(hSrc1); + src1Rgn =3D REGION_LockRgn(hSrc1); if (src1Rgn) { if (CombineMode =3D=3D RGN_COPY) @@ -2158,7 +2092,7 @@ } else { - src2Rgn =3D RGNDATA_LockRgn(hSrc2); + src2Rgn =3D REGION_LockRgn(hSrc2); if (src2Rgn) { switch (CombineMode) @@ -2176,7 +2110,7 @@ REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn); break; } - RGNDATA_UnlockRgn(src2Rgn); + REGION_UnlockRgn(src2Rgn); result =3D destRgn->rdh.iType; } else if (hSrc2 =3D=3D NULL) @@ -2185,10 +2119,10 @@ } } = - RGNDATA_UnlockRgn(src1Rgn); - } - - RGNDATA_UnlockRgn(destRgn); + REGION_UnlockRgn(src1Rgn); + } + + REGION_UnlockRgn(destRgn); } else { @@ -2215,18 +2149,22 @@ HRGN STDCALL NtGdiCreateRectRgn(INT LeftRect, INT TopRect, INT RightRect, INT BottomRec= t) { + PROSRGNDATA pRgn; HRGN hRgn; = /* Allocate region data structure with space for 1 RECT */ - if ((hRgn =3D RGNDATA_AllocRgn(1))) - { - if (NtGdiSetRectRgn(hRgn, LeftRect, TopRect, RightRect, BottomRect= )) - return hRgn; - NtGdiDeleteObject(hRgn); - } - - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; + if (!(pRgn =3D REGION_AllocRgnWithHandle(1))) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hRgn =3D pRgn->BaseObject.hHmgr; + + REGION_SetRectRgn(pRgn, LeftRect, TopRect, RightRect, BottomRect); + REGION_UnlockRgn(pRgn); + + return hRgn; + } = HRGN @@ -2276,8 +2214,8 @@ /* Create region */ = d =3D (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64; - if (!(hrgn =3D RGNDATA_AllocRgn(d))) return 0; - if (!(obj =3D RGNDATA_LockRgn(hrgn))) return 0; + if (!(obj =3D REGION_AllocRgnWithHandle(d))) return 0; + hrgn =3D obj->BaseObject.hHmgr; = /* Ellipse algorithm, based on an article by K. Porter */ /* in DDJ Graphics Programming Column, 8/89 */ @@ -2300,10 +2238,10 @@ /* move toward center */ rect.top =3D top++; rect.bottom =3D rect.top + 1; - UnsafeIntUnionRectWithRgn(obj, &rect); + REGION_UnionRectWithRgn(obj, &rect); rect.top =3D --bottom; rect.bottom =3D rect.top + 1; - UnsafeIntUnionRectWithRgn(obj, &rect); + REGION_UnionRectWithRgn(obj, &rect); yd -=3D 2*asq; d -=3D yd; } @@ -2320,10 +2258,10 @@ /* next vertical point */ rect.top =3D top++; rect.bottom =3D rect.top + 1; - UnsafeIntUnionRectWithRgn(obj, &rect); + REGION_UnionRectWithRgn(obj, &rect); rect.top =3D --bottom; rect.bottom =3D rect.top + 1; - UnsafeIntUnionRectWithRgn(obj, &rect); + REGION_UnionRectWithRgn(obj, &rect); if (d < 0) /* if nearest pixel is outside ellipse */ { rect.left--; /* move away from center */ @@ -2340,9 +2278,10 @@ { rect.top =3D top; rect.bottom =3D bottom; - UnsafeIntUnionRectWithRgn(obj, &rect); - } - RGNDATA_UnlockRgn(obj); + REGION_UnionRectWithRgn(obj, &rect); + } + + REGION_UnlockRgn(obj); return hrgn; } = @@ -2358,12 +2297,12 @@ ULONG i; BOOL bRet =3D FALSE; = - if ( !(rgn1 =3D RGNDATA_LockRgn(hSrcRgn1)) ) + if ( !(rgn1 =3D REGION_LockRgn(hSrcRgn1)) ) return ERROR; = - if ( !(rgn2 =3D RGNDATA_LockRgn(hSrcRgn2)) ) - { - RGNDATA_UnlockRgn(rgn1); + if ( !(rgn2 =3D REGION_LockRgn(hSrcRgn2)) ) + { + REGION_UnlockRgn(rgn1); return ERROR; } = @@ -2392,8 +2331,8 @@ bRet =3D TRUE; = exit: - RGNDATA_UnlockRgn(rgn1); - RGNDATA_UnlockRgn(rgn2); + REGION_UnlockRgn(rgn1); + REGION_UnlockRgn(rgn2); return bRet; } = @@ -2437,19 +2376,14 @@ return NULL; } = - hRgn =3D RGNDATA_AllocRgn(nCount); - if (hRgn =3D=3D NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - Region =3D RGNDATA_LockRgn(hRgn); + Region =3D REGION_AllocRgnWithHandle(nCount); + if (Region =3D=3D NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + hRgn =3D Region->BaseObject.hHmgr; = _SEH_TRY { @@ -2468,12 +2402,12 @@ if (!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); - RGNDATA_UnlockRgn(Region); + REGION_UnlockRgn(Region); NtGdiDeleteObject(hRgn); return NULL; } = - RGNDATA_UnlockRgn(Region); + REGION_UnlockRgn(Region); = return hRgn; } @@ -2490,14 +2424,14 @@ PROSRGNDATA rgn; PRECT r; = - if (NULL =3D=3D (rgn =3D RGNDATA_LockRgn(hRgn))) + if (NULL =3D=3D (rgn =3D REGION_LockRgn(hRgn))) { return FALSE; } = if (NULL =3D=3D (oldhBrush =3D NtGdiSelectBrush(hDC, hBrush))) { - RGNDATA_UnlockRgn(rgn); + REGION_UnlockRgn(rgn); return FALSE; } = @@ -2506,7 +2440,7 @@ NtGdiPatBlt(hDC, r->left, r->top, r->right - r->left, r->bottom - = r->top, PATCOPY); } = - RGNDATA_UnlockRgn(rgn); + REGION_UnlockRgn(rgn); NtGdiSelectBrush(hDC, oldhBrush); = return TRUE; @@ -2542,7 +2476,7 @@ } = INT FASTCALL -UnsafeIntGetRgnBox( +REGION_GetRgnBox( PROSRGNDATA Rgn, LPRECT pRect ) @@ -2637,13 +2571,13 @@ PROSRGNDATA Rgn; DWORD ret; = - if (!(Rgn =3D RGNDATA_LockRgn(hRgn))) + if (!(Rgn =3D REGION_LockRgn(hRgn))) { return ERROR; } = - ret =3D UnsafeIntGetRgnBox(Rgn, pRect); - RGNDATA_UnlockRgn(Rgn); + ret =3D REGION_GetRgnBox(Rgn, pRect); + REGION_UnlockRgn(Rgn); = return ret; } @@ -2660,13 +2594,13 @@ DWORD ret; NTSTATUS Status =3D STATUS_SUCCESS; = - if (!(Rgn =3D RGNDATA_LockRgn(hRgn))) + if (!(Rgn =3D REGION_LockRgn(hRgn))) { return ERROR; } = - ret =3D UnsafeIntGetRgnBox(Rgn, &SafeRect); - RGNDATA_UnlockRgn(Rgn); + ret =3D REGION_GetRgnBox(Rgn, &SafeRect); + REGION_UnlockRgn(Rgn); if (ERROR =3D=3D ret) { return ret; @@ -2701,7 +2635,7 @@ ULONG i; PRECT rc; = - if (!(RgnData =3D RGNDATA_LockRgn(hRgn))) + if (!(RgnData =3D REGION_LockRgn(hRgn))) { SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; @@ -2713,13 +2647,13 @@ = if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc-= >bottom - rc->top, DSTINVERT)) { - RGNDATA_UnlockRgn(RgnData); + REGION_UnlockRgn(RgnData); return FALSE; } rc++; } = - RGNDATA_UnlockRgn(RgnData); + REGION_UnlockRgn(RgnData); return TRUE; } = @@ -2731,7 +2665,7 @@ INT YOffset ) { - PROSRGNDATA rgn =3D RGNDATA_LockRgn(hRgn); + PROSRGNDATA rgn =3D REGION_LockRgn(hRgn); INT ret; = DPRINT("NtGdiOffsetRgn: hRgn %d Xoffs %d Yoffs %d rgn %x\n", hRgn, XOf= fset, YOffset, rgn ); @@ -2767,7 +2701,7 @@ } } ret =3D rgn->rdh.iType; - RGNDATA_UnlockRgn(rgn); + REGION_UnlockRgn(rgn); return ret; } = @@ -2813,8 +2747,8 @@ NtGdiCombineRgn(tmpVisRgn, tmpVisRgn, dc->w.hGCClipRgn, RGN_AND); */ = - //visrgn =3D RGNDATA_LockRgn(tmpVisRgn); - visrgn =3D RGNDATA_LockRgn(hRgn); + //visrgn =3D REGION_LockRgn(tmpVisRgn); + visrgn =3D REGION_LockRgn(hRgn); if (visrgn =3D=3D NULL) { NtGdiDeleteObject(tmpVisRgn); @@ -2843,7 +2777,7 @@ = BITMAPOBJ_UnlockBitmap(BitmapObj); BRUSHOBJ_UnlockBrush(pBrush); - RGNDATA_UnlockRgn(visrgn); + REGION_UnlockRgn(visrgn); NtGdiDeleteObject(tmpVisRgn); = // Fill the region @@ -2862,7 +2796,7 @@ ULONG i; PRECT r; = - if (!(rgn =3D RGNDATA_LockRgn(hRgn) ) ) + if (!(rgn =3D REGION_LockRgn(hRgn) ) ) return FALSE; = if (rgn->rdh.nCount > 0 && INRECT(rgn->rdh.rcBound, X, Y)) @@ -2872,19 +2806,19 @@ { if (INRECT(*r, X, Y)) { - RGNDATA_UnlockRgn(rgn); + REGION_UnlockRgn(rgn); return TRUE; } r++; } } - RGNDATA_UnlockRgn(rgn); + REGION_UnlockRgn(rgn); return FALSE; } = BOOL FASTCALL -UnsafeIntRectInRegion( +REGION_RectInRegion( PROSRGNDATA Rgn, CONST LPRECT rc ) @@ -2919,7 +2853,7 @@ BOOL Ret; NTSTATUS Status =3D STATUS_SUCCESS; = - if (!(Rgn =3D RGNDATA_LockRgn(hRgn))) + if (!(Rgn =3D REGION_LockRgn(hRgn))) { return ERROR; } @@ -2937,15 +2871,55 @@ = if (!NT_SUCCESS(Status)) { - RGNDATA_UnlockRgn(Rgn); + REGION_UnlockRgn(Rgn); SetLastNtError(Status); DPRINT1("NtGdiRectInRegion: bogus rc\n"); return ERROR; } = - Ret =3D UnsafeIntRectInRegion(Rgn, &rc); - RGNDATA_UnlockRgn(Rgn); + Ret =3D REGION_RectInRegion(Rgn, &rc); + REGION_UnlockRgn(Rgn); return Ret; +} + +VOID +FASTCALL +REGION_SetRectRgn( + PROSRGNDATA rgn, + INT LeftRect, + INT TopRect, + INT RightRect, + INT BottomRect +) +{ + PRECT firstRect; + + if (LeftRect > RightRect) + { + INT tmp =3D LeftRect; + LeftRect =3D RightRect; + RightRect =3D tmp; + } + if (TopRect > BottomRect) + { + INT tmp =3D TopRect; + TopRect =3D BottomRect; + BottomRect =3D tmp; + } + + if ((LeftRect !=3D RightRect) && (TopRect !=3D BottomRect)) + { + firstRect =3D (PRECT)rgn->Buffer; + ASSERT(firstRect); + firstRect->left =3D rgn->rdh.rcBound.left =3D LeftRect; + firstRect->top =3D rgn->rdh.rcBound.top =3D TopRect; + firstRect->right =3D rgn->rdh.rcBound.right =3D RightRect; + firstRect->bottom =3D rgn->rdh.rcBound.bottom =3D BottomRect; + rgn->rdh.nCount =3D 1; + rgn->rdh.iType =3D SIMPLEREGION; + } + else + EMPTY_REGION(rgn); } = BOOL @@ -2959,41 +2933,15 @@ ) { PROSRGNDATA rgn; - PRECT firstRect; - - - - if ( !(rgn =3D RGNDATA_LockRgn(hRgn)) ) + + if ( !(rgn =3D REGION_LockRgn(hRgn)) ) + { return 0; //per documentation - - if (LeftRect > RightRect) - { - INT tmp =3D LeftRect; - LeftRect =3D RightRect; - RightRect =3D tmp; - } - if (TopRect > BottomRect) - { - INT tmp =3D TopRect; - TopRect =3D BottomRect; - BottomRect =3D tmp; - } - - if ((LeftRect !=3D RightRect) && (TopRect !=3D BottomRect)) - { - firstRect =3D (PRECT)rgn->Buffer; - ASSERT(firstRect); - firstRect->left =3D rgn->rdh.rcBound.left =3D LeftRect; - firstRect->top =3D rgn->rdh.rcBound.top =3D TopRect; - firstRect->right =3D rgn->rdh.rcBound.right =3D RightRect; - firstRect->bottom =3D rgn->rdh.rcBound.bottom =3D BottomRect; - rgn->rdh.nCount =3D 1; - rgn->rdh.iType =3D SIMPLEREGION; - } - else - EMPTY_REGION(rgn); - - RGNDATA_UnlockRgn(rgn); + } + + REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); + + REGION_UnlockRgn(rgn); return TRUE; } = @@ -3007,7 +2955,7 @@ PROSRGNDATA Rgn; NTSTATUS Status =3D STATUS_SUCCESS; = - if (!(Rgn =3D (PROSRGNDATA)RGNDATA_LockRgn(hDest))) + if (!(Rgn =3D REGION_LockRgn(hDest))) { SetLastWin32Error(ERROR_INVALID_HANDLE); return NULL; @@ -3026,13 +2974,13 @@ = if (! NT_SUCCESS(Status)) { - RGNDATA_UnlockRgn(Rgn); + REGION_UnlockRgn(Rgn); SetLastNtError(Status); return NULL; } = - UnsafeIntUnionRectWithRgn(Rgn, &SafeRect); - RGNDATA_UnlockRgn(Rgn); + REGION_UnionRectWithRgn(Rgn, &SafeRect); + REGION_UnlockRgn(Rgn); return hDest; } = @@ -3054,7 +3002,7 @@ ) { DWORD size; - PROSRGNDATA obj =3D RGNDATA_LockRgn(hrgn); + PROSRGNDATA obj =3D REGION_LockRgn(hrgn); NTSTATUS Status =3D STATUS_SUCCESS; = if (!obj) @@ -3063,10 +3011,10 @@ size =3D obj->rdh.nCount * sizeof(RECT); if (count < (size + sizeof(RGNDATAHEADER)) || rgndata =3D=3D NULL) { - RGNDATA_UnlockRgn(obj); + REGION_UnlockRgn(obj); if (rgndata) /* buffer is too small, signal it by return 0 */ return 0; - else /* user requested buffer size with rgndata NULL */ + else /* user requested buffer size with rgndata NULL */ return size + sizeof(RGNDATAHEADER); } = @@ -3089,11 +3037,11 @@ if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RGNDATA_UnlockRgn(obj); + REGION_UnlockRgn(obj); return 0; } = - RGNDATA_UnlockRgn(obj); + REGION_UnlockRgn(obj); return size + sizeof(RGNDATAHEADER); } = @@ -3560,13 +3508,9 @@ int numFullPtBlocks =3D 0; INT poly, total; = - if (!(hrgn =3D RGNDATA_AllocRgn(nbpolygons))) + if (!(region =3D REGION_AllocRgnWithHandle(nbpolygons))) return 0; - if (!(region =3D RGNDATA_LockRgn(hrgn))) - { - NtGdiDeleteObject(hrgn); - return 0; - } + hrgn =3D region->BaseObject.hHmgr; = /* special case a rectangle */ = @@ -3581,7 +3525,7 @@ (Pts[2].x =3D=3D Pts[3].x) && (Pts[3].y =3D=3D Pts[0].y)))) { - RGNDATA_UnlockRgn(region); + REGION_UnlockRgn(region); NtGdiSetRectRgn(hrgn, min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2= ].y), max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y)); return hrgn; @@ -3730,7 +3674,7 @@ curPtBlock =3D tmpPtBlock; } ExFreePool(pETEs); - RGNDATA_UnlockRgn(region); + REGION_UnlockRgn(region); return hrgn; } =

1 0

[dreimer] 32712: Updated Polish and German RC File of shell32. Polish Part done by Olaf Siejka
by dreimer＠svn.reactos.org 17 Mar '08

17 Mar '08

Author: dreimer Date: Mon Mar 17 12:40:52 2008 New Revision: 32712 URL: http://svn.reactos.org/svn/reactos?rev=3D32712&view=3Drev Log: Updated Polish and German RC File of shell32. Polish Part done by Olaf Siejka Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc 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=3D32712&r1=3D32711&r2=3D32712&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 Mon Mar 17 12:40:52 2008 @@ -643,7 +643,7 @@ FCIDM_SHVIEW_NEWFOLDER "Neues Ver&zeichnis" FCIDM_SHVIEW_NEWLINK "Neuer Ver&weis" IDS_FOLDER_OPTIONS "Ordneroptionen" - IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" - IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_RECYCLEBIN_LOCATION "Papierkorbpfad" + IDS_RECYCLEBIN_DISKSPACE "Speicher frei" + +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=3D32712&r1=3D32711&r2=3D32712&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 Mon Mar 17 12:40:52 2008 @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, U= SA * - * translation updated by Caemyr - Olaf Siejka (Jan, 2008) + * translation updated by Caemyr - Olaf Siejka (Jan,Mar 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -649,7 +649,7 @@ FCIDM_SHVIEW_NEWFOLDER "&Folder" FCIDM_SHVIEW_NEWLINK "&Skr=C3=B3t" IDS_FOLDER_OPTIONS "Opcje Katalog=C3=B3w" - IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" - IDS_RECYCLEBIN_DISKSPACE "Space Available" - -END + IDS_RECYCLEBIN_LOCATION "Lokalizacja Kosza" + IDS_RECYCLEBIN_DISKSPACE "Pozosta=C2=B3o wolnego miejsca" + +END

1 0

[hpoussin] 32711: Replace .def files by .spec files
by hpoussin＠svn.reactos.org 17 Mar '08

17 Mar '08

Author: hpoussin Date: Mon Mar 17 07:57:17 2008 New Revision: 32711 URL: http://svn.reactos.org/svn/reactos?rev=3D32711&view=3Drev Log: Replace .def files by .spec files Added: trunk/reactos/dll/cpl/access/access.spec (with props) Removed: trunk/reactos/dll/cpl/access/access.def Modified: trunk/reactos/dll/cpl/access/access.c (contents, props changed) trunk/reactos/dll/cpl/access/access.h (props changed) trunk/reactos/dll/cpl/access/access.rbuild trunk/reactos/dll/cpl/access/access.rc (props changed) trunk/reactos/dll/cpl/access/display.c (contents, props changed) trunk/reactos/dll/cpl/access/general.c (contents, props changed) trunk/reactos/dll/cpl/access/keyboard.c (contents, props changed) trunk/reactos/dll/cpl/access/lang/nl-NL.rc (props changed) trunk/reactos/dll/cpl/access/lang/uk-UA.rc (contents, props changed) trunk/reactos/dll/cpl/access/mouse.c (contents, props changed) trunk/reactos/dll/cpl/access/resource.h (props changed) trunk/reactos/dll/cpl/access/sound.c (contents, props changed) Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access= .c?rev=3D32711&r1=3D32710&r2=3D32711&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/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Mon Mar 17 07:57:17 2008 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: access.c 29112 2007-09-19 21:31:49Z ekohl $ * * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory Propchange: trunk/reactos/dll/cpl/access/access.c ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Removed: trunk/reactos/dll/cpl/access/access.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access= .def?rev=3D32710&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/access/access.def (original) +++ trunk/reactos/dll/cpl/access/access.def (removed) @@ -1,6 +1,0 @@ -LIBRARY access.cpl - -EXPORTS -CPlApplet@16 - -; EOF Propchange: trunk/reactos/dll/cpl/access/access.h ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/cpl/access/access.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access= .rbuild?rev=3D32711&r1=3D32710&r2=3D32711&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/access/access.rbuild (original) +++ trunk/reactos/dll/cpl/access/access.rbuild Mon Mar 17 07:57:17 2008 @@ -1,7 +1,7 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name=3D"access" type=3D"win32dll" extension=3D".cpl" baseaddress= =3D"${BASEADDRESS_ACCESS}" installbase=3D"system32" installname=3D"access.= cpl" unicode=3D"yes"> - <importlibrary definition=3D"access.def" /> + <importlibrary definition=3D"access.spec.def" /> <include base=3D"access">.</include> <define name=3D"_WIN32_IE">0x600</define> <define name=3D"_WIN32_WINNT">0x600</define> @@ -18,4 +18,5 @@ <file>mouse.c</file> <file>sound.c</file> <file>access.rc</file> + <file>access.spec</file> </module> Propchange: trunk/reactos/dll/cpl/access/access.rc ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Added: trunk/reactos/dll/cpl/access/access.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access= .spec?rev=3D32711&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/access/access.spec (added) +++ trunk/reactos/dll/cpl/access/access.spec Mon Mar 17 07:57:17 2008 @@ -1,0 +1,1 @@ +@ stdcall CPlApplet(ptr long ptr ptr) Propchange: trunk/reactos/dll/cpl/access/access.spec ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/displa= y.c?rev=3D32711&r1=3D32710&r2=3D32711&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/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Mon Mar 17 07:57:17 2008 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: display.c 29112 2007-09-19 21:31:49Z ekohl $ * * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory Propchange: trunk/reactos/dll/cpl/access/display.c ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/genera= l.c?rev=3D32711&r1=3D32710&r2=3D32711&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/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Mon Mar 17 07:57:17 2008 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: general.c 29112 2007-09-19 21:31:49Z ekohl $ * * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory Propchange: trunk/reactos/dll/cpl/access/general.c ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboa= rd.c?rev=3D32711&r1=3D32710&r2=3D32711&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/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Mon Mar 17 07:57:17 2008 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: keyboard.c 29170 2007-09-23 22:59:00Z ekohl $ * * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory Propchange: trunk/reactos/dll/cpl/access/keyboard.c ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/dll/cpl/access/lang/nl-NL.rc ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Modified: trunk/reactos/dll/cpl/access/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/u= k-UA.rc?rev=3D32711&r1=3D32710&r2=3D32711&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/access/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/access/lang/uk-UA.rc Mon Mar 17 07:57:17 2008 @@ -1,312 +1,312 @@ -/* - * PROJECT: Accessibility Control Panel Applet - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/access/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for Accessibility Control Panel A= pplet - * TRANSLATOR: Rostislav Zabolotny - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - - -IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "=C3=8A=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A0" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "=C3=87=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA= =C3=AB=C3=A0=C3=A2=C2=B3=C3=B8",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHE= ETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "=C3=82=C3=A2=C3=A5=C3=A4=C3=A5=C3=AD=C3=AD=C3=BF =C3=AA=C3=AE=C3= =AC=C3=A1=C2=B3=C3=AD=C3=A0=C3=B6=C2=B3=C3=A9 =C3=A7 =C3=AA=C3=AB=C3=A0=C3= =A2=C2=B3=C3=B8=C3=A0=C3=AC=C3=A8 Shift, Ctrl =C3=B7=C3=A8 Alt, =C3=AD=C3= =A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=BE=C3=B7=C3=A8 =C3=AA=C3=AB=C3=A0=C3= =A2=C2=B3=C3=B8=C2=B3 =C3=AF=C3=AE=C3=B1=C3=AB=C2=B3=C3=A4=C3=AE=C3=A2=C3= =AD=C3=AE.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPAD= DING(4),LABELLINE(3) - AUTOCHECKBOX "&=C3=87=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF = =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8",IDC_STICKY_BOX,PROPSHEETPADDING(2),LA= BELLINE(5)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 - PUSHBUTTON "&=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(5)+6,PROPSHE= ETPADDING(15)-5,14 - - GROUPBOX "=C3=94=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3=B6=C2=B3=C3=BF = =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPS= HEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3= =BF =C3=A2=C3=A8=C3=AF=C3=A0=C3=A4=C3=AA=C3=AE=C3=A2=C3=A8=C3=B5 =C3=AA=C3= =AE=C3=B0=C3=AE=C3=B2=C3=AA=C3=AE=C3=B7=C3=A0=C3=B1=C3=AD=C3=A8=C3=B5 =C3= =A0=C3=A1=C3=AE =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=BE=C3=A2=C3=A0=C3= =AD=C3=A8=C3=B5 =C3=A7=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=BC =C3= =AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,= PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 &=C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3= =A0=C3=B6=C2=B3=C3=BE =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3",IDC_FILTER_BOX,PROPSH= EETPADDING(2),LABELLINE(13)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 - PUSHBUTTON "=C3=8D&=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(13)+6,PROPSH= EETPADDING(15)-5,14 - - GROUPBOX "=C3=8E=C3=A7=C3=A2=C3=B3=C3=B7=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD= =C3=BF =C3=AF=C3=A5=C3=B0=C3=A5=C3=AA=C3=AB=C3=BE=C3=B7=C3=A5=C3=AD=C3=AD= =C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C2=B3=C3=A2",-1,PROPSHEETPADDING(1),L= ABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPAD= DING(1) - LTEXT "=C3=8F=C3=B0=C3=A8 =C3=A7=C3=AC=C2=B3=C3=AD=C2=B3 =C3=B1=C3=B2=C3= =A0=C3=AD=C3=B3 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8 Caps Lock, Num Lock = =C2=B3 Scroll Lock =C3=A7=C3=A2=C3=B3=C3=B7=C3=A8=C3=B2=C3=BC =C3=B1=C3=A8= =C3=A3=C3=AD=C3=A0=C3=AB.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEET= WIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "&=C3=8E=C3=A7=C3=A2=C3=B3=C3=B7=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDT= H-PROPSHEETPADDING(20),14 - PUSHBUTTON "=C3=8D=C3=A0&=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSH= EETPADDING(15)-5,14 - - AUTOCHECKBOX "&=C3=84=C3=AE=C3=A4=C3=A0=C3=B2=C3=AA=C3=AE=C3=A2=C2=B3 = =C3=A2=C2=B3=C3=A4=C3=AE=C3=AC=C3=AE=C3=B1=C3=B2=C2=B3 =C3=AF=C3=B0=C3=AE = =C3=B0=C3=AE=C3=A1=C3=AE=C3=B2=C3=B3 =C2=B3=C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2= =C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=AE=C3=BE",IDC_KEYBOARD_EXTRA,PROPSHEETPAD= DING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 -END - - -IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "=C3=87=C3=A2=C3=B3=C3=AA" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "=C3=82=C2=B3=C3=A7=C3=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=A5 =C2=B3= =C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF",-1,PROP= SHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1= 0)+PROPSHEETPADDING(1) - LTEXT "=C3=87=C3=A2=C3=B3=C3=AA=C3=AE=C3=A2=C2=B3 =C3=B1=C3=A8=C3=A3=C3= =AD=C3=A0=C3=AB=C3=A8 =C3=B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC=C3=A8 =C3=B1=C3= =B3=C3=AF=C3=B0=C3=AE=C3=A2=C3=AE=C3=A4=C3=A6=C3=B3=C3=BE=C3=B2=C3=BC=C3=B1= =C3=BF =C3=A2=C2=B3=C3=A7=C3=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=AE=C3=BE =C2=B3= =C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=A0=C3=B6=C2=B3=C2=BA=C3=BE.",-1,PROPSHEET= PADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "=C3=82&=C2=B3=C3=A7=C3=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=A5 = =C2=B3=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF",I= DC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+2,14 - LTEXT "=C2=B2=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=B3=C3=A2=C3=A0=C3=B7=C3=A0:", I= DC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEET= PADDING(4),LABELLINE(1) - COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETW= IDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_= VISIBLE | WS_TABSTOP - - GROUPBOX "=C3=91=C3=B3=C3=A1=C3=B2=C3=A8=C3=B2=C3=B0=C3=A8",-1,PROPSHEET= PADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "=C3=91=C3=B3=C3=AF=C3=B0=C3=AE=C3=A2=C2=B3=C3=A4 =C3=A7=C3=A2=C3= =B3=C3=AA=C3=B3 =C2=B3 =C3=AC=C3=AE=C3=A2=C3=A8 =C3=A2 =C3=AF=C3=B0=C3=AE= =C3=A3=C3=B0=C3=A0=C3=AC=C3=A0=C3=B5 =C3=B1=C3=B3=C3=A1=C3=B2=C3=A8=C3=B2= =C3=B0=C3=A0=C3=AC=C3=A8.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEET= WIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "=C3=91&=C3=B3=C3=A1=C3=B2=C3=A8=C3=B2=C3=B0=C3=A8",IDC_SSH= OW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(= 4),14 -END - - -IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "=C3=85=C3=AA=C3=B0=C3=A0=C3=AD" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "=C3=82=C3=A8=C3=B1=C3=AE=C3=AA=C3=A0 =C3=AA=C3=AE=C3=AD=C3=B2= =C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C2=B3=C3=B1=C3=B2=C3=BC",-1,PROPSHEETPADDING= (1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETP= ADDING(1) - LTEXT "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC=C3=A8 =C3=AA=C3=AE=C3=AB=C3= =BC=C3=AE=C3=B0=C2=B3=C3=A2 =C2=B3 =C3=B8=C3=B0=C3=A8=C3=B4=C3=B2=C2=B3=C3= =A2, =C3=BF=C3=AA=C2=B3 =C3=AF=C3=AE=C3=AB=C3=A5=C3=AA=C3=B8=C3=B3=C3=BE=C3= =B2=C3=BC =C3=A7=C3=AE=C3=B0=C3=AE=C3=A2=C3=A5 =C3=B1=C3=AF=C3=B0=C3=A8=C3= =A9=C3=AD=C3=BF=C3=B2=C3=B2=C3=BF =C3=B2=C3=A5=C3=AA=C3=B1=C3=B2=C3=B3.",-1= ,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELL= INE(3) - AUTOCHECKBOX "&=C3=82=C3=A8=C3=B1=C3=AE=C3=AA=C3=A0 =C3=AA=C3=AE=C3=AD= =C3=B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C2=B3=C3=B1=C3=B2=C3=BC",IDC_CONTRAST_= BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),= 14 - PUSHBUTTON "=C3=8D&=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHE= ETPADDING(15),14 - - GROUPBOX "=C3=8F=C3=A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8 =C3=AA= =C3=B3=C3=B0=C3=B1=C3=AE=C3=B0=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(8)+5= ,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) - LTEXT "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B7=C3=A0=C3=B1=C3=B2=C3=AE=C3=B2=C3=A8 =C3=AC=C3=A8=C3=A3=C3= =AE=C3=B2=C2=B3=C3=AD=C3=AD=C3=BF =C2=B3 =C3=B2=C3=AE=C3=A2=C3=B9=C3=A8=C3= =AD=C3=A8 =C3=AA=C3=B3=C3=B0=C3=B1=C3=AE=C3=B0=C3=B3.",-1,PROPSHEETPADDING(= 2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - CTEXT "=C3=97=C3=A0=C3=B1=C3=B2=C3=AE=C3=B2=C3=A0 =C3=AC=C3=A8=C3=A3=C3= =AE=C3=B2=C2=B3=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,= PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "=C3=82=C2=B3=C3=A4=C3=B1=C3=B3=C3=B2=C3=AD=C2=BA",-1,PROPSHEETPAD= DING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C3=A5",-1,PROPSHEETWIDTH-PROPSHEET= PADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) - CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS= _TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING= (20),LABELLINE(2) - CTEXT "=C3=92=C3=AE=C3=A2=C3=B9=C3=A8=C3=AD=C3=A0 =C3=AA=C3=B3=C3=B0=C3= =B1=C3=AE=C3=B0=C3=B3:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH= -PROPSHEETPADDING(4),LABELLINE(1) - LTEXT "=C3=82=C3=B3=C3=A7=C3=BC=C3=AA=C3=A8=C3=A9",-1,PROPSHEETPADDING(3= ),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) - LTEXT "=C3=98=C3=A8=C3=B0=C3=AE=C3=AA=C3=A8=C3=A9",-1,PROPSHEETWIDTH-PRO= PSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) - CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS= _TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDI= NG(20),LABELLINE(2) - LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHE= ETPADDING(4),LABELLINE(1)+5 -END - - -IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "=C3=8C=C3=A8=C3=B8=C3=A0" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "=C3=8A=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=A2= =C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3=AA=C3=AE=C3=AC =C3=AC=C3=A8= =C3=B8=C2=B3 =C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0= =C3=A8",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING= (2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "=C3=8A=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=AC=C3= =A8=C3=B8=C3=A5=C3=BE =C2=B3=C3=A7 =C3=B6=C3=A8=C3=B4=C3=B0=C3=AE=C3=A2=C3= =AE=C2=BF =C3=AF=C3=A0=C3=AD=C3=A5=C3=AB=C2=B3 =C3=AA=C3=AB=C3=A0=C3=A2=C2= =B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8.",-1,PROPSHEETPADDING(2),LABELLINE(2),PRO= PSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&=C3=8A=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF = =C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8",IDC_MO= USE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(= 20),14 - PUSHBUTTON "=C3=8D&=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETP= ADDING(15),14 -END - - -IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "=C3=87=C3=A0=C3=A3=C3=A0=C3=AB=C3=BC=C3=AD=C2=B3" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "=C3=80=C3=A2=C3=B2=C3=AE=C3=AC=C3=A0=C3=B2=C3=A8=C3=B7=C3=AD= =C3=A5 =C3=B1=C3=AA=C3=A8=C3=A4=C3=A0=C3=AD=C3=AD=C3=BF =C3=B1=C3=AF=C3=A5= =C3=B6=C2=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=A8=C3=B5 =C3=AC=C3=AE=C3=A6=C3=AB= =C3=A8=C3=A2=C3=AE=C3=B1=C3=B2=C3=A5=C3=A9",-1,PROPSHEETPADDING(1),LABELLIN= E(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "&=C3=82=C2=B3=C3=A4=C3=AA=C3=AB=C3=BE=C3=B7=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=AF=C3=A5=C3=B6=C2=B3=C3=A0=C3=AB=C3=BC=C3=AD=C2=B3 =C3=AC=C3= =AE=C3=A6=C3=AB=C3=A8=C3=A2=C3=AE=C3=B1=C3=B2=C2=B3 =C3=A2 =C3=B0=C3=A0=C3= =A7=C2=B3 =C3=AF=C3=B0=C3=AE=C3=B1=C3=B2=C3=AE=C3=BE =C3=AF=C3=B0=C3=AE=C3= =B2=C3=BF=C3=A3=C3=AE=C3=AC:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2= )-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPA= DDING(10), LABELLINE(5), - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - GROUPBOX "=C3=91=C3=AF=C3=AE=C3=A2=C2=B3=C3=B9=C3=A5=C3=AD=C3=AD=C3=BF",= -1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LA= BELLINE(5) - AUTOCHECKBOX "&=C3=8F=C3=AE=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=AF=C3=AE=C3=AF=C3=A5=C3=B0=C3=A5=C3=A4=C3=A6=C3=A5=C3=AD=C3=AD=C3= =BF =C3=AF=C3=B0=C3=A8 =C3=A2=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3= =AD=C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",IDC_NOTIFICATION_MESSAGE,PR= OPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "=C3=8F&=C3=AE=C3=A4=C3=A0=C3=A2=C3=A0=C3=B2=C3=A8 =C3=A7= =C3=A2=C3=B3=C3=AA=C3=AE=C3=A2=C3=A8=C3=A9 =C3=B1=C3=A8=C3=A3=C3=AD=C3=A0= =C3=AB =C3=AF=C3=B0=C3=A8 =C3=A7=C3=AC=C2=B3=C3=AD=C2=B3 =C3=B0=C3=A5=C3=A6= =C3=A8=C3=AC=C3=B3",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10= )-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "=C3=80=C3=AB=C3=BC=C3=B2=C3=B0=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2= =C3=A8=C3=A2=C3=AD=C2=B3 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C2=BF = =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROP= SHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A0=C3=AB=C3=BC=C3=B2=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2=C3=A8=C3= =A2=C3=AD=C3=A8=C3=B5 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C2=BF=C3= =A2 =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3, =C3=BF=C3=AA=C2=B3 =C3=A7=C3=A0=C3=AC= =C2=B3=C3=AD=C3=BF=C3=BE=C3=B2=C3=BC =C3=AC=C3=A8=C3=B8=C3=B3 =C2=B3 =C3=AA= =C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=B3.",-1,PROPSHEETPADDIN= G(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - AUTOCHECKBOX "&=C3=80=C3=AB=C3=BC=C3=B2=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2=C3= =A8=C3=A2=C3=AD=C2=B3 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C2=BF =C3= =A2=C3=A2=C3=AE=C3=A4=C3=B3",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(1= 6)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 - PUSHBUTTON "&=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEE= TPADDING(15),14 - - GROUPBOX "=C3=80=C3=A4=C3=AC=C2=B3=C3=AD=C2=B3=C3=B1=C3=B2=C3=B0=C3=A0= =C3=B2=C3=A8=C3=A2=C3=AD=C2=B3 =C3=AF=C3=A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2= =C3=B0=C3=A8",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHE= ETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "=C3=87=C3=A0=C3=B1&=C3=B2=C3=AE=C3=B1=C3=B3=C3=A2=C3=A0=C3= =B2=C3=A8 =C3=A4=C3=AE =C3=B0=C3=AE=C3=A1=C3=AE=C3=B7=C3=AE=C3=A3=C3=AE =C3= =B1=C3=B2=C3=AE=C3=AB=C3=A0 =C3=A2=C3=B5=C3=AE=C3=A4=C3=B3 =C3=A4=C3=AE =C3= =B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC=C3=A8",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDI= NG(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&=C3=87=C3=A0=C3=B1=C3=B2=C3=AE=C3=B1=C3=AE=C3=A2=C3=B3=C3= =A2=C3=A0=C3=B2=C3=A8 =C3=A4=C3=AB=C3=BF =C3=A2=C3=B1=C2=B3=C3=B5 =C3=AD=C3= =AE=C3=A2=C3=A8=C3=B5 =C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=B3=C3=A2=C3= =A0=C3=B7=C2=B3=C3=A2",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22= )-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 -END - - -IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3 =C3=A7=C3=A0=C3=AB=C3=A8=C3= =AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "=C3=8D=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3= =AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 SHIFT 5 =C3=B0=C3=A0=C3=A7=C2=B3=C3= =A2 =C3=A0=C3=AA=C3=B2=C3=A8=C3=A2=C3=B3=C2=BA =C3=B0=C3=A5=C3=A6=C3=A8=C3= =AC =C3=A7=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3= =A0=C3=A2=C2=B3=C3=B8.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-= PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B1=C3= =AF=C3=AE=C3=B1=C2=B3=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3= =AD=C3=AD=C3=BF",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)= +2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "=C3=8F=C3=A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8",-1,PRO= PSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(= 4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&=C3=99=C3=AE=C3=A1 =C3=A7=C3=A0=C3=A1=C3=AB=C3=AE=C3=AA= =C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B1=C3=AB=C3=B3=C3=A6=C3=A1=C3=AE=C3=A2= =C3=B3 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C3=B3, =C3=AD=C3=A0=C3=B2=C3=A8= =C3=B1=C3=AD=C2=B3=C3=B2=C3=BC =C2=BF=C2=BF =C3=A4=C3=A2=C2=B3=C3=B7=C2=B3"= ,IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-P= ROPSHEETPADDING(4),14 - AUTOCHECKBOX "&=C3=82=C3=A8=C3=AC=C3=A8=C3=AA=C3=A0=C3=B2=C3=A8 =C3=A7= =C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2= =C2=B3=C3=B8 =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF= =C3=AC =C3=A4=C3=A2=C3=AE=C3=B5 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8 =C3=AE= =C3=A4=C3=AD=C3=AE=C3=B7=C3=A0=C3=B1=C3=AD=C3=AE",IDC_STICKY_UNLOCK_CHECK,P= ROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "=C2=B2=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD= =C3=AD=C3=BF",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEET= PADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&=C3=87=C3=A2=C3=B3=C3=AA=C3=AE=C3=A2=C3=A8=C3=A9 =C3=B1= =C3=A8=C3=A3=C3=AD=C3=A0=C3=AB =C3=AF=C3=B0=C3=A8 =C3=AD=C3=A0=C3=B2=C3=A8= =C3=B1=C3=AA=C3=A0=C3=AD=C3=B1=C3=AD=C3=A5=C3=AD=C3=AD=C2=B3 =C3=B1=C3=AB= =C3=B3=C3=A6=C3=A1=C3=AE=C3=A2=C3=AE=C2=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3= =C3=B8=C2=B3",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PR= OPSHEETWIDTH-PROPSHEETPADDING(4),14 - AUTOCHECKBOX "&=C3=8F=C3=AE=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=B2=C3=A0=C3=AD =C3=87=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3= =AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8 =C3=AD=C3=A0 =C3=A5=C3=AA=C3= =B0=C3=A0=C3=AD=C2=B3",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLIN= E(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3 =C3=B4=C2=B3=C3=AB=C3=BC=C3= =B2=C3=B0=C3=A0=C3=B6=C2=B3=C2=BF" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "=C3=82=C3=A8=C3=AA=C3=AB=C3=A8=C3=AA=C3=AE=C3=AC =C3=A7 =C3=AA=C3= =AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8 =C2=BA \n=C3=93=C3=B2= =C3=B0=C3=A8=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=AF=C3=B0=C3=A0= =C3=A2=C3=AE=C2=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 <Shift> =C3= =A2=C3=AF=C3=B0=C3=AE=C3=A4=C3=AE=C3=A2=C3=A6 8 =C3=B1=C3=A5=C3=AA=C3=B3=C3= =AD=C3=A4",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADD= ING(4),LABELLINE(3) - AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B8=C3= =A2=C3=A8=C3=A4=C3=AA=C3=A8=C3=A9 =C3=A2=C3=A8=C3=AA=C3=AB=C3=A8=C3=AA",IDC= _FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PR= OPSHEETPADDING(20),14 - - GROUPBOX "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD= =C3=AD=C3=BF =C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=B3",-1,PROPSHEETPADDIN= G(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 - AUTORADIOBUTTON "&=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=B2= =C3=A8 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=AD=C2=B3 =C3=AD=C3=A0=C3=B2= =C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3= =C3=B8",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEE= TPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP - AUTORADIOBUTTON "=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=B2= =C3=A8 &=C3=AA=C3=AE=C3=B0=C3=AE=C3=B2=C3=AA=C3=AE=C3=B7=C3=A0=C3=B1=C3=AD= =C2=B3 =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF =C2=B3 = =C3=A7=C3=AC=C3=A5=C3=AD=C3=B8=C3=A8=C3=B2=C3=A8 =C3=B7=C3=A0=C3=B1=C3=B2= =C3=AE=C3=B2=C3=B3 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD= =C3=BF",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHE= ETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE - PUSHBUTTON "&=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PR= OPSHEETPADDING(15),14,WS_GROUP - PUSHBUTTON "=C3=8D=C3=A0&=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,P= ROPSHEETPADDING(15),14,WS_GROUP - LTEXT "=C3=8D&=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C2=B3=C3=B2=C3=BC =C3=B2=C3= =B3=C3=B2 =C3=B9=C3=AE=C3=A1 =C3=AF=C3=A5=C3=B0=C3=A5=C3=A2=C2=B3=C3=B0=C3= =A8=C3=B2=C3=A8 =C3=AD=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3= =AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PRO= PSHEETPADDING(4),LABELLINE(1) - EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSH= EETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL - - GROUPBOX "=C2=B2=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD= =C3=AD=C3=BF",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHE= ETPADDING(2),LABELLINE(4)+3 - AUTOCHECKBOX "&=C3=8F=C3=AE=C3=A4=C3=A0=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2= =C3=AE=C3=AD, =C3=AA=C3=AE=C3=AB=C3=A8 =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA= =C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 =C3=AF= =C3=B0=C3=A8=C3=A9=C3=AD=C3=BF=C3=B2=C3=AE",IDC_FILTER_SOUND_CHECK,PROPSHEE= TPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - AUTOCHECKBOX "=C3=8F=C3=AE&=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=B2=C3=A0=C3=AD '=C3=94=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3= =B6=C2=B3=C2=BF =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3' =C3=AD=C3=A0 =C3=A5=C3=AA= =C3=B0=C3=A0=C3=AD=C2=B3",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABEL= LINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=8E=C3=A7=C3=A2=C3=B3=C3=B7=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3= =BF =C3=AF=C3=A5=C3=B0=C3=A5=C3=AA=C3=AB=C3=BE=C3=B7=C3=A5=C3=AD=C3=AD=C3= =BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C2=B3=C3=A2" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "=C3=84=C3=AB=C3=BF =C3=B8=C3=A2=C3=A8=C3=AA=C3=AE=C2=BF =C3=A0=C3= =AA=C3=B2=C3=A8=C3=A2=C3=A0=C3=B6=C2=B3=C2=BF\n=C3=93=C3=B2=C3=B0=C3=A8=C3= =AC=C3=B3=C3=A9=C3=B2=C3=A5 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C3=B3 <Num= Lock> =C3=A2=C3=AF=C3=B0=C3=AE=C3=A4=C3=AE=C3=A2=C3=A6 =C3=AF'=C3=BF=C3=B2= =C3=A8 =C3=B1=C3=A5=C3=AA=C3=B3=C3=AD=C3=A4.",-1,PROPSHEETPADDING(2),LABELL= INE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "=C3=82=C3=A8=C3=AA=C3=AE&=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B8=C3= =A2=C3=A8=C3=AA=C3=A4=C3=A8=C3=A9 =C3=A2=C3=A8=C3=AA=C3=AB=C3=A8=C3=AA",IDC= _TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PR= OPSHEETPADDING(4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A2=C3=A8=C3=B1=C3=AE=C3=AA=C3=AE=C2=BF =C3=AA=C3=AE=C3=AD=C3= =B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C3=AE=C3=B1=C3=B2=C2=B3" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "=C3=84=C3=AB=C3=BF =C3=A0=C3=AA=C3=B2=C3=A8=C3=A2=C3=A0=C3=B6=C2= =B3=C2=BF \n=C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C2=B3=C3=B2=C3=BC <ALT =C3= =A7=C3=AB=C2=B3=C3=A2=C3=A0+SHIFT =C3=A7=C3=AB=C2=B3=C3=A2=C3=A0 +PRINT SCR= EEN>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(= 4),LABELLINE(3) - AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B1=C3= =AF=C3=AE=C3=B1=C2=B3=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3= =AD=C3=AD=C3=BF",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(= 5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "=C3=AA=C3=AE=C3=AD=C3=B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C3=A0 = =C3=B1=C3=B5=C3=A5=C3=AC=C3=A0 =C3=AE=C3=B4=C3=AE=C3=B0=C3=AC=C3=AB=C3=A5= =C3=AD=C3=AD=C3=BF",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROP= SHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - LTEXT "=C3=8F=C3=AE=C3=B2=C3=AE=C3=B7=C3=AD=C3=A0 =C3=AA=C3=AE=C3=AD=C3= =B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C3=A0 =C3=B1=C3=B5=C3=A5=C3=AC=C3=A0 =C3= =AE=C3=B4=C3=AE=C3=B0=C3=AC=C3=AB=C3=A5=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPAD= DING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPS= HEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABS= TOP - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0 =C3=AA=C3= =A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=A2=C3=AA=C3=A0=C3=A7=C2= =B3=C3=A2=C3=AD=C3=A8=C3=AA=C3=AE=C3=AC =C2=B3=C3=A7 =C3=AA=C3=AB=C3=A0=C3= =A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "=C3=99=C3=AE=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=B3=C3= =B2=C3=A8 =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC =C3=AA=C3=A5=C3=B0=C3=B3=C3=A2=C3= =A0=C3=AD=C3=AD=C3=BF =C3=A2=C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3= =AA=C3=AE=C3=AC =C2=B3=C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3= =B3=C3=B0=C3=A8: \n=C3=8D=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C2=B3=C3=B2=C3=BC = =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 <ALT =C3=A7=C3=AB=C2=B3=C3=A2=C3= =A0+SHIFT =C3=A7=C3=AB=C2=B3=C3=A2=C3=A0 + NUM LOCK>.",-1,PROPSHEETPADDING(= 2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) - AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B1=C3= =AF=C3=AE=C3=B1=C2=B3=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3= =AD=C3=AD=C3=BF",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE= (5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - GROUPBOX "=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C2=B3=C3=B1=C3=B2=C3=BC =C3=B0= =C3=B3=C3=B5=C3=B3 =C3=A2=C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3=AA= =C3=A0",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING= (2),LABELLINE(9) - - LTEXT "&=C3=8D=C3=A0=C3=A9=C3=A1=C2=B3=C3=AB=C3=BC=C3=B8=C3=A0:",-1,PROP= SHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) - LTEXT "=C3=AD=C3=A8=C3=A6=C3=B7=C3=A5",-1,PROPSHEETPADDING(11),LABELLINE= (10)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS |= WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPA= DDING(22),LABELLINE(2) - LTEXT "=C3=A2=C3=A8=C3=B9=C3=A5",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),L= ABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) - - LTEXT "&=C3=8F=C3=B0=C3=A8=C3=B1=C3=AA=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3= =BF:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(= 1) - LTEXT "=C3=AD=C3=A8=C3=A6=C3=B7=C3=A5",-1,PROPSHEETPADDING(11),LABELLINE= (13)+4,PROPSHEETPADDING(3),LABELLINE(1) - CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS |= WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPA= DDING(22),LABELLINE(2) - LTEXT "=C3=A2=C3=A8=C3=B9=C3=A5",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),L= ABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) - - AUTOCHECKBOX "CTRL - =C3=AF=C3=B0=C3=A8=C3=B1&=C3=AA=C3=AE=C3=B0=C3=A5= =C3=AD=C3=AD=C3=BF, SHIFT - =C3=B3=C3=AF=C3=AE=C3=A2=C2=B3=C3=AB=C3=BC=C3= =A5=C3=AD=C3=AD=C3=BF",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELL= INE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - LTEXT "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3=A2=C3= =B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=AA=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3= =A8, =C3=BF=C3=AA=C3=B9=C3=AE NumLock:",-1,PROPSHEETPADDING(1),LABELLINE(18= )+7,PROPSHEETPADDING(20),LABELLINE(1) - AUTORADIOBUTTON "=C3=93=C3=A2=C2=B3&=C3=AC=C3=AA=C3=AD=C3=B3=C3=B2=C3=AE= ",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+= 7,PROPSHEETPADDING(5),LABELLINE(1) - AUTORADIOBUTTON "=C3=A2&=C3=A8=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AE",IDC_= MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROP= SHEETPADDING(5),LABELLINE(1) - - AUTOCHECKBOX "=C3=8F&=C3=AE=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=B2=C3=A0=C3=AD =C3=AA=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A2=C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3=AA=C3=AE=C3= =AC =C3=AD=C3=A0 =C3=A5=C3=AA=C3=B0=C3=A0=C3=AD=C2=B3",IDC_MOUSEKEYS_STATUS= _CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(= 4),14 - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=84=C3=AE=C3=A4=C3=A0=C3=B2=C3=AA=C3=AE=C3=A2=C2=B3 =C3=AF=C3= =A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8 =C3=B0=C3=A5=C3=A6=C3=A8=C3= =AC=C3=B3 =C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3=B6=C2=B3=C2=BF" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=8F=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B1=C3=A8=C3=AC=C3=A2=C3=AE=C3=AB=C2=B3=C3=A2",-1,PROPSHEETPADDING(1),LA= BELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "&=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3= =AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3= =A0=C3=A2=C2=B3=C3=B8, =C3=BF=C3=AA=C2=B3 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3= =B0=C3=BE=C3=BE=C3=B2=C3=BC=C3=B1=C3=BF =C3=B7=C3=A0=C3=B1=C3=B2=C2=B3=C3= =B8=C3=A5 =C3=AD=C2=B3=C3=A6:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSH= EETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PRO= PSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - LTEXT "&=C3=8F=C3=A5=C3=B0=C3=A5=C3=A2=C2=B3=C3=B0=C3=AA=C3=A0:",-1,PROP= SHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) - EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEE= TWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=84=C3=AE=C3=A4=C3=A0=C3=B2=C3=AA=C3=AE=C3=A2=C2=B3 =C3=AF=C3= =A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8 =C3=B0=C3=A5=C3=A6=C3=A8=C3= =AC=C3=B3 =C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3=B6=C2=B3=C2=BF" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=8F=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B1=C3=A8=C3=AC=C3=A2=C3=AE=C3=AB=C2=B3=C3=A2",-1,PROPSHEETPADDING(1),LA= BELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) - LTEXT "=C3=87=C3=AC=C2=B3=C3=AD=C3=A0 =C3=AF=C3=A0=C3=B0=C3=A0=C3=AC=C3= =A5=C3=B2=C3=B0=C2=B3=C3=A2 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3= =B3=C3=B0=C3=A8 =C3=AD=C3=A0 =C3=AF=C3=A0=C3=AD=C3=A5=C3=AB=C2=B3 =C3=AA=C3= =A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(2),LABE= LLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - AUTORADIOBUTTON "&=C3=AD=C3=A5 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3= =BE=C3=A2=C3=A0=C3=B2=C3=A8",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),= LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP - AUTORADIOBUTTON "&=C3=B3=C3=AF=C3=AE=C3=A2=C2=B3=C3=AB=C3=BC=C3=AD=C3=A5= =C3=AD=C3=AD=C3=BF =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C2=B3=C3=A2",IDC_RE= PEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) - - LTEXT "&=C3=87=C3=A0=C3=B2=C3=B0=C3=A8=C3=AC=C3=AA=C3=A0 =C3=AF=C3=A5=C3= =B0=C3=A5=C3=A4 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3= =BF=C3=AC:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABE= LLINE(1) - COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PR= OPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - LTEXT "&=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C2=B3=C3=B1=C3=B2=C3=BC =C3=AF=C3= =AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(4= ),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) - COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, = PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - GROUPBOX "=C3=8F=C3=AE=C3=A2=C2=B3=C3=AB=C3=BC=C3=AD=C3=A5 =C3=AD=C3=A0= =C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2= =C2=B3=C3=B8",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEET= PADDING(2),LABELLINE(4)+4 - LTEXT "&=C3=93=C3=B2=C3=B0=C3=A8=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3= =BF =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C3=B3=C3=B2=C3=AE=C2=BF =C3=AA=C3= =AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3:",-1,PROPSHEETPADDING(2),LABELLINE(15),PR= OPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) - COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PR= OPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - LTEXT "&=C3=8F=C3=A5=C3=B0=C3=A5=C3=A2=C2=B3=C3=B0=C3=AA=C3=A0:",-1,PROP= SHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) - EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPS= HEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0 =C3=A0=C3= =AB=C3=BC=C3=B2=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2=C3=A8=C3=A2=C3=AD=C3=AE=C3=A3= =C3=AE =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C3=BE =C3=A2=C3=A2=C3=AE= =C3=A4=C3=B3" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "=C3=AF=C3=AE=C3=B1=C3=AB=C2=B3=C3=A4=C3=AE=C3=A2=C3=AD=C3=A8= =C3=A9 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C2=B3=C3=A9 =C3=A2=C3=A2=C3=AE= =C3=A4=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETP= ADDING(2),LABELLINE(10) - LTEXT "=C3=93=C3=AA=C3=A0=C3=A6=C2=B3=C3=B2=C3=BC =C3=AF=C3=AE=C3=B0=C3= =B2, =C3=A4=C3=AE =C3=BF=C3=AA=C3=AE=C3=A3=C3=AE =C3=AF=C2=B3=C3=A4=C3=AA= =C3=AB=C3=BE=C3=B7=C3=A5=C3=AD=C3=AE =C3=A0=C3=AB=C3=BC=C3=B2=C3=A5=C3=B0= =C3=AD=C3=A0=C3=B2=C3=A8=C3=A2=C3=AD=C3=A8=C3=A9 =C3=AF=C3=B0=C3=A8=C3=B1= =C3=B2=C3=B0=C2=B3=C3=A9 =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3.",-1,PROPSHEETPADDI= NG(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - - LTEXT "&=C3=8F=C3=AE=C3=B1=C3=AB=C2=B3=C3=A4=C3=AE=C3=A2=C3=AD=C3=A8=C3= =A9 =C3=AF=C3=AE=C3=B0=C3=B2:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSH= EETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4)+7, PRO= PSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - LTEXT "&=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C2=B3=C3=B1=C3=B2=C3=BC:",-1,PROP= SHEETPADDING(2),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) - COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8)+2, PRO= PSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), - CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - - DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "=C3=91=C3=AF=C3=A5=C3=B6=C2=B3=C3=A0=C3=AB=C3=BC=C3= =AD=C2=B3 =C3=AC=C3=AE=C3=A6=C3=AB=C3=A8=C3=A2=C3=AE=C3=B1=C3=B2=C2=B3" - IDS_CPLSYSTEMDESCRIPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3= =A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=B1=C3=AF=C3=A5=C3=B6=C2=B3=C3=A0=C3=AB=C3= =BC=C3=AD=C3=A8=C3=B5 =C3=AC=C3=AE=C3=A6=C3=AB=C3=A8=C3=A2=C3=AE=C3=B1=C3= =B2=C3=A5=C3=A9 =C3=82=C3=A0=C3=B8=C3=AE=C3=A3=C3=AE =C3=AA=C3=AE=C3=AC=C3= =AF'=C3=BE=C3=B2=C3=A5=C3=B0=C3=A0." - - IDS_SENTRY_NONE "[=C3=AD=C3=A5=C3=AC=C3=A0=C2=BA]" - IDS_SENTRY_TITLE "=C3=8F=C2=B3=C3=A4=C3=B1=C3=A2=C2=B3=C3=B7=C3=B3=C3=A2= =C3=A0=C3=B2=C3=A8 =C3=A7=C3=A0=C3=A3=C3=AB=C3=AE=C3=A2=C3=AE=C3=AA" - IDS_SENTRY_WINDOW "=C3=8F=C2=B3=C3=A4=C3=B1=C3=A2=C2=B3=C3=B7=C3=B3=C3= =A2=C3=A0=C3=B2=C3=A8 =C3=A0=C3=AA=C3=B2=C3=A8=C3=A2=C3=AD=C3=A5 =C3=A2=C2= =B3=C3=AA=C3=AD=C3=AE" - IDS_SENTRY_DISPLAY "=C3=8F=C2=B3=C3=A4=C3=B1=C3=A2=C2=B3=C3=B7=C3=B3=C3= =A2=C3=A0=C3=B2=C3=A8 =C3=B0=C3=AE=C3=A1=C3=AE=C3=B7=C3=A8=C3=A9 =C3=B1=C3= =B2=C2=B3=C3=AB" - - IDS_SECONDS "=C3=B1=C3=A5=C3=AA=C3=B3=C3=AD=C3=A4" - IDS_MINUTES "=C3=B5=C3=A2=C3=A8=C3=AB=C3=A8=C3=AD" -END +/* + * PROJECT: Accessibility Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/access/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Accessibility Control Panel A= pplet + * TRANSLATOR: Rostislav Zabolotny + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "=C3=8A=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A0" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "=C3=87=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA= =C3=AB=C3=A0=C3=A2=C2=B3=C3=B8",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHE= ETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "=C3=82=C3=A2=C3=A5=C3=A4=C3=A5=C3=AD=C3=AD=C3=BF =C3=AA=C3=AE=C3= =AC=C3=A1=C2=B3=C3=AD=C3=A0=C3=B6=C2=B3=C3=A9 =C3=A7 =C3=AA=C3=AB=C3=A0=C3= =A2=C2=B3=C3=B8=C3=A0=C3=AC=C3=A8 Shift, Ctrl =C3=B7=C3=A8 Alt, =C3=AD=C3= =A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=BE=C3=B7=C3=A8 =C3=AA=C3=AB=C3=A0=C3= =A2=C2=B3=C3=B8=C2=B3 =C3=AF=C3=AE=C3=B1=C3=AB=C2=B3=C3=A4=C3=AE=C3=A2=C3= =AD=C3=AE.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPAD= DING(4),LABELLINE(3) + AUTOCHECKBOX "&=C3=87=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF = =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8",IDC_STICKY_BOX,PROPSHEETPADDING(2),LA= BELLINE(5)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "&=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(5)+6,PROPSHE= ETPADDING(15)-5,14 + + GROUPBOX "=C3=94=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3=B6=C2=B3=C3=BF = =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPS= HEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3= =BF =C3=A2=C3=A8=C3=AF=C3=A0=C3=A4=C3=AA=C3=AE=C3=A2=C3=A8=C3=B5 =C3=AA=C3= =AE=C3=B0=C3=AE=C3=B2=C3=AA=C3=AE=C3=B7=C3=A0=C3=B1=C3=AD=C3=A8=C3=B5 =C3= =A0=C3=A1=C3=AE =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=BE=C3=A2=C3=A0=C3= =AD=C3=A8=C3=B5 =C3=A7=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=BC =C3= =AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,= PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 &=C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3= =A0=C3=B6=C2=B3=C3=BE =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3",IDC_FILTER_BOX,PROPSH= EETPADDING(2),LABELLINE(13)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "=C3=8D&=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(13)+6,PROPSH= EETPADDING(15)-5,14 + + GROUPBOX "=C3=8E=C3=A7=C3=A2=C3=B3=C3=B7=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD= =C3=BF =C3=AF=C3=A5=C3=B0=C3=A5=C3=AA=C3=AB=C3=BE=C3=B7=C3=A5=C3=AD=C3=AD= =C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C2=B3=C3=A2",-1,PROPSHEETPADDING(1),L= ABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPAD= DING(1) + LTEXT "=C3=8F=C3=B0=C3=A8 =C3=A7=C3=AC=C2=B3=C3=AD=C2=B3 =C3=B1=C3=B2=C3= =A0=C3=AD=C3=B3 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8 Caps Lock, Num Lock = =C2=B3 Scroll Lock =C3=A7=C3=A2=C3=B3=C3=B7=C3=A8=C3=B2=C3=BC =C3=B1=C3=A8= =C3=A3=C3=AD=C3=A0=C3=AB.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEET= WIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "&=C3=8E=C3=A7=C3=A2=C3=B3=C3=B7=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDT= H-PROPSHEETPADDING(20),14 + PUSHBUTTON "=C3=8D=C3=A0&=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSH= EETPADDING(15)-5,14 + + AUTOCHECKBOX "&=C3=84=C3=AE=C3=A4=C3=A0=C3=B2=C3=AA=C3=AE=C3=A2=C2=B3 = =C3=A2=C2=B3=C3=A4=C3=AE=C3=AC=C3=AE=C3=B1=C3=B2=C2=B3 =C3=AF=C3=B0=C3=AE = =C3=B0=C3=AE=C3=A1=C3=AE=C3=B2=C3=B3 =C2=B3=C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2= =C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=AE=C3=BE",IDC_KEYBOARD_EXTRA,PROPSHEETPAD= DING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "=C3=87=C3=A2=C3=B3=C3=AA" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "=C3=82=C2=B3=C3=A7=C3=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=A5 =C2=B3= =C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF",-1,PROP= SHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1= 0)+PROPSHEETPADDING(1) + LTEXT "=C3=87=C3=A2=C3=B3=C3=AA=C3=AE=C3=A2=C2=B3 =C3=B1=C3=A8=C3=A3=C3= =AD=C3=A0=C3=AB=C3=A8 =C3=B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC=C3=A8 =C3=B1=C3= =B3=C3=AF=C3=B0=C3=AE=C3=A2=C3=AE=C3=A4=C3=A6=C3=B3=C3=BE=C3=B2=C3=BC=C3=B1= =C3=BF =C3=A2=C2=B3=C3=A7=C3=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=AE=C3=BE =C2=B3= =C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=A0=C3=B6=C2=B3=C2=BA=C3=BE.",-1,PROPSHEET= PADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "=C3=82&=C2=B3=C3=A7=C3=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=A5 = =C2=B3=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF",I= DC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+2,14 + LTEXT "=C2=B2=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=B3=C3=A2=C3=A0=C3=B7=C3=A0:", I= DC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEET= PADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETW= IDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_= VISIBLE | WS_TABSTOP + + GROUPBOX "=C3=91=C3=B3=C3=A1=C3=B2=C3=A8=C3=B2=C3=B0=C3=A8",-1,PROPSHEET= PADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "=C3=91=C3=B3=C3=AF=C3=B0=C3=AE=C3=A2=C2=B3=C3=A4 =C3=A7=C3=A2=C3= =B3=C3=AA=C3=B3 =C2=B3 =C3=AC=C3=AE=C3=A2=C3=A8 =C3=A2 =C3=AF=C3=B0=C3=AE= =C3=A3=C3=B0=C3=A0=C3=AC=C3=A0=C3=B5 =C3=B1=C3=B3=C3=A1=C3=B2=C3=A8=C3=B2= =C3=B0=C3=A0=C3=AC=C3=A8.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEET= WIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "=C3=91&=C3=B3=C3=A1=C3=B2=C3=A8=C3=B2=C3=B0=C3=A8",IDC_SSH= OW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(= 4),14 +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "=C3=85=C3=AA=C3=B0=C3=A0=C3=AD" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "=C3=82=C3=A8=C3=B1=C3=AE=C3=AA=C3=A0 =C3=AA=C3=AE=C3=AD=C3=B2= =C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C2=B3=C3=B1=C3=B2=C3=BC",-1,PROPSHEETPADDING= (1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETP= ADDING(1) + LTEXT "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC=C3=A8 =C3=AA=C3=AE=C3=AB=C3= =BC=C3=AE=C3=B0=C2=B3=C3=A2 =C2=B3 =C3=B8=C3=B0=C3=A8=C3=B4=C3=B2=C2=B3=C3= =A2, =C3=BF=C3=AA=C2=B3 =C3=AF=C3=AE=C3=AB=C3=A5=C3=AA=C3=B8=C3=B3=C3=BE=C3= =B2=C3=BC =C3=A7=C3=AE=C3=B0=C3=AE=C3=A2=C3=A5 =C3=B1=C3=AF=C3=B0=C3=A8=C3= =A9=C3=AD=C3=BF=C3=B2=C3=B2=C3=BF =C3=B2=C3=A5=C3=AA=C3=B1=C3=B2=C3=B3.",-1= ,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELL= INE(3) + AUTOCHECKBOX "&=C3=82=C3=A8=C3=B1=C3=AE=C3=AA=C3=A0 =C3=AA=C3=AE=C3=AD= =C3=B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C2=B3=C3=B1=C3=B2=C3=BC",IDC_CONTRAST_= BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),= 14 + PUSHBUTTON "=C3=8D&=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHE= ETPADDING(15),14 + + GROUPBOX "=C3=8F=C3=A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8 =C3=AA= =C3=B3=C3=B0=C3=B1=C3=AE=C3=B0=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(8)+5= ,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B7=C3=A0=C3=B1=C3=B2=C3=AE=C3=B2=C3=A8 =C3=AC=C3=A8=C3=A3=C3= =AE=C3=B2=C2=B3=C3=AD=C3=AD=C3=BF =C2=B3 =C3=B2=C3=AE=C3=A2=C3=B9=C3=A8=C3= =AD=C3=A8 =C3=AA=C3=B3=C3=B0=C3=B1=C3=AE=C3=B0=C3=B3.",-1,PROPSHEETPADDING(= 2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "=C3=97=C3=A0=C3=B1=C3=B2=C3=AE=C3=B2=C3=A0 =C3=AC=C3=A8=C3=A3=C3= =AE=C3=B2=C2=B3=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,= PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "=C3=82=C2=B3=C3=A4=C3=B1=C3=B3=C3=B2=C3=AD=C2=BA",-1,PROPSHEETPAD= DING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C3=A5",-1,PROPSHEETWIDTH-PROPSHEET= PADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_BLINK_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS= _TABSTOP,PROPSHEETPADDING(10),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING= (20),LABELLINE(2) + CTEXT "=C3=92=C3=AE=C3=A2=C3=B9=C3=A8=C3=AD=C3=A0 =C3=AA=C3=B3=C3=B0=C3= =B1=C3=AE=C3=B0=C3=B3:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH= -PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "=C3=82=C3=B3=C3=A7=C3=BC=C3=AA=C3=A8=C3=A9",-1,PROPSHEETPADDING(3= ),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "=C3=98=C3=A8=C3=B0=C3=AE=C3=AA=C3=A8=C3=A9",-1,PROPSHEETWIDTH-PRO= PSHEETPADDING(9),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + CONTROL "",IDC_CURSOR_WIDTH_TRACK,"msctls_trackbar32",TBS_AUTOTICKS | WS= _TABSTOP,PROPSHEETPADDING(10),LABELLINE(18)+5,PROPSHEETWIDTH-PROPSHEETPADDI= NG(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHE= ETPADDING(4),LABELLINE(1)+5 +END + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "=C3=8C=C3=A8=C3=B8=C3=A0" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "=C3=8A=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=A2= =C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3=AA=C3=AE=C3=AC =C3=AC=C3=A8= =C3=B8=C2=B3 =C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0= =C3=A8",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING= (2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "=C3=8A=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=AC=C3= =A8=C3=B8=C3=A5=C3=BE =C2=B3=C3=A7 =C3=B6=C3=A8=C3=B4=C3=B0=C3=AE=C3=A2=C3= =AE=C2=BF =C3=AF=C3=A0=C3=AD=C3=A5=C3=AB=C2=B3 =C3=AA=C3=AB=C3=A0=C3=A2=C2= =B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8.",-1,PROPSHEETPADDING(2),LABELLINE(2),PRO= PSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&=C3=8A=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF = =C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8",IDC_MO= USE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(= 20),14 + PUSHBUTTON "=C3=8D&=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETP= ADDING(15),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "=C3=87=C3=A0=C3=A3=C3=A0=C3=AB=C3=BC=C3=AD=C2=B3" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "=C3=80=C3=A2=C3=B2=C3=AE=C3=AC=C3=A0=C3=B2=C3=A8=C3=B7=C3=AD= =C3=A5 =C3=B1=C3=AA=C3=A8=C3=A4=C3=A0=C3=AD=C3=AD=C3=BF =C3=B1=C3=AF=C3=A5= =C3=B6=C2=B3=C3=A0=C3=AB=C3=BC=C3=AD=C3=A8=C3=B5 =C3=AC=C3=AE=C3=A6=C3=AB= =C3=A8=C3=A2=C3=AE=C3=B1=C3=B2=C3=A5=C3=A9",-1,PROPSHEETPADDING(1),LABELLIN= E(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "&=C3=82=C2=B3=C3=A4=C3=AA=C3=AB=C3=BE=C3=B7=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=AF=C3=A5=C3=B6=C2=B3=C3=A0=C3=AB=C3=BC=C3=AD=C2=B3 =C3=AC=C3= =AE=C3=A6=C3=AB=C3=A8=C3=A2=C3=AE=C3=B1=C3=B2=C2=B3 =C3=A2 =C3=B0=C3=A0=C3= =A7=C2=B3 =C3=AF=C3=B0=C3=AE=C3=B1=C3=B2=C3=AE=C3=BE =C3=AF=C3=B0=C3=AE=C3= =B2=C3=BF=C3=A3=C3=AE=C3=AC:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2= )-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPA= DDING(10), LABELLINE(5), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + GROUPBOX "=C3=91=C3=AF=C3=AE=C3=A2=C2=B3=C3=B9=C3=A5=C3=AD=C3=AD=C3=BF",= -1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LA= BELLINE(5) + AUTOCHECKBOX "&=C3=8F=C3=AE=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=AF=C3=AE=C3=AF=C3=A5=C3=B0=C3=A5=C3=A4=C3=A6=C3=A5=C3=AD=C3=AD=C3= =BF =C3=AF=C3=B0=C3=A8 =C3=A2=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3= =AD=C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",IDC_NOTIFICATION_MESSAGE,PR= OPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "=C3=8F&=C3=AE=C3=A4=C3=A0=C3=A2=C3=A0=C3=B2=C3=A8 =C3=A7= =C3=A2=C3=B3=C3=AA=C3=AE=C3=A2=C3=A8=C3=A9 =C3=B1=C3=A8=C3=A3=C3=AD=C3=A0= =C3=AB =C3=AF=C3=B0=C3=A8 =C3=A7=C3=AC=C2=B3=C3=AD=C2=B3 =C3=B0=C3=A5=C3=A6= =C3=A8=C3=AC=C3=B3",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10= )-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "=C3=80=C3=AB=C3=BC=C3=B2=C3=B0=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2= =C3=A8=C3=A2=C3=AD=C2=B3 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C2=BF = =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROP= SHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A0=C3=AB=C3=BC=C3=B2=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2=C3=A8=C3= =A2=C3=AD=C3=A8=C3=B5 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C2=BF=C3= =A2 =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3, =C3=BF=C3=AA=C2=B3 =C3=A7=C3=A0=C3=AC= =C2=B3=C3=AD=C3=BF=C3=BE=C3=B2=C3=BC =C3=AC=C3=A8=C3=B8=C3=B3 =C2=B3 =C3=AA= =C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=B3.",-1,PROPSHEETPADDIN= G(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "&=C3=80=C3=AB=C3=BC=C3=B2=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2=C3= =A8=C3=A2=C3=AD=C2=B3 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C2=BF =C3= =A2=C3=A2=C3=AE=C3=A4=C3=B3",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(1= 6)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "&=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEE= TPADDING(15),14 + + GROUPBOX "=C3=80=C3=A4=C3=AC=C2=B3=C3=AD=C2=B3=C3=B1=C3=B2=C3=B0=C3=A0= =C3=B2=C3=A8=C3=A2=C3=AD=C2=B3 =C3=AF=C3=A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2= =C3=B0=C3=A8",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHE= ETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "=C3=87=C3=A0=C3=B1&=C3=B2=C3=AE=C3=B1=C3=B3=C3=A2=C3=A0=C3= =B2=C3=A8 =C3=A4=C3=AE =C3=B0=C3=AE=C3=A1=C3=AE=C3=B7=C3=AE=C3=A3=C3=AE =C3= =B1=C3=B2=C3=AE=C3=AB=C3=A0 =C3=A2=C3=B5=C3=AE=C3=A4=C3=B3 =C3=A4=C3=AE =C3= =B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC=C3=A8",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDI= NG(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&=C3=87=C3=A0=C3=B1=C3=B2=C3=AE=C3=B1=C3=AE=C3=A2=C3=B3=C3= =A2=C3=A0=C3=B2=C3=A8 =C3=A4=C3=AB=C3=BF =C3=A2=C3=B1=C2=B3=C3=B5 =C3=AD=C3= =AE=C3=A2=C3=A8=C3=B5 =C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=B3=C3=A2=C3= =A0=C3=B7=C2=B3=C3=A2",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22= )-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 +END + + +IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3 =C3=A7=C3=A0=C3=AB=C3=A8=C3= =AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "=C3=8D=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3= =AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 SHIFT 5 =C3=B0=C3=A0=C3=A7=C2=B3=C3= =A2 =C3=A0=C3=AA=C3=B2=C3=A8=C3=A2=C3=B3=C2=BA =C3=B0=C3=A5=C3=A6=C3=A8=C3= =AC =C3=A7=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3= =A0=C3=A2=C2=B3=C3=B8.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-= PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B1=C3= =AF=C3=AE=C3=B1=C2=B3=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3= =AD=C3=AD=C3=BF",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)= +2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "=C3=8F=C3=A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8",-1,PRO= PSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(= 4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&=C3=99=C3=AE=C3=A1 =C3=A7=C3=A0=C3=A1=C3=AB=C3=AE=C3=AA= =C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B1=C3=AB=C3=B3=C3=A6=C3=A1=C3=AE=C3=A2= =C3=B3 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C3=B3, =C3=AD=C3=A0=C3=B2=C3=A8= =C3=B1=C3=AD=C2=B3=C3=B2=C3=BC =C2=BF=C2=BF =C3=A4=C3=A2=C2=B3=C3=B7=C2=B3"= ,IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-P= ROPSHEETPADDING(4),14 + AUTOCHECKBOX "&=C3=82=C3=A8=C3=AC=C3=A8=C3=AA=C3=A0=C3=B2=C3=A8 =C3=A7= =C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2= =C2=B3=C3=B8 =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF= =C3=AC =C3=A4=C3=A2=C3=AE=C3=B5 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8 =C3=AE= =C3=A4=C3=AD=C3=AE=C3=B7=C3=A0=C3=B1=C3=AD=C3=AE",IDC_STICKY_UNLOCK_CHECK,P= ROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "=C2=B2=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD= =C3=AD=C3=BF",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEET= PADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&=C3=87=C3=A2=C3=B3=C3=AA=C3=AE=C3=A2=C3=A8=C3=A9 =C3=B1= =C3=A8=C3=A3=C3=AD=C3=A0=C3=AB =C3=AF=C3=B0=C3=A8 =C3=AD=C3=A0=C3=B2=C3=A8= =C3=B1=C3=AA=C3=A0=C3=AD=C3=B1=C3=AD=C3=A5=C3=AD=C3=AD=C2=B3 =C3=B1=C3=AB= =C3=B3=C3=A6=C3=A1=C3=AE=C3=A2=C3=AE=C2=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3= =C3=B8=C2=B3",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PR= OPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&=C3=8F=C3=AE=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=B2=C3=A0=C3=AD =C3=87=C3=A0=C3=AB=C3=A8=C3=AF=C3=A0=C3=AD=C3= =AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8 =C3=AD=C3=A0 =C3=A5=C3=AA=C3= =B0=C3=A0=C3=AD=C2=B3",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLIN= E(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3 =C3=B4=C2=B3=C3=AB=C3=BC=C3= =B2=C3=B0=C3=A0=C3=B6=C2=B3=C2=BF" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "=C3=82=C3=A8=C3=AA=C3=AB=C3=A8=C3=AA=C3=AE=C3=AC =C3=A7 =C3=AA=C3= =AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8 =C2=BA \n=C3=93=C3=B2= =C3=B0=C3=A8=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=AF=C3=B0=C3=A0= =C3=A2=C3=AE=C2=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 <Shift> =C3= =A2=C3=AF=C3=B0=C3=AE=C3=A4=C3=AE=C3=A2=C3=A6 8 =C3=B1=C3=A5=C3=AA=C3=B3=C3= =AD=C3=A4",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADD= ING(4),LABELLINE(3) + AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B8=C3= =A2=C3=A8=C3=A4=C3=AA=C3=A8=C3=A9 =C3=A2=C3=A8=C3=AA=C3=AB=C3=A8=C3=AA",IDC= _FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PR= OPSHEETPADDING(20),14 + + GROUPBOX "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD= =C3=AD=C3=BF =C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=B3",-1,PROPSHEETPADDIN= G(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 + AUTORADIOBUTTON "&=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=B2= =C3=A8 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=AD=C2=B3 =C3=AD=C3=A0=C3=B2= =C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3= =C3=B8",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEE= TPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP + AUTORADIOBUTTON "=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=B2= =C3=A8 &=C3=AA=C3=AE=C3=B0=C3=AE=C3=B2=C3=AA=C3=AE=C3=B7=C3=A0=C3=B1=C3=AD= =C2=B3 =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF =C2=B3 = =C3=A7=C3=AC=C3=A5=C3=AD=C3=B8=C3=A8=C3=B2=C3=A8 =C3=B7=C3=A0=C3=B1=C3=B2= =C3=AE=C3=B2=C3=B3 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD= =C3=BF",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHE= ETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE + PUSHBUTTON "&=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PR= OPSHEETPADDING(15),14,WS_GROUP + PUSHBUTTON "=C3=8D=C3=A0&=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0",IDC= _FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,P= ROPSHEETPADDING(15),14,WS_GROUP + LTEXT "=C3=8D&=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C2=B3=C3=B2=C3=BC =C3=B2=C3= =B3=C3=B2 =C3=B9=C3=AE=C3=A1 =C3=AF=C3=A5=C3=B0=C3=A5=C3=A2=C2=B3=C3=B0=C3= =A8=C3=B2=C3=A8 =C3=AD=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3= =AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PRO= PSHEETPADDING(4),LABELLINE(1) + EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSH= EETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL + + GROUPBOX "=C2=B2=C3=AD=C3=B4=C3=AE=C3=B0=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD= =C3=AD=C3=BF",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHE= ETPADDING(2),LABELLINE(4)+3 + AUTOCHECKBOX "&=C3=8F=C3=AE=C3=A4=C3=A0=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2= =C3=AE=C3=AD, =C3=AA=C3=AE=C3=AB=C3=A8 =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA= =C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 =C3=AF= =C3=B0=C3=A8=C3=A9=C3=AD=C3=BF=C3=B2=C3=AE",IDC_FILTER_SOUND_CHECK,PROPSHEE= TPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + AUTOCHECKBOX "=C3=8F=C3=AE&=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=B2=C3=A0=C3=AD '=C3=94=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3= =B6=C2=B3=C2=BF =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3' =C3=AD=C3=A0 =C3=A5=C3=AA= =C3=B0=C3=A0=C3=AD=C2=B3",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABEL= LINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=8E=C3=A7=C3=A2=C3=B3=C3=B7=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3= =BF =C3=AF=C3=A5=C3=B0=C3=A5=C3=AA=C3=AB=C3=BE=C3=B7=C3=A5=C3=AD=C3=AD=C3= =BF =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C2=B3=C3=A2" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "=C3=84=C3=AB=C3=BF =C3=B8=C3=A2=C3=A8=C3=AA=C3=AE=C2=BF =C3=A0=C3= =AA=C3=B2=C3=A8=C3=A2=C3=A0=C3=B6=C2=B3=C2=BF\n=C3=93=C3=B2=C3=B0=C3=A8=C3= =AC=C3=B3=C3=A9=C3=B2=C3=A5 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C3=B3 <Num= Lock> =C3=A2=C3=AF=C3=B0=C3=AE=C3=A4=C3=AE=C3=A2=C3=A6 =C3=AF'=C3=BF=C3=B2= =C3=A8 =C3=B1=C3=A5=C3=AA=C3=B3=C3=AD=C3=A4.",-1,PROPSHEETPADDING(2),LABELL= INE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "=C3=82=C3=A8=C3=AA=C3=AE&=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B8=C3= =A2=C3=A8=C3=AA=C3=A4=C3=A8=C3=A9 =C3=A2=C3=A8=C3=AA=C3=AB=C3=A8=C3=AA",IDC= _TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PR= OPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A2=C3=A8=C3=B1=C3=AE=C3=AA=C3=AE=C2=BF =C3=AA=C3=AE=C3=AD=C3= =B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C3=AE=C3=B1=C3=B2=C2=B3" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "=C3=84=C3=AB=C3=BF =C3=A0=C3=AA=C3=B2=C3=A8=C3=A2=C3=A0=C3=B6=C2= =B3=C2=BF \n=C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C2=B3=C3=B2=C3=BC <ALT =C3= =A7=C3=AB=C2=B3=C3=A2=C3=A0+SHIFT =C3=A7=C3=AB=C2=B3=C3=A2=C3=A0 +PRINT SCR= EEN>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(= 4),LABELLINE(3) + AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B1=C3= =AF=C3=AE=C3=B1=C2=B3=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3= =AD=C3=AD=C3=BF",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(= 5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "=C3=AA=C3=AE=C3=AD=C3=B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C3=A0 = =C3=B1=C3=B5=C3=A5=C3=AC=C3=A0 =C3=AE=C3=B4=C3=AE=C3=B0=C3=AC=C3=AB=C3=A5= =C3=AD=C3=AD=C3=BF",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROP= SHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "=C3=8F=C3=AE=C3=B2=C3=AE=C3=B7=C3=AD=C3=A0 =C3=AA=C3=AE=C3=AD=C3= =B2=C3=B0=C3=A0=C3=B1=C3=B2=C3=AD=C3=A0 =C3=B1=C3=B5=C3=A5=C3=AC=C3=A0 =C3= =AE=C3=B4=C3=AE=C3=B0=C3=AC=C3=AB=C3=A5=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPAD= DING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPS= HEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABS= TOP + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0 =C3=AA=C3= =A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=A2=C3=AA=C3=A0=C3=A7=C2= =B3=C3=A2=C3=AD=C3=A8=C3=AA=C3=AE=C3=AC =C2=B3=C3=A7 =C3=AA=C3=AB=C3=A0=C3= =A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3=A8" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=93=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),P= ROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "=C3=99=C3=AE=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=B3=C3= =B2=C3=A8 =C3=B0=C3=A5=C3=A6=C3=A8=C3=AC =C3=AA=C3=A5=C3=B0=C3=B3=C3=A2=C3= =A0=C3=AD=C3=AD=C3=BF =C3=A2=C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3= =AA=C3=AE=C3=AC =C2=B3=C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3= =B3=C3=B0=C3=A8: \n=C3=8D=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C2=B3=C3=B2=C3=BC = =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3 <ALT =C3=A7=C3=AB=C2=B3=C3=A2=C3= =A0+SHIFT =C3=A7=C3=AB=C2=B3=C3=A2=C3=A0 + NUM LOCK>.",-1,PROPSHEETPADDING(= 2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3= =A2=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=B2=C3=A0=C3=AA=C3=A8=C3=A9 =C3=B1=C3= =AF=C3=AE=C3=B1=C2=B3=C3=A1 =C3=B3=C3=A2=C2=B3=C3=AC=C3=AA=C3=AD=C3=A5=C3= =AD=C3=AD=C3=BF",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE= (5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C2=B3=C3=B1=C3=B2=C3=BC =C3=B0= =C3=B3=C3=B5=C3=B3 =C3=A2=C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3=AA= =C3=A0",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING= (2),LABELLINE(9) + + LTEXT "&=C3=8D=C3=A0=C3=A9=C3=A1=C2=B3=C3=AB=C3=BC=C3=B8=C3=A0:",-1,PROP= SHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "=C3=AD=C3=A8=C3=A6=C3=B7=C3=A5",-1,PROPSHEETPADDING(11),LABELLINE= (10)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_SPEED_TRACK,"msctls_trackbar32",TBS_AUTOTICKS |= WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPA= DDING(22),LABELLINE(2) + LTEXT "=C3=A2=C3=A8=C3=B9=C3=A5",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),L= ABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&=C3=8F=C3=B0=C3=A8=C3=B1=C3=AA=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3= =BF:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(= 1) + LTEXT "=C3=AD=C3=A8=C3=A6=C3=B7=C3=A5",-1,PROPSHEETPADDING(11),LABELLINE= (13)+4,PROPSHEETPADDING(3),LABELLINE(1) + CONTROL "",IDC_MOUSEKEYS_ACCEL_TRACK,"msctls_trackbar32",TBS_AUTOTICKS |= WS_TABSTOP,PROPSHEETPADDING(15),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPA= DDING(22),LABELLINE(2) + LTEXT "=C3=A2=C3=A8=C3=B9=C3=A5",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),L= ABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "CTRL - =C3=AF=C3=B0=C3=A8=C3=B1&=C3=AA=C3=AE=C3=B0=C3=A5= =C3=AD=C3=AD=C3=BF, SHIFT - =C3=B3=C3=AF=C3=AE=C3=A2=C2=B3=C3=AB=C3=BC=C3= =A5=C3=AD=C3=AD=C3=BF",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELL= INE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "=C3=82=C3=A8=C3=AA=C3=AE=C3=B0=C3=A8=C3=B1=C3=B2=C3=AE=C3=A2=C3= =B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3=AA=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A7 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3=B3=C3=B0=C3= =A8, =C3=BF=C3=AA=C3=B9=C3=AE NumLock:",-1,PROPSHEETPADDING(1),LABELLINE(18= )+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "=C3=93=C3=A2=C2=B3&=C3=AC=C3=AA=C3=AD=C3=B3=C3=B2=C3=AE= ",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+= 7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "=C3=A2&=C3=A8=C3=AC=C3=AA=C3=AD=C3=A5=C3=AD=C3=AE",IDC_= MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROP= SHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "=C3=8F&=C3=AE=C3=AA=C3=A0=C3=A7=C3=B3=C3=A2=C3=A0=C3=B2=C3= =A8 =C3=B1=C3=B2=C3=A0=C3=AD =C3=AA=C3=A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3= =AD=C3=BF =C3=A2=C3=AA=C3=A0=C3=A7=C2=B3=C3=A2=C3=AD=C3=A8=C3=AA=C3=AE=C3= =AC =C3=AD=C3=A0 =C3=A5=C3=AA=C3=B0=C3=A0=C3=AD=C2=B3",IDC_MOUSEKEYS_STATUS= _CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(= 4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=84=C3=AE=C3=A4=C3=A0=C3=B2=C3=AA=C3=AE=C3=A2=C2=B3 =C3=AF=C3= =A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8 =C3=B0=C3=A5=C3=A6=C3=A8=C3= =AC=C3=B3 =C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3=B6=C2=B3=C2=BF" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=8F=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B1=C3=A8=C3=AC=C3=A2=C3=AE=C3=AB=C2=B3=C3=A2",-1,PROPSHEETPADDING(1),LA= BELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&=C2=B2=C3=A3=C3=AD=C3=AE=C3=B0=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8 =C3= =AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3= =A0=C3=A2=C2=B3=C3=B8, =C3=BF=C3=AA=C2=B3 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3= =B0=C3=BE=C3=BE=C3=B2=C3=BC=C3=B1=C3=BF =C3=B7=C3=A0=C3=B1=C3=B2=C2=B3=C3= =B8=C3=A5 =C3=AD=C2=B3=C3=A6:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSH= EETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PRO= PSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&=C3=8F=C3=A5=C3=B0=C3=A5=C3=A2=C2=B3=C3=B0=C3=AA=C3=A0:",-1,PROP= SHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEE= TWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=84=C3=AE=C3=A4=C3=A0=C3=B2=C3=AA=C3=AE=C3=A2=C2=B3 =C3=AF=C3= =A0=C3=B0=C3=A0=C3=AC=C3=A5=C3=B2=C3=B0=C3=A8 =C3=B0=C3=A5=C3=A6=C3=A8=C3= =AC=C3=B3 =C3=B4=C2=B3=C3=AB=C3=BC=C3=B2=C3=B0=C3=A0=C3=B6=C2=B3=C2=BF" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=8F=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3=BF = =C3=B1=C3=A8=C3=AC=C3=A2=C3=AE=C3=AB=C2=B3=C3=A2",-1,PROPSHEETPADDING(1),LA= BELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "=C3=87=C3=AC=C2=B3=C3=AD=C3=A0 =C3=AF=C3=A0=C3=B0=C3=A0=C3=AC=C3= =A5=C3=B2=C3=B0=C2=B3=C3=A2 =C3=AA=C3=AB=C3=A0=C3=A2=C2=B3=C3=A0=C3=B2=C3= =B3=C3=B0=C3=A8 =C3=AD=C3=A0 =C3=AF=C3=A0=C3=AD=C3=A5=C3=AB=C2=B3 =C3=AA=C3= =A5=C3=B0=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(2),LABE= LLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + AUTORADIOBUTTON "&=C3=AD=C3=A5 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3= =BE=C3=A2=C3=A0=C3=B2=C3=A8",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),= LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&=C3=B3=C3=AF=C3=AE=C3=A2=C2=B3=C3=AB=C3=BC=C3=AD=C3=A5= =C3=AD=C3=AD=C3=BF =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C2=B3=C3=A2",IDC_RE= PEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "&=C3=87=C3=A0=C3=B2=C3=B0=C3=A8=C3=AC=C3=AA=C3=A0 =C3=AF=C3=A5=C3= =B0=C3=A5=C3=A4 =C3=AF=C3=AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3= =BF=C3=AC:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABE= LLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PR= OPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C2=B3=C3=B1=C3=B2=C3=BC =C3=AF=C3= =AE=C3=A2=C3=B2=C3=AE=C3=B0=C3=A5=C3=AD=C3=AD=C3=BF:",-1,PROPSHEETPADDING(4= ),LABELLINE(9)+6,PROPSHEETPADDING(10),LABELLINE(1) + COMBOBOX IDC_REPEAT_REPEAT_COMBO, PROPSHEETPADDING(4), LABELLINE(10)+8, = PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(7), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + GROUPBOX "=C3=8F=C3=AE=C3=A2=C2=B3=C3=AB=C3=BC=C3=AD=C3=A5 =C3=AD=C3=A0= =C3=B2=C3=A8=C3=B1=C3=AA=C3=A0=C3=AD=C3=AD=C3=BF =C3=AA=C3=AB=C3=A0=C3=A2= =C2=B3=C3=B8",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEET= PADDING(2),LABELLINE(4)+4 + LTEXT "&=C3=93=C3=B2=C3=B0=C3=A8=C3=AC=C3=B3=C3=A2=C3=A0=C3=AD=C3=AD=C3= =BF =C3=AD=C3=A0=C3=B2=C3=A8=C3=B1=C3=AD=C3=B3=C3=B2=C3=AE=C2=BF =C3=AA=C3= =AB=C3=A0=C3=A2=C2=B3=C3=B8=C2=B3:",-1,PROPSHEETPADDING(2),LABELLINE(15),PR= OPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PR= OPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&=C3=8F=C3=A5=C3=B0=C3=A5=C3=A2=C2=B3=C3=B0=C3=AA=C3=A0:",-1,PROP= SHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPS= HEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "=C3=8D=C3=A0=C3=B1=C3=B2=C3=B0=C3=AE=C3=A9=C3=AA=C3=A0 =C3=A0=C3= =AB=C3=BC=C3=B2=C3=A5=C3=B0=C3=AD=C3=A0=C3=B2=C3=A8=C3=A2=C3=AD=C3=AE=C3=A3= =C3=AE =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C3=AE=C3=BE =C3=A2=C3=A2=C3=AE= =C3=A4=C3=B3" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "=C3=AF=C3=AE=C3=B1=C3=AB=C2=B3=C3=A4=C3=AE=C3=A2=C3=AD=C3=A8= =C3=A9 =C3=AF=C3=B0=C3=A8=C3=B1=C3=B2=C3=B0=C2=B3=C3=A9 =C3=A2=C3=A2=C3=AE= =C3=A4=C3=B3",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETP= ADDING(2),LABELLINE(10) + LTEXT "=C3=93=C3=AA=C3=A0=C3=A6=C2=B3=C3=B2=C3=BC =C3=AF=C3=AE=C3=B0=C3= =B2, =C3=A4=C3=AE =C3=BF=C3=AA=C3=AE=C3=A3=C3=AE =C3=AF=C2=B3=C3=A4=C3=AA= =C3=AB=C3=BE=C3=B7=C3=A5=C3=AD=C3=AE =C3=A0=C3=AB=C3=BC=C3=B2=C3=A5=C3=B0= =C3=AD=C3=A0=C3=B2=C3=A8=C3=A2=C3=AD=C3=A8=C3=A9 =C3=AF=C3=B0=C3=A8=C3=B1= =C3=B2=C3=B0=C2=B3=C3=A9 =C3=A2=C3=A2=C3=AE=C3=A4=C3=B3.",-1,PROPSHEETPADDI= NG(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&=C3=8F=C3=AE=C3=B1=C3=AB=C2=B3=C3=A4=C3=AE=C3=A2=C3=AD=C3=A8=C3= =A9 =C3=AF=C3=AE=C3=B0=C3=B2:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSH= EETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4)+7, PRO= PSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&=C3=98=C3=A2=C3=A8=C3=A4=C3=AA=C2=B3=C3=B1=C3=B2=C3=BC:",-1,PROP= SHEETPADDING(2),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8)+2, PRO= PSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "=C3=91=C3=AA=C3=A0=C3=B1=C3=B3=C3=A2=C3=A0=C3=B2=C3=A8", IDC= ANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "=C3=91=C3=AF=C3=A5=C3=B6=C2=B3=C3=A0=C3=AB=C3=BC=C3= =AD=C2=B3 =C3=AC=C3=AE=C3=A6=C3=AB=C3=A8=C3=A2=C3=AE=C3=B1=C3=B2=C2=B3" + IDS_CPLSYSTEMDESCRIPTION "=C3=8D=C3=A0=C3=AB=C3=A0=C3=B8=C3=B2=C3=B3=C3= =A2=C3=A0=C3=AD=C3=AD=C3=BF =C3=B1=C3=AF=C3=A5=C3=B6=C2=B3=C3=A0=C3=AB=C3= =BC=C3=AD=C3=A8=C3=B5 =C3=AC=C3=AE=C3=A6=C3=AB=C3=A8=C3=A2=C3=AE=C3=B1=C3= =B2=C3=A5=C3=A9 =C3=82=C3=A0=C3=B8=C3=AE=C3=A3=C3=AE =C3=AA=C3=AE=C3=AC=C3= =AF'=C3=BE=C3=B2=C3=A5=C3=B0=C3=A0." + + IDS_SENTRY_NONE "[=C3=AD=C3=A5=C3=AC=C3=A0=C2=BA]" + IDS_SENTRY_TITLE "=C3=8F=C2=B3=C3=A4=C3=B1=C3=A2=C2=B3=C3=B7=C3=B3=C3=A2= =C3=A0=C3=B2=C3=A8 =C3=A7=C3=A0=C3=A3=C3=AB=C3=AE=C3=A2=C3=AE=C3=AA" + IDS_SENTRY_WINDOW "=C3=8F=C2=B3=C3=A4=C3=B1=C3=A2=C2=B3=C3=B7=C3=B3=C3= =A2=C3=A0=C3=B2=C3=A8 =C3=A0=C3=AA=C3=B2=C3=A8=C3=A2=C3=AD=C3=A5 =C3=A2=C2= =B3=C3=AA=C3=AD=C3=AE" + IDS_SENTRY_DISPLAY "=C3=8F=C2=B3=C3=A4=C3=B1=C3=A2=C2=B3=C3=B7=C3=B3=C3= =A2=C3=A0=C3=B2=C3=A8 =C3=B0=C3=AE=C3=A1=C3=AE=C3=B7=C3=A8=C3=A9 =C3=B1=C3= =B2=C2=B3=C3=AB" + + IDS_SECONDS "=C3=B1=C3=A5=C3=AA=C3=B3=C3=AD=C3=A4" + IDS_MINUTES "=C3=B5=C3=A2=C3=A8=C3=AB=C3=A8=C3=AD" +END Propchange: trunk/reactos/dll/cpl/access/lang/uk-UA.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.= c?rev=3D32711&r1=3D32710&r2=3D32711&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/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Mon Mar 17 07:57:17 2008 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: mouse.c 29112 2007-09-19 21:31:49Z ekohl $ * * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory Propchange: trunk/reactos/dll/cpl/access/mouse.c ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Propchange: trunk/reactos/dll/cpl/access/resource.h ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.= c?rev=3D32711&r1=3D32710&r2=3D32711&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/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Mon Mar 17 07:57:17 2008 @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: sound.c 29112 2007-09-19 21:31:49Z ekohl $ * * PROJECT: ReactOS Accessibility Control Panel * LICENSE: GPL - See COPYING in the top level directory Propchange: trunk/reactos/dll/cpl/access/sound.c ---------------------------------------------------------------------------= --- --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

1 0

[hpoussin] 32710: Replace .def files by .spec files
by hpoussin＠svn.reactos.org 17 Mar '08

17 Mar '08

Author: hpoussin Date: Mon Mar 17 07:44:23 2008 New Revision: 32710 URL: http://svn.reactos.org/svn/reactos?rev=3D32710&view=3Drev Log: Replace .def files by .spec files Added: trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec (with= props) trunk/reactos/base/applications/screensavers/logon/logon.spec (with p= rops) Removed: trunk/reactos/base/applications/screensavers/3dtext/3dtext.def trunk/reactos/base/applications/screensavers/logon/logon.def Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc (con= tents, props changed) trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc (con= tents, props changed) trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc (con= tents, props changed) trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc (con= tents, props changed) trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc (con= tents, props changed) trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc (con= tents, props changed) trunk/reactos/base/applications/screensavers/logon/logon.rbuild trunk/reactos/base/applications/screensavers/logon/resource.h (conten= ts, props changed) Removed: trunk/reactos/base/applications/screensavers/3dtext/3dtext.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/3dtext/3dtext.def?rev=3D32709&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/base/applications/screensavers/3dtext/3dtext.def (origina= l) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.def (removed) @@ -1,5 +1,0 @@ -NAME 3dtext.scr - -EXPORTS - ScreenSaverProc - ScreenSaverConfigureDialog Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/3dtext/3dtext.rbuild?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/3dtext/3dtext.rbuild (orig= inal) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.rbuild Mon M= ar 17 07:44:23 2008 @@ -1,7 +1,7 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name=3D"3dtext" type=3D"win32scr" installbase=3D"system32" install= name=3D"3dtext.scr" unicode=3D"yes"> - <importlibrary definition=3D"3dtext.def" /> + <importlibrary definition=3D"3dtext.spec.def" /> <library>scrnsave</library> <library>kernel32</library> <library>user32</library> @@ -13,6 +13,7 @@ <file>3dtext.c</file> <file>settings.c</file> <file>rsrc.rc</file> + <file>3dtext.spec</file> = <metadata description=3D"3D text OpenGL screensaver" /> </module> Added: trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/3dtext/3dtext.spec?rev=3D32710&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/base/applications/screensavers/3dtext/3dtext.spec (added) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec Mon Mar= 17 07:44:23 2008 @@ -1,0 +1,2 @@ +@ stdcall ScreenSaverProc(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) Propchange: trunk/reactos/base/applications/screensavers/3dtext/3dtext.spec ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/lang/de-DE.rc?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/lang/de-DE.rc (origi= nal) +++ trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc Mon Ma= r 17 07:44:23 2008 @@ -1,7 +1,7 @@ -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Logon Bildschirmschoner" - IDS_TEXT "Keinerlei Einstellungen notwendig." -END +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon Bildschirmschoner" + IDS_TEXT "Keinerlei Einstellungen notwendig." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/de-DE.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/lang/fr-FR.rc?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/lang/fr-FR.rc (origi= nal) +++ trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc Mon Ma= r 17 07:44:23 2008 @@ -1,7 +1,7 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "=C3=89cran de veille de logon" - IDS_TEXT "Il n'y a aucune option =C3=A0 d=C3=A9finir." -END +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "=C3=89cran de veille de logon" + IDS_TEXT "Il n'y a aucune option =C3=A0 d=C3=A9finir." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/lang/lt-LT.rc?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/lang/lt-LT.rc (origi= nal) +++ trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc Mon Ma= r 17 07:44:23 2008 @@ -1,16 +1,16 @@ -/* - * PROJECT: ReactOS Logon ScreenSaver - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/screensavers/logon/lang/lt-LT.rc - * PURPOSE: Lithuanian Language File - * TRANSLATOR: Vytis "CMan" Gird=C3=BEijauskas (cman(a)cman.us) - * DATE: 2007-12-02 - */ - -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Logon" - IDS_TEXT "N=C3=ABra kei=C3=A8iam=C3=B8 parametr=C3=B8." -END +/* + * PROJECT: ReactOS Logon ScreenSaver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/screensavers/logon/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Gird=C3=BEijauskas (cman(a)cman.us) + * DATE: 2007-12-02 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon" + IDS_TEXT "N=C3=ABra kei=C3=A8iam=C3=B8 parametr=C3=B8." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/lt-LT.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/lang/nl-NL.rc?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/lang/nl-NL.rc (origi= nal) +++ trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc Mon Ma= r 17 07:44:23 2008 @@ -1,7 +1,7 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Logon Schermbeveiliging" - IDS_TEXT "Geen dingen om in te stellen." -END +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon Schermbeveiliging" + IDS_TEXT "Geen dingen om in te stellen." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/lang/sk-SK.rc?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/lang/sk-SK.rc (origi= nal) +++ trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc Mon Ma= r 17 07:44:23 2008 @@ -1,11 +1,11 @@ -/* TRANSLATOR: Kario (kario(a)szm.sk) - * DATE OF TR: 22-09-2007 - */ - -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Logon - =C2=9Aetri=C3=A8 obrazovky" - IDS_TEXT "Nie s=C3=BA potrebn=C3=A9 =C2=9Eiadne nastavenia." -END +/* TRANSLATOR: Kario (kario(a)szm.sk) + * DATE OF TR: 22-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon - =C2=9Aetri=C3=A8 obrazovky" + IDS_TEXT "Nie s=C3=BA potrebn=C3=A9 =C2=9Eiadne nastavenia." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/lang/uk-UA.rc?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/lang/uk-UA.rc (origi= nal) +++ trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc Mon Ma= r 17 07:44:23 2008 @@ -1,15 +1,15 @@ -/* - * PROJECT: Logon ScreenSaver - * LICENSE: Public Domain - * FILE: base/applications/screensavers/logon/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for Logon ScreenSaver - * TRANSLATOR: Artem Reznikov - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "=C3=87=C3=A0=C3=B1=C3=B2=C3=A0=C3=A2=C3=AA=C3=A0 ""= =C3=82=C3=B5=C2=B3=C3=A4 =C3=A4=C3=AE =C3=B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC= =C3=A8""" - IDS_TEXT "=C3=96=C3=BF =C3=A7=C3=A0=C3=B1=C3=B2=C3=A0=C3=A2=C3= =AA=C3=A0 =C3=AD=C3=A5 =C3=AC=C3=A0=C2=BA =C3=AD=C3=A0=C3=AB=C3=A0=C3=B8=C3= =B2=C3=AE=C3=A2=C3=B3=C3=A2=C3=A0=C3=AD=C3=A8=C3=B5 =C3=AF=C3=A0=C3=B0=C3= =A0=C3=AC=C3=A5=C3=B2=C3=B0=C2=B3=C3=A2." -END +/* + * PROJECT: Logon ScreenSaver + * LICENSE: Public Domain + * FILE: base/applications/screensavers/logon/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Logon ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "=C3=87=C3=A0=C3=B1=C3=B2=C3=A0=C3=A2=C3=AA=C3=A0 ""= =C3=82=C3=B5=C2=B3=C3=A4 =C3=A4=C3=AE =C3=B1=C3=A8=C3=B1=C3=B2=C3=A5=C3=AC= =C3=A8""" + IDS_TEXT "=C3=96=C3=BF =C3=A7=C3=A0=C3=B1=C3=B2=C3=A0=C3=A2=C3= =AA=C3=A0 =C3=AD=C3=A5 =C3=AC=C3=A0=C2=BA =C3=AD=C3=A0=C3=AB=C3=A0=C3=B8=C3= =B2=C3=AE=C3=A2=C3=B3=C3=A2=C3=A0=C3=AD=C3=A8=C3=B5 =C3=AF=C3=A0=C3=B0=C3= =A0=C3=AC=C3=A5=C3=B2=C3=B0=C2=B3=C3=A2." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/uk-UA.rc ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/base/applications/screensavers/logon/logon.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/logon.def?rev=3D32709&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/base/applications/screensavers/logon/logon.def (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.def (removed) @@ -1,5 +1,0 @@ -NAME logon.scr - -EXPORTS - ScreenSaverProc - ScreenSaverConfigureDialog Modified: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/logon.rbuild?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/logon.rbuild (origin= al) +++ trunk/reactos/base/applications/screensavers/logon/logon.rbuild Mon Mar= 17 07:44:23 2008 @@ -1,7 +1,7 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name=3D"logon" type=3D"win32scr" installbase=3D"system32" installn= ame=3D"logon.scr" unicode=3D"true"> - <importlibrary definition=3D"logon.def" /> + <importlibrary definition=3D"logon.spec.def" /> <include base=3D"logon">.</include> <library>scrnsave</library> <library>kernel32</library> @@ -12,4 +12,5 @@ = <file>logon.c</file> <file>logon.rc</file> + <file>logon.spec</file> </module> Added: trunk/reactos/base/applications/screensavers/logon/logon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/logon.spec?rev=3D32710&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=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/base/applications/screensavers/logon/logon.spec (added) +++ trunk/reactos/base/applications/screensavers/logon/logon.spec Mon Mar 1= 7 07:44:23 2008 @@ -1,0 +1,2 @@ +@ stdcall ScreenSaverProc(ptr long ptr ptr) +@ stdcall ScreenSaverConfigureDialog(ptr long ptr ptr) Propchange: trunk/reactos/base/applications/screensavers/logon/logon.spec ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/base/applications/screensavers/logon/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/scr= eensavers/logon/resource.h?rev=3D32710&r1=3D32709&r2=3D32710&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/base/applications/screensavers/logon/resource.h (original) +++ trunk/reactos/base/applications/screensavers/logon/resource.h Mon Mar 1= 7 07:44:23 2008 @@ -1,3 +1,3 @@ -#define IDS_TEXT 3 -#define IDB_WORKSTATION 0x100 -#define IDB_SERVER 0x200 +#define IDS_TEXT 3 +#define IDB_WORKSTATION 0x100 +#define IDB_SERVER 0x200 Propchange: trunk/reactos/base/applications/screensavers/logon/resource.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native

1 0

[hpoussin] 32709: Remove $(INIT) variable, which was containing all host tools Now, each rule depends only of required tools See issue #3131 for more details.
by hpoussin＠svn.reactos.org 17 Mar '08

17 Mar '08

Author: hpoussin Date: Mon Mar 17 07:26:23 2008 New Revision: 32709 URL: http://svn.reactos.org/svn/reactos?rev=3D32709&view=3Drev Log: Remove $(INIT) variable, which was containing all host tools Now, each rule depends only of required tools See issue #3131 for more details. Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/mingw.cpp?rev=3D32709&r1=3D32708&r2=3D32709&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/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Mon Mar 17 07:26:23 = 2008 @@ -270,7 +270,6 @@ fprintf ( fMakefile, "\n" ); = GenerateAllTarget ( v ); - GenerateInitTarget (); GenerateRegTestsRunTarget (); = for ( i =3D 0; i < iend; i++ ) @@ -576,34 +575,6 @@ fprintf ( fMakefile, "\n\t\n\n" ); } = -string -MingwBackend::GetBuildToolDependencies () const -{ - string dependencies; - for ( size_t i =3D 0; i < ProjectNode.modules.size (); i++ ) - { - Module& module =3D *ProjectNode.modules[i]; - if ( !module.enabled ) - continue; - if ( module.type =3D=3D BuildTool ) - { - if ( dependencies.length () > 0 ) - dependencies +=3D " "; - dependencies +=3D GetFullName ( *module.dependency ); - } - } - return dependencies; -} - -void -MingwBackend::GenerateInitTarget () const -{ - fprintf ( fMakefile, - "INIT =3D %s\n", - GetBuildToolDependencies ().c_str () ); - fprintf ( fMakefile, "\n" ); -} - void MingwBackend::GenerateRegTestsRunTarget () const { Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/mingw.h?rev=3D32709&r1=3D32708&r2=3D32709&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/mingw.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Mon Mar 17 07:26:23 20= 08 @@ -75,8 +75,6 @@ void GenerateGlobalVariables () const; bool IncludeInAllTarget ( const Module& module ) const; void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers= ) const; - std::string GetBuildToolDependencies () const; - void GenerateInitTarget () const; void GenerateRegTestsRunTarget () const; void GenerateXmlBuildFilesMacro() const; void GenerateTestSupportCode (); 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=3D32709&r1=3D32708&r2=3D32709&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= 7:26:23 2008 @@ -2296,7 +2296,7 @@ return; = if ( module.name !=3D "psdk" ) - dependencies.push_back ( "$(INIT) $(PSDK_TARGET) $(psdk_HEADERS)" ); + dependencies.push_back ( "$(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++ )

1 0

[fireball] 32708: - MAINTENANCE: Fix inconsistent new lines.
by fireball＠svn.reactos.org 17 Mar '08

17 Mar '08

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

1 0

[fireball] 32707: - MAINTENANCE: Fix inconsistent new lines.
by fireball＠svn.reactos.org 17 Mar '08

17 Mar '08

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

1 0

[hpoussin] 32706: Don't fail if CCB_SYSTEM_FLAG can't be set
by hpoussin＠svn.reactos.org 17 Mar '08

17 Mar '08

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; }

1 0

[hpoussin] 32705: Remove some more circular dependencies. May fix bug 3131
by hpoussin＠svn.reactos.org 17 Mar '08

17 Mar '08

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++ )

1 0

[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 16 Mar '08

16 Mar '08

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);">';

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs