Skip to content

Commit 628f530

Browse files
committed
Revert "[BOOTDATA][SYSDM][DEVMGMT] Scripted startup"
This reverts commit 78e1d03.
1 parent 157a28e commit 628f530

File tree

5 files changed

+4
-25
lines changed

5 files changed

+4
-25
lines changed

boot/bootdata/hivedef.inf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,8 +1927,6 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012
19271927
HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Telephony",,0x00000012
19281928
HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000012
19291929

1930-
HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","Test 1",0x00000000,"cmd /c timeout 10 && start devmgmt.exe && timeout 3 && start sysdm.cpl && timeout 10 && start taskmgr && timeout 25 && taskkill /f /im taskmgr.exe && timeout 10 && shutdown /r /f /t 0"
1931-
19321930
; Keyboard layout switcher
19331931
HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","kbswitch.exe",0x00020002,"%SystemRoot%\system32\kbswitch.exe"
19341932

@@ -1998,20 +1996,6 @@ HKCU,"SOFTWARE\ReactOS\Debug","SpyInclude",0x00020000,"INCLUDEALL"
19981996
;HKCU,"SOFTWARE\ReactOS\Debug","SpyExclude",0x00020000,""
19991997
;HKCU,"SOFTWARE\ReactOS\Debug","SpyExcludeDWP",0x00020000,""
20001998

2001-
HKCU,"SOFTWARE\ReactOS\TaskManager","Preferences",0x00000001,00,00,00,00,26,01,00,\
2002-
00,02,00,00,00,ba,02,00,00,c0,01,00,00,02,00,00,00,00,00,00,00,01,00,00,00,01,00,00,00,01,00,00,\
2003-
00,0e,80,00,00,0c,80,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,01,00,00,\
2004-
00,01,00,00,00,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
2005-
00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\
2006-
00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,01,00,00,00,02,00,00,\
2007-
00,03,00,00,00,04,00,00,00,05,00,00,00,06,00,00,00,07,00,00,00,08,00,00,00,09,00,00,00,0a,00,00,\
2008-
00,0b,00,00,00,0c,00,00,00,0d,00,00,00,0e,00,00,00,0f,00,00,00,10,00,00,00,11,00,00,00,12,00,00,\
2009-
00,13,00,00,00,14,00,00,00,15,00,00,00,16,00,00,00,17,00,00,00,18,00,00,00,19,00,00,00,69,00,00,\
2010-
00,32,00,00,00,6b,00,00,00,46,00,00,00,23,00,00,00,46,00,00,00,46,00,00,00,64,00,00,00,46,00,00,\
2011-
00,46,00,00,00,46,00,00,00,46,00,00,00,46,00,00,00,46,00,00,00,3c,00,00,00,3c,00,00,00,3c,00,00,\
2012-
00,3c,00,00,00,3c,00,00,00,46,00,00,00,46,00,00,00,46,00,00,00,46,00,00,00,46,00,00,00,46,00,00,\
2013-
00,c2,01,00,00,00,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00
2014-
20151999
; Internet Explorer
20162000
HKCU,"SOFTWARE\Wine\MSHTML","GeckoUrl",,"http://source.winehq.org/winegecko.php"
20172001
HKCU,"SOFTWARE\Wine\MSHTML","GeckoCabDir",0x00020000,"%SystemRoot%\"

boot/bootdata/livecd/unattend.inf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Signature = "$ReactOS$"
44
; Set UnattendSetupEnabled to yes in order to boot the livecd immediately to desktop
55
; yes - unattend setup enabled
66
; no - unattend setup disabled
7-
UnattendSetupEnabled = yes
7+
UnattendSetupEnabled = no
88

99
; set this option to automatically
1010
; specify language in the language setup

dll/cpl/sysdm/sysdm.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,12 @@ PropSheetProc(HWND hwndDlg, UINT uMsg, LPARAM lParam)
132132
{
133133
// NOTE: This callback is needed to set large icon correctly.
134134
HICON hIcon;
135-
RECT rcRect;
136135
switch (uMsg)
137136
{
138137
case PSCB_INITIALIZED:
139138
{
140139
hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM));
141140
SendMessageW(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
142-
if (GetWindowRect(hwndDlg, &rcRect))
143-
MoveWindow(hwndDlg, 320, 0, (rcRect.right - rcRect.left), (rcRect.bottom - rcRect.top), TRUE);
144141
break;
145142
}
146143
}

dll/win32/devmgr/devmgmt/DeviceView.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CDeviceView::CDeviceView(
3939
m_hTreeView(NULL),
4040
m_hPropertyDialog(NULL),
4141
m_hMenu(NULL),
42-
m_ViewType(DevicesByConnection),
42+
m_ViewType(DevicesByType),
4343
m_ShowHidden(false),
4444
m_RootNode(NULL)
4545
{
@@ -667,7 +667,8 @@ CDeviceView::RecurseChildDevices(
667667
hParentTreeItem,
668668
0);
669669

670-
if (true)
670+
// Expand the class if it has a problem device
671+
if (HasProblem == true)
671672
{
672673
(void)TreeView_Expand(m_hTreeView,
673674
hParentTreeItem,

dll/win32/devmgr/devmgmt/MainWindow.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption,
137137
{
138138
CAtlStringW szCaption;
139139
WNDCLASSEXW wc = {0};
140-
RECT rcRect;
141140

142141
// Store the show window value
143142
m_CmdShow = nCmdShow;
@@ -174,8 +173,6 @@ CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption,
174173
NULL,
175174
g_hThisInstance,
176175
this);
177-
if (GetWindowRect(m_hMainWnd, &rcRect))
178-
MoveWindow(m_hMainWnd, 0, -70, (rcRect.right - rcRect.left), 700, TRUE);
179176
}
180177

181178
// Return creation result

0 commit comments

Comments
 (0)