Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 29154: Fix : RemoveFontResourceA : let it call to RemoveFontResourceExA Fix : RemoveFontResourceW : let it call to RemoveFontResourceExW Fix : a comment in SetWorldTransform Fix : Redirect STROBJ_bEnum@12 to win32k Fix : Redirect STROBJ_bEnumPositionsOnly@12 to win32k Fix : Redirect STROBJ_bGetAdvanceWidths@16 to win32k Fix : Redirect STROBJ_dwGetCodePage@4 to win32k Fix : Redirect STROBJ_vEnumStart@4 to win32k Fix : Redirect SetFontEnumeration to win32k Fix : Redirect SetMagicColors
by greatlrd＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: greatlrd Date: Sun Sep 23 15:33:47 2007 New Revision: 29154 URL: http://svn.reactos.org/svn/reactos?rev=29154&view=rev Log: Fix : RemoveFontResourceA : let it call to RemoveFontResourceExA Fix : RemoveFontResourceW : let it call to RemoveFontResourceExW Fix : a comment in SetWorldTransform Fix : Redirect STROBJ_bEnum@12 to win32k Fix : Redirect STROBJ_bEnumPositionsOnly@12 to win32k Fix : Redirect STROBJ_bGetAdvanceWidths@16 to win32k Fix : Redirect STROBJ_dwGetCodePage@4 to win32k Fix : Redirect STROBJ_vEnumStart@4 to win32k Fix : Redirect SetFontEnumeration to win32k Fix : Redirect SetMagicColors to win32k Fix : Redirect SetSystemPaletteUse to win32k Fix : Redirect SetVirtualResolution@20 to win32k Fix : PtInRegion : Make smaller code in gdi32 for sharememory/metadc Fix : RectInRegion : Make smaller code in gdi32 for sharememory/metadc Fix : SetBrushOrgEx : Make smaller code in gdi32 for sharememory/metadc Fix : SetDIBits : Make smaller code in gdi32 for sharememory/metadc Fix : SetGraphicsMode : Make smaller code in gdi32 for sharememory/metadc Implement RemoveFontResourceExA : it is partly implement it miss flags, and pdv and we also need fix win32k Implement RemoveFontResourceExW : it is partly implement it miss flags, and pdv and we also need fix win32k and more stuff Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsa.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sun Sep 23 15:33:47 2007 @@ -437,14 +437,96 @@ PolyPolygon@16 PolyPolyline@16 - - - - - - - - +PolyTextOutA@12 +PolyTextOutW@12 +Polygon@12 +Polyline@12 +PolylineTo@12 +PtInRegion@12 +PtVisible@12=NtGdiPtVisible@12 +QueryFontAssocStatus@0 +RealizePalette@4 +RectInRegion@8 +RectVisible@8=NtGdiRectVisible@8 +Rectangle@20 +RemoveFontMemResourceEx@4 +RemoveFontResourceA@4 +RemoveFontResourceExA@12 +RemoveFontResourceExW@12 +RemoveFontResourceTracking@8 +RemoveFontResourceW@4 +ResetDCA@8 +ResetDCW@8 +ResizePalette@8 +RestoreDC@8 +RoundRect@28 +STROBJ_bEnum@12=NtGdiSTROBJ_bEnum@12 +STROBJ_bEnumPositionsOnly@12=NtGdiSTROBJ_bEnumPositionsOnly@12 +STROBJ_bGetAdvanceWidths@16=NtGdiSTROBJ_bGetAdvanceWidths@16 +STROBJ_dwGetCodePage@4=NtGdiSTROBJ_dwGetCodePage@4 +STROBJ_vEnumStart@4=NtGdiSTROBJ_vEnumStart@4 +SaveDC@4 +ScaleViewportExtEx@24 +ScaleWindowExtEx@24 +SelectBrushLocal@8 +SelectClipPath@8 +SelectClipRgn@8 +SelectFontLocal@8 +SelectObject@8 +SelectPalette@12 +SetAbortProc@8 +SetArcDirection@8 +SetBitmapBits@12=NtGdiSetBitmapBits@12 +SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16 +SetBkColor@8 +SetBkMode@8 +SetBoundsRect@12 +SetBrushOrgEx@16 +SetColorAdjustment@8 +SetColorSpace@8 +SetDCBrushColor@8 +SetDCPenColor@8 +SetDIBColorTable@16 +SetDIBits@28 +SetDIBitsToDevice@48 +SetDeviceGammaRamp@8 +SetEnhMetaFileBits@8 +SetFontEnumeration@4=NtGdiSetFontEnumeration@4 +SetGraphicsMode@8 +SetICMMode@8 +SetICMProfileA@8 +SetICMProfileW@8 +SetLayout@8 +SetLayoutWidth@12 +SetMagicColors@12=NtGdiSetMagicColors@12 +SetMapMode@8 +SetMapperFlags@8 +SetMetaFileBitsEx@8 +SetMetaRgn@4 +SetMiterLimit@12 +SetPaletteEntries@16 +SetPixel@16 +SetPixelFormat@12 +SetPixelV@16 +SetPolyFillMode@8 +SetROP2@8 +SetRectRgn@20 +SetRelAbs@8 +SetStretchBltMode@8 +SetSystemPaletteUse@8=NtGdiSetSystemPaletteUse@8 +SetTextAlign@8 +SetTextCharacterExtra@8 +SetTextColor@8 +SetTextJustification@12 +SetViewportExtEx@16 +SetViewportOrgEx@16 +SetVirtualResolution@20=NtGdiSetVirtualResolution@20 +SetWinMetaFileBits@16 +SetWindowExtEx@16 +SetWindowOrgEx@16 +SetWorldTransform@8 +StartDocA@8 +StartDocW@8 @@ -512,102 +594,12 @@ GetGlyphIndicesA@20 GetTextExtentExPointWPri@28 GetTextExtentPoint32A@16 -PolyTextOutA@12 -PolyTextOutW@12 -Polygon@12 -Polyline@12 -PolylineTo@12 -PtInRegion@12=NtGdiPtInRegion@12 -PtVisible@12=NtGdiPtVisible@12 -QueryFontAssocStatus@0 -RealizePalette@4 -RectInRegion@8=NtGdiRectInRegion@8 -RectVisible@8=NtGdiRectVisible@8 -Rectangle@20 -RemoveFontMemResourceEx@4 -RemoveFontResourceA@4 -RemoveFontResourceExA@12 -RemoveFontResourceExW@12 -RemoveFontResourceW@4 -RemoveFontResourceTracking@8 -ResetDCA@8 -ResetDCW@8 -ResizePalette@8 -RestoreDC@8=NtGdiRestoreDC@8 -RoundRect@28 -SaveDC@4=NtGdiSaveDC@4 -ScaleViewportExtEx@24 -ScaleWindowExtEx@24 -SelectBrushLocal@8 -SelectClipPath@8 -SelectClipRgn@8 -SelectFontLocal@8 -SelectObject@8 -SelectPalette@12 -SetAbortProc@8 -SetArcDirection@8 SetBitmapAttributes@8 -SetBitmapBits@12=NtGdiSetBitmapBits@12 -SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16 -SetBkColor@8 -SetBkMode@8 -SetBoundsRect@12 SetBrushAttributes@8 -SetBrushOrgEx@16=NtGdiSetBrushOrg@16 -SetColorAdjustment@8 -SetColorSpace@8 -SetDCBrushColor@8 -SetDCPenColor@8 -SetDIBColorTable@16 -SetDIBits@28=NtGdiSetDIBits@28 -SetDIBitsToDevice@48 -SetDeviceGammaRamp@8 -SetEnhMetaFileBits@8 -SetFontEnumeration@4 -SetGraphicsMode@8=NtGdiSetGraphicsMode@8 -SetICMMode@8 -SetICMProfileA@8 -SetICMProfileW@8 -SetLayout@8 -SetLayoutWidth@12 -SetMagicColors@12 -SetMapMode@8 -SetMapperFlags@8 -SetMetaFileBitsEx@8 -SetMetaRgn@4 -SetMiterLimit@12 -SetPaletteEntries@16 -SetPixel@16 -SetPixelFormat@12 -SetPixelV@16 -SetPolyFillMode@8=NtGdiSetPolyFillMode@8 -SetROP2@8=NtGdiSetROP2@8 -SetRectRgn@20=NtGdiSetRectRgn@20 -SetRelAbs@8 -SetStretchBltMode@8=NtGdiSetStretchBltMode@8 -SetSystemPaletteUse@8 -SetTextAlign@8=NtGdiSetTextAlign@8 -SetTextCharacterExtra@8 -SetTextColor@8 -SetTextJustification@12 -SetViewportExtEx@16=NtGdiSetViewportExtEx@16 -SetViewportOrgEx@16=NtGdiSetViewportOrgEx@16 -SetVirtualResolution@20 -SetWinMetaFileBits@16 -SetWindowExtEx@16=NtGdiSetWindowExtEx@16 -SetWindowOrgEx@16=NtGdiSetWindowOrgEx@16 -SetWorldTransform@8 -StartDocA@8 -StartDocW@8 StartFormPage@4 StartPage@4 StretchBlt@44 StretchDIBits@52=NtGdiStretchDIBits@52 -STROBJ_bEnum@12 -STROBJ_bEnumPositionsOnly@12 -STROBJ_bGetAdvanceWidths@16 -STROBJ_dwGetCodePage@4 -STROBJ_vEnumStart@4 StrokeAndFillPath@4 StrokePath@4 SwapBuffers@4 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Sep 23 15:33:47 2007 @@ -23,51 +23,257 @@ /* * @unimplemented */ -BOOL -STDCALL -CancelDC( - HDC a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ int STDCALL -DrawEscape( - HDC a0, - int a1, - int a2, - LPCSTR a3 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - +SetDIBits(HDC hdc, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + CONST VOID *lpvBits, + CONST BITMAPINFO *lpbmi, + UINT fuColorUse) +{ + /* FIXME share memory */ + return NtGdiSetDIBits(hdc, hbmp, uStartScan, cScanLines, lpvBits, lpbmi, fuColorUse); +} /* * @unimplemented */ int STDCALL -EnumObjects( - HDC a0, - int a1, - GOBJENUMPROC a2, - LPARAM a3 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +SetGraphicsMode(HDC hdc, + int iMode) +{ + /* FIXME share memory */ + return NtGdiSetGraphicsMode(hdc, iMode); +} + +/* + * @unimplemented + */ +int +STDCALL +SetPolyFillMode(HDC hdc, + int iPolyFillMode) +{ + /* FIXME share memory */ + return NtGdiSetPolyFillMode(hdc, iPolyFillMode); +} + +/* + * @unimplemented + */ +int +STDCALL +SetROP2(HDC hdc, + int fnDrawMode) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +int +STDCALL +SetStretchBltMode(HDC hdc, int iStretchMode) +{ + /* FIXME share memory */ + return NtGdiSetStretchBltMode(hdc, iStretchMode); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetRectRgn(HRGN hrgn, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect) +{ + /* FIXME metadc stuff */ + return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); +} + +/* + * @unimplemented + */ +UINT +STDCALL +SetTextAlign(HDC hdc, + UINT fMode) +{ + /* FIXME share memory */ + return NtGdiSetTextAlign(hdc, fMode); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ + /* FIXME share memory */ + return NtGdiSetViewportExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ + /* FIXME share memory */ + return NtGdiSetWindowOrgEx(hdc,X,Y,lpPoint); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetWindowExtEx(HDC hdc, + int nXExtent, + int nYExtent, + LPSIZE lpSize) +{ + /* FIXME share memory */ + return NtGdiSetWindowExtEx(hdc, nXExtent, nYExtent, lpSize); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetViewportOrgEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ + /* FIXME share memory */ + return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +SetBrushOrgEx(HDC hdc, + int nXOrg, + int nYOrg, + LPPOINT lppt) +{ + /* FIXME share memory */ + return NtGdiSetBrushOrg(hdc,nXOrg,nYOrg,lppt); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +PtInRegion(IN HRGN hrgn, + int x, + int y) +{ + /* FIXME some stuff at user mode need be fixed */ + return NtGdiPtInRegion(hrgn,x,y); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +RectInRegion(HRGN hrgn, + LPCRECT prcl) +{ + /* FIXME some stuff at user mode need be fixed */ + return NtGdiRectInRegion(hrgn, (LPRECT) prcl); +} + +/* + * @unimplemented + */ +BOOL +STDCALL +RestoreDC(IN HDC hdc, + IN INT iLevel) +{ + /* FIXME Sharememory */ + return NtGdiRestoreDC(hdc, iLevel); +} + +/* + * @unimplemented + */ +INT +STDCALL +SaveDC(IN HDC hdc) +{ + /* FIXME Sharememory */ + return NtGdiSaveDC(hdc); +} + + + +/* + * @unimplemented + */ +BOOL +STDCALL +CancelDC(HDC hdc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +int +STDCALL +DrawEscape(HDC hdc, + int a1, + int a2, + LPCSTR a3) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + +/* + * @unimplemented + */ +int +STDCALL +EnumObjects(HDC hdc, + int a1, + GOBJENUMPROC a2, + LPARAM a3) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -239,21 +445,6 @@ SetMetaFileBitsEx( UINT a0, CONST BYTE *a1 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -UINT -STDCALL -SetSystemPaletteUse( - HDC a0, - UINT a1 ) { UNIMPLEMENTED; @@ -740,13 +931,11 @@ */ HCOLORSPACE STDCALL -GetColorSpace( - HDC hDc - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetColorSpace(HDC hDc) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } @@ -786,10 +975,6 @@ return retValue; } - - - - /* * @implemented */ @@ -1061,13 +1246,6 @@ * === WHERE ARE THEY DEFINED? ============= */ - - - - - - - /* * @unimplemented */ @@ -1122,25 +1300,6 @@ return 0; } - - - - -/* - * @unimplemented - */ -DWORD -STDCALL -SetFontEnumeration( - DWORD a0 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /* * @unimplemented */ @@ -1383,9 +1542,9 @@ STDCALL GdiIsMetaPrintDC(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1395,9 +1554,9 @@ STDCALL GdiIsPlayMetafileDC(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1407,9 +1566,9 @@ STDCALL GdiValidateHandle(HGDIOBJ hobj) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1419,9 +1578,9 @@ STDCALL GetBitmapAttributes(HBITMAP hbm) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1431,9 +1590,9 @@ STDCALL GetBrushAttributes(HBRUSH hbr) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1441,17 +1600,16 @@ */ BOOL STDCALL -GetCharABCWidthsI( - HDC hdc, - UINT giFirst, - UINT cgi, - LPWORD pgi, - LPABC lpabc +GetCharABCWidthsI(HDC hdc, + UINT giFirst, + UINT cgi, + LPWORD pgi, + LPABC lpabc ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1459,17 +1617,16 @@ */ BOOL STDCALL -GetCharWidthI( - HDC hdc, - UINT giFirst, - UINT cgi, - LPWORD pgi, - LPINT lpBuffer +GetCharWidthI(HDC hdc, + UINT giFirst, + UINT cgi, + LPWORD pgi, + LPINT lpBuffer ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } @@ -1508,9 +1665,9 @@ STDCALL GetHFONT(HDC dc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1518,13 +1675,12 @@ */ DWORD STDCALL -GetLayout( - HDC hdc +GetLayout(HDC hdc ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1573,9 +1729,9 @@ STDCALL MirrorRgn(HWND hwnd,HRGN hrgn) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } @@ -1587,9 +1743,9 @@ STDCALL QueryFontAssocStatus(VOID) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1653,14 +1809,12 @@ */ DWORD STDCALL -SetLayout( - HDC hdc, - DWORD dwLayout -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +SetLayout(HDC hdc, + DWORD dwLayout) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1670,34 +1824,12 @@ STDCALL SetLayoutWidth(HDC hdc,LONG wox,DWORD dwLayout) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetMagicColors(HDC hdc,PALETTEENTRY peMagic,ULONG Index) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetVirtualResolution(HDC hdc, int cxVirtualDevicePixel,int cyVirtualDevicePixel,int cxVirtualDeviceMm, int cyVirtualDeviceMm) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + /* * @unimplemented @@ -1706,9 +1838,9 @@ STDCALL StartFormPage(HDC hdc) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1718,8 +1850,8 @@ STDCALL UnloadNetworkFonts(DWORD unknown) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } /* @@ -1760,11 +1892,12 @@ */ BOOL STDCALL -GdiRealizationInfo(HDC hdc, PREALIZATION_INFO pri) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiRealizationInfo(HDC hdc, + PREALIZATION_INFO pri) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } @@ -1774,23 +1907,27 @@ */ BOOL STDCALL -GetETM(HDC hdc,EXTTEXTMETRIC *petm) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiAddGlsRecord(HDC hdc,DWORD unknown1,LPCSTR unknown2,LPRECT unknown3) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GetETM(HDC hdc, + EXTTEXTMETRIC *petm) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiAddGlsRecord(HDC hdc, + DWORD unknown1, + LPCSTR unknown2, + LPRECT unknown3) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1800,9 +1937,9 @@ STDCALL GdiConvertMetaFilePict(HGLOBAL hMem) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1812,68 +1949,72 @@ STDCALL GdiConvertToDevmodeW(DEVMODEA *dm) { - LPDEVMODEW dmw; - - dmw = HEAP_alloc(sizeof(DEVMODEW)); -#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)dm->f, len, dmw->f, len ) -#define COPYN(f) dmw->f = dm->f - COPYS(dmDeviceName, CCHDEVICENAME ); - COPYN(dmSpecVersion); - COPYN(dmDriverVersion); - switch ( dm->dmSize ) + LPDEVMODEW dmw; + + dmw = HEAP_alloc(sizeof(DEVMODEW)); + #define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)dm->f, len, dmw->f, len ) + #define COPYN(f) dmw->f = dm->f + COPYS(dmDeviceName, CCHDEVICENAME ); + COPYN(dmSpecVersion); + COPYN(dmDriverVersion); + switch ( dm->dmSize ) { - case SIZEOF_DEVMODEA_300: - dmw->dmSize = SIZEOF_DEVMODEW_300; - break; - case SIZEOF_DEVMODEA_400: - dmw->dmSize = SIZEOF_DEVMODEW_400; - break; - case SIZEOF_DEVMODEA_500: - default: /* FIXME what to do??? */ - dmw->dmSize = SIZEOF_DEVMODEW_500; - break; + case SIZEOF_DEVMODEA_300: + dmw->dmSize = SIZEOF_DEVMODEW_300; + break; + case SIZEOF_DEVMODEA_400: + dmw->dmSize = SIZEOF_DEVMODEW_400; + break; + case SIZEOF_DEVMODEA_500: + default: /* FIXME what to do??? */ + dmw->dmSize = SIZEOF_DEVMODEW_500; + break; } - COPYN(dmDriverExtra); - COPYN(dmFields); - COPYN(dmPosition.x); - COPYN(dmPosition.y); - COPYN(dmScale); - COPYN(dmCopies); - COPYN(dmDefaultSource); - COPYN(dmPrintQuality); - COPYN(dmColor); - COPYN(dmDuplex); - COPYN(dmYResolution); - COPYN(dmTTOption); - COPYN(dmCollate); - COPYS(dmFormName,CCHFORMNAME); - COPYN(dmLogPixels); - COPYN(dmBitsPerPel); - COPYN(dmPelsWidth); - COPYN(dmPelsHeight); - COPYN(dmDisplayFlags); // aka dmNup - COPYN(dmDisplayFrequency); - - if ( dm->dmSize <= SIZEOF_DEVMODEA_300 ) - return dmw; // we're done with 0x300 fields - - COPYN(dmICMMethod); - COPYN(dmICMIntent); - COPYN(dmMediaType); - COPYN(dmDitherType); - COPYN(dmReserved1); - COPYN(dmReserved2); - - if ( dm->dmSize <= SIZEOF_DEVMODEA_400 ) - return dmw; // we're done with 0x400 fields - - COPYN(dmPanningWidth); - COPYN(dmPanningHeight); - - return dmw; - -#undef COPYN -#undef COPYS + COPYN(dmDriverExtra); + COPYN(dmFields); + COPYN(dmPosition.x); + COPYN(dmPosition.y); + COPYN(dmScale); + COPYN(dmCopies); + COPYN(dmDefaultSource); + COPYN(dmPrintQuality); + COPYN(dmColor); + COPYN(dmDuplex); + COPYN(dmYResolution); + COPYN(dmTTOption); + COPYN(dmCollate); + COPYS(dmFormName,CCHFORMNAME); + COPYN(dmLogPixels); + COPYN(dmBitsPerPel); + COPYN(dmPelsWidth); + COPYN(dmPelsHeight); + COPYN(dmDisplayFlags); // aka dmNup + COPYN(dmDisplayFrequency); + + if ( dm->dmSize <= SIZEOF_DEVMODEA_300 ) + { + return dmw; // we're done with 0x300 fields + } + + COPYN(dmICMMethod); + COPYN(dmICMIntent); + COPYN(dmMediaType); + COPYN(dmDitherType); + COPYN(dmReserved1); + COPYN(dmReserved2); + + if ( dm->dmSize <= SIZEOF_DEVMODEA_400 ) + { + return dmw; // we're done with 0x400 fields + } + + COPYN(dmPanningWidth); + COPYN(dmPanningHeight); + + return dmw; + + #undef COPYN + #undef COPYS } /* @@ -1883,9 +2024,9 @@ STDCALL GdiCreateLocalEnhMetaFile(HENHMETAFILE hmo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1895,9 +2036,9 @@ STDCALL GdiCreateLocalMetaFilePict(HENHMETAFILE hmo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } @@ -1906,27 +2047,25 @@ */ HANDLE STDCALL -GdiGetSpoolFileHandle( - LPWSTR pwszPrinterName, - LPDEVMODEW pDevmode, - LPWSTR pwszDocName) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiDeleteSpoolFileHandle( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, + LPWSTR pwszDocName) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1934,12 +2073,11 @@ */ DWORD STDCALL -GdiGetPageCount( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetPageCount(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1947,12 +2085,11 @@ */ HDC STDCALL -GdiGetDC( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetDC(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -1960,127 +2097,119 @@ */ HANDLE STDCALL -GdiGetPageHandle( - HANDLE SpoolFileHandle, - DWORD Page, - LPDWORD pdwPageType) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiStartDocEMF( - HANDLE SpoolFileHandle, - DOCINFOW *pDocInfo) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiStartPageEMF( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiPlayPageEMF( - HANDLE SpoolFileHandle, - HANDLE hemf, - RECT *prectDocument, - RECT *prectBorder, - RECT *prectClip) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiEndPageEMF( - HANDLE SpoolFileHandle, - DWORD dwOptimization) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiEndDocEMF( - HANDLE SpoolFileHandle) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiGetDevmodeForPage( - HANDLE SpoolFileHandle, - DWORD dwPageNumber, - PDEVMODEW *pCurrDM, - PDEVMODEW *pLastDM) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiResetDCEMF( - HANDLE SpoolFileHandle, - PDEVMODEW pCurrDM) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +GdiGetPageHandle(HANDLE SpoolFileHandle, + DWORD Page, + LPDWORD pdwPageType) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiStartDocEMF(HANDLE SpoolFileHandle, + DOCINFOW *pDocInfo) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiStartPageEMF(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiPlayPageEMF(HANDLE SpoolFileHandle, + HANDLE hemf, + RECT *prectDocument, + RECT *prectBorder, + RECT *prectClip) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiEndPageEMF(HANDLE SpoolFileHandle, + DWORD dwOptimization) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiEndDocEMF(HANDLE SpoolFileHandle) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiGetDevmodeForPage(HANDLE SpoolFileHandle, + DWORD dwPageNumber, + PDEVMODEW *pCurrDM, + PDEVMODEW *pLastDM) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiResetDCEMF(HANDLE SpoolFileHandle, + PDEVMODEW pCurrDM) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } HBITMAP STDCALL -CreateDIBitmap(HDC - hDc, const BITMAPINFOHEADER *Header, - DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, - UINT ColorUse) -{ - /* FIMXE we need do more thing in user mode */ - return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); +CreateDIBitmap(HDC hDc, + const BITMAPINFOHEADER *Header, + DWORD Init, LPCVOID Bits, const BITMAPINFO *Data, + UINT ColorUse) +{ + /* FIMXE we need do more thing in user mode */ + return NtGdiCreateDIBitmap(hDc, Header, Init, Bits, Data, ColorUse); } /* @@ -2089,9 +2218,9 @@ INT STDCALL CombineRgn(HRGN hDest, - HRGN hSrc1, - HRGN hSrc2, - INT CombineMode) + HRGN hSrc1, + HRGN hSrc2, + INT CombineMode) { /* FIXME some part should be done in user mode */ return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); @@ -2101,12 +2230,11 @@ * @unimplemented */ HBITMAP STDCALL -CreateBitmap( - INT Width, - INT Height, - UINT Planes, - UINT BitsPixel, - PCVOID pUnsafeBits) +CreateBitmap(INT Width, + INT Height, + UINT Planes, + UINT BitsPixel, + PCVOID pUnsafeBits) { /* FIXME some part should be done in user mode */ return NtGdiCreateBitmap(Width, Height, Planes, BitsPixel, (LPBYTE) pUnsafeBits); @@ -2121,9 +2249,9 @@ LPWSTR STDCALL EngGetDriverName(HDEV hdev) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -2173,96 +2301,46 @@ NULL); } - - /* * @unimplemented */ BOOL STDCALL -STROBJ_bEnum(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -STROBJ_bEnumPositionsOnly(STROBJ *pstro,ULONG *pc,PGLYPHPOS *ppgpos) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL STDCALL -STROBJ_bGetAdvanceWidths(STROBJ *pso,ULONG iFirst,ULONG c,POINTQF *pptqD) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD STDCALL -STROBJ_dwGetCodePage(STROBJ *pstro) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -VOID STDCALL -STROBJ_vEnumStart(STROBJ *pstro) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -} - -/* - * @unimplemented - */ -BOOL STDCALL -XFORMOBJ_bApplyXform(XFORMOBJ *pxo,ULONG iMode,ULONG cPoints,PVOID pvIn,PVOID pvOut) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +XFORMOBJ_bApplyXform(XFORMOBJ *pxo, + ULONG iMode, + ULONG cPoints, + PVOID pvIn, + PVOID pvOut) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* * @unimplemented */ ULONG STDCALL -XFORMOBJ_iGetXform(XFORMOBJ *pxo,XFORML *pxform) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG STDCALL +XFORMOBJ_iGetXform(XFORMOBJ *pxo, + XFORML *pxform) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +ULONG +STDCALL XLATEOBJ_cGetPalette(XLATEOBJ *XlateObj, - ULONG PalOutType, - ULONG cPal, - ULONG *OutPal) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + ULONG PalOutType, + ULONG cPal, + ULONG *OutPal) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -2271,9 +2349,9 @@ HANDLE STDCALL XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -2281,20 +2359,21 @@ */ ULONG STDCALL XLATEOBJ_iXlate(XLATEOBJ *XlateObj, - ULONG Color) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -ULONG * STDCALL + ULONG Color) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +ULONG * +STDCALL XLATEOBJ_piVector(XLATEOBJ *XlateObj) { - return XlateObj->pulXlate; + return XlateObj->pulXlate; } /* @@ -2302,37 +2381,32 @@ */ BOOL STDCALL -GdiPlayEMF -( - LPWSTR pwszPrinterName, - LPDEVMODEW pDevmode, - LPWSTR pwszDocName, - EMFPLAYPROC pfnEMFPlayFn, - HANDLE hPageQuery +GdiPlayEMF(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, + LPWSTR pwszDocName, + EMFPLAYPROC pfnEMFPlayFn, + HANDLE hPageQuery ) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - - -/* - * @unimplemented - */ -BOOL -STDCALL -GdiPlayPrivatePageEMF -( - HANDLE SpoolFileHandle, - DWORD unknown, - RECT *prectDocument -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + + + +/* + * @unimplemented + */ +BOOL +STDCALL +GdiPlayPrivatePageEMF(HANDLE SpoolFileHandle, + DWORD unknown, + RECT *prectDocument) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* @@ -2340,8 +2414,8 @@ */ VOID STDCALL GdiInitializeLanguagePack(DWORD InitParam) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } @@ -2352,8 +2426,8 @@ STDCALL ExcludeClipRect(IN HDC hdc, IN INT xLeft, IN INT yTop, IN INT xRight, IN INT yBottom) { - /* FIXME some part need be done on user mode size */ - return NtGdiExcludeClipRect(hdc, xLeft, yTop, xRight, yBottom); + /* FIXME some part need be done on user mode size */ + return NtGdiExcludeClipRect(hdc, xLeft, yTop, xRight, yBottom); } /* @@ -2363,8 +2437,8 @@ STDCALL ExtSelectClipRgn( IN HDC hdc, IN HRGN hrgn, IN INT iMode) { - /* FIXME some part need be done on user mode size */ - return NtGdiExtSelectClipRgn(hdc,hrgn, iMode); + /* FIXME some part need be done on user mode size */ + return NtGdiExtSelectClipRgn(hdc,hrgn, iMode); } /* @@ -2390,18 +2464,17 @@ */ BOOL STDCALL -GdiTransparentBlt( - IN HDC hdcDst, - IN INT xDst, - IN INT yDst, - IN INT cxDst, - IN INT cyDst, - IN HDC hdcSrc, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN COLORREF TransColor +GdiTransparentBlt(IN HDC hdcDst, + IN INT xDst, + IN INT yDst, + IN INT cxDst, + IN INT cyDst, + IN HDC hdcSrc, + IN INT xSrc, + IN INT ySrc, + IN INT cxSrc, + IN INT cySrc, + IN COLORREF TransColor ) { /* FIXME some part need be done in user mode */ Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Sun Sep 23 15:33:47 2007 @@ -233,23 +233,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -RemoveFontResourceExA( - LPCSTR lpFileName, - DWORD fl, - PVOID pdv -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; } /* Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Sun Sep 23 15:33:47 2007 @@ -271,21 +271,7 @@ return retValue; } -/* - * @unimplemented - */ -BOOL -STDCALL -RemoveFontResourceExW( - LPCWSTR lpFileName, - DWORD fl, - PVOID pdv -) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Sun Sep 23 15:33:47 2007 @@ -158,7 +158,8 @@ STDCALL SetWorldTransform( HDC hDC, CONST XFORM *Xform ) { - return ModifyWorldTransform( hDC, Xform, MWT_MAX+1); // MWT_SETXFORM? + /* FIXME shall we add undoc #define MWT_SETXFORM 4 ?? */ + return ModifyWorldTransform( hDC, Xform, MWT_MAX+1); } Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sun Sep 23 15:33:47 2007 @@ -1173,11 +1173,9 @@ */ BOOL STDCALL -RemoveFontResourceW( - LPCWSTR lpFileName - ) -{ - return NtGdiRemoveFontResource ( lpFileName ); +RemoveFontResourceW(LPCWSTR lpFileName) +{ + return RemoveFontResourceExW(lpFileName,0,0); } @@ -1186,26 +1184,57 @@ */ BOOL STDCALL -RemoveFontResourceA( - LPCSTR lpFileName - ) -{ - NTSTATUS Status; - LPWSTR lpFileNameW; - BOOL rc = 0; - - Status = HEAP_strdupA2W ( &lpFileNameW, lpFileName ); - if (!NT_SUCCESS (Status)) +RemoveFontResourceA(LPCSTR lpFileName) +{ + return RemoveFontResourceExA(lpFileName,0,0); +} + +/* + * @implemented + */ +BOOL +STDCALL +RemoveFontResourceExA(LPCSTR lpFileName, + DWORD fl, + PVOID pdv +) +{ + NTSTATUS Status; + LPWSTR lpFileNameW; + BOOL rc = 0; + + /* FIXME the flags */ + /* FIXME the pdv */ + /* FIXME NtGdiRemoveFontResource handle flags and pdv */ + + Status = HEAP_strdupA2W ( &lpFileNameW, lpFileName ); + if (!NT_SUCCESS (Status)) SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiRemoveFontResource ( lpFileNameW ); - - HEAP_free ( lpFileNameW ); + else + { + rc = NtGdiRemoveFontResource ( lpFileNameW ); + + HEAP_free ( lpFileNameW ); } return rc; } + +/* + * @unimplemented + */ +BOOL +STDCALL +RemoveFontResourceExW(LPCWSTR lpFileName, + DWORD fl, + PVOID pdv) +{ + /* FIXME the flags */ + /* FIXME the pdv */ + /* FIXME NtGdiRemoveFontResource handle flags and pdv */ + return NtGdiRemoveFontResource ( lpFileName); +} + /*********************************************************************** * GdiGetCharDimensions

1 0

[cfinck] 29153: Fix the intl.cpl build
by cfinck＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: cfinck Date: Sun Sep 23 15:30:09 2007 New Revision: 29153 URL: http://svn.reactos.org/svn/reactos?rev=29153&view=rev Log: Fix the intl.cpl build Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc Sun Sep 23 15:30:09 2007 @@ -25,7 +25,7 @@ EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Localisation géographique", -1, 5, 172, 234, 55 - LTEXT Configurez votre localisation pour que des services puissent vous fournir des informations locales, comme par exemple, les nouvelles et la météo", -1, 14, 184, 210, 24 + LTEXT "Configurez votre localisation pour que des services puissent vous fournir des informations locales, comme par exemple, les nouvelles et la météo", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END

1 0

[dreimer] 29152: Bug 2677: Ukrainian translation update (rstzab@yandex.ru) Bug 2678: Dutch translations for all screensavers by Joost de Meij (dreamsmsn@gmail.com) Bug 2680: Updated (french) translations (heis_spiter@hotmail.com)
by dreimer＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: dreimer Date: Sun Sep 23 15:05:44 2007 New Revision: 29152 URL: http://svn.reactos.org/svn/reactos?rev=29152&view=rev Log: Bug 2677: Ukrainian translation update (rstzab(a)yandex.ru) Bug 2678: Dutch translations for all screensavers by Joost de Meij (dreamsmsn(a)gmail.com) Bug 2680: Updated (french) translations (heis_spiter(a)hotmail.com) Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/cylfrac/lang/nl-NL.rc trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc trunk/reactos/base/applications/screensavers/matrix/lang/nl-NL.rc trunk/reactos/base/applications/screensavers/scrnsave/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/scrnsave/lang/nl-NL.rc trunk/reactos/base/applications/screensavers/starfield/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/starfield/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc trunk/reactos/base/applications/screensavers/matrix/rsrc.rc trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc trunk/reactos/base/applications/screensavers/starfield/starfield.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/lang/fr-FR.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc (original) +++ trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc Sun Sep 23 15:05:44 2007 @@ -12,4 +12,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/nl-NL.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/screensavers/cylfrac/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Fractale de cylindres" + IDS_TITLE "À propos de" + IDS_TEXT "Fractale de cylindres par unC0Rr.\nSpécial pour ReactOS." +END Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/screensavers/cylfrac/lang/nl-NL.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Cylinders fractal" + IDS_TITLE "Informatie" + IDS_TEXT "Cylinders fractal door unC0Rr.\nSpeciaal voor ReactOS." +END Added: trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Écran de veille de logon" + IDS_TITLE "À propos de" + IDS_TEXT "Il n'y a aucune option à définir." +END Added: trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/nl-NL.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon Schermbeveiliging" + IDS_TITLE "Informatie" + IDS_TEXT "Geen dingen om in te stellen." +END Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Sun Sep 23 15:05:44 2007 @@ -15,4 +15,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/nl-NL.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -43,11 +43,11 @@ WS_VSCROLL | WS_TABSTOP CONTROL "Gras",IDC_BOLD,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,247,134,46,10 - CTEXT "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140, + CTEXT "Écran de veille Matrix www.catch22.org.uk",IDC_ABOUT,140, 158,75,18 END STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Matrix ScreenSaver" + IDS_DESCRIPTION "Écran de veille Matrix" END Added: trunk/reactos/base/applications/screensavers/matrix/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/screensavers/matrix/lang/nl-NL.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,53 @@ +#include "resource.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_CONFIG DIALOG DISCARDABLE 0, 0, 340, 183 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Matrix Schermbeveiliging Configuratie" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Decodeer &Snelheid",IDC_STATIC,7,7,128,36 + LTEXT "Langzamer",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "Sneller",IDC_STATIC,104,24,20,8 + GROUPBOX "Cypher &Dichtheid",IDC_STATIC,7,50,128,36 + LTEXT "Minder",IDC_STATIC,13,67,19,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "Meer",IDC_STATIC,104,67,23,8 + GROUPBOX "Snel&heid van het bericht",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "Langzamer",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "Sneller",IDC_STATIC,104,110,22,8 + GROUPBOX "&Lettertype Grootte",IDC_STATIC,7,137,127,36 + LTEXT "Kleiner",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "Groter",IDC_STATIC,104,153,25,8 + GROUPBOX "&Gecodeerde berichten",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&Toevoegen",IDC_ADD,280,41,44,18 + PUSHBUTTON "&Verwijderen",IDC_REMOVE,280,66,44,18 + CONTROL "Willekeurige &Berichten",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "&Annuleren",IDCANCEL,283,162,50,14 + LTEXT "&Lettertype:",IDC_STATIC,151,118,38,8 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "&Vetgedrukt",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "Matrix Schermbeveiliging www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Matrix Schermbeveiliging" +END Modified: trunk/reactos/base/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/rsrc.rc Sun Sep 23 15:05:44 2007 @@ -11,6 +11,7 @@ #include "lang/en-US.rc" #include "lang/de-DE.rc" #include "lang/fr-FR.rc" +#include "lang/nl-NL.rc" #include "lang/th-TH.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/scrnsave/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/screensavers/scrnsave/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Écran de veille par défaut" + IDS_TITLE "À propos de" + IDS_TEXT "Il n'y a aucune option à définir." +END Added: trunk/reactos/base/applications/screensavers/scrnsave/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/screensavers/scrnsave/lang/nl-NL.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Standaard Schermbeveiliging" + IDS_TITLE "Informatie" + IDS_TEXT "Geen dingen om in te stellen." +END Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc (original) +++ trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc Sun Sep 23 15:05:44 2007 @@ -12,4 +12,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/nl-NL.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/screensavers/starfield/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/screensavers/starfield/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Écran de veille Champ d'étoile" + IDS_TITLE "À propos de" + IDS_TEXT "Il n'y a aucune option à définir." +END Added: trunk/reactos/base/applications/screensavers/starfield/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/screensavers/starfield/lang/nl-NL.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,8 @@ +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Sterren Schermbeveiliging" + IDS_TITLE "Informatie" + IDS_TEXT "Geen dingen om in te stellen." +END Modified: trunk/reactos/base/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rc (original) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rc Sun Sep 23 15:05:44 2007 @@ -12,4 +12,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" +#include "lang/nl-NL.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/dll/cpl/access/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/access/lang/uk-UA.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,304 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Êëàâ³àòóðà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Çàëèïàííÿ êëàâ³ø",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Ââåäåííÿ êîìá³íàö³é ç êëàâ³øàìè Shift, Ctrl ÷è Alt, íàòèñêàþ÷è êëàâ³ø³ ïîñë³äîâíî.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Çàëèïàííÿ êëàâ³ø",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "&Íàñòðîéêà",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(5)+6,PROPSHEETPADDING(15)-5,14 + + GROUPBOX "Ô³ëüòðàö³ÿ ââîäó",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "²ãíîðóâàííÿ âèïàäêîâèõ êîðîòêî÷àñíèõ àáî ïîâòîðþâàíèõ çàòèñêàíü êëàâ³ø.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Âèêîðèñòîâóâàòè &ô³ëüòðàö³þ ââîäó",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "Í&àñòðîéêà",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(13)+6,PROPSHEETPADDING(15)-5,14 + + GROUPBOX "Îçâó÷óâàííÿ ïåðåêëþ÷åííÿ ðåæèì³â",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Ïðè çì³í³ ñòàíó êëàâ³ø Caps Lock, Num Lock ³ Scroll Lock çâó÷èòü ñèãíàë.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "&Îçâó÷óâàííÿ",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "Íà&ñòðîéêà",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17)+5,LABELLINE(20)+6,PROPSHEETPADDING(15)-5,14 + + AUTOCHECKBOX "&Äîäàòêîâ³ â³äîìîñò³ ïðî ðîáîòó ³ç êëàâ³àòóðîþ",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çâóê" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Â³çóàëüíå ³íôîðìóâàííÿ",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) + LTEXT "Çâóêîâ³ ñèãíàëè ñèñòåìè ñóïðîâîäæóþòüñÿ â³çóàëüíîþ ³íôîðìàö³ºþ.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Â&³çóàëüíå ³íôîðìóâàííÿ",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15)+2,14 + LTEXT "²íôîðìóâàòè êîðèñòóâà÷à:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_SENTRY_COMBO, PROPSHEETPADDING(2), LABELLINE(9), PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + GROUPBOX "Ñóáòèòðè",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Ñóïðîâ³ä çâóêó ³ ìîâè â ïðîãðàìàõ ñóáòèòðàìè.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Ñ&óáòèòðè",IDC_SSHOW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Åêðàí" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Âèñîêà êîíòðàñòí³ñòü",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Âèêîðèñòàííÿ ñèñòåìè êîëüîð³â ³ øðèôò³â, ÿê³ ïîëåêøóþòü çîðîâå ñïðèéíÿòòÿ òåêñòó.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Âèñîêà êîíòðàñòí³ñòü",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "Í&àñòðîéêà",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Ïàðàìåòðè êóðñîðó",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Íàëàøòóâàííÿ ÷àñòîòè ìèãîò³ííÿ ³ òîâùèíè êóðñîðó.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "×àñòîòà ìèãîò³ííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Â³äñóòíº",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Øâèäêå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(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 "Òîâùèíà êóðñîðó:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Âóçüêèé",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Øèðîêèé",-1,PROPSHEETWIDTH-PROPSHEETPADDING(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-PROPSHEETPADDING(20),LABELLINE(2) + LTEXT "",IDC_CURSOR_WIDTH_TEXT,PROPSHEETPADDING(3),LABELLINE(16),PROPSHEETPADDING(4),LABELLINE(1)+5 +END + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ìèøà" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Êåðóâàííÿ âêàç³âíèêîì ìèø³ ç êëàâ³àòóðè",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Êåðóâàííÿ ìèøåþ ³ç öèôðîâî¿ ïàíåë³ êëàâ³àòóðè.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Êåðóâàííÿ ç êëàâ³àòóðè",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "Í&àñòðîéêà",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Àâòîìàòè÷íå ñêèäàííÿ ñïåö³àëüíèõ ìîæëèâîñòåé",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "&Â³äêëþ÷àòè ñïåö³àëüí³ ìîæëèâîñò³ â ðàç³ ïðîñòîþ ïðîòÿãîì:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + GROUPBOX "Ñïîâ³ùåííÿ",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "&Ïîêàçóâàòè ïîïåðåäæåííÿ ïðè ââ³ìêíåííÿ ðåæèìó",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Ï&îäàâàòè çâóêîâèé ñèãíàë ïðè çì³í³ ðåæèìó",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Àëüòðåðíàòèâí³ ïðèñòðî¿ ââîäó",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "Âèêîðèñòàííÿ àëüòåðíàòèâíèõ ïðèñòðî¿â ââîäó, ÿê³ çàì³íÿþòü ìèøó ³ êëàâ³àòóðó.",-1,PROPSHEETPADDING(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "&Àëüòåðíàòèâí³ ïðèñòðî¿ ââîäó",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "&Íàñòðîéêà",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14 + + GROUPBOX "Àäì³í³ñòðàòèâí³ ïàðàìåòðè",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "Çàñ&òîñóâàòè äî ðîáî÷îãî ñòîëà âõîäó äî ñèñòåìè",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Çàñòîñîâóâàòè äëÿ âñ³õ íîâèõ êîðèñòóâà÷³â",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 +END + + +IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàëàøòóâàííÿ ðåæèìó çàëèïàííÿ êëàâ³ø" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Íàòèñêàííÿ êëàâ³ø³ SHIFT 5 ðàç³â àêòèâóº ðåæèì çàëèïàííÿ êëàâ³ø.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè òàêèé ñïîñ³á óâ³ìêíåííÿ",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Ïàðàìåòðè",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Ùîá çàáëîêóâàòè ñëóæáîâó êëàâ³øó, íàòèñí³òü ¿¿ äâ³÷³",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Âèìèêàòè çàëèïàííÿ êëàâ³ø íàòèñíåííÿì äâîõ êëàâ³ø îäíî÷àñíî",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "²íôîðìóâàííÿ",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Çâóêîâèé ñèãíàë ïðè íàòèñêàíñíåíí³ ñëóæáîâî¿ êëàâ³ø³",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Ïîêàçóâàòè ñòàí Çàëèïàííÿ êëàâ³ø íà åêðàí³",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàëàøòóâàííÿ ðåæèìó ô³ëüòðàö³¿" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Âèêëèêîì ç êëàâ³àòóðè º \nÓòðèìóâàííÿ ïðàâî¿ êëàâ³ø³ <Shift> âïðîäîâæ 8 ñåêóíä",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè òàêèé øâèäêèé âèêëèê",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + + GROUPBOX "Íàëàøòóâàííÿ ô³ëüòðó",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 + AUTORADIOBUTTON "&²ãíîðóâàòè ïîâòîðí³ íàòèñêàííÿ êëàâ³ø",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP + AUTORADIOBUTTON "²ãíîðóâàòè &êîðîòêî÷àñí³ íàòèñíåííÿ ³ çìåíøèòè ÷àñòîòó ïîâòîðåííÿ",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE + PUSHBUTTON "&Íàñòðîéêà",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP + PUSHBUTTON "Íà&ñòðîéêà",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP + LTEXT "Í&àòèñí³òü òóò ùîá ïåðåâ³ðèòè íàëàøòóâàííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(14)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + EDITTEXT IDC_FILTER_TEST_EDIT,PROPSHEETPADDING(2),LABELLINE(15)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),14,WS_GROUP|ES_AUTOHSCROLL + + GROUPBOX "²íôîðìóâàííÿ",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 + AUTOCHECKBOX "&Ïîäàâàòè òîí, êîëè íàòèñêàííÿ êëàâ³ø³ ïðèéíÿòî",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + AUTOCHECKBOX "Ïî&êàçóâàòè ñòàí 'Ô³ëüòðàö³¿ ââîäó' íà åêðàí³",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_TOGGLEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Îçâó÷óâàííÿ ïåðåêëþ÷åííÿ ðåæèì³â" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Äëÿ øâèêî¿ àêòèâàö³¿\nÓòðèìóéòå êëàâ³øó <Num Lock> âïðîäîâæ ï'ÿòè ñåêóíä.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Âèêî&ðèñòîâóâàòè òàêèé øâèêäèé âèêëèê",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_CONTRASTOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàëàøòóâàííÿ âèñîêî¿ êîíòðàñòíîñò³" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Äëÿ àêòèâàö³¿ \níàòèñí³òü <ALT çë³âà+SHIFT çë³âà +PRINT SCREEN>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè òàêèé ñïîñ³á óâ³ìêíåííÿ",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "êîíòðàñòíà ñõåìà îôîðìëåííÿ",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Ïîòî÷íà êîíòðàñòíà ñõåìà îôîðìëåííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_MOUSEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàñòðîéêà êåðóâàííÿ âêàç³âíèêîì ³ç êëàâ³àòóðè" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óâ³ìêíåííÿ ðåæèìó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Ùîá óâ³ìêíóòè ðåæèì êåðóâàííÿ âêàç³âíèêîì ³ç êëàâ³àòóðè: \nÍàòèñí³òü êëàâ³ø³ <ALT çë³âà+SHIFT çë³âà + NUM LOCK>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Âèêîðèñòîâóâàòè òàêèé ñïîñ³á óâ³ìêíåííÿ",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Øâèäê³ñòü ðóõó âêàç³âíèêà",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Íàéá³ëüøà:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "íèæ÷å",-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-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "âèùå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Ïðèñêîðåííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "íèæ÷å",-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-PROPSHEETPADDING(22),LABELLINE(2) + LTEXT "âèùå",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "CTRL - ïðèñ&êîðåííÿ, SHIFT - óïîâ³ëüåííÿ",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Âèêîðèñòîâóâàòè êåðóâàííÿ ç êëàâ³àòóðè, ÿêùî NumLock:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "Óâ³&ìêíóòî",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "â&èìêíåíî",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "Ï&îêàçóâàòè ñòàí êåðóâàííÿ âêàç³âíèêîì íà åêðàí³",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_BOUNCEKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Äîäàòêîâ³ ïàðàìåòðè ðåæèìó ô³ëüòðàö³¿" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïîâòîðåííÿ ñèìâîë³â",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&²ãíîðóâàòè íàòèñêàííÿ êëàâ³ø, ÿê³ ïîâòîðþþòüñÿ ÷àñò³øå í³æ:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Ïåðåâ³ðêà:",-1,PROPSHEETPADDING(1),LABELLINE(7)+3,PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_REPEATKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Äîäàòêîâ³ ïàðàìåòðè ðåæèìó ô³ëüòðàö³¿" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïîâòîðåííÿ ñèìâîë³â",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Çì³íà ïàðàìåòð³â êëàâ³àòóðè íà ïàíåë³ êåðóâàííÿ:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + AUTORADIOBUTTON "&íå ïîâòîðþâàòè",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&óïîâ³ëüíåííÿ ïîâòîð³â",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "&Çàòðèìêà ïåðåä ïîâòîðåííÿì:",-1,PROPSHEETPADDING(4),LABELLINE(6)+4,PROPSHEETPADDING(10),LABELLINE(1) + COMBOBOX IDC_REPEAT_DELAY_COMBO, PROPSHEETPADDING(4), LABELLINE(7)+6, PROPSHEETWIDTH-PROPSHEETPADDING(6), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Øâèäê³ñòü ïîâòîðåííÿ:",-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 "Ïîâ³ëüíå íàòèñêàííÿ êëàâ³ø",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Óòðèìóâàííÿ íàòèñíóòî¿ êëàâ³ø³:",-1,PROPSHEETPADDING(2),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + COMBOBOX IDC_REPEAT_WAIT_COMBO, PROPSHEETPADDING(2), LABELLINE(16)+4, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Ïåðåâ³ðêà:",-1,PROPSHEETPADDING(1),LABELLINE(20),PROPSHEETPADDING(8),LABELLINE(1) + EDITTEXT IDC_REPEAT_TEST_EDIT,PROPSHEETPADDING(10),LABELLINE(19)+7,PROPSHEETWIDTH-PROPSHEETPADDING(11),14,ES_AUTOHSCROLL + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Íàñòðîéêà àëüòåðíàòèâíîãî ïðèñòðîþ ââîäó" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ïîñë³äîâíèé ïðèñòð³é ââîäó",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Óêàæ³òü ïîðò, äî ÿêîãî ï³äêëþ÷åíî àëüòåðíàòèâíèé ïðèñòð³é ââîäó.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Ïîñë³äîâíèé ïîðò:",-1,PROPSHEETPADDING(2),LABELLINE(3)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_SERIAL_PORT_COMBO, PROPSHEETPADDING(2), LABELLINE(4)+7, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + LTEXT "&Øâèäê³ñòü:",-1,PROPSHEETPADDING(2),LABELLINE(7),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + COMBOBOX IDC_SERIAL_BAUD_COMBO, PROPSHEETPADDING(2), LABELLINE(8)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(8), + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ñïåö³àëüí³ ìîæëèâîñò³" + IDS_CPLSYSTEMDESCRIPTION "Íàëàøòóâàííÿ ñïåö³àëüíèõ ìîæëèâîñòåé Âàøîãî êîìï'þòåðà." + + IDS_SENTRY_NONE "[íåìàº]" + IDS_SENTRY_TITLE "Ï³äñâ³÷óâàòè çàãëîâîê" + IDS_SENTRY_WINDOW "Ï³äñâ³÷óâàòè àêòèâíå â³êíî" + IDS_SENTRY_DISPLAY "Ï³äñâ³÷óâàòè ðîáî÷èé ñò³ë" + + IDS_SECONDS "ñåêóíä" + IDS_MINUTES "õâèëèí" +END Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/rsrc.rc (original) +++ trunk/reactos/dll/cpl/access/rsrc.rc Sun Sep 23 15:05:44 2007 @@ -13,3 +13,4 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Sun Sep 23 15:05:44 2007 @@ -37,7 +37,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Sprachleisten-Einstellungen" FONT 8, "MS Shell Dlg" -{ +BEGIN GROUPBOX "", -1, 7, 7, 226, 85 AUTOCHECKBOX "&Die Sprachleiste auf dem Desktop anzeigen", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP AUTOCHECKBOX "Die Sprachleis&te transparent anzeigen wenn inaktiv", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 @@ -46,13 +46,13 @@ AUTOCHECKBOX "E&rweiterte Textdienste deaktivieren", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 182, 99, 50, 14 -} +END IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Erweiterte Tasteneinstellungen" FONT 8, "MS Shell Dlg" -{ +BEGIN GROUPBOX "Um Caps Lock zu deaktivieren", -1, 7, 7, 258, 26 AUTORADIOBUTTON "Caps &Lock Taste drücken", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP AUTORADIOBUTTON "&Shift Taste drücken", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP @@ -63,26 +63,26 @@ PUSHBUTTON "Tastenkombination änder&n...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 146, 140, 70, 14 -} +END IDD_ADD DIALOG 20, 20, 227, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Eingabesprache hinzufügen" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 -} +END IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Tastenkombination ändern" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "", -1, 16, 5, 250, 10 GROUPBOX "", -1, 12, 17, 184, 48 AUTOCHECKBOX "Tastenkombination aktivi&eren", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 @@ -95,20 +95,20 @@ COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 212, 47, 50, 14 -} +END IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Eingabesprache Einstellungen" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Eingabesprache:", -1, 7, 7, 61, 8 LTEXT "", -1, 73, 7, 129, 8 LTEXT "&Tastaturlayout/IME:", -1, 7, 21, 110, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14 -} +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Sun Sep 23 15:05:44 2007 @@ -37,7 +37,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Language Bar Settings" FONT 8, "MS Shell Dlg" -{ +BEGIN GROUPBOX "", -1, 7, 7, 226, 85 AUTOCHECKBOX "Show the Language &bar on the desktop", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP AUTOCHECKBOX "Show the Language bar as &transparent when inactive", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 @@ -46,13 +46,13 @@ AUTOCHECKBOX "Turn &off advanced text services", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 182, 99, 50, 14 -} +END IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Advanced Key Settings" FONT 8, "MS Shell Dlg" -{ +BEGIN GROUPBOX "To turn off Caps Lock", -1, 7, 7, 258, 26 AUTORADIOBUTTON "Press the CAPS &LOCK key", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP AUTORADIOBUTTON "Press the SHI&FT key", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP @@ -63,26 +63,26 @@ PUSHBUTTON "&Change Key Sequence...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Cancel", IDCANCEL, 146, 140, 70, 14 -} +END IDD_ADD DIALOG 20, 20, 227, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Add Input language" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "&Input language:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Keyboard layout/IME:", -1, 7, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 169, 68, 50, 14 -} +END IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Key Sequence" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "", -1, 16, 5, 250, 10 GROUPBOX "", -1, 12, 17, 184, 48 AUTOCHECKBOX "&Enable Key Sequence", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 @@ -95,20 +95,20 @@ COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 212, 47, 50, 14 -} +END IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Input language Properties" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Input language:", -1, 7, 7, 61, 8 LTEXT "", -1, 73, 7, 129, 8 LTEXT "&Keyboard layout/IME:", -1, 7, 21, 110, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Cancel", IDCANCEL, 169, 53, 52, 14 -} +END STRINGTABLE BEGIN Added: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc (added) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -1,0 +1,249 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Paramètres" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Langue de saisie par défaut", -1, 7,7,231,53 + LTEXT "Sélectionnez une des langues de saisie installées pour l'utiliser quand vous allumez votre ordinateur.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "Services &installés", -1, 7,65,231,115 + LTEXT "Sélectionnez les services que vous voulez pour chaque langue de saisie affichée dans la liste. Utilisez les boutons Ajouter et Supprimer pour modifier cette liste.",-1,14,75,220,17 + CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "Définir par défaut", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "Ajouter...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "Supp&rimer...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Propriétés...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Préférences", -1, 7,185,231,36 + PUSHBUTTON "&Barre de langue...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "Paramètres des touches...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avancé" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Configuration de la compatibilité", -1, 7,7,231,60 + AUTOCHECKBOX "&Étendre le support des services avancés de à tous les programmes", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Sélectionnez cette case à cocher pour activer les services avancés de texte dans le bloc-note et d'autres programmes qui ne supporte normalement pas la reconnaissance vocale et l'écriture manuscrite ou tout autre service avancé de saisie.",-1,14,33,220,25 + GROUPBOX "Configuration du système", -1, 7,74,231,60 + AUTOCHECKBOX "Désac&tiver les services avancés de texte", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Déselectionnez cette case à cocher pour désactiver les services avancés de texte dans tous les programmes. Non recommandé pour les utilisateurs de l'Est de l'Asie car cela ferme la barre de langue.",-1,14,100,220,25 +END + +IDD_LANGBAR DIALOG 20, 20, 240, 120 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Paramètres de la barre de langue" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "", -1, 7, 7, 226, 85 + AUTOCHECKBOX "Montrer la &Barre de langue sur le bureau", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "Montrer la Barre de langue de façon transparente quand elle est inactive", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "Montrer les icônes &additionnelles de la barre de langue dans la zone de Notification", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "Monter &les intitulés de texte sur la Barre de langue", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "Désac&tiver les services avancés de texte", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 182, 99, 50, 14 +END + +IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Paramètres de touche avancés" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Pour désactiver le verouillage majuscule", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Presser &la touche VERR MAJ", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "Presser la touche MAJ", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Touches de raccourci pour la saisie des langues", -1, 7, 37, 258, 95 + LTEXT "Action", -1, 14, 47, 60, 9 + RTEXT "Séquence de touches", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Changer la séquence de touches...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Annuler", IDCANCEL, 146, 140, 70, 14 +END + +IDD_ADD DIALOG 20, 20, 227, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ajouter une langue de saisie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Langue de sa&isie:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "Configuration du clavier/IME:", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 169, 68, 50, 14 +END + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Changer la séquence de touches" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", -1, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "Activ&er la séquence de touches", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + CTEXT "MAJ", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP + CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "Touche:", -1, 110, 37, 14, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 212, 47, 50, 14 +END + +IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Proprietés de la langue de saisie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Langue de saisie:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "Configuration clavier/IME:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Annuler", IDCANCEL, 169, 53, 52, 14 +END + +/* FIXME : To improve/complete */ +/* FIXME : À améliorer/compléter */ +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Services texte et langue de saisie" + IDS_CPLSYSTEMDESCRIPTION "Personnalise les paramètres pour la langue de saisie de texte." + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belge (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belge Français" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portugais(Brésilien ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Canadien Français" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" + IDS_DANISH_LAYOUT, "Danois" + IDS_DUTCH_LAYOUT, "Néérlandais" + IDS_FINNISH_LAYOUT, "Finlandais" + IDS_FRENCH_LAYOUT, "Français" + IDS_GERMAN_LAYOUT, "Allemand" + IDS_GERMAN_IBM_LAYOUT, "Allemand (IBM)" + IDS_ICELANDIC_LAYOUT, "Icelandic" + IDS_IRISH_LAYOUT, "Irlandais" + IDS_ITALIAN_LAYOUT, "Italien" + IDS_ITALIAN_142_LAYOUT, "Italien (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latino-Américain" + IDS_NORWEGIAN_LAYOUT, "Norvégien" + IDS_PORTUGUESE_LAYOUT, "Portugais" + IDS_SPANISH_LAYOUT, "Espagnol" + IDS_SPANISH_VARIANTION_LAYOUT, "Varition espagnole" + IDS_SWEDISH_LAYOUT, "Suédois" + IDS_SWISS_FRENCH_LAYOUT, "Suisse Française" + IDS_SWISS_GERMAN_LAYOUT, "Suisse Allemande" + IDS_UNITED_KINGDOM_LAYOUT, "Royaume-Uni" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "États-Unis-International" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "États-Unis-Dvorak pour la main gauche" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "États-Unis-Dvorak pour la main droite" + IDS_ALBANIAN_LAYOUT, "Albanais" + IDS_CROATIAN_LAYOUT, "Croate" + IDS_CZECH_LAYOUT, "Tchèque" + IDS_CZECH_QWERTY_LAYOUT, "Tchèqye (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Hongrois" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Hongrois 101-key" + IDS_POLISH_LAYOUT, "Polonais (Programmeurs)" + IDS_POLISH_214_LAYOUT, "Polonais (214)" + IDS_ROMANIAN_LAYOUT, "Roumain" + IDS_SERBIAN_LATIN_LAYOUT, "Serbe (Latin)" + IDS_SLOVAK_LAYOUT, "Slovaque" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovaque (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slovène" + IDS_ESTONIAN_LAYOUT, "Estonien" + IDS_LATVIAN_LAYOUT, "Letton" + IDS_LATVIAN_QWERTY_LAYOUT, "Letton (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Lituanien IBM" + IDS_GREEK_LAYOUT, "Grec" + IDS_GREEK_LATIN_LAYOUT, "Grec Latin" + IDS_GREEK_220_LAYOUT, "Grec (220)" + IDS_GREEK_319_LAYOUT, "Grec (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Grec (220) Latin" + IDS_GREEK_319_LATIN_LAYOUT, "Grec (319) Latin" + IDS_BELARUSIAN_LAYOUT, "Biélorusse" + IDS_BULGARIAN_LAYOUT, "Bulgare" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgare (Latin)" + IDS_RUSSIAN_LAYOUT, "Russe" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russe (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbe (Cyrillic)" + IDS_UKRAINIAN_LAYOUT, "Ukrainien" + IDS_TURKISH_F_LAYOUT, "Turque F" + IDS_TURKISH_Q_LAYOUT, "Turque Q" + IDS_JAPANESE_LAYOUT, "Japonais" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Système de saisie japonais (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Koréen" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Système de saisie koréen (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinois (Traditionnel) - Clavier américain" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinois (Traditionnel) - Phonétique" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinois (Traditionnel) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinois (Traditionnel) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinois (Traditionnel) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinois (Traditionnel) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinois (Traditionnel) - Alpha-numérique" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinois (Simplifié) - Clavier américain" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinois (Simplifié) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinois (Simplifié) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinois (Simplifié) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinois (Simplifié) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thaïlandais Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thaïlandais Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thaïlandais Kedmanee (pas de vérouillage majuscule)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thaïlandais Pattachote (pas de vérouillage majuscule)" + IDS_HEBREW_LAYOUT, "Hébreux" + IDS_ARABIC_101_LAYOUT, "Arabe (101)" + IDS_ARABIC_102_LAYOUT, "Arabe (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabe (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Tchèque Programmeurs" + IDS_LITHUANIAN_LAYOUT, "Lituanien" + IDS_BELGIAN_COMMA_LAYOUT, "Belge (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinois (Traditionnel) - Nouvelle phonétique" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinois (Simplifié) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "États-Unis-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinois (Traditionnel) - New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditionnel" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonais Phonétique" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macédonien" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadien Multilangue Standard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinois (Traditionnel) - Rapide" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinois (Traditionnel) - Tableau" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" + IDS_TATAR_LAYOUT, "Tatare" + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" + IDS_VIETNAMESE_LAYOUT, "Vietnamien" + IDS_GEORGIAN_LAYOUT, "Géorgien" + IDS_ARMENIAN_EASTERN_LAYOUT, "Arménien Est" + IDS_ARMENIAN_WESTERN_LAYOUT, "Arménien Ouest" + IDS_GREEK_POLYTONIC_LAYOUT, "Grec Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portugais (Brésilien ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongole Cyrillic" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syrien" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syrien Phonétique" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonétique" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" +END Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Sun Sep 23 15:05:44 2007 @@ -45,7 +45,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ïàðàìåòðè ìîâíî¿ ïàíåë³" FONT 8, "MS Shell Dlg" -{ +BEGIN GROUPBOX "", -1, 7, 7, 226, 85 AUTOCHECKBOX "Ï&îêàçóâàòè ïàíåëü ìîâè íà ðîáî÷îìó ñòîë³", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP AUTOCHECKBOX "&Ïîêàçóâàòè ïàíåëü ìîâè ïðîçîðîþ, êîëè âîíà íåàêòèâíà", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 @@ -54,13 +54,13 @@ AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 182, 99, 50, 14 -} +END IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Äîäàòêîâ³ ïàðàìåòðè êëàâ³àòóðè" FONT 8, "MS Shell Dlg" -{ +BEGIN GROUPBOX "Âèìêíåííÿ ðåæèìó Caps Lock", -1, 7, 7, 258, 26 AUTORADIOBUTTON "&ïðè íàòèñíåíí³ êëàâ³ø³ CAPS LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP AUTORADIOBUTTON "ïðè &íàòèñíåíí³ êëàâ³ø³ SHIFT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP @@ -71,26 +71,26 @@ PUSHBUTTON "Ç&ì³íà ñïîëó÷åííÿ êëàâ³ø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 146, 140, 70, 14 -} +END IDD_ADD DIALOG 20, 20, 227, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Äîäàâàííÿ ìîâè ââîäó" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 36, 110, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14 -} +END IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "", -1, 16, 5, 250, 10 GROUPBOX "", -1, 12, 17, 184, 48 AUTOCHECKBOX "&Ââ³ìêíóòè ñïîëó÷åííÿ êëàâ³ø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 @@ -103,20 +103,20 @@ COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 212, 47, 50, 14 -} +END IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Âëàñòèâîñò³ ìîâè ââîäó" FONT 8, "MS Shell Dlg" -{ +BEGIN LTEXT "Ìîâà ââîäó:", -1, 7, 7, 61, 8 LTEXT "", -1, 73, 7, 129, 8 LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 21, 110, 10 COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 14 -} +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/rsrc.rc (original) +++ trunk/reactos/dll/cpl/input/rsrc.rc Sun Sep 23 15:05:44 2007 @@ -3,4 +3,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/intl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -1,56 +1,122 @@ /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ +/* Updated by Pierre Schweitzer 2007 (heis_spiter AT hotmail DOT com) */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Général" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Langue principale", -1, 8, 11, 228, 74 - ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON - LTEXT "Sélectionnez la langue principale que vous voulez utiliser:", -1, 38, 25, 193, 22 - COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL -END - - -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Options régionales" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Standards et formats", -1, 5, 5, 234, 162 + LTEXT "Cette option modifie comment certains programmes disposent les nombres, les monnaies, les dates et l'heure.", -1, 14, 17, 220, 25 + LTEXT "Sélectionnez un élément pour utiliser ses préférences, ou cliquez sur Personnaliser pour choisir vos propres formats:", -1, 14, 37, 220, 22 + COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + PUSHBUTTON "Personnaliser...", IDC_SETUP_BUTTON, 178, 56, 52, 13 + LTEXT "Exemples", -1, 14, 73, 70, 10 + LTEXT "Nombre:", -1, 16, 86, 48, 10 + LTEXT "Monnaie:", -1, 16, 101, 48, 10 + LTEXT "Heure:", -1, 16, 116, 48, 10 + LTEXT "Date courte:", -1, 16, 131, 48, 10 + LTEXT "Date longue:", -1, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Localisation géographique", -1, 5, 172, 234, 55 + LTEXT Configurez votre localisation pour que des services puissent vous fournir des informations locales, comme par exemple, les nouvelles et la météo", -1, 14, 184, 210, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_LANGUAGESPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Langues" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue de saisie du texte et services", IDC_GROUPBOX, 5, 5, 234, 52 + LTEXT "Pour voir ou changer la langue ou les méthodes de saise de texte, pressez ""Détails...""", -1, 12, 15, 220, 18 + PUSHBUTTON "Dé&tails...", IDC_DETAIL_BUTTON, 177, 34, 54, 14 + GROUPBOX "Support de langues additionnelles", IDC_GROUPBOX, 5, 62, 234, 82 + LTEXT "La plupart des langues sont installées par défaut. Pour installer des langues supplémentaires, sélectionnez la case à cocher appropriée ci-dessous.", -1, 12, 72, 220, 18 + CHECKBOX "I&nstaller les fichiers pour les scripts complexes et les langues de droite à gauche", IDC_INST_FILES_FOR_RTOL_LANG, 12, 92, 215, 22 + CHECKBOX "In&staller les fichiers pour les langues de l'Asie de l'Est", IDC_INST_FILES_FOR_ASIAN, 12, 114, 180, 22 +END + +IDD_ADVANCEDPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avancé" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue pour les programmes non-Unicode", IDC_GROUPBOX, 5, 5, 234, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Ce paramètre système permet aux programmes non-Unicode d'afficher les menus et les dialogues dans leur langue native. Cela n'affecte pas es programmes Unicode, mais s'applique à tous les utilisateurs de cet ordinateur.", -1, 14, 18, 223, 33 + LTEXT "Sélectionnez une langue qui corresponde à la version de la langue des programmes que vous voulez utiliser:", -1, 14, 55, 223, 18 + GROUPBOX "Tables de conversion des pages de code", -1, 5, 101, 234, 88 + LISTBOX IDC_CONV_TABLES, 14, 114, 217, 77, LBS_STANDARD + GROUPBOX "Paramètres du compte de l'utilisateur par défaut ", -1, 5, 193, 234, 30 + CHECKBOX "Appliquer tous ces paramètres au compte utilisateur actuel et à celui par défaut", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 200, 220, 22 +END + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nombres" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Page de propriétés 2",-1,73,74,90,8 -END - - -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Devise" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE - LTEXT "Positive:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + GROUPBOX "Exemple d'apparence", -1, 7, 7, 230, 53, WS_CHILD | WS_VISIBLE + LTEXT "Positif:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSPOSSAMPLE, 43, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_NUMBERSNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Symbole &décimal:", -1, 8, 67, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERDSYMBOL, 137, 65, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Nombre de chiffres après la virgule:", -1, 8, 83, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNDIGDEC, 137, 81, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Symbole de &groupement des chiffres:", -1, 8, 100, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDIGITGRSYM, 137, 97, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Groupement des chiffres:", -1, 8, 117, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDGROUPING, 137, 113, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Symbole du sign&e négatif:", -1, 8, 134, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNSIGNSYM, 137, 129, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "&Format des nombres négatifs:", -1, 8, 149, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSNNUMFORMAT, 137, 145, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Afficher les &zéros principaux:", -1, 8, 166, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSDISPLEADZER, 137, 161, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Séparateur de &liste:", -1, 8, 181, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSLSEP, 137, 177, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "Système de &mesure:", -1, 8, 197, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_NUMBERSMEASSYS, 137, 193, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monnaie" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exemple d'apparence", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Positif:", -1, 13, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYPOSSAMPLE, 42, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Negative:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 120, 21, 31, 10, WS_CHILD |WS_VISIBLE | WS_GROUP EDITTEXT IDC_CURRENCYNEGSAMPLE, 154, 19, 72, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "&Currency symbol:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Symbole de la monnaie:", -1, 20, 51, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYSYMBOL, 124, 49, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Positive Amount:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Montant &positif:", -1, 20, 68, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYPOSVALUE, 124, 66, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Negative Amount:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Montant &négatif:", -1, 20, 85, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYNEGVALUE, 124, 83, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Decimal separator:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Séparateur des décimales:", -1, 20, 111, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECSEP, 124, 109, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Number of fractional digits:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "&Nombre de chiffres décimaux:", -1, 20, 128, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYDECNUM, 124, 126, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Grouping symbol:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Symbole de &groupement:", -1, 20, 156, 100, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPSEP, 124, 154, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - LTEXT "&Digit grouping:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + LTEXT "Groupement des chiffres:", -1, 20, 173, 96, 10, WS_CHILD |WS_VISIBLE | WS_GROUP COMBOBOX IDC_CURRENCYGRPNUM, 124, 171, 100, 83, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Heure" FONT 8, "MS Shell Dlg" @@ -75,23 +141,57 @@ END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Date" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Page de propriétés 5",-1,73,74,90,8 -END - - -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Langues" -FONT 8, "MS Shell Dlg" -BEGIN - -END - + GROUPBOX "Calendrier", IDC_GROUPBOX, 7, 7, 230, 74 + LTEXT "Si l'année est tapée sur deux chiffres, alors l'afficher comme une année entre:", -1, 13, 18, 215, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "et", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "Type de calendrier:", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + LTEXT "Calendrier musulman:", -1, 13, 65, 60, 12 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + GROUPBOX "Format de date courte", IDC_GROUPBOX, 7, 83, 230, 81 + LTEXT "Exemple:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Exemple - lecture de droite à gauche:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Format court:", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur des composants de la date:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "Format de date longue", IDC_GROUPBOX, 7, 167, 230, 64 + LTEXT "Exemple:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Exemple - lecture de droite à gauche:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Format long:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + + +IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Classement" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Classement", -1, 7, 7, 230, 74 + LTEXT "Les méthodes de classement définissent l'ordre de classement des lettres, des mots, des fichiers et des répertoires.", -1, 14, 17, 220, 25 + LTEXT "Sélectionnez une méthode de classement pour votre langue:", -1, 14, 37, 220, 22 + COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CUSTOMIZE_TITLE "Personnaliser les options régionales" + IDS_SPAIN "Espagnol (Espagne)" +END STRINGTABLE BEGIN Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/intl/rsrc.rc (original) +++ trunk/reactos/dll/cpl/intl/rsrc.rc Sun Sep 23 15:05:44 2007 @@ -6,7 +6,7 @@ //#include "lang/el-GR.rc" #include "lang/en-US.rc" //#include "lang/es-ES.rc" -//#include "lang/fr-FR.rc" +#include "lang/fr-FR.rc" //#include "lang/hu-HU.rc" //#include "lang/id-ID.rc" #include "lang/it-IT.rc" Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc Sun Sep 23 15:05:44 2007 @@ -99,9 +99,10 @@ BEGIN IDS_CPLNAME "Son et périphériques audio" IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." - IDS_NO_SOUND "(None)" + IDS_NO_SOUND "(Aucun)" END +

1 0

[cfinck] 29151: Change "ReactOS Homepage - [% title %]" to "[% title %] - ReactOS Website"
by cfinck＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: cfinck Date: Sun Sep 23 12:31:01 2007 New Revision: 29151 URL: http://svn.reactos.org/svn/reactos?rev=29151&view=rev Log: Change "ReactOS Homepage - [% title %]" to "[% title %] - ReactOS Website" Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… Sun Sep 23 12:31:01 2007 @@ -62,7 +62,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <title>ReactOS Homepage - [% title %]</title> + <title>[% title %] - ReactOS Website</title> [%# Migration note: contents of the old Param 'headerhtml' would go here %]

1 0

[hpoussin] 29150: Continue rbuild cleanup (AutomaticDependency and SourceFile classes)
by hpoussin＠svn.reactos.org 23 Sep '07

23 Sep '07

Author: hpoussin Date: Sun Sep 23 12:04:24 2007 New Revision: 29150 URL: http://svn.reactos.org/svn/reactos?rev=29150&view=rev Log: Continue rbuild cleanup (AutomaticDependency and SourceFile classes) Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Sun Sep 23 12:04:24 2007 @@ -1,5 +1,6 @@ /* * Copyright (C) 2005 Casper S. Hornstrup + * Copyright (C) 2007 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,48 +28,17 @@ using std::vector; using std::map; -static std::string -GetExtension ( const std::string& filename ) -{ - size_t index = filename.find_last_of ( '/' ); - if (index == string::npos) index = 0; - string tmp = filename.substr( index, filename.size() - index ); - size_t ext_index = tmp.find_last_of( '.' ); - if (ext_index != string::npos) - return filename.substr ( index + ext_index, filename.size() ); - return ""; -} - SourceFile::SourceFile ( AutomaticDependency* automaticDependency, const Module& module, - const string& filename, - SourceFile* parent, - bool isNonAutomaticDependency ) - : automaticDependency ( automaticDependency ), + const File& file, + SourceFile* parent ) + : file ( file ), + automaticDependency ( automaticDependency), module ( module ), - filename ( filename ), - isNonAutomaticDependency ( isNonAutomaticDependency ), youngestLastWriteTime ( 0 ) { - if ( parent != NULL ) + if (parent != NULL ) parents.push_back ( parent ); - GetDirectoryAndFilenameParts (); -} - -void -SourceFile::GetDirectoryAndFilenameParts () -{ - size_t index = filename.find_last_of ( cSep ); - if ( index != string::npos ) - { - directoryPart = filename.substr ( 0, index ); - filenamePart = filename.substr ( index + 1, filename.length () - index ); - } - else - { - directoryPart = ""; - filenamePart = filename; - } } void @@ -82,6 +52,7 @@ SourceFile::Open () { struct stat statbuf; + string filename = file.GetFullPath (); Close (); FILE* f = fopen ( filename.c_str (), "rb" ); @@ -119,7 +90,14 @@ { while ( p < end ) { - if ( ( *p == '#') && ( end - p > 13 ) ) + if ( p != buf.c_str () ) + { + /* Go to end of line */ + while ( *p != '\n' && p < end ) + p++; + SkipWhitespace (); + } + if ( ( end - p > 13 ) && ( *p == '#') ) { bool include = false; p++; @@ -132,14 +110,14 @@ includeNext = false; include = true; } - if ( strncmp ( p, "include_next ", 13 ) == 0 ) - { + if ( strncmp ( p, "include_next ", 13 ) == 0 ) + { p += 13; includeNext = true; - include = true; - } + include = true; + } - if ( include ) + if ( include ) { SkipWhitespace (); if ( p < end ) @@ -200,58 +178,56 @@ } bool -SourceFile::IsIncludedFrom ( const string& normalizedFilename ) -{ - if ( normalizedFilename == filename ) - return true; - - SourceFile* sourceFile = automaticDependency->RetrieveFromCache ( normalizedFilename ); +SourceFile::IsIncludedFrom ( const File& file ) +{ + SourceFile* sourceFile = automaticDependency->RetrieveFromCache ( file ); if ( sourceFile == NULL ) return false; + if ( sourceFile == this ) + return true; + return IsParentOf ( sourceFile, this ); } +bool +SourceFile::CanProcessFile ( const File& file ) +{ + string extension = GetExtension ( file.file ); + std::transform ( extension.begin (), extension.end (), extension.begin (), tolower ); + if ( extension == ".h" ) + return true; + if ( extension == ".c" ) + return true; + if ( extension == ".cpp" ) + return true; + if ( extension == ".rc" ) + return true; + if ( extension == ".s" ) + return true; + if ( extension == ".nls" ) + return true; + if ( extension == ".idl" ) + return true; + if ( automaticDependency->project.configuration.Verbose ) + printf ( "Skipping file %s, as its extension is not recognized\n", file.file.name.c_str () ); + return false; +} + SourceFile* -SourceFile::GetParentSourceFile () -{ - if ( isNonAutomaticDependency ) +SourceFile::ParseFile ( const File& file ) +{ + if ( !CanProcessFile ( file ) ) return NULL; - return this; -} - -bool -SourceFile::CanProcessFile ( const string& extension ) -{ - if ( extension == ".h" || extension == ".H" ) - return true; - if ( extension == ".c" || extension == ".C" ) - return true; - if ( extension == ".cpp" || extension == ".CPP" ) - return true; - if ( extension == ".rc" || extension == ".RC" ) - return true; - if ( extension == ".s" || extension == ".S" ) - return true; - return false; -} - -SourceFile* -SourceFile::ParseFile ( const string& normalizedFilename ) -{ - string extension = GetExtension ( normalizedFilename ); - if ( CanProcessFile ( extension ) ) - { - if ( IsIncludedFrom ( normalizedFilename ) ) - return NULL; - - SourceFile* sourceFile = automaticDependency->RetrieveFromCacheOrParse ( module, - normalizedFilename, - GetParentSourceFile () ); - return sourceFile; - } - return NULL; + + if ( IsIncludedFrom ( file ) ) + return NULL; + + SourceFile* sourceFile = automaticDependency->RetrieveFromCacheOrParse ( module, + file, + this ); + return sourceFile; } void @@ -260,48 +236,39 @@ Open (); while ( p < end ) { - string includedFilename ( "" ); - + string includedFilename; + bool searchCurrentDirectory; bool includeNext; while ( ReadInclude ( includedFilename, searchCurrentDirectory, includeNext ) ) { - string resolvedFilename ( "" ); + File resolvedFile ( SourceDirectory, "", "", false, "", false ) ; bool locatedFile = automaticDependency->LocateIncludedFile ( this, module, includedFilename, searchCurrentDirectory, includeNext, - resolvedFilename ); + resolvedFile ); if ( locatedFile ) { - SourceFile* sourceFile = ParseFile ( resolvedFilename ); + SourceFile* sourceFile = ParseFile ( *new File ( resolvedFile ) ); if ( sourceFile != NULL ) files.push_back ( sourceFile ); - } + } else if ( automaticDependency->project.configuration.Verbose ) + printf ( "Unable to find %c%s%c, included in %s%c%s\n", + searchCurrentDirectory ? '\"' : '<', + includedFilename.c_str (), + searchCurrentDirectory ? '\"' : '>', + this->file.file.relative_path.c_str (), + cSep, + this->file.file.name.c_str () ); } p++; } Close (); } - -string -SourceFile::Location () const -{ - int line = 1; - const char* end_of_line = strchr ( buf.c_str (), '\n' ); - while ( end_of_line && end_of_line < p ) - { - ++line; - end_of_line = strchr ( end_of_line + 1, '\n' ); - } - return ssprintf ( "%s(%i)", - filename.c_str (), - line ); -} - AutomaticDependency::AutomaticDependency ( const Project& project ) : project ( project ) @@ -352,37 +319,14 @@ AutomaticDependency::ParseFile ( const Module& module, const File& file ) { - string normalizedFilename = NormalizeFilename ( file.GetFullPath () ); RetrieveFromCacheOrParse ( module, - normalizedFilename, + file, NULL ); -} - -string -AutomaticDependency::ReplaceVariable ( const string& name, - const string& value, - string path ) -{ - size_t i = path.find ( name ); - if ( i != string::npos ) - return path.replace ( i, name.length (), value ); - else - return path; -} - -string -AutomaticDependency::ResolveVariablesInPath ( const string& path ) -{ - string s = ReplaceVariable ( "$(INTERMEDIATE)", Environment::GetIntermediatePath (), path ); - s = ReplaceVariable ( "$(OUTPUT)", Environment::GetOutputPath (), s ); - s = ReplaceVariable ( "$(INSTALL)", Environment::GetInstallPath (), s ); - return s; } bool AutomaticDependency::LocateIncludedFile ( const FileLocation& directory, - const string& includedFilename, - string& resolvedFilename ) + const string& includedFilename ) { string path; switch ( directory.directory ) @@ -408,28 +352,22 @@ path += sSep; path += directory.relative_path; } - + string normalizedFilename = NormalizeFilename ( path + sSep + includedFilename ); FILE* f = fopen ( normalizedFilename.c_str (), "rb" ); if ( f != NULL ) { fclose ( f ); - resolvedFilename = normalizedFilename; - return true; - } - resolvedFilename = ""; + return true; + } return false; } void AutomaticDependency::GetIncludeDirectories ( vector<Include*>& includes, - const Module& module, - Include& currentDirectory, - bool searchCurrentDirectory ) + const Module& module ) { size_t i; - if ( searchCurrentDirectory ) - includes.push_back( &currentDirectory ); for ( i = 0; i < module.non_if_data.includes.size (); i++ ) includes.push_back( module.non_if_data.includes[i] ); for ( i = 0; i < module.project.non_if_data.includes.size (); i++ ) @@ -442,44 +380,61 @@ const string& includedFilename, bool searchCurrentDirectory, bool includeNext, - string& resolvedFilename ) + File& resolvedFile ) { vector<Include*> includes; - Include currentDirectory ( module.project, SourceDirectory, sourceFile->directoryPart ); - GetIncludeDirectories ( includes, module, currentDirectory, searchCurrentDirectory ); + string includedFileDir; + Include currentDirectory ( module.project, SourceDirectory, sourceFile->file.file.relative_path ); + if ( searchCurrentDirectory ) + includes.push_back ( &currentDirectory ); + GetIncludeDirectories ( includes, module ); + for ( size_t j = 0; j < includes.size (); j++ ) { Include& include = *includes[j]; if ( LocateIncludedFile ( *include.directory, - includedFilename, - resolvedFilename ) ) - { - if ( includeNext && stricmp ( resolvedFilename.c_str (), - sourceFile->filename.c_str () ) == 0 ) + includedFilename ) ) + { + if ( includeNext && + include.directory->directory == sourceFile->file.file.directory && + include.directory->relative_path == sourceFile->file.file.relative_path ) + { + includeNext = false; continue; + } + resolvedFile.file.directory = include.directory->directory; + size_t index = includedFilename.find_last_of ( "/\\" ); + if ( index == string::npos ) + { + resolvedFile.file.name = includedFilename; + resolvedFile.file.relative_path = include.directory->relative_path; + } + else + { + resolvedFile.file.relative_path = NormalizeFilename ( + include.directory->relative_path + sSep + + includedFilename.substr ( 0, index ) ); + resolvedFile.file.name = includedFilename.substr ( index + 1 ); + } return true; } } - /*printf ( "Unable to find %s, included in %s.\n", - includedFilename.c_str (), - sourceFile->filename.c_str () );*/ - resolvedFilename = ""; return false; } SourceFile* AutomaticDependency::RetrieveFromCacheOrParse ( const Module& module, - const string& filename, + const File& file, SourceFile* parentSourceFile ) { + string filename = file.GetFullPath(); SourceFile* sourceFile = sourcefile_map[filename]; if ( sourceFile == NULL ) { sourceFile = new SourceFile ( this, module, - ResolveVariablesInPath ( filename ), - parentSourceFile, - false ); + file, + parentSourceFile ); sourcefile_map[filename] = sourceFile; sourceFile->Parse (); } @@ -489,8 +444,9 @@ } SourceFile* -AutomaticDependency::RetrieveFromCache ( const string& filename ) -{ +AutomaticDependency::RetrieveFromCache ( const File& file ) +{ + string filename = file.GetFullPath(); return sourcefile_map[filename]; } @@ -543,9 +499,7 @@ for ( size_t fi = 0; fi < files.size (); fi++ ) { File& file = *files[fi]; - string normalizedFilename = NormalizeFilename ( file.GetFullPath () ); - - SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename ); + SourceFile* sourceFile = RetrieveFromCache ( file ); if ( sourceFile != NULL ) { CheckAutomaticDependenciesForFile ( sourceFile ); @@ -554,13 +508,15 @@ { if ( verbose ) { - printf ( "Marking %s for rebuild due to younger file %s\n", - sourceFile->filename.c_str (), - sourceFile->youngestFile->filename.c_str () ); + printf ( "Marking %s%c%s for rebuild due to younger file %s%c%s\n", + sourceFile->file.file.relative_path.c_str (), + cSep, sourceFile->file.file.name.c_str (), + sourceFile->youngestFile->file.file.relative_path.c_str (), + cSep, sourceFile->youngestFile->file.file.name.c_str () ); } timebuf.actime = sourceFile->youngestLastWriteTime; timebuf.modtime = sourceFile->youngestLastWriteTime; - utime ( sourceFile->filename.c_str (), + utime ( sourceFile->file.GetFullPath ().c_str (), &timebuf ); } } @@ -583,7 +539,7 @@ for ( size_t i = 0; i < sourceFile->files.size (); i++ ) { SourceFile* childSourceFile = sourceFile->files[i]; - + CheckAutomaticDependenciesForFile ( childSourceFile ); if ( ( childSourceFile->youngestLastWriteTime > sourceFile->youngestLastWriteTime ) || ( childSourceFile->lastWriteTime > sourceFile->youngestLastWriteTime ) ) Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sun Sep 23 12:04:24 2007 @@ -725,35 +725,27 @@ public: SourceFile ( AutomaticDependency* automaticDependency, const Module& module, - const std::string& filename, - SourceFile* parent, - bool isNonAutomaticDependency ); - SourceFile* ParseFile ( const std::string& normalizedFilename ); + const File& file, + SourceFile* parent ); void Parse (); - std::string Location () const; - std::vector<SourceFile*> files; + std::vector<SourceFile*> files; /* List of files included in this file */ + const File& file; AutomaticDependency* automaticDependency; const Module& module; - std::string filename; - std::string filenamePart; - std::string directoryPart; std::vector<SourceFile*> parents; /* List of files, this file is included from */ - bool isNonAutomaticDependency; - std::string cachedDependencies; time_t lastWriteTime; time_t youngestLastWriteTime; /* Youngest last write time of this file and all children */ SourceFile* youngestFile; private: - void GetDirectoryAndFilenameParts (); void Close (); void Open (); void SkipWhitespace (); bool ReadInclude ( std::string& filename, bool& searchCurrentDirectory, bool& includeNext ); - bool IsIncludedFrom ( const std::string& normalizedFilename ); - SourceFile* GetParentSourceFile (); - bool CanProcessFile ( const std::string& extension ); + bool IsIncludedFrom ( const File& file ); + SourceFile* ParseFile(const File& file); + bool CanProcessFile ( const File& file ); bool IsParentOf ( const SourceFile* parent, const SourceFile* child ); std::string buf; @@ -771,18 +763,17 @@ AutomaticDependency ( const Project& project ); ~AutomaticDependency (); bool LocateIncludedFile ( const FileLocation& directory, - const std::string& includedFilename, - std::string& resolvedFilename ); + const std::string& includedFilename ); bool LocateIncludedFile ( SourceFile* sourceFile, const Module& module, const std::string& includedFilename, bool searchCurrentDirectory, bool includeNext, - std::string& resolvedFilename ); + File& resolvedFile ); SourceFile* RetrieveFromCacheOrParse ( const Module& module, - const std::string& filename, + const File& file, SourceFile* parentSourceFile ); - SourceFile* RetrieveFromCache ( const std::string& filename ); + SourceFile* RetrieveFromCache ( const File& file ); void CheckAutomaticDependencies ( bool verbose ); void CheckAutomaticDependenciesForModule ( Module& module, bool verbose ); @@ -792,19 +783,13 @@ bool verbose ); void CheckAutomaticDependenciesForFile ( SourceFile* sourceFile ); void GetIncludeDirectories ( std::vector<Include*>& includes, - const Module& module, - Include& currentDirectory, - bool searchCurrentDirectory ); + const Module& module ); void GetModuleFiles ( const Module& module, std::vector<File*>& files ) const; void ParseFiles (); void ParseFiles ( const Module& module ); void ParseFile ( const Module& module, const File& file ); - std::string ReplaceVariable ( const std::string& name, - const std::string& value, - std::string path ); - std::string ResolveVariablesInPath ( const std::string& path ); std::map<std::string, SourceFile*> sourcefile_map; };

1 0

[ekohl] 29149: Add missing LPFILTERKEYS and LPTOGGLEKEYS types.
by ekohl＠svn.reactos.org 22 Sep '07

22 Sep '07

Author: ekohl Date: Sun Sep 23 00:20:28 2007 New Revision: 29149 URL: http://svn.reactos.org/svn/reactos?rev=29149&view=rev Log: Add missing LPFILTERKEYS and LPTOGGLEKEYS types. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Sun Sep 23 00:20:28 2007 @@ -3001,7 +3001,7 @@ DWORD iDelayMSec; DWORD iRepeatMSec; DWORD iBounceMSec; -} FILTERKEYS; +} FILTERKEYS, *LPFILTERKEYS; typedef struct tagHIGHCONTRASTA { UINT cbSize; DWORD dwFlags; @@ -3133,7 +3133,7 @@ typedef struct tagTOGGLEKEYS { DWORD cbSize; DWORD dwFlags; -} TOGGLEKEYS; +} TOGGLEKEYS, *LPTOGGLEKEYS; typedef struct tagMOUSEHOOKSTRUCT { POINT pt; HWND hwnd;

1 0

[cfinck] 29148: Slovak translations for the cylfrac, logon, scrnsave and starfield screensavers by Mario Kacmar (kario AT szm DOT sk)
by cfinck＠svn.reactos.org 22 Sep '07

22 Sep '07

Author: cfinck Date: Sat Sep 22 23:14:54 2007 New Revision: 29148 URL: http://svn.reactos.org/svn/reactos?rev=29148&view=rev Log: Slovak translations for the cylfrac, logon, scrnsave and starfield screensavers by Mario Kacmar (kario AT szm DOT sk) Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc trunk/reactos/base/applications/screensavers/starfield/starfield.rc Modified: trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc (original) +++ trunk/reactos/base/applications/screensavers/cylfrac/cylfrac.rc Sat Sep 22 23:14:54 2007 @@ -12,3 +12,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/screensavers/cylfrac/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/cylfrac/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/screensavers/cylfrac/lang/sk-SK.rc Sat Sep 22 23:14:54 2007 @@ -1,0 +1,12 @@ +/* TRANSLATOR: Kario (kario(a)szm.sk) + * DATE OF TR: 22-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Cylinders fractal" + IDS_TITLE "Èo je ..." + IDS_TEXT "Cylinders fractal od unC0Rr.\npeciálne pre systém ReactOS." +END Added: trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/sk-SK.rc Sat Sep 22 23:14:54 2007 @@ -1,0 +1,12 @@ +/* TRANSLATOR: Kario (kario(a)szm.sk) + * DATE OF TR: 22-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon - etriè obrazovky" + IDS_TITLE "Èo je ..." + IDS_TEXT "Nie sú potrebné iadné nastavenia." +END Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc Sat Sep 22 23:14:54 2007 @@ -15,3 +15,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc Sat Sep 22 23:14:54 2007 @@ -1,0 +1,12 @@ +/* TRANSLATOR: Kario (kario(a)szm.sk) + * DATE OF TR: 22-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Predvolený etriè obrazovky" + IDS_TITLE "Èo je ..." + IDS_TEXT "Nie sú potrebné iadné nastavenia." +END Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc (original) +++ trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.rc Sat Sep 22 23:14:54 2007 @@ -12,3 +12,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc Sat Sep 22 23:14:54 2007 @@ -1,0 +1,12 @@ +/* TRANSLATOR: Kario (kario(a)szm.sk) + * DATE OF TR: 22-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Hviezdne pole - etriè obrazovky" + IDS_TITLE "Èo je ..." + IDS_TEXT "Nie sú potrebné iadné nastavenia." +END Modified: trunk/reactos/base/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rc (original) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rc Sat Sep 22 23:14:54 2007 @@ -12,3 +12,4 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/sk-SK.rc"

1 0

[weiden] 29147: Fix loading pages provided by shell extensions
by weiden＠svn.reactos.org 22 Sep '07

22 Sep '07

Author: weiden Date: Sat Sep 22 22:59:23 2007 New Revision: 29147 URL: http://svn.reactos.org/svn/reactos?rev=29147&view=rev Log: Fix loading pages provided by shell extensions Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Sat Sep 22 22:59:23 2007 @@ -36,15 +36,42 @@ {IDC_CPLICON_1, IDS_CPLNAME_1, IDS_CPLDESCRIPTION_1, Applet1} }; -static void -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) -{ - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; +static BOOL CALLBACK +PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) +{ + PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; + if (ppsh != NULL && ppsh->nPages < MAX_POWER_PAGES) + { + ppsh->phpage[ppsh->nPages++] = hpage; + return TRUE; + } + + return FALSE; +} + +static BOOL +InitPropSheetPage(PROPSHEETHEADER *ppsh, WORD idDlg, DLGPROC DlgProc) +{ + HPROPSHEETPAGE hPage; + PROPSHEETPAGE psp; + + if (ppsh->nPages < MAX_POWER_PAGES) + { + ZeroMemory(&psp, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.dwFlags = PSP_DEFAULT; + psp.hInstance = hApplet; + psp.pszTemplate = MAKEINTRESOURCE(idDlg); + psp.pfnDlgProc = DlgProc; + + hPage = CreatePropertySheetPage(&psp); + if (hPage != NULL) + { + return PropSheetAddPage(hPage, (LPARAM)ppsh); + } + } + + return FALSE; } @@ -81,29 +108,15 @@ return TRUE; } -static BOOL CALLBACK -PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) -{ - PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; - if (ppsh != NULL && ppsh->nPages < MAX_POWER_PAGES) - { - ppsh->phpage[ppsh->nPages++] = hpage; - return TRUE; - } - - return FALSE; -} - /* First Applet */ static LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { - PROPSHEETPAGE psp[MAX_POWER_PAGES]; + HPROPSHEETPAGE hpsp[MAX_POWER_PAGES]; PROPSHEETHEADER psh; HPSXA hpsxa = NULL; TCHAR Caption[1024]; SYSTEM_POWER_CAPABILITIES spc; - INT i=0; LONG ret; UNREFERENCED_PARAMETER(hwnd); @@ -116,27 +129,26 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; + psh.dwFlags = PSH_USECALLBACK | PSH_PROPTITLE; psh.hwndParent = NULL; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON_1)); psh.pszCaption = Caption; - psh.nPages = 3; + psh.nPages = 0; psh.nStartPage = 0; - psh.ppsp = psp; + psh.phpage = hpsp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[i++], IDD_PROPPAGEPOWERSHEMES, (DLGPROC) powershemesProc); + InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSHEMES, (DLGPROC) powershemesProc); if (GetPwrCapabilities(&spc)) { if (spc.SystemBatteriesPresent) { - InitPropSheetPage(&psp[i++], IDD_PROPPAGEALARMS, (DLGPROC) alarmsProc); - psh.nPages += 1; + InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, (DLGPROC) alarmsProc); } } - InitPropSheetPage(&psp[i++], IDD_PROPPAGEADVANCED, (DLGPROC) advancedProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGEHIBERNATE, (DLGPROC) hibernateProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) advancedProc); + InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, (DLGPROC) hibernateProc); /* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages);

1 0

[weiden] 29146: - Don't change the current power scheme when displaying the dialog - Load additional pages provided by shell extensions
by weiden＠svn.reactos.org 22 Sep '07

22 Sep '07

Author: weiden Date: Sat Sep 22 22:48:02 2007 New Revision: 29146 URL: http://svn.reactos.org/svn/reactos?rev=29146&view=rev Log: - Don't change the current power scheme when displaying the dialog - Load additional pages provided by shell extensions Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powercfg.h trunk/reactos/dll/cpl/powercfg/powercfg.rbuild trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Sat Sep 22 22:48:02 2007 @@ -11,6 +11,8 @@ #include <windows.h> #include <commctrl.h> +#include <shlobj.h> +#include <regstr.h> #include <cpl.h> #include "resource.h" @@ -79,15 +81,30 @@ return TRUE; } +static BOOL CALLBACK +PropSheetAddPage(HPROPSHEETPAGE hpage, LPARAM lParam) +{ + PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; + if (ppsh != NULL && ppsh->nPages < MAX_POWER_PAGES) + { + ppsh->phpage[ppsh->nPages++] = hpage; + return TRUE; + } + + return FALSE; +} + /* First Applet */ static LONG APIENTRY Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { - PROPSHEETPAGE psp[5]; + PROPSHEETPAGE psp[MAX_POWER_PAGES]; PROPSHEETHEADER psh; + HPSXA hpsxa = NULL; TCHAR Caption[1024]; SYSTEM_POWER_CAPABILITIES spc; INT i=0; + LONG ret; UNREFERENCED_PARAMETER(hwnd); UNREFERENCED_PARAMETER(uMsg); @@ -120,8 +137,18 @@ } InitPropSheetPage(&psp[i++], IDD_PROPPAGEADVANCED, (DLGPROC) advancedProc); InitPropSheetPage(&psp[i++], IDD_PROPPAGEHIBERNATE, (DLGPROC) hibernateProc); - - return (LONG)(PropertySheet(&psh) != -1); + + /* Load additional pages provided by shell extensions */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages); + if (hpsxa != NULL) + SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + + ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxa != NULL) + SHDestroyPropSheetExtArray(hpsxa); + + return ret; } /* Control Panel Callback */ Modified: trunk/reactos/dll/cpl/powercfg/powercfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.h (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.h Sat Sep 22 22:48:02 2007 @@ -16,6 +16,8 @@ extern POWER_POLICY gPP[]; extern UINT guiIndex; +#define MAX_POWER_PAGES 32 + #endif /* __CPL_SAMPLE_H */ /* EOF */ Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rbuild (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rbuild Sat Sep 22 22:48:02 2007 @@ -12,6 +12,7 @@ <library>user32</library> <library>powrprof</library> <library>comctl32</library> + <library>shell32</library> <library>msvcrt</library> <file>powercfg.c</file> <file>powershemes.c</file> Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c Sat Sep 22 22:48:02 2007 @@ -287,9 +287,11 @@ if (!ValidatePowerPolicies(&gGPP,0)) return FALSE; +/* if (!SetActivePwrScheme(aps,&gGPP,&pp)) return FALSE; - +*/ + if (!GetPwrCapabilities(&spc)) return FALSE;

1 0

[cfinck] 29145: Slovak translation for sysdm by Mario Kacmar (kario AT szm DOT sk)
by cfinck＠svn.reactos.org 22 Sep '07

22 Sep '07

Author: cfinck Date: Sat Sep 22 22:23:06 2007 New Revision: 29145 URL: http://svn.reactos.org/svn/reactos?rev=29145&view=rev Log: Slovak translation for sysdm by Mario Kacmar (kario AT szm DOT sk) Added: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc Added: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc (added) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc Sat Sep 22 22:23:06 2007 @@ -1,0 +1,281 @@ +/* + * FILE: dll/cpl/sysdm/lang/sk-SK.rc + * PURPOSE: Slovak Language File for sysdm + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 20-09-2007 + * ______________________________________________ + * NOTE: this file is not fully translated + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Veobecné" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Systém:", IDC_STATIC, 4, 132, 32, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "Verzia ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Poèítaè:", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + CONTROL "Navtívte <A HREF=""http://www.reactos.org/"">domovskú stránku systému ReactOS</A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 200, 165, 8 + PUSHBUTTON "Zobrazi &licenciu...", IDC_LICENCE, 170, 199, 78, 13 +END + + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardvér" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Správca zariadení", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "Správca zariadení zobrazí zoznam vetkých hardvérových zariadení, ktoré sú naintalované na poèítaèi. Môete ho poui na zmenu vlastností ktoréhoko¾vek zariadenia.", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "Sprá&vca zariadení...", IDC_HARDWARE_DEVICE_MANAGER, 134, 48, 110, 15 + + GROUPBOX "Sprievodca pridaním hardvéru", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "Sprievodca pridaním hardvéru pomáha pri intalácii, odintalovaní, oprave, odpojení, vysunutí, a konfigurácií hardvéru.", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "&Sprievodca pridaním hardvéru...", IDC_HARDWARE_WIZARD, 134, 120, 110, 15 + + GROUPBOX "Hardvérové profily", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Hardvérové profily poskytujú monos nastavenia a uloenia rôznych konfigurácií hardvéru.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "&Hardvérové profily...", IDC_HARDWARE_PROFILE, 134, 190, 110, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Spresnenie" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Na vykonanie väèiny z týchto zmien sú potrebné privilégia správcu.", IDC_STATIC, 12, 5, 236, 8 + GROUPBOX "Výkon", IDC_STATIC, 6, 18, 244, 50 + LTEXT "Performance options control how applications use memory, which affects the speed of your computer.", IDC_STATIC, 16, 29, 210, 17 + PUSHBUTTON "&Nastavenie", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "Pouívate¾ské profily", IDC_STATIC, 6,75,244,48 + LTEXT "Nastavenie pracovnej plochy súvisiace s prihlásením", IDC_STATIC, 16, 88, 210, 20 + PUSHBUTTON "Nastav&enie", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "Spúanie a obnovovanie", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.", IDC_STATIC, 16, 144, 210, 19 + PUSHBUTTON "Na&stavenie", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "&Premenné prostredia", IDC_ENVVAR, 84, 192, 80, 15 + PUSHBUTTON "&Hlásenie chýb", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hardvérové profily" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "Pre rôzne hardvérové konfigurácie môete nastavi hardvérové profily. Pri spustení je moné vybra profil, ktorý chcete pouíva.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "&Dostupné hardvérové profily:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 + PUSHBUTTON "Vl&astnosti", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "&Kopírova", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "Pr&emenova", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "&Odstráni", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "Výber hardvérového profilu", IDC_STATIC, 7, 130, 240, 75 + LTEXT "Pri tarte systému ReactOS:", IDC_STATIC, 14, 142, 210, 8 + //RADIOBUTTON "&Poèka na výber hardvérového profilu", IDC_HRDPROFWAIT, 14, 158, 133, 8 + //RADIOBUTTON "&Vybra prvý profil v zozname, ak sa profil nevyberie do", IDC_HRDPROFSELECT, 14, 173, 190, 8 + CONTROL "&Poèka na výber hardvérového profilu", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 133, 8 + CONTROL "&Vybra prvý profil v zozname, ak sa profil nevyberie do", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 190, 8 + LTEXT "sekúnd", IDC_STATIC, 65, 187, 35, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 + PUSHBUTTON "Zrui", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Premenova profil" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Z:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "Na:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 196, 6, 50, 14 + PUSHBUTTON "Zrui", IDCANCEL, 196, 24, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Pouívate¾ské profily" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "Pouívate¾ské profily obsahujú nastavenia pracovnej plochy a iné informácie týkajúce sa pouívate¾ského konta. Na kadom pouívanom poèítaèi je moné vytvori iný profil alebo je moné vybra zdie¾aný profil, ktorý je rovnaký na vetkých pouívaných poèítaèoch.", + IDC_STATIC, 40, 11, 204, 35 + LTEXT "&Profily uloené na tomto poèítaèi:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "&Zmeni typ", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "&Odstráni", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "Kopírova do", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + CONTROL "Ak chcete vytvori nové pouívate¾ské konto, kliknite na poloku <A>Pouívate¾ské kontá</A> v ovládacom paneli.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 228, 8 + + DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 + PUSHBUTTON "Zrui", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Startup and Recovery" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "System startup", IDC_STATIC, 7, 12, 238, 95 + LTEXT "Default operating &system:", IDC_STATIC, 14, 26, 100, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + //CHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 + CONTROL "&Time to display list of operating systems:", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "seconds", IDC_STATIC, 215, 56, 25, 8 + CONTROL "Time to &display recovery options when needed:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "seconds", IDC_STATIC, 215, 70, 25, 8 + LTEXT "To edit the startup options file manually, click Edit.", IDC_STATIC, 14, 89, 187, 8 + PUSHBUTTON "&Edit", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "System failure", IDC_STATIC, 7, 111, 238, 140 + CONTROL "&Write an event to the system log", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 148, 10 + CONTROL "Se&nd an administrative alert", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 148, 10 + CONTROL "Automatically &restart", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 145, 10 + + GROUPBOX "Write debugging information", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "Dump &file:", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + CONTROL "&Overwrite any existing file", IDC_STRRECOVERWRITE, "button", BS_AUTOCHECKBOX, 17, 228, 125, 10 + + DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 + PUSHBUTTON "Zrui", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Virtuálna pamä" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "Jednotka [menovka zväzku]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "Ve¾kos stránkovacieho súboru (v MB)", IDC_STATIC, 115, 5, 96, 9 + LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS + GROUPBOX "Ve¾kos stránkovacieho súboru pre vybranú jednotku", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "Jednotka:", IDC_STATIC, 20, 80, 20, 8 + LTEXT "", IDC_DRIVE, 88, 81, 100, 9 + LTEXT "Dostupné miesto:", IDC_STATIC, 20, 92, 56, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "&Poèiatoèná ve¾kos (v MB):", -1, 22, 118, 54, 9 + LTEXT "Ma&ximálna ve¾kos (v MB):", -1, 22, 131, 64, 9 + CONTROL "&Vlastná ve¾kos:", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 54, 9 + CONTROL "Ve¾kos urèovaná &systémom", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 88, 9 + CONTROL "N&epouíva stránkovací súbor", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 78,9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "&Nastavi", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "Celková ve¾kos stránkovacieho súboru pre vetky jednotky", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "Najmenia povolená:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "Odporúèaná:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 + LTEXT "Aktuálne vyhradená:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 208, 100, 9 + + DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Zrui", IDCANCEL, 168, 232, 48, 13 +END + + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Environment Variables" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "User variables", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "&New...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "&Edit...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "&Delete", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "System variables", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "Ne&w...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "Ed&it...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "De&lete", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "Zrui", IDCANCEL, 195, 224, 50, 14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Upravi premennú" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Názov premennej:", IDC_STATIC, 7, 14, 70, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "&Hodnota premennej:", IDC_STATIC, 7, 32, 70, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 + PUSHBUTTON "Zrui", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "Licencia" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "Systém" + IDS_CPLSYSTEMDESCRIPTION "Zobrazí informácie o poèítaèi, zmenách rôznych systémových a hardvérových nastavenií." + IDS_MEGABYTE "MB pamäte RAM" + IDS_GIGABYTE "GB pamäte RAM" + IDS_TERABYTE "TB pamäte RAM" + IDS_PETABYTE "PB pamäte RAM" + IDS_VARIABLE "Premenná" + IDS_VALUE "Hodnota" + IDS_NO_DUMP "(iadne)" + IDS_MINI_DUMP "Malý výpis pamäte (64 kB)" + IDS_KERNEL_DUMP "Výpis pamäte jadra" + IDS_FULL_DUMP "Úplný výpis pamäte" +END Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/rsrc.rc (original) +++ trunk/reactos/dll/cpl/sysdm/rsrc.rc Sat Sep 22 22:23:06 2007 @@ -8,6 +8,7 @@ #include "lang/it-IT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" /*

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