Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[tfaber] 61685: [NTOS] - Add missing newline in DPRINT

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 19 09:11:50 2014 New Revision: 61685 URL: http://svn.reactos.org/svn/reactos?rev=61685&view=rev Log: [NTOS] - Add missing newline in DPRINT Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Jan 19 09:11:50 2014 @@ -1694,7 +1694,7 @@ Status = MmQuerySectionView(MemoryArea, BaseAddress, &MemoryInfo, &ResultLength); if (!NT_SUCCESS(Status)) { - DPRINT1("MmQuerySectionView failed. MemoryArea=%p (%p-%p), BaseAddress=%p", + DPRINT1("MmQuerySectionView failed. MemoryArea=%p (%p-%p), BaseAddress=%p\n", MemoryArea, MemoryArea->StartingAddress, MemoryArea->EndingAddress, BaseAddress); NT_ASSERT(NT_SUCCESS(Status)); }

10 years, 11 months

[cwittich] 61684: [taskmgr] formatting fixes

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 19 08:52:21 2014 New Revision: 61684 URL: http://svn.reactos.org/svn/reactos?rev=61684&view=rev Log: [taskmgr] formatting fixes Modified: trunk/reactos/base/applications/taskmgr/about.c trunk/reactos/base/applications/taskmgr/proclist.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/about.c [iso-8859-1] Sun Jan 19 08:52:21 2014 @@ -24,10 +24,10 @@ void OnAbout(void) { - TCHAR szTaskmgr[128]; + WCHAR szTaskmgr[128]; HICON taskmgrIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER)); - LoadString(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(TCHAR)); - ShellAbout(hMainWnd, szTaskmgr, 0, taskmgrIcon); + LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR)); + ShellAboutW(hMainWnd, szTaskmgr, 0, taskmgrIcon); DeleteObject(taskmgrIcon); } Modified: trunk/reactos/base/applications/taskmgr/proclist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/proclist.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/proclist.c [iso-8859-1] Sun Jan 19 08:52:21 2014 @@ -76,7 +76,7 @@ rcItem.left = LVIR_BOUNDS; SendMessageW(hWnd, LVM_GETITEMRECT, ListView_GetItemCount(hWnd) - 1, (LPARAM)&rcItem); rcClip.bottom = rcItem.bottom; - rcClip.right = rcItem.right; + rcClip.right = rcItem.right; rcItem.left = LVIR_ICON; SendMessageW(hWnd, LVM_GETITEMRECT, 0, (LPARAM)&rcItem); rcClip.left = rcItem.right; Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Jan 19 08:52:21 2014 @@ -470,25 +470,25 @@ BOOL ProcessRunning(ULONG ProcessId) { - HANDLE hProcess; - DWORD exitCode; - - if (ProcessId == 0) { - return TRUE; - } - - hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, ProcessId); - if (hProcess == NULL) { - return FALSE; - } - - if (GetExitCodeProcess(hProcess, &exitCode)) { - CloseHandle(hProcess); - return (exitCode == STILL_ACTIVE); - } - - CloseHandle(hProcess); - return FALSE; + HANDLE hProcess; + DWORD exitCode; + + if (ProcessId == 0) { + return TRUE; + } + + hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, ProcessId); + if (hProcess == NULL) { + return FALSE; + } + + if (GetExitCodeProcess(hProcess, &exitCode)) { + CloseHandle(hProcess); + return (exitCode == STILL_ACTIVE); + } + + CloseHandle(hProcess); + return FALSE; } void AddProcess(ULONG Index)

10 years, 11 months

[cwittich] 61683: [winver] convert to unicode

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 19 08:30:17 2014 New Revision: 61683 URL: http://svn.reactos.org/svn/reactos?rev=61683&view=rev Log: [winver] convert to unicode Modified: trunk/reactos/base/applications/winver/winver.c Modified: trunk/reactos/base/applications/winver/winver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/w… ============================================================================== --- trunk/reactos/base/applications/winver/winver.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winver/winver.c [iso-8859-1] Sun Jan 19 08:30:17 2014 @@ -2,14 +2,14 @@ #include <windef.h> #include <winbase.h> #include <shellapi.h> -#include <tchar.h> -int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) { +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) +{ static const WCHAR szROS[] = { 'R','e','a','c','t','O','S',0 }; UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(nCmdShow); UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(hInstance); - ShellAbout(0, szROS, 0, 0); + ShellAboutW(0, szROS, 0, 0); return 1; }

10 years, 11 months

[cwittich] 61682: [msconfig] strsafe++

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jan 19 08:20:45 2014 New Revision: 61682 URL: http://svn.reactos.org/svn/reactos?rev=61682&view=rev Log: [msconfig] strsafe++ Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c trunk/reactos/base/applications/msconfig/precomp.h trunk/reactos/base/applications/msconfig/systempage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c [iso-8859-1] Sun Jan 19 08:20:45 2014 @@ -33,15 +33,27 @@ FILE * file; UINT length; LRESULT pos; + HRESULT hr; - wcscpy(szBuffer, szDrive); - wcscat(szBuffer, L"freeldr.ini"); + hr = StringCbCopyW(szBuffer, sizeof(szBuffer), szDrive); + if (FAILED(hr)) + return FALSE; + + hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"freeldr.ini"); + if (FAILED(hr)) + return FALSE; file = _wfopen(szBuffer, L"rt"); if (!file) { - wcscpy(szBuffer, szDrive); - wcscat(szBuffer, L"boot.ini"); + hr = StringCbCopyW(szBuffer, sizeof(szBuffer), szDrive); + if (FAILED(hr)) + return FALSE; + + hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"boot.ini"); + if (FAILED(hr)) + return FALSE; + file = _wfopen(szBuffer, L"rt"); if (!file) return FALSE; @@ -137,7 +149,7 @@ if (pos != LB_ERR) { LPARAM res = SendMessage((HWND)lParam, LB_GETITEMDATA, pos, 0); - if (!res) //line is not a default one + if (!res) /* line is not a default one */ SendMessage((HWND)lParam, LB_SETCURSEL, Settings.szDefaultPos, 0); else Settings.szDefaultPos = pos; Modified: trunk/reactos/base/applications/msconfig/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/precomp.h [iso-8859-1] Sun Jan 19 08:20:45 2014 @@ -11,6 +11,7 @@ #include <tchar.h> #include <stdio.h> #include <shlobj.h> +#include <strsafe.h> #include "msconfig.h" #include "resource.h" Modified: trunk/reactos/base/applications/msconfig/systempage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/systempage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/systempage.c [iso-8859-1] Sun Jan 19 08:20:45 2014 @@ -23,9 +23,15 @@ FILE* file; UINT length; TVINSERTSTRUCT insert; + HRESULT hr; - wcscpy(szBuffer, szPath); - wcscat(szBuffer, L"\\system.ini"); + hr = StringCbCopyW(szBuffer, sizeof(szBuffer), szPath); + if (FAILED(hr)) + return FALSE; + + hr = StringCbCatW(szBuffer, sizeof(szBuffer), L"\\system.ini"); + if (FAILED(hr)) + return FALSE; file = _wfopen(szBuffer, L"rt"); if (!file)

10 years, 11 months

[ekohl] 61681: [MSGINA] - Display the lock message on the lock and unlock dialogs. - Implement the DontDisplayLastUserName and ShutdownWithoutLogon options. - Read the DefaultUserName and DefaultDo...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 19 01:33:19 2014 New Revision: 61681 URL: http://svn.reactos.org/svn/reactos?rev=61681&view=rev Log: [MSGINA] - Display the lock message on the lock and unlock dialogs. - Implement the DontDisplayLastUserName and ShutdownWithoutLogon options. - Read the DefaultUserName and DefaultDomain and display the user name on the logon dialog unless the DontDisplayLastUserName option is enabled. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Jan 19 01:33:19 2014 @@ -478,14 +478,20 @@ { case WM_INITDIALOG: { - /* FIXME: take care of DontDisplayLastUserName, NoDomainUI, ShutdownWithoutLogon */ + /* FIXME: take care of NoDomainUI */ pgContext = (PGINA_CONTEXT)lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + if (pgContext->bDontDisplayLastUserName == FALSE) + SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); + if (pgContext->bDisableCAD == TRUE) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); - SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + if (pgContext->bShutdownWithoutLogon == FALSE) + EnableWindow(GetDlgItem(hwndDlg, IDC_SHUTDOWN), FALSE); + + SetFocus(GetDlgItem(hwndDlg, pgContext->bDontDisplayLastUserName ? IDC_USERNAME : IDC_PASSWORD)); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); return TRUE; @@ -573,6 +579,24 @@ } +static VOID +SetLockMessage(HWND hwnd, + INT nDlgItem, + PGINA_CONTEXT pgContext) +{ + WCHAR Buffer1[256]; + WCHAR Buffer2[256]; + WCHAR Buffer3[512]; + + LoadStringW(pgContext->hDllInstance, IDS_LOCKMSG, Buffer1, 256); + + wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); + wsprintfW(Buffer3, Buffer1, Buffer2); + + SetDlgItemTextW(hwnd, nDlgItem, Buffer3); +} + + static INT_PTR CALLBACK @@ -592,10 +616,13 @@ pgContext = (PGINA_CONTEXT)lParam; SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + SetLockMessage(hwndDlg, IDC_LOCKMSG, pgContext); + + SetDlgItemTextW(hwndDlg, IDC_USERNAME, pgContext->UserName); + SetFocus(GetDlgItem(hwndDlg, IDC_PASSWORD)); + if (pgContext->bDisableCAD == TRUE) EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); - - SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); return TRUE; @@ -678,23 +705,6 @@ } -static VOID -OnInitLockedDlg(HWND hwnd, - PGINA_CONTEXT pgContext) -{ - WCHAR Buffer1[256]; - WCHAR Buffer2[256]; - WCHAR Buffer3[512]; - - LoadStringW(pgContext->hDllInstance, IDS_LOCKMSG, Buffer1, 256); - - wsprintfW(Buffer2, L"%s\\%s", pgContext->Domain, pgContext->UserName); - wsprintfW(Buffer3, Buffer1, Buffer2); - - SetDlgItemTextW(hwnd, IDC_LOCKMSG, Buffer3); -} - - static INT_PTR CALLBACK LockedWindowProc( IN HWND hwndDlg, @@ -714,7 +724,7 @@ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - OnInitLockedDlg(hwndDlg, pgContext); + SetLockMessage(hwndDlg, IDC_LOCKMSG, pgContext); return TRUE; } case WM_PAINT: Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sun Jan 19 01:33:19 2014 @@ -162,7 +162,10 @@ { HKEY hKey = NULL; LPWSTR lpAutoAdminLogon = NULL; + LPWSTR lpDontDisplayLastUserName = NULL; + LPWSTR lpShutdownWithoutLogon = NULL; DWORD dwDisableCAD = 0; + DWORD dwSize; LONG rc; rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -197,6 +200,47 @@ } TRACE("bDisableCAD: %s\n", pgContext->bDisableCAD ? "TRUE" : "FALSE"); + + pgContext->bShutdownWithoutLogon = TRUE; + rc = ReadRegSzKey(hKey, + L"ShutdownWithoutLogon", + &lpShutdownWithoutLogon); + if (rc == ERROR_SUCCESS) + { + if (wcscmp(lpShutdownWithoutLogon, L"0") == 0) + pgContext->bShutdownWithoutLogon = FALSE; + } + + rc = ReadRegSzKey(hKey, + L"DontDisplayLastUserName", + &lpDontDisplayLastUserName); + if (rc == ERROR_SUCCESS) + { + if (wcscmp(lpDontDisplayLastUserName, L"1") == 0) + pgContext->bDontDisplayLastUserName = TRUE; + } + + dwSize = 256 * sizeof(WCHAR); + rc = RegQueryValueExW(hKey, + L"DefaultUserName", + NULL, + NULL, + (LPBYTE)&pgContext->UserName, + &dwSize); + + dwSize = 256 * sizeof(WCHAR); + rc = RegQueryValueExW(hKey, + L"DefaultDomainName", + NULL, + NULL, + (LPBYTE)&pgContext->Domain, + &dwSize); + + if (lpShutdownWithoutLogon != NULL) + HeapFree(GetProcessHeap(), 0, lpShutdownWithoutLogon); + + if (lpDontDisplayLastUserName != NULL) + HeapFree(GetProcessHeap(), 0, lpDontDisplayLastUserName); if (lpAutoAdminLogon != NULL) HeapFree(GetProcessHeap(), 0, lpAutoAdminLogon); Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Jan 19 01:33:19 2014 @@ -36,6 +36,8 @@ DWORD AutoLogonState; BOOL bDisableCAD; BOOL bAutoAdminLogon; + BOOL bDontDisplayLastUserName; + BOOL bShutdownWithoutLogon; /* Information to be filled during logon */ WCHAR UserName[256];

10 years, 11 months

[tfaber] 61680: [HIDPARSER] - Use the full bit range of input items instead of discarding high bits CORE-7772 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jan 18 19:18:33 2014 New Revision: 61680 URL: http://svn.reactos.org/svn/reactos?rev=61680&view=rev Log: [HIDPARSER] - Use the full bit range of input items instead of discarding high bits CORE-7772 #resolve Modified: trunk/reactos/lib/drivers/hidparser/api.c Modified: trunk/reactos/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/api.… ============================================================================== --- trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/hidparser/api.c [iso-8859-1] Sat Jan 18 19:18:33 2014 @@ -602,7 +602,7 @@ return HIDPARSER_STATUS_INVALID_REPORT_LENGTH; } - for(Index = 0; Index < Report->ItemCount; Index++) + for (Index = 0; Index < Report->ItemCount; Index++) { // // get report item @@ -632,10 +632,10 @@ ASSERT(ReportItem->ByteOffset < ReportDescriptorLength); // - // FIXME: support items with variable bitlength - // - ASSERT(ReportItem->BitCount == 16); - Data = (ReportDescriptor[ReportItem->ByteOffset +1] & 0xFF) | (ReportDescriptor[ReportItem->ByteOffset +2] & 0xFF) << 8; + // one extra shift for skipping the prepended report id + // + Data = 0; + Parser->Copy(&Data, &ReportDescriptor[ReportItem->ByteOffset + 1], min(sizeof(ULONG), ReportDescriptorLength - (ReportItem->ByteOffset + 1))); // // shift data @@ -699,7 +699,7 @@ return HIDPARSER_STATUS_INVALID_REPORT_LENGTH; } - for(Index = 0; Index < Report->ItemCount; Index++) + for (Index = 0; Index < Report->ItemCount; Index++) { // // get report item @@ -732,8 +732,7 @@ // one extra shift for skipping the prepended report id // Data = 0; - Parser->Copy(&Data, &ReportDescriptor[ReportItem->ByteOffset +1], min(sizeof(ULONG), ReportDescriptorLength - (ReportItem->ByteOffset + 1))); - Data = ReportDescriptor[ReportItem->ByteOffset + 1]; + Parser->Copy(&Data, &ReportDescriptor[ReportItem->ByteOffset + 1], min(sizeof(ULONG), ReportDescriptorLength - (ReportItem->ByteOffset + 1))); // // shift data @@ -812,7 +811,6 @@ // return CustomerScanCodes[i].ScanCode; } - } //

10 years, 11 months

[ekohl] 61679: [SYSSETUP] Set the commputer name and account domain name in unattended setup.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 18 18:28:01 2014 New Revision: 61679 URL: http://svn.reactos.org/svn/reactos?rev=61679&view=rev Log: [SYSSETUP] Set the commputer name and account domain name in unattended setup. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Jan 18 18:28:01 2014 @@ -532,18 +532,22 @@ { WCHAR Title[64]; WCHAR ErrorComputerName[256]; + if (!SetComputerNameW(ComputerName)) { - if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) - { - wcscpy(Title, L"ReactOS Setup"); - } - if (0 == LoadStringW(hDllInstance, IDS_WZD_SETCOMPUTERNAME, ErrorComputerName, - sizeof(ErrorComputerName) / sizeof(ErrorComputerName[0]))) - { - wcscpy(ErrorComputerName, L"Setup failed to set the computer name."); - } - MessageBoxW(hwndDlg, ErrorComputerName, Title, MB_ICONERROR | MB_OK); + if (hwndDlg != NULL) + { + if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) + { + wcscpy(Title, L"ReactOS Setup"); + } + if (0 == LoadStringW(hDllInstance, IDS_WZD_SETCOMPUTERNAME, ErrorComputerName, + sizeof(ErrorComputerName) / sizeof(ErrorComputerName[0]))) + { + wcscpy(ErrorComputerName, L"Setup failed to set the computer name."); + } + MessageBoxW(hwndDlg, ErrorComputerName, Title, MB_ICONERROR | MB_OK); + } return FALSE; } @@ -617,6 +621,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_COMPUTERNAME), WM_SETTEXT, 0, (LPARAM)SetupData.ComputerName); SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD1), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD2), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); + WriteComputerSettings(SetupData.ComputerName, NULL); SetAdministratorPassword(SetupData.AdminPassword); }

10 years, 11 months

[ekohl] 61678: [SYSSETUP] Fix unattended install and disable some debug output.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 18 16:54:34 2014 New Revision: 61678 URL: http://svn.reactos.org/svn/reactos?rev=61678&view=rev Log: [SYSSETUP] Fix unattended install and disable some debug output. Modified: trunk/reactos/dll/win32/syssetup/security.c trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Sat Jan 18 16:54:34 2014 @@ -423,9 +423,9 @@ if (AdminInfo.Password != NULL) wcscpy(AdminInfo.Password, Password); - DPRINT1("Administrator Name: %S\n", AdminInfo.Name); - DPRINT1("Administrator Domain: %S\n", AdminInfo.Domain); - DPRINT1("Administrator Password: %S\n", AdminInfo.Password); + DPRINT("Administrator Name: %S\n", AdminInfo.Name); + DPRINT("Administrator Domain: %S\n", AdminInfo.Domain); + DPRINT("Administrator Password: %S\n", AdminInfo.Password); done: if (AccountNameInfo != NULL) Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat Jan 18 16:54:34 2014 @@ -617,6 +617,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_COMPUTERNAME), WM_SETTEXT, 0, (LPARAM)SetupData.ComputerName); SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD1), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD2), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); + SetAdministratorPassword(SetupData.AdminPassword); } }

10 years, 11 months

[dreimer] 61677: [DXDIAG] Improve english resource file by Lee Schroeder Added that change to all other languages, too. (Where still applicable) CORE-7479 #resolve

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Jan 18 15:47:09 2014 New Revision: 61677 URL: http://svn.reactos.org/svn/reactos?rev=61677&view=rev Log: [DXDIAG] Improve english resource file by Lee Schroeder Added that change to all other languages, too. (Where still applicable) CORE-7479 #resolve Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/en-US.rc trunk/reactos/base/applications/dxdiag/lang/es-ES.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/he-IL.rc trunk/reactos/base/applications/dxdiag/lang/it-IT.rc trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc trunk/reactos/base/applications/dxdiag/lang/no-NO.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "ÐÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»:", -1, 20, 35, 80, 10 RTEXT "ÐÐ¸Ð´ Ð½Ð° ÑÐ¸Ð¿Ð°:", -1, 20, 45, 80, 10 RTEXT "ÐÐ¸Ð´ Ð¦ÐÐ:", -1, 20, 55, 80, 10 - RTEXT "ÐÐ±ÑÐ° Ð¿Ð°Ð¼ÐµÑ Ð¾ÐºÐ¾Ð»Ð¾:", -1, 20, 65, 80, 10 - RTEXT "Ð ÐµÐ¶Ð¸Ð¼ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°:", -1, 20, 75, 80, 10 + RTEXT "ÐÐ±ÑÐ° Ð¿Ð°Ð¼ÐµÑ Ð¾ÐºÐ¾Ð»Ð¾:", -1, 14, 65, 80, 10 + RTEXT "Ð ÐµÐ¶Ð¸Ð¼ Ð½Ð° ÐµÐºÑÐ°Ð½Ð°:", -1, 14, 75, 80, 10 RTEXT "ÐÐºÑÐ°Ð½:", -1, 20, 85, 80, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -189,7 +189,7 @@ IDS_DEVICE_MANUFACTURER "ÐÐ Ð½Ð° Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»Ñ" IDS_DEVICE_PRODUCT "ÐÐ Ð½Ð° Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸ÐµÑÐ¾" IDS_DEVICE_FORCEFEEDBACK "ÐÐ¾Ð´Ð°Ñ Ð·Ð° ÑÐ¸Ð»Ð¾Ð²Ð° Ð¾Ð±ÑÐ°ÑÐ½Ð° Ð²ÑÑÐ·ÐºÐ°" - IDS_NOT_APPLICABLE "ÐÐµÐ¿ÑÐ¸Ð»Ð¾Ð¶Ð¸Ð¼Ð¾" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "ÐÐ°" IDS_DIRECTPLAY_COL_NAME1 "ÐÐ¼Ðµ" IDS_DIRECTPLAY_COL_NAME2 "Ð ÐµÐ³Ð¸ÑÑÑÑ" Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -58,8 +58,8 @@ RTEXT "VÃ½robce:", -1, 20, 35, 70, 10 RTEXT "Typ Äipu:", -1, 20, 45, 70, 10 RTEXT "Typ DAC:", -1, 20, 55, 70, 10 - RTEXT "CelkovÃ¡ pamÄÅ¥:", -1, 20, 65, 70, 10 - RTEXT "ZobrazovacÃ mÃ³d:", -1, 20, 75, 70, 10 + RTEXT "CelkovÃ¡ pamÄÅ¥:", -1, 14, 65, 75, 10 + RTEXT "ZobrazovacÃ mÃ³d:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -194,7 +194,7 @@ IDS_DEVICE_MANUFACTURER "ID vÃ½robce" IDS_DEVICE_PRODUCT "ID produktu" IDS_DEVICE_FORCEFEEDBACK "OvladaÄ Force Feedback" - IDS_NOT_APPLICABLE "Nelze aplikovat" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Ano" IDS_DIRECTPLAY_COL_NAME1 "NÃ¡zev" IDS_DIRECTPLAY_COL_NAME2 "Registr" Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/de-DE.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "Hersteller:", -1, 20, 35, 70, 10 RTEXT "Chiptyp:", -1, 20, 45, 70, 10 RTEXT "DAC-Typ:", -1, 20, 55, 70, 10 - RTEXT "Gesamtspeicher ca.:", -1, 20, 65, 70, 10 - RTEXT "Anzeigemodus:", -1, 20, 75, 70, 10 + RTEXT "Gesamtspeicher ca.:", -1, 14, 65, 75, 10 + RTEXT "Anzeigemodus:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -189,7 +189,7 @@ IDS_DEVICE_MANUFACTURER "Herstellererkennung" IDS_DEVICE_PRODUCT "Produkterkennung" IDS_DEVICE_FORCEFEEDBACK "Force-Feedback-Treiber" - IDS_NOT_APPLICABLE "Nicht zutreffend" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Ja" IDS_DIRECTPLAY_COL_NAME1 "Name" IDS_DIRECTPLAY_COL_NAME2 "Registrierung" Modified: trunk/reactos/base/applications/dxdiag/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "Manufacturer:", -1, 20, 35, 70, 10 RTEXT "Chip Type:", -1, 20, 45, 70, 10 RTEXT "DAC Type:", -1, 20, 55, 70, 10 - RTEXT "Approx. Total Memory:", -1, 20, 65, 70, 10 - RTEXT "Current Display Mode:", -1, 20, 75, 70, 10 + RTEXT "Approx. Total Memory:", -1, 14, 65, 75, 10 + RTEXT "Current Display Mode:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -189,7 +189,7 @@ IDS_DEVICE_MANUFACTURER "Manufacturer ID" IDS_DEVICE_PRODUCT "Product ID" IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" - IDS_NOT_APPLICABLE "Not applicable" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Yes" IDS_DIRECTPLAY_COL_NAME1 "Name" IDS_DIRECTPLAY_COL_NAME2 "Registry" Modified: trunk/reactos/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/es-ES.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -55,8 +55,8 @@ RTEXT "Fabricante:", -1, 20, 35, 70, 10 RTEXT "Tipo de Chip:", -1, 20, 45, 70, 10 RTEXT "Ipo de DAC:", -1, 20, 55, 70, 10 - RTEXT "Memoria total aprox.:", -1, 20, 65, 70, 10 - RTEXT "ResoluciÃ³n actual:", -1, 20, 75, 70, 10 + RTEXT "Memoria total aprox.:", -1, 14, 65, 75, 10 + RTEXT "ResoluciÃ³n actual:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -191,7 +191,7 @@ IDS_DEVICE_MANUFACTURER "ID del fabricante" IDS_DEVICE_PRODUCT "ID del producto" IDS_DEVICE_FORCEFEEDBACK "Forzar recuperaciÃ³n del controlador" - IDS_NOT_APPLICABLE "No aplicable" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "SÃ" IDS_DIRECTPLAY_COL_NAME1 "Nombre" IDS_DIRECTPLAY_COL_NAME2 "Registro" Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "Fabricant :", -1, 20, 35, 70, 10 RTEXT "Type de puce :", -1, 20, 45, 70, 10 RTEXT "Type de DAC :", -1, 20, 55, 70, 10 - RTEXT "MÃ©moire totale approx. :", -1, 20, 65, 70, 10 - RTEXT "Mode d'affichage actuelle:", -1, 20, 75, 70, 10 + RTEXT "MÃ©moire totale approx. :", -1, 14, 65, 75, 10 + RTEXT "Mode d'affichage actuelle:", -1, 14, 75, 75, 10 RTEXT "Moniteur :", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -189,7 +189,7 @@ IDS_DEVICE_MANUFACTURER "ID fabricant" IDS_DEVICE_PRODUCT "ID produit" IDS_DEVICE_FORCEFEEDBACK "PÃ©riphÃ©rique Ã retour de force" - IDS_NOT_APPLICABLE "Non appliquable" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Oui" IDS_DIRECTPLAY_COL_NAME1 "Nom" IDS_DIRECTPLAY_COL_NAME2 "Registre" Modified: trunk/reactos/base/applications/dxdiag/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/he-IL.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -54,8 +54,8 @@ RTEXT "××¦×¨×:", -1, 20, 35, 70, 10 RTEXT "×¡×× ×©××:", -1, 20, 45, 70, 10 RTEXT "×¡×× DAC:", -1, 20, 55, 70, 10 - RTEXT "××××¨×× ×××× ××§××¨××:", -1, 20, 65, 70, 10 - RTEXT "××¦× ×ª×¦××× × ××××:", -1, 20, 75, 70, 10 + RTEXT "××××¨×× ×××× ××§××¨××:", -1, 14, 65, 75, 10 + RTEXT "××¦× ×ª×¦××× × ××××:", -1, 14, 75, 75, 10 RTEXT "×¦×:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -190,7 +190,7 @@ IDS_DEVICE_MANUFACTURER "×××× ×¡×¤×§" IDS_DEVICE_PRODUCT "×××× ×××¦×¨" IDS_DEVICE_FORCEFEEDBACK "Force Feedback ×× ×× ××ª×§×" - IDS_NOT_APPLICABLE "Not applicable" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "××" IDS_DIRECTPLAY_COL_NAME1 "×©×" IDS_DIRECTPLAY_COL_NAME2 "×¨×©××" Modified: trunk/reactos/base/applications/dxdiag/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/it-IT.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "Fabbricante:", -1, 20, 35, 70, 10 RTEXT "Chip Type:", -1, 20, 45, 70, 10 RTEXT "DAC Type:", -1, 20, 55, 70, 10 - RTEXT "Totale memnoria (Approssimativo):", -1, 20, 65, 70, 10 - RTEXT "ModalitÃ di visualizzazione corrente:", -1, 20, 75, 70, 10 + RTEXT "Totale memnoria (Approssimativo):", -1, 14, 65, 75, 10 + RTEXT "ModalitÃ di visualizzazione corrente:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -189,7 +189,7 @@ IDS_DEVICE_MANUFACTURER "Manufacturer ID" IDS_DEVICE_PRODUCT "Product ID" IDS_DEVICE_FORCEFEEDBACK "Forza Feedback-Driver" - IDS_NOT_APPLICABLE "Non applicabile" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Si" IDS_DIRECTPLAY_COL_NAME1 "Nome" IDS_DIRECTPLAY_COL_NAME2 "Registro" Modified: trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ja-JP.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "è£½é å:", -1, 20, 35, 70, 10 RTEXT "ãããã®ç¨®é¡:", -1, 20, 45, 70, 10 RTEXT "DAC ã®ç¨®é¡:", -1, 20, 55, 70, 10 - RTEXT "æ¦ç®ã¡ã¢ãªåè¨:", -1, 20, 65, 70, 10 - RTEXT "ç¾å¨ã®ãã£ã¹ãã¬ã¤ ã¢ã¼ã:", -1, 20, 75, 70, 10 + RTEXT "æ¦ç®ã¡ã¢ãªåè¨:", -1, 14, 65, 75, 10 + RTEXT "ç¾å¨ã®ãã£ã¹ãã¬ã¤ ã¢ã¼ã:", -1, 14, 75, 75, 10 RTEXT "ã¢ãã¿:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -55,8 +55,8 @@ RTEXT "ì ì¡°ì:", -1, 20, 35, 70, 10 RTEXT "ì¹© íì:", -1, 20, 45, 70, 10 RTEXT "DAC íì:", -1, 20, 55, 70, 10 - RTEXT "ì´ ë©ëª¨ë¦¬:", -1, 20, 65, 70, 10 - RTEXT "íì¬ ëì¤íë ì´ ëª¨ë:", -1, 20, 75, 70, 10 + RTEXT "ì´ ë©ëª¨ë¦¬:", -1, 14, 65, 75, 10 + RTEXT "íì¬ ëì¤íë ì´ ëª¨ë:", -1, 14, 75, 75, 10 RTEXT "ëª¨ëí°:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 Modified: trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "Fabrikans:", -1, 20, 35, 70, 10 RTEXT "Chip-type:", -1, 20, 45, 70, 10 RTEXT "DAC-type:", -1, 20, 55, 70, 10 - RTEXT "Totaal geheugen:", -1, 20, 65, 70, 10 - RTEXT "Huidige resolutie:", -1, 20, 75, 70, 10 + RTEXT "Totaal geheugen:", -1, 14, 65, 75, 10 + RTEXT "Huidige resolutie:", -1, 14, 75, 75, 10 RTEXT "Beeldscherm:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 Modified: trunk/reactos/base/applications/dxdiag/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/no-NO.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "Fabrikant:", -1, 20, 35, 70, 10 RTEXT "Brikketype:", -1, 20, 45, 70, 10 RTEXT "DAC type:", -1, 20, 55, 70, 10 - RTEXT "Cirka total minne:", -1, 20, 65, 70, 10 - RTEXT "Gjeldende skjermmodus:", -1, 20, 75, 70, 10 + RTEXT "Cirka total minne:", -1, 14, 65, 75, 10 + RTEXT "Gjeldende skjermmodus:", -1, 14, 75, 75, 10 RTEXT "Skjerm:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -189,7 +189,7 @@ IDS_DEVICE_MANUFACTURER "Fabrikant ID" IDS_DEVICE_PRODUCT "Produkt ID" IDS_DEVICE_FORCEFEEDBACK "Force Feedback-driver" - IDS_NOT_APPLICABLE "Ikke gjeldende" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Ja" IDS_DIRECTPLAY_COL_NAME1 "Navn" IDS_DIRECTPLAY_COL_NAME2 "Register" Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -62,8 +62,8 @@ RTEXT "Producent:", -1, 20, 35, 70, 10 RTEXT "GPU:", -1, 20, 45, 70, 10 RTEXT "Typ DAC:", -1, 20, 55, 70, 10 - RTEXT "PamiÄÄ:", -1, 20, 65, 70, 10 - RTEXT "BieÅ¼Äca rozdzielczoÅÄ:", -1, 20, 75, 70, 10 + RTEXT "PamiÄÄ:", -1, 14, 65, 75, 10 + RTEXT "BieÅ¼Äca rozdzielczoÅÄ:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -198,7 +198,7 @@ IDS_DEVICE_MANUFACTURER "ID Producenta" IDS_DEVICE_PRODUCT "ID Produktu" IDS_DEVICE_FORCEFEEDBACK "Sterowniki Force-Feedback" - IDS_NOT_APPLICABLE "Nie stosowane" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Tak" IDS_DIRECTPLAY_COL_NAME1 "Nazwa" IDS_DIRECTPLAY_COL_NAME2 "Rejestr" Modified: trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pt-BR.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -55,8 +55,8 @@ RTEXT "Fabricante:", -1, 20, 35, 70, 10 RTEXT "Tipo de processador:", -1, 20, 45, 70, 10 RTEXT "Conv. analÃ³gico-digital:", -1, 20, 55, 70, 10 - RTEXT "Total aprox. memÃ³ria:", -1, 20, 65, 70, 10 - RTEXT "Modo de exib. atual:", -1, 20, 75, 70, 10 + RTEXT "Total aprox. memÃ³ria:", -1, 14, 65, 75, 10 + RTEXT "Modo de exib. atual:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -191,7 +191,7 @@ IDS_DEVICE_MANUFACTURER "IdentificaÃ§Ã£o do fornecedor" IDS_DEVICE_PRODUCT "IdentificaÃ§Ã£o do produto (Product ID)" IDS_DEVICE_FORCEFEEDBACK "Driver do Force Feedback" - IDS_NOT_APPLICABLE "NÃ£o aplicÃ¡vel" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Sim" IDS_DIRECTPLAY_COL_NAME1 "Nome" IDS_DIRECTPLAY_COL_NAME2 "Registro" Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -60,8 +60,8 @@ RTEXT "ProducÄtor:", -1, 20, 35, 70, 10 RTEXT "Tipul cipului:", -1, 20, 45, 70, 10 RTEXT "Tipul CDA:", -1, 20, 55, 70, 10 - RTEXT "Memorie aprox.:", -1, 20, 65, 70, 10 - RTEXT "AfiÈare curentÄ:", -1, 20, 75, 70, 10 + RTEXT "Memorie aprox.:", -1, 14, 65, 75, 10 + RTEXT "AfiÈare curentÄ:", -1, 14, 75, 75, 10 RTEXT "Ecran:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -196,7 +196,7 @@ IDS_DEVICE_MANUFACTURER "ID producÄtor" IDS_DEVICE_PRODUCT "ID produs" IDS_DEVICE_FORCEFEEDBACK "ForÈeazÄ reacÈia modulului-pilot" - IDS_NOT_APPLICABLE "Neaplicabil" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Da" IDS_DIRECTPLAY_COL_NAME1 "Nume" IDS_DIRECTPLAY_COL_NAME2 "Registru" Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -53,8 +53,8 @@ RTEXT "ÐÐ·Ð³Ð¾ÑÐ¾Ð²Ð¸ÑÐµÐ»Ñ:", -1, 20, 35, 70, 10 RTEXT "Ð¢Ð¸Ð¿ Ð¼Ð¸ÐºÑÐ¾ÑÑÐµÐ¼:", -1, 20, 45, 70, 10 RTEXT "Ð¢Ð¸Ð¿ ÐºÐ¾Ð½Ð²ÐµÑÑÐµÑÐ° DAC:", -1, 15, 55, 75, 10 - RTEXT "ÐÑÐµÐ³Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸:", -1, 20, 65, 70, 10 - RTEXT "Ð ÐµÐ¶Ð¸Ð¼ ÑÐºÑÐ°Ð½Ð°:", -1, 20, 75, 70, 10 + RTEXT "ÐÑÐµÐ³Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸:", -1, 14, 65, 75, 10 + RTEXT "Ð ÐµÐ¶Ð¸Ð¼ ÑÐºÑÐ°Ð½Ð°:", -1, 14, 75, 75, 10 RTEXT "ÐÐ¾Ð½Ð¸ÑÐ¾Ñ:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -58,8 +58,8 @@ RTEXT "VÃ½robca:", -1, 20, 35, 70, 10 RTEXT "Typ Äipu:", -1, 20, 45, 70, 10 RTEXT "Typ D-A konvertora:", -1, 20, 55, 70, 10 - RTEXT "Pribl. celkovÃ¡ pamÃ¤Å¥:", -1, 20, 65, 70, 10 - RTEXT "SÃºÄasnÃ½ mÃ³d obrazovky:", -1, 20, 75, 70, 10 + RTEXT "Pribl. celkovÃ¡ pamÃ¤Å¥:", -1, 14, 65, 75, 10 + RTEXT "SÃºÄasnÃ½ mÃ³d obrazovky:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -194,7 +194,7 @@ IDS_DEVICE_MANUFACTURER "ID vÃ½robcu" IDS_DEVICE_PRODUCT "ID produktu" IDS_DEVICE_FORCEFEEDBACK "OvlÃ¡daÄ Force Feedback" - IDS_NOT_APPLICABLE "Not applicable" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Ãno" IDS_DIRECTPLAY_COL_NAME1 "NÃ¡zov" IDS_DIRECTPLAY_COL_NAME2 "Registry" Modified: trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sq-AL.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -57,8 +57,8 @@ RTEXT "Prodhuesi:", -1, 20, 35, 70, 10 RTEXT "Tipi i procesorit:", -1, 20, 45, 70, 10 RTEXT "Tipi DAC:", -1, 20, 55, 70, 10 - RTEXT "Memoria Totale:", -1, 20, 65, 70, 10 - RTEXT "Modaliteti vizual aktual:", -1, 20, 75, 70, 10 + RTEXT "Memoria Totale:", -1, 14, 65, 75, 10 + RTEXT "Modaliteti vizual aktual:", -1, 14, 75, 75, 10 RTEXT "Monitor:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -193,7 +193,7 @@ IDS_DEVICE_MANUFACTURER "ID e proshuesit" IDS_DEVICE_PRODUCT "ID e produktit" IDS_DEVICE_FORCEFEEDBACK "Detyro prapaveprimin e Driverit" - IDS_NOT_APPLICABLE "Nuk aplikohet" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Po" IDS_DIRECTPLAY_COL_NAME1 "Emri" IDS_DIRECTPLAY_COL_NAME2 "Regjistri" Modified: trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -60,8 +60,8 @@ RTEXT "Fabrikat:", -1, 20, 35, 70, 10 RTEXT "Chip typ:", -1, 20, 45, 70, 10 RTEXT "DAC type:", -1, 20, 55, 70, 10 - RTEXT "Uppskattat total minne:", -1, 20, 65, 70, 10 - RTEXT "Aktuellt BildskÃ¤rmslÃ¤ge:", -1, 20, 75, 70, 10 + RTEXT "Uppskattat total minne:", -1, 14, 65, 75, 10 + RTEXT "Aktuellt BildskÃ¤rmslÃ¤ge:", -1, 14, 75, 75, 10 RTEXT "BildskÃ¤rm:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -196,7 +196,7 @@ IDS_DEVICE_MANUFACTURER "Tillverkarens ID" IDS_DEVICE_PRODUCT "Produkt ID" IDS_DEVICE_FORCEFEEDBACK "Force Feedback-driver" - IDS_NOT_APPLICABLE "Icke applicerbar" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Ja" IDS_DIRECTPLAY_COL_NAME1 "Namn" IDS_DIRECTPLAY_COL_NAME2 "Register" Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -55,8 +55,8 @@ RTEXT "Ãretici:", -1, 20, 35, 70, 10 RTEXT "Yonga TÃ¼rÃ¼:", -1, 20, 45, 70, 10 RTEXT "DAC TÃ¼rÃ¼:", -1, 20, 55, 70, 10 - RTEXT "YaklaÅÄ±k Toplam Bellek:", -1, 20, 65, 70, 10 - RTEXT "GeÃ§erli GÃ¶rÃ¼ntÃ¼ SeÃ§eneÄi:", -1, 20, 75, 70, 10 + RTEXT "YaklaÅÄ±k Toplam Bellek:", -1, 14, 65, 75, 10 + RTEXT "GeÃ§erli GÃ¶rÃ¼ntÃ¼ SeÃ§eneÄi:", -1, 14, 75, 75, 10 RTEXT "GÃ¶stergeÃ§:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 @@ -191,7 +191,7 @@ IDS_DEVICE_MANUFACTURER "Ãretici KimliÄi" IDS_DEVICE_PRODUCT "ÃrÃ¼n KimliÄi" IDS_DEVICE_FORCEFEEDBACK "GÃ¼Ã§ DÃ¶nÃ¼tlÃ¼ SÃ¼rÃ¼cÃ¼sÃ¼" - IDS_NOT_APPLICABLE "Uygulanamaz" + IDS_NOT_APPLICABLE "n/a" IDS_OPTION_YES "Evet" IDS_DIRECTPLAY_COL_NAME1 "Ad" IDS_DIRECTPLAY_COL_NAME2 "DeÄer" Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc [iso-8859-1] Sat Jan 18 15:47:09 2014 @@ -61,8 +61,8 @@ RTEXT "è£½é åï¼", -1, 20, 35, 70, 10 RTEXT "æ¶çé¡åï¼", -1, 20, 45, 70, 10 RTEXT "DAC é¡åï¼", -1, 20, 55, 70, 10 - RTEXT "è¨æ¶é«ç¸½è¨ç´ï¼", -1, 20, 65, 70, 10 - RTEXT "ç®åé¡¯ç¤ºæ¨¡å¼ï¼", -1, 20, 75, 70, 10 + RTEXT "è¨æ¶é«ç¸½è¨ç´ï¼", -1, 14, 65, 75, 10 + RTEXT "ç®åé¡¯ç¤ºæ¨¡å¼ï¼", -1, 14, 75, 75, 10 RTEXT "é¡¯ç¤ºå¨ï¼", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10

10 years, 11 months

[ekohl] 61676: [SYSSETUP] Use the administrator name, domain and password for the logon hack and store them in the registry for later use by winlogon if the AutoAdminLogon option is enabled. CORE-7...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 18 14:26:07 2014 New Revision: 61676 URL: http://svn.reactos.org/svn/reactos?rev=61676&view=rev Log: [SYSSETUP] Use the administrator name, domain and password for the logon hack and store them in the registry for later use by winlogon if the AutoAdminLogon option is enabled. CORE-7722 #resolve Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/security.c Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat Jan 18 14:26:07 2014 @@ -1075,8 +1075,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator" -;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomain",0x00000000,"" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" ; Time Zone Servers Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/globals.h [iso-8859-1] Sat Jan 18 14:26:07 2014 @@ -56,10 +56,17 @@ LCID LocaleID; } SETUPDATA, *PSETUPDATA; +typedef struct _ADMIN_INFO +{ + LPWSTR Name; + LPWSTR Domain; + LPWSTR Password; +} ADMIN_INFO, *PADMIN_INFO; extern HINSTANCE hDllInstance; extern HINF hSysSetupInf; extern SETUPDATA SetupData; +extern ADMIN_INFO AdminInfo; BOOL RegisterTypeLibraries (HINF hinf, LPCWSTR szSection); @@ -70,6 +77,9 @@ NTSTATUS SetAdministratorPassword(LPCWSTR Password); +VOID +SetAutoAdminLogon(VOID); + /* wizard.c */ VOID InstallWizard (VOID); 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] Sat Jan 18 14:26:07 2014 @@ -39,6 +39,7 @@ /* GLOBALS ******************************************************************/ HINF hSysSetupInf = INVALID_HANDLE_VALUE; +ADMIN_INFO AdminInfo; /* FUNCTIONS ****************************************************************/ @@ -905,6 +906,8 @@ InstallSecurity(); + SetAutoAdminLogon(); + hShortcutsInf = SetupOpenInfFileW(L"shortcuts.inf", NULL, INF_STYLE_WIN4, @@ -933,7 +936,12 @@ HANDLE hToken; BOOL ret; - ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT, &hToken); + ret = LogonUserW(AdminInfo.Name, + AdminInfo.Domain, + AdminInfo.Password, + LOGON32_LOGON_INTERACTIVE, + LOGON32_PROVIDER_DEFAULT, + &hToken); if (!ret) { FatalError("LogonUserW() failed!"); @@ -959,6 +967,15 @@ LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done"); TerminateSetupActionLog(); + if (AdminInfo.Name != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AdminInfo.Name); + + if (AdminInfo.Domain != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AdminInfo.Domain); + + if (AdminInfo.Password != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AdminInfo.Password); + /* Get shutdown privilege */ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) { Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Sat Jan 18 14:26:07 2014 @@ -317,6 +317,7 @@ SetAdministratorPassword(LPCWSTR Password) { PPOLICY_ACCOUNT_DOMAIN_INFO OrigInfo = NULL; + PUSER_ACCOUNT_NAME_INFORMATION AccountNameInfo = NULL; USER_SET_PASSWORD_INFORMATION PasswordInfo; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle = NULL; @@ -370,8 +371,8 @@ } Status = SamOpenUser(DomainHandle, - USER_FORCE_PASSWORD_CHANGE, - DOMAIN_USER_RID_ADMIN, /* 500 */ + USER_FORCE_PASSWORD_CHANGE | USER_READ_GENERAL, + DOMAIN_USER_RID_ADMIN, &UserHandle); if (!NT_SUCCESS(Status)) { @@ -391,7 +392,45 @@ goto done; } + Status = SamQueryInformationUser(UserHandle, + UserAccountNameInformation, + (PVOID*)&AccountNameInfo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamSetInformationUser() failed (Status %08lx)\n", Status); + goto done; + } + + AdminInfo.Name = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + AccountNameInfo->UserName.Length + sizeof(WCHAR)); + if (AdminInfo.Name != NULL) + RtlCopyMemory(AdminInfo.Name, + AccountNameInfo->UserName.Buffer, + AccountNameInfo->UserName.Length); + + AdminInfo.Domain = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + OrigInfo->DomainName.Length + sizeof(WCHAR)); + if (AdminInfo.Domain != NULL) + RtlCopyMemory(AdminInfo.Domain, + OrigInfo->DomainName.Buffer, + OrigInfo->DomainName.Length); + + AdminInfo.Password = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(Password) + 1) * sizeof(WCHAR)); + if (AdminInfo.Password != NULL) + wcscpy(AdminInfo.Password, Password); + + DPRINT1("Administrator Name: %S\n", AdminInfo.Name); + DPRINT1("Administrator Domain: %S\n", AdminInfo.Domain); + DPRINT1("Administrator Password: %S\n", AdminInfo.Password); + done: + if (AccountNameInfo != NULL) + SamFreeMemory(AccountNameInfo); + if (OrigInfo != NULL) LsaFreeMemory(OrigInfo); @@ -412,5 +451,63 @@ return Status; } + +VOID +SetAutoAdminLogon(VOID) +{ + WCHAR szAutoAdminLogon[2]; + HKEY hKey = NULL; + DWORD dwType; + DWORD dwSize; + LONG lError; + + lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", + 0, + KEY_READ | KEY_WRITE, + &hKey); + if (lError != ERROR_SUCCESS) + return; + + dwSize = 2 * sizeof(WCHAR); + lError = RegQueryValueExW(hKey, + L"AutoAdminLogon", + NULL, + &dwType, + (LPBYTE)szAutoAdminLogon, + &dwSize); + if (lError != ERROR_SUCCESS) + goto done; + + if (wcscmp(szAutoAdminLogon, L"1") == 0) + { + RegSetValueExW(hKey, + L"DefaultDomain", + 0, + REG_SZ, + (LPBYTE)AdminInfo.Domain, + (wcslen(AdminInfo.Domain) + 1) * sizeof(WCHAR)); + + RegSetValueExW(hKey, + L"DefaultUserName", + 0, + REG_SZ, + (LPBYTE)AdminInfo.Name, + (wcslen(AdminInfo.Name) + 1) * sizeof(WCHAR)); + + RegSetValueExW(hKey, + L"DefaultPassword", + 0, + REG_SZ, + (LPBYTE)AdminInfo.Password, + (wcslen(AdminInfo.Password) + 1) * sizeof(WCHAR)); + } + +done: + if (hKey != NULL) + RegCloseKey(hKey); +} + + /* EOF */

10 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
43
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 January 2014