Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[hpoussin] 27586: [FORMATTING] Fix indentation (mixed tabs and spaces) by always using 4 spaces

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jul 11 12:52:55 2007 New Revision: 27586 URL: http://svn.reactos.org/svn/reactos?rev=27586&view=rev Log: [FORMATTING] Fix indentation (mixed tabs and spaces) by always using 4 spaces Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/logfile.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 (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Jul 11 12:52:55 2007 @@ -66,636 +66,641 @@ void DebugPrint(char* fmt,...) { - char buffer[512]; - va_list ap; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - strcat(buffer, "\nRebooting now!"); - MessageBoxA(NULL, - buffer, - "ReactOS Setup", - MB_OK); + char buffer[512]; + va_list ap; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + strcat(buffer, "\nRebooting now!"); + MessageBoxA(NULL, + buffer, + "ReactOS Setup", + MB_OK); } HRESULT CreateShellLink(LPCTSTR linkPath, LPCTSTR cmd, LPCTSTR arg, LPCTSTR dir, LPCTSTR iconPath, int icon_nr, LPCTSTR comment) { - IShellLink* psl; - IPersistFile* ppf; + IShellLink* psl; + IPersistFile* ppf; #ifndef _UNICODE - WCHAR buffer[MAX_PATH]; + WCHAR buffer[MAX_PATH]; #endif /* _UNICODE */ - HRESULT hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID*)&psl); - - if (SUCCEEDED(hr)) - { - hr = psl->lpVtbl->SetPath(psl, cmd); - - if (arg) - { - hr = psl->lpVtbl->SetArguments(psl, arg); - } - - if (dir) - { - hr = psl->lpVtbl->SetWorkingDirectory(psl, dir); - } - - if (iconPath) - { - hr = psl->lpVtbl->SetIconLocation(psl, iconPath, icon_nr); - } - - if (comment) - { - hr = psl->lpVtbl->SetDescription(psl, comment); - } - - hr = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); - - if (SUCCEEDED(hr)) + HRESULT hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLink, (LPVOID*)&psl); + + if (SUCCEEDED(hr)) + { + hr = psl->lpVtbl->SetPath(psl, cmd); + + if (arg) + { + hr = psl->lpVtbl->SetArguments(psl, arg); + } + + if (dir) + { + hr = psl->lpVtbl->SetWorkingDirectory(psl, dir); + } + + if (iconPath) + { + hr = psl->lpVtbl->SetIconLocation(psl, iconPath, icon_nr); + } + + if (comment) + { + hr = psl->lpVtbl->SetDescription(psl, comment); + } + + hr = psl->lpVtbl->QueryInterface(psl, &IID_IPersistFile, (LPVOID*)&ppf); + + if (SUCCEEDED(hr)) { #ifdef _UNICODE - hr = ppf->lpVtbl->Save(ppf, linkPath, TRUE); + hr = ppf->lpVtbl->Save(ppf, linkPath, TRUE); #else /* _UNICODE */ - MultiByteToWideChar(CP_ACP, 0, linkPath, -1, buffer, MAX_PATH); - - hr = ppf->lpVtbl->Save(ppf, buffer, TRUE); + MultiByteToWideChar(CP_ACP, 0, linkPath, -1, buffer, MAX_PATH); + + hr = ppf->lpVtbl->Save(ppf, buffer, TRUE); #endif /* _UNICODE */ - ppf->lpVtbl->Release(ppf); - } - - psl->lpVtbl->Release(psl); - } - - return hr; + ppf->lpVtbl->Release(ppf); + } + + psl->lpVtbl->Release(psl); + } + + return hr; } static BOOL CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle) { - TCHAR path[MAX_PATH]; - TCHAR title[256]; - TCHAR name[256]; - LPTSTR p = path; - - if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) - return FALSE; - - if (folder) - { - p = PathAddBackslash(p); - _tcscpy(p, folder); - } - - p = PathAddBackslash(p); - - if(!LoadString(hDllInstance, nIdName, name, 256)) - return FALSE; - _tcscpy(p, name); - - if (!LoadString(hDllInstance, nIdTitle, title, 256)) - return FALSE; - - return SUCCEEDED(CreateShellLink(path, command, _T(""), NULL, NULL, 0, title)); + TCHAR path[MAX_PATH]; + TCHAR title[256]; + TCHAR name[256]; + LPTSTR p = path; + + if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) + return FALSE; + + if (folder) + { + p = PathAddBackslash(p); + _tcscpy(p, folder); + } + + p = PathAddBackslash(p); + + if(!LoadString(hDllInstance, nIdName, name, 256)) + return FALSE; + _tcscpy(p, name); + + if (!LoadString(hDllInstance, nIdTitle, title, 256)) + return FALSE; + + return SUCCEEDED(CreateShellLink(path, command, _T(""), NULL, NULL, 0, title)); } static BOOL CreateShortcutFolder(int csidl, UINT nID, LPTSTR name, int nameLen) { - TCHAR path[MAX_PATH]; - LPTSTR p; - - if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) - return FALSE; - - if (!LoadString(hDllInstance, nID, name, nameLen)) - return FALSE; - - p = PathAddBackslash(path); - _tcscpy(p, name); - - return CreateDirectory(path, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; + TCHAR path[MAX_PATH]; + LPTSTR p; + + if (!SHGetSpecialFolderPath(0, path, csidl, TRUE)) + return FALSE; + + if (!LoadString(hDllInstance, nID, name, nameLen)) + return FALSE; + + p = PathAddBackslash(path); + _tcscpy(p, name); + + return CreateDirectory(path, NULL) || GetLastError()==ERROR_ALREADY_EXISTS; } static VOID -CreateRandomSid (PSID *Sid) -{ - SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; - LARGE_INTEGER SystemTime; - PULONG Seed; - - NtQuerySystemTime (&SystemTime); - Seed = &SystemTime.u.LowPart; - - RtlAllocateAndInitializeSid (&SystemAuthority, - 4, - SECURITY_NT_NON_UNIQUE, - RtlUniform (Seed), - RtlUniform (Seed), - RtlUniform (Seed), - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - SECURITY_NULL_RID, - Sid); +CreateRandomSid( + OUT PSID *Sid) +{ + SID_IDENTIFIER_AUTHORITY SystemAuthority = {SECURITY_NT_AUTHORITY}; + LARGE_INTEGER SystemTime; + PULONG Seed; + + NtQuerySystemTime (&SystemTime); + Seed = &SystemTime.u.LowPart; + + RtlAllocateAndInitializeSid( + &SystemAuthority, + 4, + SECURITY_NT_NON_UNIQUE, + RtlUniform(Seed), + RtlUniform (Seed), + RtlUniform (Seed), + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + SECURITY_NULL_RID, + Sid); } static VOID -AppendRidToSid (PSID *Dst, - PSID Src, - ULONG NewRid) -{ - ULONG Rid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; - UCHAR RidCount; - ULONG i; - - RidCount = *RtlSubAuthorityCountSid (Src); - - for (i = 0; i < RidCount; i++) - Rid[i] = *RtlSubAuthoritySid (Src, i); - - if (RidCount < 8) - { - Rid[RidCount] = NewRid; - RidCount++; - } - - RtlAllocateAndInitializeSid (RtlIdentifierAuthoritySid (Src), - RidCount, - Rid[0], - Rid[1], - Rid[2], - Rid[3], - Rid[4], - Rid[5], - Rid[6], - Rid[7], - Dst); +AppendRidToSid( + IN PSID *Dst, + IN PSID Src, + IN ULONG NewRid) +{ + ULONG Rid[8] = {0, 0, 0, 0, 0, 0, 0, 0}; + UCHAR RidCount; + ULONG i; + + RidCount = *RtlSubAuthorityCountSid (Src); + + for (i = 0; i < RidCount; i++) + Rid[i] = *RtlSubAuthoritySid (Src, i); + + if (RidCount < 8) + { + Rid[RidCount] = NewRid; + RidCount++; + } + + RtlAllocateAndInitializeSid( + RtlIdentifierAuthoritySid(Src), + RidCount, + Rid[0], + Rid[1], + Rid[2], + Rid[3], + Rid[4], + Rid[5], + Rid[6], + Rid[7], + Dst); } static VOID -CreateTempDir(LPCWSTR VarName) -{ - TCHAR szTempDir[MAX_PATH]; - TCHAR szBuffer[MAX_PATH]; - DWORD dwLength; - HKEY hKey; - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"), - 0, - KEY_ALL_ACCESS, - &hKey)) - { - DebugPrint("Error: %lu\n", GetLastError()); - return; - } - - /* Get temp dir */ - dwLength = MAX_PATH * sizeof(TCHAR); - if (RegQueryValueEx(hKey, - VarName, - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) - { - DebugPrint("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return; - } - - /* Expand it */ - if (!ExpandEnvironmentStrings(szBuffer, - szTempDir, - MAX_PATH)) - { - DebugPrint("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return; - } - - /* Create profiles directory */ - if (!CreateDirectory(szTempDir, NULL)) - { - if (GetLastError() != ERROR_ALREADY_EXISTS) - { - DebugPrint("Error: %lu\n", GetLastError()); - RegCloseKey(hKey); - return; - } - } - - RegCloseKey(hKey); +CreateTempDir( + IN LPCWSTR VarName) +{ + TCHAR szTempDir[MAX_PATH]; + TCHAR szBuffer[MAX_PATH]; + DWORD dwLength; + HKEY hKey; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment"), + 0, + KEY_ALL_ACCESS, + &hKey)) + { + DebugPrint("Error: %lu\n", GetLastError()); + return; + } + + /* Get temp dir */ + dwLength = MAX_PATH * sizeof(TCHAR); + if (RegQueryValueEx(hKey, + VarName, + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength)) + { + DebugPrint("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return; + } + + /* Expand it */ + if (!ExpandEnvironmentStrings(szBuffer, + szTempDir, + MAX_PATH)) + { + DebugPrint("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return; + } + + /* Create profiles directory */ + if (!CreateDirectory(szTempDir, NULL)) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + { + DebugPrint("Error: %lu\n", GetLastError()); + RegCloseKey(hKey); + return; + } + } + + RegCloseKey(hKey); } BOOL ProcessSysSetupInf(VOID) { - INFCONTEXT InfContext; - TCHAR LineBuffer[256]; - DWORD LineLength; - - if (!SetupFindFirstLine(hSysSetupInf, - _T("DeviceInfsToInstall"), - NULL, - &InfContext)) - { - return FALSE; - } - - do - { - if (!SetupGetStringField(&InfContext, - 0, - LineBuffer, - 256, - &LineLength)) - { - return FALSE; - } - - if (!SetupDiInstallClass(NULL, LineBuffer, DI_QUIETINSTALL, NULL)) - { - return FALSE; - } - } - while (SetupFindNextLine(&InfContext, &InfContext)); - - return TRUE; + INFCONTEXT InfContext; + TCHAR LineBuffer[256]; + DWORD LineLength; + + if (!SetupFindFirstLine(hSysSetupInf, + _T("DeviceInfsToInstall"), + NULL, + &InfContext)) + { + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + LineBuffer, + 256, + &LineLength)) + { + return FALSE; + } + + if (!SetupDiInstallClass(NULL, LineBuffer, DI_QUIETINSTALL, NULL)) + { + return FALSE; + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + + return TRUE; } static BOOL EnableUserModePnpManager(VOID) { - SC_HANDLE hSCManager = NULL; - SC_HANDLE hService = NULL; - BOOL ret = FALSE; - - hSCManager = OpenSCManager(NULL, NULL, 0); - if (hSCManager == NULL) - goto cleanup; - - hService = OpenService(hSCManager, _T("PlugPlay"), SERVICE_CHANGE_CONFIG | SERVICE_START); - if (hService == NULL) - goto cleanup; - - ret = ChangeServiceConfig( - hService, - SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, - NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if (!ret) - goto cleanup; - - ret = StartService(hService, 0, NULL); - if (!ret) - goto cleanup; - - ret = TRUE; + SC_HANDLE hSCManager = NULL; + SC_HANDLE hService = NULL; + BOOL ret = FALSE; + + hSCManager = OpenSCManager(NULL, NULL, 0); + if (hSCManager == NULL) + goto cleanup; + + hService = OpenService(hSCManager, _T("PlugPlay"), SERVICE_CHANGE_CONFIG | SERVICE_START); + if (hService == NULL) + goto cleanup; + + ret = ChangeServiceConfig( + hService, + SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (!ret) + goto cleanup; + + ret = StartService(hService, 0, NULL); + if (!ret) + goto cleanup; + + ret = TRUE; cleanup: - if (hSCManager != NULL) - CloseServiceHandle(hSCManager); - if (hService != NULL) - CloseServiceHandle(hService); - return ret; + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hService != NULL) + CloseServiceHandle(hService); + return ret; } DWORD STDCALL InstallLiveCD (HINSTANCE hInstance) { - LONG rc; - HKEY hKey = NULL; - DWORD dwType; - DWORD requiredSize; - LPTSTR Shell = NULL; - TCHAR CommandLine[MAX_PATH]; - STARTUPINFO StartupInfo; - PROCESS_INFORMATION ProcessInformation; - BOOL res; - - hSysSetupInf = SetupOpenInfFileW( - L"syssetup.inf", - NULL, - INF_STYLE_WIN4, - NULL); - if (hSysSetupInf == INVALID_HANDLE_VALUE) - { - DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); + LONG rc; + HKEY hKey = NULL; + DWORD dwType; + DWORD requiredSize; + LPTSTR Shell = NULL; + TCHAR CommandLine[MAX_PATH]; + STARTUPINFO StartupInfo; + PROCESS_INFORMATION ProcessInformation; + BOOL res; + + hSysSetupInf = SetupOpenInfFileW( + L"syssetup.inf", + NULL, + INF_STYLE_WIN4, + NULL); + if (hSysSetupInf == INVALID_HANDLE_VALUE) + { + DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); + return 0; + } + + if (!ProcessSysSetupInf()) + { + DebugPrint("ProcessSysSetupInf() failed!\n"); + return 0; + } + + SetupCloseInfFile(hSysSetupInf); + + if (!EnableUserModePnpManager()) + { + DebugPrint("EnableUserModePnpManager() failed!\n"); + return 0; + } + + /* Load the default shell */ + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), /* FIXME: should be REGSTR_PATH_WINLOGON */ + 0, + KEY_QUERY_VALUE, + &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + rc = RegQueryValueEx( + hKey, + TEXT("Shell"), + NULL, + &dwType, + NULL, + &requiredSize); + if (rc != ERROR_SUCCESS) + goto cleanup; + else if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) + goto cleanup; + else if (requiredSize > (MAX_PATH - 1) * sizeof(TCHAR)) + goto cleanup; + Shell = HeapAlloc(GetProcessHeap(), 0, requiredSize + sizeof(TCHAR)); + if (!Shell) + goto cleanup; + Shell[requiredSize / sizeof(WCHAR)] = '\0'; + rc = RegQueryValueEx( + hKey, + TEXT("Shell"), + NULL, + NULL, + (LPBYTE)Shell, + &requiredSize); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (dwType == REG_EXPAND_SZ) + ExpandEnvironmentStrings(Shell, CommandLine, MAX_PATH); + else if (dwType == REG_SZ) + _tcscpy(CommandLine, Shell); + + /* Run the shell */ + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.lpReserved = NULL; + StartupInfo.lpDesktop = NULL; + StartupInfo.lpTitle = NULL; + StartupInfo.dwFlags = 0; + StartupInfo.cbReserved2 = 0; + StartupInfo.lpReserved2 = 0; + res = CreateProcess( + CommandLine, + NULL, + NULL, + NULL, + FALSE, + 0, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); + if (!res) + goto cleanup; + + /* Wait for process termination */ + WaitForSingleObject(ProcessInformation.hProcess, INFINITE); + +cleanup: + if (hKey != NULL) + RegCloseKey(hKey); + HeapFree(GetProcessHeap(), 0, Shell); + MessageBoxA( + NULL, + "You can shutdown your computer, or press ENTER to reboot", + "ReactOS LiveCD", + MB_OK); return 0; - } - - if (!ProcessSysSetupInf()) - { - DebugPrint("ProcessSysSetupInf() failed!\n"); - return 0; - } - - SetupCloseInfFile(hSysSetupInf); - - if (!EnableUserModePnpManager()) - { - DebugPrint("EnableUserModePnpManager() failed!\n"); - return 0; - } - - /* Load the default shell */ - rc = RegOpenKeyEx( - HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), /* FIXME: should be REGSTR_PATH_WINLOGON */ - 0, - KEY_QUERY_VALUE, - &hKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - rc = RegQueryValueEx( - hKey, - TEXT("Shell"), - NULL, - &dwType, - NULL, - &requiredSize); - if (rc != ERROR_SUCCESS) - goto cleanup; - else if (dwType != REG_SZ && dwType != REG_EXPAND_SZ) - goto cleanup; - else if (requiredSize > (MAX_PATH - 1) * sizeof(TCHAR)) - goto cleanup; - Shell = HeapAlloc(GetProcessHeap(), 0, requiredSize + sizeof(TCHAR)); - if (!Shell) - goto cleanup; - Shell[requiredSize / sizeof(WCHAR)] = '\0'; - rc = RegQueryValueEx( - hKey, - TEXT("Shell"), - NULL, - NULL, - (LPBYTE)Shell, - &requiredSize); - if (rc != ERROR_SUCCESS) - goto cleanup; - if (dwType == REG_EXPAND_SZ) - ExpandEnvironmentStrings(Shell, CommandLine, MAX_PATH); - else if (dwType == REG_SZ) - _tcscpy(CommandLine, Shell); - - /* Run the shell */ - StartupInfo.cb = sizeof(StartupInfo); - StartupInfo.lpReserved = NULL; - StartupInfo.lpDesktop = NULL; - StartupInfo.lpTitle = NULL; - StartupInfo.dwFlags = 0; - StartupInfo.cbReserved2 = 0; - StartupInfo.lpReserved2 = 0; - res = CreateProcess( - CommandLine, - NULL, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); - if (!res) - goto cleanup; - - /* Wait for process termination */ - WaitForSingleObject(ProcessInformation.hProcess, INFINITE); - -cleanup: - if (hKey != NULL) - RegCloseKey(hKey); - HeapFree(GetProcessHeap(), 0, Shell); - MessageBoxA( - NULL, - "You can shutdown your computer, or press ENTER to reboot", - "ReactOS LiveCD", - MB_OK); - return 0; } DWORD STDCALL InstallReactOS (HINSTANCE hInstance) { - TCHAR sAccessories[256]; - TCHAR sGames[256]; - TCHAR szBuffer[MAX_PATH]; - TCHAR Path[MAX_PATH]; - -# if 0 - OutputDebugStringA ("InstallReactOS() called\n"); - - if (!InitializeSetupActionLog (FALSE)) - { - OutputDebugStringA ("InitializeSetupActionLog() failed\n"); - } - - LogItem (SYSSETUP_SEVERITY_INFORMATION, - L"ReactOS Setup starting"); - - LogItem (SYSSETUP_SEVERITY_FATAL_ERROR, - L"Buuuuuuaaaah!"); - - LogItem (SYSSETUP_SEVERITY_INFORMATION, - L"ReactOS Setup finished"); - - TerminateSetupActionLog (); + TCHAR sAccessories[256]; + TCHAR sGames[256]; + TCHAR szBuffer[MAX_PATH]; + TCHAR Path[MAX_PATH]; + +#if 0 + OutputDebugStringA ("InstallReactOS() called\n"); + + if (!InitializeSetupActionLog (FALSE)) + { + OutputDebugStringA ("InitializeSetupActionLog() failed\n"); + } + + LogItem(SYSSETUP_SEVERITY_INFORMATION, + L"ReactOS Setup starting"); + + LogItem(SYSSETUP_SEVERITY_FATAL_ERROR, + L"Buuuuuuaaaah!"); + + LogItem(SYSSETUP_SEVERITY_INFORMATION, + L"ReactOS Setup finished"); + + TerminateSetupActionLog (); #endif #if 0 - UNICODE_STRING SidString; + UNICODE_STRING SidString; #endif - ULONG LastError; - - if (!InitializeProfiles ()) - { - DebugPrint ("InitializeProfiles() failed\n"); - return 0; - } - - CoInitialize(NULL); - SetUserDefaultLCID(GetSystemDefaultLCID()); - SetThreadLocale(GetSystemDefaultLCID()); - - /* create desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); - - /* create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("explorer.exe"), IDS_CMT_EXPLORER); - /* workaround to stop empty links for trunk builds */ - if(GetSystemDirectory(szBuffer, MAX_PATH)) - { - _tcscpy(Path, szBuffer); - if((_taccess(_tcscat(Path, _T("\\downloader.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("downloader.exe"), IDS_CMT_DOWNLOADER); - - _tcscpy(Path, szBuffer); - if((_taccess(_tcscat(Path, _T("\\getfirefox.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_FIREFOX, _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); - } - - - /* create administritive tools startmenu shortcuts */ - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("servman.exe"), IDS_CMT_SERVMAN); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("devmgmt.exe"), IDS_CMT_DEVMGMT); - - /* create and fill Accessories subfolder */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) - { - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CALC, _T("calc.exe"), IDS_CMT_CALC); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_NOTEPAD, _T("notepad.exe"), IDS_CMT_NOTEPAD); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_REGEDIT, _T("regedit.exe"), IDS_CMT_REGEDIT); - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_WORDPAD, _T("wordpad.exe"), IDS_CMT_WORDPAD); - if(GetSystemDirectory(szBuffer, MAX_PATH)) - { - _tcscpy(Path, szBuffer); - if((_taccess(_tcscat(Path, _T("\\screenshot.exe")), 0 )) != -1) - CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_SNAP, _T("screenshot.exe"), IDS_CMT_SCREENSHOT); - } - } - - /* create Games subfolder and fill if the exe is available */ - if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) - { - CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_SOLITAIRE, _T("sol.exe"), IDS_CMT_SOLITAIRE); - CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_WINEMINE, _T("winemine.exe"), IDS_CMT_WINEMINE); - } - - CoUninitialize(); - - /* Create the semi-random Domain-SID */ - CreateRandomSid (&DomainSid); - if (DomainSid == NULL) - { - DebugPrint ("Domain-SID creation failed!\n"); - return 0; + ULONG LastError; + + if (!InitializeProfiles ()) + { + DebugPrint ("InitializeProfiles() failed\n"); + return 0; + } + + CoInitialize(NULL); + SetUserDefaultLCID(GetSystemDefaultLCID()); + SetThreadLocale(GetSystemDefaultLCID()); + + /* Create desktop shortcuts */ + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); + + /* Create program startmenu shortcuts */ + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("explorer.exe"), IDS_CMT_EXPLORER); + /* workaround to stop empty links for trunk builds */ + if (GetSystemDirectory(szBuffer, MAX_PATH)) + { + _tcscpy(Path, szBuffer); + if ((_taccess(_tcscat(Path, _T("\\downloader.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("downloader.exe"), IDS_CMT_DOWNLOADER); + + _tcscpy(Path, szBuffer); + if ((_taccess(_tcscat(Path, _T("\\getfirefox.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_FIREFOX, _T("getfirefox.exe"), IDS_CMT_GETFIREFOX); + } + + + /* Create administritive tools startmenu shortcuts */ + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("servman.exe"), IDS_CMT_SERVMAN); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("devmgmt.exe"), IDS_CMT_DEVMGMT); + + /* create and fill Accessories subfolder */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) + { + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CALC, _T("calc.exe"), IDS_CMT_CALC); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_CMD, _T("cmd.exe"), IDS_CMT_CMD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_NOTEPAD, _T("notepad.exe"), IDS_CMT_NOTEPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_REGEDIT, _T("regedit.exe"), IDS_CMT_REGEDIT); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_WORDPAD, _T("wordpad.exe"), IDS_CMT_WORDPAD); + if (GetSystemDirectory(szBuffer, MAX_PATH)) + { + _tcscpy(Path, szBuffer); + if ((_taccess(_tcscat(Path, _T("\\screenshot.exe")), 0 )) != -1) + CreateShortcut(CSIDL_PROGRAMS, sAccessories, IDS_SHORT_SNAP, _T("screenshot.exe"), IDS_CMT_SCREENSHOT); + } + } + + /* Create Games subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, sGames, 256)) + { + CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_SOLITAIRE, _T("sol.exe"), IDS_CMT_SOLITAIRE); + CreateShortcut(CSIDL_PROGRAMS, sGames, IDS_SHORT_WINEMINE, _T("winemine.exe"), IDS_CMT_WINEMINE); + } + + CoUninitialize(); + + /* Create the semi-random Domain-SID */ + CreateRandomSid(&DomainSid); + if (DomainSid == NULL) + { + DebugPrint ("Domain-SID creation failed!\n"); + return 0; } #if 0 - RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); - DebugPrint ("Domain-SID: %wZ\n", &SidString); - RtlFreeUnicodeString (&SidString); + RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); + DebugPrint ("Domain-SID: %wZ\n", &SidString); + RtlFreeUnicodeString (&SidString); #endif - /* Initialize the Security Account Manager (SAM) */ - if (!SamInitializeSAM ()) - { - DebugPrint ("SamInitializeSAM() failed!\n"); - RtlFreeSid (DomainSid); - return 0; - } - - /* Set the Domain SID (aka Computer SID) */ - if (!SamSetDomainSid (DomainSid)) - { - DebugPrint ("SamSetDomainSid() failed!\n"); - RtlFreeSid (DomainSid); - return 0; - } - - /* Append the Admin-RID */ - AppendRidToSid(&AdminSid, DomainSid, DOMAIN_USER_RID_ADMIN); + /* Initialize the Security Account Manager (SAM) */ + if (!SamInitializeSAM ()) + { + DebugPrint ("SamInitializeSAM() failed!\n"); + RtlFreeSid (DomainSid); + return 0; + } + + /* Set the Domain SID (aka Computer SID) */ + if (!SamSetDomainSid (DomainSid)) + { + DebugPrint ("SamSetDomainSid() failed!\n"); + RtlFreeSid (DomainSid); + return 0; + } + + /* Append the Admin-RID */ + AppendRidToSid(&AdminSid, DomainSid, DOMAIN_USER_RID_ADMIN); #if 0 - RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); - DebugPrint ("Admin-SID: %wZ\n", &SidString); - RtlFreeUnicodeString (&SidString); + RtlConvertSidToUnicodeString (&SidString, DomainSid, TRUE); + DebugPrint ("Admin-SID: %wZ\n", &SidString); + RtlFreeUnicodeString (&SidString); #endif - /* Create the Administrator account */ - if (!SamCreateUser(L"Administrator", L"", AdminSid)) - { - /* Check what the error was. - * If the Admin Account already exists, then it means Setup - * wasn't allowed to finish properly. Instead of rebooting - * and not completing it, let it restart instead - */ - LastError = GetLastError(); - if (LastError != ERROR_USER_EXISTS) - { - DebugPrint("SamCreateUser() failed!\n"); - RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); - return 0; - } - } - - /* Create the Administrator profile */ - if (!CreateUserProfileW(AdminSid, L"Administrator")) - { - DebugPrint("CreateUserProfileW() failed!\n"); + /* Create the Administrator account */ + if (!SamCreateUser(L"Administrator", L"", AdminSid)) + { + /* Check what the error was. + * If the Admin Account already exists, then it means Setup + * wasn't allowed to finish properly. Instead of rebooting + * and not completing it, let it restart instead + */ + LastError = GetLastError(); + if (LastError != ERROR_USER_EXISTS) + { + DebugPrint("SamCreateUser() failed!\n"); + RtlFreeSid(AdminSid); + RtlFreeSid(DomainSid); + return 0; + } + } + + /* Create the Administrator profile */ + if (!CreateUserProfileW(AdminSid, L"Administrator")) + { + DebugPrint("CreateUserProfileW() failed!\n"); + RtlFreeSid(AdminSid); + RtlFreeSid(DomainSid); + return 0; + } + RtlFreeSid(AdminSid); RtlFreeSid(DomainSid); + + CreateTempDir(L"TEMP"); + CreateTempDir(L"TMP"); + + if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR))) + { + PathAddBackslash(szBuffer); + _tcscat(szBuffer, _T("system")); + CreateDirectory(szBuffer, NULL); + } + + hSysSetupInf = SetupOpenInfFileW(L"syssetup.inf", + NULL, + INF_STYLE_WIN4, + NULL); + if (hSysSetupInf == INVALID_HANDLE_VALUE) + { + DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); + return 0; + } + + if (!ProcessSysSetupInf()) + { + DebugPrint("ProcessSysSetupInf() failed!\n"); + return 0; + } + + if (!EnableUserModePnpManager()) + { + DebugPrint("EnableUserModePnpManager() failed!\n"); + return 0; + } + + if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) + { + DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); + return 0; + } + + InstallWizard(); + + SetupCloseInfFile(hSysSetupInf); + + /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL + /// DO NOT REMOVE!!! + DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); + return 0; - } - - RtlFreeSid(AdminSid); - RtlFreeSid(DomainSid); - - CreateTempDir(L"TEMP"); - CreateTempDir(L"TMP"); - - if (GetWindowsDirectory(szBuffer, sizeof(szBuffer) / sizeof(TCHAR))) - { - PathAddBackslash(szBuffer); - _tcscat(szBuffer, _T("system")); - CreateDirectory(szBuffer, NULL); - } - - hSysSetupInf = SetupOpenInfFileW(L"syssetup.inf", - NULL, - INF_STYLE_WIN4, - NULL); - if (hSysSetupInf == INVALID_HANDLE_VALUE) - { - DebugPrint("SetupOpenInfFileW() failed to open 'syssetup.inf' (Error: %lu)\n", GetLastError()); - return 0; - } - - if (!ProcessSysSetupInf()) - { - DebugPrint("ProcessSysSetupInf() failed!\n"); - return 0; - } - - if (!EnableUserModePnpManager()) - { - DebugPrint("EnableUserModePnpManager() failed!\n"); - return 0; - } - - if (CMP_WaitNoPendingInstallEvents(INFINITE) != WAIT_OBJECT_0) - { - DebugPrint("CMP_WaitNoPendingInstallEvents() failed!\n"); - return 0; - } - - InstallWizard(); - - SetupCloseInfFile(hSysSetupInf); - - /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL - /// DO NOT REMOVE!!! - DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n"); - - return 0; } @@ -706,5 +711,5 @@ SetupChangeFontSize(HANDLE hWnd, LPCWSTR lpszFontSize) { - return FALSE; -} + return FALSE; +} Modified: trunk/reactos/dll/win32/syssetup/logfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/logfile… ============================================================================== --- trunk/reactos/dll/win32/syssetup/logfile.c (original) +++ trunk/reactos/dll/win32/syssetup/logfile.c Wed Jul 11 12:52:55 2007 @@ -44,145 +44,145 @@ BOOL STDCALL InitializeSetupActionLog (BOOL bDeleteOldLogFile) { - WCHAR szFileName[MAX_PATH]; + WCHAR szFileName[MAX_PATH]; - GetWindowsDirectoryW (szFileName, - MAX_PATH); + GetWindowsDirectoryW (szFileName, + MAX_PATH); - if (szFileName[wcslen (szFileName)] != L'\\') + if (szFileName[wcslen (szFileName)] != L'\\') { - wcsncat (szFileName, - L"\\", - MAX_PATH); + wcsncat(szFileName, + L"\\", + MAX_PATH); } - wcsncat (szFileName, - L"setuplog.txt", - MAX_PATH); + wcsncat(szFileName, + L"setuplog.txt", + MAX_PATH); - if (bDeleteOldLogFile != FALSE) + if (bDeleteOldLogFile != FALSE) { - SetFileAttributesW (szFileName, - FILE_ATTRIBUTE_NORMAL); - DeleteFileW (szFileName); + SetFileAttributesW(szFileName, + FILE_ATTRIBUTE_NORMAL); + DeleteFileW(szFileName); } - hLogFile = CreateFileW (szFileName, - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hLogFile == INVALID_HANDLE_VALUE) + hLogFile = CreateFileW(szFileName, + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (hLogFile == INVALID_HANDLE_VALUE) { - hLogFile = NULL; - return FALSE; + hLogFile = NULL; + return FALSE; } - return TRUE; + return TRUE; } VOID STDCALL TerminateSetupActionLog (VOID) { - if (hLogFile != NULL) + if (hLogFile != NULL) { - CloseHandle (hLogFile); - hLogFile = NULL; + CloseHandle (hLogFile); + hLogFile = NULL; } } BOOL STDCALL -LogItem (DWORD dwSeverity, - LPWSTR lpMessageText) +LogItem(DWORD dwSeverity, + LPWSTR lpMessageText) { - LPSTR lpNewLine = "\r\n"; - LPSTR lpSeverityString; - LPSTR lpMessageString; - DWORD dwMessageLength; - DWORD dwMessageSize; - DWORD dwWritten; + LPSTR lpNewLine = "\r\n"; + LPSTR lpSeverityString; + LPSTR lpMessageString; + DWORD dwMessageLength; + DWORD dwMessageSize; + DWORD dwWritten; - /* Get the severity code string */ - switch (dwSeverity) + /* Get the severity code string */ + switch (dwSeverity) { - case SYSSETUP_SEVERITY_INFORMATION: - lpSeverityString = "Information : "; - break; + case SYSSETUP_SEVERITY_INFORMATION: + lpSeverityString = "Information : "; + break; - case SYSSETUP_SEVERITY_WARNING: - lpSeverityString = "Warning : "; - break; + case SYSSETUP_SEVERITY_WARNING: + lpSeverityString = "Warning : "; + break; - case SYSSETUP_SEVERITY_ERROR: - lpSeverityString = "Error : "; - break; + case SYSSETUP_SEVERITY_ERROR: + lpSeverityString = "Error : "; + break; - case SYSSETUP_SEVERITY_FATAL_ERROR: - lpSeverityString = "Fatal error : "; - break; + case SYSSETUP_SEVERITY_FATAL_ERROR: + lpSeverityString = "Fatal error : "; + break; - default: - lpSeverityString = "Unknown : "; - break; + default: + lpSeverityString = "Unknown : "; + break; } - /* Get length of the converted ansi string */ - dwMessageLength = wcslen(lpMessageText) * sizeof(WCHAR); - RtlUnicodeToMultiByteSize (&dwMessageSize, - lpMessageText, - dwMessageLength); + /* Get length of the converted ansi string */ + dwMessageLength = wcslen(lpMessageText) * sizeof(WCHAR); + RtlUnicodeToMultiByteSize(&dwMessageSize, + lpMessageText, + dwMessageLength); - /* Allocate message string buffer */ - lpMessageString = (LPSTR) HeapAlloc (GetProcessHeap (), - HEAP_ZERO_MEMORY, - dwMessageSize); - if (lpMessageString == NULL) + /* Allocate message string buffer */ + lpMessageString = (LPSTR) HeapAlloc(GetProcessHeap (), + HEAP_ZERO_MEMORY, + dwMessageSize); + if (lpMessageString == NULL) { - return FALSE; + return FALSE; } - /* Convert unicode to ansi */ - RtlUnicodeToMultiByteN (lpMessageString, - dwMessageSize, - NULL, - lpMessageText, - dwMessageLength); + /* Convert unicode to ansi */ + RtlUnicodeToMultiByteN(lpMessageString, + dwMessageSize, + NULL, + lpMessageText, + dwMessageLength); - /* Set file pointer to the end of the file */ - SetFilePointer (hLogFile, - 0, - NULL, - FILE_END); + /* Set file pointer to the end of the file */ + SetFilePointer(hLogFile, + 0, + NULL, + FILE_END); - /* Write severity code */ - WriteFile (hLogFile, - lpSeverityString, - strlen (lpSeverityString), - &dwWritten, - NULL); + /* Write severity code */ + WriteFile(hLogFile, + lpSeverityString, + strlen(lpSeverityString), + &dwWritten, + NULL); - /* Write message string */ - WriteFile (hLogFile, - lpMessageString, - dwMessageSize, - &dwWritten, - NULL); + /* Write message string */ + WriteFile(hLogFile, + lpMessageString, + dwMessageSize, + &dwWritten, + NULL); - /* Write newline */ - WriteFile (hLogFile, - lpNewLine, - 2, - &dwWritten, - NULL); + /* Write newline */ + WriteFile(hLogFile, + lpNewLine, + 2, + &dwWritten, + NULL); - HeapFree (GetProcessHeap (), - 0, - lpMessageString); + HeapFree(GetProcessHeap(), + 0, + lpMessageString); - return TRUE; + return TRUE; } /* EOF */

17 years, 5 months

[dreimer] 27585: Set eol:style native Fix title of reladdr2line.cmd

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 02:52:11 2007 New Revision: 27585 URL: http://svn.reactos.org/svn/reactos?rev=27585&view=rev Log: Set eol:style native Fix title of reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (contents, props changed) Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Wed Jul 11 02:52:11 2007 @@ -8,7 +8,7 @@ :: @echo off -title RAddr2Line... +title relAddr2Line... for /f "tokens=2" %%i in ('"objdump -p %1 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i set /a baseaddr += 0x%2 Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Wed Jul 11 02:52:11 2007 @@ -1,20 +1,20 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 -STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêè RosBE" -FONT 8, "MS Shell Dlg" -{ - // x, pos_hight, width, hight - LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 130, 13 - LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 114, 13 - COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Öâåò Ôîíà", 0x0, 10, 70, 114, 13 - COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 - CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 - EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü", ID_OK, 92, 160, 59, 26, WS_TABSTOP - PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP -} +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêè RosBE" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 130, 13 + LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 114, 13 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Öâåò Ôîíà", 0x0, 10, 70, 114, 13 + COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 + CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 + EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 92, 160, 59, 26, WS_TABSTOP + PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP +} Propchange: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[dreimer] 27584: Russian Translation by towerr. Thx for it :-) Fix in changelog

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 02:50:53 2007 New Revision: 27584 URL: http://svn.reactos.org/svn/reactos?rev=27584&view=rev Log: Russian Translation by towerr. Thx for it :-) Fix in changelog Added: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Tools/config/options.rc Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Wed Jul 11 02:50:53 2007 @@ -13,7 +13,7 @@ - Readded makex. Sorry, bug in Vista still persists... its a GCC bug. - Changed Default Source Folder to \Source Subfolder. Helpful for letting RosBE load the Source. - Added a command to change the Default Folder for this session, nice for working with several ROS Trees or Branches. -- Very ALPHA User Mode Support. +- Very ALPHA NonAdmin Account Support (NOT for Vista). *** May 21th, 2007 - RosBE 0.3.6 Released Added: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (added) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Wed Jul 11 02:50:53 2007 @@ -1,0 +1,20 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 280, 200 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Óñòàíîâêè RosBE" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 130, 13 + LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 114, 13 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Öâåò Ôîíà", 0x0, 10, 70, 114, 13 + COMBOBOX IDC_BACK, 100, 70, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 90, 110, 21 + CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 60, 21 + EDITTEXT ID_LOGDIR, 25, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSE, 230, 120, 30, 13, WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 92, 160, 59, 26, WS_TABSTOP + PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 162, 160, 59, 26, WS_TABSTOP +} Modified: trunk/tools/RosBE-Windows/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.rc Wed Jul 11 02:50:53 2007 @@ -5,3 +5,4 @@ #include "lang/en-US.rc" #include "lang/de-DE.rc" +#include "lang/ru-RU.rc"

17 years, 5 months

[dreimer] 27583: Tell the User, that Vista will not work, when not using Admin Rights.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 02:28:42 2007 New Revision: 27583 URL: http://svn.reactos.org/svn/reactos?rev=27583&view=rev Log: Tell the User, that Vista will not work, when not using Admin Rights. Modified: trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Wed Jul 11 02:28:42 2007 @@ -251,7 +251,7 @@ Return IsNotAdmin: messageBox MB_OK|MB_ICONEXCLAMATION \ - "You do not have administrative privileges. Installing on Default Account is more than BETA!!!" + "You do not have administrative privileges. Installing on NonAdmin Account is working now, but it's not tested well yet. NO Vista Support possible!" Return FunctionEnd @@ -262,7 +262,5 @@ IsAdmin: Return IsNotAdmin: - messageBox MB_OK|MB_ICONEXCLAMATION \ - "You do not have administrative privileges. Installing on Default Account is more than BETA!!!" - Return -FunctionEnd + Return +FunctionEnd

17 years, 5 months

[dreimer] 27582: Update Uninstaller once more.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 02:23:56 2007 New Revision: 27582 URL: http://svn.reactos.org/svn/reactos?rev=27582&view=rev Log: Update Uninstaller once more. Modified: trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Wed Jul 11 02:23:56 2007 @@ -186,7 +186,8 @@ Delete /REBOOTOK "$INSTDIR\RosBE.cmd" Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" Delete /REBOOTOK "$INSTDIR\Config.cmd" - Delete /REBOOTOK "$INSTDIR\SVN.cmd" + Delete /REBOOTOK "$INSTDIR\sSVN.cmd" + Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd" Delete /REBOOTOK "$INSTDIR\RAddr.cmd" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd"

17 years, 5 months

[dreimer] 27581: Sometimes I really think, I am too tupid for that... - Fix all cmds to support Foldernaes with Spaces properly. - Hopefuly final fix for NonAdmin Usage.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 02:05:51 2007 New Revision: 27581 URL: http://svn.reactos.org/svn/reactos?rev=27581&view=rev Log: Sometimes I really think,I am too tupid for that... - Fix all cmds to support Foldernaes with Spaces properly. - Hopefuly final fix for NonAdmin Usage. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RAddr.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Wed Jul 11 02:05:51 2007 @@ -60,7 +60,7 @@ :: :: Now use mingw32-make to build ReactOS, passing along options, if any. :: -call buildtime %MAKE_COMMAND% 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" +call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" :: :: Highlight the fact that building has ended. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Wed Jul 11 02:05:51 2007 @@ -12,13 +12,13 @@ if "%1" == "delete" ( if exist "%_ROSSOURCEDIR%\config.rbuild" ( - del %_ROSSOURCEDIR%\config.rbuild + del "%_ROSSOURCEDIR%\config.rbuild" echo Main Configuration File was found and deleted. ) else ( echo Main Configuration File was not found in ReactOS Source Tree. ) if exist "%ROSBEBASEDIR%\config.rbuild" ( - del %ROSBEBASEDIR%\config.rbuild + del "%ROSBEBASEDIR%\config.rbuild" echo Working Configuration File was found and deleted. ) else ( echo Working Configuration File was not found in ReactOS Source Tree. @@ -50,16 +50,16 @@ echo Architecture to build for. Not Editable. echo. echo Right now -call grep \"ARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"ARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 echo. echo Sub-architecture to build for. echo Default is: none echo. echo Right now -call grep \"SARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"SARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P X= (), (xbox) -call sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" %ROSBEBASEDIR%\config.rbuild > %ROSBEBASEDIR%\config2.rbuild +call sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%ROSBEBASEDIR%\config.rbuild" > "%ROSBEBASEDIR%\config2.rbuild" cls echo Which CPU ReactOS should be optimized for. @@ -70,9 +70,9 @@ echo Default is: pentium echo. echo Right now -call grep \"OARCH\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"OARCH\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P XX= -call sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" %ROSBEBASEDIR%\config2.rbuild > %ROSBEBASEDIR%\config21.rbuild +call sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%ROSBEBASEDIR%\config2.rbuild" > "%ROSBEBASEDIR%\config21.rbuild" cls echo What level do you want ReactOS to be optimized at. @@ -83,27 +83,27 @@ echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. echo Right now -call grep \"OPTIMIZE\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"OPTIMIZE\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) -call sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" %ROSBEBASEDIR%\config21.rbuild > %ROSBEBASEDIR%\config3.rbuild +call sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%ROSBEBASEDIR%\config21.rbuild" > "%ROSBEBASEDIR%\config3.rbuild" cls echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. echo Right now -call grep \"MP\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"MP\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P Z= (0), (1) -call sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" %ROSBEBASEDIR%\config3.rbuild > %ROSBEBASEDIR%\config4.rbuild +call sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%ROSBEBASEDIR%\config3.rbuild" > "%ROSBEBASEDIR%\config4.rbuild" cls echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. echo Right now -call grep \"KDBG\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"KDBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P A= (0), (1) -call sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" %ROSBEBASEDIR%\config4.rbuild > %ROSBEBASEDIR%\config5.rbuild +call sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%ROSBEBASEDIR%\config4.rbuild" > "%ROSBEBASEDIR%\config5.rbuild" cls echo Whether to compile for debugging. No compiler optimizations will be @@ -111,9 +111,9 @@ echo Default is: 1 echo. echo Right now -call grep \"DBG\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"DBG\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P B= (0), (1) -call sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" %ROSBEBASEDIR%\config5.rbuild > %ROSBEBASEDIR%\config6.rbuild +call sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%ROSBEBASEDIR%\config5.rbuild" > "%ROSBEBASEDIR%\config6.rbuild" cls echo Whether to compile for debugging with GDB. If you don't use GDB, @@ -121,9 +121,9 @@ echo Default is: 0 echo. echo Right now -call grep \"GDB\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"GDB\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P C= (0), (1) -call sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" %ROSBEBASEDIR%\config6.rbuild > %ROSBEBASEDIR%\config7.rbuild +call sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%ROSBEBASEDIR%\config6.rbuild" > "%ROSBEBASEDIR%\config7.rbuild" cls echo Whether to compile apps/libs with features covered software patents @@ -133,18 +133,18 @@ echo Default is: 0 echo. echo Right now -call grep \"NSWPAT\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"NSWPAT\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P D= (0), (1) -call sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" %ROSBEBASEDIR%\config7.rbuild > %ROSBEBASEDIR%\config8.rbuild +call sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%ROSBEBASEDIR%\config7.rbuild" > "%ROSBEBASEDIR%\config8.rbuild" cls echo Whether to compile with NT-compatible LPC Semantics. This should echo always be 1. echo. echo Right now -call grep \"NTLPC\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"NTLPC\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P E= (0), (1) -call sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" %ROSBEBASEDIR%\config8.rbuild > %ROSBEBASEDIR%\config9.rbuild +call sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%E%\"/g" "%ROSBEBASEDIR%\config8.rbuild" > "%ROSBEBASEDIR%\config9.rbuild" cls echo Whether to compile with the KD protocol. This will disable support for @@ -156,15 +156,15 @@ echo Default is: 0 echo. echo Right now -call grep \"_WINKD_\" %ROSBEBASEDIR%\config.rbuild|cut -d "\"" -f 4 +call grep \"_WINKD_\" "%ROSBEBASEDIR%\config.rbuild"|cut -d "\"" -f 4 SET /P F= (0), (1) -call sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" %ROSBEBASEDIR%\config9.rbuild > %ROSBEBASEDIR%\config10.rbuild +call sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%ROSBEBASEDIR%\config9.rbuild" > "%ROSBEBASEDIR%\config10.rbuild" -copy %ROSBEBASEDIR%\config10.rbuild %ROSBEBASEDIR%\config.tmp -del %ROSBEBASEDIR%\*.rbuild -copy %ROSBEBASEDIR%\config.tmp %ROSBEBASEDIR%\config.rbuild -del %ROSBEBASEDIR%\*.tmp -copy %ROSBEBASEDIR%\config.rbuild %_ROSSOURCEDIR%\config.rbuild +copy "%ROSBEBASEDIR%\config10.rbuild" "%ROSBEBASEDIR%\config.tmp" +del "%ROSBEBASEDIR%\*.rbuild" +copy "%ROSBEBASEDIR%\config.tmp" "%ROSBEBASEDIR%\config.rbuild" +del "%ROSBEBASEDIR%\*.tmp" +copy "%ROSBEBASEDIR%\config.rbuild" "%_ROSSOURCEDIR%\config.rbuild" goto :NOK Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RAddr.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Wed Jul 11 02:05:51 2007 @@ -35,17 +35,17 @@ SET /P ADDR= echo. echo. -raddr2line %EXE% %ADDR% +raddr2line "%EXE%" "%ADDR%" goto :EOC :AUTO1 echo Set the Address you wanna analyze inside the Executable. SET /P ADDR= -raddr2line %1 %ADDR% +raddr2line "%1" "%ADDR%" goto :EOC :AUTO2 -raddr2line %1 %2 +raddr2line "%1" "%2" goto :EOC :EOC Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Wed Jul 11 02:05:51 2007 @@ -60,7 +60,7 @@ :: :: Look if the Source Folder is empty. If so, ask for using "svn create". :: -dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul +dir /b "%_ROSSOURCEDIR%" 2>nul|grep -e ".*" >nul if errorlevel 1 ( echo No ReactOS Source detected. Please use "svn create" to download it. goto :ExitRosBE Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Wed Jul 11 02:05:51 2007 @@ -14,9 +14,9 @@ goto :DEF ) if /I "%1"=="default" ( - set "%_ROSSOURCEDIR%" == "%_ROSSRCDIRBCK%" + set _ROSSOURCEDIR=%_ROSSRCDIRBCK% ) else ( - set "%_ROSSOURCEDIR%" == "%1" + set _ROSSOURCEDIR=%1 ) goto :END @@ -29,11 +29,12 @@ goto :END ) if /I "%XY%"=="default" ( - set "%_ROSSOURCEDIR%" == "%_ROSSRCDIRBCK%" + set _ROSSOURCEDIR=%_ROSSRCDIRBCK% ) else ( - set "%_ROSSOURCEDIR%" == "%XY%" + set _ROSSOURCEDIR=%XY% ) goto :END :END title ReactOS Build Environment %_VER% +cd "%_ROSSOURCEDIR%" Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Wed Jul 11 02:05:51 2007 @@ -18,15 +18,15 @@ if "%1" == "update" ( title Updating... if not "%2" == "" ( - svn update %_ROSSOURCEDIR% -r %2 + svn update "%_ROSSOURCEDIR%" -r %2 ) else ( - svn update %_ROSSOURCEDIR% + svn update "%_ROSSOURCEDIR%" ) goto :ExitSVN ) if "%1" == "cleanup" ( title Cleaning... - svn cleanup %_ROSSOURCEDIR% + svn cleanup "%_ROSSOURCEDIR%" goto :ExitSVN ) :: @@ -39,9 +39,9 @@ echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) - dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul + dir /b "%_ROSSOURCEDIR%" 2>nul|grep -e ".*" >nul if errorlevel 1 ( - svn checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% + svn checkout svn://svn.reactos.org/reactos/trunk/reactos "%_ROSSOURCEDIR%" ) else ( echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -49,14 +49,14 @@ ) if "%1" == "status" ( title Status - call svn info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" + call svn info "%_ROSSOURCEDIR%" > "%ROSBEBASEDIR%\x.tmp" echo Recent Offline Revision: - call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2 + call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2 del "%ROSBEBASEDIR%\x.tmp" call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" echo Online HEAD Revision: - call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2 + call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2 del "%ROSBEBASEDIR%\x.tmp" goto :ExitSVN ) Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Wed Jul 11 02:05:51 2007 @@ -104,7 +104,7 @@ !include "RosBE.Files-Miscellaneous.nsh" Section -StartMenuShortcuts SEC03 - SetShellVarContext all + SetShellVarContext current ;; ;; Add our start menu shortcuts. @@ -122,7 +122,7 @@ SectionEnd Section /o "Desktop Shortcuts" SEC04 - SetShellVarContext all + SetShellVarContext current ;; ;; Add our desktop shortcuts. @@ -132,7 +132,7 @@ SectionEnd Section /o "Quick Launch Shortcuts" SEC05 - SetShellVarContext all + SetShellVarContext current ;; ;; Add our quick launch shortcuts. @@ -171,7 +171,7 @@ Section Uninstall !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP - SetShellVarContext all + SetShellVarContext current ;; ;; Clean up installed files.

17 years, 5 months

[dreimer] 27580: This fixes the needed Variable

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 01:32:24 2007 New Revision: 27580 URL: http://svn.reactos.org/svn/reactos?rev=27580&view=rev Log: This fixes the needed Variable Modified: trunk/tools/RosBE-Windows/WriteEnvStr.nsh Modified: trunk/tools/RosBE-Windows/WriteEnvStr.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/WriteEnvStr.ns… ============================================================================== --- trunk/tools/RosBE-Windows/WriteEnvStr.nsh (original) +++ trunk/tools/RosBE-Windows/WriteEnvStr.nsh Wed Jul 11 01:32:24 2007 @@ -4,12 +4,7 @@ !include "WinMessages.nsh" !ifndef WriteEnvStr_RegKey - !ifdef ALL_USERS - !define WriteEnvStr_RegKey \ - 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' - !else - !define WriteEnvStr_RegKey 'HKCU "Environment"' - !endif + !define WriteEnvStr_RegKey 'HKCU "Environment"' !endif # @@ -126,7 +121,7 @@ !macro IsNT UN Function ${UN}IsNT Push $0 - ReadRegStr $0 HKCU \ + ReadRegStr $0 HKLM \ "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion StrCmp $0 "" 0 IsNT_yes ; we are not NT.

17 years, 5 months

[dreimer] 27579: Current try to get it run on NonAdmin rights. Cooooliiin. HEELP

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 01:18:29 2007 New Revision: 27579 URL: http://svn.reactos.org/svn/reactos?rev=27579&view=rev Log: Current try to get it run on NonAdmin rights. Cooooliiin. HEELP Modified: trunk/tools/RosBE-Windows/RosBE.nsi trunk/tools/RosBE-Windows/WriteEnvStr.nsh Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Wed Jul 11 01:18:29 2007 @@ -2,7 +2,7 @@ !define PRODUCT_VERSION "0.3.7" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define PRODUCT_UNINST_ROOT_KEY "HKCU" !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir" ;; @@ -11,7 +11,7 @@ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "RosBE-${PRODUCT_VERSION}.exe" InstallDir "$PROFILE\RosBE" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -33,7 +33,6 @@ !include "MUI.nsh" !include "RosSourceDir.nsh" -!define ALL_USERS !include "WriteEnvStr.nsh" ;; MUI begin. @@ -150,7 +149,7 @@ Section -Post SEC07 WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" + WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" @@ -214,15 +213,15 @@ ;; Clean up the registry. ;; DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}" SetAutoClose true SectionEnd Function UninstallPrevious - ReadRegStr $R0 HKLM \ + ReadRegStr $R0 HKCU \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ "UninstallString" - ReadRegStr $R1 HKLM \ + ReadRegStr $R1 HKCU \ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" \ "DisplayVersion" StrCmp $R1 "${PRODUCT_VERSION}" SameVersion Modified: trunk/tools/RosBE-Windows/WriteEnvStr.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/WriteEnvStr.ns… ============================================================================== --- trunk/tools/RosBE-Windows/WriteEnvStr.nsh (original) +++ trunk/tools/RosBE-Windows/WriteEnvStr.nsh Wed Jul 11 01:18:29 2007 @@ -126,7 +126,7 @@ !macro IsNT UN Function ${UN}IsNT Push $0 - ReadRegStr $0 HKLM \ + ReadRegStr $0 HKCU \ "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion StrCmp $0 "" 0 IsNT_yes ; we are not NT.

17 years, 5 months

[fireball] 27578: - Russian translation fixes by Dmitry Chapyshev (lentin).

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jul 11 00:45:56 2007 New Revision: 27578 URL: http://svn.reactos.org/svn/reactos?rev=27578&view=rev Log: - Russian translation fixes by Dmitry Chapyshev (lentin). Added: trunk/reactos/base/applications/charmap/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Added: trunk/reactos/base/applications/charmap/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/ru-RU.rc (added) +++ trunk/reactos/base/applications/charmap/ru-RU.rc Wed Jul 11 00:45:56 2007 @@ -1,0 +1,37 @@ +// Russian language resource file (Dmitry Chapyshev, 2007-06-10) + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Òàáëèöà ñèìâîëîâ" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Ñïðàâêà", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Êîïèðîâàòü ñèìâîë :", IDC_STATIC, 6, 188, 66, 9 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Êîïèðîâàòü", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Î Òàáëèöå ñèìâîëîâ" +FONT 8,"MS Sans Serif",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Òàáëèöà ñèìâîëîâ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_ABOUT "&Î ïðîãðàììå..." +END Propchange: trunk/reactos/base/applications/charmap/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Wed Jul 11 00:45:56 2007 @@ -29,8 +29,8 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire îò J Brown\n\nCardLib âåðñèè 1.0." + IDS_SOL_NAME "Ïàñüÿíñ" + IDS_SOL_ABOUT "Ïàñüÿíñ îò J Brown\n\nCardLib âåðñèè 1.0." IDS_SOL_QUIT "Çàêîí÷èòü òåêóùóþ èãðó?" END Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Wed Jul 11 00:45:56 2007 @@ -5,7 +5,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_APPNAME, "WineMine" + IDS_APPNAME, "Ñàïåð" } @@ -81,7 +81,7 @@ FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT { - LTEXT "Winemine", IDNONE, 10, 10, 35, 10 + LTEXT "Ñàïåð", IDNONE, 10, 10, 35, 10 LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 LTEXT "ïîä ëèöåíçèåé Wine", IDNONE, 35, 35, 100, 10 ICON "WINEMINE", IDNONE, 10, 25, 20, 20 Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mmc/lang/ru-RU.rc Wed Jul 11 00:45:56 2007 @@ -12,12 +12,12 @@ POPUP "&Ñïðàâêà" BEGIN - MENUITEM "&Î ReactOS Management Console...", ID_HELP_ABOUT + MENUITEM "&Î Êîíñîëè óïðàâëåíèÿ ReactOS...", ID_HELP_ABOUT END END STRINGTABLE DISCARDABLE BEGIN - IDS_APPTITLE "ReactOS Management Console" + IDS_APPTITLE "Êîíñîëü óïðàâëåíèÿ ReactOS" IDS_CONSOLETITLE "Console%1!u!" END Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/msconfig/lang/ru-RU.rc Wed Jul 11 00:45:56 2007 @@ -153,5 +153,5 @@ IDS_SERVICES_STATUS_RUNNING "Çàïóùåíî" IDS_SERVICES_STATUS_STOPPED "Îñòàíîâëåíî" IDS_SERVICES_YES "Äà" - IDS_SERVICES_UNKNOWN "Unknown" + IDS_SERVICES_UNKNOWN "Íåèçâåñòíûé" END Modified: trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/sndvol32/lang/ru-RU.rc Wed Jul 11 00:45:56 2007 @@ -11,7 +11,7 @@ MENUITEM SEPARATOR MENUITEM "&Âûõîä", IDC_EXIT END - POPUP "&Help" + POPUP "&Ñïðàâêà" BEGIN MENUITEM "&Âûçîâ ñïðàâêè", IDC_HELP_TOPICS MENUITEM SEPARATOR Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Wed Jul 11 00:45:56 2007 @@ -287,69 +287,69 @@ PUSHBUTTON "Îòìåíà",IDCANCEL,174,133,50,14 LTEXT "Óñòàíîâêà ïðîöåññîðîâ, íà êîòîðûõ áóäåò âûïîëíÿòüñÿ çàäà÷à.", IDC_STATIC,5,5,220,16 - CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + CONTROL "ÖÏ 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 11,28,37,10 - CONTROL "CPU 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,41,37,10 - CONTROL "CPU 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,54,37,10 - CONTROL "CPU 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,67,37,10 - CONTROL "CPU 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,80,37,10 - CONTROL "CPU 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,93,37,10 - CONTROL "CPU 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,106,37,10 - CONTROL "CPU 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,11,119,37,10 - CONTROL "CPU 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,28,37,10 - CONTROL "CPU 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + CONTROL "ÖÏ 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,41,37,10 - CONTROL "CPU 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,54,41,10 - CONTROL "CPU 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,67,41,10 - CONTROL "CPU 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,80,41,10 - CONTROL "CPU 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,93,41,10 - CONTROL "CPU 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,106,41,10 - CONTROL "CPU 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,61,119,41,10 - CONTROL "CPU 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,28,41,10 - CONTROL "CPU 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,41,41,10 - CONTROL "CPU 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,54,41,10 - CONTROL "CPU 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,67,41,10 - CONTROL "CPU 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,80,41,10 - CONTROL "CPU 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,93,41,10 - CONTROL "CPU 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,106,41,10 - CONTROL "CPU 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,119,41,10 - CONTROL "CPU 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,28,41,10 - CONTROL "CPU 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,41,41,10 - CONTROL "CPU 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,54,41,10 - CONTROL "CPU 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,67,41,10 - CONTROL "CPU 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,80,41,10 - CONTROL "CPU 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,93,41,10 - CONTROL "CPU 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,106,41,10 - CONTROL "CPU 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + CONTROL "ÖÏ 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,175,119,41,10 END

17 years, 5 months

[dreimer] 27577: Updated ChangeLog

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Jul 11 00:42:40 2007 New Revision: 27577 URL: http://svn.reactos.org/svn/reactos?rev=27577&view=rev Log: Updated ChangeLog Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Wed Jul 11 00:42:40 2007 @@ -11,6 +11,10 @@ - Added use of ROS_LEAN_AND_MEAN by typeing "make/makex %command% strip". - Added GDB GNU-Debugger 6.6. - Readded makex. Sorry, bug in Vista still persists... its a GCC bug. +- Changed Default Source Folder to \Source Subfolder. Helpful for letting RosBE load the Source. +- Added a command to change the Default Folder for this session, nice for working with several ROS Trees or Branches. +- Very ALPHA User Mode Support. + *** May 21th, 2007 - RosBE 0.3.6 Released

17 years, 5 months

← Newer
1
...
45
46
47
48
49
50
51
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007