ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
November 2005
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
27 participants
875 discussions
Start a n
N
ew thread
[npwoods] 19712: Regedit: Partially implemented Find/Find Next
by npwoods@svn.reactos.com
Regedit: Partially implemented Find/Find Next Currently only implemented "Search Key Names"; searching key values and data not yet implemented. Also, the searching algorithm is pretty crude right now. Modified: trunk/reactos/subsys/system/regedit/De.rc Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Added: trunk/reactos/subsys/system/regedit/find.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/regedit.xml Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/regproc.h Modified: trunk/reactos/subsys/system/regedit/resource.h _____ Modified: trunk/reactos/subsys/system/regedit/De.rc --- trunk/reactos/subsys/system/regedit/De.rc 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/De.rc 2005-11-27 23:23:38 UTC (rev 19712) @@ -366,7 +366,7 @@ PUSHBUTTON "A&bbrechen",IDCANCEL,197,24,50,14 GROUPBOX "Look at",IDC_STATIC,7,25,63,51 LTEXT "Suche &nach:",IDC_STATIC,7,8,37,10 - EDITTEXT IDD_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL CONTROL "&Schl³ssel",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,36,35,8 CONTROL "&Werte",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-11-27 23:23:38 UTC (rev 19712) @@ -81,8 +81,8 @@ MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR - MENUITEM "&Find\tCtrl+F", ID_EDIT_FIND, GRAYED - MENUITEM "Find Ne&xt\tF3", ID_EDIT_FINDNEXT, GRAYED + MENUITEM "&Find\tCtrl+F", ID_EDIT_FIND + MENUITEM "Find Ne&xt\tF3", ID_EDIT_FINDNEXT END POPUP "&View" BEGIN @@ -139,7 +139,7 @@ MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE END - MENUITEM "&Find", ID_EDIT_FIND, GRAYED + MENUITEM "&Find", ID_EDIT_FIND MENUITEM SEPARATOR MENUITEM "&Delete", ID_TREE_DELETE MENUITEM "&Rename", ID_TREE_RENAME @@ -351,6 +351,7 @@ IDS_EXPAND "&Expand" IDS_COLLAPSE "&Collapse" IDS_GOTO_SUGGESTED_KEY "&Go to '%s'" + IDS_FINISHEDFIND "Finished searching through the registry." END /*****************************************************************/ @@ -403,7 +404,7 @@ PUSHBUTTON "Cancel",IDCANCEL,197,24,50,14 GROUPBOX "Look at",IDC_STATIC,7,25,63,51 LTEXT "Fi&nd what:",IDC_STATIC,7,8,37,10 - EDITTEXT IDD_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL CONTROL "&Keys",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,36,35,8 CONTROL "&Values",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | @@ -416,6 +417,17 @@ WS_TABSTOP,83,48,90,12 END +IDD_FINDING DIALOGEX 0, 0, 145, 50 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU +CAPTION "Find" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 + PUSHBUTTON "&Cancel",IDCANCEL,93,29,45,14 + LTEXT "Searching the registry...",IDC_STATIC,33,12,83,8 +END + /* * TEXTINCLUDE */ _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-27 23:23:38 UTC (rev 19712) @@ -142,6 +142,9 @@ case ID_TREE_EXPORT: ExportRegistryFile(pChildWnd->hTreeWnd); break; + case ID_EDIT_FIND: + FindDialog(hWnd); + break; case ID_EDIT_COPYKEYNAME: hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey); _____ Added: trunk/reactos/subsys/system/regedit/find.c --- trunk/reactos/subsys/system/regedit/find.c 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/find.c 2005-11-27 23:23:38 UTC (rev 19712) @@ -0,0 +1,314 @@ +/* + * Regedit find dialog + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include <windows.h> +#include <tchar.h> +#include <commctrl.h> +#include <commdlg.h> +#include <cderr.h> +#include <stdlib.h> +#include <stdio.h> +#include <shellapi.h> +#include <objsel.h> +#include <objbase.h> +#include <ole2.h> + +#include "main.h" +#include "regproc.h" + +static TCHAR s_szFindWhat[256]; +static const TCHAR s_szFindFlags[] = _T("FindFlags"); +static const TCHAR s_szFindFlagsR[] = _T("FindFlagsReactOS"); +static HWND s_hwndAbortDialog; +static BOOL s_bAbort; + + + +static DWORD GetFindFlags(void) +{ + HKEY hKey; + DWORD dwFlags = RSF_LOOKATKEYS; + DWORD dwType, dwValue, cbData; + + if (RegOpenKey(HKEY_CURRENT_USER, g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) + { + /* Retrieve flags from registry key */ + cbData = sizeof(dwValue); + if (RegQueryValueEx(hKey, s_szFindFlags, NULL, &dwType, (LPBYTE) &dwValue, &cbData) == ERROR_SUCCESS) + { + if (dwType == REG_DWORD) + dwFlags = (dwFlags & ~0x0000FFFF) | ((dwValue & 0x0000FFFF) << 0); + } + + /* Retrieve ReactOS Regedit specific flags from registry key */ + cbData = sizeof(dwValue); + if (RegQueryValueEx(hKey, s_szFindFlagsR, NULL, &dwType, (LPBYTE) &dwValue, &cbData) == ERROR_SUCCESS) + { + if (dwType == REG_DWORD) + dwFlags = (dwFlags & ~0xFFFF0000) | ((dwValue & 0x0000FFFF) << 16); + } + + RegCloseKey(hKey); + } + return dwFlags; +} + +static void SetFindFlags(DWORD dwFlags) +{ + HKEY hKey; + DWORD dwDisposition; + DWORD dwData; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) == ERROR_SUCCESS) + { + dwData = (dwFlags >> 0) & 0x0000FFFF; + RegSetValueEx(hKey, s_szFindFlags, 0, REG_DWORD, (const BYTE *) &dwData, sizeof(dwData)); + + dwData = (dwFlags >> 16) & 0x0000FFFF; + RegSetValueEx(hKey, s_szFindFlagsR, 0, REG_DWORD, (const BYTE *) &dwData, sizeof(dwData)); + + RegCloseKey(hKey); + } +} + +static INT_PTR CALLBACK AbortFindDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_CLOSE: + s_bAbort = TRUE; + break; + + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case BN_CLICKED: + switch(LOWORD(wParam)) + { + case IDCANCEL: + s_bAbort = TRUE; + break; + } + break; + } + break; + } + return 0; +} + +static BOOL RegSearchProc(LPVOID lpParam) +{ + MSG msg; + + if (s_hwndAbortDialog && PeekMessage(&msg, s_hwndAbortDialog, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + return s_bAbort; +} + +BOOL FindNext(HWND hWnd) +{ + HKEY hKeyRoot; + LPCTSTR pszFindWhat; + LPCTSTR pszKeyPath; + DWORD dwFlags; + LONG lResult; + TCHAR szSubKey[512]; + TCHAR szError[512]; + TCHAR szTitle[64]; + TCHAR szFullKey[512]; + + pszFindWhat = s_szFindWhat; + dwFlags = GetFindFlags() & ~(RSF_LOOKATVALUES | RSF_LOOKATDATA); + + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + lstrcpyn(szSubKey, pszKeyPath, sizeof(szSubKey) / sizeof(szSubKey[0])); + + /* Create abort find dialog */ + s_hwndAbortDialog = CreateDialog(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_FINDING), hWnd, AbortFindDialogProc); + if (s_hwndAbortDialog) + ShowWindow(s_hwndAbortDialog, SW_SHOW); + s_bAbort = FALSE; + + lResult = RegSearch(hKeyRoot, szSubKey, sizeof(szSubKey) / sizeof(szSubKey[0]), + pszFindWhat, 0, dwFlags, RegSearchProc, NULL); + + if (s_hwndAbortDialog) + { + DestroyWindow(s_hwndAbortDialog); + s_hwndAbortDialog = NULL; + } + + /* Did the user click "Cancel"? If so, exit without displaying an error message */ + if (lResult == ERROR_OPERATION_ABORTED) + return FALSE; + + if (lResult != ERROR_SUCCESS) + { + LoadString(NULL, IDS_APP_TITLE, szTitle, sizeof(szTitle) / sizeof(szTitle[0])); + + if ((lResult != ERROR_NO_MORE_ITEMS) || !LoadString(NULL, IDS_FINISHEDFIND, szError, sizeof(szError) / sizeof(szError[0]))) + { + FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, lResult, 0, + szError, sizeof(szError) / sizeof(szError[0]), NULL); + } + MessageBox(hWnd, szError, szTitle, MB_OK); + return FALSE; + } + + RegKeyGetName(szFullKey, sizeof(szFullKey) / sizeof(szFullKey[0]), hKeyRoot, szSubKey); + SelectNode(g_pChildWnd->hTreeWnd, szFullKey); + return TRUE; +} + +static INT_PTR CALLBACK FindDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + INT_PTR iResult = 0; + HWND hControl; + LONG lStyle; + DWORD dwFlags; + static TCHAR s_szSavedFindValue[256]; + + switch(uMsg) + { + case WM_INITDIALOG: + dwFlags = GetFindFlags(); + + /* Looking at values is not yet implemented */ + hControl = GetDlgItem(hDlg, IDC_LOOKAT_KEYS); + if (hControl) + SendMessage(hControl, BM_SETCHECK, (dwFlags & RSF_LOOKATKEYS) ? TRUE : FALSE, 0); + + /* Looking at values is not yet implemented */ + hControl = GetDlgItem(hDlg, IDC_LOOKAT_VALUES); + if (hControl) + { + lStyle = GetWindowLong(hControl, GWL_STYLE); + SetWindowLong(hControl, GWL_STYLE, lStyle | WS_DISABLED); + } + + /* Looking at data is not yet implemented */ + hControl = GetDlgItem(hDlg, IDC_LOOKAT_DATA); + if (hControl) + { + lStyle = GetWindowLong(hControl, GWL_STYLE); + SetWindowLong(hControl, GWL_STYLE, lStyle | WS_DISABLED); + } + + /* Match whole string */ + hControl = GetDlgItem(hDlg, IDC_MATCHSTRING); + if (hControl) + SendMessage(hControl, BM_SETCHECK, (dwFlags & RSF_WHOLESTRING) ? TRUE : FALSE, 0); + + /* Case sensitivity */ + hControl = GetDlgItem(hDlg, IDC_MATCHCASE); + if (hControl) + SendMessage(hControl, BM_SETCHECK, (dwFlags & RSF_MATCHCASE) ? TRUE : FALSE, 0); + + hControl = GetDlgItem(hDlg, IDC_FINDWHAT); + if (hControl) + { + SetWindowText(hControl, s_szSavedFindValue); + SetFocus(hControl); + SendMessage(hControl, EM_SETSEL, 0, -1); + } + break; + + case WM_CLOSE: + EndDialog(hDlg, 0); + break; + + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case BN_CLICKED: + switch(LOWORD(wParam)) + { + case IDOK: + dwFlags = 0; + + hControl = GetDlgItem(hDlg, IDC_LOOKAT_KEYS); + if (hControl && (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED)) + dwFlags |= RSF_LOOKATKEYS; + + hControl = GetDlgItem(hDlg, IDC_LOOKAT_VALUES); + if (hControl && (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED)) + dwFlags |= RSF_LOOKATVALUES; + + hControl = GetDlgItem(hDlg, IDC_LOOKAT_DATA); + if (hControl && (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED)) + dwFlags |= RSF_LOOKATDATA; + + hControl = GetDlgItem(hDlg, IDC_MATCHSTRING); + if (hControl && (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED)) + dwFlags |= RSF_WHOLESTRING; + + hControl = GetDlgItem(hDlg, IDC_MATCHCASE); + if (hControl && (SendMessage(hControl, BM_GETCHECK, 0, 0) == BST_CHECKED)) + dwFlags |= RSF_MATCHCASE; + + SetFindFlags(dwFlags); + + hControl = GetDlgItem(hDlg, IDC_FINDWHAT); + if (hControl) + GetWindowText(hControl, s_szFindWhat, sizeof(s_szFindWhat) / sizeof(s_szFindWhat[0])); + EndDialog(hDlg, 1); + break; + + case IDCANCEL: + EndDialog(hDlg, 0); + break; + } + break; + + case EN_CHANGE: + switch(LOWORD(wParam)) + { + case IDC_FINDWHAT: + GetWindowText((HWND) lParam, s_szSavedFindValue, sizeof(s_szSavedFindValue) / sizeof(s_szSavedFindValue[0])); + hControl = GetDlgItem(hDlg, IDOK); + if (hControl) + { + lStyle = GetWindowLong(hControl, GWL_STYLE); + if (s_szSavedFindValue[0]) + lStyle &= ~WS_DISABLED; + else + lStyle |= WS_DISABLED; + SetWindowLong(hControl, GWL_STYLE, lStyle); + RedrawWindow(hControl, NULL, NULL, RDW_INVALIDATE); + } + break; + } + } + break; + } + return iResult; +} + +void FindDialog(HWND hWnd) +{ + if (DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_FIND), + hWnd, FindDialogProc, 0) != 0) + { + FindNext(hWnd); + } +} + Property changes on: trunk/reactos/subsys/system/regedit/find.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-11-27 23:23:38 UTC (rev 19712) @@ -905,7 +905,7 @@ break; case ID_EDIT_DELETE: { - if (GetFocus() == g_pChildWnd->hListWnd) + if (GetFocus() == g_pChildWnd->hListWnd) { UINT nSelected = ListView_GetSelectedCount(g_pChildWnd->hListWnd); if(nSelected >= 1) @@ -966,6 +966,12 @@ break; } + case ID_EDIT_FIND: + FindDialog(hWnd); + break; + case ID_EDIT_FINDNEXT: + FindNext(hWnd); + break; case ID_EDIT_COPYKEYNAME: CopyKeyName(hWnd, hKeyRoot, keyPath); break; _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/main.c 2005-11-27 23:23:38 UTC (rev 19712) @@ -50,6 +50,7 @@ HMENU hPopupMenus = 0; UINT nClipboardFormat; LPCTSTR strClipboardFormat = _T("TODO: SET CORRECT FORMAT"); +const TCHAR g_szGeneralRegKey[] = _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"); #define MAX_LOADSTRING 100 @@ -162,8 +163,7 @@ } /* Restore position */ - if (RegQueryStringValue(HKEY_CURRENT_USER, - _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"), + if (RegQueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey, _T("LastKey"), szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) { _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/main.h 2005-11-27 23:23:38 UTC (rev 19712) @@ -79,12 +79,18 @@ extern TCHAR szFrameClass[]; extern TCHAR szChildClass[]; +extern const TCHAR g_szGeneralRegKey[]; + /* about.c */ extern void ShowAboutBox(HWND hWnd); /* childwnd.c */ extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +/* find.c */ +extern void FindDialog(HWND hWnd); +extern BOOL FindNext(HWND hWnd); + /* framewnd.c */ extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); extern void SetupStatusBar(HWND hWnd, BOOL bResize); _____ Modified: trunk/reactos/subsys/system/regedit/regedit.xml --- trunk/reactos/subsys/system/regedit/regedit.xml 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/regedit.xml 2005-11-27 23:23:38 UTC (rev 19712) @@ -19,6 +19,7 @@ <file>about.c</file> <file>childwnd.c</file> <file>edit.c</file> + <file>find.c</file> <file>framewnd.c</file> <file>hexedit.c</file> <file>listview.c</file> _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-11-27 23:23:38 UTC (rev 19712) @@ -1594,7 +1594,7 @@ { LPCTSTR s; LPTSTR lpNewSubKey = NULL; - LONG Ret = 0; + LONG Ret = 0; s = _tcsrchr(lpSubKey, _T('\\')); if (s) @@ -1687,6 +1687,145 @@ } /*********************************************************************** ******* + * Searching + */ + +static LONG RegNextKey(HKEY hKey, LPTSTR lpSubKey, size_t iSubKeyLength) +{ + LONG lResult; + LPTSTR s; + LPCTSTR pszOriginalKey; + TCHAR szKeyName[256]; + HKEY hSubKey, hBaseKey; + DWORD dwIndex = 0; + DWORD cbName; + FILETIME ft; + BOOL bFoundKey = FALSE; + + /* Try accessing a subkey */ + if (RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hSubKey) == ERROR_SUCCESS) + { + cbName = iSubKeyLength - _tcslen(lpSubKey) - 1; + lResult = RegEnumKeyEx(hSubKey, 0, lpSubKey + _tcslen(lpSubKey) + 1, + &cbName, NULL, NULL, NULL, &ft); + RegCloseKey(hSubKey); + + if (lResult == ERROR_SUCCESS) + { + lpSubKey[_tcslen(lpSubKey)] = '\\'; + bFoundKey = TRUE; + } + } + + if (!bFoundKey) + { + /* Go up and find the next sibling key */ + do + { + s = _tcsrchr(lpSubKey, '\\'); + if (s) + { + *s = '\0'; + pszOriginalKey = s + 1; + + hBaseKey = NULL; + RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hBaseKey); + } + else + { + pszOriginalKey = lpSubKey; + hBaseKey = hKey; + } + + if (hBaseKey) + { + dwIndex = 0; + do + { + lResult = RegEnumKey(hBaseKey, dwIndex++, szKeyName, sizeof(szKeyName) / sizeof(szKeyName[0])); + } + while((lResult == ERROR_SUCCESS) && _tcscmp(szKeyName, pszOriginalKey)); + + if (lResult == ERROR_SUCCESS) + { + lResult = RegEnumKey(hBaseKey, dwIndex++, szKeyName, sizeof(szKeyName) / sizeof(szKeyName[0])); + if (lResult == ERROR_SUCCESS) + { + bFoundKey = TRUE; + _sntprintf(lpSubKey + _tcslen(lpSubKey), iSubKeyLength - _tcslen(lpSubKey), _T("\\%s"), szKeyName); + } + } + RegCloseKey(hBaseKey); + } + } + while(!bFoundKey); + } + return bFoundKey ? ERROR_SUCCESS : ERROR_NO_MORE_ITEMS; +} + +static BOOL RegSearchCompare(LPCTSTR s1, LPCTSTR s2, DWORD dwSearchFlags) +{ + BOOL bResult; + if (dwSearchFlags & RSF_WHOLESTRING) + { + if (dwSearchFlags & RSF_MATCHCASE) + bResult = !_tcscmp(s1, s2); + else + bResult = !_tcsicmp(s1, s2); + } + else + { + if (dwSearchFlags & RSF_MATCHCASE) + bResult = (_tcsstr(s1, s2) != NULL); + else + { + /* My kingdom for _tcsistr() */ + bResult = FALSE; + while(*s1) + { + if (!_tcsnicmp(s1, s2, _tcslen(s2))) + { + bResult = TRUE; + break; + } + s1++; + } + } + } + return bResult; +} + +LONG RegSearch(HKEY hKey, LPTSTR lpSubKey, size_t iSubKeyLength, + LPCTSTR pszSearchString, DWORD dwValueIndex, + DWORD dwSearchFlags, BOOL (*pfnCallback)(LPVOID), LPVOID lpParam) +{ + LONG lResult; + LPCTSTR s; + + if (dwSearchFlags & (RSF_LOOKATVALUES | RSF_LOOKATDATA)) + return ERROR_CALL_NOT_IMPLEMENTED; /* NYI */ + + do + { + if (pfnCallback) + { + if (pfnCallback(lpParam)) + return ERROR_OPERATION_ABORTED; + } + + lResult = RegNextKey(hKey, lpSubKey, iSubKeyLength); + if (lResult != ERROR_SUCCESS) + return lResult; + + s = _tcsrchr(lpSubKey, '\\'); + s = s ? s + 1 : lpSubKey; + } + while(!(dwSearchFlags & RSF_LOOKATKEYS) || !RegSearchCompare(s, pszSearchString, dwSearchFlags)); + + return ERROR_SUCCESS; +} + +/********************************************************************** ******** * Key naming and parsing */ _____ Modified: trunk/reactos/subsys/system/regedit/regproc.h --- trunk/reactos/subsys/system/regedit/regproc.h 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/regproc.h 2005-11-27 23:23:38 UTC (rev 19712) @@ -85,7 +85,6 @@ /* * Processing */ -LONG RegDeleteKeyRecursive(HKEY hKey, LPCTSTR lpSubKey); LONG RegCopyKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey); LONG RegMoveKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey); LONG RegRenameKey(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpNewName); @@ -95,6 +94,16 @@ /* * Miscellaneous */ +#define RSF_WHOLESTRING 0x00000001 +#define RSF_LOOKATKEYS 0x00000002 +#define RSF_LOOKATVALUES 0x00000004 +#define RSF_LOOKATDATA 0x00000008 +#define RSF_MATCHCASE 0x00010000 + +LONG RegSearch(HKEY hKey, LPTSTR lpSubKey, size_t iSubKeyLength, + LPCTSTR pszSearchString, DWORD dwValueIndex, + DWORD dwSearchFlags, BOOL (*pfnCallback)(LPVOID), LPVOID lpParam); + BOOL RegKeyGetName(LPTSTR pszDest, size_t iDestLength, HKEY hRootKey, LPCTSTR lpSubKey); /* EOF */ _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-11-27 23:23:13 UTC (rev 19711) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-11-27 23:23:38 UTC (rev 19712) @@ -45,6 +45,7 @@ #define IDD_ADDFAVORITES 138 #define IDD_REMOVEFAVORITES 139 #define IDD_FIND 140 +#define IDD_FINDING 141 #define IDC_LICENSE_EDIT 1029 #define ID_REGISTRY_EXIT 32770 #define ID_FAVOURITES_ADDTOFAVOURITES 32772 @@ -194,12 +195,13 @@ #define IDC_FAVORITENAME 2011 #define IDC_FAVORITESLIST 2012 -#define IDD_FINDWHAT 2013 +#define IDC_FINDWHAT 2013 #define IDC_LOOKAT_KEYS 2014 #define IDC_LOOKAT_VALUES 2015 #define IDC_LOOKAT_DATA 2016 #define IDC_MATCHSTRING 2017 #define IDC_MATCHCASE 2018 +#define IDS_FINISHEDFIND 2019 #define ID_FAVORITES_MIN 2100 #define ID_FAVORITES_MAX 2999
19 years
1
0
0
0
[gvg] 19711: Prepare to update wmc to latest version
by gvg@svn.reactos.com
Prepare to update wmc to latest version Added: vendor/wine/tools/wmc/ Added: vendor/wine/tools/wmc/current/ Added: vendor/wine/tools/wmc/current/CHANGES Added: vendor/wine/tools/wmc/current/Makefile.in Added: vendor/wine/tools/wmc/current/lang.c Added: vendor/wine/tools/wmc/current/lang.h Added: vendor/wine/tools/wmc/current/mcl.c Added: vendor/wine/tools/wmc/current/mcy.y Added: vendor/wine/tools/wmc/current/utils.c Added: vendor/wine/tools/wmc/current/utils.h Added: vendor/wine/tools/wmc/current/wmc.c Added: vendor/wine/tools/wmc/current/wmc.h Added: vendor/wine/tools/wmc/current/wmc.man.in Added: vendor/wine/tools/wmc/current/wmctypes.h Added: vendor/wine/tools/wmc/current/write.c Added: vendor/wine/tools/wmc/current/write.h _____ Added: vendor/wine/tools/wmc/current/CHANGES --- vendor/wine/tools/wmc/current/CHANGES 2005-11-27 23:18:12 UTC (rev 19710) +++ vendor/wine/tools/wmc/current/CHANGES 2005-11-27 23:23:13 UTC (rev 19711) @@ -0,0 +1,5 @@ +----------------------------------------------------------------------- ---- +Version 1.0.0 (12-Jun-2000) + +Bertho Stultiens <bertho(a)akhphd.au.dk> +- Initial release Property changes on: vendor/wine/tools/wmc/current/CHANGES ___________________________________________________________________ Name: svn:eol-style + native _____ Added: vendor/wine/tools/wmc/current/Makefile.in --- vendor/wine/tools/wmc/current/Makefile.in 2005-11-27 23:18:12 UTC (rev 19710) +++ vendor/wine/tools/wmc/current/Makefile.in 2005-11-27 23:23:13 UTC (rev 19711) @@ -0,0 +1,45 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +EXEEXT = @EXEEXT@ + +PROGRAMS = wmc$(EXEEXT) +MANPAGES = wmc.man +MODULE = none + +C_SRCS = \ + lang.c \ + mcl.c \ + utils.c \ + wmc.c \ + write.c + +EXTRA_SRCS = mcy.y +EXTRA_OBJS = mcy.tab.o + +all: $(PROGRAMS) $(MANPAGES) + +mcl.o: mcy.tab.h + +@MAKE_RULES@ + +wmc$(EXEEXT): $(OBJS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBUNICODE) $(LIBPORT) $(LEXLIB) $(LDFLAGS) + +mcy.tab.c mcy.tab.h: mcy.y + $(BISON) -d -t $(SRCDIR)/mcy.y -o mcy.tab.c + +# hack to allow parallel make +mcy.tab.h: mcy.tab.c +mcy.tab.o: mcy.tab.h + +install:: $(PROGRAMS) $(MANPAGES) + $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) + $(INSTALL_DATA) wmc.man $(mandir)/man$(prog_manext)/wmc.$(prog_manext) + $(INSTALL_PROGRAM) wmc$(EXEEXT) $(bindir)/wmc$(EXEEXT) + +uninstall:: + $(RM) $(bindir)/wmc$(EXEEXT) $(mandir)/man$(prog_manext)/wmc.$(prog_manext) + +### Dependencies: Property changes on: vendor/wine/tools/wmc/current/Makefile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/tools/wmc/current/lang.c --- vendor/wine/tools/wmc/current/lang.c 2005-11-27 23:18:12 UTC (rev 19710) +++ vendor/wine/tools/wmc/current/lang.c 2005-11-27 23:23:13 UTC (rev 19711) @@ -0,0 +1,165 @@ +/* + * Wine Message Compiler language and codepage support + * + * Copyright 2000 Bertho A. Stultiens (BS) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <assert.h> + +#include "wmc.h" +#include "lang.h" + + +/* + * Languages supported + * + * MUST be sorting ascending on language ID + */ +static const language_t languages[] = { + + {0x0000, 437, 1252, "Neutral", "Neutral"}, + {0x0402, 866, 1251, "Bulgarian", "Bulgaria"}, + {0x0403, 850, 1252, "Catalan", "Spain"}, + {0x0405, 852, 1250, "Czech", "Czech Republic"}, + {0x0406, 850, 1252, "Danish", "Denmark"}, + {0x0407, 850, 1252, "German", "Germany"}, + {0x0408, 737, 1253, "Greek", "Greece"}, + {0x0409, 437, 1252, "English", "United States"}, + {0x040A, 850, 1252, "Spanish - Traditional Sort", "Spain"}, + {0x040B, 850, 1252, "Finnish", "Finland"}, + {0x040C, 850, 1252, "French", "France"}, + {0x040E, 852, 1250, "Hungarian", "Hungary"}, + {0x040F, 850, 1252, "Icelandic", "Iceland"}, + {0x0410, 850, 1252, "Italian", "Italy"}, + {0x0411, 932, 932, "Japanese", "Japan"}, + {0x0412, 949, 949, "Korean", "Korea (south)"}, + {0x0413, 850, 1252, "Dutch", "Netherlands"}, + {0x0414, 850, 1252, "Norwegian (BokmÕl)", "Norway"}, + {0x0415, 852, 1250, "Polish", "Poland"}, + {0x0416, 850, 1252, "Portuguese", "Brazil"}, + {0x0418, 852, 1250, "Romanian", "Romania"}, + {0x0419, 866, 1251, "Russian", "Russia"}, + {0x041A, 852, 1250, "Croatian", "Croatia"}, + {0x041B, 852, 1250, "Slovak", "Slovakia"}, + {0x041C, 852, 1250, "Albanian", "Albania"}, + {0x041D, 850, 1252, "Swedish", "Sweden"}, + {0x041F, 857, 1254, "Turkish", "Turkey"}, + {0x0421, 850, 1252, "Indonesian", "Indonesia"}, + {0x0422, 866, 1251, "Ukrainian", "Ukraine"}, + {0x0423, 866, 1251, "Belarusian", "Belarus"}, + {0x0424, 852, 1250, "Slovene", "Slovenia"}, + {0x0425, 775, 1257, "Estonian", "Estonia"}, + {0x0426, 775, 1257, "Latvian", "Latvia"}, + {0x0427, 775, 1257, "Lithuanian", "Lithuania"}, +/* {0x042A, ?, ?, "Vietnamese", "Vietnam"},*/ + {0x042D, 850, 1252, "Basque", "Spain"}, + {0x042F, 866, 1251, "Macedonian", "Former Yugoslav Republic of Macedonia"}, + {0x0436, 850, 1252, "Afrikaans", "South Africa"}, +/* {0x0438, 852, 1252, "Faroese", "Faroe Islands"}, FIXME: Not sure about codepages */ + {0x043C, 437, 1252, "Irish", "Ireland"}, + {0x043E, 850, 1252, "Malay", "Malaysia"}, +/* {0x048F, ?, ?, "Esperanto", "<none>"},*/ + {0x0804, 936, 936, "Chinese (People's republic of China)", "People's republic of China"}, + {0x0807, 850, 1252, "German", "Switzerland"}, + {0x0809, 850, 1252, "English", "United Kingdom"}, + {0x080A, 850, 1252, "Spanish", "Mexico"}, + {0x080C, 850, 1252, "French", "Belgium"}, + {0x0810, 850, 1252, "Italian", "Switzerland"}, + {0x0813, 850, 1252, "Dutch", "Belgium"}, + {0x0814, 850, 1252, "Norwegian (Nynorsk)", "Norway"}, + {0x0816, 850, 1252, "Portuguese", "Portugal"}, +/* {0x081A, ?, ?, "Serbian (latin)", "Yugoslavia"},*/ + {0x081D, 850, 1252, "Swedish (Finland)", "Finland"}, + {0x0C07, 850, 1252, "German", "Austria"}, + {0x0C09, 850, 1252, "English", "Australia"}, + {0x0C0A, 850, 1252, "Spanish - International Sort", "Spain"}, + {0x0C0C, 850, 1252, "French", "Canada"}, + {0x0C1A, 855, 1251, "Serbian (Cyrillic)", "Serbia"}, + {0x1007, 850, 1252, "German", "Luxembourg"}, + {0x1009, 850, 1252, "English", "Canada"}, + {0x100A, 850, 1252, "Spanish", "Guatemala"}, + {0x100C, 850, 1252, "French", "Switzerland"}, + {0x1407, 850, 1252, "German", "Liechtenstein"}, + {0x1409, 850, 1252, "English", "New Zealand"}, + {0x140A, 850, 1252, "Spanish", "Costa Rica"}, + {0x140C, 850, 1252, "French", "Luxembourg"}, + {0x1809, 850, 1252, "English", "Ireland"}, + {0x180A, 850, 1252, "Spanish", "Panama"}, + {0x1C09, 437, 1252, "English", "South Africa"}, + {0x1C0A, 850, 1252, "Spanish", "Dominican Republic"}, + {0x2009, 850, 1252, "English", "Jamaica"}, + {0x200A, 850, 1252, "Spanish", "Venezuela"}, + {0x2409, 850, 1252, "English", "Caribbean"}, + {0x240A, 850, 1252, "Spanish", "Colombia"}, + {0x2809, 850, 1252, "English", "Belize"}, + {0x280A, 850, 1252, "Spanish", "Peru"}, + {0x2C09, 437, 1252, "English", "Trinidad & Tobago"}, + {0x2C0A, 850, 1252, "Spanish", "Argentina"}, + {0x300A, 850, 1252, "Spanish", "Ecuador"}, + {0x340A, 850, 1252, "Spanish", "Chile"}, + {0x380A, 850, 1252, "Spanish", "Uruguay"}, + {0x3C0A, 850, 1252, "Spanish", "Paraguay"}, + {0x400A, 850, 1252, "Spanish", "Bolivia"}, + {0x440A, 850, 1252, "Spanish", "El Salvador"}, + {0x480A, 850, 1252, "Spanish", "Honduras"}, + {0x4C0A, 850, 1252, "Spanish", "Nicaragua"}, + {0x500A, 850, 1252, "Spanish", "Puerto Rico"} +}; + +#define NLAN (sizeof(languages)/sizeof(languages[0])) + +void show_languages(void) +{ + unsigned int i; + printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); + printf("-------+--------+--------+--------------+---------\n"); + for(i = 0; i < NLAN; i++) + printf("0x%04x | %5d | %5d | %-12s | %s\n", + languages[i].id, + languages[i].doscp, + languages[i].wincp, + languages[i].name, + languages[i].country); +} + +static int langcmp(const void *p1, const void *p2) +{ + return *(const unsigned *)p1 - ((const language_t *)p2)->id; +} + +const language_t *find_language(unsigned id) +{ + return (const language_t *)bsearch(&id, languages, NLAN, sizeof(languages[0]), langcmp); +} + +void show_codepages(void) +{ + unsigned i; + const union cptable *cpp; + printf("Codepages:\n"); + for(i = 0; (cpp = wine_cp_enum_table(i)); i++) + { + printf("%-5d %s\n", cpp->info.codepage, cpp->info.name); + } +} + +const union cptable *find_codepage(int id) +{ + return wine_cp_get_table(id); +} Property changes on: vendor/wine/tools/wmc/current/lang.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/tools/wmc/current/lang.h --- vendor/wine/tools/wmc/current/lang.h 2005-11-27 23:18:12 UTC (rev 19710) +++ vendor/wine/tools/wmc/current/lang.h 2005-11-27 23:23:13 UTC (rev 19711) @@ -0,0 +1,39 @@ +/* + * Wine Message Compiler language and codepage support + * + * Copyright 2000 Bertho A. Stultiens (BS) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WMC_LANG_H +#define __WMC_LANG_H + +#include "wine/unicode.h" + +typedef struct language { + unsigned id; + unsigned doscp; + unsigned wincp; + const char *name; + const char *country; +} language_t; + +void show_languages(void); +const language_t *find_language(unsigned id); +void show_codepages(void); +const union cptable *find_codepage(int id); + +#endif Property changes on: vendor/wine/tools/wmc/current/lang.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: vendor/wine/tools/wmc/current/mcl.c --- vendor/wine/tools/wmc/current/mcl.c 2005-11-27 23:18:12 UTC (rev 19710) +++ vendor/wine/tools/wmc/current/mcl.c 2005-11-27 23:23:13 UTC (rev 19711) @@ -0,0 +1,747 @@ +/* + * Wine Message Compiler lexical scanner + * + * Copyright 2000 Bertho A. Stultiens (BS) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <assert.h> +#include <string.h> + +#include "utils.h" +#include "wmc.h" +#include "lang.h" + +#include "mcy.tab.h" + +/* + * Keywords are case insenitive. All normal input is treated as + * being in codepage iso-8859-1 for ascii input files (unicode + * page 0) and as equivalent unicode if unicode input is selected. + * All normal input, which is not part of a message text, is + * enforced to be unicode page 0. Otherwise an error will be + * generated. The normal file data should only be ASCII because + * that is the basic definition of the grammar. + * + * Byteorder or unicode input is determined automatically by + * reading the first 8 bytes and checking them against unicode + * page 0 byteorder (hibyte must be 0). + * -- FIXME -- + * Alternatively, the input is checked against a special byte + * sequence to identify the file. + * -- FIXME -- + * + * + * Keywords: + * Codepages + * Facility + * FacilityNames + * LanguageNames + * MessageId + * MessageIdTypedef + * Severity + * SeverityNames + * SymbolicName + * + * Default added identifiers for classes: + * SeverityNames: + * Success = 0x0 + * Informational = 0x1 + * Warning = 0x2 + * Error = 0x3 + * FacilityNames: + * System = 0x0FF + * Application = 0xFFF + * + * The 'Codepages' keyword is a wmc extension. + */ + +static WCHAR ustr_application[] = { 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', 0 }; +static WCHAR ustr_codepages[] = { 'C', 'o', 'd', 'e', 'p', 'a', 'g', 'e', 's', 0 }; +static WCHAR ustr_english[] = { 'E', 'n', 'g', 'l', 'i', 's', 'h', 0 }; +static WCHAR ustr_error[] = { 'E', 'r', 'r', 'o', 'r', 0 }; +static WCHAR ustr_facility[] = { 'F', 'a', 'c', 'i', 'l', 'i', 't', 'y', 0 }; +static WCHAR ustr_facilitynames[] = { 'F', 'a', 'c', 'i', 'l', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; +static WCHAR ustr_informational[] = { 'I', 'n', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', 'a', 'l', 0 }; +static WCHAR ustr_language[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 0}; +static WCHAR ustr_languagenames[] = { 'L', 'a', 'n', 'g', 'u', 'a', 'g', 'e', 'N', 'a', 'm', 'e', 's', 0}; +static WCHAR ustr_messageid[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 0 }; +static WCHAR ustr_messageidtypedef[] = { 'M', 'e', 's', 's', 'a', 'g', 'e', 'I', 'd', 'T', 'y', 'p', 'e', 'd', 'e', 'f', 0 }; +static WCHAR ustr_outputbase[] = { 'O', 'u', 't', 'p', 'u', 't', 'B', 'a', 's', 'e', 0 }; +static WCHAR ustr_severity[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 0 }; +static WCHAR ustr_severitynames[] = { 'S', 'e', 'v', 'e', 'r', 'i', 't', 'y', 'N', 'a', 'm', 'e', 's', 0 }; +static WCHAR ustr_success[] = { 'S', 'u', 'c', 'c', 'e', 's', 's', 0 }; +static WCHAR ustr_symbolicname[] = { 'S', 'y', 'm', 'b', 'o', 'l', 'i', 'c', 'N', 'a', 'm', 'e', 0 }; +static WCHAR ustr_system[] = { 'S', 'y', 's', 't', 'e', 'm', 0 }; +static WCHAR ustr_warning[] = { 'W', 'a', 'r', 'n', 'i', 'n', 'g', 0 }; +static WCHAR ustr_msg00001[] = { 'm', 's', 'g', '0', '0', '0', '0', '1', 0 }; +/* + * This table is to beat any form of "expression building" to check for + * correct filename characters. It is also used for ident checks. + * FIXME: use it more consistently. + */ + +#define CH_SHORTNAME 0x01 +#define CH_LONGNAME 0x02 +#define CH_IDENT 0x04 +#define CH_NUMBER 0x08 +/*#define CH_WILDCARD 0x10*/ +/*#define CH_DOT 0x20*/ +#define CH_PUNCT 0x40 +#define CH_INVALID 0x80 + +static const char char_table[256] = { + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, /* 0x00 - 0x07 */ + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, /* 0x08 - 0x0F */ + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, /* 0x10 - 0x17 */ + 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, /* 0x18 - 0x1F */ + 0x80, 0x03, 0x80, 0x03, 0x03, 0x03, 0x03, 0x03, /* 0x20 - 0x27 " !"#$%&'" */ + 0x43, 0x43, 0x10, 0x80, 0x03, 0x03, 0x22, 0x80, /* 0x28 - 0x2F "()*+,-./" */ + 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, /* 0x30 - 0x37 "01234567" */ + 0x0b, 0x0b, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x10, /* 0x38 - 0x3F "89:;<=>?" */ + 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, /* 0x40 - 0x47 "@ABCDEFG" */ + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, /* 0x48 - 0x4F "HIJKLMNO" */ + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, /* 0x50 - 0x57 "PQRSTUVW" */ + 0x07, 0x07, 0x07, 0x80, 0x80, 0x80, 0x80, 0x07, /* 0x58 - 0x5F "XYZ[\]^_" */ + 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, /* 0x60 - 0x67 "`abcdefg" */ + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, /* 0x68 - 0x6F "hijklmno" */ + 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, /* 0x70 - 0x77 "pqrstuvw" */ + 0x07, 0x07, 0x07, 0x03, 0x80, 0x03, 0x03, 0x80, /* 0x78 - 0x7F "xyz{|}~ " */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0x80 - 0x87 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0x88 - 0x8F */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0x90 - 0x97 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0x98 - 0x9F */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xA0 - 0xA7 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xA8 - 0xAF */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xB0 - 0xB7 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xB8 - 0xBF */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xC0 - 0xC7 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xC8 - 0xCF */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xD0 - 0xD7 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xD8 - 0xDF */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xE0 - 0xE7 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xE8 - 0xEF */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 0xF0 - 0xF7 */ + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x80, /* 0xF8 - 0xFF */ +}; + +static int isisochar(int ch) +{ + return !(ch & (~0xff)); +} + +static int codepage; +static const union cptable *codepage_def; + +void set_codepage(int cp) +{ + codepage = cp; + codepage_def = find_codepage(codepage); + if(!codepage_def) + xyyerror("Codepage %d not found; cannot process", codepage); +} + +/* + * Input functions + */ +static int nungetstack = 0; +static int allocungetstack = 0; +static char *ungetstack = NULL; +static int ninputbuffer = 0; +static WCHAR *inputbuffer = NULL; +static char *xlatebuffer = NULL; + +#define INPUTBUFFER_SIZE 2048 /* Must be larger than 4 and approx. large enough to hold a line */ + +/* + * Fill the input buffer with *one* line of input. + * The line is '\n' terminated so that scanning + * messages with translation works as expected + * (otherwise we cannot pre-translate because the + * language is first known one line before the + * actual message). + */ +static int fill_inputbuffer(void) +{ + int n; + static const char err_fatalread[] = "Fatal: reading input failed"; + static int endian = -1; + + if(!inputbuffer) + { + inputbuffer = xmalloc(INPUTBUFFER_SIZE); + xlatebuffer = xmalloc(INPUTBUFFER_SIZE); + } + +try_again: + if(!unicodein) + { + char *cptr; + cptr = fgets(xlatebuffer, INPUTBUFFER_SIZE, yyin); + if(!cptr && ferror(yyin)) + xyyerror(err_fatalread); + else if(!cptr) + return 0; + assert(codepage_def != NULL); + n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + if(n < 0) + internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)", n); + if(n <= 1) + goto try_again; /* Should not hapen */ + n--; /* Strip added conversion '\0' from input length */ + /* + * FIXME: + * Detect UTF-8 in the first time we read some bytes by + * checking the special sequence "FE..." or something like + * that. I need to check
www.unicode.org
for details. + */ + } + else + { + if(endian == -1) + { + n = fread(inputbuffer, 1, 8, yyin); + if(n != 8) + { + if(!n && ferror(yyin)) + xyyerror(err_fatalread); + else + xyyerror("Fatal: file to short to determine byteorder (should never happen)"); + } + if(isisochar(inputbuffer[0]) && + isisochar(inputbuffer[1]) && + isisochar(inputbuffer[2]) && + isisochar(inputbuffer[3])) + { +#ifdef WORDS_BIGENDIAN + endian = WMC_BO_BIG; +#else + endian = WMC_BO_LITTLE; +#endif + } + else if(isisochar(BYTESWAP_WORD(inputbuffer[0])) && + isisochar(BYTESWAP_WORD(inputbuffer[1])) && + isisochar(BYTESWAP_WORD(inputbuffer[2])) && + isisochar(BYTESWAP_WORD(inputbuffer[3]))) + { +#ifdef WORDS_BIGENDIAN + endian = WMC_BO_LITTLE; +#else + endian = WMC_BO_BIG; +#endif + } + else + xyyerror("Fatal: cannot determine file's byteorder"); + /* FIXME: + * Determine the file-endian with the leader-bytes + * "FF FE..."; can't remember the exact sequence. + */ + n /= 2; +#ifdef WORDS_BIGENDIAN + if(endian == WMC_BO_LITTLE) +#else + if(endian == WMC_BO_BIG) +#endif + { + inputbuffer[0] = BYTESWAP_WORD(inputbuffer[0]); + inputbuffer[1] = BYTESWAP_WORD(inputbuffer[1]); + inputbuffer[2] = BYTESWAP_WORD(inputbuffer[2]); + inputbuffer[3] = BYTESWAP_WORD(inputbuffer[3]); + } + + } + else + { + int i; + n = 0; + for(i = 0; i < INPUTBUFFER_SIZE; i++) + { + int t; + t = fread(&inputbuffer[i], 2, 1, yyin); + if(!t && ferror(yyin)) + xyyerror(err_fatalread); + else if(!t && n) + break; + n++; +#ifdef WORDS_BIGENDIAN + if(endian == WMC_BO_LITTLE) +#else + if(endian == WMC_BO_BIG) +#endif + { + if((inputbuffer[i] = BYTESWAP_WORD(inputbuffer[i])) == '\n') + break; + } + else + { + if(inputbuffer[i] == '\n') + break; + } + } + } + + } + + if(!n) + { + yywarning("Re-read line (input was or converted to zilch)"); + goto try_again; /* Should not happen, but could be due to stdin reading and a signal */ + } + + ninputbuffer += n; + return 1; +} + +static int get_unichar(void) +{ + static WCHAR *b = NULL; + char_number++; + + if(nungetstack) + return ungetstack[--nungetstack]; + + if(!ninputbuffer) + { + if(!fill_inputbuffer()) + return EOF; + b = inputbuffer; + } + + ninputbuffer--; + return (int)(*b++ & 0xffff); +} + +static void unget_unichar(int ch) +{ + if(ch == EOF) + return; + + char_number--; + + if(nungetstack == allocungetstack) + { + allocungetstack += 32; + ungetstack = xrealloc(ungetstack, allocungetstack * sizeof(*ungetstack)); + } + + ungetstack[nungetstack++] = (WCHAR)ch; +} + + +/* + * Normal character stack. + * Used for number scanning. + */ +static int ncharstack = 0; +static int alloccharstack = 0; +static char *charstack = NULL; + +static void empty_char_stack(void) +{ + ncharstack = 0; +} + +static void push_char(int ch) +{ + if(ncharstack == alloccharstack) + { + alloccharstack += 32; + charstack = xrealloc(charstack, alloccharstack * sizeof(*charstack)); + } + charstack[ncharstack++] = (char)ch; +} + +static int tos_char_stack(void) +{ + if(!ncharstack) + return 0; + else + return (int)(charstack[ncharstack-1] & 0xff); +} + +static char *get_char_stack(void) +{ + return charstack; +} + +/* + * Unicode character stack. + * Used for general scanner. + */ +static int nunicharstack = 0; +static int allocunicharstack = 0; +static WCHAR *unicharstack = NULL; + +static void empty_unichar_stack(void) +{ + nunicharstack = 0; +} + +static void push_unichar(int ch) +{ + if(nunicharstack == allocunicharstack) + { + allocunicharstack += 128; + unicharstack = xrealloc(unicharstack, allocunicharstack * sizeof(*unicharstack)); + } + unicharstack[nunicharstack++] = (WCHAR)ch; +} + +#if 0 +static int tos_unichar_stack(void) +{ + if(!nunicharstack) + return 0; + else + return (int)(unicharstack[nunicharstack-1] & 0xffff); +} +#endif + +static WCHAR *get_unichar_stack(void) +{ + return unicharstack; +} + +/* + * Number scanner + * + * state | ch | next state + * ------+-----------------+-------------------------- + * 0 | [0] | 1 + * 0 | [1-9] | 4 + * 0 | . | error (should never occur) + * 1 | [xX] | 2 + * 1 | [0-7] | 3 + * 1 | [89a-wyzA-WYZ_] | error invalid digit + * 1 | . | return 0 + * 2 | [0-9a-fA-F] | 2 + * 2 | [g-zG-Z_] | error invalid hex digit + * 2 | . | return (hex-number) if TOS != [xX] else error + * 3 | [0-7] | 3 + * 3 | [89a-zA-Z_] | error invalid octal digit + * 3 | . | return (octal-number) + * 4 | [0-9] | 4 + * 4 | [a-zA-Z_] | error invalid decimal digit + * 4 | . | return (decimal-number) + * + * All non-identifier characters [^a-zA-Z_0-9] terminate the scan + * and return the value. This is not entirely correct, but close + * enough (should check punctuators as trailing context, but the + * char_table is not adapted to that and it is questionable whether + * it is worth the trouble). + * All non-iso-8859-1 characters are an error. + */ +static int scan_number(int ch) +{ + int state = 0; + int base = 10; + empty_char_stack(); + + while(1) + { + if(!isisochar(ch)) + xyyerror("Invalid digit"); + + switch(state) + { + case 0: + if(isdigit(ch)) + { + push_char(ch); + if(ch == '0') + state = 1; + else + state = 4; + } + else + internal_error(__FILE__, __LINE__, "Non-digit in first number-scanner state"); + break; + case 1: + if(ch == 'x' || ch == 'X') + { + push_char(ch); + state = 2; + } + else if(ch >= '0' && ch <= '7') + { + push_char(ch); + state = 3; + } + else if(isalpha(ch) || ch == '_') + xyyerror("Invalid number digit"); + else + { + unget_unichar(ch); + yylval.num = 0; + return tNUMBER; + } + break; + case 2: + if(isxdigit(ch)) + push_char(ch); + else if(isalpha(ch) || ch == '_' || !isxdigit(tos_char_stack())) + xyyerror("Invalid hex digit"); + else + { + base = 16; + goto finish; + } + break; + case 3: + if(ch >= '0' && ch <= '7') + push_char(ch); + else if(isalnum(ch) || ch == '_') + xyyerror("Invalid octal digit"); + else + { + base = 8; + goto finish; + } + break; + case 4: + if(isdigit(ch)) + push_char(ch); + else if(isalnum(ch) || ch == '_') + xyyerror("Invalid decimal digit"); + else + { + base = 10; + goto finish; + } + break; + default: + internal_error(__FILE__, __LINE__, "Invalid state in number-scanner"); + } + ch = get_unichar(); + } +finish: + unget_unichar(ch); + push_char(0); + yylval.num = strtoul(get_char_stack(), NULL, base); + return tNUMBER; +} + +static void newline(void) +{ + line_number++; + char_number = 1; +} + +static int unisort(const void *p1, const void *p2) +{ + return unistricmp(((const token_t *)p1)->name, ((const token_t *)p2)->name); +} + +static token_t *tokentable = NULL; +static int ntokentable = 0; + +token_t *lookup_token(const WCHAR *s) +{ + token_t tok; + + tok.name = s; + return (token_t *)bsearch(&tok, tokentable, ntokentable, sizeof(*tokentable), unisort); +} + +void add_token(tok_e type, const WCHAR *name, int tok, int cp, const WCHAR *alias, int fix) +{ + ntokentable++; + tokentable = xrealloc(tokentable, ntokentable * sizeof(*tokentable)); + tokentable[ntokentable-1].type = type; + tokentable[ntokentable-1].name = name; + tokentable[ntokentable-1].token = tok; + tokentable[ntokentable-1].codepage = cp; + tokentable[ntokentable-1].alias = alias; + tokentable[ntokentable-1].fixed = fix; + qsort(tokentable, ntokentable, sizeof(*tokentable), unisort); +} + +void get_tokentable(token_t **tab, int *len) +{ + assert(tab != NULL); + assert(len != NULL); + *tab = tokentable; + *len = ntokentable; +} + +/* + * The scanner + * + */ +int yylex(void) +{ + static const WCHAR ustr_dot1[] = { '.', '\n', 0 }; + static const WCHAR ustr_dot2[] = { '.', '\r', '\n', 0 }; + static int isinit = 0; + int ch; + + if(!isinit) + { + isinit++; + set_codepage(WMC_DEFAULT_CODEPAGE); + add_token(tok_keyword, ustr_codepages, tCODEPAGE, 0, NULL, 0); + add_token(tok_keyword, ustr_facility, tFACILITY, 0, NULL, 1); + add_token(tok_keyword, ustr_facilitynames, tFACNAMES, 0, NULL, 1); + add_token(tok_keyword, ustr_language, tLANGUAGE, 0, NULL, 1); + add_token(tok_keyword, ustr_languagenames, tLANNAMES, 0, NULL, 1); + add_token(tok_keyword, ustr_messageid, tMSGID, 0, NULL, 1); + add_token(tok_keyword, ustr_messageidtypedef, tTYPEDEF, 0, NULL, 1); + add_token(tok_keyword, ustr_outputbase, tBASE, 0, NULL, 1); + add_token(tok_keyword, ustr_severity, tSEVERITY, 0, NULL, 1); + add_token(tok_keyword, ustr_severitynames, tSEVNAMES, 0, NULL, 1); + add_token(tok_keyword, ustr_symbolicname, tSYMNAME, 0, NULL, 1); + add_token(tok_severity, ustr_error, 0x03, 0, NULL, 0); + add_token(tok_severity, ustr_warning, 0x02, 0, NULL, 0); + add_token(tok_severity, ustr_informational, 0x01, 0, NULL, 0); + add_token(tok_severity, ustr_success, 0x00, 0, NULL, 0); + add_token(tok_facility, ustr_application, 0xFFF, 0, NULL, 0); + add_token(tok_facility, ustr_system, 0x0FF, 0, NULL, 0); + add_token(tok_language, ustr_english, 0x409, 437, ustr_msg00001, 0); + } + + empty_unichar_stack(); + + while(1) + { + if(want_line) + { + while((ch = get_unichar()) != '\n') + { + if(ch == EOF) + xyyerror("Unexpected EOF"); + push_unichar(ch); + } + newline(); + push_unichar(ch); + push_unichar(0); + if(!unistrcmp(ustr_dot1, get_unichar_stack()) || !unistrcmp(ustr_dot2, get_unichar_stack())) + { + want_line = 0; + /* Reset the codepage to our default after each message */ + set_codepage(WMC_DEFAULT_CODEPAGE); + return tMSGEND; + } + yylval.str = xunistrdup(get_unichar_stack()); + return tLINE; + } + + ch = get_unichar(); + + if(ch == EOF) + return EOF; + + if(ch == '\n') + { + newline(); + if(want_nl) + { + want_nl = 0; + return tNL; + } + continue; + } + + if(isisochar(ch)) + { + if(want_file) + { + int n = 0; + while(n < 8 && isisochar(ch)) + { + int t = char_table[ch]; + if((t & CH_PUNCT) || !(t & CH_SHORTNAME)) + break; + + push_unichar(ch); + n++; + ch = get_unichar(); + } + unget_unichar(ch); + push_unichar(0); + want_file = 0; + yylval.str = xunistrdup(get_unichar_stack()); + return tFILE; + } + + if(char_table[ch] & CH_IDENT) + { + token_t *tok; + while(isisochar(ch) && (char_table[ch] & (CH_IDENT|CH_NUMBER))) + { + push_unichar(ch); + ch = get_unichar(); + } + unget_unichar(ch); + push_unichar(0); + if(!(tok = lookup_token(get_unichar_stack()))) + { + yylval.str = xunistrdup(get_unichar_stack()); + return tIDENT; + } + switch(tok->type) [truncated at 1000 lines; 2256 more skipped]
19 years
1
0
0
0
[weiden] 19710: more light-weight gui consoles that don't double-buffer the console screen
by weiden@svn.reactos.com
more light-weight gui consoles that don't double-buffer the console screen Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.h _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-11-27 23:15:07 UTC (rev 19709) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-11-27 23:18:12 UTC (rev 19710) @@ -27,8 +27,6 @@ BOOL CursorBlinkOn; BOOL ForceCursorOff; CRITICAL_SECTION Lock; - HDC MemoryDC; - HBITMAP MemoryBitmap; RECT Selection; POINT SelectionStart; BOOL MouseDown; @@ -122,15 +120,6 @@ GuiData->CharHeight = Metrics.tmHeight + Metrics.tmExternalLeading; SelectObject(Dc, OldFont); - GuiData->MemoryDC = CreateCompatibleDC(Dc); - GuiData->MemoryBitmap = CreateCompatibleBitmap(Dc, - Console->Size.X * GuiData->CharWidth, - Console->Size.Y * GuiData->CharHeight); - /* NOTE: Don't delete the "first bitmap", it's done in DeleteDC. */ - SelectObject(GuiData->MemoryDC, GuiData->MemoryBitmap); - /* NOTE: Don't delete stock font. */ - SelectObject(GuiData->MemoryDC, GuiData->Font); - ReleaseDC(hWnd, Dc); GuiData->CursorBlinkOn = TRUE; GuiData->ForceCursorOff = FALSE; @@ -249,150 +238,188 @@ } -VOID FASTCALL -GuiConsoleUpdateBitmap(HWND hWnd, RECT rc) +static VOID FASTCALL +GuiConsolePaint(PCSRSS_CONSOLE Console, + PGUI_CONSOLE_DATA GuiData, + HDC hDC, + PRECT rc) { - PCSRSS_CONSOLE Console; - PGUI_CONSOLE_DATA GuiData; - PCSRSS_SCREEN_BUFFER Buff; - HDC Dc; - ULONG TopLine, BottomLine, LeftChar, RightChar; - ULONG Line, Char, Start; - PBYTE From; - PWCHAR To; - BYTE LastAttribute, Attribute; - ULONG CursorX, CursorY, CursorHeight; - HBRUSH CursorBrush, OldBrush; + PCSRSS_SCREEN_BUFFER Buff; + ULONG TopLine, BottomLine, LeftChar, RightChar; + ULONG Line, Char, Start; + PBYTE From; + PWCHAR To; + BYTE LastAttribute, Attribute; + ULONG CursorX, CursorY, CursorHeight; + HBRUSH CursorBrush, OldBrush; + HFONT OldFont; - GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); - if (NULL != Console && NULL != GuiData && NULL != Console->ActiveBuffer) + Buff = Console->ActiveBuffer; + + TopLine = rc->top / GuiData->CharHeight; + BottomLine = (rc->bottom + (GuiData->CharHeight - 1)) / GuiData->CharHeight - 1; + LeftChar = rc->left / GuiData->CharWidth; + RightChar = (rc->right + (GuiData->CharWidth - 1)) / GuiData->CharWidth - 1; + LastAttribute = Buff->Buffer[(TopLine * Buff->MaxX + LeftChar) * 2 + 1]; + + GuiConsoleSetTextColors(hDC, + LastAttribute); + + EnterCriticalSection(&Buff->Header.Lock); + + OldFont = SelectObject(hDC, + GuiData->Font); + + for (Line = TopLine; Line <= BottomLine; Line++) { - Buff = Console->ActiveBuffer; - EnterCriticalSection(&Buff->Header.Lock); - Dc = GetDC(hWnd); - if (rc.right <= rc.left || rc.bottom <= rc.top) + if (Line + Buff->ShowY < Buff->MaxY) { - ReleaseDC(hWnd, Dc); - LeaveCriticalSection(&Buff->Header.Lock); - return; + From = Buff->Buffer + ((Line + Buff->ShowY) * Buff->MaxX + LeftChar) * 2; } + else + { + From = Buff->Buffer + + ((Line - (Buff->MaxY - Buff->ShowY)) * Buff->MaxX + LeftChar) * 2; + } + Start = LeftChar; + To = GuiData->LineBuffer; - EnterCriticalSection(&GuiData->Lock); - - TopLine = rc.top / GuiData->CharHeight; - BottomLine = (rc.bottom + (GuiData->CharHeight - 1)) / GuiData->CharHeight - 1; - LeftChar = rc.left / GuiData->CharWidth; - RightChar = (rc.right + (GuiData->CharWidth - 1)) / GuiData->CharWidth - 1; - LastAttribute = Buff->Buffer[(TopLine * Buff->MaxX + LeftChar) * 2 + 1]; - GuiConsoleSetTextColors(GuiData->MemoryDC, LastAttribute); - - for (Line = TopLine; Line <= BottomLine; Line++) + for (Char = LeftChar; Char <= RightChar; Char++) { - if (Line + Buff->ShowY < Buff->MaxY) + if (*(From + 1) != LastAttribute) { - From = Buff->Buffer + ((Line + Buff->ShowY) * Buff->MaxX + LeftChar) * 2; - } - else - { - From = Buff->Buffer + - ((Line - (Buff->MaxY - Buff->ShowY)) * Buff->MaxX + LeftChar) * 2; - } - Start = LeftChar; - To = GuiData->LineBuffer; - for (Char = LeftChar; Char <= RightChar; Char++) - { - if (*(From + 1) != LastAttribute) + TextOutW(hDC, + Start * GuiData->CharWidth, + Line * GuiData->CharHeight, + GuiData->LineBuffer, + Char - Start); + Start = Char; + To = GuiData->LineBuffer; + Attribute = *(From + 1); + if (Attribute != LastAttribute) { - TextOutW(GuiData->MemoryDC, Start * GuiData->CharWidth, Line * GuiData->CharHeight, - GuiData->LineBuffer, Char - Start); - Start = Char; - To = GuiData->LineBuffer; - Attribute = *(From + 1); - if (Attribute != LastAttribute) - { - GuiConsoleSetTextColors(GuiData->MemoryDC, Attribute); - LastAttribute = Attribute; - } + GuiConsoleSetTextColors(hDC, + Attribute); + LastAttribute = Attribute; } - MultiByteToWideChar(Console->OutputCodePage, 0, (PCHAR)From, 1, To, 1); - To++; - From += 2; } - TextOutW(GuiData->MemoryDC, Start * GuiData->CharWidth, Line * GuiData->CharHeight, - GuiData->LineBuffer, RightChar - Start + 1); + + MultiByteToWideChar(Console->OutputCodePage, + 0, + (PCHAR)From, + 1, + To, + 1); + To++; + From += 2; } - if (Buff->CursorInfo.bVisible && GuiData->CursorBlinkOn - &&! GuiData->ForceCursorOff) + TextOutW(hDC, + Start * GuiData->CharWidth, + Line * GuiData->CharHeight, + GuiData->LineBuffer, + RightChar - Start + 1); + } + + if (Buff->CursorInfo.bVisible && GuiData->CursorBlinkOn && + !GuiData->ForceCursorOff) + { + GuiConsoleGetLogicalCursorPos(Buff, + &CursorX, + &CursorY); + if (LeftChar <= CursorX && CursorX <= RightChar && + TopLine <= CursorY && CursorY <= BottomLine) { - GuiConsoleGetLogicalCursorPos(Buff, &CursorX, &CursorY); - if (LeftChar <= CursorX && CursorX <= RightChar && - TopLine <= CursorY && CursorY <= BottomLine) + CursorHeight = (GuiData->CharHeight * Buff->CursorInfo.dwSize) / 100; + if (CursorHeight < 1) { - CursorHeight = (GuiData->CharHeight * Buff->CursorInfo.dwSize) / 100; - if (CursorHeight < 1) - { - CursorHeight = 1; - } - From = Buff->Buffer + (Buff->CurrentY * Buff->MaxX + Buff->CurrentX) * 2 + 1; - CursorBrush = CreateSolidBrush(GuiConsoleRGBFromAttribute(*From)); - OldBrush = SelectObject(GuiData->MemoryDC, CursorBrush); - PatBlt(GuiData->MemoryDC, CursorX * GuiData->CharWidth, - CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), - GuiData->CharWidth, CursorHeight, PATCOPY); - SelectObject(GuiData->MemoryDC, OldBrush); - DeleteObject(CursorBrush); + CursorHeight = 1; } + From = Buff->Buffer + (Buff->CurrentY * Buff->MaxX + Buff->CurrentX) * 2 + 1; + CursorBrush = CreateSolidBrush(GuiConsoleRGBFromAttribute(*From)); + OldBrush = SelectObject(hDC, + CursorBrush); + PatBlt(hDC, + CursorX * GuiData->CharWidth, + CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + GuiData->CharWidth, + CursorHeight, + PATCOPY); + SelectObject(hDC, + OldBrush); + DeleteObject(CursorBrush); } + } - LeaveCriticalSection(&GuiData->Lock); - ReleaseDC(hWnd, Dc); - LeaveCriticalSection(&Buff->Header.Lock); - InvalidateRect(hWnd, &rc, FALSE); - } + LeaveCriticalSection(&Buff->Header.Lock); + + SelectObject(hDC, + OldFont); } -VOID FASTCALL -GuiConsoleHandlePaint(HWND hWnd) +static VOID FASTCALL +GuiConsoleHandlePaint(HWND hWnd, HDC hDCPaint) { - PAINTSTRUCT Ps; - HDC Dc; - PCSRSS_CONSOLE Console; - PGUI_CONSOLE_DATA GuiData; + RECT rcUpdate; + HDC hDC; + PAINTSTRUCT ps; + PCSRSS_CONSOLE Console; + PGUI_CONSOLE_DATA GuiData; - GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); - if (NULL != Console && NULL != GuiData) + if (GetUpdateRect(hWnd, + &rcUpdate, + FALSE)) { - EnterCriticalSection(&GuiData->Lock); - Dc = BeginPaint (hWnd, &Ps); - BitBlt(Dc, Ps.rcPaint.left, Ps.rcPaint.top, - Ps.rcPaint.right - Ps.rcPaint.left + 1, - Ps.rcPaint.bottom - Ps.rcPaint.top + 1, GuiData->MemoryDC, - Ps.rcPaint.left, Ps.rcPaint.top, SRCCOPY); + hDC = (hDCPaint != NULL ? hDCPaint : BeginPaint(hWnd, + &ps)); + if (hDC != NULL) + { + GuiConsoleGetDataPointers(hWnd, + &Console, + &GuiData); + if (Console != NULL && GuiData != NULL && + Console->ActiveBuffer != NULL) + { + EnterCriticalSection(&GuiData->Lock); - if (GuiData->Selection.left != -1) - { - RECT rc = GuiData->Selection; + GuiConsolePaint(Console, + GuiData, + hDC, + &rcUpdate); - rc.left *= GuiData->CharWidth; - rc.top *= GuiData->CharHeight; - rc.right *= GuiData->CharWidth; - rc.bottom *= GuiData->CharHeight; + if (GuiData->Selection.left != -1) + { + RECT rc = GuiData->Selection; - if (IntersectRect(&rc, &Ps.rcPaint, &rc)) - { - PatBlt(Dc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, DSTINVERT); - } - } + rc.left *= GuiData->CharWidth; + rc.top *= GuiData->CharHeight; + rc.right *= GuiData->CharWidth; + rc.bottom *= GuiData->CharHeight; - EndPaint (hWnd, &Ps); - LeaveCriticalSection(&GuiData->Lock); + /* invert the selection */ + if (IntersectRect(&rc, + &rcUpdate, + &rc)) + { + PatBlt(hDC, + rc.left, + rc.top, + rc.right - rc.left, + rc.bottom - rc.top, + DSTINVERT); + } + } + + LeaveCriticalSection(&GuiData->Lock); + } + + if (hDCPaint == NULL) + { + EndPaint(hWnd, + &ps); + } + } } - else - { - Dc = BeginPaint (hWnd, &Ps); - EndPaint (hWnd, &Ps); - } } static VOID FASTCALL @@ -427,7 +454,7 @@ RegionRect.right = (Region->right + 1) * GuiData->CharWidth; RegionRect.bottom = (Region->bottom + 1) * GuiData->CharHeight; - GuiConsoleUpdateBitmap(Wnd, RegionRect); + InvalidateRect(Wnd, &RegionRect, FALSE); } static VOID STDCALL @@ -435,12 +462,10 @@ { PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData; - if (NULL == Console->hWindow || NULL == GuiData) + if (NULL != Console->hWindow && NULL != GuiData) { - return; + GuiIntDrawRegion(GuiData, Console->hWindow, Region); } - - GuiIntDrawRegion(GuiData, Console->hWindow, Region); } static VOID FASTCALL @@ -463,7 +488,7 @@ PGUI_CONSOLE_DATA GuiData = (PGUI_CONSOLE_DATA) Console->PrivateData; PCSRSS_SCREEN_BUFFER Buff = Console->ActiveBuffer; LONG CursorEndX, CursorEndY; - RECT Source, Dest; + RECT Source, ScrollRect; if (NULL == Console->hWindow || NULL == GuiData) { @@ -476,12 +501,12 @@ Source.top = ScrolledLines; Source.right = Console->Size.X - 1; Source.bottom = ScrolledLines + Region->top - 1; - Dest.left = 0; - Dest.top = 0; - Dest.right = Console->Size.X - 1; - Dest.bottom = Region->top - 1; + ScrollRect.left = 0; + ScrollRect.top = 0; + ScrollRect.right = Console->Size.X * GuiData->CharWidth; + ScrollRect.bottom = Region->top * GuiData->CharHeight; - GuiConsoleCopyRegion(Console->hWindow, &Source, &Dest); + InvalidateRect(Console->hWindow, &ScrollRect, FALSE); } GuiIntDrawRegion(GuiData, Console->hWindow, Region); @@ -595,7 +620,6 @@ GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); KillTimer(hWnd, 1); Console->PrivateData = NULL; - DeleteDC(GuiData->MemoryDC); DeleteCriticalSection(&GuiData->Lock); HeapFree(Win32CsrApiHeap, 0, GuiData); } @@ -742,7 +766,7 @@ Result = (LRESULT) GuiConsoleHandleNcCreate(hWnd, (CREATESTRUCTW *) lParam); break; case WM_PAINT: - GuiConsoleHandlePaint(hWnd); + GuiConsoleHandlePaint(hWnd, (HDC)wParam); break; case WM_KEYDOWN: case WM_KEYUP: @@ -1058,30 +1082,4 @@ return STATUS_SUCCESS; } -VOID STDCALL -GuiConsoleCopyRegion(HWND hWnd, - RECT *Source, - RECT *Dest) -{ - RECT ScrollRect; - PGUI_CONSOLE_DATA GuiData; - PCSRSS_CONSOLE Console; - - - GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); - - ScrollRect.left = Dest->left * GuiData->CharWidth; - ScrollRect.right = (Dest->right + 1) * GuiData->CharWidth; - ScrollRect.top = Dest->top * GuiData->CharHeight; - ScrollRect.bottom = (Dest->bottom + 1) * GuiData->CharHeight; - EnterCriticalSection(&GuiData->Lock); - BitBlt(GuiData->MemoryDC, ScrollRect.left, ScrollRect.top, - ScrollRect.right - ScrollRect.left, ScrollRect.bottom - ScrollRect.top, - GuiData->MemoryDC, Source->left * GuiData->CharWidth, Source->top * GuiData->CharHeight, SRCCOPY); - - LeaveCriticalSection(&GuiData->Lock); - - InvalidateRect(hWnd, &ScrollRect, FALSE); -} - /* EOF */ _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.h --- trunk/reactos/subsys/csrss/win32csr/guiconsole.h 2005-11-27 23:15:07 UTC (rev 19709) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.h 2005-11-27 23:18:12 UTC (rev 19710) @@ -8,12 +8,6 @@ #include "api.h" -extern NTSTATUS FASTCALL GuiInitConsole(PCSRSS_CONSOLE Console); -extern VOID STDCALL GuiConsoleDrawRegion(PCSRSS_CONSOLE Console, SMALL_RECT Region); -extern VOID STDCALL GuiConsoleCopyRegion(HWND hWnd, - RECT *Source, - RECT *Dest); -extern VOID STDCALL GuiConsoleChangeTitle(PCSRSS_CONSOLE Console); -extern VOID STDCALL GuiConsoleDeleteConsole(PCSRSS_CONSOLE Console); +NTSTATUS FASTCALL GuiInitConsole(PCSRSS_CONSOLE Console); /*EOF*/
19 years
1
0
0
0
[turner] 19709: fall back to .default values aren't found. ntclose -> zwclose thanks to thomas.
by turner@svn.reactos.com
fall back to .default values aren't found. ntclose -> zwclose thanks to thomas. Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-27 23:04:51 UTC (rev 19708) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-27 23:15:07 UTC (rev 19709) @@ -985,12 +985,23 @@ InitializeObjectAttributes(&KeyAttributes, &Key, OBJ_CASE_INSENSITIVE, CurrentUserKey, NULL); ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); - NtClose(CurrentUserKey); + ZwClose(CurrentUserKey); /* read the tile value in the registry */ Status = ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation, 0, 0, &ResLength); + /* fall back to .DEFAULT if we didnt find values */ + if(Status == STATUS_INVALID_HANDLE) + { + RtlInitUnicodeString (&KeyPath,L"\\Registry\\User\\.Default\\Control Panel\\Desktop"); + InitializeObjectAttributes(&KeyAttributes, &KeyPath, OBJ_CASE_INSENSITIVE, + NULL, NULL); + ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation, + 0, 0, &ResLength); + } + ResLength += sizeof(KEY_VALUE_PARTIAL_INFORMATION); KeyValuePartialInfo = ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); Length = ResLength; @@ -1005,7 +1016,7 @@ (PVOID)KeyValuePartialInfo, Length, &ResLength); if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { - NtClose(KeyHandle); + ZwClose(KeyHandle); ExFreePool(KeyValuePartialInfo); return 0; } @@ -1032,7 +1043,7 @@ if(!KeyValuePartialInfo) { - NtClose(KeyHandle); + ZwClose(KeyHandle); return 0; } @@ -1040,7 +1051,7 @@ (PVOID)KeyValuePartialInfo, Length, &ResLength); if(!NT_SUCCESS(Status) || (KeyValuePartialInfo->Type != REG_SZ)) { - NtClose(KeyHandle); + ZwClose(KeyHandle); ExFreePool(KeyValuePartialInfo); return 0; } @@ -1066,7 +1077,7 @@ WinStaObject->WallpaperMode = wmStretch; } - NtClose(KeyHandle); + ZwClose(KeyHandle); break; } case SPI_GETDESKWALLPAPER:
19 years
1
0
0
0
[royce] 19708: move xml.h/cpp and ssprintf.h/cpp up a directory, make both rbuild and buildno use these same files
by royce@svn.reactos.com
move xml.h/cpp and ssprintf.h/cpp up a directory, make both rbuild and buildno use these same files Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.mak Deleted: trunk/reactos/tools/buildno/exception.cpp Deleted: trunk/reactos/tools/buildno/exception.h Deleted: trunk/reactos/tools/buildno/ssprintf.cpp Deleted: trunk/reactos/tools/buildno/ssprintf.h Deleted: trunk/reactos/tools/buildno/xml.cpp Deleted: trunk/reactos/tools/buildno/xml.h Modified: trunk/reactos/tools/rbuild/rbuild.dsp Modified: trunk/reactos/tools/rbuild/rbuild.mak Deleted: trunk/reactos/tools/rbuild/ssprintf.cpp Deleted: trunk/reactos/tools/rbuild/ssprintf.h Deleted: trunk/reactos/tools/rbuild/xml.cpp Deleted: trunk/reactos/tools/rbuild/xml.h Added: trunk/reactos/tools/ssprintf.cpp Added: trunk/reactos/tools/ssprintf.h Modified: trunk/reactos/tools/tools.mak Added: trunk/reactos/tools/xml.cpp Added: trunk/reactos/tools/xml.h _____ Modified: trunk/reactos/tools/buildno/buildno.cpp --- trunk/reactos/tools/buildno/buildno.cpp 2005-11-27 23:04:05 UTC (rev 19707) +++ trunk/reactos/tools/buildno/buildno.cpp 2005-11-27 23:04:51 UTC (rev 19708) @@ -29,7 +29,6 @@ #include <string.h> #include "version.h" #include "xml.h" -#include "exception.h" #define FALSE 0 #define TRUE 1 @@ -179,20 +178,19 @@ try { - Path path; XMLElement *head; try { - head = XMLLoadFile(".svn/entries", path); + head = XMLLoadFile(".svn/entries"); } - catch(FileNotFoundException) + catch(XMLFileNotFoundException) { - head = XMLLoadFile("_svn/entries", path); + head = XMLLoadFile("_svn/entries"); } XMLElement *entries = head->subElements[0]; for (size_t i = 0; i < entries->subElements.size(); i++) - { + { XMLElement *entry = entries->subElements[i]; if ("entry" == entry->name) { _____ Modified: trunk/reactos/tools/buildno/buildno.mak --- trunk/reactos/tools/buildno/buildno.mak 2005-11-27 23:04:05 UTC (rev 19707) +++ trunk/reactos/tools/buildno/buildno.mak 2005-11-27 23:04:51 UTC (rev 19708) @@ -20,38 +20,26 @@ BUILDNO_SOURCES = $(addprefix $(BUILDNO_BASE_), \ buildno.cpp \ - exception.cpp \ - ssprintf.cpp \ - xml.cpp \ ) BUILDNO_OBJECTS = \ - $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) + $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) -BUILDNO_HOST_CXXFLAGS = -Iinclude/reactos $(TOOLS_CPPFLAGS) +BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS) BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS) -$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) | $(BUILDNO_OUT) +.PHONY: buildno +buildno: $(BUILDNO_TARGET) + +$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(XML_SSPRINTF_OBJECTS) | $(BUILDNO_OUT) $(ECHO_LD) - ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $@ + ${host_gpp} $^ $(BUILDNO_HOST_LFLAGS) -o $@ $(BUILDNO_INT_)buildno.o: $(BUILDNO_BASE_)buildno.cpp | $(BUILDNO_INT) $(ECHO_CC) ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ -$(BUILDNO_INT_)exception.o: $(BUILDNO_BASE_)exception.cpp | $(BUILDNO_INT) - $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ - -$(BUILDNO_INT_)ssprintf.o: $(BUILDNO_BASE_)ssprintf.cpp | $(BUILDNO_INT) - $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ - -$(BUILDNO_INT_)xml.o: $(BUILDNO_BASE_)xml.cpp | $(BUILDNO_INT) - $(ECHO_CC) - ${host_gpp} $(BUILDNO_HOST_CXXFLAGS) -c $< -o $@ - .PHONY: buildno_clean buildno_clean: -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) _____ Deleted: trunk/reactos/tools/buildno/exception.cpp --- trunk/reactos/tools/buildno/exception.cpp 2005-11-27 23:04:05 UTC (rev 19707) +++ trunk/reactos/tools/buildno/exception.cpp 2005-11-27 23:04:51 UTC (rev 19708) @@ -1,178 +0,0 @@ -#include "pch.h" - -#ifdef RBUILD -#include "rbuild.h" -#else -#include "exception.h" -#include "ssprintf.h" -#endif - -using std::string; - -Exception::Exception () -{ -} - -Exception::Exception ( const string& message ) -{ - Message = message; -} - -Exception::Exception ( const char* format, - ...) -{ - va_list args; - va_start ( args, - format); - Message = ssvprintf ( format, - args); - va_end ( args ); -} - -void Exception::SetMessage ( const char* message, - va_list args) -{ - Message = ssvprintf ( message, - args); -} - - -OutOfMemoryException::OutOfMemoryException () - : Exception ( "Out of memory" ) -{ -} - - -InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber ) -{ - Message = ssprintf ( "%s:%d", - filename, - linenumber ); -} - -InvalidOperationException::InvalidOperationException ( const char* filename, - const int linenumber, - const char* message, - ... ) -{ - string errorMessage; - va_list args; - va_start ( args, - message ); - errorMessage = ssvprintf ( message, - args ); - va_end ( args ); - Message = ssprintf ( "%s:%d %s", - filename, - linenumber, - errorMessage.c_str () ); -} - - -FileNotFoundException::FileNotFoundException ( const string& filename ) - : Exception ( "File '%s' not found.", - filename.c_str() ) -{ - Filename = filename; -} - - -AccessDeniedException::AccessDeniedException ( const string& filename) - : Exception ( "Access denied to file '%s'.", - filename.c_str() ) -{ - Filename = filename; -} - - -InvalidBuildFileException::InvalidBuildFileException ( const string& location, - const char* message, - ...) -{ - va_list args; - va_start ( args, - message ); - SetLocationMessage ( location, message, args ); - va_end ( args ); -} - -InvalidBuildFileException::InvalidBuildFileException () -{ -} - -void -InvalidBuildFileException::SetLocationMessage ( const std::string& location, - const char* message, - va_list args ) -{ - Message = location + ": " + ssvprintf ( message, args ); -} - -XMLSyntaxErrorException::XMLSyntaxErrorException ( const string& location, - const char* message, - ... ) -{ - va_list args; - va_start ( args, - message ); - SetLocationMessage ( location, message, args ); - va_end ( args ); -} - - -RequiredAttributeNotFoundException::RequiredAttributeNotFoundException ( - const string& location, - const string& attributeName, - const string& elementName ) - : InvalidBuildFileException ( location, - "Required attribute '%s' not found on '%s'.", - attributeName.c_str (), - elementName.c_str ()) -{ -} - -InvalidAttributeValueException::InvalidAttributeValueException ( - const string& location, - const string& name, - const string& value ) - : InvalidBuildFileException ( location, - "Attribute '%s' has an invalid value '%s'.", - name.c_str (), - value.c_str () ) -{ - -} - -BackendNameConflictException::BackendNameConflictException ( const string& name ) - : Exception ( "Backend name conflict: '%s'", - name.c_str() ) -{ -} - - -UnknownBackendException::UnknownBackendException ( const string& name ) - : Exception ( "Unknown Backend requested: '%s'", - name.c_str() ) -{ -} - - -UnknownModuleTypeException::UnknownModuleTypeException ( const string& location, - int moduletype ) - : InvalidBuildFileException ( location, - "module type requested: %i", - moduletype ) -{ -} - - -InvocationFailedException::InvocationFailedException ( const std::string& command, - int exitcode ) - : Exception ( "Failed to execute '%s' (exit code %d)", - command.c_str (), - exitcode ) -{ - Command = command; - ExitCode = exitcode; -} _____ Deleted: trunk/reactos/tools/buildno/exception.h --- trunk/reactos/tools/buildno/exception.h 2005-11-27 23:04:05 UTC (rev 19707) +++ trunk/reactos/tools/buildno/exception.h 2005-11-27 23:04:51 UTC (rev 19708) @@ -1,125 +0,0 @@ -#ifndef __EXCEPTION_H -#define __EXCEPTION_H - -#include "pch.h" - -class Exception -{ -public: - Exception ( const std::string& message ); - Exception ( const char* format, - ...); - std::string Message; -protected: - Exception (); - void SetMessage ( const char* message, - va_list args); -}; - - -class InvalidOperationException : public Exception -{ -public: - InvalidOperationException ( const char* filename, - const int linenumber); - InvalidOperationException ( const char* filename, - const int linenumber, - const char* message, - ... ); -}; - - -class OutOfMemoryException : public Exception -{ -public: - OutOfMemoryException (); -}; - - -class FileNotFoundException : public Exception -{ -public: - FileNotFoundException ( const std::string& filename ); - std::string Filename; -}; - - -class AccessDeniedException : public Exception -{ -public: - AccessDeniedException ( const std::string& filename ); - std::string Filename; -}; - -class InvalidBuildFileException : public Exception -{ -public: - InvalidBuildFileException ( const std::string& location, - const char* message, - ...); - void SetLocationMessage ( const std::string& location, - const char* message, - va_list args ); -protected: - InvalidBuildFileException (); -}; - - -class XMLSyntaxErrorException : public InvalidBuildFileException -{ -public: - XMLSyntaxErrorException ( const std::string& location, - const char* message, - ... ); -}; - - -class RequiredAttributeNotFoundException : public InvalidBuildFileException -{ -public: - RequiredAttributeNotFoundException ( const std::string& location, - const std::string& attributeName, - const std::string& elementName ); -}; - - -class InvalidAttributeValueException : public InvalidBuildFileException -{ -public: - InvalidAttributeValueException ( const std::string& location, - const std::string& name, - const std::string& value ); -}; - - -class BackendNameConflictException : public Exception -{ -public: - BackendNameConflictException ( const std::string& name ); -}; - - -class UnknownBackendException : public Exception -{ -public: - UnknownBackendException ( const std::string& name ); -}; - -class UnknownModuleTypeException : public InvalidBuildFileException -{ -public: - UnknownModuleTypeException ( const std::string& location, - int moduletype ); -}; - - -class InvocationFailedException : public Exception -{ -public: - InvocationFailedException ( const std::string& command, - int exitcode ); - std::string Command; - int ExitCode; -}; - -#endif /* __EXCEPTION_H */ _____ Deleted: trunk/reactos/tools/buildno/ssprintf.cpp --- trunk/reactos/tools/buildno/ssprintf.cpp 2005-11-27 23:04:05 UTC (rev 19707) +++ trunk/reactos/tools/buildno/ssprintf.cpp 2005-11-27 23:04:51 UTC (rev 19708) @@ -1,1931 +0,0 @@ -// ssprintf.cpp - -#include "pch.h" - -#ifdef __FreeBSD__ -# include <stdlib.h> -#else -# include <malloc.h> -#endif // __FreeBSD__ -#include <math.h> -#include <float.h> -#include <assert.h> -#include "ssprintf.h" - -#ifdef __FreeBSD__ -# define __isnan isnan -# define __finite finite -# define powl __builtin_powl -# define modfl __builtin_modfl -#endif // _FreeBSD__ - -#ifdef _MSC_VER -#define alloca _alloca -#endif//_MSC_VER - -#ifdef _MSC_VER -typedef __int64 LONGLONG; -typedef unsigned __int64 ULONGLONG; -#else -typedef long long LONGLONG; -typedef unsigned long long ULONGLONG; -#endif - -typedef struct { - unsigned int mantissa:23; - unsigned int exponent:8; - unsigned int sign:1; -} ieee_float_t; - -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; -} ieee_double_t; - -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:32; - unsigned int exponent:15; - unsigned int sign:1; - unsigned int empty:16; -} ieee_long_double_t; - -std::string -ssprintf ( const char* fmt, ... ) -{ - va_list arg; - va_start(arg, fmt); - std::string f = ssvprintf ( fmt, arg ); - va_end(arg); - return f; -} - -std::wstring -sswprintf ( const wchar_t* fmt, ... ) -{ - va_list arg; - va_start(arg, fmt); - std::wstring f = sswvprintf ( fmt, arg ); - va_end(arg); - return f; -} - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define ZEROTRUNC 128 /* truncate zero 's */ - - -static int -skip_atoi(const char **s) -{ - int i=0; - - while (isdigit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - -static int -skip_wtoi(const wchar_t **s) -{ - int i=0; - - while (iswdigit(**s)) - i = i*10 + *((*s)++) - L'0'; - return i; -} - - -static int -do_div(LONGLONG *n,int base) -{ - int __res = ((ULONGLONG) *n) % (unsigned) base; - *n = ((ULONGLONG) *n) / (unsigned) base; - return __res; -} - - -static bool -number(std::string& f, LONGLONG num, int base, int size, int precision ,int type) -{ - char c,sign,tmp[66]; - const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; - int i; - - if (type & LARGE) - digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++]='0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - f += ' '; - if (sign) - f += sign; - if (type & SPECIAL) - { - if (base==8) - f += '0'; - else if (base==16) - { - f += '0'; - f += digits[33]; - } - } - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - while (i < precision--) - { - f += '0'; - } - while (i-- > 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += ' '; - } - return true; -} - -static bool -wnumber(std::wstring& f, LONGLONG num, int base, int size, int precision ,int type) -{ - wchar_t c,sign,tmp[66]; - const wchar_t *digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; - int i; - - if (type & LARGE) - digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = L'-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = L'+'; - size--; - } else if (type & SPACE) { - sign = L' '; - - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++]=L'0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - f += L' '; - if (sign) - f += sign; - if (type & SPECIAL) - { - if (base==8) - f += L'0'; - else if (base==16) - { - f += L'0'; - f += digits[33]; - } - } - if (!(type & LEFT)) - { - while (size-- > 0) - f += c; - } - while (i < precision--) - { - f += L'0'; - } - while (i-- > 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += L' '; - } - return true; -} - - -static bool -numberf(std::string& f, double __n, char exp_sign, int size, int precision, int type) -{ - double exponent = 0.0; - double e; - long ie; - - //int x; - char *buf, *tmp; - int i = 0; - int j = 0; - //int k = 0; - - double frac, intr; - double p; - char sign; - char c; - char ro = 0; - int result; - - union - { - double* __n; - ieee_double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - exponent = ie/3.321928; - } - - if ( exp_sign == 'g' || exp_sign == 'G' ) { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - } - - if ( exp_sign == 'e' || exp_sign == 'E' ) { - frac = modf(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type); - if (result < 0) - return false; - f += exp_sign; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = number(f,ie, 10,2, 2,type ); - if (result < 0) - return false; - return true; - } - - if ( exp_sign == 'f' ) { - buf = (char*)alloca(4096); - if (type & LEFT) { - type &= ~ZEROPAD; - } - - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (__n < 0) { - sign = '-'; - __n = fabs(__n); - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - - frac = modf(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - - if ( precision > 0 ) { - //frac = modfl(__n,&intr); - i = precision-1; - while ( i >= 0 ) { - frac*=10.0L; - frac = modf(frac, &p); - buf[i] = (int)p + '0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) { - ro = 1; - } - - if ( precision >= 1 || type & SPECIAL) { - buf[i++] = '.'; - size--; - } - } - - if ( intr == 0.0 ) { - buf[i++] = '0'; - size--; - } - else { - while ( intr > 0.0 ) { - p = intr; - intr/=10.0L; - modf(intr, &intr); - - p -= 10.0*intr; - - buf[i++] = (int)p + '0'; - size--; - } - } - - j = 0; - while ( j < i && ro == 1) { - if ( buf[j] >= '0' && buf[j] <= '8' ) { - buf[j]++; - ro = 0; - } - else if ( buf[j] == '9' ) { - buf[j] = '0'; - } - j++; - } - if ( ro == 1 ) - buf[i++] = '1'; - - buf[i] = 0; - - size -= precision; - if (!(type&(ZEROPAD+LEFT))) - { - while(size-->0) - f += ' '; - } - if (sign) - { - f += sign; - } - - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - { - f += ' '; - } - if (type & SPECIAL) { - } - - if (!(type & LEFT)) - while (size-- > 0) - { - f += c; - } - - tmp = buf; - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) - { - j = 0; - while ( j < i && ( *tmp == '0' || *tmp == '.' )) - { - tmp++; - i--; - } - } -// else -// while (i < precision--) -// putc('0', f); - while (i-- > 0) - { - f += tmp[i]; - } - while (size-- > 0) - { - f += ' '; - } - } - return true; -} - -static bool -wnumberf(std::wstring& f, double __n, wchar_t exp_sign, int size, int precision, int type) -{ - double exponent = 0.0; - double e; - long ie; - - int i = 0; - int j = 0; - - double frac, intr; - double p; - wchar_t *buf, *tmp, sign, c, ro = 0; - int result; - - union - { - double* __n; - ieee_double_t* n; - } n; - - n.__n = &__n; - - if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - exponent = ie/3.321928; - } - - if ( exp_sign == L'g' || exp_sign == L'G' ) - { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - } - - if ( exp_sign == L'e' || exp_sign == L'E' ) - { - frac = modf(exponent,&e); - if ( frac > 0.5 ) - e++; - else if ( frac < -0.5 ) - e--; - - result = wnumberf(f,__n/pow(10.0L,e),L'f',size-4, precision, type); - if (result < 0) - return false; - f += exp_sign; - size--; - ie = (long)e; - type = LEFT | PLUS; - if ( ie < 0 ) - type |= SIGN; - - result = wnumber(f,ie, 10,2, 2,type ); - if (result < 0) - return false; - return true; - } - - if ( exp_sign == L'f' ) - { - buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); - if (type & LEFT) - type &= ~ZEROPAD; - - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) - { - if (__n < 0) - { - sign = L'-'; - __n = fabs(__n); - size--; - } - else if (type & PLUS) - { - sign = L'+'; - size--; - } - else if (type & SPACE) - { - sign = L' '; - size--; - } - } - - frac = modf(__n,&intr); - - // # flags forces a . and prevents trucation of trailing zero's - - if ( precision > 0 ) { - //frac = modfl(__n,&intr); - i = precision-1; - while ( i >= 0 ) { - frac*=10.0L; - frac = modf(frac, &p); - buf[i] = (int)p + L'0'; - i--; - } - i = precision; - size -= precision; - - ro = 0; - if ( frac > 0.5 ) { - ro = 1; - } - - if ( precision >= 1 || type & SPECIAL) { - buf[i++] = L'.'; - size--; - } - } - - if ( intr == 0.0 ) { - buf[i++] = L'0'; - size--; - } - else { - while ( intr > 0.0 ) { - p = intr; - intr/=10.0L; - modf(intr, &intr); - - p -= 10.0*intr; - - buf[i++] = (int)p + L'0'; - size--; - } - } - [truncated at 1000 lines; 5553 more skipped]
19 years
1
0
0
0
[gvg] 19707: Tell others to leave our port alone
by gvg@svn.reactos.com
Tell others to leave our port alone Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-27 23:01:38 UTC (rev 19706) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-27 23:04:05 UTC (rev 19707) @@ -1755,6 +1755,8 @@ /* Initialize the Port */ KdPortInitializeEx(&GdbPortInfo, 0, 0); + + KdpPort = GdbPortInfo.ComPort; } else if (BootPhase == 1) {
19 years
1
0
0
0
[royce] 19706: add simplified version of XMLLoadFile() - preparation to move up a directory
by royce@svn.reactos.com
add simplified version of XMLLoadFile() - preparation to move up a directory Modified: trunk/reactos/tools/rbuild/xml.cpp Modified: trunk/reactos/tools/rbuild/xml.h _____ Modified: trunk/reactos/tools/rbuild/xml.cpp --- trunk/reactos/tools/rbuild/xml.cpp 2005-11-27 22:59:20 UTC (rev 19705) +++ trunk/reactos/tools/rbuild/xml.cpp 2005-11-27 23:01:38 UTC (rev 19706) @@ -849,9 +849,10 @@ } XMLElement* -XMLLoadFile ( const string& filename, - const Path& path, - XMLIncludes& includes ) +XMLLoadFile ( + const string& filename, + const Path& path, + XMLIncludes& includes ) { XMLFile* f = new XMLFile(); @@ -909,3 +910,11 @@ } return head; } + +XMLElement* +XMLLoadFile ( const string& filename ) +{ + Path path; + XMLIncludes includes; + return XMLLoadFile ( filename, path, includes ); +} _____ Modified: trunk/reactos/tools/rbuild/xml.h --- trunk/reactos/tools/rbuild/xml.h 2005-11-27 22:59:20 UTC (rev 19705) +++ trunk/reactos/tools/rbuild/xml.h 2005-11-27 23:01:38 UTC (rev 19706) @@ -233,4 +233,7 @@ const Path& path, XMLIncludes& includes ); +XMLElement* +XMLLoadFile ( const std::string& filename ); + #endif // XML_H
19 years
1
0
0
0
[royce] 19705: remove dependance on rbuild's headers - preparation to move up a directory
by royce@svn.reactos.com
remove dependance on rbuild's headers - preparation to move up a directory Modified: trunk/reactos/tools/rbuild/ssprintf.cpp _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-27 22:45:01 UTC (rev 19704) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-27 22:59:20 UTC (rev 19705) @@ -13,7 +13,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "pch.h" #ifdef __FreeBSD__ # include <stdlib.h> @@ -305,7 +304,7 @@ double* __n; ieee_double_t* n; } n; - + n.__n = &__n; if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { @@ -496,7 +495,7 @@ double* __n; ieee_double_t* n; } n; - + n.__n = &__n; if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) { @@ -708,7 +707,7 @@ if ( exp_sign == 'g' || exp_sign == 'G' ) { type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) + if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E else exp_sign = 'f'; @@ -739,7 +738,7 @@ if ( exp_sign == 'f' ) { - + buf = (char*)alloca(4096); if (type & LEFT) { @@ -912,7 +911,7 @@ if ( exp_sign == L'g' || exp_sign == L'G' ) { type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) + if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E else exp_sign = 'f'; @@ -943,7 +942,7 @@ if ( exp_sign == L'f' ) { - + buf = (wchar_t*)alloca(4096*sizeof(wchar_t)); if (type & LEFT) { @@ -1486,7 +1485,7 @@ case 'G': if (qualifier == 'l' || qualifier == 'L' ) { _ldouble = va_arg(args, long double); - + if ( _isnanl(_ldouble) ) { f += "Nan"; @@ -1810,7 +1809,7 @@ if (qualifier == L'l' || qualifier == L'L' ) { _ldouble = va_arg(args, long double); - + if ( _isnanl(_ldouble) ) { f += L"Nan";
19 years
1
0
0
0
[weiden] 19704: fixed uninitialized variable warning
by weiden@svn.reactos.com
fixed uninitialized variable warning Modified: trunk/reactos/lib/syssetup/wizard.c _____ Modified: trunk/reactos/lib/syssetup/wizard.c --- trunk/reactos/lib/syssetup/wizard.c 2005-11-27 22:33:18 UTC (rev 19703) +++ trunk/reactos/lib/syssetup/wizard.c 2005-11-27 22:45:01 UTC (rev 19704) @@ -1570,7 +1570,7 @@ case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; - ULONG MaxProgress; + ULONG MaxProgress = 0; switch (lpnm->code) {
19 years
1
0
0
0
[weiden] 19703: Patch by encoded <samcharly@hotmail.com>:
by weiden@svn.reactos.com
Patch by encoded <samcharly(a)hotmail.com>: - added some Spanish translations Added: trunk/reactos/lib/cpl/appwiz/Es.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Added: trunk/reactos/lib/cpl/control/Es.rc Modified: trunk/reactos/lib/cpl/control/control.rc Added: trunk/reactos/lib/cpl/intl/Es.rc Modified: trunk/reactos/lib/cpl/intl/intl.rc Added: trunk/reactos/lib/cpl/ncpa/Es.rc Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc Added: trunk/reactos/lib/cpl/sysdm/es.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc Added: trunk/reactos/lib/shellext/slayer/Es.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc Modified: trunk/reactos/lib/syssetup/syssetup.rc Added: trunk/reactos/lib/syssetup/syssetup_Es.rc Added: trunk/reactos/lib/userenv/Es.rc Modified: trunk/reactos/lib/userenv/userenv.rc _____ Added: trunk/reactos/lib/cpl/appwiz/Es.rc --- trunk/reactos/lib/cpl/appwiz/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/appwiz/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,56 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Instalar/Desinstalar" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Para instalar un programa, presione instalar",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Instalar...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + LTEXT "El siguiente software puede ser removido automaticamente. Para remover un programa o modificar sus componentes instalados, seleccionalo en la lista y pulsa A±adir/Remover.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "A±adir/&Remover", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Configuraci¾n de ReactOs" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crear enlace" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1", -1, 115, 15, 160, 24 + LTEXT "Text2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Crear enlace" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Text1",-1,10,0,225,40 + LTEXT "Text2",-1,10,40,120,20 + LTEXT "Text3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "A±adir/Remover Programas" + IDS_CPLSYSTEMDESCRIPTION "Instala o Remueve programas." +END Property changes on: trunk/reactos/lib/cpl/appwiz/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -31,3 +31,5 @@ #include "Nl.rc" #include "Ru.rc" #include "Pl.rc" +#include "Es.rc" + _____ Added: trunk/reactos/lib/cpl/control/Es.rc --- trunk/reactos/lib/cpl/control/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/control/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,32 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Cerrar", IDM_CLOSE + END + POPUP "&View" + BEGIN + MENUITEM "Iconos Grandes", IDM_LARGEICONS + MENUITEM "Iconos Peque±os", IDM_SMALLICONS + MENUITEM "Lista", IDM_LIST + MENUITEM "Detalles", IDM_DETAILS + END + POPUP "Ayuda" + BEGIN + MENUITEM "Sobre", IDM_ABOUT + END +END + Property changes on: trunk/reactos/lib/cpl/control/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/control/control.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -41,4 +41,6 @@ #include "Pl.rc" #include "Ru.rc" #include "Sv.rc" +#include "Es.rc" #include "Hu.rc" + _____ Added: trunk/reactos/lib/cpl/intl/Es.rc --- trunk/reactos/lib/cpl/intl/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/intl/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,88 @@ +/* $Id: intl.rc 12852 2005-01-06 13:58:04Z mf $ */ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 1",-1,73,74,90,8 +END + + +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Numeros" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 2",-1,73,74,90,8 +END + + +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Moneda" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 3",-1,73,74,90,8 +END + + +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tiempo" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ejemplo de Apariencia", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Ejemplo de tiempo:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Formato de Tiempo:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Separador de Tiempo:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "SÝmbolo A&M:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + LTEXT "Formato de Notaci¾n del Tiempo\n\n" + "h = hora m = minuto s = segundo t = am ¾ pm\n\n" + "h = 12 houras\n" + "H = 24 houras\n\n" + "hh, mm, ss = cero inicial\n" + "h, m, s = sin cero inicial", + -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +END + + +IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Dia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Property Page 5",-1,73,74,90,8 +END + + +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Localidad" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Lenguaje Primario", -1, 8, 11, 228, 74 + ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON + LTEXT "Seleccione el lenguaje primario y la regi¾n que desea usar:", -1, 38, 25, 193, 22 + COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "Opciones Regionales" + IDS_CPLDESCRIPTION "Seleccione lenguaje y formato numerio, moneda, hora y fecha." +END Property changes on: trunk/reactos/lib/cpl/intl/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/intl/intl.rc --- trunk/reactos/lib/cpl/intl/intl.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/intl/intl.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -26,5 +26,7 @@ #include "de.rc" #include "nl.rc" #include "sv.rc" +#include "es.rc" #include "Ja.rc" #include "hu.rc" + _____ Added: trunk/reactos/lib/cpl/ncpa/Es.rc --- trunk/reactos/lib/cpl/ncpa/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/ncpa/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,93 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de la Red" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Adaptadores de la red",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&A±adir",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Remover",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Propiedades",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Connectarse Usando:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Los componentes marcados son utilizados por esta conecci¾n:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Descripci¾n", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "La Descripci¾n del componente va aqui...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Ense±ar icono de estatus cuando conectado", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Coneci¾n", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Estatus:", -1, 19, 20, 60, 8 + LTEXT "Duraci¾n:", -1, 19, 34, 60, 8 + LTEXT "Velocidad:", -1, 19, 48, 60, 8 + GROUPBOX "Actividad", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Enviado", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Recibido", -1, 149, 90, 37, 8 + LTEXT "Paquetes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Desabilitar", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Se pueden asignar las propiedades de IP automaticamente si su red apoya esta capacidad. Si no, debe contactar su administrador de red para los ajustes necesarios.", -1, 9, 9, 228, 27 + CONTROL "Obtener direcci¾n IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Usar la siguiente Direcci¾n IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "Direcci¾n IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",0,150,75-2,80,12 + LTEXT "Subnet mask:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",0,150,90-2,80,12 + LTEXT "Default gateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",0,150,105-2,80,12 + CONTROL "Obtener direcci¾n del servidor DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Usar las siguiente direcciones de DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Servidor DNS Preferido:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",0,150,171-2,80,12 + LTEXT "Servidor DNS Alterno:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",0,150,186-2,80,12 + PUSHBUTTON "&Avanzado", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +} + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Propiedades de la Red" + IDS_CPLSYSTEMDESCRIPTION "Cambia las opciones de la red." +END Property changes on: trunk/reactos/lib/cpl/ncpa/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc --- trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -24,5 +24,7 @@ #include "dk.rc" #include "nl.rc" #include "sv.rc" +#include "es.rc" #include "Ja.rc" #include "hu.rc" + _____ Added: trunk/reactos/lib/cpl/sysdm/es.rc --- trunk/reactos/lib/cpl/sysdm/es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/sysdm/es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,143 @@ +// Spanish language resource file +// React Operating System 2005 +// Samuel Serapi¾n Vega + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +RC_LICENSE RTDATA "resources/gpl.txt" + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Sistema Operativo",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PR OPSHEETPADDING,8 + LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3), PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "Versi¾n " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE( 4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + LTEXT "Computadora",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN -PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7) ,PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(8),PROPSHEETWI DTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(9),PROPSH EETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(10),PROPSHE ETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8 + + EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING,LABELLINE(13),PROPSHEETWIDTH-(2*PROPSHE ETPADDING),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING,ES_LEFT|WS_TAB STOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY +END + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Identificaci¾n en el Red" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "ReactOs utiliza la siguiente informaci¾n para identificar tu computadora en la red.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1)-5,PROPSHEETWIDTH-(6* PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + LTEXT "Nombre Completo del computador:",-1,PROPSHEETPADDING,LABELLINE(4)-4,17*PROPSHEETPADDING,LABE LLINE(4)-4 + LTEXT "(predeterminado)",IDC_COMPUTERNAME,17*PROPSHEETPADDING,LABELLINE(4)-5,6 0,LABELLINE(4)-5 + LTEXT "Grupo de Trabajo:",IDC_WORKGROUPDOMAIN,PROPSHEETPADDING,LABELLINE(6)-6,17*PROPSHE ETPADDING,LABELLINE(6)-6 + LTEXT "(vacio)",IDC_WORKGROUPDOMAIN_NAME,17*PROPSHEETPADDING,LABELLINE(6)-6,60 ,LABELLINE(6)-6 + LTEXT "Para usar el asistente de identificaci¾n del red unirse a un dominio o crear un usuario local, pulse Identificaci¾n de Red.",-1,PROPSHEETPADDING,LABELLINE(7)+5,PROPSHEETWIDTH-(12*PROPSHEETPAD DING)-ICONSIZE,LABELLINE(8)+5 + PUSHBUTTON "&Network ID...",IDC_NETWORK_ID,175,LABELLINE(7)+5,70,LABELLINE(1)+4 + LTEXT "Para renombrar la computadora o unirse a un dominio, pulse Propiedades.",-1,PROPSHEETPADDING,LABELLINE(11)+2,PROPSHEETWIDTH-(12*PRO PSHEETPADDING)-ICONSIZE,LABELLINE(12)+2 + PUSHBUTTON "&Propiedades...",IDC_NETWORK_PROPERTY,175,LABELLINE(11)+2,70,LABELLINE( 1)+4 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Hardware" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Asistente de Hardware",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPA DDING),LABELLINE(6)+PROPSHEETPADDING + LTEXT "El asistente de hardware the ayuda instalar, desinstalar, reparar, desconectar, expulsar, y configurar tu hardware.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH- (6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + PUSHBUTTON "&Asistente de Hardware...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LA BELLINE(5)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Administrador de Dispositivos",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPS HEETPADDING),LABELLINE(7)+2 + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON + LTEXT "The Device Manager lists all the hardware devices installed on your computer. Use the Device Manager to change the properties of any device.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + + PUSHBUTTON "&Administrador de Dispositivos...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-(17*PROPSHEE TPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14 + + GROUPBOX "Perfiles de Hardware",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEE TPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Los perfiles de hardware proveen una forma para que usted archive diferentes configuraciones de hardware.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDT H-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Perfiles Hard&ware ...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE (20)+2,(15*PROPSHEETPADDING),14 +END + +IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Perfiles de Usuarios" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING,LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Los perfiles de usuarios archivan el escritorio y otra informaci¾n relacionada a tu login. Un perfil diferente puede ser creado en cada computadora que utilize, o puede seleccionar un perfil movil que es igual en cada computadora que utilize.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-( 6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(4) + LTEXT "Perfiles archivados en esta computadora:",-1,PROPSHEETPADDING,LABELLINE(6),PROPSHEETWIDTH-(6*PROPSHE ETPADDING)-ICONSIZE,LABELLINE(1) + CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHO WSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING,LABEL LINE(8),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(11),WS_EX_CLIENTED GE + + PUSHBUTTON "Borrar",IDC_USERPROFILE_DELETE,PROPSHEETPADDING,LABELLINE(20),60,LABELL INE(1)+2 + PUSHBUTTON "Cambiar tipo...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,L ABELLINE(1)+2 + PUSHBUTTON "Copiar a...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING-60,LABELLINE( 20),60,LABELLINE(1)+2 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avanzado" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Funcionamiento",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Las opciones de funcionamiento controlan como los programas utilizan la memoria, lo cual afecta la velocidad de su computadora.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWID TH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Opciones de &funcionamiento...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABE LLINE(5)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "Variables de entorno",-1,PROPSHEETPADDING,LABELLINE(8)+2,PROPSHEETWIDTH-(2*PROPSHEETP ADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Las Variables de entorno le dicen a su computadora donde encontrar ciertos typo de informaci¾n.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-5,PROPSHEET WIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "Variables de &entorno...",IDC_ENVVAR,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLINE(1 2)+2,(18*PROPSHEETPADDING),14 + GROUPBOX "&Arranque y recuperaci¾n",-1,PROPSHEETPADDING,LABELLINE(15)+3,PROPSHEETWIDTH-(2*PROP SHEETPADDING),LABELLINE(6)+PROPSHEETPADDING + ICON IDI_DEVMGR, IDC_ICON1, (2*PROPSHEETPADDING),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON + LTEXT "Las opciones de Arranque y recuperaci¾n le dicen a su computadora como empezar y que hacer si un error cause que su computadora se detenga.",0,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH -(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3) + PUSHBUTTON "&Arranque y recuperaci¾n...",IDC_STAREC,PROPSHEETWIDTH-(20*PROPSHEETPADDING),LABELLI NE(19)+2,(18*PROPSHEETPADDING),14 +END + +IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Environment Variables" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Variables de Usuario",-1,7,12,238,100 + LTEXT "&Variables:",-1,14,24,224,8 + CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_S HOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS _TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "&Nuevas...",IDC_USER_VARIABLE_NEW,80,90,50,14 + PUSHBUTTON "&Editar...",IDC_USER_VARIABLE_EDIT,134,90,50,14 + PUSHBUTTON "&Borrar",IDC_USER_VARIABLE_DELETE,188,90,50,14 + + GROUPBOX "Variables del Systema",-1,7,116,238,100 + LTEXT "V&ariables:",-1,14,128,224,8 + CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS _SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL| WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE + PUSHBUTTON "Nu&evas...",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 + PUSHBUTTON "Ed&itar...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 + PUSHBUTTON "Bo&rrar",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 + + DEFPUSHBUTTON "Aceptar",IDOK,141,224,50,14,WS_GROUP + PUSHBUTTON "Cancelar",IDCANCEL,195,224,50,14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Editar Variable" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Nombre de Variable:",-1,7,14,50,8 + EDITTEXT IDC_VARIABLE_NAME,75,12,145,12,ES_AUTOHSCROLL + LTEXT "Valor Variable:",-1,7,32,50,8 + EDITTEXT IDC_VARIABLE_VALUE,75,30,145,12,ES_AUTOHSCROLL + + DEFPUSHBUTTON "Aceptar",IDOK,116,50,50,14,WS_GROUP + PUSHBUTTON "Cancelar",IDCANCEL,170,50,50,14 +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Systema" + IDS_CPLSYSTEMDESCRIPTION "Ver informaci¾n de su Computadora y cambiar varias opciones del systema." +END Property changes on: trunk/reactos/lib/cpl/sysdm/es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -22,5 +22,7 @@ #include "fr.rc" #include "nl.rc" #include "sv.rc" +#include "es.rc" #include "Ja.rc" #include "hu.rc" + _____ Added: trunk/reactos/lib/shellext/slayer/Es.rc --- trunk/reactos/lib/shellext/slayer/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/shellext/slayer/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,43 @@ +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Compatibilidad" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Si tiene problemas corriendo este programa en ReactOS, selecione un sistema operativo el cual ReactOS le reportara a la applicaci¾n.", -1, 7,7,210,31 + GROUPBOX "Modo de Compatibilidad", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Corre este programa en mode de compatibilidad para:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Ajuste de Pantalla", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Usar 256 colores", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Usar resoluci¾n 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Disabilitar temas visuales", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "E&ditar modos de compatibilidad...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Editar Modos de Compatibilidad" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "&A±adir...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&Editar...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "&Borrar", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&Aceptar", IDOK, 95,116,60,14 + PUSHBUTTON "&Cancelar", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Capa de extenci¾n de compatibilidad para applicaciones" +END + Property changes on: trunk/reactos/lib/shellext/slayer/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.rc --- trunk/reactos/lib/shellext/slayer/slayer.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/shellext/slayer/slayer.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -20,4 +20,6 @@ #include "Nl.rc" #include "Pl.rc" #include "Sv.rc" +#include "Es.rc" #include "Hu.rc" + _____ Modified: trunk/reactos/lib/syssetup/syssetup.rc --- trunk/reactos/lib/syssetup/syssetup.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/syssetup/syssetup.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -47,4 +47,6 @@ #include "syssetup_Fr.rc" #include "syssetup_Nl.rc" #include "syssetup_Ja.rc" +#include "syssetup_Es.rc" #include "syssetup_Hu.rc" + _____ Added: trunk/reactos/lib/syssetup/syssetup_Es.rc --- trunk/reactos/lib/syssetup/syssetup_Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/syssetup/syssetup_Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,203 @@ +/* + * Copyright (C) 2004 Filip Navara + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bienvenido al asistente de instalaci¾n the ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Este asistente instala ReactOS en tu computadora. El asistente "\ + "necesita recoger alguna informaci¾n sobre usted y su computadora "\ + "para configurar ReactOS apropiadamente.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Pulse Pr¾ximo para continuar la instalaci¾n.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The ReactOS developers would like to acknowledge the following Open Source projects, "\ + "(parts of) which were used to create ReactOS:", + IDC_STATIC,15,7,286,19 + LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | + LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LTEXT "ReactOS is licensed under the GPL, so if you want to reuse or redistribute "\ + "(parts of) it you must respect the GPL", + IDC_STATIC,15,110,227,19 + PUSHBUTTON "&View GPL...",IDC_VIEWGPL,251,110,50,19 + LTEXT "Click Next to continue with Setup.",IDC_STATIC,15,136, + 195,17 +END + + +IDD_OWNERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Escriba su nombre completo y el nombre de su Compa±ia u organizaci¾n.", + IDC_STATIC, 54, 7, 242, 21 + LTEXT "No&mbre:", IDC_STATIC, 54, 37, 44, 8 + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Organizaci¾n:", IDC_STATIC, 54, 57, 44, 8 + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL +END + + +IDD_COMPUTERPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Escriba un nombre para su computadora que sea de 63 characteres o menos. "\ + "Si se encuentra conectado a una red, el nombre debe ser unico.", + IDC_STATIC, 54, 7, 250, 24 + LTEXT "Nombre de la &Computadora:", IDC_STATIC, 54, 38, 75, 8 + EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + LTEXT "El instalador creara un perfil en su computadora llamado Administrator. "\ + "Puede utilizar este perfil si necesita acceso completo a su computadora.", + IDC_STATIC, 54, 57, 250, 25 + LTEXT "Escriba una contrase±a para este perfil de 14 characteres o menos.", + IDC_STATIC, 54, 87, 250, 8 + LTEXT "Contrase±a &Administrator:", IDC_STATIC, 54, 104, 75, 8 + EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirme contrase±a:", IDC_STATIC, 54, 123, 75, 8 + EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD +END + + +IDD_LOCALEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "La localidad del sistema de ser compatible con la de las aplicaciones "\ + "que usted desea usar. La localidad del usuario controla como se representan los numeros, "\ + "monedas, y fechas que aparecen en el sistema.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "<locale text>", IDC_LOCALETEXT, 53, 29, 250, 16 + LTEXT "Para cambiar la localidad del sistema o de los usuarios, pulse Modificar.", + IDC_STATIC, 53, 60, 184, 8 + PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + LTEXT "La disposici¾n de teclado controla los characteres que aparesen cuando usted escribe.", + IDC_STATIC, 53, 86, 253, 8 + LTEXT "<layout text>", IDC_LAYOUTTEXT, 53, 100, 250, 16 + LTEXT "Para cambiar la disposici¾n de teclad, pulse Modificar.", + IDC_STATIC, 53, 126, 184, 8 + PUSHBUTTON "&Modificar...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 +END + + +IDD_DATETIMEPAGE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fecha y Tiempo", IDC_STATIC, 53, 7, 253, 8 + CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 + LTEXT "Zona de tiempo", IDC_STATIC, 53, 42, 253, 8 + COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, + CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + AUTOCHECKBOX "Ajustar el reloj automaticamente en temporada de &ahorro de la luz del dÝa", + IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + + +IDD_PROCESSPAGE DIALOG 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Some text...", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Some more text...", IDC_STATIC, 53, 29, 253, 20 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 53, 70, 253, 8 +END + + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizaci¾n de la Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Terminando el asistente de Instalaci¾n de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Usted a terminado con Úxito la instalaci¾n de ReactOS.\n\n" \ + "Cuando Pulse Terminar, su computadora sera recargada.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Si hay un DC en su lector, remuevalo. Luego, recarge su computadora "\ + "pulse Terminar.", IDC_STATIC, 115, 169, 195, 17 +END + + +IDD_RESTART DIALOG 6, 18, 245, 116 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Instalaci¾n de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Usted a terminado con Úxito la instalaci¾n de ReactOS.", IDC_STATIC, 13, 12, 212, 16 + LTEXT "Para poder proseguir, el programa de instalaci¾n necesita recargar su computadora. "\ + "La computadora sera recargada automaticamente en 15 segundos o si presiona el "\ + "boton de recargar.", IDC_STATIC, 13, 33, 212, 32 +/* GROUPBOX "", -1, 7, 3, 231, 106 */ + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 13, 70, 212, 8 + PUSHBUTTON "&Recargar", IDOK, 98, 87, 50, 14 +END + + +IDD_GPL DIALOG 0, 0, 333, 230 +STYLE DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GPL_TEXT,7,7,319,190,ES_MULTILINE | ES_AUTOHSCROLL | + ES_READONLY | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,141,209,50,14 +END + + +STRINGTABLE +BEGIN + IDS_ACKTITLE "Acknowledgements" + IDS_ACKSUBTITLE "The shoulders ReactOS stands on and license information" + IDS_OWNERTITLE "Personalize your Software" + IDS_OWNERSUBTITLE "Setup uses this information about yourself to personalize ReactOS." + IDS_COMPUTERTITLE "Computer Name and Administrator Password" + IDS_COMPUTERSUBTITLE "You must provide a name and an Administrator Password for your computer." + IDS_LOCALETITLE "Regional settings" + IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." + IDS_DATETIMETITLE "Date and Time" + IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." + IDS_PROCESSTITLE "Process page title" + IDS_PROCESSSUBTITLE "Process page subtitle" +END + +/* EOF */ Property changes on: trunk/reactos/lib/syssetup/syssetup_Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/userenv/Es.rc --- trunk/reactos/lib/userenv/Es.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/userenv/Es.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2004 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* + *Spanish Language resource file + *ReactOs (c) 2005 Samuel Serapi¾n Vega + */ + +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH + +STRINGTABLE +BEGIN + IDS_PROFILEPATH "%SystemDrive%\\Opciones y Documentos" + IDS_APPDATA "Data de Aplicaci¾n" + IDS_DESKTOP "Escritorio" + IDS_FAVORITES "Favoritos" + IDS_STARTMENU "Menu de Inicio" + IDS_PROGRAMS "Menu de Inicio\\Programas" + IDS_ADMINTOOLS "Menu de Inicio\\Programas\\Herramientas Administrativas" + IDS_STARTUP "Menu de Inicio\\Programas\\Autoinicio" + IDS_MYDOCUMENTS "Mis Documentos" + IDS_MYPICTURES "Mis Documentos\\Mis Fotos" + IDS_MYMUSIC "Mis Documentos\\Mi M·sica" + IDS_MYVIDEOS "Mis Documentos\\Mis Videos" + IDS_TEMPLATES "Plantillas" + IDS_RECENT "Reciente" + IDS_SENDTO "Enviar a" + IDS_PRINTHOOD "Vecindario Inmpresi¾n" + IDS_NETHOOD "Vecindario Red" + IDS_LOCALSETTINGS "Opciones Locales" + IDS_LOCALAPPDATA "Opciones Locales\\Data de Aplicaci¾n" + IDS_TEMP "Opciones Locales\\Temp" + IDS_CACHE "Opciones Locales\\Archivos de Internet Temporales" + IDS_HISTORY "Opciones Locales\\Historia" + IDS_COOKIES "Cookies" + IDS_PROGRAMFILES "%SystemDrive%\\Archivos de Programas" +END Property changes on: trunk/reactos/lib/userenv/Es.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/userenv/userenv.rc --- trunk/reactos/lib/userenv/userenv.rc 2005-11-27 22:27:35 UTC (rev 19702) +++ trunk/reactos/lib/userenv/userenv.rc 2005-11-27 22:33:18 UTC (rev 19703) @@ -45,3 +45,5 @@ #include "Pl.rc" #include "Sv.rc" #include "Ru.rc" +#include "Es.rc" +
19 years
1
0
0
0
← Newer
1
...
6
7
8
9
10
11
12
...
88
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
Results per page:
10
25
50
100
200