Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[jimtabor] 28918: - Reordered IntGdiGet/SetDCState and separated the copy sections. - When creating DCE for window handles, allocate a DC structure for the default window DC. - Return Dhpdev if not zero for NtGdiOpenDCW. - Reordered the DC object.
by jimtabor＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: jimtabor Date: Fri Sep 7 16:21:26 2007 New Revision: 28918 URL: http://svn.reactos.org/svn/reactos?rev=28918&view=rev Log: - Reordered IntGdiGet/SetDCState and separated the copy sections. - When creating DCE for window handles, allocate a DC structure for the default window DC. - Return Dhpdev if not zero for NtGdiOpenDCW. - Reordered the DC object. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Fri Sep 7 16:21:26 2007 @@ -59,37 +59,42 @@ typedef struct _DC { - HDC hSelf; - HDC hNext; - PDC_ATTR pDc_Attr; - INT DC_Type; - INT DC_Flags; - DHPDEV PDev; - HSURF FillPatternSurfaces[HS_DDI_MAX]; - PGDIINFO GDIInfo; - PDEVINFO DevInfo; - HDEV GDIDevice; + HGDIOBJ hHmgr; + PVOID pvEntry; + ULONG lucExcLock; + ULONG Tid; + + DHPDEV PDev; + INT DC_Type; + INT DC_Flags; + PDC_ATTR pDc_Attr; + DC_ATTR Dc_Attr; + + HDC hSelf; + HDC hNext; + HSURF FillPatternSurfaces[HS_DDI_MAX]; + PGDIINFO GDIInfo; + PDEVINFO DevInfo; + HDEV GDIDevice; DRIVER_FUNCTIONS DriverFunctions; UNICODE_STRING DriverName; - HANDLE DeviceDriver; + HANDLE DeviceDriver; - CLIPOBJ *CombinedClip; + CLIPOBJ *CombinedClip; - XLATEOBJ *XlateBrush; - XLATEOBJ *XlatePen; + XLATEOBJ *XlateBrush; + XLATEOBJ *XlatePen; - INT saveLevel; - BOOL IsIC; + INT saveLevel; + BOOL IsIC; - HPALETTE PalIndexed; + HPALETTE PalIndexed; - WIN_DC_INFO w; - DC_ATTR Dc_Attr; + WIN_DC_INFO w; - HANDLE hFile; + HANDLE hFile; LPENHMETAHEADER emh; - } DC, *PDC; typedef struct _GDIPOINTER /* should stay private to ENG */ @@ -151,6 +156,8 @@ HDC FASTCALL DC_GetNextDC (PDC pDC); VOID FASTCALL DC_SetNextDC (PDC pDC, HDC hNextDC); VOID FASTCALL DC_SetOwnership(HDC DC, PEPROCESS Owner); +VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC); +VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); VOID FASTCALL DC_UpdateXforms(PDC dc); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Fri Sep 7 16:21:26 2007 @@ -159,7 +159,7 @@ HDC FASTCALL IntGdiCreateDC(PUNICODE_STRING Driver, PUNICODE_STRING Device, - PUNICODE_STRING Output, + PVOID pUMdhpdev, CONST PDEVMODEW InitData, BOOL CreateAsIC); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Fri Sep 7 16:21:26 2007 @@ -39,7 +39,7 @@ /* NOTE - I think we should store this per window station (including gdi objects) */ static PDCE FirstDce = NULL; -static HDC defaultDCstate = NULL; +static PDC defaultDCstate = NULL; //static INT DCECount = 0; #define DCX_CACHECOMPAREMASK (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | \ @@ -126,12 +126,16 @@ ExFreePoolWithTag(pDce, TAG_PDCE); return NULL; } - +// +// If NULL, first time through! Build the default window dc! +// if (NULL == defaultDCstate) // Ultra HAX! Dedicated to GvG! { // This is a cheesy way to do this. - // But, due to the right way of creating gdi handles there is no choice. - defaultDCstate = IntGdiGetDCState(pDce->hDC); - DC_SetOwnership( defaultDCstate, NULL); + PDC dc = DC_LockDc ( pDce->hDC ); + defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + RtlZeroMemory(defaultDCstate, sizeof(DC)); + IntGdiCopyToSaveState(dc, defaultDCstate); + DC_UnlockDc( dc ); } pDce->hwndCurrent = (Window ? Window->hSelf : NULL); @@ -144,8 +148,7 @@ KeLeaveCriticalRegion(); if (Type == DCE_WINDOW_DC) //Window DCE have ownership. - { - DC_SetOwnership(pDce->hDC, PsGetCurrentProcess()); + { // Process should already own it. pDce->pProcess = PsGetCurrentProcess(); } else @@ -248,13 +251,8 @@ /* make the DC clean so that SetDCState doesn't try to update the vis rgn */ IntGdiSetHookFlags(dce->hDC, DCHF_VALIDATEVISRGN); - if( dce->pProcess ) // Attempt to fix Dc_Attr problem. - DC_SetOwnership( defaultDCstate, dce->pProcess); - else - DC_SetOwnership( defaultDCstate, PsGetCurrentProcess()); - - IntGdiSetDCState(dce->hDC, defaultDCstate); - DC_SetOwnership( defaultDCstate, NULL); // Return default dc state to inaccessible mode. + PDC dc = DC_LockDc ( dce->hDC ); + IntGdiCopyFromSaveState(dc, defaultDCstate); // Was SetDCState. dce->DCXFlags &= ~DCX_DCEBUSY; if (dce->DCXFlags & DCX_DCEDIRTY) Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Fri Sep 7 16:21:26 2007 @@ -809,7 +809,7 @@ HDC FASTCALL IntGdiCreateDC(PUNICODE_STRING Driver, PUNICODE_STRING Device, - PUNICODE_STRING Output, + PVOID pUMdhpdev, CONST PDEVMODEW InitData, BOOL CreateAsIC) { @@ -909,6 +909,7 @@ memcpy(NewDC->FillPatternSurfaces, PrimarySurface.FillPatterns, sizeof(NewDC->FillPatternSurfaces)); NewDC->PDev = PrimarySurface.PDev; + if(pUMdhpdev) pUMdhpdev = NewDC->PDev; NewDC->GDIDevice = (HDEV)&PrimarySurface; NewDC->DriverFunctions = PrimarySurface.DriverFunctions; NewDC->w.hBitmap = PrimarySurface.Handle; @@ -963,6 +964,7 @@ { UNICODE_STRING SafeDevice; DEVMODEW SafeInitData; + PVOID Dhpdev; HDC Ret; NTSTATUS Status = STATUS_SUCCESS; @@ -970,6 +972,12 @@ { _SEH_TRY { + if (pUMdhpdev) + { + ProbeForWrite(pUMdhpdev, + sizeof(PVOID), + 1); + } ProbeForRead(InitData, sizeof(DEVMODEW), 1); @@ -1002,10 +1010,12 @@ Ret = IntGdiCreateDC(NULL == Device ? NULL : &SafeDevice, NULL, - NULL, + NULL == pUMdhpdev ? NULL : &Dhpdev, NULL == InitData ? NULL : &SafeInitData, (BOOL) iType); // FALSE 0 DCW, TRUE 1 ICW + if (pUMdhpdev) pUMdhpdev = Dhpdev; + return Ret; } @@ -1281,29 +1291,11 @@ return oldColor; } -HDC STDCALL -IntGdiGetDCState(HDC hDC) -{ - PDC newdc, dc; - HDC hnewdc; - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - hnewdc = DC_AllocDC(NULL); - if (hnewdc == NULL) - { - DC_UnlockDc(dc); - return 0; - } - newdc = DC_LockDc( hnewdc ); - /* FIXME - newdc can be NULL!!!! Don't assert here!!! */ - ASSERT( newdc ); - + +VOID +FASTCALL +IntGdiCopyToSaveState(PDC dc, PDC newdc) +{ newdc->w.flags = dc->w.flags | DC_SAVED; newdc->Dc_Attr.hpen = dc->Dc_Attr.hpen; newdc->Dc_Attr.hbrush = dc->Dc_Attr.hbrush; @@ -1344,7 +1336,6 @@ newdc->w.xformWorld2Vport = dc->w.xformWorld2Vport; newdc->w.xformVport2World = dc->w.xformVport2World; newdc->w.vport2WorldValid = dc->w.vport2WorldValid; - DCU_UpdateUserXForms(newdc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); newdc->Dc_Attr.ptlWindowOrg.x = dc->Dc_Attr.ptlWindowOrg.x; newdc->Dc_Attr.ptlWindowOrg.y = dc->Dc_Attr.ptlWindowOrg.y; newdc->Dc_Attr.szlWindowExt.cx = dc->Dc_Attr.szlWindowExt.cx; @@ -1354,7 +1345,6 @@ newdc->Dc_Attr.szlViewportExt.cx = dc->Dc_Attr.szlViewportExt.cx; newdc->Dc_Attr.szlViewportExt.cy = dc->Dc_Attr.szlViewportExt.cy; - newdc->hSelf = hnewdc; newdc->saveLevel = 0; newdc->IsIC = dc->IsIC; @@ -1370,6 +1360,136 @@ newdc->w.hClipRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); NtGdiCombineRgn( newdc->w.hClipRgn, dc->w.hClipRgn, 0, RGN_COPY ); } +} + + +VOID +FASTCALL +IntGdiCopyFromSaveState(PDC dc, PDC dcs) +{ + HDC hDC = dc->hSelf; + + dc->w.flags = dcs->w.flags & ~DC_SAVED; + + dc->w.hFirstBitmap = dcs->w.hFirstBitmap; + +#if 0 + dc->w.hDevice = dcs->w.hDevice; +#endif + + dc->w.totalExtent = dcs->w.totalExtent; + dc->Dc_Attr.jROP2 = dcs->Dc_Attr.jROP2; + dc->Dc_Attr.jFillMode = dcs->Dc_Attr.jFillMode; + dc->Dc_Attr.jStretchBltMode = dcs->Dc_Attr.jStretchBltMode; + dc->Dc_Attr.lRelAbs = dcs->Dc_Attr.lRelAbs; + dc->Dc_Attr.jBkMode = dcs->Dc_Attr.jBkMode; + dc->Dc_Attr.crBackgroundClr = dcs->Dc_Attr.crBackgroundClr; + dc->Dc_Attr.crForegroundClr = dcs->Dc_Attr.crForegroundClr; + dc->Dc_Attr.ptlBrushOrigin.x = dcs->Dc_Attr.ptlBrushOrigin.x; + dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y; + dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign; + dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra; + dc->Dc_Attr.cBreak = dcs->Dc_Attr.cBreak; + dc->Dc_Attr.lBreakExtra = dcs->Dc_Attr.lBreakExtra; + dc->Dc_Attr.iMapMode = dcs->Dc_Attr.iMapMode; + dc->Dc_Attr.iGraphicsMode = dcs->Dc_Attr.iGraphicsMode; +#if 0 +/* Apparently, the DC origin is not changed by [GS]etDCState */ + dc->w.DCOrgX = dcs->w.DCOrgX; + dc->w.DCOrgY = dcs->w.DCOrgY; +#endif + dc->Dc_Attr.ptlCurrent.x = dcs->Dc_Attr.ptlCurrent.x; + dc->Dc_Attr.ptlCurrent.y = dcs->Dc_Attr.ptlCurrent.y; + dc->w.ArcDirection = dcs->w.ArcDirection; + + dc->w.xformWorld2Wnd = dcs->w.xformWorld2Wnd; + dc->w.xformWorld2Vport = dcs->w.xformWorld2Vport; + dc->w.xformVport2World = dcs->w.xformVport2World; + dc->w.vport2WorldValid = dcs->w.vport2WorldValid; + dc->Dc_Attr.ptlWindowOrg.x = dcs->Dc_Attr.ptlWindowOrg.x; + dc->Dc_Attr.ptlWindowOrg.y = dcs->Dc_Attr.ptlWindowOrg.y; + dc->Dc_Attr.szlWindowExt.cx = dcs->Dc_Attr.szlWindowExt.cx; + dc->Dc_Attr.szlWindowExt.cy = dcs->Dc_Attr.szlWindowExt.cy; + dc->Dc_Attr.ptlViewportOrg.x = dcs->Dc_Attr.ptlViewportOrg.x; + dc->Dc_Attr.ptlViewportOrg.y = dcs->Dc_Attr.ptlViewportOrg.y; + dc->Dc_Attr.szlViewportExt.cx = dcs->Dc_Attr.szlViewportExt.cx; + dc->Dc_Attr.szlViewportExt.cy = dcs->Dc_Attr.szlViewportExt.cy; + dc->PalIndexed = dcs->PalIndexed; + + if (!(dc->w.flags & DC_MEMORY)) + { + dc->w.bitsPerPixel = dcs->w.bitsPerPixel; + } + +#if 0 + if (dcs->w.hClipRgn) + { + if (!dc->w.hClipRgn) + { + dc->w.hClipRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); + } + NtGdiCombineRgn( dc->w.hClipRgn, dcs->w.hClipRgn, 0, RGN_COPY ); + } + else + { + if (dc->w.hClipRgn) + { + NtGdiDeleteObject( dc->w.hClipRgn ); + } + dc->w.hClipRgn = 0; + } + { + int res; + res = CLIPPING_UpdateGCRegion( dc ); + ASSERT ( res != ERROR ); + } + DC_UnlockDc ( dc ); +#else + IntGdiExtSelectClipRgn(dc, dcs->w.hClipRgn, RGN_COPY); + DC_UnlockDc ( dc ); +#endif + + NtGdiSelectObject( hDC, dcs->w.hBitmap ); + NtGdiSelectObject( hDC, dcs->Dc_Attr.hbrush ); + NtGdiSelectObject( hDC, dcs->Dc_Attr.hlfntNew ); + NtGdiSelectObject( hDC, dcs->Dc_Attr.hpen ); + + NtGdiSetBkColor( hDC, dcs->Dc_Attr.crBackgroundClr); + NtGdiSetTextColor( hDC, dcs->Dc_Attr.crForegroundClr); + + NtUserSelectPalette( hDC, dcs->w.hPalette, FALSE ); + +#if 0 + GDISelectPalette16( hDC, dcs->w.hPalette, FALSE ); +#endif +} + +HDC STDCALL +IntGdiGetDCState(HDC hDC) +{ + PDC newdc, dc; + HDC hnewdc; + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + hnewdc = DC_AllocDC(NULL); + if (hnewdc == NULL) + { + DC_UnlockDc(dc); + return 0; + } + newdc = DC_LockDc( hnewdc ); + /* FIXME - newdc can be NULL!!!! Don't assert here!!! */ + ASSERT( newdc ); + + newdc->hSelf = hnewdc; + IntGdiCopyToSaveState( dc, newdc); + DCU_SyncDcAttrtoUser(newdc, -1); DC_UnlockDc( newdc ); DC_UnlockDc( dc ); @@ -1391,105 +1511,16 @@ { if ( dcs->w.flags & DC_SAVED ) { - dc->w.flags = dcs->w.flags & ~DC_SAVED; - - dc->w.hFirstBitmap = dcs->w.hFirstBitmap; - -#if 0 - dc->w.hDevice = dcs->w.hDevice; -#endif - - dc->w.totalExtent = dcs->w.totalExtent; - dc->Dc_Attr.jROP2 = dcs->Dc_Attr.jROP2; - dc->Dc_Attr.jFillMode = dcs->Dc_Attr.jFillMode; - dc->Dc_Attr.jStretchBltMode = dcs->Dc_Attr.jStretchBltMode; - dc->Dc_Attr.lRelAbs = dcs->Dc_Attr.lRelAbs; - dc->Dc_Attr.jBkMode = dcs->Dc_Attr.jBkMode; - dc->Dc_Attr.crBackgroundClr = dcs->Dc_Attr.crBackgroundClr; - dc->Dc_Attr.crForegroundClr = dcs->Dc_Attr.crForegroundClr; - dc->Dc_Attr.ptlBrushOrigin.x = dcs->Dc_Attr.ptlBrushOrigin.x; - dc->Dc_Attr.ptlBrushOrigin.y = dcs->Dc_Attr.ptlBrushOrigin.y; - dc->Dc_Attr.lTextAlign = dcs->Dc_Attr.lTextAlign; - dc->Dc_Attr.lTextExtra = dcs->Dc_Attr.lTextExtra; - dc->Dc_Attr.cBreak = dcs->Dc_Attr.cBreak; - dc->Dc_Attr.lBreakExtra = dcs->Dc_Attr.lBreakExtra; - dc->Dc_Attr.iMapMode = dcs->Dc_Attr.iMapMode; - dc->Dc_Attr.iGraphicsMode = dcs->Dc_Attr.iGraphicsMode; -#if 0 - /* Apparently, the DC origin is not changed by [GS]etDCState */ - dc->w.DCOrgX = dcs->w.DCOrgX; - dc->w.DCOrgY = dcs->w.DCOrgY; -#endif - dc->Dc_Attr.ptlCurrent.x = dcs->Dc_Attr.ptlCurrent.x; - dc->Dc_Attr.ptlCurrent.y = dcs->Dc_Attr.ptlCurrent.y; - dc->w.ArcDirection = dcs->w.ArcDirection; - - dc->w.xformWorld2Wnd = dcs->w.xformWorld2Wnd; - dc->w.xformWorld2Vport = dcs->w.xformWorld2Vport; - dc->w.xformVport2World = dcs->w.xformVport2World; - dc->w.vport2WorldValid = dcs->w.vport2WorldValid; - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); - dc->Dc_Attr.ptlWindowOrg.x = dcs->Dc_Attr.ptlWindowOrg.x; - dc->Dc_Attr.ptlWindowOrg.y = dcs->Dc_Attr.ptlWindowOrg.y; - dc->Dc_Attr.szlWindowExt.cx = dcs->Dc_Attr.szlWindowExt.cx; - dc->Dc_Attr.szlWindowExt.cy = dcs->Dc_Attr.szlWindowExt.cy; - dc->Dc_Attr.ptlViewportOrg.x = dcs->Dc_Attr.ptlViewportOrg.x; - dc->Dc_Attr.ptlViewportOrg.y = dcs->Dc_Attr.ptlViewportOrg.y; - dc->Dc_Attr.szlViewportExt.cx = dcs->Dc_Attr.szlViewportExt.cx; - dc->Dc_Attr.szlViewportExt.cy = dcs->Dc_Attr.szlViewportExt.cy; - dc->PalIndexed = dcs->PalIndexed; - - if (!(dc->w.flags & DC_MEMORY)) - { - dc->w.bitsPerPixel = dcs->w.bitsPerPixel; - } - -#if 0 - if (dcs->w.hClipRgn) - { - if (!dc->w.hClipRgn) - { - dc->w.hClipRgn = NtGdiCreateRectRgn( 0, 0, 0, 0 ); - } - NtGdiCombineRgn( dc->w.hClipRgn, dcs->w.hClipRgn, 0, RGN_COPY ); - } - else - { - if (dc->w.hClipRgn) - { - NtGdiDeleteObject( dc->w.hClipRgn ); - } - - dc->w.hClipRgn = 0; - } - { - int res; - res = CLIPPING_UpdateGCRegion( dc ); - ASSERT ( res != ERROR ); - } - DC_UnlockDc ( dc ); -#else - IntGdiExtSelectClipRgn(dc, dcs->w.hClipRgn, RGN_COPY); - DC_UnlockDc ( dc ); -#endif - - NtGdiSelectObject( hDC, dcs->w.hBitmap ); - NtGdiSelectObject( hDC, dcs->Dc_Attr.hbrush ); - NtGdiSelectObject( hDC, dcs->Dc_Attr.hlfntNew ); - NtGdiSelectObject( hDC, dcs->Dc_Attr.hpen ); - NtGdiSetBkColor( hDC, dcs->Dc_Attr.crBackgroundClr); - NtGdiSetTextColor( hDC, dcs->Dc_Attr.crForegroundClr); - - NtUserSelectPalette( hDC, dcs->w.hPalette, FALSE ); - -#if 0 - GDISelectPalette16( hDC, dcs->w.hPalette, FALSE ); -#endif - } else { + IntGdiCopyFromSaveState( dc, dcs); + } + else + { DC_UnlockDc(dc); } DC_UnlockDc ( dcs ); - } else { + } + else + { DC_UnlockDc ( dc ); SetLastWin32Error(ERROR_INVALID_HANDLE); } @@ -2607,7 +2638,6 @@ { PDC DC; -// DC_FreeDcAttr(hDC, NULL); GDIOBJ_SetOwnership(GdiHandleTable, hDC, Owner); DC = DC_LockDc(hDC); if (NULL != DC) @@ -2626,7 +2656,6 @@ } DC_UnlockDc(DC); } -// DC_AllocateDcAttr(hDC, Owner); } BOOL FASTCALL

1 0

[ekohl] 28917: Add the serial keys settings dialog.
by ekohl＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: ekohl Date: Fri Sep 7 15:17:09 2007 New Revision: 28917 URL: http://svn.reactos.org/svn/reactos?rev=28917&view=rev Log: Add the serial keys settings dialog. Modified: trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc trunk/reactos/dll/cpl/access/resource.h Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Fri Sep 7 15:17:09 2007 @@ -22,9 +22,102 @@ { ACCESSTIMEOUT accessTimeout; SERIALKEYS serialKeys; + TCHAR szActivePort[MAX_PATH]; + TCHAR szPort[MAX_PATH]; BOOL bWarningSounds; BOOL bSoundOnActivation; } GLOBAL_DATA, *PGLOBAL_DATA; + + +#define BAUDTICKS 6 +static INT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200}; + + +INT_PTR CALLBACK +SerialKeysDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + INT i, n; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = (PGLOBAL_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + /* Add the COM-Ports 1 - 4 to the list */ + for (i = 0; i < 4; i++) + { + TCHAR szBuffer[256]; + + _stprintf(szBuffer, _T("COM%d"), i + 1); + SendDlgItemMessage(hwndDlg, IDC_SERIAL_PORT_COMBO, CB_ADDSTRING, 0, (LPARAM)szBuffer); + } + + /* Determine the current port */ + if (pGlobalData->serialKeys.lpszActivePort && pGlobalData->serialKeys.lpszActivePort[0]) + { + i = pGlobalData->serialKeys.lpszActivePort[3] - '1'; + if (i < 0 || i > 3) + i = 0; + } + else + { + /* Make COM1 the default port */ + i = 0; + _tcscpy(pGlobalData->serialKeys.lpszActivePort, _T("COM1")); + } + + /* Set the current port */ + SendDlgItemMessage(hwndDlg, IDC_SERIAL_PORT_COMBO, CB_SETCURSEL, i, 0); + + /* Determine the current baud rate */ + n = 0; + for (i = 0; i < BAUDTICKS; i++) + { + TCHAR szBuffer[256]; + + _stprintf(szBuffer, _T("%d Baud"), nBaudArray[i]); + SendDlgItemMessage(hwndDlg, IDC_SERIAL_BAUD_COMBO, CB_ADDSTRING, 0, (LPARAM)szBuffer); + + if (pGlobalData->serialKeys.iBaudRate == nBaudArray[i]) + n = i; + } + + /* Set the current baud rate */ + SendDlgItemMessage(hwndDlg, IDC_SERIAL_BAUD_COMBO, CB_SETCURSEL, n, 0); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + i = SendDlgItemMessage(hwndDlg, IDC_SERIAL_PORT_COMBO, CB_GETCURSEL, 0, 0) + 1; + _stprintf(pGlobalData->serialKeys.lpszActivePort, _T("COM%d"), i); + + i = SendDlgItemMessage(hwndDlg, IDC_SERIAL_BAUD_COMBO, CB_GETCURSEL, 0, 0); + pGlobalData->serialKeys.iBaudRate = nBaudArray[i]; + + EndDialog(hwndDlg, TRUE); + break; + + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + break; + + default: + break; + } + break; + } + + return FALSE; +} static VOID @@ -65,6 +158,8 @@ /* Get serial keys information */ pGlobalData->serialKeys.cbSize = sizeof(SERIALKEYS); + pGlobalData->serialKeys.lpszActivePort = pGlobalData->szActivePort; + pGlobalData->serialKeys.lpszPort = pGlobalData->szPort; SystemParametersInfo(SPI_GETSERIALKEYS, sizeof(SERIALKEYS), &pGlobalData->serialKeys, @@ -245,6 +340,12 @@ break; case IDC_SERIAL_BUTTON: + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_SERIALKEYSOPTIONS), + hwndDlg, + (DLGPROC)SerialKeysDlgProc, + (LPARAM)pGlobalData)) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_ADMIN_LOGON_BOX: Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Fri Sep 7 15:17:09 2007 @@ -268,6 +268,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Monosti usnadnìní" Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Fri Sep 7 15:17:09 2007 @@ -245,7 +245,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) - LTEXT "Tastatureinstellungen in der Systmsteuerung übergehen:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + LTEXT "Tastatureinstellungen in der Systemsteuerung übergehen:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) AUTORADIOBUTTON "&Keine Wiederholung",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP AUTORADIOBUTTON "&Wiederholungsraten verlangsamen",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) @@ -268,6 +268,27 @@ DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", 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 "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Fri Sep 7 15:17:09 2007 @@ -268,6 +268,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Fri Sep 7 15:17:09 2007 @@ -271,6 +271,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilidad" Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Fri Sep 7 15:17:09 2007 @@ -270,6 +270,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibilité" Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Fri Sep 7 15:17:09 2007 @@ -269,6 +269,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Kisegítõ lehetõségek" Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Fri Sep 7 15:17:09 2007 @@ -270,6 +270,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Aksesibilitas" Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Fri Sep 7 15:17:09 2007 @@ -268,6 +268,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Accessibility" Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Fri Sep 7 15:17:09 2007 @@ -268,6 +268,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "[U[â" Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Fri Sep 7 15:17:09 2007 @@ -270,6 +270,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Toegankelijkheidsopties" Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Fri Sep 7 15:17:09 2007 @@ -271,6 +271,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "U³atwienia dostêpu" Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Fri Sep 7 15:17:09 2007 @@ -268,6 +268,27 @@ END +IDD_SERIALKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "SerialKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Serial Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10) + LTEXT "Choose the port where you connect an alternative input device.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + LTEXT "&Serial port:",-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 "&Baud rate:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "Ñïåöèàëüíûå âîçìîæíîñòè" Modified: trunk/reactos/dll/cpl/access/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/access/resource.h (original) +++ trunk/reactos/dll/cpl/access/resource.h Fri Sep 7 15:17:09 2007 @@ -28,6 +28,8 @@ #define IDD_CONTRASTOPTIONS 110 #define IDD_MOUSEKEYSOPTIONS 111 + +#define IDD_SERIALKEYSOPTIONS 112 #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 @@ -108,6 +110,9 @@ #define IDC_MOUSEKEYS_OFF_RADIO 270 #define IDC_MOUSEKEYS_STATUS_CHECK 271 +#define IDC_SERIAL_PORT_COMBO 275 +#define IDC_SERIAL_BAUD_COMBO 276 + #endif /* __CPL_RESOURCE_H */ /* EOF */

1 0

[janderwald] 28916: - use raw hdd image for linux and use vmdk for windows hosts
by janderwald＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: janderwald Date: Fri Sep 7 15:16:05 2007 New Revision: 28916 URL: http://svn.reactos.org/svn/reactos?rev=28916&view=rev Log: - use raw hdd image for linux and use vmdk for windows hosts Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Sep 7 15:16:05 2007 @@ -192,7 +192,11 @@ TCHAR * options[] = {NULL, _T("create"), _T("-f"), +#ifdef __LINUX__ _T("raw"), +#else + _T("vmdk"), +#endif NULL, _T("100M"), NULL

1 0

[ekohl] 28915: Delete the bulgarian translation and revert the polish one because they are outdated. Dialogs and controls are missing or were removed by dreimers latest patch!
by ekohl＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: ekohl Date: Fri Sep 7 15:14:51 2007 New Revision: 28915 URL: http://svn.reactos.org/svn/reactos?rev=28915&view=rev Log: Delete the bulgarian translation and revert the polish one because they are outdated. Dialogs and controls are missing or were removed by dreimers latest patch! Removed: trunk/reactos/dll/cpl/access/lang/bg-BG.rc Modified: trunk/reactos/dll/cpl/access/access.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Fri Sep 7 15:14:51 2007 @@ -11,7 +11,6 @@ IDI_CPLACCESS ICON "resources/applet.ico" -#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" Removed: trunk/reactos/dll/cpl/access/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/access/lang/bg-BG.rc (removed) @@ -1,118 +1,0 @@ -LANGUAGE LANG_BULGARIAN, 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(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Èç&ïîëçâàíå íà ËåïêàâèÊëàâèøè",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Íà&ñòðîéêè",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - - GROUPBOX "ÏðåñÿâàùèÊëàâèøè",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "Èçïîëçâàéòå ÏðåñÿâàùèÊëàâèøè, àêî èñêàòå ÐåàêòÎÑ äà ïðåíåáðåáâà êðàòêè èëè ïîâòàðÿùøè ñå íàòèñêàíèÿ èëè äà íàìàëè ñêîðîñòòà íà ïîâòàðÿíå.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Èçïîëçâàéòå &ÏðåñÿâàùèÊëàâèøè",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Íà&ñòðîéêè",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 - GROUPBOX "ÎáðàùàùèÊëàâèøè",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Èçïîëçâàéòå ÎáðàùàùèÊëàâèøè, àêî èñêàòå äà ÷óâàòå çâóê ïðè íàòèñêàíå íà Caps Lock, Num Lock è Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - AUTOCHECKBOX "Èçïîëçâàíå íà &ÎáðàùàùèÊëàâèøè",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - PUSHBUTTON "Íà&ñòðîéêè",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),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(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Èçïîëçâàíå íà &ÇâóêîâÑòðàæ",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),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 "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Èçïîëçâàíå Çâóêîâî&Ïîêàçâàíå",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,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 "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Èçïîëçâàíå íà ãîëÿì êîíòðàñò",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - PUSHBUTTON "Íà&ñòðîéêè",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 -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 "MouseKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Use this option if you want to control the pointer with the numeric keypad on your keyboard.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Use &MouseKeys",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),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 "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), - CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - LTEXT "Minutes",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) - - GROUPBOX "Óâåäîìÿâàíå",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - AUTOCHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - - GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - AUTOCHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - - PUSHBUTTON "Íà&ñòðîéêè",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) - - GROUPBOX "Administrative options",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - AUTOCHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 -END - - -IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Sticky Keys Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Êëàâèøè",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Íàòèñíåòå 5 ïúòè êëàâèøà Shift, çà äà âêëþ÷èòå ëåïêàâèòå êëàâèøè.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Â&êëþ÷âàíå íà ëåïêàâè êëàâèøè",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - - PUSHBUTTON "Äîáðå", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Îòêàç", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Äîñòúïíîñò" - IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." - - IDS_SENTRY_NONE "[Ìèãàíå]" - IDS_SENTRY_TITLE "Ìèãàíå íà çàãëàâíàòà ëåíòà" - IDS_SENTRY_WINDOW "Ìèãàíå íà òåêóùèÿ ïðîçîðåö" - IDS_SENTRY_DISPLAY "Ìèãàíå íà ðàáîòíàòà ïëîù" -END Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Fri Sep 7 15:14:51 2007 @@ -10,18 +10,21 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Klawisze Trwa³e",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "U¿yj funkcji Klawisze Trwa³e, jeli chcesz u¿ywaæ klawiszy Shift, Ctrl lub Alt, naciskaj¹c je tylko raz.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&U¿yj Klawiszy Trwa³ych",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "U¿yj funkcji Klawisze trwa³e jeli chcesz u¿ywaæ Shifta, Ctrl-a albo Alta naciskaj¹c je tylko raz.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&U¿yj Klawiszy Trwa³ych",IDC_STICKY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "U&stawienia",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - GROUPBOX "Klawisze Filtru",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "U¿yj funkcji Klawisze Filtru, jeli chcesz, ¿eby ReactOS ignorowa³ krótkie albo powtarzaj¹ce siê wciniêcia klawiszy albo zmniejsza³ czêstoæ powtarzania.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Klawisze &Filtru",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Klawisze Filtra",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "U¿yj funkcji Klawisze Filtra, jeli chcesz, ¿eby ReactOS ignorowa³ krótkie albo powtarzaj¹ce siê wciniêcia klawiszy albo zmniejsza³ czêstoæ powtarzania.",-1,PROPSHEETPADDING(2),LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Klawisze &Filtra",IDC_FILTER_BOX,PROPSHEETPADDING(2),LABELLINE(13)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Us&tawienia",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + GROUPBOX "Klawisze Prze³¹czaj¹ce",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "U¿yj funkcji &Klawisze Prze³¹czaj¹ce, jeli chcesz s³yszeæ dwiêk przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj Klawiszy Prze³¹czaj¹cych",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + LTEXT "U¿yj funkcji &Klawisze Prze³¹czaj¹ce, jeli chcesz s³yszeæ dwiêk przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,PROPSHEETPADDING(2),LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "U¿yj Klawiszy Prze³¹czaj¹cych",IDC_TOGGLE_BOX,PROPSHEETPADDING(2),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "Ustawie&nia",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 - AUTOCHECKBOX "&Poka¿ w programach dodatkow¹ pomoc dotycz¹c¹ klawiatury",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 + + AUTOCHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA,PROPSHEETPADDING(1),LABELLINE(23)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),14 END @@ -31,14 +34,14 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Wartownik Dwiêku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(10)+PROPSHEETPADDING(1) - LTEXT "U¿yj funkcji Wartownik Dwiêku, jeli chcesz, ¿eby ReactOS pokazywa³ wizualne ostrze¿enia w chwili generacji dwiêku.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + LTEXT "U¿yj funkcji Wartownik Dwiêku jeli chcesz, ¿eby ReactOS pokazywa³ wizualne ostrze¿enia w chwili generacji dwiêku.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "U¿yj funkcji &Wartownik Dwiêku",IDC_SENTRY_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETPADDING(15),14 - LTEXT "U¿yj nastêpuj¹cego ostrze¿enia:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "User the following warning:", 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 "Poka¿ Dwiêki",-1,PROPSHEETPADDING(1),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - LTEXT "U¿yj funkcji Poka¿ Dwiêki, aby nakazaæ swoim programom wywietlanie napisów w chwili generacji dwiêku lub mowy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj funkcji &Poka¿ Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 + LTEXT "U¿yj funkcji Poka¿ Dwiêki, aby nakazaæ swoim programom wywietlanie napisów w chwili generacji dwiêku lub mowy.",-1,PROPSHEETPADDING(2),LABELLINE(14)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "U¿yj funkcji &Poka Dwiêki",IDC_SSHOW_BOX,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 END @@ -48,11 +51,22 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Wysoki Kontrast",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "U¿yj tej funkcji, jeli chcesz, ¿eby ReactOS u¿ywa³ kolorów i czcionek zaprojektowanych do ³atwego czytania",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&U¿yj funkcji Wysoki Kontrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + LTEXT "U¿yj tej funkcji, jeli chcesz, ¿eby Reactos u¿ywa³ kolorów i czcionek zaprojektowanych do ³atwego czytania",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&U¿yj funkcji Wysoki Kontrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "U&stawienia",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 -END - + + GROUPBOX "Cursor options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) + LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + CTEXT "Blinking speed:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "None",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Fast",-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 "Cursor width:",-1,PROPSHEETPADDING(2),LABELLINE(17),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) + LTEXT "Narrow",-1,PROPSHEETPADDING(3),LABELLINE(18)+7,PROPSHEETPADDING(6),LABELLINE(1) + LTEXT "Wide",-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 @@ -61,8 +75,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Klawisze Myszy",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "U¿yj tej opcji, jeli chcesz kontrolowaæ wskanik myszy przy pomocy klawiatury numerycznej.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj funkcji Klawisze &Myszy",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17),14 + LTEXT "U¿yj tej opcji, jeli chcesz kontrolowaæ wskanik myszy przy pomocy klawiatury numerycznej.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "U¿yj funkcji Klawisze &Myszy",IDC_MOUSE_BOX,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 PUSHBUTTON "U&stawienia",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 END @@ -73,82 +87,200 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Automatyczny reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "&Wy³¹cz funkcje u³atwiaj¹ce dostêp, gdy komputer nie jest u¿ywany przez:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(6), LABELLINE(5), + AUTOCHECKBOX "&Wy³¹cz funkcje u³atwiaj¹ce dostêp kiedy komputer nie jest u¿ywany przez:",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 "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "Ostrzegaj kiedy funkcja jest w³¹czana",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Odgrywaj dwiêk, kiedy funkcja jest w³¹czana albo wy³¹czana",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Urz¹dzenia klawiszy szeregowych",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "Urz¹dzenia klawiszy szeregowych zapewniaj¹ alternatywny dostêp do funkcji klawiatury lub myszy.",-1,PROPSHEETPADDING(2),LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + AUTOCHECKBOX "Wspieraj urz¹dzenia klawi&szy szeregowych",IDC_SERIAL_BOX,PROPSHEETPADDING(2),LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + PUSHBUTTON "&Ustawienia",IDC_SERIAL_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(16)-4,PROPSHEETPADDING(15),14 + + GROUPBOX "Opcje zarz¹dzania",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + AUTOCHECKBOX "Zastosuj wszystkie ustawienia do pu&lpitu logowania",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "Zastosuj wszystkie ustawienia do &domylnego profilu dla nowych u¿ytkowników",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 "Ustawienia Klawiszy Trwa³ych" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Klawisze",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Nacinij klawisz SHIFT 5 razy by aktywowaæ funkcjê KlawiszeTrwa³e.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Options",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(10)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(2),LABELLINE(12),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Anuluj", 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 "Filter Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for FilterKeys is: \nHold down <Right Shift> for eight seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_FILTER_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(20),14 + + GROUPBOX "Filter options",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(8)+5 + AUTORADIOBUTTON "Ign&ore repeated keystrokes",IDC_FILTER_BOUNCE_RADIO,PROPSHEETPADDING(2),LABELLINE(9)+7,PROPSHEETPADDING(20),LABELLINE(1),WS_GROUP|WS_TABSTOP + AUTORADIOBUTTON "Ig&nore quick keystrokes and slow down the repeat rate",IDC_FILTER_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(11)+5,PROPSHEETPADDING(20),LABELLINE(2),BS_TOP|BS_MULTILINE + PUSHBUTTON "&Settings",IDC_FILTER_BOUNCE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(9)+5,PROPSHEETPADDING(15),14,WS_GROUP + PUSHBUTTON "S&ettings",IDC_FILTER_REPEAT_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(11)+5,PROPSHEETPADDING(15),14,WS_GROUP + LTEXT "&Click here and type here to test the settings:",-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 "Notifications",-1,PROPSHEETPADDING(1),LABELLINE(17)+6,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+3 + AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 "Toggle Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 "High Contrast Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_CONTRAST_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "High Contrast Color Scheme",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + LTEXT "Current Color Scheme:",-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 - LTEXT "minut",-1,PROPSHEETPADDING(10)+2, LABELLINE(4)+2, PROPSHEETPADDING(16), LABELLINE(1) - - GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "Ostrzegaj, gdy funkcja jest w³¹czana",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - AUTOCHECKBOX "Odgrywaj dwiêk, gdy funkcja jest w³¹czana albo wy³¹czana",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - - GROUPBOX "Urz¹dzenia klawiszy szeregowych",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - LTEXT "Urz¹dzenia klawiszy szeregowych zapewniaj¹ alternatywny dostêp do funkcji klawiatury lub myszy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) - AUTOCHECKBOX "Wspieraj urz¹dzenia klawi&szy szeregowych",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - - PUSHBUTTON "&Ustawienia",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,14 - - GROUPBOX "Opcje zarz¹dzania",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) - AUTOCHECKBOX "Zastosuj wszystkie ustawienia do pu&lpitu logowania",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 - AUTOCHECKBOX "Zastosuj wszystkie ustawienia do &domylnego profilu dla nowych u¿ytkowników",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,14 -END - - -IDD_STICKYKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ustawienia funkcji Klawisze Trwa³e" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Skrót klawiaturowy",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Nacinij klawisz SHIFT 5 razy, by aktywowaæ funkcjê Klawisze Trwa³e.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 - - GROUPBOX "Opcje",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "Aby &zablokowaæ, nacinij dwukrotnie klawisz modyfikuj¹cy",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 - AUTOCHECKBOX "&Wy³¹cz Klawisze Trwa³e, gdy dwa klawisze zostan¹ naciniête równoczenie",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 - - GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(15),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) - AUTOCHECKBOX "&Odtwórz dwiêk, gdy zostanie naciniêty klawisz modyfikuj¹cy",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(4),LABELLINE(16)+2,PROPSHEETPADDING(28)+4,14 - AUTOCHECKBOX "&Poka¿ na ekranie stan funkcji Klawisze Trwa³e",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(4),LABELLINE(18),PROPSHEETPADDING(28)+4,14 - - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Anuluj", 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 "Ustawienia funkcji Klawisze Filtru" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Anuluj", 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 "Ustawienia funkcji Klawisze Prze³¹czaj¹ce" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Skrót klawiaturowy",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "Skrótem funkcji Klawisze Prze³¹czaj¹ce jest: \nPrzytrzymanie wciniêtego klawisza <Num Lock> przez 5 sekund.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "U¿yj &skrótu",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 - - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Anuluj", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 "Mouse Keys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Keyboard shortcut",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) + AUTOCHECKBOX "&Use shortcut",IDC_MOUSEKEYS_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + GROUPBOX "Pointer speed",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(9) + + LTEXT "&Top speed:",-1,PROPSHEETPADDING(2),LABELLINE(10)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Low",-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 "High",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(10)+4,PROPSHEETPADDING(3),LABELLINE(1) + + LTEXT "&Acceleration:",-1,PROPSHEETPADDING(2),LABELLINE(13)+4,PROPSHEETPADDING(8),LABELLINE(1) + LTEXT "Slow",-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 "Fast",-1,PROPSHEETWIDTH-PROPSHEETPADDING(7),LABELLINE(13)+4,PROPSHEETPADDING(3),LABELLINE(1) + + AUTOCHECKBOX "&Hold down Ctrl to speed up and Shift to slow down",IDC_MOUSEKEYS_SPEED_CHECK,PROPSHEETPADDING(2),LABELLINE(16),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + LTEXT "Use MouseKeys when NumLock is:",-1,PROPSHEETPADDING(1),LABELLINE(18)+7,PROPSHEETPADDING(20),LABELLINE(1) + AUTORADIOBUTTON "O&n",IDC_MOUSEKEYS_ON_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(14),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + AUTORADIOBUTTON "Of&f",IDC_MOUSEKEYS_OFF_RADIO,PROPSHEETWIDTH-PROPSHEETPADDING(8),LABELLINE(18)+7,PROPSHEETPADDING(5),LABELLINE(1) + + AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 + + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "&Ignore keystrokes repeated faster than:",-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 "&Test area:",-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 "Cancel", 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 "Advanced FilterKeys Settings" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + LTEXT "Override settings on the Keyboard control panel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + + AUTORADIOBUTTON "&No keyboard repeat",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP + AUTORADIOBUTTON "&Slow down keyboard repeat rates",IDC_REPEAT_REPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(4)+7,131,LABELLINE(1) + + LTEXT "Repeat &delay:",-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 "Repeat &rate:",-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 "Slow Keys",-1,PROPSHEETPADDING(1),LABELLINE(14),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+4 + LTEXT "&Keys must be held down for:",-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 "&Test area:",-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 "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END STRINGTABLE BEGIN IDS_CPLSYSTEMNAME "U³atwienia dostêpu" - IDS_CPLSYSTEMDESCRIPTION "Personalizuje funkcje u³atwieñ dostêpu na Twoim komputerze." - - IDS_SENTRY_NONE "[brak]" + IDS_CPLSYSTEMDESCRIPTION "Personalizuje funkcje u³atwieñ dostêpu na twoim komputerze." + + IDS_SENTRY_NONE "[Brak]" IDS_SENTRY_TITLE "Migaj¹cy pasek tytu³u" IDS_SENTRY_WINDOW "Migaj¹ce okno aktywne" IDS_SENTRY_DISPLAY "Migaj¹cy pulpit" -END + + IDS_SECONDS "Seconds" + IDS_MINUTES "Minut" +END

1 0

[gedmurphy] 28914: adjust the pointers on the server side to match what the client is sending
by gedmurphy＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: gedmurphy Date: Fri Sep 7 14:55:16 2007 New Revision: 28914 URL: http://svn.reactos.org/svn/reactos?rev=28914&view=rev Log: adjust the pointers on the server side to match what the client is sending Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Fri Sep 7 14:55:16 2007 @@ -2294,15 +2294,13 @@ if (dwInfoLevel & SERVICE_CONFIG_DESCRIPTION) { - LPSERVICE_DESCRIPTIONW lpServiceDescription = (LPSERVICE_DESCRIPTIONW)lpInfo; - - if (dwInfoSize != sizeof(*lpServiceDescription)) - { - dwError = ERROR_INVALID_PARAMETER; - goto done; - } - - if (lpServiceDescription != NULL && lpServiceDescription->lpDescription != NULL) + LPSERVICE_DESCRIPTIONW lpServiceDescription; + + lpServiceDescription = (LPSERVICE_DESCRIPTIONW)lpInfo; + lpServiceDescription->lpDescription = (LPWSTR)(lpInfo + sizeof(LPSERVICE_DESCRIPTIONW)); + + if (lpServiceDescription != NULL && + lpServiceDescription->lpDescription != NULL) { RegSetValueExW(hServiceKey, L"Description", @@ -2327,7 +2325,7 @@ if (hServiceKey != NULL) RegCloseKey(hServiceKey); - DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); + DPRINT("ScmrChangeServiceConfig2W() done (Error %lu)\n", dwError); return dwError; }

1 0

[gedmurphy] 28913: Fix the client side of the ChangeServiceConfig2 RPC call to send the text in the lpDescription pointer of SERVICE_DESCRIPTION tagged onto the end of the struct. This fixes setting service descriptions
by gedmurphy＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: gedmurphy Date: Fri Sep 7 14:52:43 2007 New Revision: 28913 URL: http://svn.reactos.org/svn/reactos?rev=28913&view=rev Log: Fix the client side of the ChangeServiceConfig2 RPC call to send the text in the lpDescription pointer of SERVICE_DESCRIPTION tagged onto the end of the struct. This fixes setting service descriptions Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Fri Sep 7 14:52:43 2007 @@ -139,20 +139,42 @@ DWORD dwInfoLevel, LPVOID lpInfo) { - DWORD lpInfoSize; + LPBYTE lpSendData = NULL; + DWORD dwInfoSize; DWORD dwError; DPRINT("ChangeServiceConfig2W() called\n"); - /* Determine the length of the lpInfo parameter */ switch (dwInfoLevel) { case SERVICE_CONFIG_DESCRIPTION: - lpInfoSize = sizeof(SERVICE_DESCRIPTIONW); + { + LPSERVICE_DESCRIPTIONW lpServiceDescription = lpInfo; + DWORD dwStringSize; + + dwInfoSize = sizeof(SERVICE_DESCRIPTIONW); + dwStringSize = (wcslen(lpServiceDescription->lpDescription) + 1) * sizeof(WCHAR); + dwInfoSize += dwStringSize; + + lpSendData = HeapAlloc(GetProcessHeap(), 0, dwInfoSize); + if (lpSendData) + { + LPBYTE pt = lpSendData; + + CopyMemory(pt, lpInfo, sizeof(SERVICE_DESCRIPTIONW)); + pt += sizeof(SERVICE_DESCRIPTIONW); + CopyMemory(pt, lpServiceDescription->lpDescription, dwStringSize); + } + else + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } break; + } case SERVICE_CONFIG_FAILURE_ACTIONS: - lpInfoSize = sizeof(SERVICE_FAILURE_ACTIONSW); + dwInfoSize = sizeof(SERVICE_FAILURE_ACTIONSW); break; default: @@ -162,21 +184,27 @@ } if (lpInfo == NULL) - return TRUE; + goto done; HandleBind(); dwError = ScmrChangeServiceConfig2W(BindingHandle, (unsigned int)hService, dwInfoLevel, - lpInfo, - lpInfoSize); + lpSendData, + dwInfoSize); if (dwError != ERROR_SUCCESS) { DPRINT1("ScmrChangeServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } + +done: + if (lpSendData != NULL) + HeapFree(GetProcessHeap(), 0, lpSendData); + + DPRINT("ChangeServiceConfig2W() done\n"); return TRUE; }

1 0

[fireball] 28912: - Remove FF2.0 from Downloader (it doesn't work in 0.3.3).
by fireball＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: fireball Date: Fri Sep 7 12:35:15 2007 New Revision: 28912 URL: http://svn.reactos.org/svn/reactos?rev=28912&view=rev Log: - Remove FF2.0 from Downloader (it doesn't work in 0.3.3). Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Modified: branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/rosapps/do… ============================================================================== --- branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml (original) +++ branches/ros-branch-0_3_3-new/rosapps/downloader/downloader.xml Fri Sep 7 12:35:15 2007 @@ -6,13 +6,6 @@ <version>1.5.0.9</version> <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> - </application> - <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.6)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.6</version> - <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname>

1 0

[tkreuzer] 28911: - add NTMW_INTERNAL structure - better structure implementation for ENUMFONTDATAW - change NewEnumFontFamiliesEx to use the new structure - some fixes and comments
by tkreuzer＠svn.reactos.org 07 Sep '07

07 Sep '07

Author: tkreuzer Date: Fri Sep 7 07:33:00 2007 New Revision: 28911 URL: http://svn.reactos.org/svn/reactos?rev=28911&view=rev Log: - add NTMW_INTERNAL structure - better structure implementation for ENUMFONTDATAW - change NewEnumFontFamiliesEx to use the new structure - some fixes and comments Modified: trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/include/reactos/win32k/ntgdityp.h 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 Fri Sep 7 07:33:00 2007 @@ -1321,59 +1321,67 @@ LPARAM lParam, DWORD dwFlags) { - ULONG_PTR idEnum, ulCount, ulSize; + ULONG_PTR idEnum, cbDataSize, cbRetSize; PENUMFONTDATAW pEfdw; PBYTE pBuffer; PBYTE pMax; INT ret = 1; + /* Open enumeration handle and find out how much memory we need */ idEnum = NtGdiEnumFontOpen(hDC, EfdFontFamilies, 0, LF_FACESIZE, - lpLogfont->lfFaceName, - lpLogfont->lfCharSet, - &ulCount); + (lpLogfont && lpLogfont->lfFaceName[0])? lpLogfont->lfFaceName : NULL, + lpLogfont? lpLogfont->lfCharSet : DEFAULT_CHARSET, + &cbDataSize); if (idEnum == 0) { return 0; } - if (ulCount == 0) + if (cbDataSize == 0) { NtGdiEnumFontClose(idEnum); return 0; } - pBuffer = HeapAlloc(GetProcessHeap(), 0, ulCount); + /* Allocate memory */ + pBuffer = HeapAlloc(GetProcessHeap(), 0, cbDataSize); if (pBuffer == NULL) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); NtGdiEnumFontClose(idEnum); return 0; } - pMax = pBuffer + ulCount; - - if (!NtGdiEnumFontChunk(hDC, idEnum, ulCount, &ulSize, (PVOID)pBuffer)) + + /* Do the enumeration */ + if (!NtGdiEnumFontChunk(hDC, idEnum, cbDataSize, &cbRetSize, (PVOID)pBuffer)) { HeapFree(GetProcessHeap(), 0, pBuffer); NtGdiEnumFontClose(idEnum); return 0; } - /* Iterate through the structures */ - for (pEfdw = (PENUMFONTDATAW)pBuffer; - (PBYTE)pEfdw < pMax && pEfdw->cbSize != 0 && ret != 0; - pEfdw = (PENUMFONTDATAW)((PBYTE)pEfdw + pEfdw->cbSize)) - { - ENUMLOGFONTEXW *pElfew = &pEfdw->efdi.elfex; - NEWTEXTMETRICEXW *pNtmew = (NEWTEXTMETRICEXW*)((PBYTE)&pEfdw->efdi + pEfdw->efdi.cbSize + sizeof(DWORD)); // FIXME - DWORD dwFontType = pEfdw->efdi.dwFontType; - ret = lpEnumFontFamExProcW(pElfew, pNtmew, dwFontType, lParam); + /* Get start and end address */ + pEfdw = (PENUMFONTDATAW)pBuffer; + pMax = pBuffer + cbDataSize; + + /* Iterate through the structures */ + while ((PBYTE)pEfdw < pMax && ret) + { + PNTMW_INTERNAL pNtmwi = (PNTMW_INTERNAL)((ULONG_PTR)pEfdw + pEfdw->ulNtmwiOffset); + + ret = lpEnumFontFamExProcW(&pEfdw->elfexdv.elfEnumLogfontEx, + &pNtmwi->ntmw, + pEfdw->dwFontType, + lParam); + + pEfdw = (PENUMFONTDATAW)((ULONG_PTR)pEfdw + pEfdw->cbSize); } + /* Release the memory and close handle */ HeapFree(GetProcessHeap(), 0, pBuffer); NtGdiEnumFontClose(idEnum); return ret; } - - Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Fri Sep 7 07:33:00 2007 @@ -120,32 +120,20 @@ TMDIFF Diff; } TMW_INTERNAL, *PTMW_INTERNAL; -typedef struct +typedef struct _NTMW_INTERNAL { - ULONG cbSize; - DWORD dwFontType; - ENUMLOGFONTEXW elfex; -/* - * Yuan 14.5: - * DESIGNVECTOR is a variable-size data structure that specifies the number of - * axes and a value for each axis. - * So it maybe smaller than MM_MAX_NUMAXES. - */ - DESIGNVECTOR dv; -} ENUMFONTDATAINTW, *PENUMFONTDATAINTW; + TMDIFF tmd; + NEWTEXTMETRICEXW ntmw; +} NTMW_INTERNAL, *PNTMW_INTERNAL; -/* Warning: this structure is of variable size! - * It is only to access the cbSize and efdi member. - * The rest of the structure has to be parsed. */ typedef struct _ENUMFONTDATAW { ULONG cbSize; - ENUMFONTDATAINTW efdi; -/* The following 2 members do not have a constant offset! */ -/* DWORD dwFlags; - ENUMTEXTMETRICW etm; */ + ULONG ulNtmwiOffset; + DWORD dwFontType; + ENUMLOGFONTEXDVW elfexdv; /* variable size! */ + /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ } ENUMFONTDATAW, *PENUMFONTDATAW; - /* Number Representation */ typedef struct _EFLOAT_S

1 0

[janderwald] 28910: - format hdd images with raw format - improve error checking
by janderwald＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: janderwald Date: Fri Sep 7 02:49:05 2007 New Revision: 28910 URL: http://svn.reactos.org/svn/reactos?rev=28910&view=rev Log: - format hdd images with raw format - improve error checking Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Fri Sep 7 02:49:05 2007 @@ -187,25 +187,28 @@ cerr << "Error: ROS_EMU_PATH must contain the path to qemu and qemu-img " << qemuimgdir << endl; return false; } - - TCHAR * options[] = { NULL, - _T("create"), - NULL, - _T("100M"), - NULL + _tremove(image.c_str ()); + + TCHAR * options[] = {NULL, + _T("create"), + _T("-f"), + _T("raw"), + NULL, + _T("100M"), + NULL }; options[0] = (TCHAR*)qemuimgdir.c_str(); - options[2] = (TCHAR*)image.c_str(); + options[4] = (TCHAR*)image.c_str(); cerr << "Creating HDD Image ..." << image << endl; - if (OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 4, options, true)) + OsSupport::createProcess ((TCHAR*)qemuimgdir.c_str(), 6, options, true); + if (isFileExisting(image)) { m_HDDImage = image; return true; } - return false; } //----------------------------------------------------------------------------------------

1 0

[gedmurphy] 28909: silence debug output
by gedmurphy＠svn.reactos.org 06 Sep '07

06 Sep '07

Author: gedmurphy Date: Fri Sep 7 01:37:58 2007 New Revision: 28909 URL: http://svn.reactos.org/svn/reactos?rev=28909&view=rev Log: silence debug output Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Fri Sep 7 01:37:58 2007 @@ -579,7 +579,7 @@ if (ret && ClipboardOwnerWindow) { - DPRINT1("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->hSelf); + DPRINT("Clipboard: WM_DESTROYCLIPBOARD to %p", ClipboardOwnerWindow->hSelf); co_IntSendMessage( ClipboardOwnerWindow->hSelf, WM_DESTROYCLIPBOARD, 0, 0); }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
59
Older →

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 September 2007