Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 19126: list services
by cwittich＠svn.reactos.com 10 Nov '05

10 Nov '05

list services Modified: trunk/reactos/subsys/system/msconfig/De.rc Modified: trunk/reactos/subsys/system/msconfig/En.rc Modified: trunk/reactos/subsys/system/msconfig/msconfig.c Modified: trunk/reactos/subsys/system/msconfig/resource.h Modified: trunk/reactos/subsys/system/msconfig/srvpage.c _____ Modified: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2005-11-10 21:29:00 UTC (rev 19125) +++ trunk/reactos/subsys/system/msconfig/De.rc 2005-11-10 22:46:41 UTC (rev 19126) @@ -34,12 +34,13 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 + CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 END STRINGTABLE DISCARDABLE BEGIN IDS_TAB_GENERAL "Allgemein" + IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Dienste" IDS_TAB_STARTUP "Systemstart" _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2005-11-10 21:29:00 UTC (rev 19125) +++ trunk/reactos/subsys/system/msconfig/En.rc 2005-11-10 22:46:41 UTC (rev 19126) @@ -34,12 +34,13 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 + CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 END STRINGTABLE DISCARDABLE BEGIN IDS_TAB_GENERAL "General" + IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Services" IDS_TAB_STARTUP "Startup" _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-11-10 21:29:00 UTC (rev 19125) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-11-10 22:46:41 UTC (rev 19126) @@ -23,30 +23,36 @@ item.pszText = szTemp; TabCtrl_InsertItem(hTabWnd, 0, &item); - LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); + LoadString(hInst, IDS_TAB_SYSTEM, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; TabCtrl_InsertItem(hTabWnd, 1, &item); - LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); + LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; TabCtrl_InsertItem(hTabWnd, 2, &item); - LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); + LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; TabCtrl_InsertItem(hTabWnd, 3, &item); - LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); + LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; TabCtrl_InsertItem(hTabWnd, 4, &item); + LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); + memset(&item, 0, sizeof(TCITEM)); + item.mask = TCIF_TEXT; + item.pszText = szTemp; + TabCtrl_InsertItem(hTabWnd, 5, &item); + return TRUE; } @@ -61,28 +67,35 @@ ShowWindow(hServicesPage, SW_HIDE); //BringWindowToTop(hFreeLdrPage); break; - case 1: //Freeldr + case 1: //SYSTEM.INI ShowWindow(hToolsPage, SW_HIDE); ShowWindow(hStartupPage, SW_HIDE); //ShowWindow(hFreeLdrPage, SW_SHOW); ShowWindow(hServicesPage, SW_HIDE); //BringWindowToTop(hFreeLdrPage); break; - case 2: //Services + case 2: //Freeldr ShowWindow(hToolsPage, SW_HIDE); ShowWindow(hStartupPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hServicesPage, SW_HIDE); + //BringWindowToTop(hFreeLdrPage); + break; + case 3: //Services + ShowWindow(hToolsPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); //ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_SHOW); - //BringWindowToTop(hFreeLdrPage); + BringWindowToTop(hServicesPage); break; - case 3: //startup + case 4: //startup ShowWindow(hToolsPage, SW_HIDE); ShowWindow(hStartupPage, SW_SHOW); //ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_HIDE); BringWindowToTop(hStartupPage); break; - case 4: //Tools + case 5: //Tools ShowWindow(hToolsPage, SW_SHOW); ShowWindow(hStartupPage, SW_HIDE); //ShowWindow(hFreeLdrPage, SW_HIDE); _____ Modified: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2005-11-10 21:29:00 UTC (rev 19125) +++ trunk/reactos/subsys/system/msconfig/resource.h 2005-11-10 22:46:41 UTC (rev 19126) @@ -14,19 +14,20 @@ #define IDC_STARTUP_LIST 1008 #define IDS_TAB_TOOLS 2001 -#define IDS_TAB_FREELDR 2002 -#define IDS_TAB_STARTUP 2003 -#define IDS_TAB_SERVICES 2004 -#define IDS_TAB_GENERAL 2005 +#define IDS_TAB_SYSTEM 2002 +#define IDS_TAB_FREELDR 2003 +#define IDS_TAB_STARTUP 2004 +#define IDS_TAB_SERVICES 2005 +#define IDS_TAB_GENERAL 2006 #define IDS_TOOLS_COLUMN_NAME 2010 #define IDS_TOOLS_COLUMN_DESCR 2011 #define IDS_SERVICES_COLUMN_SERVICE 2012 #define IDS_SERVICES_COLUMN_VENDOR 2013 #define IDS_SERVICES_COLUMN_STATUS 2014 -#define IDS_STARTUP_COLUMN_ELEMENT 2015 -#define IDS_STARTUP_COLUMN_CMD 2016 -#define IDS_STARTUP_COLUMN_PATH 2017 +#define IDS_STARTUP_COLUMN_ELEMENT 2015 +#define IDS_STARTUP_COLUMN_CMD 2016 +#define IDS_STARTUP_COLUMN_PATH 2017 #define IDS_TOOLS_CMD_NAME 2100 #define IDS_TOOLS_CMD_DESCR 2101 _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-10 21:29:00 UTC (rev 19125) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-10 22:46:41 UTC (rev 19126) @@ -4,6 +4,8 @@ HWND hServicesListCtrl; HWND hServicesDialog; +void GetServices ( void ); + INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -28,7 +30,7 @@ LoadString(hInst, IDS_SERVICES_COLUMN_SERVICE, szTemp, 256); column.pszText = szTemp; - column.cx = 150; + column.cx = 200; ListView_InsertColumn(hServicesListCtrl, 0, &column); column.mask = LVCF_TEXT | LVCF_WIDTH; @@ -43,8 +45,60 @@ column.cx = 70; ListView_InsertColumn(hServicesListCtrl, 2, &column); + GetServices(); return TRUE; } return 0; } + +void +GetServices ( void ) +{ + HKEY hKey, hSubKey; + DWORD dwSubKeys, dwKeyLength; + DWORD dwType, dwDataLength; + size_t Index; + TCHAR lpKeyName[MAX_KEY_LENGTH]; + TCHAR lpSubKey[MAX_KEY_LENGTH]; + TCHAR DisplayName[MAX_VALUE_NAME]; + TCHAR ObjectName[MAX_VALUE_NAME]; + TCHAR lpServicesKey[MAX_KEY_LENGTH] = _T("SYSTEM\\CurrentControlSet\\Services"); + LV_ITEM item; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, lpServicesKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, &dwSubKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + for (Index = 0; Index < dwSubKeys; Index++) + { + dwKeyLength = MAX_KEY_LENGTH; + if (RegEnumKeyEx(hKey, Index, lpKeyName, &dwKeyLength, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + _tcscpy(lpSubKey, lpServicesKey); + _tcscat(lpSubKey, _T("\\")); + _tcscat(lpSubKey, lpKeyName); + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, lpSubKey, 0, KEY_READ, &hSubKey) == ERROR_SUCCESS) + { + dwDataLength = MAX_VALUE_NAME; + if (RegQueryValueEx(hSubKey, _T("ObjectName"), NULL, &dwType, (LPBYTE)ObjectName, &dwDataLength) == ERROR_SUCCESS) + { + dwDataLength = MAX_VALUE_NAME; + if (RegQueryValueEx(hSubKey, _T("DisplayName"), NULL, &dwType, (LPBYTE)DisplayName, &dwDataLength) == ERROR_SUCCESS) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT; + item.iImage = 0; + item.pszText = DisplayName; + item.iItem = ListView_GetItemCount(hServicesListCtrl); + item.lParam = 0; + ListView_InsertItem(hServicesListCtrl, &item); + } + } + } + } + } + } + RegCloseKey(hKey); + } +}

1 0

[gedmurphy] 19125: Display a media disconnected notice if the adapter is not connected.
by gedmurphy＠svn.reactos.com 10 Nov '05

10 Nov '05

Display a media disconnected notice if the adapter is not connected. Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-10 20:56:49 UTC (rev 19124) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-10 21:29:00 UTC (rev 19125) @@ -13,7 +13,6 @@ */ /* * TODO: - * display multiple adapters * fix renew / release * implement flushdns, registerdns, displaydns, showclassid, setclassid * allow globbing on adapter names @@ -138,7 +137,7 @@ _tprintf(_T("\nReactOS IP Configuration\n\n")); - do + while (pAdapter) { if (bAll) { @@ -157,6 +156,15 @@ } _tprintf(_T("\n%s ...... : \n\n"), GetInterfaceTypeName(pAdapter->Type)); + + /* check if the adapter is connected to the media */ + if (_tcscmp(pAdapter->IpAddressList.IpAddress.String, "0.0.0.0") == 0) + { + _tprintf(_T("\tMedia State . . . . . . . . . . . : Media disconnected\n")); + pAdapter = pAdapter->Next; + continue; + } + _tprintf(_T("\tConnection-specific DNS Suffix. . : %s\n"), pFixedInfo->DomainName); if (bAll) @@ -202,7 +210,7 @@ pAdapter = pAdapter->Next; - } while (pAdapter); + } return 0; }

1 0

[cwittich] 19124: started implementing startup page
by cwittich＠svn.reactos.com 10 Nov '05

10 Nov '05

started implementing startup page Modified: trunk/reactos/subsys/system/msconfig/De.rc Modified: trunk/reactos/subsys/system/msconfig/En.rc Modified: trunk/reactos/subsys/system/msconfig/msconfig.c Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml Modified: trunk/reactos/subsys/system/msconfig/precomp.h Modified: trunk/reactos/subsys/system/msconfig/resource.h Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Added: trunk/reactos/subsys/system/msconfig/startuppage.c Added: trunk/reactos/subsys/system/msconfig/startuppage.h _____ Modified: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/De.rc 2005-11-10 20:56:49 UTC (rev 19124) @@ -23,6 +23,13 @@ PUSHBUTTON "&Ausf³hren", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 +END + IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" @@ -68,4 +75,8 @@ IDS_TOOLS_SYSDM_DESCR "Zeigt Informationen ³ber diesen Rechner an." IDS_TOOLS_SYSDM_CMD "control" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" + IDS_STARTUP_COLUMN_CMD "Befehl" + IDS_STARTUP_COLUMN_PATH "Pfad" END _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/En.rc 2005-11-10 20:56:49 UTC (rev 19124) @@ -14,6 +14,13 @@ PUSHBUTTON "Apply", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDD_STARTUP_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 +END + IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" @@ -67,4 +74,8 @@ IDS_TOOLS_SYSDM_DESCR "Shows information about this computer." IDS_TOOLS_SYSDM_CMD "control" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" + IDS_STARTUP_COLUMN_CMD "Command" + IDS_STARTUP_COLUMN_PATH "Path" END _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-11-10 20:56:49 UTC (rev 19124) @@ -14,6 +14,7 @@ hTabWnd = GetDlgItem(hWnd, IDC_TAB); hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); // Insert Tab Pages LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); @@ -53,32 +54,37 @@ void MsConfig_OnTabWndSelChange(void) { switch (TabCtrl_GetCurSel(hTabWnd)) { - case 0: + case 0: //General ShowWindow(hToolsPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hStartupPage, SW_HIDE); + //ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_HIDE); //BringWindowToTop(hFreeLdrPage); break; - case 1: + case 1: //Freeldr ShowWindow(hToolsPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); //ShowWindow(hFreeLdrPage, SW_SHOW); ShowWindow(hServicesPage, SW_HIDE); //BringWindowToTop(hFreeLdrPage); break; - case 2: + case 2: //Services ShowWindow(hToolsPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); //ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_SHOW); //BringWindowToTop(hFreeLdrPage); break; - case 3: + case 3: //startup ShowWindow(hToolsPage, SW_HIDE); + ShowWindow(hStartupPage, SW_SHOW); //ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_HIDE); - //BringWindowToTop(hFreeLdrPage); + BringWindowToTop(hStartupPage); break; - case 4: + case 4: //Tools ShowWindow(hToolsPage, SW_SHOW); + ShowWindow(hStartupPage, SW_HIDE); //ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_HIDE); BringWindowToTop(hToolsPage); @@ -125,6 +131,7 @@ case WM_DESTROY: DestroyWindow(hToolsPage); DestroyWindow(hServicesPage); + DestroyWindow(hStartupPage); return DefWindowProc(hDlg, message, wParam, lParam); } _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-10 20:56:49 UTC (rev 19124) @@ -12,6 +12,7 @@ <library>shell32</library> <file>toolspage.c</file> <file>srvpage.c</file> + <file>startuppage.c</file> <file>msconfig.c</file> <file>msconfig.rc</file> </module> _____ Modified: trunk/reactos/subsys/system/msconfig/precomp.h --- trunk/reactos/subsys/system/msconfig/precomp.h 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/precomp.h 2005-11-10 20:56:49 UTC (rev 19124) @@ -8,4 +8,9 @@ #include "msconfig.h" #include "toolspage.h" #include "srvpage.h" +#include "startuppage.h" +#define MAX_KEY_LENGTH 255 +#define MAX_VALUE_NAME 16383 + + _____ Modified: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/resource.h 2005-11-10 20:56:49 UTC (rev 19124) @@ -11,6 +11,7 @@ #define IDC_BTN_RUN 1005 #define IDC_SERVICES_LIST 1006 #define IDC_TOOLS_LIST 1007 +#define IDC_STARTUP_LIST 1008 #define IDS_TAB_TOOLS 2001 #define IDS_TAB_FREELDR 2002 @@ -23,6 +24,9 @@ #define IDS_SERVICES_COLUMN_SERVICE 2012 #define IDS_SERVICES_COLUMN_VENDOR 2013 #define IDS_SERVICES_COLUMN_STATUS 2014 +#define IDS_STARTUP_COLUMN_ELEMENT 2015 +#define IDS_STARTUP_COLUMN_CMD 2016 +#define IDS_STARTUP_COLUMN_PATH 2017 #define IDS_TOOLS_CMD_NAME 2100 #define IDS_TOOLS_CMD_DESCR 2101 _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-10 20:56:49 UTC (rev 19124) @@ -14,7 +14,7 @@ switch (message) { case WM_INITDIALOG: - hServicesListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); + hServicesListCtrl = GetDlgItem(hDlg, IDC_SERVICES_LIST); hServicesDialog = hDlg; dwStyle = SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); @@ -41,7 +41,7 @@ LoadString(hInst, IDS_SERVICES_COLUMN_STATUS, szTemp, 256); column.pszText = szTemp; column.cx = 70; - ListView_InsertColumn(hServicesListCtrl, 1, &column); + ListView_InsertColumn(hServicesListCtrl, 2, &column); return TRUE; } _____ Added: trunk/reactos/subsys/system/msconfig/startuppage.c --- trunk/reactos/subsys/system/msconfig/startuppage.c 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/startuppage.c 2005-11-10 20:56:49 UTC (rev 19124) @@ -0,0 +1,112 @@ +#include <precomp.h> + +HWND hStartupPage; +HWND hStartupListCtrl; +HWND hStartupDialog; + +void GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ); + +INT_PTR CALLBACK +StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + LV_COLUMN column; + TCHAR szTemp[256]; + DWORD dwStyle; + + switch (message) { + case WM_INITDIALOG: + + hStartupListCtrl = GetDlgItem(hDlg, IDC_STARTUP_LIST); + hStartupDialog = hDlg; + + dwStyle = SendMessage(hStartupListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; + SendMessage(hStartupListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + + // Initialize the application page's controls + column.mask = LVCF_TEXT | LVCF_WIDTH; + + LoadString(hInst, IDS_STARTUP_COLUMN_ELEMENT, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + ListView_InsertColumn(hStartupListCtrl, 0, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_STARTUP_COLUMN_CMD, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + ListView_InsertColumn(hStartupListCtrl, 1, &column); + + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_STARTUP_COLUMN_PATH, szTemp, 256); + column.pszText = szTemp; + column.cx = 250; + ListView_InsertColumn(hStartupListCtrl, 2, &column); + + GetAutostartEntriesFromRegistry(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); + GetAutostartEntriesFromRegistry(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); + //FIXME: What about HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Userinit + //FIXME: Common Startup (startmenu) + + return TRUE; + } + + return 0; +} + +void +GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ) +{ + HKEY hKey; + DWORD Index, dwValues, retVal, dwType; + DWORD dwValueLength, dwDataLength = MAX_VALUE_NAME; + TCHAR Data[MAX_VALUE_NAME]; + TCHAR lpValueName[MAX_KEY_LENGTH]; + TCHAR Path[MAX_KEY_LENGTH + 5]; + LV_ITEM item; + + if (RegOpenKeyEx(hRootKey, KeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + for (Index = 0, retVal = ERROR_SUCCESS; Index < dwValues; Index++) + { + dwValueLength = MAX_VALUE_NAME; + dwDataLength = MAX_VALUE_NAME; + retVal = RegEnumValue(hKey, Index, lpValueName, &dwValueLength, NULL, &dwType, (LPBYTE)Data, &dwDataLength); + if (retVal == ERROR_SUCCESS) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT; + item.iImage = 0; + item.pszText = lpValueName; + item.iItem = ListView_GetItemCount(hStartupListCtrl); + item.lParam = 0; + ListView_InsertItem(hStartupListCtrl, &item); + + if (dwType == REG_SZ) + { + GetLongPathName(Data, Data, sizeof(Data)); + item.pszText = Data; + item.iSubItem = 1; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + + if (hRootKey == HKEY_LOCAL_MACHINE) + _tcscpy(Path, _T("HKLM\\")); + if (hRootKey == HKEY_CURRENT_USER) + _tcscpy(Path, _T("HKCU\\")); + + _tcscat(Path, KeyName); + item.pszText = Path; + item.iSubItem = 2; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + } + } + RegCloseKey(hKey); + } + +} _____ Added: trunk/reactos/subsys/system/msconfig/startuppage.h --- trunk/reactos/subsys/system/msconfig/startuppage.h 2005-11-10 20:33:10 UTC (rev 19123) +++ trunk/reactos/subsys/system/msconfig/startuppage.h 2005-11-10 20:56:49 UTC (rev 19124) @@ -0,0 +1,4 @@ +extern HWND hStartupPage; +extern HWND hStartupPageListCtrl; + +INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

1 0

[chorns] 19123: Build win32k_test
by chorns＠svn.reactos.com 10 Nov '05

10 Nov '05

Build win32k_test Modified: trunk/reactos/subsys/win32k/tests/stubs.xml _____ Modified: trunk/reactos/subsys/win32k/tests/stubs.xml --- trunk/reactos/subsys/win32k/tests/stubs.xml 2005-11-10 17:43:55 UTC (rev 19122) +++ trunk/reactos/subsys/win32k/tests/stubs.xml 2005-11-10 20:33:10 UTC (rev 19123) @@ -60,6 +60,7 @@ <symbol>ExFreePool@4</symbol> <symbol>ExAllocatePoolWithTag@12</symbol> <symbol>IoBuildDeviceIoControlRequest@36</symbol> + <symbol>IoBuildSynchronousFsdRequest@28</symbol> <symbol>@IofCallDriver@8</symbol> <symbol>KeWaitForSingleObject@20</symbol> <symbol>@ExAcquireFastMutex@4</symbol>

1 0

[sedwards] 19122: restore wine style license headers...superfolus chanes make doing a diff impossible
by sedwards＠svn.reactos.com 10 Nov '05

10 Nov '05

restore wine style license headers...superfolus chanes make doing a diff impossible Modified: trunk/reactos/lib/imagehlp/access.c Modified: trunk/reactos/lib/imagehlp/imagehlp_main.c Modified: trunk/reactos/lib/imagehlp/integrity.c Modified: trunk/reactos/lib/imagehlp/modify.c _____ Modified: trunk/reactos/lib/imagehlp/access.c --- trunk/reactos/lib/imagehlp/access.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/access.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,9 +1,21 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/access.c - * PURPOSE: Image (un)load/mapping and data directory/section access - * PROGRAMMER: Patrik Stridvall + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/lib/imagehlp/imagehlp_main.c --- trunk/reactos/lib/imagehlp/imagehlp_main.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/imagehlp_main.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,11 +1,24 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/imagehlp_main.c - * PURPOSE: DLL Entrypoint - * PROGRAMMER: Patrik Stridvall + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + /* INCLUDES ******************************************************************/ #include "precomp.h" _____ Modified: trunk/reactos/lib/imagehlp/integrity.c --- trunk/reactos/lib/imagehlp/integrity.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/integrity.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,9 +1,22 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/integrity.c - * PURPOSE: Image Integrity: Security Certificates and Checksums - * PROGRAMMER: Patrik Stridvall, Mike McCormack (WINE) + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * Copyright 2003 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* _____ Modified: trunk/reactos/lib/imagehlp/modify.c --- trunk/reactos/lib/imagehlp/modify.c 2005-11-10 17:28:23 UTC (rev 19121) +++ trunk/reactos/lib/imagehlp/modify.c 2005-11-10 17:43:55 UTC (rev 19122) @@ -1,9 +1,22 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Imagehlp Libary - * FILE: lib/imagehlp/modify.c - * PURPOSE: Binding, Base Fixing and Rebasing - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * IMAGEHLP library + * + * Copyright 1998 Patrik Stridvall + * Copyright 2005 Alex Ionescu + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* INCLUDES ******************************************************************/

1 0

[turner] 19121: convert office docs to pdf and open office native docs. this way we have the best of both worlds.
by turner＠svn.reactos.com 10 Nov '05

10 Nov '05

convert office docs to pdf and open office native docs. this way we have the best of both worlds. Added: trunk/press-media/flyers/ReactOS.pdf Added: trunk/press-media/flyers/ReactOS.sxw Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.pdf Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.sti _____ Added: trunk/press-media/flyers/ReactOS.pdf (Binary files differ) Property changes on: trunk/press-media/flyers/ReactOS.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/flyers/ReactOS.sxw (Binary files differ) Property changes on: trunk/press-media/flyers/ReactOS.sxw ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.pdf (Binary files differ) Property changes on: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.sti (Binary files differ) Property changes on: trunk/press-media/presentations/wineconf-2005/ReactOS_and_Wine.sti ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

[weiden] 19120: mark several helper functions as static
by weiden＠svn.reactos.com 10 Nov '05

10 Nov '05

mark several helper functions as static Modified: trunk/reactos/lib/cpl/ncpa/ncpa.c Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.c --- trunk/reactos/lib/cpl/ncpa/ncpa.c 2005-11-10 14:02:20 UTC (rev 19119) +++ trunk/reactos/lib/cpl/ncpa/ncpa.c 2005-11-10 14:12:53 UTC (rev 19120) @@ -66,14 +66,14 @@ typedef void (ENUMREGKEYCALLBACK)(void *pCookie,HKEY hBaseKey,TCHAR *pszSubKey); -LONG CALLBACK DisplayApplet(VOID); -INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +static LONG CALLBACK DisplayApplet(VOID); +static INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo); HINSTANCE hApplet = 0; /* Applets */ -APPLET Applets[] = +static APPLET Applets[] = { {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, DisplayApplet} }; @@ -81,7 +81,8 @@ /* useful utilities */ -VOID EnumRegKeys(ENUMREGKEYCALLBACK *pCallback,PVOID pCookie,HKEY hBaseKey,TCHAR *tpszRegPath) +static VOID +EnumRegKeys(ENUMREGKEYCALLBACK *pCallback,PVOID pCookie,HKEY hBaseKey,TCHAR *tpszRegPath) { HKEY hKey; INT i; @@ -119,7 +120,8 @@ RegCloseKey(hKey); } -void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc,LPARAM lParam) +void +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc,LPARAM lParam) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -132,7 +134,8 @@ -BOOL FindNICClassKeyForCfgInstance(TCHAR *tpszCfgInst,TCHAR *tpszSubKeyOut) +static BOOL +FindNICClassKeyForCfgInstance(TCHAR *tpszCfgInst,TCHAR *tpszSubKeyOut) { int i; TCHAR tpszSubKey[MAX_PATH]; @@ -161,7 +164,8 @@ } -void NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) +static void +NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) { HWND hwndDlg; DWORD dwCharacteristics; @@ -233,7 +237,7 @@ -INT_PTR CALLBACK +static INT_PTR CALLBACK NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); @@ -370,7 +374,8 @@ } -void DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID) +static void +DisplayNICProperties(HWND hParent,TCHAR *tpszCfgInstanceID) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; @@ -411,7 +416,7 @@ -INT_PTR CALLBACK +static INT_PTR CALLBACK NICStatusPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -439,7 +444,8 @@ return FALSE; } -VOID DisplayNICStatus(HWND hParent,TCHAR *tpszCfgInstanceID) +static VOID +DisplayNICStatus(HWND hParent,TCHAR *tpszCfgInstanceID) { PROPSHEETPAGE psp[1]; PROPSHEETHEADER psh; @@ -484,7 +490,8 @@ // IPHLPAPI does not provide a list of all adapters // #if 0 -VOID EnumAdapters(HWND hwndDlg) +static VOID +EnumAdapters(HWND hwndDlg) { TCHAR pszText[MAX_ADAPTER_NAME_LENGTH + 4]; IP_ADAPTER_INFO *pInfo; @@ -511,7 +518,8 @@ -void NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) +static void +NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) { TCHAR tpszDisplayName[MAX_PATH]; //TCHAR tpszDeviceID[MAX_PATH]; @@ -579,7 +587,8 @@ } -void EnumAdapters(HWND hwndDlg) +static void +EnumAdapters(HWND hwndDlg) { LPTSTR lpRegPath = _T("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1- 08002BE10318}"); @@ -588,7 +597,7 @@ } -INT_PTR CALLBACK +static INT_PTR CALLBACK NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { NMHDR* pnmh; @@ -651,15 +660,15 @@ /* First Applet */ -LONG CALLBACK DisplayApplet(VOID) +static LONG CALLBACK +DisplayApplet(VOID) { PROPSHEETPAGE psp[1]; - PROPSHEETHEADER psh; + PROPSHEETHEADER psh = {0}; TCHAR Caption[1024]; LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE; psh.hwndParent = NULL; @@ -677,7 +686,8 @@ } /* Control Panel Callback */ -LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { switch (uMsg) { _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 14:02:20 UTC (rev 19119) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 14:12:53 UTC (rev 19120) @@ -53,23 +53,26 @@ #include "resource.h" #include "ncpa.h" -extern void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); +void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); -void EnableDHCP( HWND hwndDlg, BOOL Enabled ) { +static void +EnableDHCP( HWND hwndDlg, BOOL Enabled ) { CheckDlgButton(hwndDlg,IDC_USEDHCP,Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg,IDC_NODHCP,Enabled ? BST_UNCHECKED : BST_CHECKED); } -void ManualDNS( HWND hwndDlg, BOOL Enabled ) { +static void +ManualDNS( HWND hwndDlg, BOOL Enabled ) { CheckDlgButton(hwndDlg,IDC_FIXEDDNS,Enabled ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg,IDC_AUTODNS,Enabled ? BST_UNCHECKED : BST_CHECKED); EnableWindow(GetDlgItem(hwndDlg,IDC_DNS1),Enabled); EnableWindow(GetDlgItem(hwndDlg,IDC_DNS2),Enabled); } -BOOL GetAddressFromField( HWND hwndDlg, UINT CtlId, - DWORD *dwIPAddr, - const char **AddressString ) { +static BOOL +GetAddressFromField( HWND hwndDlg, UINT CtlId, + DWORD *dwIPAddr, + const char **AddressString ) { LRESULT lResult; struct in_addr inIPAddr; @@ -86,7 +89,8 @@ return TRUE; } -BOOL InternTCPIPSettings( HWND hwndDlg ) { +static BOOL +InternTCPIPSettings( HWND hwndDlg ) { PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); IP_ADAPTER_INFO *pInfo = NULL; TCHAR pszRegKey[MAX_PATH]; @@ -147,7 +151,7 @@ return RetVal; } -INT_PTR CALLBACK +static INT_PTR CALLBACK TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA);

1 0

[weiden] 19119: fixed some warnings
by weiden＠svn.reactos.com 10 Nov '05

10 Nov '05

fixed some warnings Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 13:37:56 UTC (rev 19118) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 14:02:20 UTC (rev 19119) @@ -94,7 +94,7 @@ DWORD IpAddress, NetMask, Gateway; const char *AddressString; BOOL RetVal = FALSE; - BOOL DhcpEnabled; + BOOL DhcpEnabled = FALSE; MIB_IPFORWARDROW RowToAdd = { 0 }; if(pPage) @@ -108,18 +108,18 @@ if( !GetAddressFromField ( hwndDlg, IDC_IPADDR, &IpAddress, &AddressString ) || RegSetValueEx - ( hKey, _T("IPAddress"), 0, REG_SZ, AddressString, + ( hKey, _T("IPAddress"), 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) ) != ERROR_SUCCESS ) goto cleanup; if( !GetAddressFromField ( hwndDlg, IDC_SUBNETMASK, &NetMask, &AddressString ) || RegSetValueEx - ( hKey, _T("SubnetMask"), 0, REG_SZ, AddressString, + ( hKey, _T("SubnetMask"), 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) ) != ERROR_SUCCESS ) goto cleanup; - if( DhcpEnabled ) + if( DhcpEnabled ) /* FIXME - DhcpEnabled is never initialized at this point! */ DhcpLeaseIpAddress( pInfo->Index ); else { DhcpReleaseIpAddressLease( pInfo->Index ); @@ -129,7 +129,7 @@ if( !GetAddressFromField ( hwndDlg, IDC_DEFGATEWAY, &Gateway, &AddressString ) || RegSetValueEx - ( hKey, _T("DefaultGateway"), 0, REG_SZ, AddressString, + ( hKey, _T("DefaultGateway"), 0, REG_SZ, (const BYTE*)AddressString, strlen(AddressString) ) != ERROR_SUCCESS ) goto cleanup;

1 0

[cwittich] 19118: remove SetupIsActive function
by cwittich＠svn.reactos.com 10 Nov '05

10 Nov '05

remove SetupIsActive function Modified: trunk/reactos/subsys/system/setup/setup.c _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-11-10 13:27:12 UTC (rev 19117) +++ trunk/reactos/subsys/system/setup/setup.c 2005-11-10 13:37:56 UTC (rev 19118) @@ -57,18 +57,7 @@ return (LPTSTR)NULL; } - static VOID -SetupIsActive( DWORD dw ) -{ - HKEY hKey = 0; - if (RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T("SYSTEM\\Setup"), 0, KEY_WRITE, &hKey ) == ERROR_SUCCESS) { - RegSetValueEx( hKey, _T("SystemSetupInProgress"), 0, REG_DWORD, (CONST BYTE *)&dw, sizeof(dw) ); - RegCloseKey( hKey ); - } -} - -static VOID RunNewSetup (HINSTANCE hInstance) { HMODULE hDll; @@ -85,8 +74,6 @@ } DPRINT("Loaded 'syssetup'!\n"); - - SetupIsActive(1); InstallReactOS = (PINSTALL_REACTOS)GetProcAddress (hDll, "InstallReactOS"); if (InstallReactOS == NULL)

1 0

[cwittich] 19117: set SystemSetupInProgress to 0x00000001
by cwittich＠svn.reactos.com 10 Nov '05

10 Nov '05

set SystemSetupInProgress to 0x00000001 Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-10 11:45:50 UTC (rev 19116) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-10 13:27:12 UTC (rev 19117) @@ -769,5 +769,5 @@ HKLM,"SYSTEM\Setup","OsLoaderPath",0x00000000,"\" HKLM,"SYSTEM\Setup","SetupType",0x00010001,0x00000001 HKLM,"SYSTEM\Setup","SystemPartition",0x00000000,"\Device\Harddisk0\Part ition1" -HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000000 +HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; EOF

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs