Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[npwoods] 18198: Regedit: Implemented exporting specific branches

by npwoods＠svn.reactos.com

Regedit: Implemented exporting specific branches Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/regproc.h _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-01 19:01:07 UTC (rev 18197) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-02 01:21:43 UTC (rev 18198) @@ -294,31 +294,51 @@ static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - HWND hControl; + HWND hwndExportAll; + HWND hwndExportBranch; + HWND hwndExportBranchText; UINT_PTR iResult = 0; + OPENFILENAME *pOfn; + LPTSTR pszSelectedKey; + OFNOTIFY *pOfnNotify; switch(uiMsg) { case WM_INITDIALOG: - hControl = GetDlgItem(hdlg, IDC_EXPORT_ALL); - if (hControl) - { - EnableWindow(hControl, FALSE); - SendMessage(hControl, BM_SETCHECK, BST_CHECKED, 0); - } + pOfn = (OPENFILENAME *) lParam; + pszSelectedKey = (LPTSTR) pOfn->lCustData; - hControl = GetDlgItem(hdlg, IDC_EXPORT_BRANCH); - if (hControl) - { - EnableWindow(hControl, FALSE); - SendMessage(hControl, BM_SETCHECK, BST_UNCHECKED, 0); - } + hwndExportAll = GetDlgItem(hdlg, IDC_EXPORT_ALL); + if (hwndExportAll) + SendMessage(hwndExportAll, BM_SETCHECK, pszSelectedKey[0] ? BST_UNCHECKED : BST_CHECKED, 0); - hControl = GetDlgItem(hdlg, IDC_EXPORT_BRANCH_TEXT); - if (hControl) - { - EnableWindow(hControl, FALSE); + hwndExportBranch = GetDlgItem(hdlg, IDC_EXPORT_BRANCH); + if (hwndExportBranch) + SendMessage(hwndExportBranch, BM_SETCHECK, pszSelectedKey[0] ? BST_CHECKED : BST_UNCHECKED, 0); + + hwndExportBranchText = GetDlgItem(hdlg, IDC_EXPORT_BRANCH_TEXT); + if (hwndExportBranchText) + SetWindowText(hwndExportBranchText, pszSelectedKey); + break; + + case WM_NOTIFY: + if (((NMHDR *) lParam)->code == CDN_FILEOK) + { + pOfnNotify = (OFNOTIFY *) lParam; + pszSelectedKey = (LPTSTR) pOfnNotify->lpOFN->lCustData; + + hwndExportBranch = GetDlgItem(hdlg, IDC_EXPORT_BRANCH); + hwndExportBranchText = GetDlgItem(hdlg, IDC_EXPORT_BRANCH_TEXT); + if (hwndExportBranch && hwndExportBranchText + && (SendMessage(hwndExportBranch, BM_GETCHECK, 0, 0) == BST_CHECKED)) + { + GetWindowText(hwndExportBranchText, pszSelectedKey, _MAX_PATH); + } + else + { + pszSelectedKey[0] = '\0'; + } } - break; + break; } return iResult; } @@ -328,12 +348,18 @@ OPENFILENAME ofn; TCHAR ExportKeyPath[_MAX_PATH]; TCHAR Caption[128]; + HKEY hKeyRoot; + LPCTSTR pszKeyPath; - ExportKeyPath[0] = _T('\0'); + /* Figure out which key path we are exporting */ + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + RegKeyGetName(ExportKeyPath, sizeof(ExportKeyPath) / sizeof(ExportKeyPath[0]), + hKeyRoot, pszKeyPath); + InitOpenFileName(hWnd, &ofn); LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, sizeof(Caption)/sizeof(TCHAR)); ofn.lpstrTitle = Caption; - /* ofn.lCustData = ;*/ + ofn.lCustData = (LPARAM) ExportKeyPath; ofn.Flags = OFN_ENABLETEMPLATE | OFN_EXPLORER | OFN_ENABLEHOOK; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-01 19:01:07 UTC (rev 18197) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-02 01:21:43 UTC (rev 18198) @@ -1384,7 +1384,6 @@ if (file) { fclose(file); } - HeapFree(GetProcessHeap(), 0, reg_key_name); HeapFree(GetProcessHeap(), 0, val_buf); return TRUE; } @@ -1665,3 +1664,33 @@ return lResult; } +/********************************************************************** ******** + * Key naming and parsing + */ + +BOOL RegKeyGetName(LPTSTR pszDest, size_t iDestLength, HKEY hRootKey, LPCTSTR lpSubKey) +{ + LPCTSTR pszRootKey; + + if (hRootKey == HKEY_CLASSES_ROOT) + pszRootKey = TEXT("HKEY_CLASSES_ROOT"); + else if (hRootKey == HKEY_CURRENT_USER) + pszRootKey = TEXT("HKEY_CURRENT_USER"); + else if (hRootKey == HKEY_LOCAL_MACHINE) + pszRootKey = TEXT("HKEY_LOCAL_MACHINE"); + else if (hRootKey == HKEY_USERS) + pszRootKey = TEXT("HKEY_USERS"); + else if (hRootKey == HKEY_CURRENT_CONFIG) + pszRootKey = TEXT("HKEY_CURRENT_CONFIG"); + else if (hRootKey == HKEY_DYN_DATA) + pszRootKey = TEXT("HKEY_DYN_DATA"); + else + return FALSE; + + if (lpSubKey[0]) + _sntprintf(pszDest, iDestLength, TEXT("%s\\%s"), pszRootKey, lpSubKey); + else + _sntprintf(pszDest, iDestLength, TEXT("%s"), pszRootKey); + return TRUE; +} + _____ Modified: trunk/reactos/subsys/system/regedit/regproc.h --- trunk/reactos/subsys/system/regedit/regproc.h 2005-10-01 19:01:07 UTC (rev 18197) +++ trunk/reactos/subsys/system/regedit/regproc.h 2005-10-02 01:21:43 UTC (rev 18198) @@ -91,4 +91,9 @@ LONG RegRenameKey(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpNewName); LONG RegRenameValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpDestValue, LPCTSTR lpSrcValue); +/* + * Miscellaneous + */ +BOOL RegKeyGetName(LPTSTR pszDest, size_t iDestLength, HKEY hRootKey, LPCTSTR lpSubKey); + /* EOF */

19 years, 2 months

[weiden] 18197: fixed some memory leaks and build it as unicode by default

by weiden＠svn.reactos.com

fixed some memory leaks and build it as unicode by default Modified: trunk/reactos/apps/utils/net/route/route.c Modified: trunk/reactos/apps/utils/net/route/route.xml _____ Modified: trunk/reactos/apps/utils/net/route/route.c --- trunk/reactos/apps/utils/net/route/route.c 2005-10-01 18:41:02 UTC (rev 18196) +++ trunk/reactos/apps/utils/net/route/route.c 2005-10-01 19:01:07 UTC (rev 18197) @@ -22,69 +22,120 @@ int Usage() { - fprintf( stderr, - "route usage:\n" - "route print\n" - " prints the route table\n" - "route add <target> [mask <mask>] <gw> [metric <m>]\n" - " adds a route\n" - "route delete <target> <gw>\n" - " deletes a route\n" ); + _ftprintf( stderr, + _T("route usage:\n" + "route print\n" + " prints the route table\n" + "route add <target> [mask <mask>] <gw> [metric <m>]\n" + " adds a route\n" + "route delete <target> <gw>\n" + " deletes a route\n") ); return 1; } int PrintRoutes() { PMIB_IPFORWARDTABLE IpForwardTable = NULL; - PIP_ADAPTER_INFO pAdapterInfo = NULL; + PIP_ADAPTER_INFO pAdapterInfo; + ULONG Size = 0; DWORD Error = 0; - ULONG Size = 0; - ULONG adaptOutBufLen; + ULONG adaptOutBufLen = sizeof(IP_ADAPTER_INFO); TCHAR DefGate[16]; - char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF]; + TCHAR Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF]; unsigned int i; /* set required buffer size */ - pAdapterInfo = (IP_ADAPTER_INFO *) malloc( sizeof(IP_ADAPTER_INFO) ); - if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + pAdapterInfo = (IP_ADAPTER_INFO *) malloc( adaptOutBufLen ); + if (pAdapterInfo == NULL) + { + Error = ERROR_NOT_ENOUGH_MEMORY; + goto Error; + } + if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) + { + free (pAdapterInfo); pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); + if (pAdapterInfo == NULL) + { + Error = ERROR_NOT_ENOUGH_MEMORY; + goto Error; + } + } if( (GetIpForwardTable( NULL, &Size, TRUE )) == ERROR_INSUFFICIENT_BUFFER ) - IpForwardTable = malloc( Size ); + { + if (!(IpForwardTable = malloc( Size ))) + { + free(pAdapterInfo); + Error = ERROR_NOT_ENOUGH_MEMORY; + goto Error; + } + } - if ((Error = (GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR)) && - (Error = (GetIpForwardTable(IpForwardTable, &Size, TRUE) == NO_ERROR))) + if (((Error = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) == NO_ERROR) && + ((Error = GetIpForwardTable(IpForwardTable, &Size, TRUE)) == NO_ERROR)) { - _tcsncpy(DefGate, pAdapterInfo->GatewayList.IpAddress.String, 16); + _stprintf(DefGate, +#if UNICODE + _T("%hs"), +#else + _T("%s"), +#endif + pAdapterInfo->GatewayList.IpAddress.String); _tprintf(_T("=========================================================== ================\n")); _tprintf(_T("Interface List\n")); + /* FIXME - sort by the index! */ while (pAdapterInfo) { - _tprintf(_T("0x%lu ........................... %s\n"), pAdapterInfo->Index, pAdapterInfo->Description); + _tprintf(_T("0x%lu ........................... " +#if UNICODE + "%hs\n"), +#else + "%s\n"), +#endif + pAdapterInfo->Index, pAdapterInfo->Description); pAdapterInfo = pAdapterInfo->Next; } _tprintf(_T("=========================================================== ================\n")); _tprintf(_T("=========================================================== ================\n")); _tprintf(_T("Active Routes:\n")); - printf( "%-27s%-17s%-14s%-11s%-10s\n", - "Network Destination", - "Netmask", - "Gateway", - "Interface", - "Metric" ); + _tprintf( _T("%-27s%-17s%-14s%-11s%-10s\n"), + _T("Network Destination"), + _T("Netmask"), + _T("Gateway"), + _T("Interface"), + _T("Metric") ); for( i = 0; i < IpForwardTable->dwNumEntries; i++ ) { - strcpy( Destination, inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardDest) ) ); - strcpy( Netmask, inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardMask) ) ); - strcpy( Gateway, inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardNextHop) ) ); + _stprintf( Destination, +#if UNICODE + _T("%hs"), +#else + _T("%s"), +#endif + inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardDest) ) ); + _stprintf( Netmask, +#if UNICODE + _T("%hs"), +#else + _T("%s"), +#endif + inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardMask) ) ); + _stprintf( Gateway, +#if UNICODE + _T("%hs"), +#else + _T("%s"), +#endif + inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardNextHop) ) ); - printf( "%17s%17s%17s%16ld%9ld\n", - Destination, - Netmask, - Gateway, - IpForwardTable->table[i].dwForwardIfIndex, - IpForwardTable->table[i].dwForwardMetric1 ); + _tprintf( _T("%17s%17s%17s%16ld%9ld\n"), + Destination, + Netmask, + Gateway, + IpForwardTable->table[i].dwForwardIfIndex, + IpForwardTable->table[i].dwForwardMetric1 ); } _tprintf(_T("Default Gateway:%18s\n"), DefGate); _tprintf(_T("=========================================================== ================\n")); @@ -97,98 +148,159 @@ } else { - fprintf( stderr, "Route enumerate failed\n" ); +Error: + _ftprintf( stderr, _T("Route enumerate failed\n") ); return Error; } } int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, - int argc, char **argv ) { + int argc, TCHAR **argv ) { int i; +#if UNICODE + char addr[16]; +#endif if( argc > 1 ) + { +#if UNICODE + sprintf( addr, "%ls", argv[0] ); + RowToAdd->dwForwardDest = inet_addr( addr ); +#else RowToAdd->dwForwardDest = inet_addr( argv[0] ); +#endif + } else return FALSE; for( i = 1; i < argc; i++ ) { - if( !strcasecmp( argv[i], "mask" ) ) + if( !_tcscmp( argv[i], _T("mask") ) ) { i++; if( i >= argc ) return FALSE; +#if UNICODE + sprintf( addr, "%ls", argv[i] ); + RowToAdd->dwForwardDest = inet_addr( addr ); +#else RowToAdd->dwForwardMask = inet_addr( argv[i] ); +#endif } - else if( !strcasecmp( argv[i], "metric" ) ) + else if( !_tcscmp( argv[i], _T("metric") ) ) { i++; if( i >= argc ) return FALSE; - RowToAdd->dwForwardMetric1 = atoi( argv[i] ); + RowToAdd->dwForwardMetric1 = _ttoi( argv[i] ); } else + { +#if UNICODE + sprintf( addr, "%ls", argv[i] ); + RowToAdd->dwForwardNextHop = inet_addr( addr ); +#else RowToAdd->dwForwardNextHop = inet_addr( argv[i] ); +#endif + } } return TRUE; } -int add_route( int argc, char **argv ) { +int add_route( int argc, TCHAR **argv ) { MIB_IPFORWARDROW RowToAdd = { 0 }; DWORD Error; if( argc < 2 || !convert_add_cmd_line( &RowToAdd, argc, argv ) ) { - fprintf( stderr, - "route add usage:\n" - "route add <target> [mask <mask>] <gw> [metric <m>]\n" - " Adds a route to the IP route table.\n" - " <target> is the network or host to add a route to.\n" - " <mask> is the netmask to use (autodetected if unspecified)\n" - " <gw> is the gateway to use to access the network\n" - " <m> is the metric to use (lower is preferred)\n" ); + _ftprintf( stderr, + _T("route add usage:\n" + "route add <target> [mask <mask>] <gw> [metric <m>]\n" + " Adds a route to the IP route table.\n" + " <target> is the network or host to add a route to.\n" + " <mask> is the netmask to use (autodetected if unspecified)\n" + " <gw> is the gateway to use to access the network\n" + " <m> is the metric to use (lower is preferred)\n") ); return 1; } if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS ) return 0; - fprintf( stderr, "Route addition failed\n" ); + _ftprintf( stderr, _T("Route addition failed\n") ); return Error; } -int del_route( int argc, char **argv ) +int del_route( int argc, TCHAR **argv ) { MIB_IPFORWARDROW RowToDel = { 0 }; DWORD Error; if( argc < 2 || !convert_add_cmd_line( &RowToDel, argc, argv ) ) { - fprintf( stderr, - "route delete usage:\n" - "route delete <target> <gw>\n" - " Removes a route from the IP route table.\n" - " <target> is the network or host to add a route to.\n" - " <gw> is the gateway to remove the route from.\n" ); + _ftprintf( stderr, + _T("route delete usage:\n" + "route delete <target> <gw>\n" + " Removes a route from the IP route table.\n" + " <target> is the network or host to add a route to.\n" + " <gw> is the gateway to remove the route from.\n") ); return 1; } if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS ) return 0; - fprintf( stderr, "Route addition failed\n" ); + _ftprintf( stderr, _T("Route addition failed\n") ); return Error; } -int main( int argc, char **argv ) +int _tmain( int argc, TCHAR **argv ) { if( argc < 2 ) return Usage(); - else if ( !strcasecmp( argv[1], "print" ) ) + else if ( !_tcscmp( argv[1], _T("print") ) ) return PrintRoutes(); - else if( !strcasecmp( argv[1], "add" ) ) + else if( !_tcscmp( argv[1], _T("add") ) ) return add_route( argc-2, argv+2 ); - else if( !strcasecmp( argv[1], "delete" ) ) + else if( !_tcscmp( argv[1], _T("delete") ) ) return del_route( argc-2, argv+2 ); else return Usage(); } + +#if defined(_UNICODE) && defined(__GNUC__) +/* HACK - MINGW HAS NO OFFICIAL SUPPORT FOR wmain()!!! */ +int main( int argc, char **argv ) +{ + WCHAR **argvW; + int i, j, Ret = 1; + + if ((argvW = malloc(argc * sizeof(WCHAR*)))) + { + /* convert the arguments */ + for (i = 0, j = 0; i < argc; i++) + { + if (!(argvW[i] = malloc((strlen(argv[i]) + 1) * sizeof(WCHAR)))) + { + j++; + } + swprintf(argvW[i], L"%hs", argv[i]); + } + + if (j == 0) + { + /* no error converting the parameters, call wmain() */ + Ret = wmain(argc, argvW); + } + + /* free the arguments */ + for (i = 0; i < argc; i++) + { + if (argvW[i]) + free(argvW[i]); + } + free(argvW); + } + + return Ret; +} +#endif _____ Modified: trunk/reactos/apps/utils/net/route/route.xml --- trunk/reactos/apps/utils/net/route/route.xml 2005-10-01 18:41:02 UTC (rev 18196) +++ trunk/reactos/apps/utils/net/route/route.xml 2005-10-01 19:01:07 UTC (rev 18197) @@ -1,6 +1,8 @@ -<module name="route" type="win32cui" installbase="system32" installname="route.exe" allowwarnings="true"> +<module name="route" type="win32cui" installbase="system32" installname="route.exe"> <include base="route">.</include> <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>kernel32</library> <library>ws2_32</library> <library>iphlpapi</library>

19 years, 2 months

[gedmurphy] 18196: fix unused variable warning.

by gedmurphy＠svn.reactos.com

fix unused variable warning. free pointer before returning. Modified: trunk/reactos/apps/utils/net/route/route.c _____ Modified: trunk/reactos/apps/utils/net/route/route.c --- trunk/reactos/apps/utils/net/route/route.c 2005-10-01 18:14:17 UTC (rev 18195) +++ trunk/reactos/apps/utils/net/route/route.c 2005-10-01 18:41:02 UTC (rev 18196) @@ -20,7 +20,7 @@ #define IPBUF 17 #define IN_ADDR_OF(x) *((struct in_addr *)&(x)) -int usage() +int Usage() { fprintf( stderr, "route usage:\n" @@ -33,11 +33,11 @@ return 1; } -int print_routes() +int PrintRoutes() { PMIB_IPFORWARDTABLE IpForwardTable = NULL; PIP_ADAPTER_INFO pAdapterInfo = NULL; - DWORD Error; + DWORD Error = 0; ULONG Size = 0; ULONG adaptOutBufLen; TCHAR DefGate[16]; @@ -52,8 +52,8 @@ if( (GetIpForwardTable( NULL, &Size, TRUE )) == ERROR_INSUFFICIENT_BUFFER ) IpForwardTable = malloc( Size ); - if ((GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR) && - GetIpForwardTable( IpForwardTable, &Size, TRUE ) == NO_ERROR) + if ((Error = (GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR)) && + (Error = (GetIpForwardTable(IpForwardTable, &Size, TRUE) == NO_ERROR))) { _tcsncpy(DefGate, pAdapterInfo->GatewayList.IpAddress.String, 16); _tprintf(_T("=========================================================== ================\n")); @@ -90,7 +90,8 @@ _tprintf(_T("=========================================================== ================\n")); _tprintf(_T("Persistent Routes:\n")); - free( IpForwardTable ); + free(IpForwardTable); + free(pAdapterInfo); return ERROR_SUCCESS; } @@ -181,13 +182,13 @@ { if( argc < 2 ) - return usage(); + return Usage(); else if ( !strcasecmp( argv[1], "print" ) ) - return print_routes(); + return PrintRoutes(); else if( !strcasecmp( argv[1], "add" ) ) return add_route( argc-2, argv+2 ); else if( !strcasecmp( argv[1], "delete" ) ) return del_route( argc-2, argv+2 ); else - return usage(); + return Usage(); }

19 years, 2 months

[mf] 18195: add code comments

by mf＠svn.reactos.com

add code comments Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-01 18:13:33 UTC (rev 18194) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-01 18:14:17 UTC (rev 18195) @@ -549,9 +549,11 @@ XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); XS_String mdiStr = XMLString(explorer_options, "mdi"); + // If there isn't yet the "mdi" setting in the configuration, display MDI/SDI dialog. if (mdiStr.empty()) Dialog::DoModal(IDD_MDI_SDI, WINDOW_CREATOR(MdiSdiDlg), g_Globals._hwndDesktop); + // Now read the setting again and interpret it as boolean value. bool mdi = XMLBool(explorer_options, "mdi", true); // create main window

19 years, 2 months

[mf] 18194: MDI/SDI option dialog:

by mf＠svn.reactos.com

MDI/SDI option dialog: - pictures for illustration - remove resizable flag Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc Modified: trunk/reactos/subsys/system/explorer/explorer-ru.rc Modified: trunk/reactos/subsys/system/explorer/explorer-sv.rc Modified: trunk/reactos/subsys/system/explorer/explorer.dsp Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Added: trunk/reactos/subsys/system/explorer/res/mdi.bmp Added: trunk/reactos/subsys/system/explorer/res/sdi.bmp Modified: trunk/reactos/subsys/system/explorer/resource.h _____ Modified: trunk/reactos/subsys/system/explorer/explorer-cz.rc --- trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-01 15:47:40 UTC (rev 18193) +++ trunk/reactos/subsys/system/explorer/explorer-cz.rc 2005-10-01 18:13:33 UTC (rev 18194) @@ -362,18 +362,20 @@ PUSHBUTTON "&ZruÜit",IDCANCEL,151,153,50,14 END -IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Volba MDI / SDI m¾du" -FONT 8, "MS Sans Serif", 0, 0, 0x1 +FONT 8, "MS Sans Serif" BEGIN LTEXT "ProsÝm zvolte si Vßmi up°ednost?ovan² zp¨sob zobrazenÝ oken pr¨zkumnÝka:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (Mnoho dokumentov² interface)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,121,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL "&SDI (Jedno dokumentov² interface)",IDC_SDI,"Button", BS_AUTORADIOBUTTON,7,53,115,10 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 LTEXT "Toto nastavenÝ bude pou×ito jako implicitnÝ pro vÜechny okna pr¨zkumnÝka.", IDC_STATIC,7,76,174,22 DEFPUSHBUTTON "&Nastavit",IDOK,29,105,50,14,WS_GROUP _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-01 15:47:40 UTC (rev 18193) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-10-01 18:13:33 UTC (rev 18194) @@ -360,8 +360,8 @@ PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 END -IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW CAPTION "Choose MDI / SDI mode" FONT 8, "MS Sans Serif", 0, 0, 0x1 @@ -369,13 +369,15 @@ LTEXT "Please select your prefered explorer user interface:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (multiple document interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,121,10 + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,121,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL "&SDI (single document interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,53,115,10 + BS_AUTORADIOBUTTON,7,62,115,10 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 LTEXT "This setting will be used as default for all explorer windows in the future.", - IDC_STATIC,7,76,174,22 - DEFPUSHBUTTON "&OK",IDOK,29,105,50,14,WS_GROUP - PUSHBUTTON "&Cancel",IDCANCEL,106,105,50,14 + IDC_STATIC,7,91,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,117,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,106,117,50,14 END _____ Modified: trunk/reactos/subsys/system/explorer/explorer-es.rc --- trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-01 15:47:40 UTC (rev 18193) +++ trunk/reactos/subsys/system/explorer/explorer-es.rc 2005-10-01 18:13:33 UTC (rev 18194) @@ -1,491 +1,485 @@ -/* - * Explorer (Spanish resources) - * - * Copyright 2005 Patricio MartÝnez Ros - * - */ - -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include <windows.h> - -/////////////////////////////////////////////////////////////////////// ////// -#undef APSTUDIO_READONLY_SYMBOLS - -/////////////////////////////////////////////////////////////////////// ////// - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH -#pragma code_page(1252) -#endif //_WIN32 - -/////////////////////////////////////////////////////////////////////// ////// -// -// Menu -// - -IDM_MDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Salir", ID_FILE_EXIT - END - POPUP "&Ver" - BEGIN - MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR - MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR - MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR - MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Actualizar\tF5", ID_REFRESH - MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&SDI", ID_VIEW_SDI - END - POPUP "&Ventana" - BEGIN - MENUITEM "Nueva &Ventana", ID_WINDOW_NEW - MENUITEM "Cascada\tShift+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tShift+F4", ID_WINDOW_TILE_VERT - MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE - END - POPUP "&Tools" - BEGIN - MENUITEM "&Options", ID_TOOLS_OPTIONS - END - POPUP "A&yuda" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_DESKTOPBAR MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Configuracion...", ID_DESKTOPBAR_SETTINGS - MENUITEM "&Administrador de Tareas...", ID_TASKMGR - MENUITEM SEPARATOR - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_VOLUME MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "Abrir Control de Volumen", ID_TRAY_VOLUME - MENUITEM "Ajustar Propiedades de Audio", ID_VOLUME_PROPERTIES - END -END - -IDM_NOTIFYAREA MENU DISCARDABLE -BEGIN - POPUP "" - BEGIN - MENUITEM "&Mostrar iconos ocultos", ID_SHOW_HIDDEN_ICONS - MENUITEM "Mostrar &Bot¾n de Icono", ID_SHOW_ICON_BUTTON - MENUITEM "&Configurar Notificaciones...", ID_CONFIG_NOTIFYAREA - MENUITEM "Ajustar Fecha/&Hora...", ID_CONFIG_TIME - MENUITEM SEPARATOR - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - END -END - -IDM_SDIFRAME MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "S&alir", ID_FILE_EXIT - END - POPUP "&Ver" - BEGIN - MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED - MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Actualizar\tF5", ID_REFRESH - MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM "&MDI", ID_VIEW_MDI - END - POPUP "Herramientas" - BEGIN - MENUITEM "&Opciones", ID_TOOLS_OPTIONS - END - POPUP "&Ayuda" - BEGIN - MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ - MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER - MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS - END -END - -IDM_WINEFILE MENU DISCARDABLE -BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Abrir\tEnter", 101 - MENUITEM "&Mover...\tF7", 106 - MENUITEM "&Copiar...\tF8", 107 - MENUITEM "&en el Portapapeles...\tF9", 118 - MENUITEM "&Eliminar\tDel", 108 - MENUITEM "Re&nombrar...", 109 - MENUITEM "Prop&iedades...\tAlt+Enter", ID_EDIT_PROPERTIES - MENUITEM SEPARATOR - MENUITEM "C&omprimir...", 119 - MENUITEM "Desc&omprimir...", 120 - MENUITEM SEPARATOR - MENUITEM "&Ejecutar...", ID_EXECUTE - MENUITEM "&Imprimir...", 102 - MENUITEM "Asociar...", 103 - MENUITEM SEPARATOR - MENUITEM "Cr&ear Directorio...", ID_EXECUTE - MENUITEM "Busca&r...", 104 - MENUITEM "&Seleccionar Archivos...", 116 - MENUITEM SEPARATOR - MENUITEM "S&alir\tAlt+X", ID_FILE_EXIT - END - POPUP "&Disco" - BEGIN - MENUITEM "&Copiar Disco...", 201 - MENUITEM "&Etiqueta del Disco...", 202 - MENUITEM SEPARATOR - MENUITEM "&Formateart Disco...", 203 - MENUITEM SEPARATOR - MENUITEM "Conectar a &Unidad de Red", 252 - MENUITEM "&Desconectar Unidad de Red", 253 - MENUITEM SEPARATOR - MENUITEM "Guardar como...", 254 - MENUITEM "&Eliminar Guardado...", 255 - MENUITEM SEPARATOR - MENUITEM "&Seleccionar Unidad...", 251 - END - POPUP "&Directorios" - BEGIN - MENUITEM "&Siguiente Nivel\t+", 301 - MENUITEM "Expandir &Arbol\t*", 302 - MENUITEM "Expandir &Todo\tStrg+*", 303 - MENUITEM "Contraer &Arbol\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Marcar Hijos", 505 - END - POPUP "&Ver" - BEGIN - MENUITEM "A&rbol y Directorio", 413 - MENUITEM "Solo Arb&ol", 411 - MENUITEM "S&olo Directorio", 412 - MENUITEM SEPARATOR - MENUITEM "Sp&lit", 414 - MENUITEM SEPARATOR - MENUITEM "&Nombre", ID_VIEW_NAME - MENUITEM "&Todos Los Detalles del Archivo", ID_VIEW_ALL_ATTRIBUTES - , CHECKED - MENUITEM "Detalles &Parciales...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ordenar por Nombre", 404 - MENUITEM "Ordenar &por Tipo", 405 - MENUITEM "Ord&enar por Tama±o", 406 - MENUITEM "Or&denar por Fecha", 407 - MENUITEM SEPARATOR - MENUITEM "Ordenar por &...", 409 - END - POPUP "&Opciones" - BEGIN - MENUITEM "&Confirmacion...", 65535 - MENUITEM "&Fuente...", 65535 - MENUITEM "Personalizar la &Barra de Herramientas...", 65535 - MENUITEM SEPARATOR - MENUITEM "Barra de Herramien&tas", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "Barra de Uni&dades", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR - MENUITEM "Barra de E&stado", ID_VIEW_STATUSBAR, CHECKED - MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S", ID_VIEW_FULLSCREEN - MENUITEM SEPARATOR - MENUITEM "&SÝmbolo despuÚs de ejecutar", 65535 - MENUITEM "&Guardar cambios al salir", 511 - END - POPUP "&Seguridad" - BEGIN - MENUITEM "&Aceso...", 605 - MENUITEM "&Entrada...", 606 - MENUITEM "&Propietario...", 607 - END - POPUP "&Ventana" - BEGIN - MENUITEM "Nueva &Ventana", ID_WINDOW_NEW - MENUITEM "Cascada\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT - MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT - MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE - MENUITEM "&Actualizar\tF5", ID_REFRESH - END - POPUP "&?" - BEGIN - MENUITEM "&Temas de Ayuda\tF1", ID_HELP - MENUITEM "Ayuda y &Buscar...\tF1", ID_HELP - MENUITEM "&Usando la Ayuda\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "Info sobre &ArchivoWine...", ID_ABOUT_WINEFILE - END -END - - -/////////////////////////////////////////////////////////////////////// ////// -// -// Dialog -// - -IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ejecutar" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 - CONTROL "Orden:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, - 18,60,10 - EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL - CONTROL "Como &SÝmbolo",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, - 45,71,12 - DEFPUSHBUTTON "&Aceptar",1,158,6,47,14 - PUSHBUTTON "&Cancelar",2,158,23,47,14 - PUSHBUTTON "&Ayuda",254,158,43,47,14 -END - -IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Buscar Programa en el menu Inicio" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "&Filtro:",IDC_STATIC,7,9,23,8 - EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL - CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | - WS_TABSTOP,7,25,186,33 - PUSHBUTTON "&Marcar Entradas",IDC_CHECK_ENTRIES,136,7,57,14 -END - -IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades de Pantalla" -FONT 8, "MS Sans Serif" -BEGIN - LTEXT "Por favor seleccione su algoritmo de alineamiento preferido:", - IDC_STATIC,7,7,195,8 - CONTROL "izquierda/arriba abajo",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "izquierda/arriba derecha",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "derecha/arriba izquierda",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "derecha/arriba abajo",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "derecha/abajo arriba",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "izquierda/abajo derecha",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "derecha/abajo izquierda",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "derecha/abajo",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "borde inferior",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "borde H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "aproximado",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | - BS_BOTTOM | WS_TABSTOP,110,121,46,44 - CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | - WS_TABSTOP,159,121,46,44 - CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 -END - -IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades de la Barra de Tareas" -FONT 8, "MS Sans Serif" -BEGIN - CONTROL "Mostrar &Reloj",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,152,56,10 - CONTROL "&Ocultar iconos de notificacion inactivos", - ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,174,136,10 - PUSHBUTTON "&Notificaciones...",ID_CONFIG_NOTIFYAREA,145,173,64,14 -END - -IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 -STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Propiedades del Men· Inicio" -FONT 8, "MS Sans Serif" -BEGIN -END - -IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 -STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Configurar Iconos de Notificaciones" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | - TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 - LTEXT "&Texto de Info:",IDC_LABEL1,8,44,51,8 - EDITTEXT IDC_NOTIFY_TOOLTIP,82,42,117,14,ES_AUTOHSCROLL - LTEXT "TÝtulo de la V&entana:",IDC_LABEL2,8,63,70,8 - EDITTEXT IDC_NOTIFY_TITLE,82,60,117,14,ES_AUTOHSCROLL - LTEXT "&Parche del M¾dulo:",IDC_LABEL3,8,81,65,8 - EDITTEXT IDC_NOTIFY_MODULE,82,78,117,14,ES_AUTOHSCROLL - GROUPBOX "Modo de &Display",IDC_LABEL4,7,96,157,28 - CONTROL "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,15,108,38,10 - CONTROL "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, - 108,36,10 - CONTROL "A&utoocultar",IDC_NOTIFY_AUTOHIDE,"Button", - BS_AUTORADIOBUTTON,112,108,50,10 - ICON "",IDC_PICTURE,173,101,21,20 - LTEXT "?ltimo cambio:",IDC_LABEL6,7,132,50,8 - EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | - ES_READONLY - CONTROL "Mostrar Ocu&ltos",ID_SHOW_HIDDEN_ICONS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,154,64,10 - DEFPUSHBUTTON "&Aceptar",IDOK,91,153,50,14,WS_GROUP - PUSHBUTTON "&Cancelar",IDCANCEL,151,153,50,14 -END - -IDD_MDI_SDI DIALOGEX 0, 0, 188, 126 -STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -EXSTYLE WS_EX_APPWINDOW -CAPTION "Elegir modo MDI / SDI" -FONT 8, "MS Sans Serif", 0, 0, 0x1 -BEGIN - LTEXT "Por favor, seleccione su interfaz de usuario preferida para el explorador:", - IDC_STATIC,7,7,170,18 - CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", - BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,123,10 - CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", - BS_AUTORADIOBUTTON,7,53,116,10 - LTEXT "Esta configuraci¾n se usarß por defecto y apartir de ahora para todas las ventanas del explorador.", - IDC_STATIC,7,76,174,22 - DEFPUSHBUTTON "&Aceptar",IDOK,29,105,50,14,WS_GROUP - PUSHBUTTON "&Cancelar",IDCANCEL,106,105,50,14 -END - - -#ifdef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE MOVEABLE PURE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE MOVEABLE PURE -BEGIN - "#include <windows.h>\r\n" - "\0" -END - -3 TEXTINCLUDE MOVEABLE PURE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -/////////////////////////////////////////////////////////////////////// ////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_TITLE "ReactOS Explorer" - IDS_START "Iniciar" - IDS_LOGOFF "Salir..." - IDS_SHUTDOWN "Apagar..." - IDS_LAUNCH "Ejecutar..." - IDS_START_HELP "Ayuda" - IDS_SEARCH_FILES "Buscar..." - IDS_DOCUMENTS "Documentos" - IDS_FAVORITES "Favoritos" - IDS_PROGRAMS "Programas" - IDS_SETTINGS "Configuraci¾n" - IDS_EXPLORE "Explorar" - IDS_EMPTY "(VacÝo)" - IDS_RECENT "Documentos Recientes" - IDS_ADMIN "Administracion" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STARTMENU "Men· Inicio" - IDS_MINIMIZE_ALL "mimimizar todas las ventanas" - IDS_DESKTOP_NUM "Escritorio %d" - IDS_VOLUME "Volumen" - IDS_ITEMS_CUR "Objetos Actuales" - IDS_ITEMS_CONFIGURED "configuraci¾n" - IDS_ITEMS_VISIBLE "visible" - IDS_ITEMS_HIDDEN "oculto" - IDS_NOTIFY_SHOW "mostrar" - IDS_NOTIFY_HIDE "ocultar" - IDS_NOTIFY_AUTOHIDE "autoocultar" - IDS_SHOW_HIDDEN_ICONS "Mostrar iconos ocultos" - IDS_HIDE_ICONS "Ocultar iconos" - IDS_TERMINATE "Finalizar ROS Explorer" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NETWORK "Red" - IDS_CONNECTIONS "Conexiones de Red" - IDS_DRIVES "Unidades" - IDS_SEARCH_COMPUTER "Buscar PC..." - IDS_SETTINGS_MENU "Men·s de Configuraci¾n" - IDS_CONTROL_PANEL "Panel de Control" - IDS_PRINTERS "Impresoras" - IDS_BROWSE "Explorar Archivos" - IDS_SEARCH_PRG "Buscar Programas..." - IDS_ALL_USERS "Todos los Usuarios\\" - IDS_SEARCH "Buscar" - IDS_ABOUT_EXPLORER "&Acerca de Explorer..." - IDS_LAUNCH_MANY_PROGRAMS - "Ha seleccionado mßs de un programa.\n?Estß seguro de que desea ejecutarlos todos?" - IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio" - IDS_DESKTOP "Escritorio" - IDS_TASKBAR "Barra de Tareas" -END - -#endif // Spanish (Castilian) resources -/////////////////////////////////////////////////////////////////////// ////// - - - -#ifndef APSTUDIO_INVOKED -/////////////////////////////////////////////////////////////////////// ////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -/////////////////////////////////////////////////////////////////////// ////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// Spanish (Castilian) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Salir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Extra", ID_VIEW_EXTRA_BAR + MENUITEM "Barra de &Unidades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&SDI", ID_VIEW_SDI + END + POPUP "&Ventana" + BEGIN + MENUITEM "Nueva &Ventana", ID_WINDOW_NEW + MENUITEM "Cascada\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaico &Vertical\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT + MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE + END + POPUP "&Tools" + BEGIN + MENUITEM "&Options", ID_TOOLS_OPTIONS + END + POPUP "A&yuda" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Configuracion...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Administrador de Tareas...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Abrir Control de Volumen", ID_TRAY_VOLUME + MENUITEM "Ajustar Propiedades de Audio", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Mostrar iconos ocultos", ID_SHOW_HIDDEN_ICONS + MENUITEM "Mostrar &Bot¾n de Icono", ID_SHOW_ICON_BUTTON + MENUITEM "&Configurar Notificaciones...", ID_CONFIG_NOTIFYAREA + MENUITEM "Ajustar Fecha/&Hora...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "S&alir", ID_FILE_EXIT + END + POPUP "&Ver" + BEGIN + MENUITEM "&Barra de Herramientas", ID_VIEW_TOOL_BAR + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "Barra de &Estado", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Actualizar\tF5", ID_REFRESH + MENUITEM "P&antalla Completa\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "Herramientas" + BEGIN + MENUITEM "&Opciones", ID_TOOLS_OPTIONS + END + POPUP "&Ayuda" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Acerca de Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Acerca de &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_WINEFILE MENU DISCARDABLE +BEGIN + POPUP "&Archivo" + BEGIN + MENUITEM "&Abrir\tEnter", 101 + MENUITEM "&Mover...\tF7", 106 + MENUITEM "&Copiar...\tF8", 107 + MENUITEM "&en el Portapapeles...\tF9", 118 + MENUITEM "&Eliminar\tDel", 108 + MENUITEM "Re&nombrar...", 109 + MENUITEM "Prop&iedades...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "C&omprimir...", 119 + MENUITEM "Desc&omprimir...", 120 + MENUITEM SEPARATOR + MENUITEM "&Ejecutar...", ID_EXECUTE + MENUITEM "&Imprimir...", 102 + MENUITEM "Asociar...", 103 + MENUITEM SEPARATOR + MENUITEM "Cr&ear Directorio...", ID_EXECUTE + MENUITEM "Busca&r...", 104 + MENUITEM "&Seleccionar Archivos...", 116 + MENUITEM SEPARATOR + MENUITEM "S&alir\tAlt+X", ID_FILE_EXIT + END + POPUP "&Disco" + BEGIN + MENUITEM "&Copiar Disco...", 201 + MENUITEM "&Etiqueta del Disco...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formateart Disco...", 203 + MENUITEM SEPARATOR + MENUITEM "Conectar a &Unidad de Red", 252 + MENUITEM "&Desconectar Unidad de Red", 253 + MENUITEM SEPARATOR + MENUITEM "Guardar como...", 254 + MENUITEM "&Eliminar Guardado...", 255 + MENUITEM SEPARATOR + MENUITEM "&Seleccionar Unidad...", 251 + END + POPUP "&Directorios" + BEGIN + MENUITEM "&Siguiente Nivel\t+", 301 + MENUITEM "Expandir &Arbol\t*", 302 + MENUITEM "Expandir &Todo\tStrg+*", 303 + MENUITEM "Contraer &Arbol\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&Marcar Hijos", 505 + END + POPUP "&Ver" + BEGIN + MENUITEM "A&rbol y Directorio", 413 + MENUITEM "Solo Arb&ol", 411 + MENUITEM "S&olo Directorio", 412 + MENUITEM SEPARATOR + MENUITEM "Sp&lit", 414 + MENUITEM SEPARATOR + MENUITEM "&Nombre", ID_VIEW_NAME + MENUITEM "&Todos Los Detalles del Archivo", ID_VIEW_ALL_ATTRIBUTES + , CHECKED + MENUITEM "Detalles &Parciales...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ordenar por Nombre", 404 + MENUITEM "Ordenar &por Tipo", 405 + MENUITEM "Ord&enar por Tama±o", 406 + MENUITEM "Or&denar por Fecha", 407 + MENUITEM SEPARATOR + MENUITEM "Ordenar por &...", 409 + END + POPUP "&Opciones" + BEGIN + MENUITEM "&Confirmacion...", 65535 + MENUITEM "&Fuente...", 65535 + MENUITEM "Personalizar la &Barra de Herramientas...", 65535 + MENUITEM SEPARATOR + MENUITEM "Barra de Herramien&tas", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Barra de Uni&dades", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Barra &Lateral", ID_VIEW_SIDE_BAR + MENUITEM "Barra de E&stado", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Pantalla Com&pleta\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM SEPARATOR + MENUITEM "&SÝmbolo despuÚs de ejecutar", 65535 + MENUITEM "&Guardar cambios al salir", 511 + END + POPUP "&Seguridad" + BEGIN + MENUITEM "&Aceso...", 605 + MENUITEM "&Entrada...", 606 + MENUITEM "&Propietario...", 607 + END + POPUP "&Ventana" + BEGIN + MENUITEM "Nueva &Ventana", ID_WINDOW_NEW + MENUITEM "Cascada\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Mosaico &Horizontal", ID_WINDOW_TILE_HORZ + MENUITEM "Mosaico &Vertical\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT + MENUITEM "Agrupar &SÝmbolos", ID_WINDOW_ARRANGE + MENUITEM "&Actualizar\tF5", ID_REFRESH + END + POPUP "&?" + BEGIN + MENUITEM "&Temas de Ayuda\tF1", ID_HELP + MENUITEM "Ayuda y &Buscar...\tF1", ID_HELP + MENUITEM "&Usando la Ayuda\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Info sobre &ArchivoWine...", ID_ABOUT_WINEFILE + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ejecutar" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "Orden:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3,18, + 60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Como &SÝmbolo",214,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,3,45,71,12 + DEFPUSHBUTTON "&Aceptar",1,158,6,47,14 + PUSHBUTTON "&Cancelar",2,158,23,47,14 + PUSHBUTTON "&Ayuda",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Buscar Programa en el menu Inicio" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filtro:",IDC_STATIC,7,9,23,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Marcar Entradas",IDC_CHECK_ENTRIES,136,7,57,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de Pantalla" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Por favor seleccione su algoritmo de alineamiento preferido:", + IDC_STATIC,7,7,195,8 + CONTROL "izquierda/arriba abajo",IDC_ICON_ALIGN_0,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "izquierda/arriba derecha",IDC_ICON_ALIGN_1,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "derecha/arriba izquierda",IDC_ICON_ALIGN_2,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "derecha/arriba abajo",IDC_ICON_ALIGN_3,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "derecha/abajo arriba",IDC_ICON_ALIGN_4,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "izquierda/abajo derecha",IDC_ICON_ALIGN_5,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "derecha/abajo izquierda",IDC_ICON_ALIGN_6,"Button", + BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "derecha/abajo",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "borde inferior",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "borde H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "aproximado",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades de la Barra de Tareas" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Mostrar &Reloj",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,56,10 + CONTROL "&Ocultar iconos de notificacion inactivos", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,136,10 + PUSHBUTTON "&Notificaciones...",ID_CONFIG_NOTIFYAREA,145,173,64,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propiedades del Men· Inicio" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Configurar Iconos de Notificaciones" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Texto de Info:",IDC_LABEL1,8,44,51,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,82,42,117,14,ES_AUTOHSCROLL + LTEXT "TÝtulo de la V&entana:",IDC_LABEL2,8,63,70,8 + EDITTEXT IDC_NOTIFY_TITLE,82,60,117,14,ES_AUTOHSCROLL + LTEXT "&Parche del M¾dulo:",IDC_LABEL3,8,81,65,8 + EDITTEXT IDC_NOTIFY_MODULE,82,78,117,14,ES_AUTOHSCROLL + GROUPBOX "Modo de &Display",IDC_LABEL4,7,96,157,28 + CONTROL "&Mostrar",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,38,10 + CONTROL "&Ocultar",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON, + 66,108,36,10 + CONTROL "A&utoocultar",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,50,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "?ltimo cambio:",IDC_LABEL6,7,132,50,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "Mostrar Ocu&ltos",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,64,10 + DEFPUSHBUTTON "&Aceptar",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Cancelar",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 138 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Elegir modo MDI / SDI" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Por favor, seleccione su interfaz de usuario preferida para el explorador:", + IDC_STATIC,7,7,170,18 + CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,30,123,10 + CONTROL "&SDI (Single Document Interface)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,53,116,10 + LTEXT "Esta configuraci¾n se usarß por defecto y apartir de ahora para todas las ventanas del explorador.", + IDC_STATIC,7,76,174,22 + DEFPUSHBUTTON "&Aceptar",IDOK,29,105,50,14,WS_GROUP + PUSHBUTTON "&Cancelar",IDCANCEL,106,105,50,14 +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "Iniciar" + IDS_LOGOFF "Salir..." + IDS_SHUTDOWN "Apagar..." + IDS_LAUNCH "Ejecutar..." + IDS_START_HELP "Ayuda" + IDS_SEARCH_FILES "Buscar..." + IDS_DOCUMENTS "Documentos" + IDS_FAVORITES "Favoritos" + IDS_PROGRAMS "Programas" + IDS_SETTINGS "Configuraci¾n" + IDS_EXPLORE "Explorar" + IDS_EMPTY "(VacÝo)" + IDS_RECENT "Documentos Recientes" + IDS_ADMIN "Administracion" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Men· Inicio" + IDS_MINIMIZE_ALL "mimimizar todas las ventanas" + IDS_DESKTOP_NUM "Escritorio %d" + IDS_VOLUME "Volumen" + IDS_ITEMS_CUR "Objetos Actuales" + IDS_ITEMS_CONFIGURED "configuraci¾n" + IDS_ITEMS_VISIBLE "visible" [truncated at 1000 lines; 238 more skipped]

19 years, 2 months

[gedmurphy] 18193: Start to alter print output so it correctly simulates the MS 'route print'

by gedmurphy＠svn.reactos.com

Start to alter print output so it correctly simulates the MS 'route print' Modified: trunk/reactos/apps/utils/net/route/route.c _____ Modified: trunk/reactos/apps/utils/net/route/route.c --- trunk/reactos/apps/utils/net/route/route.c 2005-10-01 15:30:25 UTC (rev 18192) +++ trunk/reactos/apps/utils/net/route/route.c 2005-10-01 15:47:40 UTC (rev 18193) @@ -15,86 +15,116 @@ #include <windows.h> #include <iphlpapi.h> #include <winsock2.h> +#include <tchar.h> #define IPBUF 17 #define IN_ADDR_OF(x) *((struct in_addr *)&(x)) -int usage() { +int usage() +{ fprintf( stderr, - "route usage:\n" - "route print\n" - " prints the route table\n" - "route add <target> [mask <mask>] <gw> [metric <m>]\n" - " adds a route\n" - "route delete <target> <gw>\n" - " deletes a route\n" ); + "route usage:\n" + "route print\n" + " prints the route table\n" + "route add <target> [mask <mask>] <gw> [metric <m>]\n" + " adds a route\n" + "route delete <target> <gw>\n" + " deletes a route\n" ); return 1; } -int print_routes() { +int print_routes() +{ PMIB_IPFORWARDTABLE IpForwardTable = NULL; + PIP_ADAPTER_INFO pAdapterInfo = NULL; DWORD Error; ULONG Size = 0; + ULONG adaptOutBufLen; + TCHAR DefGate[16]; char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF]; unsigned int i; - if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) == - ERROR_INSUFFICIENT_BUFFER ) { - IpForwardTable = malloc( Size ); - Error = GetIpForwardTable( IpForwardTable, &Size, TRUE ); - } + /* set required buffer size */ + pAdapterInfo = (IP_ADAPTER_INFO *) malloc( sizeof(IP_ADAPTER_INFO) ); + if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_INSUFFICIENT_BUFFER) + pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen); - if( Error == ERROR_SUCCESS ) { - printf( "%-16s%-16s%-16s%-10s%-10s\n", - "Destination", - "Netmask", - "Gateway", - "Index", - "Metric" ); - for( i = 0; i < IpForwardTable->dwNumEntries; i++ ) { - strcpy( Destination, - inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i]. - dwForwardDest) ) ); - strcpy( Netmask, - inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i]. - dwForwardMask) ) ); - strcpy( Gateway, - inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i]. - dwForwardNextHop) ) ); + if( (GetIpForwardTable( NULL, &Size, TRUE )) == ERROR_INSUFFICIENT_BUFFER ) + IpForwardTable = malloc( Size ); - printf( "%-16s%-16s%-16s%-10ld%-10ld\n", - Destination, - Netmask, - Gateway, - IpForwardTable->table[i].dwForwardIfIndex, - IpForwardTable->table[i].dwForwardMetric1 ); - } + if ((GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen) == NO_ERROR) && + GetIpForwardTable( IpForwardTable, &Size, TRUE ) == NO_ERROR) + { + _tcsncpy(DefGate, pAdapterInfo->GatewayList.IpAddress.String, 16); + _tprintf(_T("=========================================================== ================\n")); + _tprintf(_T("Interface List\n")); + while (pAdapterInfo) + { + _tprintf(_T("0x%lu ........................... %s\n"), pAdapterInfo->Index, pAdapterInfo->Description); + pAdapterInfo = pAdapterInfo->Next; + } + _tprintf(_T("=========================================================== ================\n")); - free( IpForwardTable ); + _tprintf(_T("=========================================================== ================\n")); + _tprintf(_T("Active Routes:\n")); + printf( "%-27s%-17s%-14s%-11s%-10s\n", + "Network Destination", + "Netmask", + "Gateway", + "Interface", + "Metric" ); + for( i = 0; i < IpForwardTable->dwNumEntries; i++ ) + { + strcpy( Destination, inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardDest) ) ); + strcpy( Netmask, inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardMask) ) ); + strcpy( Gateway, inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].dwForwardNextHop) ) ); - return ERROR_SUCCESS; - } else { - fprintf( stderr, "Route enumerate failed\n" ); - return Error; + printf( "%17s%17s%17s%16ld%9ld\n", + Destination, + Netmask, + Gateway, + IpForwardTable->table[i].dwForwardIfIndex, + IpForwardTable->table[i].dwForwardMetric1 ); + } + _tprintf(_T("Default Gateway:%18s\n"), DefGate); + _tprintf(_T("=========================================================== ================\n")); + _tprintf(_T("Persistent Routes:\n")); + + free( IpForwardTable ); + + return ERROR_SUCCESS; } + else + { + fprintf( stderr, "Route enumerate failed\n" ); + return Error; + } } int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, - int argc, char **argv ) { + int argc, char **argv ) { int i; - if( argc > 1 ) RowToAdd->dwForwardDest = inet_addr( argv[0] ); - else return FALSE; - for( i = 1; i < argc; i++ ) { - if( !strcasecmp( argv[i], "mask" ) ) { - i++; if( i >= argc ) return FALSE; - RowToAdd->dwForwardMask = inet_addr( argv[i] ); - } else if( !strcasecmp( argv[i], "metric" ) ) { - i++; if( i >= argc ) return FALSE; - RowToAdd->dwForwardMetric1 = atoi( argv[i] ); - } else { - RowToAdd->dwForwardNextHop = inet_addr( argv[i] ); - } + if( argc > 1 ) + RowToAdd->dwForwardDest = inet_addr( argv[0] ); + else + return FALSE; + for( i = 1; i < argc; i++ ) + { + if( !strcasecmp( argv[i], "mask" ) ) + { + i++; if( i >= argc ) return FALSE; + RowToAdd->dwForwardMask = inet_addr( argv[i] ); + } + else if( !strcasecmp( argv[i], "metric" ) ) + { + i++; + if( i >= argc ) + return FALSE; + RowToAdd->dwForwardMetric1 = atoi( argv[i] ); + } + else + RowToAdd->dwForwardNextHop = inet_addr( argv[i] ); } return TRUE; @@ -104,53 +134,60 @@ MIB_IPFORWARDROW RowToAdd = { 0 }; DWORD Error; - if( argc < 2 || !convert_add_cmd_line( &RowToAdd, argc, argv ) ) { - fprintf( stderr, - "route add usage:\n" - "route add <target> [mask <mask>] <gw> [metric <m>]\n" - " Adds a route to the IP route table.\n" - " <target> is the network or host to add a route to.\n" - " <mask> is the netmask to use (autodetected if unspecified)\n" - " <gw> is the gateway to use to access the network\n" - " <m> is the metric to use (lower is preferred)\n" ); - return 1; + if( argc < 2 || !convert_add_cmd_line( &RowToAdd, argc, argv ) ) + { + fprintf( stderr, + "route add usage:\n" + "route add <target> [mask <mask>] <gw> [metric <m>]\n" + " Adds a route to the IP route table.\n" + " <target> is the network or host to add a route to.\n" + " <mask> is the netmask to use (autodetected if unspecified)\n" + " <gw> is the gateway to use to access the network\n" + " <m> is the metric to use (lower is preferred)\n" ); + return 1; } if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS ) - return 0; + return 0; fprintf( stderr, "Route addition failed\n" ); return Error; } -int del_route( int argc, char **argv ) { +int del_route( int argc, char **argv ) +{ MIB_IPFORWARDROW RowToDel = { 0 }; DWORD Error; - if( argc < 2 || !convert_add_cmd_line( &RowToDel, argc, argv ) ) { - fprintf( stderr, - "route delete usage:\n" - "route delete <target> <gw>\n" - " Removes a route from the IP route table.\n" - " <target> is the network or host to add a route to.\n" - " <gw> is the gateway to remove the route from.\n" ); - return 1; + if( argc < 2 || !convert_add_cmd_line( &RowToDel, argc, argv ) ) + { + fprintf( stderr, + "route delete usage:\n" + "route delete <target> <gw>\n" + " Removes a route from the IP route table.\n" + " <target> is the network or host to add a route to.\n" + " <gw> is the gateway to remove the route from.\n" ); + return 1; } if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS ) - return 0; + return 0; fprintf( stderr, "Route addition failed\n" ); return Error; } -int main( int argc, char **argv ) { - if( argc < 2 ) return usage(); - else if( !strcasecmp( argv[1], "print" ) ) - return print_routes(); +int main( int argc, char **argv ) +{ + + if( argc < 2 ) + return usage(); + else if ( !strcasecmp( argv[1], "print" ) ) + return print_routes(); else if( !strcasecmp( argv[1], "add" ) ) - return add_route( argc-2, argv+2 ); + return add_route( argc-2, argv+2 ); else if( !strcasecmp( argv[1], "delete" ) ) - return del_route( argc-2, argv+2 ); - else return usage(); + return del_route( argc-2, argv+2 ); + else + return usage(); }

19 years, 2 months

[weiden] 18192: implemented the "Go to process" feature

by weiden＠svn.reactos.com

implemented the "Go to process" feature Modified: trunk/reactos/subsys/system/taskmgr/applpage.c Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c _____ Modified: trunk/reactos/subsys/system/taskmgr/applpage.c --- trunk/reactos/subsys/system/taskmgr/applpage.c 2005-10-01 15:11:31 UTC (rev 18191) +++ trunk/reactos/subsys/system/taskmgr/applpage.c 2005-10-01 15:30:25 UTC (rev 18192) @@ -48,6 +48,7 @@ void ApplicationPageShowContextMenu1(void); void ApplicationPageShowContextMenu2(void); int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); +int PerfGetIndexByProcessId(DWORD dwProcessId); #if 0 void SwitchToThisWindow ( @@ -936,9 +937,18 @@ */ TabCtrl_SetCurFocus(hTabWnd, 1); /* - * FIXME: Select the process item in the list + * Select the process item in the list */ - for (i=0; i<ListView_GetItemCount(hProcessPage); i++) { + i = PerfGetIndexByProcessId(dwProcessId); + if (i != -1) + { + ListView_SetItemState(hProcessPageListCtrl, + i, + LVIS_SELECTED | LVIS_FOCUSED, + LVIS_SELECTED | LVIS_FOCUSED); + ListView_EnsureVisible(hProcessPageListCtrl, + i, + FALSE); } } } _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-01 15:11:31 UTC (rev 18191) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-01 15:30:25 UTC (rev 18192) @@ -345,6 +345,26 @@ return bSuccessful; } +int PerfGetIndexByProcessId(DWORD dwProcessId) +{ + int Index, FoundIndex = -1; + + EnterCriticalSection(&PerfDataCriticalSection); + + for (Index = 0; Index < ProcessCount; Index++) + { + if ((DWORD)pPerfData[Index].ProcessId == dwProcessId) + { + FoundIndex = Index; + break; + } + } + + LeaveCriticalSection(&PerfDataCriticalSection); + + return FoundIndex; +} + ULONG PerfDataGetProcessId(ULONG Index) { ULONG ProcessId;

19 years, 2 months

[npwoods] 18191: Regedit: Moved hEditMenu declaration to the top of the function

by npwoods＠svn.reactos.com

Regedit: Moved hEditMenu declaration to the top of the function Modified: trunk/reactos/subsys/system/regedit/main.c _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-10-01 14:38:10 UTC (rev 18190) +++ trunk/reactos/subsys/system/regedit/main.c 2005-10-01 15:11:31 UTC (rev 18191) @@ -73,6 +73,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { BOOL AclUiAvailable; + HMENU hEditMenu; WNDCLASSEX wcFrame = { sizeof(WNDCLASSEX), @@ -118,7 +119,6 @@ /* Initialize the Windows Common Controls DLL */ InitCommonControls(); - HMENU hEditMenu; hEditMenu = GetSubMenu(hMenuFrame, 1); AclUiAvailable = InitializeAclUiDll();

19 years, 2 months

[weiden] 18190: use the NT5+ behavior of displaying the system cache size. fixes bug 856

by weiden＠svn.reactos.com

use the NT5+ behavior of displaying the system cache size. fixes bug 856 Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c _____ Modified: trunk/reactos/subsys/system/taskmgr/perfdata.c --- trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-01 13:57:38 UTC (rev 18189) +++ trunk/reactos/subsys/system/taskmgr/perfdata.c 2005-10-01 14:38:10 UTC (rev 18190) @@ -806,15 +806,12 @@ EnterCriticalSection(&PerfDataCriticalSection); - SystemCache = SystemCacheInfo.CurrentSize; PageSize = SystemBasicInfo.PageSize; + SystemCache = SystemCacheInfo.CurrentSizeIncludingTransitionInPages * PageSize; LeaveCriticalSection(&PerfDataCriticalSection); - /* SystemCache = SystemCache * (PageSize / 1024); */ - SystemCache = SystemCache / 1024; - - return SystemCache; + return SystemCache / 1024; } ULONG PerfDataGetSystemHandleCount(void)

19 years, 2 months

[greatlrd] 18189: commit new startmenu picture that can be resize, see http://www.reactos.org/bugzilla/show_bug.cgi?id=676

by greatlrd＠svn.reactos.com

commit new startmenu picture that can be resize, see http://www.reactos.org/bugzilla/show_bug.cgi?id=676 Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp Modified: trunk/reactos/subsys/system/explorer/res/logov16.bmp Modified: trunk/reactos/subsys/system/explorer/res/logov256.bmp _____ Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/logov16.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/logov256.bmp (Binary files differ)

19 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005