Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 30 06:24:48 2007 New Revision: 28030 URL: http://svn.reactos.org/svn/reactos?rev=28030&view=rev Log: update ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Jul 30 06:24:48 2007 @@ -1062,10 +1062,6 @@ /* These shouldn't even be called NtGdi */ HDC STDCALL NtGdiGetDCState(HDC hDC); WORD STDCALL NtGdiSetHookFlags(HDC hDC, WORD Flags); -INT -STDCALL -NtGdiSelectVisRgn(HDC hdc, - HRGN hrgn); VOID STDCALL NtGdiSetDCState ( HDC hDC, HDC hDCSave ); /* All this Should be in user-mode, not NtUser calls. Especially not in GDI! */

17 years, 4 months

[tkreuzer] 28029: rename NtGdiSelectVisRgn to IntGdiSelectVisRgn

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 30 06:24:08 2007 New Revision: 28029 URL: http://svn.reactos.org/svn/reactos?rev=28029&view=rev Log: rename NtGdiSelectVisRgn to IntGdiSelectVisRgn Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/dc.c 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 Mon Jul 30 06:24:08 2007 @@ -132,6 +132,11 @@ IntGdiGetClipBox(HDC hDC, LPRECT rc); +INT +STDCALL +IntGdiSelectVisRgn(HDC hdc, + HRGN hrgn); + HRGN FASTCALL REGION_CropRgn(HRGN hDst, HRGN hSrc, const PRECT lpRect, PPOINT lpPt); void FASTCALL REGION_UnionRectWithRegion(const RECT *rect, ROSRGNDATA *rgn); INT FASTCALL UnsafeIntGetRgnBox(PROSRGNDATA Rgn, LPRECT pRect); 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 Mon Jul 30 06:24:08 2007 @@ -337,7 +337,7 @@ } Dce->DCXFlags &= ~DCX_DCEDIRTY; - NtGdiSelectVisRgn(Dce->hDC, hRgnVisible); + IntGdiSelectVisRgn(Dce->hDC, hRgnVisible); if (Window != NULL) { Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Mon Jul 30 06:24:08 2007 @@ -60,7 +60,7 @@ } INT STDCALL -NtGdiSelectVisRgn(HDC hdc, HRGN hrgn) +IntGdiSelectVisRgn(HDC hdc, HRGN hrgn) { int retval; DC *dc; 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 Mon Jul 30 06:24:08 2007 @@ -257,7 +257,7 @@ } hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); - NtGdiSelectVisRgn(hNewDC, hVisRgn); + IntGdiSelectVisRgn(hNewDC, hVisRgn); NtGdiDeleteObject(hVisRgn); DC_InitDC(hNewDC); @@ -914,7 +914,7 @@ hVisRgn = NtGdiCreateRectRgn(0, 0, NewDC->GDIInfo->ulHorzRes, NewDC->GDIInfo->ulVertRes); - NtGdiSelectVisRgn(hNewDC, hVisRgn); + IntGdiSelectVisRgn(hNewDC, hVisRgn); NtGdiDeleteObject(hVisRgn); /* Initialize the DC state */ @@ -2044,7 +2044,7 @@ DC_UnlockDc ( dc ); hVisRgn = NtGdiCreateRectRgn ( 0, 0, pb->SurfObj.sizlBitmap.cx, pb->SurfObj.sizlBitmap.cy ); BITMAPOBJ_UnlockBitmap( pb ); - NtGdiSelectVisRgn ( hDC, hVisRgn ); + IntGdiSelectVisRgn ( hDC, hVisRgn ); NtGdiDeleteObject ( hVisRgn ); return objOrg;

17 years, 4 months

[tkreuzer] 28028: probe and copy hdc from usermode PAINTSTRUCT using SEH

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 30 05:39:26 2007 New Revision: 28028 URL: http://svn.reactos.org/svn/reactos?rev=28028&view=rev Log: probe and copy hdc from usermode PAINTSTRUCT using SEH Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Mon Jul 30 05:39:26 2007 @@ -870,11 +870,13 @@ */ BOOL STDCALL -NtUserEndPaint(HWND hWnd, CONST PAINTSTRUCT* lPs) -{ +NtUserEndPaint(HWND hWnd, CONST PAINTSTRUCT* pUnsafePs) +{ + NTSTATUS Status = STATUS_SUCCESS; PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; + HDC hdc = NULL; DPRINT("Enter NtUserEndPaint\n"); UserEnterExclusive(); @@ -884,7 +886,22 @@ RETURN(FALSE); } - UserReleaseDC(Window, lPs->hdc, TRUE); + _SEH_TRY + { + ProbeForRead(pUnsafePs, sizeof(*pUnsafePs), 1); + hdc = pUnsafePs->hdc; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + if (!NT_SUCCESS(Status)) + { + RETURN(FALSE); + } + + UserReleaseDC(Window, hdc, TRUE); UserRefObjectCo(Window, &Ref); co_UserShowCaret(Window);

17 years, 4 months

[tkreuzer] 28027: remove useless NtGdiOffsetRgn

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 30 05:26:57 2007 New Revision: 28027 URL: http://svn.reactos.org/svn/reactos?rev=28027&view=rev Log: remove useless NtGdiOffsetRgn Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Mon Jul 30 05:26:57 2007 @@ -79,21 +79,17 @@ dc->w.flags &= ~DC_DIRTY; if (dc->w.hVisRgn == NULL) - { - dc->w.hVisRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - GDIOBJ_CopyOwnership(GdiHandleTable, hdc, dc->w.hVisRgn); - } - else - { - NtGdiOffsetRgn(dc->w.hVisRgn, dc->w.DCOrgX, dc->w.DCOrgY); - } + { + dc->w.hVisRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + GDIOBJ_CopyOwnership(GdiHandleTable, hdc, dc->w.hVisRgn); + } retval = NtGdiCombineRgn(dc->w.hVisRgn, hrgn, 0, RGN_COPY); if ( retval != ERROR ) - { - NtGdiOffsetRgn(dc->w.hVisRgn, -dc->w.DCOrgX, -dc->w.DCOrgY); - CLIPPING_UpdateGCRegion(dc); - } + { + NtGdiOffsetRgn(dc->w.hVisRgn, -dc->w.DCOrgX, -dc->w.DCOrgY); + CLIPPING_UpdateGCRegion(dc); + } DC_UnlockDc(dc); return retval;

17 years, 4 months

[tkreuzer] 28026: - rename NtGdiGetTextMetrics to NtGdigetTextMetricsW and add cj parameter - GetTextMetricsAW: call NtGdigetTextMetricW with cj set to sizeof(TMW_INTERNAL), use TextMetric member - update w32ksvc.db - update ntgdibad.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 30 05:10:35 2007 New Revision: 28026 URL: http://svn.reactos.org/svn/reactos?rev=28026&view=rev Log: - rename NtGdiGetTextMetrics to NtGdigetTextMetricsW and add cj parameter - GetTextMetricsAW: call NtGdigetTextMetricW with cj set to sizeof(TMW_INTERNAL), use TextMetric member - update w32ksvc.db - update ntgdibad.h Modified: trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Mon Jul 30 05:10:35 2007 @@ -86,14 +86,14 @@ LPTEXTMETRICA lptm ) { - TEXTMETRICW tmw; - - if (! NtGdiGetTextMetrics(hdc, &tmw)) - { - return FALSE; - } - - return TextMetricW2A(lptm, &tmw); + TMW_INTERNAL tmwi; + + if (! NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) + { + return FALSE; + } + + return TextMetricW2A(lptm, &tmwi.TextMetric); } @@ -107,7 +107,15 @@ LPTEXTMETRICW lptm ) { - return NtGdiGetTextMetrics(hdc, lptm); + TMW_INTERNAL tmwi; + + if (! NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) + { + return FALSE; + } + + *lptm = tmwi.TextMetric; + return TRUE; } Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Mon Jul 30 05:10:35 2007 @@ -605,12 +605,6 @@ /* Needs to be done in user-mode, using shared GDI Object Attributes. */ COLORREF STDCALL NtGdiGetTextColor(HDC hDC); -/* Use NtGdiGetTextMetricsW with 0 at the end */ -BOOL -STDCALL -NtGdiGetTextMetrics(HDC hDC, - LPTEXTMETRICW tm); - /* Use NtGdiGetDCPoint with GdiGetViewPortExt */ BOOL STDCALL NtGdiGetViewportExtEx(HDC hDC, LPSIZE viewportExt); Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Mon Jul 30 05:10:35 2007 @@ -3688,26 +3688,32 @@ return Count; } +W32KAPI BOOL -STDCALL -NtGdiGetTextMetrics(HDC hDC, - LPTEXTMETRICW tm) +APIENTRY +NtGdiGetTextMetricsW( + IN HDC hDC, + OUT TMW_INTERNAL * pUnsafeTmwi, + IN ULONG cj +) { PDC dc; PTEXTOBJ TextObj; PFONTGDI FontGDI; NTSTATUS Status = STATUS_SUCCESS; - TEXTMETRICW SafeTm; + TMW_INTERNAL tmwi; FT_Face Face; TT_OS2 *pOS2; TT_HoriHeader *pHori; ULONG Error; - if (NULL == tm) + if (NULL == pUnsafeTmwi) { SetLastWin32Error(STATUS_INVALID_PARAMETER); return FALSE; } + + /* FIXME: check cj ? */ if(!(dc = DC_LockDc(hDC))) { @@ -3736,7 +3742,9 @@ } else { - memcpy(&SafeTm, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); + memcpy(&tmwi.TextMetric, &FontGDI->TextMetric, sizeof(TEXTMETRICW)); + /* FIXME: Fill Diff member */ + RtlZeroMemory(&tmwi.Diff, sizeof(tmwi.Diff)); Status = STATUS_SUCCESS; IntLockFreeType; @@ -3757,10 +3765,24 @@ IntUnLockFreeType; if (NT_SUCCESS(Status)) - { - FillTM(&SafeTm, FontGDI->face, pOS2, pHori); - Status = MmCopyToCaller(tm, &SafeTm, sizeof(TEXTMETRICW)); - } + { + FillTM(&tmwi.TextMetric, FontGDI->face, pOS2, pHori); + + if (cj > sizeof(TMW_INTERNAL)) + cj = sizeof(TMW_INTERNAL); + + Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForWrite(pUnsafeTmwi, cj, 1); + RtlCopyMemory(pUnsafeTmwi,&tmwi,cj); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + } } TEXTOBJ_UnlockText(TextObj); } Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Mon Jul 30 05:10:35 2007 @@ -153,7 +153,7 @@ NtGdiGetTextExtent 5 NtGdiGetTextExtentPoint32 4 NtGdiGetTextFaceW 4 -NtGdiGetTextMetrics 2 +NtGdiGetTextMetricsW 3 NtGdiGetViewportExtEx 2 NtGdiGetViewportOrgEx 2 NtGdiGetWinMetaFileBits 5

17 years, 4 months

[dreimer] 28025: - I did not know that I abused %CD% so much... - Update Changelog and all other files for the Bugfix release, which will be released as soon as everything runs for EVERYONE. P.S. Why do I release Beta Versions when noone tests them?

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jul 30 01:34:03 2007 New Revision: 28025 URL: http://svn.reactos.org/svn/reactos?rev=28025&view=rev Log: - I did not know that I abused %CD% so much... - Update Changelog and all other files for the Bugfix release, which will be released as soon as everything runs for EVERYONE. P.S. Why do I release Beta Versions when noone tests them? Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Jul 30 01:34:03 2007 @@ -7,6 +7,9 @@ - Fixed the double \\ Bug introduced in 0.3.7. (Daniel Reimer) - Added Build Begin Time into Topic. (Daniel Reimer) - Added svnversion. (Daniel Reimer) +- Updated Tools. (Daniel Reimer) +- sSVN asks you if you wanna update if Offline Source Tree is old. (Daniel Reimer) +- Fixed DOZENS of bugs/stupid coded parts/things you could get easier... (Daniel Reimer) *** July 26th, 2007 - RosBE 0.3.7.1 Released Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Jul 30 01:34:03 2007 @@ -14,7 +14,7 @@ :: Set Defaults to work with and override if needed. :: color 0A -set _VER=0.3.8 +set _VER=0.3.7.2 set ROSBEBASEDIR=%~dp0 echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed "s/.$//g" > "C:\aaa.tmp" set /P ROSBEBASEDIR=< "C:\aaa.tmp" Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Jul 30 01:34:03 2007 @@ -18,15 +18,15 @@ if "%1" == "update" ( title Updating... if not "%2" == "" ( - svn update "%CD%" -r %2 + svn update -r %2 ) else ( - svn update "%CD%" + svn update ) goto :ExitSVN ) if "%1" == "cleanup" ( title Cleaning... - svn cleanup "%CD%" + svn cleanup goto :ExitSVN ) :: @@ -39,9 +39,9 @@ echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) - dir /b "%CD%" 2>nul|findstr "." >nul + dir /b 2>nul|findstr "." >nul if errorlevel 1 ( - svn checkout svn://svn.reactos.org/reactos/trunk/reactos "%CD%" + svn checkout svn://svn.reactos.org/reactos/trunk/reactos ) else ( echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Mon Jul 30 01:34:03 2007 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "0.3.8" +!define PRODUCT_VERSION "0.3.7.2" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -18,7 +18,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "0.3.8.0" +VIAddVersionKey /LANG=1033 "FileVersion" "0.3.7.2" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -26,7 +26,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2007 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "0.3.8.0" +VIProductVersion "0.3.7.2" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -185,6 +185,7 @@ Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd" Delete /REBOOTOK "$INSTDIR\RAddr.cmd" +;; Delete /REBOOTOK "$INSTDIR\options.exe" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" Delete /REBOOTOK "$INSTDIR\LICENSE.txt"

17 years, 4 months

[ekohl] 28024: - Add sticky keys settings and make the existing settings work. - Add empty filter keys dialog and toggle keys dialog.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jul 30 01:07:41 2007 New Revision: 28024 URL: http://svn.reactos.org/svn/reactos?rev=28024&view=rev Log: - Add sticky keys settings and make the existing settings work. - Add empty filter keys dialog and toggle keys dialog. Modified: trunk/reactos/dll/cpl/access/keyboard.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/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Mon Jul 30 01:07:41 2007 @@ -18,6 +18,7 @@ typedef struct _GLOBAL_DATA { STICKYKEYS stickyKeys; + STICKYKEYS oldStickyKeys; FILTERKEYS filterKeys; TOGGLEKEYS toggleKeys; } GLOBAL_DATA, *PGLOBAL_DATA; @@ -30,14 +31,90 @@ WPARAM wParam, LPARAM lParam) { + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch (uMsg) { case WM_INITDIALOG: + pGlobalData = (PGLOBAL_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + memcpy(&pGlobalData->oldStickyKeys, + &pGlobalData->stickyKeys, + sizeof(STICKYKEYS)); + + CheckDlgButton(hwndDlg, + IDC_STICKY_ACTIVATE_CHECK, + pGlobalData->stickyKeys.dwFlags & SKF_HOTKEYACTIVE ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_STICKY_LOCK_CHECK, + pGlobalData->stickyKeys.dwFlags & SKF_TRISTATE ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_STICKY_UNLOCK_CHECK, + pGlobalData->stickyKeys.dwFlags & SKF_TWOKEYSOFF ? BST_CHECKED : BST_UNCHECKED); + break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_STICKY_ACTIVATE_CHECK: + pGlobalData->stickyKeys.dwFlags ^= SKF_HOTKEYACTIVE; + break; + + case IDC_STICKY_LOCK_CHECK: + pGlobalData->stickyKeys.dwFlags ^= SKF_TRISTATE; + break; + + case IDC_STICKY_UNLOCK_CHECK: + pGlobalData->stickyKeys.dwFlags ^= SKF_TWOKEYSOFF; + break; + + case IDOK: + EndDialog(hwndDlg, + (pGlobalData->stickyKeys.dwFlags != pGlobalData->oldStickyKeys.dwFlags)); + break; + + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + break; + + default: + break; + } + break; + } + + return FALSE; +} + + +/* Property page dialog callback */ +INT_PTR CALLBACK +FilterKeysDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = (PGLOBAL_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { case IDOK: EndDialog(hwndDlg, TRUE); break; @@ -56,17 +133,49 @@ } +/* Property page dialog callback */ +INT_PTR CALLBACK +ToggleKeysDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = (PGLOBAL_DATA)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, TRUE); + break; + + case IDCANCEL: + EndDialog(hwndDlg, FALSE); + break; + + default: + break; + } + break; + } + + return FALSE; +} + + static VOID -OnInitDialog(IN HWND hwndDlg) -{ - PGLOBAL_DATA pGlobalData; - - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); - if (pGlobalData == NULL) - return; - - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - +OnInitDialog(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData) +{ /* Get sticky keys information */ pGlobalData->stickyKeys.cbSize = sizeof(STICKYKEYS); if (!SystemParametersInfo(SPI_GETSTICKYKEYS, @@ -77,9 +186,6 @@ return; } - if (pGlobalData->stickyKeys.dwFlags & SKF_STICKYKEYSON) - SendDlgItemMessage(hwndDlg, IDC_STICKY_BOX, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - /* Get filter keys information */ pGlobalData->filterKeys.cbSize = sizeof(FILTERKEYS); if (!SystemParametersInfo(SPI_GETFILTERKEYS, @@ -90,9 +196,6 @@ return; } - if (pGlobalData->filterKeys.dwFlags & FKF_FILTERKEYSON) - SendDlgItemMessage(hwndDlg, IDC_FILTER_BOX, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - /* Get toggle keys information */ pGlobalData->toggleKeys.cbSize = sizeof(TOGGLEKEYS); if (!SystemParametersInfo(SPI_GETTOGGLEKEYS, @@ -103,8 +206,17 @@ return; } - if (pGlobalData->toggleKeys.dwFlags & TKF_TOGGLEKEYSON) - SendDlgItemMessage(hwndDlg, IDC_TOGGLE_BOX, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + CheckDlgButton(hwndDlg, + IDC_STICKY_BOX, + pGlobalData->stickyKeys.dwFlags & SKF_STICKYKEYSON ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_FILTER_BOX, + pGlobalData->filterKeys.dwFlags & FKF_FILTERKEYSON ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, + IDC_TOGGLE_BOX, + pGlobalData->toggleKeys.dwFlags & TKF_TOGGLEKEYSON ? BST_CHECKED : BST_UNCHECKED); } @@ -123,37 +235,57 @@ switch (uMsg) { case WM_INITDIALOG: - OnInitDialog(hwndDlg); + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + if (pGlobalData == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + OnInitDialog(hwndDlg, pGlobalData); return TRUE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_STICKY_BOX: + pGlobalData->stickyKeys.dwFlags ^= SKF_STICKYKEYSON; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_STICKY_BUTTON: if (DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_STICKYKEYSOPTIONS), - hwndDlg, - (DLGPROC)StickyKeysDlgProc, - (LPARAM)pGlobalData)) + MAKEINTRESOURCE(IDD_STICKYKEYSOPTIONS), + hwndDlg, + (DLGPROC)StickyKeysDlgProc, + (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_FILTER_BOX: + pGlobalData->filterKeys.dwFlags ^= FKF_FILTERKEYSON; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_FILTER_BUTTON: + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_FILTERKEYSOPTIONS), + hwndDlg, + (DLGPROC)FilterKeysDlgProc, + (LPARAM)pGlobalData)) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_TOGGLE_BOX: + pGlobalData->toggleKeys.dwFlags ^= TKF_TOGGLEKEYSON; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_TOGGLE_BUTTON: + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_TOGGLEKEYSOPTIONS), + hwndDlg, + (DLGPROC)ToggleKeysDlgProc, + (LPARAM)pGlobalData)) + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; default: 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 Mon Jul 30 01:07:41 2007 @@ -98,7 +98,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -100,10 +100,38 @@ BEGIN GROUPBOX "Tastenkombination",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Drücken Sie fünfmal die Umschalttaste um die Einrastfunktion zu aktivieren.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 + AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 Mon Jul 30 01:07:41 2007 @@ -97,7 +97,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -101,7 +101,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -99,7 +99,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -99,7 +99,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -100,7 +100,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -98,7 +98,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -98,7 +98,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -100,7 +100,35 @@ BEGIN GROUPBOX "Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Press the SHIFT-Key 5 times in order to activate the Sticky Keys feature.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ctivate sticky keys",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", 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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 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 Mon Jul 30 01:07:41 2007 @@ -101,10 +101,38 @@ 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(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "A&ktywuj Klawisze Trwa³e",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),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 "Filter Keys Settings" +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 "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "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/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 Mon Jul 30 01:07:41 2007 @@ -98,10 +98,38 @@ BEGIN GROUPBOX "Êëàâèøè",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) LTEXT "Íàæàòèå êëàâèøè SHIFT 5 ðàç àêòèâèðóåò çàëèïàíèå êëàâèø.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - AUTOCHECKBOX "&Àêòèâèðîâàòü çàëèïàíèå êëàâèø",IDC_STICKY_ACTVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+4,14 + AUTOCHECKBOX "&Àêòèâèðîâàòü çàëèïàíèå êëàâèø",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(20)+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(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 + AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 +END + + +IDD_FILTERKEYSOPTIONS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Filter Keys Settings" +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 "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 + LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END 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 Mon Jul 30 01:07:41 2007 @@ -21,6 +21,8 @@ #define IDD_PROPPAGEGENERAL 104 #define IDD_STICKYKEYSOPTIONS 105 +#define IDD_FILTERKEYSOPTIONS 106 +#define IDD_TOGGLEKEYSOPTIONS 107 #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 @@ -57,7 +59,7 @@ #define IDC_ADMIN_LOGON_BOX 221 #define IDC_ADMIN_USERS_BOX 222 -#define IDC_STICKY_ACTVATE_CHECK 221 +#define IDC_STICKY_ACTIVATE_CHECK 221 #define IDC_STICKY_LOCK_CHECK 222 #define IDC_STICKY_UNLOCK_CHECK 223 #define IDC_STICKY_SIGNAL_CHECK 224

17 years, 4 months

[dreimer] 28023: - Stop the abuse of %CD% and of the call command. - Revert my previous commit. It CAN be put in one file.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jul 30 00:32:00 2007 New Revision: 28023 URL: http://svn.reactos.org/svn/reactos?rev=28023&view=rev Log: - Stop the abuse of %CD% and of the call command. - Revert my previous commit. It CAN be put in one file. Removed: trunk/tools/RosBE-Windows/Root/sSVNs.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Mon Jul 30 00:32:00 2007 @@ -28,16 +28,16 @@ :: Check if our log directory exists, if it doesn't, create it. :: if %logdiff% == 0 ( -if not exist "%CD%\RosBE-Logs\." ( - if not exist "%CD%\.svn\." ( +if not exist "RosBE-Logs\." ( + if not exist ".svn\." ( echo Folder is empty. No Build can be performed. goto :EOB ) else ( - mkdir "%CD%\RosBE-Logs" - set _ROSBELOGDIR=%CD%\RosBE-Logs + mkdir "RosBE-Logs" + set _ROSBELOGDIR=RosBE-Logs ) ) else ( - set _ROSBELOGDIR=%CD%\RosBE-Logs + set _ROSBELOGDIR=RosBE-Logs ) ) if %logdiff% == 1 ( @@ -53,8 +53,8 @@ :: Check if config.template.rbuild is newer than config.rbuild, if it is then :: abort the build and inform the user. :: -if exist "%CD%\config.rbuild" ( - test "%CD%\config.template.rbuild" -nt "%CD%\config.rbuild" +if exist "config.rbuild" ( + test "config.template.rbuild" -nt "config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -77,25 +77,25 @@ if %ROSBE_SHOWTIME% == 1 ( if %ROSBE_WRITELOG% == 1 ( - call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) if %ROSBE_WRITELOG% == 0 ( - call buildtime "%MAKE_COMMAND%" 2>&1 + buildtime "%MAKE_COMMAND%" 2>&1 ) ) if %ROSBE_SHOWTIME% == 0 ( if %ROSBE_WRITELOG% == 1 ( - call "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" + "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) if %ROSBE_WRITELOG% == 0 ( - call "%MAKE_COMMAND%" 2>&1 + "%MAKE_COMMAND%" 2>&1 ) ) :: :: Highlight the fact that building has ended. :: -call flash +flash :EOB title ReactOS Build Environment %_VER% Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Mon Jul 30 00:32:00 2007 @@ -15,7 +15,7 @@ :: : Check if we have something to clean, if so, clean it. :: - if exist "%CD%\obj-i386\." ( + if exist "obj-i386\." ( echo Cleaning ReactOS source directory... :: @@ -26,58 +26,58 @@ :: : Remove directories/makefile.auto created by the build. :: - if exist "%CD%\obj-i386\." ( - rd /s /q "%CD%\obj-i386" 1> NUL 2> NUL + if exist "obj-i386\." ( + rd /s /q "obj-i386" 1> NUL 2> NUL ) - if exist "%CD%\output-i386\." ( - rd /s /q "%CD%\output-i386" 1> NUL 2> NUL + if exist "output-i386\." ( + rd /s /q "output-i386" 1> NUL 2> NUL ) - if exist "%CD%\reactos\." ( - rd /s /q "%CD%\reactos" 1> NUL 2> NUL + if exist "reactos\." ( + rd /s /q "reactos" 1> NUL 2> NUL ) - if exist "%CD%\makefile.auto" ( - del "%CD%\makefile.auto" 1> NUL 2> NUL + if exist "makefile.auto" ( + del "makefile.auto" 1> NUL 2> NUL ) :: : Now delete auto-generated/copied files not removed by make clean. :: - del /f "%CD%\media\inf\syssetup.inf" 1> NUL 2> NUL - del /f "%CD%\include\roscfg.h" 1> NUL 2> NUL - del /f "%CD%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\network.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL - del /f "%CD%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL + del /f "media\inf\syssetup.inf" 1> NUL 2> NUL + del /f "include\roscfg.h" 1> NUL 2> NUL + del /f "dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL + del /f "dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL + del /f "dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL + del /f "dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL + del /f "dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL + del /f "dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL + del /f "dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL + del /f "dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\network.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL + del /f "dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL echo Done cleaning ReactOS source directory. ) else ( Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Jul 30 00:32:00 2007 @@ -11,8 +11,8 @@ title ReactOS Build Configurator if "%1" == "delete" ( - if exist "%CD%\config.rbuild" ( - del "%CD%\config.rbuild" + if exist "config.rbuild" ( + del "config.rbuild" echo Main Configuration File was found and deleted. ) else ( echo Main Configuration File was not found in ReactOS Source Tree. @@ -31,7 +31,7 @@ ) if not exist "%ROSBEBASEDIR%\config.rbuild" ( - copy "%CD%\config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" + copy "config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" ) echo WARNING: @@ -50,16 +50,16 @@ echo Architecture to build for. Not Editable. echo. echo Right now -call grep \"ARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"ARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 echo. echo Sub-architecture to build for. echo Default is: none echo. echo Right now -call grep \"SARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"SARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P X= (), (xbox) -call sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%ROSBEBASEDIR%\config.rbuild" > "%ROSBEBASEDIR%\config2.rbuild" +sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%ROSBEBASEDIR%\config.rbuild" > "%ROSBEBASEDIR%\config2.rbuild" cls echo Which CPU ReactOS should be optimized for. @@ -70,9 +70,9 @@ echo Default is: pentium echo. echo Right now -call grep \"OARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"OARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P XX= -call sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%ROSBEBASEDIR%\config2.rbuild" > "%ROSBEBASEDIR%\config21.rbuild" +sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%ROSBEBASEDIR%\config2.rbuild" > "%ROSBEBASEDIR%\config21.rbuild" cls echo What level do you want ReactOS to be optimized at. @@ -83,27 +83,27 @@ echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. echo Right now -call grep \"OPTIMIZE\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"OPTIMIZE\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) -call sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%ROSBEBASEDIR%\config21.rbuild" > "%ROSBEBASEDIR%\config3.rbuild" +sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%ROSBEBASEDIR%\config21.rbuild" > "%ROSBEBASEDIR%\config3.rbuild" cls echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. echo Right now -call grep \"MP\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"MP\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P Z= (0), (1) -call sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%ROSBEBASEDIR%\config3.rbuild" > "%ROSBEBASEDIR%\config4.rbuild" +sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%ROSBEBASEDIR%\config3.rbuild" > "%ROSBEBASEDIR%\config4.rbuild" cls echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. echo Right now -call grep \"KDBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"KDBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P A= (0), (1) -call sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%ROSBEBASEDIR%\config4.rbuild" > "%ROSBEBASEDIR%\config5.rbuild" +sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%ROSBEBASEDIR%\config4.rbuild" > "%ROSBEBASEDIR%\config5.rbuild" cls echo Whether to compile for debugging. No compiler optimizations will be @@ -111,9 +111,9 @@ echo Default is: 1 echo. echo Right now -call grep \"DBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"DBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P B= (0), (1) -call sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%ROSBEBASEDIR%\config5.rbuild" > "%ROSBEBASEDIR%\config6.rbuild" +sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%ROSBEBASEDIR%\config5.rbuild" > "%ROSBEBASEDIR%\config6.rbuild" cls echo Whether to compile for debugging with GDB. If you don't use GDB, @@ -121,9 +121,9 @@ echo Default is: 0 echo. echo Right now -call grep \"GDB\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"GDB\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P C= (0), (1) -call sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%ROSBEBASEDIR%\config6.rbuild" > "%ROSBEBASEDIR%\config7.rbuild" +sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%ROSBEBASEDIR%\config6.rbuild" > "%ROSBEBASEDIR%\config7.rbuild" cls echo Whether to compile apps/libs with features covered software patents @@ -133,18 +133,18 @@ echo Default is: 0 echo. echo Right now -call grep \"NSWPAT\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"NSWPAT\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P D= (0), (1) -call sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild" +sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild" cls echo Whether to compile with NT-compatible LPC Semantics. This should echo always be 1. echo. echo Right now -call grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P E= (0), (1) -call sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild" +sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild" cls echo Whether to compile with the KD protocol. This will disable support for @@ -156,15 +156,15 @@ echo Default is: 0 echo. echo Right now -call grep \"_WINKD_\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 +grep \"_WINKD_\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P F= (0), (1) -call sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild" +sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild" copy "%ROSBEBASEDIR%\config10.rbuild" "%ROSBEBASEDIR%\config.tmp" del "%ROSBEBASEDIR%\*.rbuild" copy "%ROSBEBASEDIR%\config.tmp" "%ROSBEBASEDIR%\config.rbuild" del "%ROSBEBASEDIR%\*.tmp" -copy "%ROSBEBASEDIR%\config.rbuild" "%CD%\config.rbuild" +copy "%ROSBEBASEDIR%\config.rbuild" "config.rbuild" goto :NOK Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Jul 30 00:32:00 2007 @@ -21,7 +21,7 @@ del "C:\aaa.tmp" set ROSBE_SHOWTIME=1 set ROSBE_WRITELOG=1 -set _LOGDIR=%CD%\RosBE-Logs +set _LOGDIR=RosBE-Logs if exist %ROSBEBASEDIR%\options.cmd ( goto :PREV Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Jul 30 00:32:00 2007 @@ -35,7 +35,7 @@ if "%1" == "create" ( title Creating... - if exist "%CD%\.svn\." ( + if exist ".svn\." ( echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) @@ -52,7 +52,7 @@ for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp" set /P ONSVN=< "%ROSBEBASEDIR%\onsvn.tmp" - call "%ROSBEBASEDIR%\sSVNs.cmd" + call :UP goto :ExitSVN ) @@ -61,5 +61,24 @@ goto :ExitSVN ) +:UP +echo Recent Offline Revision: %OFFSVN% +echo Online HEAD Revision: %ONSVN% +del "%ROSBEBASEDIR%\onsvn.tmp" +echo. +if %OFFSVN% LSS %ONSVN% ( + echo Your Tree is not Up to date. Do you want to update it? + goto :UP2 +) +if %OFFSVN% EQU %ONSVN% ( + echo Your Tree is Up to date. + goto :ExitSVN +) + +:UP2 +SET /P XY=(yes), (no) +if /I "%XY%"=="yes" %ROSBEBASEDIR%\ssvn update +if /I "%XY%"=="no" goto :ExitSVN + :ExitSVN title ReactOS Build Environment %_VER% Removed: trunk/tools/RosBE-Windows/Root/sSVNs.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVNs.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVNs.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVNs.cmd (removed) @@ -1,28 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See COPYING in the top level directory -:: FILE: Root/sv.cmd -:: PURPOSE: Integrated SVN Client, status step 2. -:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off - -echo Recent Offline Revision: %OFFSVN% -echo Online HEAD Revision: %ONSVN% -del "%ROSBEBASEDIR%\onsvn.tmp" -echo. -if %OFFSVN% LSS %ONSVN% ( - echo Your Tree is not Up to date. Do you want to update it? - goto :UP -) -if %OFFSVN% EQU %ONSVN% ( -echo Your Tree is Up to date. -) -goto :EOF - -:UP -SET /P XY=(yes), (no) - -if /I "%XY%"=="yes" call %ROSBEBASEDIR%\ssvn update -if /I "%XY%"=="no" goto :ExitSVN

17 years, 4 months

[cfinck] 28022: Various cmd fixes by Carlo Bramini (carlo DOT bramix AT libero DOT it) See issue #2232 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jul 29 23:53:17 2007 New Revision: 28022 URL: http://svn.reactos.org/svn/reactos?rev=28022&view=rev Log: Various cmd fixes by Carlo Bramini (carlo DOT bramix AT libero DOT it) See issue #2232 for more details. Modified: trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/misc.c Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/copy.c (original) +++ trunk/reactos/base/shell/cmd/copy.c Sun Jul 29 23:53:17 2007 @@ -66,7 +66,6 @@ DWORD dwAttrib; DWORD dwRead; DWORD dwWritten; - DWORD i; BOOL bEof = FALSE; TCHAR TrueDest[MAX_PATH]; TCHAR TempSrc[MAX_PATH]; @@ -168,7 +167,6 @@ } - if (!IsExistingFile (dest)) { #ifdef _DEBUG @@ -231,7 +229,9 @@ nErrorLevel = 1; return 0; } - buffer = (LPBYTE)malloc (BUFF_SIZE); + + /* A page-aligned buffer usually give more speed */ + buffer = (LPBYTE)VirtualAlloc(NULL, BUFF_SIZE, MEM_COMMIT, PAGE_READWRITE); if (buffer == NULL) { CloseHandle (hFileDest); @@ -247,16 +247,13 @@ ReadFile (hFileSrc, buffer, BUFF_SIZE, &dwRead, NULL); if (lpdwFlags & COPY_ASCII) { - for (i = 0; i < dwRead; i++) - { - /* we're dealing with ASCII files! */ - if (((LPSTR)buffer)[i] == 0x1A) - { - bEof = TRUE; - break; - } - } - dwRead = i; + LPBYTE pEof = memchr(buffer, 0x1A, dwRead); + if (pEof != NULL) + { + bEof = TRUE; + dwRead = pEof-buffer+1; + break; + } } if (dwRead == 0) @@ -274,25 +271,24 @@ return 0; } } - while (dwRead && !bEof); + while (!bEof); #ifdef _DEBUG DebugPrintf (_T("setting time\n")); #endif SetFileTime (hFileDest, &srctime, NULL, NULL); - if (lpdwFlags & COPY_ASCII) + if ((lpdwFlags & COPY_ASCII) && !bEof) { /* we're dealing with ASCII files! */ - ((LPSTR)buffer)[0] = 0x1A; - ((LPSTR)buffer)[1] = '\0'; + buffer[0] = 0x1A; #ifdef _DEBUG DebugPrintf (_T("appending ^Z\n")); #endif WriteFile (hFileDest, buffer, sizeof(CHAR), &dwWritten, NULL); } - free (buffer); + VirtualFree (buffer, 0, MEM_RELEASE); CloseHandle (hFileDest); CloseHandle (hFileSrc); @@ -317,8 +313,6 @@ if(lpdwFlags & COPY_DECRYPT) DeleteFile(TempSrc); - - return 1; } @@ -877,7 +871,7 @@ LoadString(CMD_ModuleHandle, STRING_COPY_FILE, szMsg, RC_STRING_MAX_SIZE); ConOutPrintf(szMsg, nFiles); - CloseHandle(hFile); + FindClose(hFile); if (arg!=NULL) free(arg); Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c (original) +++ trunk/reactos/base/shell/cmd/filecomp.c Sun Jul 29 23:53:17 2007 @@ -473,7 +473,8 @@ _tcscpy(szSuffix,&strIN[SBreak]); strIN[PBreak] = _T('\0'); _tcscpy(szPrefix,strIN); - if(szPrefix[_tcslen(szPrefix) - 2] == _T('\"')) + if (szPrefix[_tcslen(szPrefix) - 2] == _T('\"') && + szPrefix[_tcslen(szPrefix) - 1] != _T(' ')) { /* need to remove the " right before a \ at the end to allow the next stuff to stay inside one set of quotes @@ -604,21 +605,17 @@ } /* search for the files it might be */ hFile = FindFirstFile (szSearchPath, &file); - + if(hFile == INVALID_HANDLE_VALUE) + { + /* Assemble the orginal string and return */ + _tcscpy(strOut,szOrginal); + return; + } + /* aseemble a list of all files names */ do { - if(hFile == INVALID_HANDLE_VALUE) - { - /* Assemble the orginal string and return */ - _tcscpy(strOut,szOrginal); - CloseHandle(hFile); - if(FileList != NULL) - free(FileList); - return; - } - - if(!_tcscmp (file.cFileName, _T(".")) || + if(!_tcscmp (file.cFileName, _T(".")) || !_tcscmp (file.cFileName, _T(".."))) continue; @@ -631,36 +628,28 @@ } /* Add the file to the list of files */ - if(FileList == NULL) - { - FileListSize = 1; - FileList = malloc(FileListSize * sizeof(FileName)); - } - else - { - FileListSize++; - FileList = realloc(FileList, FileListSize * sizeof(FileName)); - } + FileList = realloc(FileList, ++FileListSize * sizeof(FileName)); if(FileList == NULL) { /* Assemble the orginal string and return */ _tcscpy(strOut,szOrginal); - CloseHandle(hFile); + FindClose(hFile); ConOutFormatMessage (GetLastError()); return; } /* Copies the file name into the struct */ _tcscpy(FileList[FileListSize-1].Name,file.cFileName); - }while(FindNextFile(hFile,&file)); + } while(FindNextFile(hFile,&file)); + + FindClose(hFile); /* Check the size of the list to see if we found any matches */ if(FileListSize == 0) { _tcscpy(strOut,szOrginal); - CloseHandle(hFile); if(FileList != NULL) free(FileList); return; @@ -751,7 +740,6 @@ _tcscpy(LastReturned,strOut); EndLength = _tcslen(strOut); DiffLength = EndLength - StartLength; - CloseHandle(hFile); if(FileList != NULL) free(FileList); Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c (original) +++ trunk/reactos/base/shell/cmd/misc.c Sun Jul 29 23:53:17 2007 @@ -142,7 +142,7 @@ _tcscat(TempPath, _T("\\")); _tcscat(OutPath, FindFileData.cFileName); _tcscat(OutPath, _T("\\")); - CloseHandle(hFind); + FindClose(hFind); } } }

17 years, 4 months

[dreimer] 28021: - Added svnversion Tool. - Simplified sSVN. - Fixed a strange behavior of CMD. ssvn status only worked right if started two times, because only then the Variabls got the rev Numbers in them. Now it works.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Jul 29 23:46:46 2007 New Revision: 28021 URL: http://svn.reactos.org/svn/reactos?rev=28021&view=rev Log: - Added svnversion Tool. - Simplified sSVN. - Fixed a strange behavior of CMD. ssvn status only worked right if started two times,because only then the Variabls got the rev Numbers in them. Now it works. Added: trunk/tools/RosBE-Windows/Root/sSVNs.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Tools/info.txt Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Sun Jul 29 23:46:46 2007 @@ -6,6 +6,7 @@ - Fixed the double \\ Bug introduced in 0.3.7. (Daniel Reimer) - Added Build Begin Time into Topic. (Daniel Reimer) +- Added svnversion. (Daniel Reimer) *** July 26th, 2007 - RosBE 0.3.7.1 Released Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Sun Jul 29 23:46:46 2007 @@ -49,26 +49,10 @@ ) if "%1" == "status" ( title Status - call svn info "%CD%" > "%ROSBEBASEDIR%\x.tmp" - call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cutz svn > "%ROSBEBASEDIR%\offsvn.tmp" - set /P OFFSVN=< "%ROSBEBASEDIR%\offsvn.tmp" - call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\y.tmp" - call grep Revision: "%ROSBEBASEDIR%\y.tmp"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp" + for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i + svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp" set /P ONSVN=< "%ROSBEBASEDIR%\onsvn.tmp" - echo Recent Offline Revision: %OFFSVN% - echo Online HEAD Revision: %ONSVN% - del "%ROSBEBASEDIR%\offsvn.tmp" - del "%ROSBEBASEDIR%\onsvn.tmp" - del "%ROSBEBASEDIR%\x.tmp" - del "%ROSBEBASEDIR%\y.tmp" - echo. - if %OFFSVN% LSS %ONSVN% ( - echo Your Tree is not Up to date. Do you want to update it? - goto :UP - ) - if %OFFSVN% EQU %ONSVN% ( - echo Your Tree is Up to date. - ) + call "%ROSBEBASEDIR%\sSVNs.cmd" goto :ExitSVN ) @@ -77,11 +61,5 @@ goto :ExitSVN ) -:UP -SET /P XY=(yes), (no) - -if /I "%XY%"=="yes" call %ROSBEBASEDIR%\ssvn update -if /I "%XY%"=="no" goto :ExitSVN - :ExitSVN title ReactOS Build Environment %_VER% Added: trunk/tools/RosBE-Windows/Root/sSVNs.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVNs.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVNs.cmd (added) +++ trunk/tools/RosBE-Windows/Root/sSVNs.cmd Sun Jul 29 23:46:46 2007 @@ -1,0 +1,28 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GPL - See COPYING in the top level directory +:: FILE: Root/sv.cmd +:: PURPOSE: Integrated SVN Client, status step 2. +:: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +:: +:: +@echo off + +echo Recent Offline Revision: %OFFSVN% +echo Online HEAD Revision: %ONSVN% +del "%ROSBEBASEDIR%\onsvn.tmp" +echo. +if %OFFSVN% LSS %ONSVN% ( + echo Your Tree is not Up to date. Do you want to update it? + goto :UP +) +if %OFFSVN% EQU %ONSVN% ( +echo Your Tree is Up to date. +) +goto :EOF + +:UP +SET /P XY=(yes), (no) + +if /I "%XY%"=="yes" call %ROSBEBASEDIR%\ssvn update +if /I "%XY%"=="no" goto :ExitSVN Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/info.txt (original) +++ trunk/tools/RosBE-Windows/Tools/info.txt Sun Jul 29 23:46:46 2007 @@ -1,10 +1,11 @@ Additional Tools needed: -tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm -test: http://gnuwin32.sourceforge.net/packages/coreutils.htm -cut: http://gnuwin32.sourceforge.net/packages/coreutils.htm -sed: http://gnuwin32.sourceforge.net/packages/sed.htm -grep: http://gnuwin32.sourceforge.net/packages/grep.htm -svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 +tee: http://gnuwin32.sourceforge.net/packages/coreutils.htm +test: http://gnuwin32.sourceforge.net/packages/coreutils.htm +cut: http://gnuwin32.sourceforge.net/packages/coreutils.htm +sed: http://gnuwin32.sourceforge.net/packages/sed.htm +grep: http://gnuwin32.sourceforge.net/packages/grep.htm +svn: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 +svnversion: http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91 Additional Libs needed: LibIntl: http://gnuwin32.sourceforge.net/packages/libintl.htm

17 years, 4 months

← Newer
1
2
3
4
5
6
7
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007