Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[gadamopoulos] 59110: [syssetup] - Create shortcuts based on shortcuts.inf instead of hardcoding them Note to translators: please make sure that all shortcut translations are correct. Several local...
by gadamopoulos＠svn.reactos.org 29 May '13

29 May '13

Author: gadamopoulos Date: Wed May 29 20:33:11 2013 New Revision: 59110 URL: http://svn.reactos.org/svn/reactos?rev=59110&view=rev Log: [syssetup] - Create shortcuts based on shortcuts.inf instead of hardcoding them Note to translators: please make sure that all shortcut translations are correct. Several localized strings had to be copied by hand so there is the possibility that some errors exist Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Wed May 29 20:33:11 2013 @@ -127,19 +127,15 @@ static BOOL CreateShortcut( - int csidl, LPCTSTR pszFolder, - UINT nIdName, + LPCTSTR pszName, LPCTSTR pszCommand, - UINT nIdTitle, - BOOL bCheckExistence, + LPCTSTR pszDescription, INT iIconNr) { TCHAR szPath[MAX_PATH]; TCHAR szExeName[MAX_PATH]; - TCHAR szTitle[256]; - TCHAR szName[256]; - LPTSTR Ptr = szPath; + LPTSTR Ptr; TCHAR szWorkingDirBuf[MAX_PATH]; LPTSTR pszWorkingDir = NULL; LPTSTR lpFilePart; @@ -152,12 +148,9 @@ _tcscpy(szPath, pszCommand); } - if (bCheckExistence) - { - if ((_taccess(szPath, 0 )) == -1) - /* Expected error, don't return FALSE */ - return TRUE; - } + if ((_taccess(szPath, 0 )) == -1) + /* Expected error, don't return FALSE */ + return TRUE; dwLen = GetFullPathName(szPath, sizeof(szWorkingDirBuf) / sizeof(szWorkingDirBuf[0]), @@ -185,47 +178,104 @@ pszWorkingDir = szWorkingDirBuf; } - - if (!SHGetSpecialFolderPath(0, szPath, csidl, TRUE)) + _tcscpy(szPath, pszFolder); + + Ptr = PathAddBackslash(szPath); + + _tcscpy(Ptr, pszName); + + // FIXME: we should pass 'command' straight in here, but shell32 doesn't expand it + return SUCCEEDED(CreateShellLink(szPath, szExeName, _T(""), pszWorkingDir, szExeName, iIconNr, pszDescription)); +} + + +static BOOL CreateShortcutsFromSection(HINF hinf, LPWSTR pszSection, LPCWSTR pszFolder) +{ + INFCONTEXT Context; + WCHAR szCommand[MAX_PATH]; + WCHAR szName[MAX_PATH]; + WCHAR szDescription[MAX_PATH]; + INT iIconNr; + + if (!SetupFindFirstLine(hinf, pszSection, NULL, &Context)) return FALSE; - if (pszFolder) - { - Ptr = PathAddBackslash(Ptr); - _tcscpy(Ptr, pszFolder); - } - - Ptr = PathAddBackslash(Ptr); - - if (!LoadString(hDllInstance, nIdName, szName, sizeof(szName)/sizeof(szName[0]))) + do + { + if (SetupGetFieldCount(&Context) < 4) + continue; + + if (!SetupGetStringFieldW(&Context, 1, szCommand, MAX_PATH, NULL)) + continue; + + if (!SetupGetStringFieldW(&Context, 2, szName, MAX_PATH, NULL)) + continue; + + if (!SetupGetStringFieldW(&Context, 3, szDescription, MAX_PATH, NULL)) + continue; + + if (!SetupGetIntField(&Context, 4, &iIconNr)) + continue; + + _tcscat(szName, L".lnk"); + + CreateShortcut(pszFolder, szName, szCommand, szDescription, iIconNr); + + }while (SetupFindNextLine(&Context, &Context)); + + return TRUE; +} + +static BOOL CreateShortcuts(HINF hinf, LPCWSTR szSection) +{ + INFCONTEXT Context; + WCHAR szPath[MAX_PATH]; + WCHAR szFolder[MAX_PATH]; + WCHAR szFolderSection[MAX_PATH]; + INT csidl; + LPWSTR p; + + CoInitialize(NULL); + + if (!SetupFindFirstLine(hinf, szSection, NULL, &Context)) return FALSE; - _tcscpy(Ptr, szName); - - if (!LoadString(hDllInstance, nIdTitle, szTitle, sizeof(szTitle)/sizeof(szTitle[0]))) - return FALSE; - - // FIXME: we should pass 'command' straight in here, but shell32 doesn't expand it - return SUCCEEDED(CreateShellLink(szPath, szExeName, _T(""), pszWorkingDir, szExeName, iIconNr, szTitle)); -} - -static BOOL -CreateShortcutFolder(int csidl, UINT nID, LPTSTR pszName, int cchNameLen) -{ - TCHAR szPath[MAX_PATH]; - LPTSTR p; - - if (!SHGetSpecialFolderPath(0, szPath, csidl, TRUE)) - return FALSE; - - if (!LoadString(hDllInstance, nID, pszName, cchNameLen)) - return FALSE; - - p = PathAddBackslash(szPath); - _tcscpy(p, pszName); - - return CreateDirectory(szPath, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; -} - + + do + { + if (SetupGetFieldCount(&Context) < 2) + continue; + + if (!SetupGetStringFieldW(&Context, 0, szFolderSection, MAX_PATH, NULL)) + continue; + + if (!SetupGetIntField(&Context, 1, &csidl)) + continue; + + if (!SetupGetStringFieldW(&Context, 2, szFolder, MAX_PATH, NULL)) + continue; + + if (!SHGetSpecialFolderPathW(0, szPath, csidl, TRUE)) + continue; + + p = PathAddBackslash(szPath); + _tcscpy(p, szFolder); + + if (!CreateDirectory(szPath, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + continue; + } + } + + CreateShortcutsFromSection(hinf, szFolderSection, szPath); + + }while (SetupFindNextLine(&Context, &Context)); + + CoUninitialize(); + + return TRUE; +} static VOID CreateTempDir( @@ -769,74 +819,6 @@ static BOOL -CreateShortcuts(VOID) -{ - TCHAR szFolder[256]; - - CoInitialize(NULL); - - /* Create desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE, 0); - - /* Create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE, 1); - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\rapps.exe"), IDS_CMT_DOWNLOADER, TRUE, 0); - - /* Create administrative tools startmenu shortcuts */ - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("%SystemRoot%\\system32\\servman.exe"), IDS_CMT_SERVMAN, TRUE, 0); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("%SystemRoot%\\system32\\devmgmt.exe"), IDS_CMT_DEVMGMT, TRUE, 0); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_EVENTVIEW, _T("%SystemRoot%\\system32\\eventvwr.exe"), IDS_CMT_EVENTVIEW, TRUE, 0); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_MSCONFIG, _T("%SystemRoot%\\system32\\msconfig.exe"), IDS_CMT_MSCONFIG, TRUE, 0); - - /* Create and fill Accessories subfolder */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) - { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_PAINT, _T("%SystemRoot%\\system32\\mspaint.exe"), IDS_CMT_PAINT, TRUE, 0); - } - - /* Create System Tools subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) - { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_DXDIAG, _T("%SystemRoot%\\system32\\dxdiag.exe"), IDS_CMT_DXDIAG, TRUE, 0); - } - - /* Create Accessibility subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ACCESSIBILITY, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) - { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MAGNIFY, _T("%SystemRoot%\\system32\\magnify.exe"), IDS_CMT_MAGNIFY, TRUE, 0); - } - - /* Create Entertainment subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ENTERTAINMENT, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) - { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MPLAY32, _T("%SystemRoot%\\system32\\mplay32.exe"), IDS_CMT_MPLAY32, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDVOL32, _T("%SystemRoot%\\system32\\sndvol32.exe"), IDS_CMT_SNDVOL32, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDREC32, _T("%SystemRoot%\\system32\\sndrec32.exe"), IDS_CMT_SNDREC32, TRUE, 0); - } - - /* Create Games subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) - { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("%SystemRoot%\\system32\\sol.exe"), IDS_CMT_SOLITAIRE, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("%SystemRoot%\\system32\\winmine.exe"), IDS_CMT_WINEMINE, TRUE, 0); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SPIDER, _T("%SystemRoot%\\system32\\spider.exe"), IDS_CMT_SPIDER, TRUE, 0); - } - - CoUninitialize(); - - return TRUE; -} - -static BOOL SetSetupType(DWORD dwSetupType) { DWORD dwError; @@ -872,6 +854,7 @@ HANDLE token; TOKEN_PRIVILEGES privs; HKEY hKey; + HINF hShortcutsInf; InitializeSetupActionLog(FALSE); LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS"); @@ -922,11 +905,23 @@ InstallSecurity(); - if (!CreateShortcuts()) + hShortcutsInf = SetupOpenInfFileW(L"shortcuts.inf", + NULL, + INF_STYLE_WIN4, + NULL); + if (hShortcutsInf == INVALID_HANDLE_VALUE) + { + FatalError("Failed to open shortcuts.inf"); + return 0; + } + + if (!CreateShortcuts(hShortcutsInf, L"ShortcutFolders")) { FatalError("CreateShortcuts() failed"); return 0; } + + SetupCloseInfFile(hShortcutsInf); /* ROS HACK, as long as NtUnloadKey is not implemented */ { @@ -967,7 +962,7 @@ /* Get shutdown privilege */ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) { - FatalError("OpenProcessToken() failed!"); + FatalError("OpenProcessToken() failed!"); return 0; } if (!LookupPrivilegeValue(

1 0

[ekohl] 59109: [SAMSRV] Implement SamIFree_SAMPR_GET_GROUPS_BUFFER.
by ekohl＠svn.reactos.org 29 May '13

29 May '13

Author: ekohl Date: Wed May 29 20:21:42 2013 New Revision: 59109 URL: http://svn.reactos.org/svn/reactos?rev=59109&view=rev Log: [SAMSRV] Implement SamIFree_SAMPR_GET_GROUPS_BUFFER. Modified: trunk/reactos/dll/win32/samsrv/samsrv.c trunk/reactos/dll/win32/samsrv/samsrv.spec Modified: trunk/reactos/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.c [iso-8859-1] Wed May 29 20:21:42 2013 @@ -167,6 +167,20 @@ VOID NTAPI +SamIFree_SAMPR_GET_GROUPS_BUFFER(PSAMPR_GET_GROUPS_BUFFER Ptr) +{ + if (Ptr != NULL) + { + if (Ptr->Groups != NULL) + MIDL_user_free(Ptr->Groups); + + MIDL_user_free(Ptr); + } +} + + +VOID +NTAPI SamIFree_SAMPR_PSID_ARRAY(PSAMPR_PSID_ARRAY Ptr) { if (Ptr != NULL) Modified: trunk/reactos/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.sp… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.spec [iso-8859-1] Wed May 29 20:21:42 2013 @@ -21,7 +21,7 @@ @ stub SamIFree_SAMPR_DISPLAY_INFO_BUFFER @ stub SamIFree_SAMPR_DOMAIN_INFO_BUFFER @ stdcall SamIFree_SAMPR_ENUMERATION_BUFFER(ptr) -@ stub SamIFree_SAMPR_GET_GROUPS_BUFFER +@ stdcall SamIFree_SAMPR_GET_GROUPS_BUFFER(ptr) @ stub SamIFree_SAMPR_GET_MEMBERS_BUFFER @ stub SamIFree_SAMPR_GROUP_INFO_BUFFER @ stdcall SamIFree_SAMPR_PSID_ARRAY(ptr)

1 0

[gadamopoulos] 59108: - Add shortcuts.inf file that will be used by syssetup to create the shortcuts in second stage. In this way shortcuts and their folders won't be hardcoded in syssetup
by gadamopoulos＠svn.reactos.org 29 May '13

29 May '13

Author: gadamopoulos Date: Wed May 29 19:35:35 2013 New Revision: 59108 URL: http://svn.reactos.org/svn/reactos?rev=59108&view=rev Log: - Add shortcuts.inf file that will be used by syssetup to create the shortcuts in second stage. In this way shortcuts and their folders won't be hardcoded in syssetup Added: trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/media/inf/CMakeLists.txt Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Wed May 29 19:35:35 2013 @@ -31,6 +31,7 @@ nettcpip.inf ports.inf scsi.inf + shortcuts.inf unknown.inf usb.inf usbport.inf Added: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf (added) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Wed May 29 19:35:35 2013 @@ -0,0 +1,1344 @@ +ï»¿[Version] +Signature = $Windows NT$ +ClassGUID = {00000000-0000-0000-0000-000000000000} + +[ShortcutFolders] +DesktopShortcuts=0, +ProgramShortcuts=2, +AdminToolsShortcuts=47, +AccessoriesShortcuts=2, %ACCESSORIES% +SystemToolsShortcuts=2, %SYSTOOLS% +AccesibilityShortcuts=2, %ACCESIBILITY% +EntertainmentShortcuts=2, %ENTERTAINMENT% +GamesShortcuts=2, %GAMES% + +[DesktopShortcuts] +%SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0 + +[ProgramShortcuts] +%SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 1 +%SystemRoot%\system32\rapps.exe, %RAPPS_TITLE%, %RAPPS_DESC%, 0 + +[AdminToolsShortcuts] +%SystemRoot%\system32\servman.exe, %SERVMAN_TITLE%, %SERVMAN_DESC%, 0 +%SystemRoot%\system32\devmgmt.exe, %DEVMGMT_TITLE%, %DEVMGMT_DESC%, 0 +%SystemRoot%\system32\eventvwr.exe, %EVENTVWR_TITLE%, %EVENTVWR_DESC%, 0 +%SystemRoot%\system32\msconfig.exe, %MSCONFIG_TITLE%, %MSCONFIG_DESC%, 0 + +[AccessoriesShortcuts] +%SystemRoot%\system32\calc.exe, %CALC_TITLE%, %CALC_DESC%, 0 +%SystemRoot%\system32\cmd.exe, %CMD_TITLE%, %CMD_DESC%, 0 +%SystemRoot%\system32\notepad.exe, %NOTEPAD_TITLE%, %NOTEPAD_DESC%, 0 +%SystemRoot%\system32\mstsc.exe, %MSTSC_TITLE%, %MSTSC_DESC%, 0 +%SystemRoot%\system32\screenshot.exe, %SCREENSHOT_TITLE%, %SCREENSHOT_DESC%, 0 +%SystemRoot%\system32\wordpad.exe, %WORDPAD_TITLE%, %WORDPAD_DESC%, 0 +%SystemRoot%\system32\mspaint.exe, %MSPAINT_TITLE%, %MSPAINT_DESC%, 0 + +[SystemToolsShortcuts] +%SystemRoot%\system32\charmap.exe, %CHARMAP_TITLE%, %CHARMAP_DESC%, 0 +%SystemRoot%\system32\kbswitch.exe, %KBSWITCH_TITLE%, %KBSWITCH_DESC%, 0 +%SystemRoot%\system32\regedit32.exe, %REGEDIT_TITLE%, %REGEDIT_DESC%, 0 +%SystemRoot%\system32\dxdiag.exe, %DXDIAG_TITLE%, %DXDIAG_DESC%, 0 + +[AccesibilityShortcuts] +%SystemRoot%\system32\magnify.exe, %MAGNIFY_TITLE%, %MAGNIFY_DESC%, 0 + +[EntertainmentShortcuts] +%SystemRoot%\system32\mplay32.exe, %MPLAY_TITLE%, %MPLAY_DESC%, 0 +%SystemRoot%\system32\sndvol32.exe, %SNDVOL_TITLE%, %SNDVOL_DESC%, 0 +%SystemRoot%\system32\sndrec32.exe, %SNDREC32_TITLE%, %SNDREC32_DESC%, 0 + +[GamesShortcuts] +%SystemRoot%\system32\sol.exe, %SOL_TITLE%, %SOL_DESC%, 0 +%SystemRoot%\system32\winmine.exe, %WINMINE_TITLE%, %WINMINE_DESC%, 0 +%SystemRoot%\system32\spider.exe, %SPIDER_TITLE%, %SPIDER_DESC%, 0 + + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ACCESSORIES=Accessories +SYSTOOLS=System Tools +ACCESIBILITY=Accesibility +ENTERTAINMENT=Entertainment +GAMES=Games + +CMD_TITLE=Command Prompt +CMD_DESC=Open command prompt +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Launch Explorer +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Download and install various applications +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Launch Service Manager +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Launch Device Manager +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Launch Event Viewer +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Launch System Configuration program +CALC_TITLE=Calculator +CALC_DESC=Launch Calculator +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Launch Text Editor +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Launch Registry Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Launch Document Editor +MSPAINT_TITLE=MSPaint +MSPAINT_DESC=Launch Paint +CHARMAP_TITLE=Character Map +CHARMAP_DESC=Character Map +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Keyboard Layout Switcher +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Launch Registry Editor +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Launch ReactX-Diagnostic program +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Magnify +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Launch Multimedia Player +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Launch Volume Control +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Solitaire +SOL_DESC=Solitaire +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_BULGARIAN SUBLANG_NEUTRAL +[Strings.0002] +ACCESSORIES=ÐÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð½Ð¾ÑÑÐ¸ +SYSTOOLS=Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð¸ ÑÑÐµÐ´ÑÑÐ²Ð° +ACCESIBILITY=ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ÑÑ +ENTERTAINMENT=ÐÐ°Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ +GAMES=ÐÐ³ÑÐ¸ + +CMD_TITLE=ÐÐ¾Ð¼Ð°Ð½Ð´ÐµÐ½ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ +CMD_DESC=ÐÑÐ²Ð°ÑÑÐ½Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ +EXPLORER_TITLE=ÐÐ·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»ÑÑ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡ +EXPLORER_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¸Ð·ÑÐ»ÐµÐ´Ð¾Ð²Ð°ÑÐµÐ»Ñ +RAPPS_TITLE=Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑÑÐ° Ð·Ð° Ð ÐµÐ°ÐºÑÐÐ¡ +RAPPS_DESC=Ð¡Ð²Ð°Ð»ÑÐ½Ðµ Ð¸ ÑÐ»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð·Ð»Ð¸ÑÐ½Ð¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ +SERVMAN_TITLE=Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° ÑÑÐ»ÑÐ³Ð¸ÑÐµ +SERVMAN_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ Ð½Ð° ÑÑÐ»ÑÐ³Ð¸ÑÐµ +DEVMGMT_TITLE=Ð£Ð¿ÑÐ°Ð²Ð¸ÑÐµÐ» Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° +DEVMGMT_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°ÑÐ° +EVENTVWR_TITLE=ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ñ +EVENTVWR_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐµÐ³Ð»ÐµÐ´Ð½Ð¸ÐºÐ° Ð½Ð° ÑÑÐ±Ð¸ÑÐ¸Ñ +MSCONFIG_TITLE=ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÑÑÐµÐ´Ð±Ð°ÑÐ° +MSCONFIG_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð·Ð° Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° ÑÑÐµÐ´Ð±Ð°ÑÐ° +CALC_TITLE=ÐÐ·ÑÐ¸ÑÐ»Ð¸ÑÐµÐ» +CALC_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¸Ð·ÑÐ¸ÑÐ»Ð¸ÑÐµÐ»Ñ +NOTEPAD_TITLE=ÐÐµÐ»ÐµÐ¶Ð½Ð¸Ðº +NOTEPAD_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐµÐºÑÑÐ¾Ð¾Ð±ÑÐ°ÑÐ²Ð°ÑÐ°ÑÐ° +MSTSC_TITLE=ÐÐ°Ð»ÐµÑÐ½Ð° ÑÐ°Ð±Ð¾ÑÐ½Ð° Ð¿Ð»Ð¾Ñ +MSTSC_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐµÐ³Ð¸ÑÑÑÐ¾Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ²Ð°ÑÐ°ÑÐ° +SCREENSHOT_TITLE=Ð¡Ð½Ð¸Ð¼ÐºÐ° +SCREENSHOT_DESC=ÐÐ°ÑÐ½ÐµÐ¼Ð°Ð½Ðµ Ð½Ð° ÐµÐºÑÐ°Ð½Ð° +WORDPAD_TITLE=Ð¢ÐµÑÑÐ°Ð´ÐºÐ° +WORDPAD_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ½Ð°ÑÐ° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ²Ð°ÑÐ° +MSPAINT_TITLE=Ð Ð¸ÑÑÐ½ÑÐº +MSPAINT_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð·Ð° ÑÐ¸ÑÑÐ²Ð°Ð½Ðµ +CHARMAP_TITLE=ÐÐ½Ð°ÐºÐ¾Ð²Ð° ÑÐ°Ð±Ð»Ð¸ÑÐ° +CHARMAP_DESC=ÐÐ½Ð°ÐºÐ¾Ð²Ð° ÑÐ°Ð±Ð»Ð¸ÑÐ° +KBSWITCH_TITLE=ÐÑÐµÐ²ÐºÐ»ÑÑÐ²Ð°ÑÐµÐ» Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ½Ð¸ÑÐµ Ð¿Ð¾Ð´ÑÐµÐ´Ð±Ð¸ +KBSWITCH_DESC=ÐÑÐµÐ²ÐºÐ»ÑÑÐ²Ð°ÑÐµÐ» Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ½Ð¸ÑÐµ Ð¿Ð¾Ð´ÑÐµÐ´Ð±Ð¸ +REGEDIT_TITLE=ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° ÑÐµÐ³Ð¸ÑÑÑÑÐ° +REGEDIT_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐµÐ³Ð¸ÑÑÑÐ¾Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ²Ð°ÑÐ°ÑÐ° +DXDIAG_TITLE=ÐÑÐµÐ³Ð»ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐ¥ +DXDIAG_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð·Ð° Ð¿ÑÐµÐ³Ð»ÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð ÐµÐ°ÐºÑÐ¥ +MAGNIFY_TITLE=ÐÑÐ¿Ð° +MAGNIFY_DESC=ÐÑÐ¿Ð° +MPLAY_TITLE=ÐÑÐ»ÑÐ¸Ð¼ÐµÐ´Ð¸ÐµÐ½ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ» +MPLAY_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¼ÑÐ»ÑÐ¸Ð¼ÐµÐ´Ð¸Ð¹Ð½Ð¸Ñ Ð²ÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ» +SNDVOL_TITLE=Ð¡Ð¸Ð»Ð° Ð½Ð° Ð·Ð²ÑÐºÐ° +SNDVOL_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÑÐ¿ÑÐ²Ð»ÐµÐ½Ð¸ÐµÑÐ¾ Ð½Ð° ÑÐ¸Ð»Ð°ÑÐ° Ð½Ð° Ð·Ð²ÑÐºÐ° +SNDREC32_TITLE=ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ñ +SNDREC32_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° ÐÐ²ÑÐºÐ¾Ð·Ð°Ð¿Ð¸ÑÐ²Ð°ÑÐ° +SOL_TITLE=ÐÐ°ÑÐ¸Ð°Ð½Ñ +SOL_DESC=ÐÐ°ÑÐ¸Ð°Ð½Ñ +WINMINE_TITLE=ÐÐ¸Ð½Ð¸ÑÐºÐ¸ +WINMINE_DESC=ÐÐ¸Ð½Ð¸ÑÐºÐ¸ +SPIDER_TITLE=ÐÐ°ÑÐ¸Ð°Ð½Ñ âÐÐ°ÑÐºâ + +; LANG_CZECH SUBLANG_NEUTRAL +[Strings.0005] +ACCESSORIES=PÅÃsluÅ¡enstvÃ +SYSTOOLS=SystÃ©movÃ© nÃ¡stroje +ACCESIBILITY=UsnadnÄnÃ +ENTERTAINMENT=ZÃ¡bava +GAMES=Hry + +CMD_TITLE=PÅÃkazovÃ½ ÅÃ¡dek +CMD_DESC=OtevÅÃt PÅÃkazovÃ½ ÅÃ¡dek +EXPLORER_TITLE=ReactOS PrÅ¯zkumnÃk +EXPLORER_DESC=Spustit PrÅ¯zkumnÃka +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=StÃ¡hnout a nainstalovat dalÅ¡Ã aplikace +SERVMAN_TITLE=SprÃ¡vce sluÅ¾eb +SERVMAN_DESC=Spustit SprÃ¡vce sluÅ¾eb +DEVMGMT_TITLE=SprÃ¡vce zaÅÃzenÃ +DEVMGMT_DESC=Spustit SprÃ¡vce zaÅÃzenÃ +EVENTVWR_TITLE=ProhlÃÅ¾eÄ udÃ¡lostÃ +EVENTVWR_DESC=Spustit ProhlÃÅ¾eÄ udÃ¡lostÃ +MSCONFIG_TITLE=NastavenÃ systÃ©mu +MSCONFIG_DESC=Spustit NÃ¡stroj pro konfiguraci systÃ©mu +CALC_TITLE=KalkulaÄka +CALC_DESC=Spustit KalkulaÄku +NOTEPAD_TITLE=PoznÃ¡mkovÃ½ blok +NOTEPAD_DESC=Spustit TextovÃ½ editor +MSTSC_TITLE=VzdÃ¡lenÃ¡ plocha +MSTSC_DESC=Spustit Editor registru +SCREENSHOT_TITLE=Sejmout obrazovku +SCREENSHOT_DESC=Sejmout obrazovku +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Spustit WordPad +MSPAINT_TITLE=MalovÃ¡nÃ +MSPAINT_DESC=Spustit MalovÃ¡nÃ +CHARMAP_TITLE=Mapa znakÅ¯ +CHARMAP_DESC=Mapa znakÅ¯ +KBSWITCH_TITLE=PÅepÃnaÄ rozloÅ¾enÃ klÃ¡vesnice +KBSWITCH_DESC=PÅepÃnaÄ rozloÅ¾enÃ klÃ¡vesnice +REGEDIT_TITLE=Editor registru +REGEDIT_DESC=Spustit Editor registru +DXDIAG_TITLE=Diagnostika ReactX +DXDIAG_DESC=Spustit NÃ¡stroj pro diagnostiku ReactX +MAGNIFY_TITLE=Lupa +MAGNIFY_DESC=Lupa +MPLAY_TITLE=PÅehrÃ¡vaÄ multimÃ©diÃ +MPLAY_DESC=Spustit PÅehrÃ¡vaÄ multimÃ©diÃ +SNDVOL_TITLE=OvlÃ¡dÃ¡nÃ hlasitosti +SNDVOL_DESC=Spustit OvlÃ¡dÃ¡nÃ hlasitosti +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Solitaire +SOL_DESC=Solitaire +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_GERMAN SUBLANG_NEUTRAL +[Strings.0007] +ACCESSORIES=ZubehÃ¶r +SYSTOOLS=Systemprogramme +ACCESIBILITY=Eingabehilfen +ENTERTAINMENT=Unterhaltung +GAMES=Spiele + +CMD_TITLE=Eingabeaufforderung +CMD_DESC=Ãffne Kommandozeilenfenster +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Starte Explorer +RAPPS_TITLE=ReactOS Anwendungsmanager +RAPPS_DESC=Herunterladen und Installieren verschiedener Anwendungen +SERVMAN_TITLE=Dienste-Manager +SERVMAN_DESC=Starte Dienstmanager +DEVMGMT_TITLE=GerÃ¤te-Manager +DEVMGMT_DESC=Starte GerÃ¤temanager +EVENTVWR_TITLE=Ereignisanzeige +EVENTVWR_DESC=Starte Ereignisanzeige +MSCONFIG_TITLE=Systemkonfiguration +MSCONFIG_DESC=Starte Systemkonfigurationsprogramm +CALC_TITLE=Rechner +CALC_DESC=Starte Taschenrechner +NOTEPAD_TITLE=Editor +NOTEPAD_DESC=Starte Texteditor +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Starte Registrierungseditor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Screenshot erstellen +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Starte Dokumenteneditor +MSPAINT_TITLE=Paint +MSPAINT_DESC=Starte Paint +CHARMAP_TITLE=Zeichentabelle +CHARMAP_DESC=Zeichentabelle +KBSWITCH_TITLE=Tastaturlayout-Umschalter +KBSWITCH_DESC=Tastaturlayout-Umschalter +REGEDIT_TITLE=Registrierungseditor +REGEDIT_DESC=Starte Registrierungseditor +DXDIAG_TITLE=ReactX-Diagnose +DXDIAG_DESC=Starte ReactX-Diagnoseprogramm +MAGNIFY_TITLE=Bildschirmlupe +MAGNIFY_DESC=Bildschirmlupe +MPLAY_TITLE=Multimedia-Player +MPLAY_DESC=Starte Multimedia-Player +SNDVOL_TITLE=LautstÃ¤rkeregelung +SNDVOL_DESC=Starte LautstÃ¤rkeregelung +SNDREC32_TITLE=Audiorekorder +SNDREC32_DESC=Starte Audiorekorder +SOL_TITLE=SolitÃ¤r +SOL_DESC=SolitÃ¤r +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_GREEK SUBLANG_NEUTRAL +[Strings.0008] +ACCESSORIES=ÎÎ¿Î·Î¸Î®Î¼Î±ÏÎ± +SYSTOOLS=ÎÏÎ³Î±Î»ÎµÎ¯Î± Î£ÏÏÏÎ®Î¼Î±ÏÎ¿Ï +ACCESIBILITY=ÎÎ¹Î± Î¬ÏÎ¿Î¼Î± Î¼Îµ ÎµÎ¹Î´Î¹ÎºÎÏ Î±Î½Î¬Î³ÎºÎµÏ +ENTERTAINMENT=ÎÎ¹Î±ÏÎºÎÎ´Î±ÏÎ· +GAMES=Î Î±Î¹ÏÎ½Î¯Î´Î¹Î± + +CMD_TITLE=ÎÏÎ±Î¼Î¼Î® ÎµÎ½ÏÎ¿Î»ÏÎ½ +CMD_DESC=Open command prompt +EXPLORER_TITLE=ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ· ÏÎ¿Ï ReactOS +EXPLORER_DESC=ÎÎ¾ÎµÏÎµÏÎ½Î·ÏÎ®Ï +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Download and install various applications +SERVMAN_TITLE=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ +SERVMAN_DESC=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ +DEVMGMT_TITLE=ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· ÏÏÏÎºÎµÏÏÎ½ +DEVMGMT_DESC=ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î£ÏÏÎºÎµÏÏÎ½ +EVENTVWR_TITLE=Î ÏÎ¿Î²Î¿Î»Î® Î£ÏÎ¼Î²Î¬Î½ÏÏÎ½ +EVENTVWR_DESC=Î ÏÎ¿Î²Î¿Î»Î® Î£ÏÎ¼Î²Î¬Î½ÏÏÎ½ +MSCONFIG_TITLE=ÎÎ¿Î·Î¸Î·ÏÎ¹ÎºÏ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÏÎ¸Î¼Î¹ÏÎ·Ï ÏÎ±ÏÎ±Î¼ÎÏÏÏÎ½ +MSCONFIG_DESC=ÎÎ¿Î·Î¸Î·ÏÎ¹ÎºÏ ÏÏÏÎ³ÏÎ±Î¼Î¼Î± ÏÏÎ¸Î¼Î¹ÏÎ·Ï ÏÎ±ÏÎ±Î¼ÎÏÏÏÎ½ +CALC_TITLE=ÎÏÎ¹Î¸Î¼Î¿Î¼Î·ÏÎ±Î½Î® +CALC_DESC=ÎÏÎ¹Î¸Î¼Î¿Î¼Î·ÏÎ±Î½Î® +NOTEPAD_TITLE=Î£Î·Î¼ÎµÎ¹ÏÎ¼Î±ÏÎ¬ÏÎ¹Î¿ +NOTEPAD_DESC=Î£Î·Î¼ÎµÎ¹ÏÎ¼Î±ÏÎ¬ÏÎ¹Î¿ +MSTSC_TITLE=Î£ÏÎ½Î´ÎµÏÎ· Î±ÏÎ¿Î¼Î±ÎºÏÏÏÎ¼ÎÎ½Î·Ï ÎµÏÎ¹ÏÎ¬Î½ÎµÎ¹Î±Ï ÎµÏÎ³Î±ÏÎ¯Î±Ï +MSTSC_DESC=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Î¼Î·ÏÏÏÎ¿Ï +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Launch Document Editor +MSPAINT_TITLE=Paint +MSPAINT_DESC=Launch Paint +CHARMAP_TITLE=Î Î¯Î½Î±ÎºÎ±Ï Î§Î±ÏÎ±ÎºÏÎ®ÏÏÎ½ +CHARMAP_DESC=Î Î¯Î½Î±ÎºÎ±Ï Î§Î±ÏÎ±ÎºÏÎ®ÏÏÎ½ +KBSWITCH_TITLE=ÎÎ»Î»Î±Î³Î® ÎÎ¹Î¬ÏÎ±Î¾Î·Ï Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï +KBSWITCH_DESC=ÎÎ»Î»Î±Î³Î® ÎÎ¹Î¬ÏÎ±Î¾Î·Ï Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï +REGEDIT_TITLE=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Î¼Î·ÏÏÏÎ¿Ï +REGEDIT_DESC=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Î¼Î·ÏÏÏÎ¿Ï +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Launch ReactX-Diagnostic program +MAGNIFY_TITLE=ÎÎµÎ³ÎµÎ¸ÏÎ½ÏÎ¹ÎºÏÏ ÏÎ±ÎºÏÏ +MAGNIFY_DESC=ÎÎµÎ³ÎµÎ¸ÏÎ½ÏÎ¹ÎºÏÏ ÏÎ±ÎºÏÏ +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Launch Multimedia Player +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Launch Volume Control +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Î Î±ÏÎ¹ÎÎ½ÏÎ¶Î± +SOL_DESC=Î Î±ÏÎ¹ÎÎ½ÏÎ¶Î± +WINMINE_TITLE=ÎÎ±ÏÎºÎ±Î»Î¹ÎµÏÏÎ®Ï +WINMINE_DESC=ÎÎ±ÏÎºÎ±Î»Î¹ÎµÏÏÎ®Ï +SPIDER_TITLE=Spider Solitaire + +; LANG_SPANISH SUBLANG_NEUTRAL +[Strings.000A] +ACCESSORIES=Accesorios +SYSTOOLS=Herramientas del sistema +ACCESIBILITY=Accesibilidad +ENTERTAINMENT=Entretenimiento +GAMES=Juegos + +CMD_TITLE=SÃmbolo del sistema +CMD_DESC=Abrir SÃmbolo del sistema +EXPLORER_TITLE=Explorador de ReactOS +EXPLORER_DESC=Ejecutar Explorador +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Descarga e instala varias aplicaciones +SERVMAN_TITLE=Administrador de Servicios +SERVMAN_DESC=Ejecutar Administrador de servicios +DEVMGMT_TITLE=Administrador de Dispositivos +DEVMGMT_DESC=Ejecutar Administrador de dispositivos +EVENTVWR_TITLE=Visor de sucesos +EVENTVWR_DESC=Ejecutar Visor de sucesos +MSCONFIG_TITLE=ConfiguraciÃ³n del sistema +MSCONFIG_DESC=Ejecutar Utilidad de configuraciÃ³n del sistema +CALC_TITLE=Calculadora +CALC_DESC=Ejecutar Calculadora +NOTEPAD_TITLE=Bloc de notas +NOTEPAD_DESC=Ejecutar Editor de texto +MSTSC_TITLE=Escritorio Remoto +MSTSC_DESC=Ejecutar Editor del registro +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Toma capturas de pantalla +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Ejecutar Editor de documentos +MSPAINT_TITLE=Paint +MSPAINT_DESC=Ejecutar Paint +CHARMAP_TITLE=Mapa de caracteres +CHARMAP_DESC=Mapa de caracteres +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Keyboard Layout Switcher +REGEDIT_TITLE=Editor de registro +REGEDIT_DESC=Ejecutar Editor del registro +DXDIAG_TITLE=DiagnÃ³stico de ReactX +DXDIAG_DESC=Ejecutar el programa de diagnÃ³stico de ReactX +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Magnify +MPLAY_TITLE=Reproductor multimedia +MPLAY_DESC=Ejecutar Reproductor multimedia +SNDVOL_TITLE=Control de volumen +SNDVOL_DESC=Ejecutar Control de volumen +SNDREC32_TITLE=Grabadora de sonidos +SNDREC32_DESC=Ejecutar Grabadora de sonidos +SOL_TITLE=Solitario +SOL_DESC=Solitario +WINMINE_TITLE=Buscaminas +WINMINE_DESC=Buscaminas +SPIDER_TITLE=Solitario Spider + +; LANG_ESTONIAN SUBLANG_NEUTRAL +[Strings.0025] +ACCESSORIES=Tarvikud +SYSTOOLS=SÃ¼steemi tÃ¶Ã¶riistad +ACCESIBILITY=LigipÃ¤Ã¤setavus +ENTERTAINMENT=Meelelahutus +GAMES=MÃ¤ngud + +CMD_TITLE=Command Prompt +CMD_DESC=Ava kÃ¤surida +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Ava sirvija +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Laadi alla ja paigalda erinevaid rakendusi +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Ava Teenustehaldur +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Ava Seadmehaldur +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Ava SÃ¼ndmuste logi +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Ava sÃ¼steemi seadistamise programm +CALC_TITLE=Calculator +CALC_DESC=Ava Kalkulaator +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Ava Tekstiredaktor +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Ava Registriredaktor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Tee ekraanitÃµmmis +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Ava Dokumendiredaktor +MSPAINT_TITLE=Paint +MSPAINT_DESC=Ava Paint +CHARMAP_TITLE=Character Map +CHARMAP_DESC=KirjamÃ¤rkide Tabel +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Klaviatuuriasetuse Muutmine +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Ava Registriredaktor +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Ava ReactX-Diagnostika programm +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Suurenda +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Ava MeediamÃ¤ngija +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Ava Helitugevuse Kontroll +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Solitaire +SOL_DESC=Solitaire +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_FRENCH SUBLANG_NEUTRAL +[Strings.000C] +ACCESSORIES=Accessoires +SYSTOOLS=Outils systÃ¨me +ACCESIBILITY=AccessibilitÃ© +ENTERTAINMENT=Divertissement +GAMES=Jeux + +CMD_TITLE=Invite de commandes +CMD_DESC=Ouvrir l'invite de commandes +EXPLORER_TITLE=Explorateur ReactOS +EXPLORER_DESC=Lancer Explorer +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=TÃ©lÃ©charger et installer diverses applications +SERVMAN_TITLE=Gestionnaire de services +SERVMAN_DESC=Lancer le gestionnaire de services +DEVMGMT_TITLE=Gestionnaire de pÃ©riphÃ©riques +DEVMGMT_DESC=Lancer le gestionnaire de pÃ©riphÃ©riques +EVENTVWR_TITLE=Visionneuse des Ã©vÃ©nements +EVENTVWR_DESC=Lancer la visionneuse des Ã©vÃ©nements +MSCONFIG_TITLE=Configuration systÃ¨me +MSCONFIG_DESC=Lancer le programme de configuration systÃ¨me +CALC_TITLE=Calculatrice +CALC_DESC=Lancer la Calculatrice +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Lancer l'Ãditeur de Texte +MSTSC_TITLE=Bureau Distant +MSTSC_DESC=Lancer l'Ãditeur de Registre +SCREENSHOT_TITLE=Capture d'Ã©cran +SCREENSHOT_DESC=Faire une capture d'Ã©cran +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Lancer l'Ãditeur de Documents +MSPAINT_TITLE=Paint +MSPAINT_DESC=Lancer Paint +CHARMAP_TITLE=Table des CaractÃ¨res +CHARMAP_DESC=Table des CaractÃ¨res +KBSWITCH_TITLE=SÃ©lecteur de configuration clavier +KBSWITCH_DESC=SÃ©lecteur de configuration clavier +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Lancer l'Ãditeur de Registre +DXDIAG_TITLE=Diagnostic ReactX +DXDIAG_DESC=Lancer le prorgramme de diagnostic ReactX +MAGNIFY_TITLE=Loupe +MAGNIFY_DESC=Loupe +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Lancer le lecteur multimÃ©dia +SNDVOL_TITLE=ContrÃ´leur de volume +SNDVOL_DESC=Lancer le contrÃ´leur de volume +SNDREC32_TITLE=Enregistreur de son +SNDREC32_DESC=Lancer l'enregistreur de son +SOL_TITLE=Solitaire +SOL_DESC=Solitaire +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_HEBREW SUBLANG_NEUTRAL +[Strings.000D] +ACCESSORIES=×¢××¨×× +SYSTOOLS=××× ××¢×¨××ª +ACCESIBILITY=× ×××©××ª +ENTERTAINMENT=×××××¨ +GAMES=××©××§×× + +CMD_TITLE=×©××¨×ª ××¤×§××× +CMD_DESC=×©××¨×ª ××¤×§××× +EXPLORER_TITLE=ReactOS ×¡×××¨ +EXPLORER_DESC=×¡×××¨ +RAPPS_TITLE=×× ×× ××××©×××× ×©× ReactOS +RAPPS_DESC=×××¨× ×××ª×§× ×ª×× ×××ª +SERVMAN_TITLE=×× ×× ××©××¨××ª×× +SERVMAN_DESC=×× ×× ××©××¨××ª×× +DEVMGMT_TITLE=×× ×× ×××ª×§× ×× +DEVMGMT_DESC=×× ×× ×××ª×§× ×× +EVENTVWR_TITLE=××¦×× ××××¨××¢×× +EVENTVWR_DESC=××¦×× ××××¨××¢×× +MSCONFIG_TITLE=××××¨×ª ×××¢×¨××ª +MSCONFIG_DESC=×ª×× ××ª ××××¨×ª ×××¢×¨××ª +CALC_TITLE=×××©××× +CALC_DESC=×××©××× +NOTEPAD_TITLE=×¤× ×§×¡ ××¨×©××××ª +NOTEPAD_DESC=×¢××¨× ××§×¡× +MSTSC_TITLE=×©×××× ×¢×××× ××¨×××§ +MSTSC_DESC=×¢××¨× ××¨××©×× +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=×¦×××× ××¡× +WORDPAD_TITLE=××ª×× +WORDPAD_DESC=×¢××¨× ×××¡×××× +MSPAINT_TITLE=×¦×××¨ +MSPAINT_DESC=×¦×××¨ +CHARMAP_TITLE=××¤×ª ×ª×××× +CHARMAP_DESC=××¤×ª ××ª×××× +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Keyboard Layout Switcher +REGEDIT_TITLE=Regedit +REGEDIT_DESC=×¢××¨× ××¨××©×× +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Launch ReactX-Diagnostic program +MAGNIFY_TITLE=××××××ª ×××××ª +MAGNIFY_DESC=××××××ª ×××××ª +MPLAY_TITLE=× ×× ××××××××× +MPLAY_DESC=× ×× ×××××××××× +SNDVOL_TITLE=××§×¨×ª ×¢××¦×× +SNDVOL_DESC=××§×¨×ª ×¢××¦×× +SNDREC32_TITLE=×¨×©××§×× +SNDREC32_DESC=×¨×©××§×× +SOL_TITLE=×¡×××××××¨ +SOL_DESC=×¡×××××××¨ +WINMINE_TITLE=WineMine +WINMINE_DESC=×©××× ××××§×©×× +SPIDER_TITLE=×¡×××××××¨ ×¢××××© + +; LANG_HUNGARIAN SUBLANG_NEUTRAL +[Strings.000E] +ACCESSORIES=Accessories +SYSTOOLS=System Tools +ACCESIBILITY=Accessibility +ENTERTAINMENT=Entertainment +GAMES=JÃ¡tÃ©kok + +CMD_TITLE=Command Prompt +CMD_DESC=Open command prompt +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Launch Explorer +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Download and install various applications +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Launch Service Manager +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Launch Device Manager +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Launch Event Viewer +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Launch System Configuration program +CALC_TITLE=Calculator +CALC_DESC=Launch Calculator +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Launch Text Editor +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Launch Registry Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Launch Document Editor +MSPAINT_TITLE=Paint +MSPAINT_DESC=Launch Paint +CHARMAP_TITLE=CharMap +CHARMAP_DESC=CharMap +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Keyboard Layout Switcher +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Launch Registry Editor +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Launch ReactX-Diagnostic program +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Magnify +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Launch Multimedia Player +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Launch Volume Control +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Solitaire +SOL_DESC=PasziÃ¡nsz +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_INDONESIAN SUBLANG_NEUTRAL +[Strings.0021] +ACCESSORIES=Aksesoris +SYSTOOLS=System Tools +ACCESIBILITY=Accessibility +ENTERTAINMENT=Entertainment +GAMES=Games + +CMD_TITLE=Command Prompt +CMD_DESC=Buka prompt perintah +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Jalankan Explorer +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Download dan instalasi berbagai aplikasi +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Launch Service Manager +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Launch Device Manager +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Launch Event Viewer +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Launch System Configuration program +CALC_TITLE=Calculator +CALC_DESC=Jalankan Kalkulator +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Jalankan Editor Teks +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Jalankan Editor Registri +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Ambil foto layar +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Jalankan Editor Dokumen +MSPAINT_TITLE=Paint +MSPAINT_DESC=Launch Paint +CHARMAP_TITLE=CharMap +CHARMAP_DESC=CharMap +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Keyboard Layout Switcher +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Jalankan Editor Registri +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Launch ReactX-Diagnostic program +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Magnify +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Launch Multimedia Player +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Launch Volume Control +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Solitaire +SOL_DESC=Solitaire +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_ITALIAN SUBLANG_NEUTRAL +[Strings.0010] +ACCESSORIES=Accessori +SYSTOOLS=Strumenti di sistema +ACCESIBILITY=AccessibilitÃ +ENTERTAINMENT=Divertimento +GAMES=Giochi + +CMD_TITLE=Prompt dei comandi +CMD_DESC=Apri la finestra dei comandi +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Lancia Explorer +RAPPS_TITLE=ReactOS gestione applicazioni +RAPPS_DESC=Scarica e installa varie applicazioni +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Lancia la Gestione dei servizi +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Lancia la Gestione periferiche +EVENTVWR_TITLE=Visualizzatore Eventi +EVENTVWR_DESC=Lancia il visualizzatore degli eventi +MSCONFIG_TITLE=Configurazione del sistema +MSCONFIG_DESC=Lancia il programma di configurazione del sistema +CALC_TITLE=Calcolatrice +CALC_DESC=Calcolatrice +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Lancia l'editor dei testi +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Lancia l'editor del registro +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Salva una schermata +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Lancia l'editor dei documenti +MSPAINT_TITLE=Paint +MSPAINT_DESC=Lancia Paint +CHARMAP_TITLE=CharMap +CHARMAP_DESC=Mappa dei caratteri +KBSWITCH_TITLE=Layout di tastiera +KBSWITCH_DESC=Cambia il layout di tastiera +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Lancia l'editor del registro +DXDIAG_TITLE=ReactX Diagnostica +DXDIAG_DESC=Esegui il programma di diagnostica ReactX- +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Ingrandisci +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Esegui Multimedia Player +SNDVOL_TITLE=Controllo Volume +SNDVOL_DESC=Esegui Controllo Volume +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Esegui il Registratore di suonoi +SOL_TITLE=Solitario +SOL_DESC=Solitario +WINMINE_TITLE=WineMine +WINMINE_DESC=Campo minato +SPIDER_TITLE=Spider + +; LANG_JAPANESE SUBLANG_NEUTRAL +[Strings.0011] +ACCESSORIES=ã¢ã¯ã»ãµãª +SYSTOOLS=ã·ã¹ãã ãã¼ã« +ACCESIBILITY=ã¢ã¯ã»ã·ããªãã£ +ENTERTAINMENT=ã¨ã³ã¿ã¼ãã¤ã¡ã³ã +GAMES=ã²ã¼ã + +CMD_TITLE=ã³ãã³ã ããã³ãã +CMD_DESC=ã³ãã³ã ããã³ãããéãã¾ã +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=ã¨ã¯ã¹ããã¼ã©ãèµ·åãã¾ã +RAPPS_TITLE=ReactOS ã¢ããªã±ã¼ã·ã§ã³ ããã¼ã¸ã£ +RAPPS_DESC=æ§ããªã¢ããªã±ã¼ã·ã§ã³ã®ãã¦ã³ãã¼ãã¨ã¤ã³ã¹ãã¼ã«ãè¡ãã¾ã +SERVMAN_TITLE=ãµã¼ãã¹ ããã¼ã¸ã£ +SERVMAN_DESC=ãµã¼ãã¹ ããã¼ã¸ã£ãèµ·åãã¾ã +DEVMGMT_TITLE=ããã¤ã¹ ããã¼ã¸ã£ +DEVMGMT_DESC=ããã¤ã¹ ããã¼ã¸ã£ãèµ·åãã¾ã +EVENTVWR_TITLE=ã¤ãã³ã ãã¥ã¼ã¢ +EVENTVWR_DESC=ã¤ãã³ã ãã¥ã¼ã¢ãèµ·åãã¾ã +MSCONFIG_TITLE=ã·ã¹ãã ã®æ§æ +MSCONFIG_DESC=ã·ã¹ãã ã®æ§æããã°ã©ã ãéãã¾ã +CALC_TITLE=é»å +CALC_DESC=é»åãèµ·åãã¾ã +NOTEPAD_TITLE=ã¡ã¢å¸³ +NOTEPAD_DESC=ããã¹ãã¨ãã£ã¿ãèµ·åãã¾ã +MSTSC_TITLE=ãªã¢ã¼ã ãã¹ã¯ãããæ¥ç¶ +MSTSC_DESC=ã¬ã¸ã¹ããª ã¨ãã£ã¿ãèµ·åãã¾ã +SCREENSHOT_TITLE=ã¹ãããã·ã§ãã +SCREENSHOT_DESC=ã¹ã¯ãªã¼ã³ã·ã§ãããæ®ãã¾ã +WORDPAD_TITLE=ã¯ã¼ãããã +WORDPAD_DESC=ããã¥ã¡ã³ãã¨ãã£ã¿ãèµ·åãã¾ã +MSPAINT_TITLE=ãã¤ã³ã +MSPAINT_DESC=ãã¤ã³ããèµ·åãã¾ã +CHARMAP_TITLE=æåã³ã¼ãè¡¨ +CHARMAP_DESC=æåã³ã¼ãè¡¨ +KBSWITCH_TITLE=ãã¼ãã¼ã ã¬ã¤ã¢ã¦ã åæ¿å¨ +KBSWITCH_DESC=ãã¼ãã¼ãã¬ã¤ã¢ã¦ãåæ¿å¨ +REGEDIT_TITLE=ã¬ã¸ã¹ããª ã¨ãã£ã¿ +REGEDIT_DESC=ã¬ã¸ã¹ããª ã¨ãã£ã¿ãèµ·åãã¾ã +DXDIAG_TITLE=ReactX è¨ºæ +DXDIAG_DESC=ReactX è¨ºæ ããã°ã©ã ãèµ·åãã¾ã +MAGNIFY_TITLE=æ¡å¤§é¡ +MAGNIFY_DESC=æ¡å¤§é¡ +MPLAY_TITLE=ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤ +MPLAY_DESC=ãã«ãã¡ãã£ã¢ ãã¬ã¼ã¤ã¼ãèµ·åãã¾ã +SNDVOL_TITLE=ããªã¥ã¼ã ã³ã³ããã¼ã« +SNDVOL_DESC=ããªã¥ã¼ã ã³ã³ããã¼ã«ãèµ·åãã¾ã +SNDREC32_TITLE=ãªã¼ãã£ãªã¬ã³ã¼ã +SNDREC32_DESC=ãµã¦ã³ã ã¬ã³ã¼ããèµ·åãã¾ã +SOL_TITLE=ã½ãªãã£ã¢ +SOL_DESC=ã½ãªãã£ã¢ +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=ã¹ãã¤ã ã½ãªãã£ã¢ + +; LANG_DUTCH SUBLANG_NEUTRAL +[Strings.0013] +ACCESSORIES=Accessories +SYSTOOLS=System Tools +ACCESIBILITY=Accessibility +ENTERTAINMENT=Entertainment +GAMES=Games + +CMD_TITLE=Command Prompt +CMD_DESC=Open command prompt +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Launch Explorer +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Download and install various applications +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Launch Service Manager +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Launch Device Manager +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Launch Event Viewer +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Launch System Configuration program +CALC_TITLE=Calculator +CALC_DESC=Launch Calculator +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Launch Text Editor +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Launch Registry Editor +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Take screenshot +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Launch Document Editor +MSPAINT_TITLE=Paint +MSPAINT_DESC=Launch Paint +CHARMAP_TITLE=CharMap +CHARMAP_DESC=CharMap +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Keyboard Layout Switcher +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Launch Registry Editor +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Launch ReactX-Diagnostic program +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Magnify +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Launch Multimedia Player +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Launch Volume Control +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Solitaire +SOL_DESC=Solitaire +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_NORWEGIAN SUBLANG_NEUTRAL +[Strings.0014] +ACCESSORIES=TilbehÃ¸r +SYSTOOLS=SystemverktÃ¸y +ACCESIBILITY=Tilgjengelighet +ENTERTAINMENT=Underholdning +GAMES=Spill + +CMD_TITLE=Command Prompt +CMD_DESC=Ãpne Kommandolinje +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Start Utforsker +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=Last ned og innstaller forskjellige applikasjoner +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Start Tjenestebehandler +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Start Enhetsbehandler +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Start Hendelseliste +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Start Systemkonfigurasjon +CALC_TITLE=Calculator +CALC_DESC=Start Kalkulator +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Start Tekstredigering +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Start Registerredigering +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Ta skjermbilde +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Start Dokument redigering +MSPAINT_TITLE=Paint +MSPAINT_DESC=Start Paint +CHARMAP_TITLE=CharMap +CHARMAP_DESC=Tegnkart +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Endre tastaturvalg +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Start Registerredigering +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=KjÃ¸r ReactX-Diagnose program +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=ForstÃ¸rrelse +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Start Multimedia avspiller +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Start Volumkontroll +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Solitaire +SOL_DESC=Kabal +WINMINE_TITLE=WineMine +WINMINE_DESC=Minnesveiper +SPIDER_TITLE=Spider Solitaire + +; LANG_POLISH SUBLANG_NEUTRAL +[Strings.0015] +ACCESSORIES=Akcesoria +SYSTOOLS=NarzÄdzia systemowe +ACCESIBILITY=UÅatwienia DostÄpu +ENTERTAINMENT=Rozrywka +GAMES=Gry + +CMD_TITLE=Wiersz poleceÅ +CMD_DESC=Uruchom konsolÄ +EXPLORER_TITLE=Eksplorator ReactOS +EXPLORER_DESC=Uruchom Eksplorator +RAPPS_TITLE=MenedÅ¼er aplikacji ReactOS +RAPPS_DESC=ÅciÄgnij i zainstaluj inne aplikacje +SERVMAN_TITLE=MenedÅ¼er usÅug +SERVMAN_DESC=Uruchom MenedÅ¼er usÅug +DEVMGMT_TITLE=MenedÅ¼er urzÄdzeÅ +DEVMGMT_DESC=Uruchom MenedÅ¼er urzÄdzeÅ +EVENTVWR_TITLE=PodglÄd zdarzeÅ +EVENTVWR_DESC=Uruchom PodglÄd ZdarzeÅ +MSCONFIG_TITLE=Konfiguracja systemowa +MSCONFIG_DESC=Uruchom NarzÄdzie konfiguracji systemu +CALC_TITLE=Kalkulator +CALC_DESC=Uruchom Kalkulator +NOTEPAD_TITLE=Notatnik +NOTEPAD_DESC=Uruchom Edytor tekstu +MSTSC_TITLE=DostÄp zdalny +MSTSC_DESC=Uruchom Edytor rejestru +SCREENSHOT_TITLE=Zrzut ekranu +SCREENSHOT_DESC=Zrzut ekranu +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Uruchom WordPada +MSPAINT_TITLE=MSPaint +MSPAINT_DESC=Uruchom Paint +CHARMAP_TITLE= +CHARMAP_DESC=Tablica znakÃ³w +KBSWITCH_TITLE=Zmiana ukÅadu klawiatury +KBSWITCH_DESC=Zmiana ukÅadu klawiatury +REGEDIT_TITLE=Edytor rejestru +REGEDIT_DESC=Uruchom Edytor rejestru +DXDIAG_TITLE=Program diagnostyczny ReactX +DXDIAG_DESC=Uruchom program diagnostyczny ReactX +MAGNIFY_TITLE=Lupa +MAGNIFY_DESC=Lupa +MPLAY_TITLE=Odtwarzacz multimedialny +MPLAY_DESC=Uruchom Odtwarzacz multimedialny +SNDVOL_TITLE=Regulacja gÅoÅnoÅci +SNDVOL_DESC=Uruchom regulacjÄ gÅoÅnoÅci +SNDREC32_TITLE=Rejestrator dÅºwiÄku +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=Pasjans +SOL_DESC=Pasjans +WINMINE_TITLE=Saper +WINMINE_DESC=Saper +SPIDER_TITLE=Spider Solitaire + +; LANG_PORTUGUESE SUBLANG_NEUTRAL +[Strings.0016] +ACCESSORIES=AcessÃ³rios +SYSTOOLS=Ferramentas de Sistema +ACCESIBILITY=Acessibilidade +ENTERTAINMENT=Entretenimento +GAMES=Jogos + +CMD_TITLE=Command Prompt +CMD_DESC=Abrir prompt de comando +EXPLORER_TITLE=ReactOS Explorer +EXPLORER_DESC=Iniciar Explorer +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=FaÃ§a o download e instale vÃ¡rias aplicaÃ§Ãµes +SERVMAN_TITLE=Service Manager +SERVMAN_DESC=Iniciar Gerenciador de ServiÃ§os +DEVMGMT_TITLE=Device Manager +DEVMGMT_DESC=Iniciar Gerenciador de Dispositivos +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Iniciar Visualizador de Eventos +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Iniciar Software de ConfiguraÃ§Ã£o do Sistema +CALC_TITLE=Calculator +CALC_DESC=Iniciar Calculadora +NOTEPAD_TITLE=Notepad +NOTEPAD_DESC=Iniciar Editor de Texto +MSTSC_TITLE=Remote Desktop +MSTSC_DESC=Iniciar Editor do Registro +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Capturar Tela +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Iniciar Editor de Documentos +MSPAINT_TITLE=Paint +MSPAINT_DESC=Iniciar Paint +CHARMAP_TITLE=Character Map +CHARMAP_DESC=Mapa de Caracteres +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Alterador de Layout de Teclado +REGEDIT_TITLE=Regedit +REGEDIT_DESC=Iniciar Editor do Registro +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Iniciar o ReactX-Diagnostic +MAGNIFY_TITLE=Magnify +MAGNIFY_DESC=Ampliar +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Iniciar Player MultimÃdia +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Iniciar Controle de Volume +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Iniciar Gravador de Som +SOL_TITLE=Solitaire +SOL_DESC=PaciÃªncia +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_ROMANIAN SUBLANG_NEUTRAL +[Strings.0018] +ACCESSORIES=Accesorii +SYSTOOLS=Instrumente de sistem +ACCESIBILITY=Accesibilitate +ENTERTAINMENT=DistracÈie +GAMES=Jocuri + +CMD_TITLE=Linie de comandÄ +CMD_DESC=Deschide Linia de comandÄ +EXPLORER_TITLE=Explorator ReactOS +EXPLORER_DESC=Deschide Explorator ReactOS +RAPPS_TITLE=Gestionar de aplicaÈii +RAPPS_DESC=DescÄrcare Èi instalare diverse programe. +SERVMAN_TITLE=Gestionar de servicii +SERVMAN_DESC=Deschide Gestionar de servicii +DEVMGMT_TITLE=Gestionar de dispozitive +DEVMGMT_DESC=Deschide Gestionar de dispozitive +EVENTVWR_TITLE=Observator de evenimente +EVENTVWR_DESC=Deschide Gestionar de evenimente +MSCONFIG_TITLE=Configurator de sistem +MSCONFIG_DESC=Deschide Configurator de sistem +CALC_TITLE=Minicalculator +CALC_DESC=Deschide Minicalculator +NOTEPAD_TITLE=CarneÈel +NOTEPAD_DESC=Deschide CarneÈel +MSTSC_TITLE=Birou la distanÈÄ +MSTSC_DESC=Deschide Editor de registru +SCREENSHOT_TITLE=CapturÄ de ecran +SCREENSHOT_DESC=ExecutÄ CapturÄ de ecran +WORDPAD_TITLE=Editor de documente +WORDPAD_DESC=Deschide Editor de documente +MSPAINT_TITLE=Pictare +MSPAINT_DESC=Deschide Pictare +CHARMAP_TITLE=Harta caracterelor +CHARMAP_DESC=Deschide harta caracterelor +KBSWITCH_TITLE=Comutator aranjamente de tastaturÄ +KBSWITCH_DESC=Comutatorul aranjamentelor de tastaturÄ +REGEDIT_TITLE=Editor de registru +REGEDIT_DESC=Deschide Editor de registru +DXDIAG_TITLE=Diagnostic ReactX +DXDIAG_DESC=Deschide instrumentul de diagnostic React-X +MAGNIFY_TITLE=LupÄ +MAGNIFY_DESC=LupÄ +MPLAY_TITLE=Lector multimedia +MPLAY_DESC=Deschide lectorul multimedia +SNDVOL_TITLE=Reglaj de volum +SNDVOL_DESC=Deschide reglajele de volum +SNDREC32_TITLE=Ãnregistrator audio +SNDREC32_DESC=Deschide Ã®nregistratorul audio +SOL_TITLE=PasienÈÄ +SOL_DESC=PasienÈÄ +WINMINE_TITLE=Genist +WINMINE_DESC=Genist +SPIDER_TITLE=PasienÈÄ-pÄianjen + +; LANG_RUSSIAN SUBLANG_NEUTRAL +[Strings.0019] +ACCESSORIES=Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ +SYSTOOLS=Ð¡Ð»ÑÐ¶ÐµÐ±Ð½ÑÐµ +ACCESIBILITY=Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ +ENTERTAINMENT=Ð Ð°Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ñ +GAMES=ÐÐ³ÑÑ + +CMD_TITLE=ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° +CMD_DESC=ÐÑÐºÑÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½ÑÑ ÑÑÑÐ¾ÐºÑ +EXPLORER_TITLE=ÐÑÐ¾Ð²Ð¾Ð´Ð½Ð¸Ðº ReactOS +EXPLORER_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐÑÐ¾Ð²Ð¾Ð´Ð½Ð¸Ðº +RAPPS_TITLE=ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ ReactOS +RAPPS_DESC=Ð¡ÐºÐ°ÑÐ°ÑÑ Ð¸ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÑÐ³Ð¸Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ +SERVMAN_TITLE=ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÐ»ÑÐ¶Ð± +SERVMAN_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð´Ð¸ÑÐ¿ÐµÑÑÐµÑ ÑÐ»ÑÐ¶Ð± +DEVMGMT_TITLE=ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² +DEVMGMT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð´Ð¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² +EVENTVWR_TITLE=ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ¾Ð±ÑÑÐ¸Ð¹ +EVENTVWR_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° ÑÐ¾Ð±ÑÑÐ¸Ð¹ +MSCONFIG_TITLE=ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ +MSCONFIG_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¸ÑÑÐµÐ¼Ñ +CALC_TITLE=ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ +CALC_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÐºÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ +NOTEPAD_TITLE=ÐÐ»Ð¾ÐºÐ½Ð¾Ñ +NOTEPAD_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÐºÑÑÐ¾Ð²ÑÐ¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ +MSTSC_TITLE=Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð±Ð¾ÑÐ¸Ð¹ ÑÑÐ¾Ð» +MSTSC_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÐµÑÑÑÐ° +SCREENSHOT_TITLE=SnapShot +SCREENSHOT_DESC=Ð¡Ð´ÐµÐ»Ð°ÑÑ ÑÐ½Ð¸Ð¼Ð¾Ðº ÑÐºÑÐ°Ð½Ð° +WORDPAD_TITLE=WordPad +WORDPAD_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¾Ð² +MSPAINT_TITLE=Paint +MSPAINT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Paint +CHARMAP_TITLE=Ð¢Ð°Ð±Ð»Ð¸ÑÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² +CHARMAP_DESC=Ð¢Ð°Ð±Ð»Ð¸ÑÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² +KBSWITCH_TITLE=ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ +KBSWITCH_DESC=ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ +REGEDIT_TITLE=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÐµÑÑÑÐ° +REGEDIT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÐµÑÑÑÐ° +DXDIAG_TITLE=Ð¡ÑÐµÐ´ÑÑÐ²Ð¾ Ð´Ð¸Ð°Ð³Ð½Ð¾ÑÑÐ¸ÐºÐ¸ ReactX +DXDIAG_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð¸Ð°Ð³Ð½Ð¾ÑÑÐ¸ÐºÐ¸ ReactX +MAGNIFY_TITLE=ÐÐºÑÐ°Ð½Ð½Ð°Ñ Ð»ÑÐ¿Ð° +MAGNIFY_DESC=ÐÐºÑÐ°Ð½Ð½Ð°Ñ Ð»ÑÐ¿Ð° +MPLAY_TITLE=ÐÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ +MPLAY_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ +SNDVOL_TITLE=ÐÑÐ¾Ð¼ÐºÐ¾ÑÑÑ +SNDVOL_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ÑÐµÐ³ÑÐ»ÑÑÐ¾Ñ Ð³ÑÐ¾Ð¼ÐºÐ¾ÑÑÐ¸ +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=ÐÐ°ÑÑÑÐ½Ñ ÐÐ¾ÑÑÐ½ÐºÐ° +SOL_DESC=ÐÐ°ÑÑÑÐ½Ñ ÐÐ¾ÑÑÐ½ÐºÐ° +WINMINE_TITLE=Ð¡Ð°Ð¿ÐµÑ +WINMINE_DESC=Ð¡Ð°Ð¿ÐµÑ +SPIDER_TITLE=ÐÐ°ÑÑÑÐ½Ñ ÐÐ°ÑÐº + +; LANG_SLOVAK SUBLANG_NEUTRAL +[Strings.001B] +ACCESSORIES=PrÃsluÅ¡enstvo +SYSTOOLS=SystÃ©movÃ© nÃ¡stroje +ACCESIBILITY=ZjednoduÅ¡enie ovlÃ¡dania +ENTERTAINMENT=ZÃ¡bava +GAMES=Hry + +CMD_TITLE=PrÃkazovÃ½ riadok +CMD_DESC=OtvoriÅ¥ PrÃkazovÃ½ riadok +EXPLORER_TITLE=PrieskumnÃk systÃ©mu ReactOS +EXPLORER_DESC=SpustiÅ¥ PrieskumnÃka +RAPPS_TITLE=ManaÅ¾Ã©r aplikÃ¡ciÃ systÃ©mu ReactOS +RAPPS_DESC=StiahnuÅ¥ a nainÅ¡talovaÅ¥ ÄalÅ¡ie aplikÃ¡cie +SERVMAN_TITLE=SprÃ¡vca sluÅ¾ieb +SERVMAN_DESC=SpustiÅ¥ SprÃ¡vcu sluÅ¾ieb +DEVMGMT_TITLE=SprÃ¡vca zariadenÃ +DEVMGMT_DESC=SpustiÅ¥ SprÃ¡vcu zariadenÃ +EVENTVWR_TITLE=ZobrazovaÄ udalostÃ +EVENTVWR_DESC=SpustiÅ¥ ZobrazovaÄ udalostÃ +MSCONFIG_TITLE=Program na konfigurÃ¡ciu systÃ©mu +MSCONFIG_DESC=SpustiÅ¥ Program na konfigurÃ¡ciu systÃ©mu +CALC_TITLE=KalkulaÄka +CALC_DESC=SpustiÅ¥ KalkulaÄku +NOTEPAD_TITLE=PoznÃ¡mkovÃ½ blok +NOTEPAD_DESC=SpustiÅ¥ TextovÃ½ editor +MSTSC_TITLE=VzdialenÃ¡ pracovnÃ¡ plocha +MSTSC_DESC=SpustiÅ¥ Editor registrov +SCREENSHOT_TITLE=Momentka //SnapShot +SCREENSHOT_DESC=UloÅ¾iÅ¥ obrazovku +WORDPAD_TITLE=WordPad +WORDPAD_DESC=SpustiÅ¥ Editor dokumentov +MSPAINT_TITLE=SkicÃ¡r +MSPAINT_DESC=SpustiÅ¥ SkicÃ¡r +CHARMAP_TITLE=Mapa znakov +CHARMAP_DESC=Mapa znakov +KBSWITCH_TITLE=PrepÃnaÄ rozloÅ¾enia klÃ¡vesnice +KBSWITCH_DESC=PrepÃnaÄ rozloÅ¾enia klÃ¡vesnice +REGEDIT_TITLE=Editor registrov +REGEDIT_DESC=SpustiÅ¥ Editor registrov +DXDIAG_TITLE=Diagnostika ReactX +DXDIAG_DESC=SpustiÅ¥ ReactX - diagnostickÃ½ program +MAGNIFY_TITLE=Lupa +MAGNIFY_DESC=Lupa +MPLAY_TITLE=MultimediÃ¡lny prehrÃ¡vaÄ +MPLAY_DESC=SpustiÅ¥ MultimediÃ¡lny prehrÃ¡vaÄ +SNDVOL_TITLE=OvlÃ¡danie hlasitosti //Volume Control +SNDVOL_DESC=SpustiÅ¥ OvlÃ¡danie hlasitosti +SNDREC32_TITLE=AudiorekordÃ©r +SNDREC32_DESC=SpustiÅ¥ NahrÃ¡vanie zvuku +SOL_TITLE=SolitÃ©r +SOL_DESC=SolitÃ©r +WINMINE_TITLE=MÃny +WINMINE_DESC=MÃny +SPIDER_TITLE=PavÃºÄÃ solitÃ©r + +; LANG_TURKISH SUBLANG_NEUTRAL +[Strings.001F] +ACCESSORIES=DonatÄ±lar +SYSTOOLS=Sistem AraÃ§larÄ± +ACCESIBILITY=EriÅilebilirlik +ENTERTAINMENT=EÄlence +GAMES=Oyunlar + +CMD_TITLE=Komut Ä°stemi +CMD_DESC=Komut istemini aÃ§ +EXPLORER_TITLE=ReactOS Gezgini +EXPLORER_DESC=Gezgin'i baÅlat +RAPPS_TITLE=ReactOS Uygulama YÃ¶neticisi +RAPPS_DESC=ÃeÅitli uygulamalarÄ± indir ve kur +SERVMAN_TITLE=Hizmet YÃ¶neticisi +SERVMAN_DESC=Hizmet YÃ¶neticisi'ni baÅlat +DEVMGMT_TITLE=AygÄ±t YÃ¶neticisi +DEVMGMT_DESC=AygÄ±t YÃ¶neticisi'ni baÅlat +EVENTVWR_TITLE=Olay GÃ¶rÃ¼ntÃ¼leyicisi +EVENTVWR_DESC=Olay GÃ¶rÃ¼ntÃ¼leyici'yi baÅlat +MSCONFIG_TITLE=Sistem KonfigÃ¼rasyonu +MSCONFIG_DESC=Sistem KonfigÃ¼rasyon uygulamasÄ±'nÄ± baÅlat +CALC_TITLE=Hesap Makinesi +CALC_DESC=Hesap Makinesi'ni baÅlat +NOTEPAD_TITLE=Not Defteri +NOTEPAD_DESC=Metin DÃ¼zenleyicisi'ni baÅlat +MSTSC_TITLE=Uzak MasaÃ¼stÃ¼ BaÄlantÄ±sÄ± +MSTSC_DESC=KayÄ±t DÃ¼zenleyicisi'ni baÅlat +SCREENSHOT_TITLE=Ekran GÃ¶rÃ¼ntÃ¼sÃ¼ +SCREENSHOT_DESC=Ekran gÃ¶rÃ¼ntÃ¼sÃ¼ al +WORDPAD_TITLE=WordPad +WORDPAD_DESC=Belge DÃ¼zenleyicisi'ni baÅlat +MSPAINT_TITLE=MSPaint +MSPAINT_DESC=Paint'i baÅlat +CHARMAP_TITLE=Karakter EÅlem +CHARMAP_DESC=Karakter EÅlem'i BaÅlat +KBSWITCH_TITLE=Klavye GiriÅ DeÄiÅtirici +KBSWITCH_DESC=Klavye GiriÅ AracÄ±sÄ±'nÄ± BaÅlat +REGEDIT_TITLE=KayÄ±t DÃ¼zenleyicisi +REGEDIT_DESC=KayÄ±t DÃ¼zenleyicisi'ni baÅlat +DXDIAG_TITLE=ReactX TanÄ± AracÄ± +DXDIAG_DESC=ReactX TanÄ± AracÄ±'nÄ± BaÅlat +MAGNIFY_TITLE=BÃ¼yÃ¼teÃ§ +MAGNIFY_DESC=BÃ¼yÃ¼teÃ§ +MPLAY_TITLE=Ãoklu Ortam OynatÄ±cÄ±sÄ± +MPLAY_DESC=Ãoklu Ortam OynatÄ±cÄ±sÄ±'nÄ± BaÅlat +SNDVOL_TITLE=Ses Denetimi +SNDVOL_DESC=Ses Denetimi'ni BaÅlat +SNDREC32_TITLE=Ses Kaydedicisi +SNDREC32_DESC=Ses Kaydedicisi'ni BaÅlat +SOL_TITLE=Solitaire +SOL_DESC=Solitaire +WINMINE_TITLE=WineMine +WINMINE_DESC=WineMine +SPIDER_TITLE=Spider Solitaire + +; LANG_UKRAINIAN SUBLANG_NEUTRAL +[Strings.0022] +ACCESSORIES=ÐÐ¾Ð¿Ð¾Ð¼ÑÐ¶Ð½Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ +SYSTOOLS=Ð¡Ð»ÑÐ¶Ð±Ð¾Ð²Ñ +ACCESIBILITY=Ð¡Ð¿ÐµÑÑÐ°Ð»ÑÐ½Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ +ENTERTAINMENT=Ð Ð¾Ð·Ð²Ð°Ð³Ð¸ +GAMES=ÐÐ³ÑÐ¸ + +CMD_TITLE=ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ð¹ ÑÑÐ´Ð¾Ðº +CMD_DESC=ÐÑÐ´ÐºÑÐ¸ÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ð¹ ÑÑÐ´Ð¾Ðº +EXPLORER_TITLE=ÐÑÐ¾Ð²ÑÐ´Ð½Ð¸Ðº ReactOS +EXPLORER_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÑÐ¾Ð²ÑÐ´Ð½Ð¸Ðº +RAPPS_TITLE=ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ ReactOS +RAPPS_DESC=ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÑÐ·Ð½Ð¸Ñ Ð´Ð¾Ð´Ð°ÑÐºÑÐ² +SERVMAN_TITLE=ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÐ»ÑÐ¶Ð± +SERVMAN_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ»ÑÐ¶Ð±Ð°Ð¼Ð¸ +DEVMGMT_TITLE=ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ² +DEVMGMT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ² +EVENTVWR_TITLE=ÐÐ³Ð»ÑÐ´Ð°Ñ Ð¿Ð¾Ð´ÑÐ¹ +EVENTVWR_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÐ³Ð»ÑÐ´Ð°Ñ Ð¿Ð¾Ð´ÑÐ¹ +MSCONFIG_TITLE=ÐÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ð¸ +MSCONFIG_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÑÐ¾Ð³ÑÐ°Ð¼Ñ ÐºÐ¾Ð½ÑÑÐ³ÑÑÐ°ÑÑÑ ÑÐ¸ÑÑÐµÐ¼Ð¸ +CALC_TITLE=ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ +CALC_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ +NOTEPAD_TITLE=ÐÐ»Ð¾ÐºÐ½Ð¾Ñ +NOTEPAD_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð¢ÐµÐºÑÑÐ¾Ð²Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ +MSTSC_TITLE=ÐÑÐ´Ð´Ð°Ð»ÐµÐ½Ðµ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ¾Ð±Ð¾ÑÐ¸Ð¼ ÑÑÐ¾Ð»Ð¾Ð¼ +MSTSC_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÑÑÑÑÑ +SCREENSHOT_TITLE=ÐÐ½ÑÐ¼Ð¾Ðº ÐµÐºÑÐ°Ð½Ñ +SCREENSHOT_DESC=ÐÑÐ¾Ð±Ð¸ÑÐ¸ Ð·Ð½ÑÐ¼Ð¾Ðº ÐµÐºÑÐ°Ð½Ð° +WORDPAD_TITLE=WordPad +WORDPAD_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÑÐ² +MSPAINT_TITLE=Paint +MSPAINT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Paint +CHARMAP_TITLE=Ð¢Ð°Ð±Ð»Ð¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ² +CHARMAP_DESC=Ð¢Ð°Ð±Ð»Ð¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ² +KBSWITCH_TITLE=ÐÐµÑÐµÐ¼Ð¸ÐºÐ°Ñ ÑÐ¾Ð·ÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²ÑÐ°ÑÑÑÐ¸ +KBSWITCH_DESC=ÐÐµÑÐµÐ¼Ð¸ÐºÐ°Ñ ÑÐ¾Ð·ÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²ÑÐ°ÑÑÑÐ¸ +REGEDIT_TITLE=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÑÑÑÑÑ +REGEDIT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÑÑÑÑÑ +DXDIAG_TITLE=ÐÑÐ°Ð³Ð½Ð¾ÑÑÐ¸ÐºÐ° ReactX +DXDIAG_DESC=ÐÐ°Ð¿ÑÑÐº Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ Ð´ÑÐ°Ð³Ð½Ð¾ÑÑÐ¸ÐºÐ¸ ReactX +MAGNIFY_TITLE=ÐÐºÑÐ°Ð½Ð½Ð° Ð»ÑÐ¿Ð° +MAGNIFY_DESC=ÐÐºÑÐ°Ð½Ð½Ð° Ð»ÑÐ¿Ð° +MPLAY_TITLE=ÐÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑÑ +MPLAY_DESC=ÐÐ°Ð¿ÑÑÐº Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¾Ð³Ð¾ Ð¿Ð»ÐµÑÑÐ° +SNDVOL_TITLE=Ð ÐµÐ³ÑÐ»ÑÑÐ¾Ñ Ð³ÑÑÐ½Ð¾ÑÑÑ +SNDVOL_DESC=ÐÐ°Ð¿ÑÑÐº ÑÐµÐ³ÑÐ»ÑÑÐ¾ÑÐ° Ð³ÑÑÐ½Ð¾ÑÑÑ +SNDREC32_TITLE=ÐÐ°Ð¿Ð¸ÑÑÐ²Ð°Ñ Ð·Ð²ÑÐºÑ +SNDREC32_DESC=ÐÐ°Ð¿ÑÑÐº Ð·Ð°Ð¿Ð¸ÑÑÐ²Ð°ÑÐ° Ð·Ð²ÑÐºÑ +SOL_TITLE=ÐÐ¾ÑÐ¸Ð½ÐºÐ° +SOL_DESC=ÐÐ¾ÑÐ¸Ð½ÐºÐ° +WINMINE_TITLE=WineMine +WINMINE_DESC=Ð¡Ð°Ð¿ÐµÑ +SPIDER_TITLE=ÐÐ°Ñ'ÑÐ½Ñ ÐÐ°Ð²ÑÐº + +; LANG_CHINESE SUBLANG_CHINESE_SIMPLIFIED +[Strings.0204] +ACCESSORIES=éä»¶ +SYSTOOLS=ç³»ç»å·¥å· +ACCESIBILITY=Accessibility +ENTERTAINMENT=Entertainment +GAMES=æ¸¸æ + +CMD_TITLE=å½ä»¤æç¤ºç¬¦ +CMD_DESC=å½ä»¤æç¤ºç¬¦ +EXPLORER_TITLE=ReactOS èµæºç®¡çå¨ +EXPLORER_DESC=ReactOS èµæºç®¡çå¨ +RAPPS_TITLE=ReactOS Applications Manager +RAPPS_DESC=ä¸è½½å¹¶å®è£å¶ä»åºç¨è½¯ä»¶ +SERVMAN_TITLE=æå¡ +SERVMAN_DESC=æå¡ +DEVMGMT_TITLE=è®¾å¤ç®¡ç +DEVMGMT_DESC=è®¾å¤ç®¡ç +EVENTVWR_TITLE=Event Viewer +EVENTVWR_DESC=Launch Event Viewer +MSCONFIG_TITLE=System Configuration +MSCONFIG_DESC=Launch System Configuration program +CALC_TITLE=è®¡ç®å¨ +CALC_DESC=è®¡ç®å¨ +NOTEPAD_TITLE=è®°äºæ¬ +NOTEPAD_DESC=è®°äºæ¬ +MSTSC_TITLE=è¿ç¨æ¡é¢è¿æ¥ +MSTSC_DESC=æ³¨åè¡¨ç¼è¾å¨ +SCREENSHOT_TITLE=å±å¹æªå¾ +SCREENSHOT_DESC=å±å¹æªå¾ +WORDPAD_TITLE=ååæ¿ +WORDPAD_DESC=ååæ¿ +MSPAINT_TITLE=Paint +MSPAINT_DESC=Launch Paint +CHARMAP_TITLE=åç¬¦æ å°è¡¨ +CHARMAP_DESC=åç¬¦æ å°è¡¨ +KBSWITCH_TITLE=Keyboard Layout Switcher +KBSWITCH_DESC=Keyboard Layout Switcher +REGEDIT_TITLE=æ³¨åè¡¨ç¼è¾å¨ +REGEDIT_DESC=æ³¨åè¡¨ç¼è¾å¨ +DXDIAG_TITLE=ReactX Diagnostic +DXDIAG_DESC=Launch ReactX-Diagnostic program +MAGNIFY_TITLE=æ¾å¤§é +MAGNIFY_DESC=æ¾å¤§é +MPLAY_TITLE=Multimedia Player +MPLAY_DESC=Launch Multimedia Player +SNDVOL_TITLE=Volume Control +SNDVOL_DESC=Launch Volume Control +SNDREC32_TITLE=Audiorecorder +SNDREC32_DESC=Launch Sound Recorder +SOL_TITLE=çº¸ç +SOL_DESC=çº¸ç +WINMINE_TITLE=æ«é· +WINMINE_DESC=æ«é· +SPIDER_TITLE=Spider Solitaire

1 0

[ekohl] 59107: [SAMSRV] Set default group membership for new users.
by ekohl＠svn.reactos.org 29 May '13

29 May '13

Author: ekohl Date: Wed May 29 16:09:10 2013 New Revision: 59107 URL: http://svn.reactos.org/svn/reactos?rev=59107&view=rev Log: [SAMSRV] Set default group membership for new users. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed May 29 16:09:10 2013 @@ -2096,6 +2096,7 @@ SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; + GROUP_MEMBERSHIP GroupMembership; UCHAR LogonHours[23]; ULONG ulSize; ULONG ulRid; @@ -2365,7 +2366,22 @@ return Status; } - /* FIXME: Set Groups attribute*/ + /* Set Groups attribute*/ + GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; + GroupMembership.Attributes = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED | + SE_GROUP_ENABLED_BY_DEFAULT; + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + &GroupMembership, + sizeof(GROUP_MEMBERSHIP)); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } /* Set LMPwd attribute*/ Status = SampSetObjectAttribute(UserObject, @@ -7638,6 +7654,7 @@ SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; + GROUP_MEMBERSHIP GroupMembership; UCHAR LogonHours[23]; ULONG ulSize; ULONG ulRid; @@ -7914,7 +7931,22 @@ return Status; } - /* FIXME: Set Groups attribute*/ + /* Set Groups attribute*/ + GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; + GroupMembership.Attributes = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED | + SE_GROUP_ENABLED_BY_DEFAULT; + + Status = SampSetObjectAttribute(UserObject, + L"Groups", + REG_BINARY, + &GroupMembership, + sizeof(GROUP_MEMBERSHIP)); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } /* Set LMPwd attribute*/ Status = SampSetObjectAttribute(UserObject, Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Wed May 29 16:09:10 2013 @@ -168,6 +168,7 @@ ULONG UserAccountControl) { SAM_USER_FIXED_DATA FixedUserData; + GROUP_MEMBERSHIP GroupMembership; UCHAR LogonHours[23]; LPWSTR lpEmptyString = L""; DWORD dwDisposition; @@ -294,7 +295,18 @@ (LPVOID)LogonHours, sizeof(LogonHours)); - /* FIXME: Set Groups attribute*/ + /* Set Groups attribute*/ + GroupMembership.RelativeId = DOMAIN_GROUP_RID_USERS; + GroupMembership.Attributes = SE_GROUP_MANDATORY | + SE_GROUP_ENABLED | + SE_GROUP_ENABLED_BY_DEFAULT; + + RegSetValueEx(hAccountKey, + L"Groups", + 0, + REG_BINARY, + (LPVOID)&GroupMembership, + sizeof(GROUP_MEMBERSHIP)); /* Set LMPwd attribute*/ RegSetValueEx(hAccountKey,

1 0

[gadamopoulos] 59106: [hivedef.inf] - Fix the names of the colors and sizes of the classic theme. - Fixes CORE-7149
by gadamopoulos＠svn.reactos.org 29 May '13

29 May '13

Author: gadamopoulos Date: Wed May 29 13:23:27 2013 New Revision: 59106 URL: http://svn.reactos.org/svn/reactos?rev=59106&view=rev Log: [hivedef.inf] - Fix the names of the colors and sizes of the classic theme. - Fixes CORE-7149 Modified: trunk/reactos/boot/bootdata/hivedef.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Wed May 29 13:23:27 2013 @@ -241,7 +241,9 @@ HKCU,"Control Panel\Appearance\New Schemes","SelectedStyle",0x00020000,"0" ; ReactOS Standard HKCU,"Control Panel\Appearance\New Schemes\0","DisplayName",0x00020000,"@themeui.dll,-883" +HKCU,"Control Panel\Appearance\New Schemes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -299,10 +301,11 @@ HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #29",0x00010001,0x006a240a HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #30",0x00010001,0x00c8d0d4 HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_0%" ; Brick HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\1","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -360,10 +363,11 @@ HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #30",0x00010001,0x00a5bfc2 HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_1%" ; Eggplant HKCU,"Control Panel\Appearance\New Schemes\2","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\2","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -421,10 +425,11 @@ HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color #29",0x00010001,0x00788058 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Color #30",0x00010001,0x00a8b090 HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\2\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_2%" ; Green Olive HKCU,"Control Panel\Appearance\New Schemes\3","DisplayName",0x00020000,"@themeui.dll,-877" +HKCU,"Control Panel\Appearance\New Schemes\3","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -482,10 +487,11 @@ HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color #29",0x00010001,0x00649759 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Color #30",0x00010001,0x00a9c8a2 HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\3\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_3%" ; High Contrast 1 HKCU,"Control Panel\Appearance\New Schemes\4","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\4","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -543,10 +549,11 @@ HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color #29",0x00010001,0x00008000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\4\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_4%" ; High Contrast 2 HKCU,"Control Panel\Appearance\New Schemes\5","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\5","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -604,10 +611,11 @@ HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color #29",0x00010001,0x00ff0000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\5\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_5%" ; High Contrast Black HKCU,"Control Panel\Appearance\New Schemes\6","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\6\","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -665,10 +673,11 @@ HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Color #30",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\6\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_6%" ; High Contrast White HKCU,"Control Panel\Appearance\New Schemes\7","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\7","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -726,10 +735,11 @@ HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color #29",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Color #30",0x00010001,0x00ffffff HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\7\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_7%" ; Lilac HKCU,"Control Panel\Appearance\New Schemes\8","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\8","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -787,10 +797,11 @@ HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color #29",0x00010001,0x00b14e5a HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Color #30",0x00010001,0x00d9a8ae HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\8\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_8%" ; Maple HKCU,"Control Panel\Appearance\New Schemes\9","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\9","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -848,10 +859,11 @@ HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color #29",0x00010001,0x0046a6c6 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Color #30",0x00010001,0x00aed8e6 HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\9\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_9%" ; Marine HKCU,"Control Panel\Appearance\New Schemes\10","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\10","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -909,10 +921,11 @@ HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color #29",0x00010001,0x00800000 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Color #30",0x00010001,0x00b8c088 HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\10\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_10%" ; Plum HKCU,"Control Panel\Appearance\New Schemes\11","DisplayName",0x00020000,"@themeui.dll,-869" +HKCU,"Control Panel\Appearance\New Schemes\11","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%" HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -970,10 +983,11 @@ HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Color #30",0x00010001,0x009098a8 HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\11\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_11%" ; Pumpkin HKCU,"Control Panel\Appearance\New Schemes\12","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\12","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1031,10 +1045,11 @@ HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Color #30",0x00010001,0x009dd5ec HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\12\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_12%" ; Rainy Day HKCU,"Control Panel\Appearance\New Schemes\13","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\13","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1092,10 +1107,11 @@ HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color #29",0x00010001,0x007d654f HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Color #30",0x00010001,0x00b19983 HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\13\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_13%" ; ReactOS Classic HKCU,"Control Panel\Appearance\New Schemes\14","DisplayName",0x00020000,"@themeui.dll,-880" +HKCU,"Control Panel\Appearance\New Schemes\14","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%" HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1153,10 +1169,11 @@ HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color #29",0x00010001,0x00800000 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\14\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_14%" ; Rose HKCU,"Control Panel\Appearance\New Schemes\15","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\15","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1214,10 +1231,11 @@ HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color #29",0x00010001,0x0070609f HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Color #30",0x00010001,0x00b7afcf HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\15\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_15%" ; Sand HKCU,"Control Panel\Appearance\New Schemes\16","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\16","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%" HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1275,10 +1293,11 @@ HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Color #30",0x00010001,0x00bbccd5 HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\16\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_16%" ; Sky (WinXP-like) HKCU,"Control Panel\Appearance\New Schemes\17","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\17","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1336,10 +1355,11 @@ HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color #29",0x00010001,0x00c56a31 HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Color #30",0x00010001,0x00d8e9ec HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\17\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_17%" ; Slate HKCU,"Control Panel\Appearance\New Schemes\18","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\18","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1397,10 +1417,11 @@ HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color #29",0x00010001,0x00978055 HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Color #30",0x00010001,0x00c8b99d HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\18\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_18%" ; Storm HKCU,"Control Panel\Appearance\New Schemes\19","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\19","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1458,10 +1479,11 @@ HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color #29",0x00010001,0x00800080 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\19\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_19%" ; Teal HKCU,"Control Panel\Appearance\New Schemes\20","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\20","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1519,10 +1541,11 @@ HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color #29",0x00010001,0x00808000 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Color #30",0x00010001,0x00c0c0c0 HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\20\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_20%" ; Wheat HKCU,"Control Panel\Appearance\New Schemes\21","DisplayName",0x00020000,"@themeui.dll,-851" +HKCU,"Control Panel\Appearance\New Schemes\21","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_SIZE_0%" HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Flat Menus",0x00010001,0x00000000 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ 00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ @@ -1580,7 +1603,6 @@ HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color #29",0x00010001,0x00008080 HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Color #30",0x00010001,0x00a0dede HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","Contrast",0x00010001,0x00000000 -HKCU,"Control Panel\Appearance\New Schemes\21\Sizes\0","LegacyName",0x00020000,"%DESKTOP_SCHEME_21%" HKCU,"Control Panel\Sound","Beep",2,"yes" HKCU,"Control Panel\Sound","ExtendedSounds",2,"yes" @@ -1875,6 +1897,7 @@ DESKTOP_SCHEME_19="Storm" DESKTOP_SCHEME_20="Teal" DESKTOP_SCHEME_21="Wheat" +DESKTOP_SCHEME_SIZE_0="Default size" TEMP_DIR="%USERPROFILE%\Local Settings\Temp"

1 0

[gadamopoulos] 59105: [desk.cpl] - If loading the name of a classic color fails, try to read it from the "LegacyName" value
by gadamopoulos＠svn.reactos.org 29 May '13

29 May '13

Author: gadamopoulos Date: Wed May 29 13:14:37 2013 New Revision: 59105 URL: http://svn.reactos.org/svn/reactos?rev=59105&view=rev Log: [desk.cpl] - If loading the name of a classic color fails, try to read it from the "LegacyName" value Modified: trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=5… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Wed May 29 13:14:37 2013 @@ -573,6 +573,16 @@ NULL, 0, NULL); + if (Result != ERROR_SUCCESS) + { + Result = RegLoadMUIStringW(hkScheme, + L"LegacyName", + wstrDisplayName, + sizeof(wstrDisplayName), + NULL, + 0, + NULL); + } if (Result == ERROR_SUCCESS) pCurrentStyle = CreateStyle(wstrStyleName, wstrDisplayName);

1 0

[ekohl] 59104: [DISKPART] * Simplified the help system * Removed an unnecessary check in the help system that listed the first help entry 'active' no matter what was entered into the help system, e...
by ekohl＠svn.reactos.org 29 May '13

29 May '13

Author: ekohl Date: Wed May 29 11:40:43 2013 New Revision: 59104 URL: http://svn.reactos.org/svn/reactos?rev=59104&view=rev Log: [DISKPART] * Simplified the help system * Removed an unnecessary check in the help system that listed the first help entry 'active' no matter what was entered into the help system, even if the word is not in the list. * Removed exit_main and rem_main functions since it took a little extra processing time and made the code a bit harder to read. Now it determines if the given command is rem or exit first before looking through the entire function list. * Converted WCHAR* to LPWSTR to make it a bit easier to read. * Add a title to the program to make it easier for the user to determine the name of the application currently running, especially if a large script is being used. Patch by Lee Schroeder. Thanks! CORE-7187 #resolve #comment Committed in r79104. Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/diskpart/active.c trunk/reactos/base/system/diskpart/add.c trunk/reactos/base/system/diskpart/assign.c trunk/reactos/base/system/diskpart/attach.c trunk/reactos/base/system/diskpart/attributes.c trunk/reactos/base/system/diskpart/automount.c trunk/reactos/base/system/diskpart/break.c trunk/reactos/base/system/diskpart/clean.c trunk/reactos/base/system/diskpart/compact.c trunk/reactos/base/system/diskpart/convert.c trunk/reactos/base/system/diskpart/create.c trunk/reactos/base/system/diskpart/delete.c trunk/reactos/base/system/diskpart/detach.c trunk/reactos/base/system/diskpart/detail.c trunk/reactos/base/system/diskpart/diskpart.c trunk/reactos/base/system/diskpart/diskpart.h trunk/reactos/base/system/diskpart/expand.c trunk/reactos/base/system/diskpart/extend.c trunk/reactos/base/system/diskpart/filesystems.c trunk/reactos/base/system/diskpart/format.c trunk/reactos/base/system/diskpart/gpt.c trunk/reactos/base/system/diskpart/help.c trunk/reactos/base/system/diskpart/import.c trunk/reactos/base/system/diskpart/inactive.c trunk/reactos/base/system/diskpart/interpreter.c trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/diskpart/list.c trunk/reactos/base/system/diskpart/merge.c trunk/reactos/base/system/diskpart/offline.c trunk/reactos/base/system/diskpart/online.c trunk/reactos/base/system/diskpart/recover.c trunk/reactos/base/system/diskpart/remove.c trunk/reactos/base/system/diskpart/repair.c trunk/reactos/base/system/diskpart/rescan.c trunk/reactos/base/system/diskpart/resource.h trunk/reactos/base/system/diskpart/retain.c trunk/reactos/base/system/diskpart/san.c trunk/reactos/base/system/diskpart/select.c trunk/reactos/base/system/diskpart/setid.c trunk/reactos/base/system/diskpart/shrink.c trunk/reactos/base/system/diskpart/uniqueid.c Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Wed May 29 11:40:43 2013 @@ -41,7 +41,7 @@ diskpart.rc) set_module_type(diskpart win32cui UNICODE) -add_importlibs(diskpart user32 msvcrt kernel32) +add_importlibs(diskpart user32 msvcrt advapi32 kernel32) if(MSVC) add_importlibs(diskpart ntdll) endif() Modified: trunk/reactos/base/system/diskpart/active.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/activ… ============================================================================== --- trunk/reactos/base/system/diskpart/active.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/active.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,18 +8,9 @@ #include "diskpart.h" -BOOL active_main(INT argc, WCHAR **argv) +BOOL active_main(INT argc, LPWSTR *argv) { printf("\nActive\n"); return TRUE; } - -/* - * help_active(): - * Shows the description and explains each argument type of the active command - */ -VOID help_active(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ACTIVE); -} Modified: trunk/reactos/base/system/diskpart/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/add.c… ============================================================================== --- trunk/reactos/base/system/diskpart/add.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/add.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,16 +8,7 @@ #include "diskpart.h" -BOOL add_main(INT argc, WCHAR **argv) +BOOL add_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_add(): - * Shows the description and explains each argument type of the add command - */ -VOID help_add(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ADD); -} Modified: trunk/reactos/base/system/diskpart/assign.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/assig… ============================================================================== --- trunk/reactos/base/system/diskpart/assign.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/assign.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,16 +7,7 @@ */ #include "diskpart.h" -BOOL assign_main(INT argc, WCHAR **argv) +BOOL assign_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_assign(): - * Shows the description and explains each argument type of the assign command - */ -VOID help_assign(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ASSIGN); -} Modified: trunk/reactos/base/system/diskpart/attach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attac… ============================================================================== --- trunk/reactos/base/system/diskpart/attach.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/attach.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,17 +7,7 @@ */ #include "diskpart.h" -BOOL attach_main(INT argc, WCHAR **argv) +BOOL attach_main(INT argc, LPWSTR *argv) { return TRUE; -} - - -/* - * help_attach(): - * Shows the description and explains each argument type of the attach command - */ -VOID help_attach(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ATTACH); -} +} Modified: trunk/reactos/base/system/diskpart/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attri… ============================================================================== --- trunk/reactos/base/system/diskpart/attributes.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/attributes.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,16 +7,7 @@ */ #include "diskpart.h" -BOOL attributes_main(INT argc, WCHAR **argv) +BOOL attributes_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_attributes(): - * Shows the description and explains each argument type of the attributes command - */ -VOID help_attributes(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ATTRIBUTES); -} Modified: trunk/reactos/base/system/diskpart/automount.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/autom… ============================================================================== --- trunk/reactos/base/system/diskpart/automount.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/automount.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -7,17 +7,8 @@ */ #include "diskpart.h" -BOOL automount_main(INT argc, WCHAR **argv) +BOOL automount_main(INT argc, LPWSTR *argv) { printf("Automount\n"); return TRUE; } - -/* - * help_automount(): - * Shows the description and explains each argument type of the automount command - */ -VOID help_automount(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_AUTOMOUNT); -} Modified: trunk/reactos/base/system/diskpart/break.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/break… ============================================================================== --- trunk/reactos/base/system/diskpart/break.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/break.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,18 +8,9 @@ */ #include "diskpart.h" -BOOL break_main(INT argc, WCHAR **argv) +BOOL break_main(INT argc, LPWSTR *argv) { printf("\nTODO: Add code later since Win 7 Home Premium doesn't have this feature.\n"); return TRUE; } - -/* - * help_break(): - * Shows the description and explains each argument type of the break command - */ -VOID help_break(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_BREAK); -} Modified: trunk/reactos/base/system/diskpart/clean.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/clean… ============================================================================== --- trunk/reactos/base/system/diskpart/clean.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/clean.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL clean_main(INT argc, WCHAR **argv) +BOOL clean_main(INT argc, LPWSTR *argv) { return TRUE; } - - -/* - * help_clean(): - * Shows the description and explains each argument type of the clean command - */ -VOID help_clean(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_CLEAN); -} Modified: trunk/reactos/base/system/diskpart/compact.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/compa… ============================================================================== --- trunk/reactos/base/system/diskpart/compact.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/compact.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL compact_main(INT argc, WCHAR **argv) +BOOL compact_main(INT argc, LPWSTR *argv) { return 0; } - - -/* - * help_compact(): - * Shows the description and explains each argument type of the compact command - */ -VOID help_compact(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_COMPACT); -} Modified: trunk/reactos/base/system/diskpart/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/conve… ============================================================================== --- trunk/reactos/base/system/diskpart/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/convert.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL convert_main(INT argc, WCHAR **argv) +BOOL convert_main(INT argc, LPWSTR *argv) { return TRUE; } - - -/* - * help_convert(): - * Shows the description and explains each argument type of the convert command - */ -VOID help_convert(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_CONVERT); -} Modified: trunk/reactos/base/system/diskpart/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/creat… ============================================================================== --- trunk/reactos/base/system/diskpart/create.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/create.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,17 +8,7 @@ */ #include "diskpart.h" -BOOL create_main(INT argc, WCHAR **argv) +BOOL create_main(INT argc, LPWSTR *argv) { return TRUE; } - - -/* - * help_create(): - * Shows the description and explains each argument type of the create command - */ -VOID help_create(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_CREATE); -} Modified: trunk/reactos/base/system/diskpart/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/delet… ============================================================================== --- trunk/reactos/base/system/diskpart/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/delete.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,16 +8,7 @@ */ #include "diskpart.h" -BOOL delete_main(INT argc, WCHAR **argv) +BOOL delete_main(INT argc, LPWSTR *argv) { return TRUE; } - -/* - * help_delete(): - * Shows the description and explains each argument type of the delete command - */ -VOID help_delete(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_DELETE); -} Modified: trunk/reactos/base/system/diskpart/detach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detac… ============================================================================== --- trunk/reactos/base/system/diskpart/detach.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/detach.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL detach_main(INT argc, WCHAR **argv) +BOOL detach_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_detach(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_DETACH); -} Modified: trunk/reactos/base/system/diskpart/detail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detai… ============================================================================== --- trunk/reactos/base/system/diskpart/detail.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/detail.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL detail_main(INT argc, WCHAR **argv) +BOOL detail_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_detail(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_DETAIL); -} Modified: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -11,7 +11,6 @@ #include "diskpart.h" /* FUNCTIONS ******************************************************************/ - VOID PrintResourceString(INT resID, ...) { @@ -37,7 +36,9 @@ wprintf(L"\n*WARNING*: This program is incomplete and may not work properly.\n"); /* Print the header information */ + wprintf(L"\n"); PrintResourceString(IDS_APP_HEADER); + wprintf(L"\n"); PrintResourceString(IDS_APP_LICENSE); PrintResourceString(IDS_APP_CURR_COMPUTER, szComputerName); } @@ -79,14 +80,21 @@ * wmain(): * Main entry point of the application. */ -int wmain(int argc, const WCHAR *argv[]) +int wmain(int argc, const LPWSTR argv[]) { LPCWSTR script = NULL; LPCWSTR tmpBuffer = NULL; + WCHAR appTitle[50]; int index, timeout; + /* Sets the title of the program so the user will have an easier time + determining the current program, especially if diskpart is running a + script */ + LoadStringW(GetModuleHandle(NULL), IDS_APP_HEADER, (LPWSTR)appTitle, 50); + SetConsoleTitleW(appTitle); + /* Sets the timeout value to 0 just in case the user doesn't - specify a value. */ + specify a value */ timeout = 0; /* If there are no command arguments, then go straight to the interpreter */ Modified: trunk/reactos/base/system/diskpart/diskpart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Wed May 29 11:40:43 2013 @@ -15,6 +15,7 @@ #include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <wincon.h> #include <winuser.h> #include <stdio.h> #include <stdlib.h> @@ -25,9 +26,10 @@ typedef struct _COMMAND { - WCHAR *name; + LPWSTR name; BOOL (*func)(INT, WCHAR**); - VOID (*help)(INT, WCHAR**); + INT help; + INT help_desc; } COMMAND, *PCOMMAND; extern COMMAND cmds[]; @@ -40,165 +42,126 @@ #define ERROR_SERVICE 4 #define ERROR_SYNTAX 5 -#define DISKPART_VERSION L"0.0.019" - #define MAX_STRING_SIZE 1024 #define MAX_ARGS_COUNT 256 /* PROTOTYPES *****************************************************************/ /* active.c */ -BOOL active_main(INT argc, WCHAR **argv); -VOID help_active(INT argc, WCHAR **argv); +BOOL active_main(INT argc, LPWSTR *argv); /* add.c */ -BOOL add_main(INT argc, WCHAR **argv); -VOID help_add(INT argc, WCHAR **argv); +BOOL add_main(INT argc, LPWSTR *argv); /* assign.c */ -BOOL assign_main(INT argc, WCHAR **argv); -VOID help_assign(INT argc, WCHAR **argv); +BOOL assign_main(INT argc, LPWSTR *argv); /* attach.c */ -BOOL attach_main(INT argc, WCHAR **argv); -VOID help_attach(INT argc, WCHAR **argv); +BOOL attach_main(INT argc, LPWSTR *argv); /* attributes.h */ -VOID help_attributes(INT argc, WCHAR **argv); -BOOL attributes_main(INT argc, WCHAR **argv); +BOOL attributes_main(INT argc, LPWSTR *argv); /* automount.c */ -BOOL automount_main(INT argc, WCHAR **argv); -VOID help_automount(INT argc, WCHAR **argv); +BOOL automount_main(INT argc, LPWSTR *argv); /* break.c */ -BOOL break_main(INT argc, WCHAR **argv); -VOID help_break(INT argc, WCHAR **argv); +BOOL break_main(INT argc, LPWSTR *argv); /* clean.c */ -BOOL clean_main(INT argc, WCHAR **argv); -VOID help_clean(INT argc, WCHAR **argv); +BOOL clean_main(INT argc, LPWSTR *argv); /* compact.c */ -BOOL compact_main(INT argc, WCHAR **argv); -VOID help_compact(INT argc, WCHAR **argv); +BOOL compact_main(INT argc, LPWSTR *argv); /* convert.c */ -BOOL convert_main(INT argc, WCHAR **argv); -VOID help_convert(INT argc, WCHAR **argv); +BOOL convert_main(INT argc, LPWSTR *argv); /* create.c */ -BOOL create_main(INT argc, WCHAR **argv); -VOID help_create(INT argc, WCHAR **argv); +BOOL create_main(INT argc, LPWSTR *argv); /* delete.c */ -BOOL delete_main(INT argc, WCHAR **argv); -VOID help_delete(INT argc, WCHAR **argv); +BOOL delete_main(INT argc, LPWSTR *argv); /* detach.c */ -BOOL detach_main(INT argc, WCHAR **argv); -VOID help_detach(INT argc, WCHAR **argv); +BOOL detach_main(INT argc, LPWSTR *argv); /* detail.c */ -BOOL detail_main(INT argc, WCHAR **argv); -VOID help_detail(INT argc, WCHAR **argv); +BOOL detail_main(INT argc, LPWSTR *argv); /* diskpart.c */ VOID PrintResourceString(INT resID, ...); /* expand.c */ -BOOL expand_main(INT argc, WCHAR **argv); -VOID help_expand(INT argc, WCHAR **argv); +BOOL expand_main(INT argc, LPWSTR *argv); /* extend.c */ -BOOL extend_main(INT argc, WCHAR **argv); -VOID help_extend(INT argc, WCHAR **argv); +BOOL extend_main(INT argc, LPWSTR *argv); /* filesystem.c */ -BOOL filesystems_main(INT argc, WCHAR **argv); -VOID help_filesystems(INT argc, WCHAR **argv); +BOOL filesystems_main(INT argc, LPWSTR *argv); /* format.c */ -BOOL format_main(INT argc, WCHAR **argv); -VOID help_format(INT argc, WCHAR **argv); +BOOL format_main(INT argc, LPWSTR *argv); /* gpt.c */ -BOOL gpt_main(INT argc, WCHAR **argv); -VOID help_gpt(INT argc, WCHAR **argv); +BOOL gpt_main(INT argc, LPWSTR *argv); /* help.c */ -BOOL help_main(INT argc, WCHAR **argv); -VOID help_help(INT argc, WCHAR **argv); +BOOL help_main(INT argc, LPWSTR *argv); VOID help_cmdlist(VOID); -VOID help_print_noerr(VOID); /* import. c */ -BOOL import_main(INT argc, WCHAR **argv); -VOID help_import(INT argc, WCHAR **argv); +BOOL import_main(INT argc, LPWSTR *argv); /* inactive.c */ -BOOL inactive_main(INT argc, WCHAR **argv); -VOID help_inactive(INT argc, WCHAR **argv); +BOOL inactive_main(INT argc, LPWSTR *argv); /* interpreter.c */ -BOOL InterpretScript(WCHAR *line); -BOOL InterpretCmd(INT argc, WCHAR **argv); +BOOL InterpretScript(LPWSTR line); +BOOL InterpretCmd(INT argc, LPWSTR *argv); VOID InterpretMain(VOID); /* list.c */ -BOOL list_main(INT argc, WCHAR **argv); -VOID help_list(INT argc, WCHAR **argv); +BOOL list_main(INT argc, LPWSTR *argv); /* merge.c */ -BOOL merge_main(INT argc, WCHAR **argv); -VOID help_merge(INT argc, WCHAR **argv); +BOOL merge_main(INT argc, LPWSTR *argv); /* offline.c */ -BOOL offline_main(INT argc, WCHAR **argv); -VOID help_offline(INT argc, WCHAR **argv); +BOOL offline_main(INT argc, LPWSTR *argv); /* online.c */ -BOOL online_main(INT argc, WCHAR **argv); -VOID help_online(INT argc, WCHAR **argv); +BOOL online_main(INT argc, LPWSTR *argv); /* recover.c */ -BOOL recover_main(INT argc, WCHAR **argv); -VOID help_recover(INT argc, WCHAR **argv); +BOOL recover_main(INT argc, LPWSTR *argv); /* remove.c */ -BOOL remove_main(INT argc, WCHAR **argv); -VOID help_remove(INT argc, WCHAR **argv); +BOOL remove_main(INT argc, LPWSTR *argv); /* repair.c */ -BOOL repair_main(INT argc, WCHAR **argv); -VOID help_repair(INT argc, WCHAR **argv); +BOOL repair_main(INT argc, LPWSTR *argv); /* rescan.c */ -BOOL rescan_main(INT argc, WCHAR **argv); -VOID help_rescan(INT argc, WCHAR **argv); +BOOL rescan_main(INT argc, LPWSTR *argv); /* retain.c */ -BOOL retain_main(INT argc, WCHAR **argv); -VOID help_retain(INT argc, WCHAR **argv); +BOOL retain_main(INT argc, LPWSTR *argv); /* san.c */ -BOOL san_main(INT argc, WCHAR **argv); -VOID help_san(INT argc, WCHAR **argv); +BOOL san_main(INT argc, LPWSTR *argv); /* select.c */ -BOOL select_main(INT argc, WCHAR **argv); -VOID help_select(INT argc, WCHAR **argv); +BOOL select_main(INT argc, LPWSTR *argv); /* setid.c */ -BOOL setid_main(INT argc, WCHAR **argv); -VOID help_setid(INT argc, WCHAR **argv); +BOOL setid_main(INT argc, LPWSTR *argv); /* shrink.c */ -BOOL shrink_main(INT argc, WCHAR **argv); -VOID help_shrink(INT argc, WCHAR **argv); +BOOL shrink_main(INT argc, LPWSTR *argv); /* uniqueid.c */ -BOOL uniqueid_main(INT argc, WCHAR **argv); -VOID help_uniqueid(INT argc, WCHAR **argv); +BOOL uniqueid_main(INT argc, LPWSTR *argv); #endif /* DISKPART_H */ Modified: trunk/reactos/base/system/diskpart/expand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/expan… ============================================================================== --- trunk/reactos/base/system/diskpart/expand.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/expand.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL expand_main(INT argc, WCHAR **argv) +BOOL expand_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_expand(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_EXPAND); -} Modified: trunk/reactos/base/system/diskpart/extend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/exten… ============================================================================== --- trunk/reactos/base/system/diskpart/extend.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/extend.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL extend_main(INT argc, WCHAR **argv) +BOOL extend_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_extend(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_EXTEND); -} Modified: trunk/reactos/base/system/diskpart/filesystems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/files… ============================================================================== --- trunk/reactos/base/system/diskpart/filesystems.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/filesystems.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL filesystems_main(INT argc, WCHAR **argv) +BOOL filesystems_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_filesystems(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_FILESYSTEMS); -} Modified: trunk/reactos/base/system/diskpart/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/forma… ============================================================================== --- trunk/reactos/base/system/diskpart/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/format.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -3,18 +3,12 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/format.c * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * an interactive way * PROGRAMMERS: Lee Schroeder */ #include "diskpart.h" -BOOL format_main(INT argc, WCHAR **argv) +BOOL format_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_format(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_FORMAT); -} Modified: trunk/reactos/base/system/diskpart/gpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/gpt.c… ============================================================================== --- trunk/reactos/base/system/diskpart/gpt.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/gpt.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,12 +8,7 @@ */ #include "diskpart.h" -BOOL gpt_main(INT argc, WCHAR **argv) +BOOL gpt_main(INT argc, LPWSTR *argv) { return TRUE; } - -VOID help_gpt(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_GPT); -} Modified: trunk/reactos/base/system/diskpart/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/help.… ============================================================================== --- trunk/reactos/base/system/diskpart/help.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/help.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,70 +8,29 @@ #include "diskpart.h" - /* * help_cmdlist(): * shows all the available commands and basic descriptions for diskpart */ VOID help_cmdlist(VOID) { + PCOMMAND cmdptr; + /* Print the header information */ - PrintResourceString(IDS_APP_HEADER, DISKPART_VERSION); + PrintResourceString(IDS_APP_HEADER); + printf("\n"); /* lists all the commands and the basic descriptions */ - PrintResourceString(IDS_HELP_CMD_DESC_ACTIVE); - PrintResourceString(IDS_HELP_CMD_DESC_ADD); - PrintResourceString(IDS_HELP_CMD_DESC_ASSIGN); - PrintResourceString(IDS_HELP_CMD_DESC_ATTACH); - PrintResourceString(IDS_HELP_CMD_DESC_ATTRIBUTES); - PrintResourceString(IDS_HELP_CMD_DESC_AUTOMOUNT); - PrintResourceString(IDS_HELP_CMD_DESC_BREAK); - PrintResourceString(IDS_HELP_CMD_DESC_CLEAN); - PrintResourceString(IDS_HELP_CMD_DESC_COMPACT); - PrintResourceString(IDS_HELP_CMD_DESC_CONVERT); - PrintResourceString(IDS_HELP_CMD_DESC_CREATE); - PrintResourceString(IDS_HELP_CMD_DESC_DELETE); - PrintResourceString(IDS_HELP_CMD_DESC_DETACH); - PrintResourceString(IDS_HELP_CMD_DESC_DETAIL); - PrintResourceString(IDS_HELP_CMD_DESC_EXIT); - PrintResourceString(IDS_HELP_CMD_DESC_EXPAND); - PrintResourceString(IDS_HELP_CMD_DESC_EXTEND); - PrintResourceString(IDS_HELP_CMD_DESC_FS); - PrintResourceString(IDS_HELP_CMD_DESC_FORMAT); - PrintResourceString(IDS_HELP_CMD_DESC_GPT); - PrintResourceString(IDS_HELP_CMD_DESC_HELP); - PrintResourceString(IDS_HELP_CMD_DESC_IMPORT); - PrintResourceString(IDS_HELP_CMD_DESC_INACTIVE); - PrintResourceString(IDS_HELP_CMD_DESC_LIST); - PrintResourceString(IDS_HELP_CMD_DESC_MERGE); - PrintResourceString(IDS_HELP_CMD_DESC_OFFLINE); - PrintResourceString(IDS_HELP_CMD_DESC_ONLINE); - PrintResourceString(IDS_HELP_CMD_DESC_RECOVER); - PrintResourceString(IDS_HELP_CMD_DESC_REM); - PrintResourceString(IDS_HELP_CMD_DESC_REMOVE); - PrintResourceString(IDS_HELP_CMD_DESC_REPAIR); - PrintResourceString(IDS_HELP_CMD_DESC_RESCAN); - PrintResourceString(IDS_HELP_CMD_DESC_RETAIN); - PrintResourceString(IDS_HELP_CMD_DESC_SAN); - PrintResourceString(IDS_HELP_CMD_DESC_SELECT); - PrintResourceString(IDS_HELP_CMD_DESC_SETID); - PrintResourceString(IDS_HELP_CMD_DESC_SHRINK); - PrintResourceString(IDS_HELP_CMD_DESC_UNIQUEID); + for(cmdptr = cmds; cmdptr->name; cmdptr++) + PrintResourceString(cmdptr->help_desc); + printf("\n"); } - - -VOID help_help(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_HELP); -} - - /* help_main(char *arg): * main entry point for the help command. Gives help to users who needs it. */ -BOOL help_main(INT argc, WCHAR **argv) +BOOL help_main(INT argc, LPWSTR *argv) { PCOMMAND cmdptr; @@ -84,9 +43,9 @@ /* Scan internal command table */ for (cmdptr = cmds; cmdptr->name; cmdptr++) { - if (_wcsicmp(argv[1], cmdptr->name) == 0 && cmdptr->help != NULL) + if(_wcsicmp(argv[1], cmdptr->name) == 0) { - cmdptr->help(argc, argv); + PrintResourceString(cmdptr->help); return TRUE; } } Modified: trunk/reactos/base/system/diskpart/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/impor… ============================================================================== --- trunk/reactos/base/system/diskpart/import.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/import.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,12 +8,7 @@ */ #include "diskpart.h" -BOOL import_main(INT argc, WCHAR **argv) +BOOL import_main(INT argc, LPWSTR *argv) { return TRUE; } - -VOID help_import(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_IMPORT); -} Modified: trunk/reactos/base/system/diskpart/inactive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inact… ============================================================================== --- trunk/reactos/base/system/diskpart/inactive.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/inactive.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL inactive_main(INT argc, WCHAR **argv) +BOOL inactive_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_inactive(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_INACTIVE); -} Modified: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… ============================================================================== --- trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -9,68 +9,55 @@ #include "diskpart.h" -BOOL exit_main(INT argc, WCHAR **argv); -BOOL rem_main(INT argc, WCHAR **argv); +BOOL exit_main(INT argc, LPWSTR *argv); +BOOL rem_main(INT argc, LPWSTR *argv); COMMAND cmds[] = { - {L"active", active_main, help_active}, - {L"add", add_main, help_add}, - {L"assign", assign_main, help_assign}, - {L"attributes", attributes_main, help_attributes}, - {L"automount", automount_main, help_automount}, - {L"break", break_main, help_break}, - {L"clean", clean_main, help_clean}, - {L"compact", compact_main, help_compact}, - {L"convert", convert_main, help_convert}, - {L"create", create_main, help_create}, - {L"delete", delete_main, help_delete}, - {L"detail", detail_main, help_detail}, - {L"detach", detach_main, help_detach}, - {L"exit", exit_main, NULL}, - {L"expand", expand_main, help_expand}, - {L"extend", extend_main, help_extend}, - {L"filesystems", filesystems_main, help_filesystems}, - {L"format", format_main, help_format}, - {L"gpt", gpt_main, help_gpt}, - {L"help", help_main, help_help}, - {L"list", list_main, help_list}, - {L"import", import_main, help_import}, - {L"inactive", inactive_main, help_inactive}, - {L"merge", merge_main, help_merge}, - {L"offline", offline_main, help_offline}, - {L"online", online_main, help_online}, - {L"recover", recover_main, help_recover}, - {L"rem", rem_main, NULL}, - {L"remove", remove_main, help_remove}, - {L"repair", repair_main, help_repair}, - {L"rescan", rescan_main, help_rescan}, - {L"retain", retain_main, help_retain}, - {L"san", san_main, help_san}, - {L"select", select_main, help_select}, - {L"setid", setid_main, help_setid}, - {L"shrink", shrink_main, help_shrink}, - {L"uniqueid", uniqueid_main, help_uniqueid}, - {NULL, NULL, NULL} + {L"active", active_main, IDS_HELP_CMD_ACTIVE, IDS_HELP_CMD_DESC_ACTIVE}, + {L"add", add_main, IDS_HELP_CMD_ADD, IDS_HELP_CMD_DESC_ADD}, + {L"assign", assign_main, IDS_HELP_CMD_ASSIGN, IDS_HELP_CMD_DESC_ASSIGN}, + {L"attach", attach_main, IDS_HELP_CMD_ATTACH, IDS_HELP_CMD_DESC_ATTACH}, + {L"attributes", attributes_main, IDS_HELP_CMD_ATTRIBUTES, IDS_HELP_CMD_DESC_ATTRIBUTES}, + {L"automount", automount_main, IDS_HELP_CMD_AUTOMOUNT, IDS_HELP_CMD_DESC_AUTOMOUNT}, + {L"break", break_main, IDS_HELP_CMD_BREAK, IDS_HELP_CMD_DESC_BREAK}, + {L"clean", clean_main, IDS_HELP_CMD_CLEAN, IDS_HELP_CMD_DESC_CLEAN}, + {L"compact", compact_main, IDS_HELP_CMD_COMPACT, IDS_HELP_CMD_DESC_COMPACT}, + {L"convert", convert_main, IDS_HELP_CMD_CONVERT, IDS_HELP_CMD_DESC_CONVERT}, + {L"create", create_main, IDS_HELP_CMD_CREATE, IDS_HELP_CMD_DESC_CREATE}, + {L"delete", delete_main, IDS_HELP_CMD_DELETE, IDS_HELP_CMD_DESC_DELETE}, + {L"detail", detail_main, IDS_HELP_CMD_DETAIL, IDS_HELP_CMD_DESC_DETAIL}, + {L"detach", detach_main, IDS_HELP_CMD_DETACH, IDS_HELP_CMD_DESC_DETACH}, + {L"exit", NULL, IDS_NONE, IDS_HELP_CMD_DESC_EXIT}, + {L"expand", expand_main, IDS_HELP_CMD_EXPAND, IDS_HELP_CMD_DESC_EXPAND}, + {L"extend", extend_main, IDS_HELP_CMD_EXTEND, IDS_HELP_CMD_DESC_EXTEND}, + {L"filesystems", filesystems_main, IDS_HELP_CMD_FILESYSTEMS, IDS_HELP_CMD_DESC_FS}, + {L"format", format_main, IDS_HELP_CMD_FORMAT, IDS_HELP_CMD_DESC_FORMAT}, + {L"gpt", gpt_main, IDS_HELP_CMD_GPT, IDS_HELP_CMD_DESC_GPT}, + {L"help", help_main, IDS_HELP_CMD_HELP, IDS_HELP_CMD_DESC_HELP}, + {L"import", import_main, IDS_HELP_CMD_IMPORT, IDS_HELP_CMD_DESC_IMPORT}, + {L"inactive", inactive_main, IDS_HELP_CMD_INACTIVE, IDS_HELP_CMD_DESC_INACTIVE}, + {L"list", list_main, IDS_HELP_CMD_LIST, IDS_HELP_CMD_DESC_LIST}, + {L"merge", merge_main, IDS_HELP_CMD_MERGE, IDS_HELP_CMD_DESC_MERGE}, + {L"offline", offline_main, IDS_HELP_CMD_OFFLINE, IDS_HELP_CMD_DESC_OFFLINE}, + {L"online", online_main, IDS_HELP_CMD_ONLINE, IDS_HELP_CMD_DESC_ONLINE}, + {L"recover", recover_main, IDS_HELP_CMD_RECOVER, IDS_HELP_CMD_DESC_RECOVER}, + {L"rem", NULL, IDS_NONE, IDS_HELP_CMD_DESC_REM}, + {L"remove", remove_main, IDS_HELP_CMD_REMOVE, IDS_HELP_CMD_DESC_REMOVE}, + {L"repair", repair_main, IDS_HELP_CMD_REPAIR, IDS_HELP_CMD_DESC_REPAIR}, + {L"rescan", rescan_main, IDS_HELP_CMD_RESCAN, IDS_HELP_CMD_DESC_RESCAN}, + {L"retain", retain_main, IDS_HELP_CMD_RETAIN, IDS_HELP_CMD_DESC_RETAIN}, + {L"san", san_main, IDS_HELP_CMD_SAN, IDS_HELP_CMD_DESC_SAN}, + {L"select", select_main, IDS_HELP_CMD_SELECT, IDS_HELP_CMD_DESC_SELECT}, + {L"setid", setid_main, IDS_HELP_CMD_SETID, IDS_HELP_CMD_DESC_SETID}, + {L"shrink", shrink_main, IDS_HELP_CMD_SHRINK, IDS_HELP_CMD_DESC_SHRINK}, + {L"uniqueid", uniqueid_main, IDS_HELP_CMD_UNIQUEID, IDS_HELP_CMD_DESC_UNIQUEID}, + {NULL, NULL, IDS_NONE, IDS_NONE} }; /* FUNCTIONS *****************************************************************/ - -BOOL -exit_main(INT argc, WCHAR **argv) -{ - return FALSE; -} - - -BOOL -rem_main(INT argc, WCHAR **argv) -{ - return TRUE; -} - /* * InterpretCmd(char *cmd_line, char *arg_line): @@ -78,17 +65,23 @@ * determines which function to envoke. */ BOOL -InterpretCmd(int argc, WCHAR **argv) +InterpretCmd(int argc, LPWSTR *argv) { PCOMMAND cmdptr; /* Scan internal command table */ for (cmdptr = cmds; cmdptr->name; cmdptr++) { + /* First, determine if the user wants to exit + or to use a comment */ + if(wcsicmp(argv[0], L"exit") == 0) + return FALSE; + + if(wcsicmp(argv[0], L"rem") == 0) + return TRUE; + if (wcsicmp(argv[0], cmdptr->name) == 0) - { return cmdptr->func(argc, argv); - } } help_cmdlist(); @@ -102,12 +95,12 @@ * The main function used for when reading commands from scripts. */ BOOL -InterpretScript(WCHAR *input_line) +InterpretScript(LPWSTR input_line) { - WCHAR *args_vector[MAX_ARGS_COUNT]; + LPWSTR args_vector[MAX_ARGS_COUNT]; INT args_count = 0; BOOL bWhiteSpace = TRUE; - WCHAR *ptr; + LPWSTR ptr; memset(args_vector, 0, sizeof(args_vector)); @@ -148,11 +141,11 @@ InterpretMain(VOID) { WCHAR input_line[MAX_STRING_SIZE]; - WCHAR *args_vector[MAX_ARGS_COUNT]; + LPWSTR args_vector[MAX_ARGS_COUNT]; INT args_count = 0; BOOL bWhiteSpace = TRUE; BOOL bRun = TRUE; - WCHAR *ptr; + LPWSTR ptr; while (bRun == TRUE) { @@ -180,10 +173,8 @@ args_vector[args_count] = ptr; args_count++; } - bWhiteSpace = FALSE; } - ptr++; } Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Wed May 29 11:40:43 2013 @@ -13,7 +13,7 @@ /* Basic application information */ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_HEADER, "\nReactOS DiskPart\n" + IDS_APP_HEADER, "ReactOS DiskPart" IDS_APP_USAGE, "\nDisk Partitioning Interpreter.\n\n\ Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ /S filename\tRuns the given script.\n\ @@ -196,6 +196,13 @@ <Add convert command help text here>\n\n" END +/* Convert help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_CREATE "\n\ +<Add create command help text here>\n\n" +END + /* Delete help description */ STRINGTABLE DISCARDABLE BEGIN @@ -203,6 +210,13 @@ <Add delete command help text here>\n\n" END +/* Delete help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_DETAIL "\n\ +<Add detail command help text here>\n\n" +END + /* Detach help description */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Wed May 29 11:40:43 2013 @@ -15,7 +15,7 @@ /* Basic application information */ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_HEADER, "\nReactOS DiskPart\n" + IDS_APP_HEADER, "ReactOS DiskPart" IDS_APP_USAGE, "Interpretor pentru partiÈionare discuri.\n\nUtilizare: DISKPART [/S numefiÈier] [/T timplimitÄ] [/?]\n\n\ /S numefiÈier\tExecutÄ scriptul din fiÈierul dat.\n\ /T timplimitÄ\tLimitÄ temporalÄ pentru prevenirea utilizÄrii concurente.\n\ @@ -197,6 +197,14 @@ <AdÄugare manual pentru comanda Â«convertÂ»>\n\n" END +/* Convert help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_CREATE "\n\ +<AdÄugare manual pentru comanda Â«createÂ»>\n\n" +END + + /* Delete help description */ STRINGTABLE DISCARDABLE BEGIN @@ -204,6 +212,13 @@ <AdÄugare manual pentru comanda Â«deleteÂ»>\n\n" END +/* Delete help description */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HELP_CMD_DETAIL "\n\ +<AdÄugare manual pentru comanda Â«detailÂ»>\n\n" +END + /* Detach help description */ STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/system/diskpart/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/list.… ============================================================================== --- trunk/reactos/base/system/diskpart/list.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/list.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -32,42 +32,26 @@ printf("List VDisk!!\n"); } -BOOL list_main(INT argc, WCHAR **argv) +BOOL list_main(INT argc, LPWSTR *argv) { /* gets the first word from the string */ if (argc == 1) { - help_list(0, NULL); + PrintResourceString(IDS_HELP_CMD_LIST); return TRUE; } /* determines which to list (disk, partition, etc.) */ if(!wcsicmp(argv[1], L"disk")) - { list_disk(); - } else if(!wcsicmp(argv[1], L"partition")) - { list_partition(); - } else if(!wcsicmp(argv[1], L"volume")) - { list_volume(); - } else if(!wcsicmp(argv[1], L"vdisk")) - { list_vdisk(); - } else - { - help_list(0, NULL); - } + PrintResourceString(IDS_HELP_CMD_LIST); return TRUE; } - - -VOID help_list(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_LIST); -} Modified: trunk/reactos/base/system/diskpart/merge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/merge… ============================================================================== --- trunk/reactos/base/system/diskpart/merge.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/merge.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL merge_main(INT argc, WCHAR **argv) +BOOL merge_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_merge(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_MERGE); -} Modified: trunk/reactos/base/system/diskpart/offline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/offli… ============================================================================== --- trunk/reactos/base/system/diskpart/offline.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/offline.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL offline_main(INT argc, WCHAR **argv) +BOOL offline_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_offline(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_OFFLINE); -} Modified: trunk/reactos/base/system/diskpart/online.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/onlin… ============================================================================== --- trunk/reactos/base/system/diskpart/online.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/online.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,15 +8,9 @@ */ #include "diskpart.h" -BOOL online_main(INT argc, WCHAR **argv) +BOOL online_main(INT argc, LPWSTR *argv) { - help_online(0, NULL); + PrintResourceString(IDS_HELP_CMD_ONLINE); return TRUE; } - - -VOID help_online(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_ONLINE); -} Modified: trunk/reactos/base/system/diskpart/recover.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/recov… ============================================================================== --- trunk/reactos/base/system/diskpart/recover.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/recover.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL recover_main(INT argc, WCHAR **argv) +BOOL recover_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_recover(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_RECOVER); -} Modified: trunk/reactos/base/system/diskpart/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/remov… ============================================================================== --- trunk/reactos/base/system/diskpart/remove.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/remove.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL remove_main(INT argc, WCHAR **argv) +BOOL remove_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_remove(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_REMOVE); -} Modified: trunk/reactos/base/system/diskpart/repair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/repai… ============================================================================== --- trunk/reactos/base/system/diskpart/repair.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/repair.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,15 +8,9 @@ */ #include "diskpart.h" -BOOL repair_main(INT argc, WCHAR **argv) +BOOL repair_main(INT argc, LPWSTR *argv) { printf("\nTODO: Add code later since Win 7 Home Premium doesn't have this feature.\n"); return TRUE; } - - -VOID help_repair(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_REPAIR); -} Modified: trunk/reactos/base/system/diskpart/rescan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resca… ============================================================================== --- trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL rescan_main(INT argc, WCHAR **argv) +BOOL rescan_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_rescan(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_RESCAN); -} Modified: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Wed May 29 11:40:43 2013 @@ -9,6 +9,7 @@ #ifndef RESOURCE_H #define RESOURCE_H +#define IDS_NONE -1 #define IDS_APP_HEADER 0 #define IDS_APP_USAGE 1 #define IDS_APP_LICENSE 2 @@ -16,24 +17,24 @@ #define IDS_APP_LEAVING 4 #define IDS_APP_PROMPT 5 -#define IDS_DETAIL_INFO_DISK_ID 6 -#define IDS_DETAIL_INFO_TYPE 7 -#define IDS_DETAIL_INFO_STATUS 8 -#define IDS_DETAIL_INFO_PATH 9 -#define IDS_DETAIL_INFO_TARGET 10 -#define IDS_DETAIL_INFO_LUN_ID 11 -#define IDS_DETAIL_INFO_LOC_PATH 12 -#define IDS_DETAIL_INFO_CURR_RO_STATE 13 -#define IDS_DETAIL_INFO_RO 14 -#define IDS_DETAIL_INFO_BOOT_DSK 15 -#define IDS_DETAIL_INFO_PAGE_FILE_DSK 16 -#define IDS_DETAIL_INFO_HIBER_FILE_DSK 17 -#define IDS_DETAIL_INFO_CRASH_DSK 18 -#define IDS_DETAIL_INFO_CLST_DSK 19 +#define IDS_DETAIL_INFO_DISK_ID 7 +#define IDS_DETAIL_INFO_TYPE 8 +#define IDS_DETAIL_INFO_STATUS 9 +#define IDS_DETAIL_INFO_PATH 10 +#define IDS_DETAIL_INFO_TARGET 11 +#define IDS_DETAIL_INFO_LUN_ID 12 +#define IDS_DETAIL_INFO_LOC_PATH 13 +#define IDS_DETAIL_INFO_CURR_RO_STATE 14 +#define IDS_DETAIL_INFO_RO 15 +#define IDS_DETAIL_INFO_BOOT_DSK 16 +#define IDS_DETAIL_INFO_PAGE_FILE_DSK 17 +#define IDS_DETAIL_INFO_HIBER_FILE_DSK 18 +#define IDS_DETAIL_INFO_CRASH_DSK 19 +#define IDS_DETAIL_INFO_CLST_DSK 20 -#define IDS_LIST_DISK_HEAD 20 -#define IDS_LIST_DISK_LINE 21 -#define IDS_LIST_VOLUME_HEAD 22 +#define IDS_LIST_DISK_HEAD 21 +#define IDS_LIST_DISK_LINE 22 +#define IDS_LIST_VOLUME_HEAD 23 #define IDS_STATUS_YES 31 #define IDS_STATUS_NO 32 Modified: trunk/reactos/base/system/diskpart/retain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/retai… ============================================================================== --- trunk/reactos/base/system/diskpart/retain.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/retain.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL retain_main(INT argc, WCHAR **argv) +BOOL retain_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_retain(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_RETAIN); -} Modified: trunk/reactos/base/system/diskpart/san.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/san.c… ============================================================================== --- trunk/reactos/base/system/diskpart/san.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/san.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL san_main(INT argc, WCHAR **argv) +BOOL san_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_san(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SAN); -} Modified: trunk/reactos/base/system/diskpart/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/selec… ============================================================================== --- trunk/reactos/base/system/diskpart/select.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/select.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL select_main(INT argc, WCHAR **argv) +BOOL select_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_select(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SELECT); -} Modified: trunk/reactos/base/system/diskpart/setid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/setid… ============================================================================== --- trunk/reactos/base/system/diskpart/setid.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/setid.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL setid_main(INT argc, WCHAR **argv) +BOOL setid_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_setid(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SETID); -} Modified: trunk/reactos/base/system/diskpart/shrink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/shrin… ============================================================================== --- trunk/reactos/base/system/diskpart/shrink.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/shrink.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL shrink_main(INT argc, WCHAR **argv) +BOOL shrink_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_shrink(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_SHRINK); -} Modified: trunk/reactos/base/system/diskpart/uniqueid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/uniqu… ============================================================================== --- trunk/reactos/base/system/diskpart/uniqueid.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/uniqueid.c [iso-8859-1] Wed May 29 11:40:43 2013 @@ -8,13 +8,7 @@ */ #include "diskpart.h" -BOOL uniqueid_main(INT argc, WCHAR **argv) +BOOL uniqueid_main(INT argc, LPWSTR *argv) { return TRUE; } - - -VOID help_uniqueid(INT argc, WCHAR **argv) -{ - PrintResourceString(IDS_HELP_CMD_UNIQUEID); -}

1 0

[akhaldi] 59103: [ADVPACK_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 29 May '13

29 May '13

Author: akhaldi Date: Wed May 29 11:01:18 2013 New Revision: 59103 URL: http://svn.reactos.org/svn/reactos?rev=59103&view=rev Log: [ADVPACK_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/advpack/advpack.c trunk/rostests/winetests/advpack/files.c trunk/rostests/winetests/advpack/install.c trunk/rostests/winetests/advpack/testlist.c Modified: trunk/rostests/winetests/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/advpack… ============================================================================== --- trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/advpack.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -19,12 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <stdio.h> -#include <stdarg.h> -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> #include <advpub.h> #include <assert.h> -#include "wine/test.h" +#include <wine/test.h> /* defines for the TranslateInfString/Ex tests */ #define TEST_STRING1 "\\Application Name" Modified: trunk/rostests/winetests/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/files.c… ============================================================================== --- trunk/rostests/winetests/advpack/files.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/files.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -18,11 +18,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <stdio.h> -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> #include <advpub.h> #include <fci.h> -#include "wine/test.h" +#include <wine/test.h> /* make the max size large so there is only one cab file */ #define MEDIA_SIZE 999999999 Modified: trunk/rostests/winetests/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/install… ============================================================================== --- trunk/rostests/winetests/advpack/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/install.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -18,10 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <stdio.h> -#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <objbase.h> #include <advpub.h> -#include "wine/test.h" +#include <wine/test.h> static HMODULE hAdvPack; /* function pointers */ Modified: trunk/rostests/winetests/advpack/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/testlis… ============================================================================== --- trunk/rostests/winetests/advpack/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/testlist.c [iso-8859-1] Wed May 29 11:01:18 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_advpack(void); extern void func_files(void);

1 0

[akhaldi] 59102: [ADVPACK] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 29 May '13

29 May '13

Author: akhaldi Date: Wed May 29 11:01:08 2013 New Revision: 59102 URL: http://svn.reactos.org/svn/reactos?rev=59102&view=rev Log: [ADVPACK] * Sync with Wine 1.5.26. Modified: trunk/reactos/dll/win32/advpack/files.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/files.c [iso-8859-1] Wed May 29 11:01:08 2013 @@ -710,6 +710,8 @@ if (!hCabinet) return E_FAIL; + ZeroMemory(&session, sizeof(SESSION)); + pExtract = (void *)GetProcAddress(hCabinet, "Extract"); if (!pExtract) { @@ -717,7 +719,6 @@ goto done; } - ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, ExpandDir); if (FileList) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed May 29 11:01:08 2013 @@ -40,7 +40,7 @@ reactos/dll/directx/quartz # Autosync reactos/dll/win32/activeds # Synced to Wine-1.1.43? reactos/dll/win32/actxprxy # Synced to Wine-1.5.26 -reactos/dll/win32/advpack # Synced to Wine-1.5.19 +reactos/dll/win32/advpack # Synced to Wine-1.5.26 reactos/dll/win32/atl # Synced to Wine-1.5.19 reactos/dll/win32/atl100 # Synced to Wine-1.5.19 reactos/dll/win32/avifil32 # Synced to Wine-1.3.37

1 0

[ekohl] 59101: [CMD] Remove cmd_main(). Patch by Lee Schroeder. Thanks! CORE-7205 #resolve #comment Committed in r59101.
by ekohl＠svn.reactos.org 29 May '13

29 May '13

Author: ekohl Date: Wed May 29 10:56:25 2013 New Revision: 59101 URL: http://svn.reactos.org/svn/reactos?rev=59101&view=rev Log: [CMD] Remove cmd_main(). Patch by Lee Schroeder. Thanks! CORE-7205 #resolve #comment Committed in r59101. Removed: trunk/reactos/base/shell/cmd/main.c Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… ============================================================================== --- trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/CMakeLists.txt [iso-8859-1] Wed May 29 10:56:25 2013 @@ -38,7 +38,6 @@ internal.c label.c locale.c - main.c memory.c misc.c mklink.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Wed May 29 10:56:25 2013 @@ -1815,7 +1815,7 @@ /* * main function */ -int cmd_main (int argc, const TCHAR *argv[]) +int _tmain(int argc, const TCHAR *argv[]) { HANDLE hConsole; TCHAR startPath[MAX_PATH]; @@ -1828,7 +1828,7 @@ _tchdir(startPath); SetFileApisToOEM(); - InputCodePage= 0; + InputCodePage = 0; OutputCodePage = 0; hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, @@ -1845,7 +1845,7 @@ CloseHandle(hConsole); } - InputCodePage= GetConsoleCP(); + InputCodePage = GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); CMD_ModuleHandle = GetModuleHandle(NULL); Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Wed May 29 10:56:25 2013 @@ -114,7 +114,6 @@ LPTSTR DoDelayedExpansion(LPTSTR Line); INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore); -int cmd_main (int argc, const TCHAR *argv[]); extern HANDLE CMD_ModuleHandle; Removed: trunk/reactos/base/shell/cmd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/main.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/main.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/main.c (removed) @@ -1,6 +0,0 @@ -#include "precomp.h" - -int _tmain (int argc, const TCHAR *argv[]) -{ - return cmd_main(argc, argv); -}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013