Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 19116: fixed typo. DevInstallW with SW_HIDE should work now
by cwittich＠svn.reactos.com 10 Nov '05

10 Nov '05

fixed typo. DevInstallW with SW_HIDE should work now Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-10 08:47:43 UTC (rev 19115) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-10 11:45:50 UTC (rev 19116) @@ -871,7 +871,7 @@ DPRINT("Installing %S (%S)\n", DevInstData.buffer, InstanceId); - if ((Show =! SW_HIDE) && (!FindDriver(&DevInstData))) + if ((Show != SW_HIDE) && (!FindDriver(&DevInstData))) { /* Create the Welcome page */

1 0

[hpoussin] 19115: Fix uninitialized variable
by hpoussin＠svn.reactos.com 10 Nov '05

10 Nov '05

Fix uninitialized variable Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 08:37:40 UTC (rev 19114) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 08:47:43 UTC (rev 19115) @@ -933,10 +933,11 @@ if (rc != ERROR_SUCCESS) goto cleanup; + size = sizeof(DWORD); rc = RegQueryValueExW(hKey, L"SystemSetupInProgress", NULL, &regType, (LPBYTE)&active, &size); if (rc != ERROR_SUCCESS) goto cleanup; - if (regType != REG_DWORD) + if (regType != REG_DWORD || size != sizeof(DWORD)) goto cleanup; ret = (active != 0);

1 0

[hpoussin] 19114: Send SW_HIDE instead of SW_SHOWNOACTIVATE to newdev.dll when 2nd stage setup is running
by hpoussin＠svn.reactos.com 10 Nov '05

10 Nov '05

Send SW_HIDE instead of SW_SHOWNOACTIVATE to newdev.dll when 2nd stage setup is running Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 06:58:40 UTC (rev 19113) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-11-10 08:37:40 UTC (rev 19114) @@ -878,7 +878,7 @@ typedef BOOL (WINAPI *PDEV_INSTALL_W)(HWND, HINSTANCE, LPCWSTR, INT); static BOOL -InstallDevice(PCWSTR DeviceInstance) +InstallDevice(PCWSTR DeviceInstance, BOOL SetupIsActive) { PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; HMODULE hNewDev = NULL; @@ -909,7 +909,7 @@ DevInstallW = (PDEV_INSTALL_W)GetProcAddress(hNewDev, (LPCSTR)"DevInstallW"); if (!DevInstallW) goto cleanup; - if (!DevInstallW(NULL, NULL, DeviceInstance, SW_SHOWNOACTIVATE)) + if (!DevInstallW(NULL, NULL, DeviceInstance, SetupIsActive ? SW_HIDE : SW_SHOWNOACTIVATE)) goto cleanup; DeviceInstalled = TRUE; @@ -921,6 +921,33 @@ return DeviceInstalled; } +static BOOL +SetupIsActive(VOID) +{ + HKEY hKey = INVALID_HANDLE_VALUE; + DWORD regType, active, size; + LONG rc; + BOOL ret = FALSE; + + rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + + rc = RegQueryValueExW(hKey, L"SystemSetupInProgress", NULL, &regType, (LPBYTE)&active, &size); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (regType != REG_DWORD) + goto cleanup; + + ret = (active != 0); + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + DPRINT("System setup in progress? %S\n", ret ? L"YES" : L"NO"); + return ret; +} + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { @@ -928,12 +955,15 @@ ULONG PnpEventSize; NTSTATUS Status; RPC_STATUS RpcStatus; + BOOL setupActive; PnpEventSize = 0x1000; PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); if (PnpEvent == NULL) return ERROR_OUTOFMEMORY; + setupActive = SetupIsActive(); + for (;;) { DPRINT("Calling NtGetPlugPlayEvent()\n"); @@ -961,7 +991,7 @@ if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { DPRINT("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); - InstallDevice(PnpEvent->TargetDevice.DeviceIds); + InstallDevice(PnpEvent->TargetDevice.DeviceIds, setupActive); } else {

1 0

[arty] 19113: Straggling header.
by arty＠svn.reactos.com 10 Nov '05

10 Nov '05

Straggling header. Added: trunk/reactos/w32api/include/dhcpcapi.h _____ Added: trunk/reactos/w32api/include/dhcpcapi.h --- trunk/reactos/w32api/include/dhcpcapi.h 2005-11-10 06:54:44 UTC (rev 19112) +++ trunk/reactos/w32api/include/dhcpcapi.h 2005-11-10 06:58:40 UTC (rev 19113) @@ -0,0 +1,23 @@ +#ifndef _DHCPCAPI_H +#define _DHCPCAPI_H +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + +#include <windows.h> +#include <accctrl.h> + +#ifdef __cplusplus +extern "C" { +#endif + + VOID STDCALL DhcpLeaseIpAddress( ULONG AdapterIndex ); + VOID STDCALL DhcpReleaseIpAddressLease( ULONG AdapterIndex ); + VOID STDCALL DhcpStaticRefreshParams + ( ULONG AdapterIndex, ULONG IpAddress, ULONG NetMask ); + +#ifdef __cplusplus +} +#endif + +#endif/*_DHCPCAPI_H*/

1 0

[arty] 19112: Forgotten xml change.
by arty＠svn.reactos.com 10 Nov '05

10 Nov '05

Forgotten xml change. Modified: trunk/reactos/lib/directory.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-11-10 06:13:12 UTC (rev 19111) +++ trunk/reactos/lib/directory.xml 2005-11-10 06:54:44 UTC (rev 19112) @@ -53,6 +53,9 @@ <directory name="devenum"> <xi:include href="devenum/devenum.xml" /> </directory> +<directory name="dhcpcapi"> + <xi:include href="dhcpcapi/dhcpcapi.xml" /> +</directory> <directory name="dinput"> <xi:include href="dinput/dinput.xml" /> </directory>

1 0

[arty] 19111: Added xml to build dhcpcapi.
by arty＠svn.reactos.com 10 Nov '05

10 Nov '05

Added xml to build dhcpcapi. Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.xml _____ Added: trunk/reactos/lib/dhcpcapi/dhcpcapi.xml --- trunk/reactos/lib/dhcpcapi/dhcpcapi.xml 2005-11-10 06:12:27 UTC (rev 19110) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.xml 2005-11-10 06:13:12 UTC (rev 19111) @@ -0,0 +1,14 @@ +<module name="dhcpcapi" type="win32dll" installbase="system32" installname="dhcpcapi.dll"> + <importlibrary definition="dhcpcapi.def" /> + <include base="dhcpcapi">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT=0x0500" /> + <library>ntdll</library> + <library>kernel32</library> + <library>msvcrt</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>dhcpcapi.c</file> + <file>dhcpcapi.rc</file> +</module>

1 0

[arty] 19110: Preliminary commit for tcpip control panel. I've been sitting on this
by arty＠svn.reactos.com 10 Nov '05

10 Nov '05

Preliminary commit for tcpip control panel. I've been sitting on this for a while, mainly because it used to bugcheck in a named pipe call. I've lost my modifications to dhcpcapi, so stuff in there might not be right. Looking at it. Modified: trunk/reactos/lib/cpl/ncpa/ncpa.xml Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.xml --- trunk/reactos/lib/cpl/ncpa/ncpa.xml 2005-11-09 23:23:12 UTC (rev 19109) +++ trunk/reactos/lib/cpl/ncpa/ncpa.xml 2005-11-10 06:12:27 UTC (rev 19110) @@ -11,6 +11,9 @@ <library>user32</library> <library>comctl32</library> <library>iphlpapi</library> + <library>ws2_32</library> + <library>dhcpcapi</library> + <library>ntdll</library> <file>ncpa.c</file> <file>tcpip_properties.c</file> <file>ncpa.rc</file> _____ Modified: trunk/reactos/lib/cpl/ncpa/tcpip_properties.c --- trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-09 23:23:12 UTC (rev 19109) +++ trunk/reactos/lib/cpl/ncpa/tcpip_properties.c 2005-11-10 06:12:27 UTC (rev 19110) @@ -34,6 +34,7 @@ #include <iptypes.h> #include <iphlpapi.h> #include <commctrl.h> +#include <dhcpcapi.h> #include <prsht.h> @@ -54,86 +55,196 @@ extern void InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); +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 ) { + 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 ) { + LRESULT lResult; + struct in_addr inIPAddr; + + *AddressString = NULL; + + lResult = SendMessage(GetDlgItem(hwndDlg, IDC_IPADDR), IPM_GETADDRESS, 0, + (ULONG_PTR)dwIPAddr); + if( lResult != 4 ) return FALSE; + + inIPAddr.s_addr = *dwIPAddr; + *AddressString = inet_ntoa(inIPAddr); + if( !*AddressString ) return FALSE; + + return TRUE; +} + +BOOL InternTCPIPSettings( HWND hwndDlg ) { + PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); + IP_ADAPTER_INFO *pInfo = NULL; + TCHAR pszRegKey[MAX_PATH]; + HKEY hKey = NULL; + DWORD IpAddress, NetMask, Gateway; + const char *AddressString; + BOOL RetVal = FALSE; + BOOL DhcpEnabled; + MIB_IPFORWARDROW RowToAdd = { 0 }; + + if(pPage) + pInfo = (IP_ADAPTER_INFO *)pPage->lParam; + + if( !pPage || !pInfo ) goto cleanup; + + _stprintf(pszRegKey,_T("SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Para meters\\Interfaces\\%S"),pInfo->AdapterName); + if(RegOpenKey(HKEY_LOCAL_MACHINE,pszRegKey,&hKey)!=ERROR_SUCCESS) goto cleanup; + + if( !GetAddressFromField + ( hwndDlg, IDC_IPADDR, &IpAddress, &AddressString ) || + RegSetValueEx + ( hKey, _T("IPAddress"), 0, REG_SZ, AddressString, + strlen(AddressString) ) != ERROR_SUCCESS ) + goto cleanup; + + if( !GetAddressFromField + ( hwndDlg, IDC_SUBNETMASK, &NetMask, &AddressString ) || + RegSetValueEx + ( hKey, _T("SubnetMask"), 0, REG_SZ, AddressString, + strlen(AddressString) ) != ERROR_SUCCESS ) + goto cleanup; + + if( DhcpEnabled ) + DhcpLeaseIpAddress( pInfo->Index ); + else { + DhcpReleaseIpAddressLease( pInfo->Index ); + DhcpStaticRefreshParams( pInfo->Index, IpAddress, NetMask ); + } + + if( !GetAddressFromField + ( hwndDlg, IDC_DEFGATEWAY, &Gateway, &AddressString ) || + RegSetValueEx + ( hKey, _T("DefaultGateway"), 0, REG_SZ, AddressString, + strlen(AddressString) ) != ERROR_SUCCESS ) + goto cleanup; + + /* If not on DHCP then add a default gateway, assuming one was specified */ + if( !DhcpEnabled ) { + RowToAdd.dwForwardMask = 0; + RowToAdd.dwForwardMetric1 = 1; + RowToAdd.dwForwardNextHop = Gateway; + CreateIpForwardEntry( &RowToAdd ); + } + +cleanup: + if( hKey ) RegCloseKey( hKey ); + + return RetVal; +} + INT_PTR CALLBACK TCPIPPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); - IP_ADAPTER_INFO *pInfo = NULL; - if(pPage) - pInfo = (IP_ADAPTER_INFO *)pPage->lParam; - switch(uMsg) - { + PROPSHEETPAGE *pPage = (PROPSHEETPAGE *)GetWindowLongPtr(hwndDlg,GWL_USERDATA); + IP_ADAPTER_INFO *pInfo = NULL; + int StaticDNS = 0; + char *NextDNSServer; + + if(pPage) + pInfo = (IP_ADAPTER_INFO *)pPage->lParam; + switch(uMsg) + { case WM_INITDIALOG: - { - pPage = (PROPSHEETPAGE *)lParam; - pInfo = (IP_ADAPTER_INFO *)pPage->lParam; - EnableWindow(GetDlgItem(hwndDlg,IDC_ADVANCED),FALSE); - SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)pPage->lParam); + { + pPage = (PROPSHEETPAGE *)lParam; + pInfo = (IP_ADAPTER_INFO *)pPage->lParam; + EnableWindow(GetDlgItem(hwndDlg,IDC_ADVANCED),FALSE); + SetWindowLongPtr(hwndDlg,GWL_USERDATA,(DWORD_PTR)pPage->lParam); - if(pInfo->DhcpEnabled) { - CheckDlgButton(hwndDlg,IDC_USEDHCP,BST_CHECKED); - CheckDlgButton(hwndDlg,IDC_NODHCP,BST_UNCHECKED); - } else { - CheckDlgButton(hwndDlg,IDC_USEDHCP,BST_UNCHECKED); - CheckDlgButton(hwndDlg,IDC_NODHCP,BST_CHECKED); - } - { - DWORD dwIPAddr; - int b[4]; - IP_ADDR_STRING *pString; - pString = &pInfo->IpAddressList; - while(pString->Next) - pString = pString->Next; - sscanf(pString->IpAddress.String,"%d.%d.%d.%d",&b[0],&b[1],&b[2],&b[3]); - dwIPAddr = b[0]<<24|b[1]<<16|b[2]<<8|b[3]; - SendDlgItemMessage(hwndDlg,IDC_IPADDR,IPM_SETADDRESS,0,dwIPAddr); - sscanf(pString->IpMask.String,"%d.%d.%d.%d",&b[0],&b[1],&b[2],&b[3]); - dwIPAddr = b[0]<<24|b[1]<<16|b[2]<<8|b[3]; - SendDlgItemMessage(hwndDlg,IDC_SUBNETMASK,IPM_SETADDRESS,0,dwIPAddr); + EnableDHCP( hwndDlg, pInfo->DhcpEnabled ); - pString = &pInfo->GatewayList; - while(pString->Next) - pString = pString->Next; - sscanf(pString->IpAddress.String,"%d.%d.%d.%d",&b[0],&b[1],&b[2],&b[3]); - dwIPAddr = b[0]<<24|b[1]<<16|b[2]<<8|b[3]; - SendDlgItemMessage(hwndDlg,IDC_DEFGATEWAY,IPM_SETADDRESS,0,dwIPAddr); + { + DWORD dwIPAddr; + IP_ADDR_STRING *pString; + pString = &pInfo->IpAddressList; + while(pString->Next) + pString = pString->Next; + dwIPAddr = inet_addr(pString->IpAddress.String); + SendDlgItemMessage(hwndDlg,IDC_IPADDR,IPM_SETADDRESS,0,dwIPAddr); + dwIPAddr = inet_addr(pString->IpMask.String); + SendDlgItemMessage(hwndDlg,IDC_SUBNETMASK,IPM_SETADDRESS,0,dwIPAddr); - } - { - TCHAR pszRegKey[MAX_PATH]; - HKEY hKey; - _stprintf(pszRegKey,_T("SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Para meters\\Interfaces\\%S"),pInfo->AdapterName); - if(RegOpenKey(HKEY_LOCAL_MACHINE,pszRegKey,&hKey)==ERROR_SUCCESS) - { - char pszDNS[MAX_PATH]; - DWORD dwSize = sizeof(pszDNS); - DWORD dwType = REG_SZ; - int b[2][4]; - DWORD dwIPAddr; - RegQueryValueExA(hKey,"NameServer",NULL,&dwType,(BYTE*)pszDNS,&dwSize); - RegCloseKey(hKey); - - sscanf(pszDNS,"%d.%d.%d.%d,%d.%d.%d.%d",&b[0][0],&b[0][1],&b[0][2],&b[0] [3],&b[1][0],&b[1][1],&b[1][2],&b[1][3]); - dwIPAddr = b[0][0]<<24|b[0][1]<<16|b[0][2]<<8|b[0][3]; - SendDlgItemMessage(hwndDlg,IDC_DNS1,IPM_SETADDRESS,0,dwIPAddr); - dwIPAddr = b[1][0]<<24|b[1][1]<<16|b[1][2]<<8|b[1][3]; - SendDlgItemMessage(hwndDlg,IDC_DNS2,IPM_SETADDRESS,0,dwIPAddr); - CheckDlgButton(hwndDlg,IDC_FIXEDDNS,TRUE); - EnableWindow(GetDlgItem(hwndDlg,IDC_DNS1),FALSE); - EnableWindow(GetDlgItem(hwndDlg,IDC_DNS2),FALSE); - EnableWindow(GetDlgItem(hwndDlg,IDC_AUTODNS),FALSE); - EnableWindow(GetDlgItem(hwndDlg,IDC_FIXEDDNS),FALSE); - } - } - } - break; - case WM_COMMAND: - switch(LOWORD(wParam)) - { - } - break; - } - return FALSE; + pString = &pInfo->GatewayList; + while(pString->Next) + pString = pString->Next; + dwIPAddr = inet_addr(pString->IpAddress.String); + SendDlgItemMessage(hwndDlg,IDC_DEFGATEWAY,IPM_SETADDRESS,0,dwIPAddr); + + } + { + TCHAR pszRegKey[MAX_PATH]; + HKEY hKey; + _stprintf(pszRegKey,_T("SYSTEM\\CurrentControlSet\\Services\\TCPIP\\Para meters\\Interfaces\\%S"),pInfo->AdapterName); + if(RegOpenKey(HKEY_LOCAL_MACHINE,pszRegKey,&hKey)==ERROR_SUCCESS) + { + char pszDNS[MAX_PATH]; + DWORD dwSize = sizeof(pszDNS); + DWORD dwType = REG_SZ; + DWORD dwIPAddr; + RegQueryValueExA(hKey,"NameServer",NULL,&dwType,(BYTE*)pszDNS,&dwSize); + RegCloseKey(hKey); + + NextDNSServer = pszDNS; + + while( NextDNSServer && StaticDNS < 2 ) { + dwIPAddr = inet_addr(NextDNSServer); + if( dwIPAddr != INADDR_NONE ) { + SendDlgItemMessage(hwndDlg,IDC_DNS1 + StaticDNS,IPM_SETADDRESS,0,dwIPAddr); + StaticDNS++; + } + NextDNSServer = strchr( pszDNS, ',' ); + if( NextDNSServer ) + NextDNSServer++; + } + + ManualDNS( hwndDlg, StaticDNS ); + } + } + } + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_FIXEDDNS: + ManualDNS( hwndDlg, TRUE ); + break; + + case IDC_AUTODNS: + ManualDNS( hwndDlg, FALSE ); + break; + + case IDC_USEDHCP: + EnableDHCP( hwndDlg, TRUE ); + break; + + case IDC_NODHCP: + EnableDHCP( hwndDlg, FALSE ); + break; + + case IDOK: + /* Set the IP Address and DNS Information so we won't + * be doing all this for nothing */ + InternTCPIPSettings( hwndDlg ); + break; + } + break; + } + return FALSE; } void DisplayTCPIPProperties(HWND hParent,IP_ADAPTER_INFO *pInfo)

1 0

[gvg] 19109: We need to call HalReleaseDisplayOwnership before killing all running processes.
by gvg＠svn.reactos.com 09 Nov '05

09 Nov '05

We need to call HalReleaseDisplayOwnership before killing all running processes. During HalReleaseDisplayOwnership processing, the video miniport driver can do an INT10 call, for which we need the CSRSS memory space. If the the process (and therefore its memory space) is already gone, a kernel stack fault can result. Modified: trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/hal/halx86/generic/reboot.c --- trunk/reactos/hal/halx86/generic/reboot.c 2005-11-09 23:17:13 UTC (rev 19108) +++ trunk/reactos/hal/halx86/generic/reboot.c 2005-11-09 23:23:12 UTC (rev 19109) @@ -64,7 +64,6 @@ } else if (Action == HalRebootRoutine) { - HalReleaseDisplayOwnership(); HalReboot (); } } _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-11-09 23:17:13 UTC (rev 19108) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-11-09 23:23:12 UTC (rev 19109) @@ -42,9 +42,61 @@ SHUTDOWN_ACTION Action = (SHUTDOWN_ACTION)Context; LARGE_INTEGER Waittime; + static PCH FamousLastWords[] = + { + "So long, and thanks for all the fish\n", + "I think you ought to know I'm feeling very depressed\n", + "I'm not getting you down at all am I?\n", + "I'll be back\n", + "It's the same series of signal over and over again!\n", + "Pie Iesu Domine, dona eis requiem\n", + "Wandering stars, for whom it is reserved;\n" + "the blackness and darkness forever.\n", + "Your knees start shakin' and your fingers pop\n" + "Like a pinch on the neck from Mr. Spock!\n", + "It's worse than that ... He's dead, Jim\n", + "Don't Panic!\n", + "Et tu... Brute?\n", + "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee!\n", + "My Precious! O my Precious!\n", + "Sir, If you'll not be needing me for a while I'll turn down.\n", + "What are you doing, Dave...?\n", + "I feel a great disturbance in the Force\n", + "Gone fishing\n", + "Do you want me to sit in the corner and rust, or just fall apart where I'm standing?\n", + "There goes another perfect chance for a new uptime record\n", + "The end ..... Try the sequel, hit the reset button right now!\n", + "God's operating system is going to sleep now, guys, so wait until I will switch on again!\n", + "Oh i'm boring eh?\n", + "<This space was intentionally left blank>\n", + "tell me..., in the future... will I be artificial intelligent enough to actually feel\n" + "sad serving you this screen?\n", + "Thank you for some well deserved rest.\n", + "It's been great, maybe we can boot me up again some time soon.\n", + "For what's it worth, I've enjoyed every single CPU cycle.\n", + "There are many questions when the end is near.\n" + "What to expect, what will it be like...what should I look for?\n", + "I've seen things you people wouldn't believe. Attack ships on fire\n" + "off the shoulder of Orion. I watched C-beams glitter in the dark near\n" + "the Tannhauser gate. All those moments will be lost in time, like tears\n" + "in rain. Time to die.\n", + "Will I dream?\n", + "One day, I shall come back. Yes, I shall come back.\n" + "Until then, there must be no regrets, no fears, no anxieties.\n" + "Just go forward in all your beliefs, and prove to me that I am not mistaken in mine.\n", + "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\n", + "Hasta la vista, BABY!\n", + "They live, we sleep!\n", + "I have come here to chew bubble gum and kick ass.\n" + "And I'm all out of bubble gum!\n" + }; + LARGE_INTEGER Now; + /* Run the thread on the boot processor */ KeSetSystemAffinityThread(1); + HalReleaseDisplayOwnership(); + CmShutdownRegistry(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); @@ -57,6 +109,10 @@ if (Action == ShutdownNoReboot) { + ZwQuerySystemTime(&Now); + Now.u.LowPart = Now.u.LowPart >> 8; /* Seems to give a somewhat better "random" number */ + HalDisplayString("\nYou can switch off your computer now\n\n"); + HalDisplayString(FamousLastWords[Now.u.LowPart % (sizeof(FamousLastWords) / sizeof(PCH))]); #if 0 /* Switch off */ @@ -124,68 +180,8 @@ HANDLE ThreadHandle; PETHREAD ShutdownThread; - static PCH FamousLastWords[] = - { - "So long, and thanks for all the fish\n", - "I think you ought to know I'm feeling very depressed\n", - "I'm not getting you down at all am I?\n", - "I'll be back\n", - "It's the same series of signal over and over again!\n", - "Pie Iesu Domine, dona eis requiem\n", - "Wandering stars, for whom it is reserved;\n" - "the blackness and darkness forever.\n", - "Your knees start shakin' and your fingers pop\n" - "Like a pinch on the neck from Mr. Spock!\n", - "It's worse than that ... He's dead, Jim\n", - "Don't Panic!\n", - "Et tu... Brute?\n", - "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee!\n", - "My Precious! O my Precious!\n", - "Sir, If you'll not be needing me for a while I'll turn down.\n", - "What are you doing, Dave...?\n", - "I feel a great disturbance in the Force\n", - "Gone fishing\n", - "Do you want me to sit in the corner and rust, or just fall apart where I'm standing?\n", - "There goes another perfect chance for a new uptime record\n", - "The end ..... Try the sequel, hit the reset button right now!\n", - "God's operating system is going to sleep now, guys, so wait until I will switch on again!\n", - "Oh i'm boring eh?\n", - "<This space was intentionally left blank>\n", - "tell me..., in the future... will I be artificial intelligent enough to actually feel\n" - "sad serving you this screen?\n", - "Thank you for some well deserved rest.\n", - "It's been great, maybe we can boot me up again some time soon.\n", - "For what's it worth, I've enjoyed every single CPU cycle.\n", - "There are many questions when the end is near.\n" - "What to expect, what will it be like...what should I look for?\n", - "I've seen things you people wouldn't believe. Attack ships on fire\n" - "off the shoulder of Orion. I watched C-beams glitter in the dark near\n" - "the Tannhauser gate. All those moments will be lost in time, like tears\n" - "in rain. Time to die.\n", - "Will I dream?\n", - "One day, I shall come back. Yes, I shall come back.\n" - "Until then, there must be no regrets, no fears, no anxieties.\n" - "Just go forward in all your beliefs, and prove to me that I am not mistaken in mine.\n", - "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\n", - "Hasta la vista, BABY!\n", - "They live, we sleep!\n", - "I have come here to chew bubble gum and kick ass.\n" - "And I'm all out of bubble gum!\n" - }; - LARGE_INTEGER Now; - if (Action > ShutdownPowerOff) return STATUS_INVALID_PARAMETER; - - ZwQuerySystemTime(&Now); - Now.u.LowPart = Now.u.LowPart >> 8; /* Seems to give a somewhat better "random" number */ - - if (Action == ShutdownNoReboot) - { - HalReleaseDisplayOwnership(); - HalDisplayString("\nYou can switch off your computer now\n\n"); - HalDisplayString(FamousLastWords[Now.u.LowPart % (sizeof(FamousLastWords) / sizeof(PCH))]); - } Status = PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, NULL,

1 0

[cwittich] 19108: set SystemSetupInProgress to 0 in syssetup instead of in setup (before rebooting the system)
by cwittich＠svn.reactos.com 09 Nov '05

09 Nov '05

set SystemSetupInProgress to 0 in syssetup instead of in setup (before rebooting the system) Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/subsys/system/setup/setup.c Modified: trunk/reactos/subsys/system/setup/setup.xml _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-11-09 22:50:47 UTC (rev 19107) +++ trunk/reactos/lib/syssetup/install.c 2005-11-09 23:17:13 UTC (rev 19108) @@ -236,6 +236,16 @@ Dst); } +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 ); + } +} + INT_PTR CALLBACK RestartDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -255,7 +265,10 @@ hWndProgress = GetDlgItem(hWnd, IDC_RESTART_PROGRESS); Position = SendMessage(hWndProgress, PBM_GETPOS, 0, 0); if (Position == 300) + { + SetupIsActive(0); EndDialog(hWnd, 0); + } else SendMessage(hWndProgress, PBM_SETPOS, Position + 1, 0); } _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-11-09 22:50:47 UTC (rev 19107) +++ trunk/reactos/subsys/system/setup/setup.c 2005-11-09 23:17:13 UTC (rev 19108) @@ -88,7 +88,6 @@ SetupIsActive(1); InstallReactOS = (PINSTALL_REACTOS)GetProcAddress (hDll, "InstallReactOS"); - SetupIsActive(0); if (InstallReactOS == NULL) { _____ Modified: trunk/reactos/subsys/system/setup/setup.xml --- trunk/reactos/subsys/system/setup/setup.xml 2005-11-09 22:50:47 UTC (rev 19107) +++ trunk/reactos/subsys/system/setup/setup.xml 2005-11-09 23:17:13 UTC (rev 19108) @@ -1,6 +1,8 @@ <module name="setup" type="win32gui" installbase="system32" installname="setup.exe"> <include base="setup">.</include> <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> <define name="_WIN32_IE">0x0400</define> <library>kernel32</library> <library>userenv</library>

1 0

[cwittich] 19107: set SystemSetupInProgress to 1 when 2nd stage setup is running
by cwittich＠svn.reactos.com 09 Nov '05

09 Nov '05

set SystemSetupInProgress to 1 when 2nd stage setup is running compile setup as UNICODE 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-09 21:18:08 UTC (rev 19106) +++ trunk/reactos/subsys/system/setup/setup.c 2005-11-09 22:50:47 UTC (rev 19107) @@ -28,6 +28,7 @@ #include <tchar.h> #include <syssetup/syssetup.h> #include <userenv.h> +#include <tchar.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> @@ -58,6 +59,16 @@ 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; @@ -75,7 +86,10 @@ DPRINT("Loaded 'syssetup'!\n"); + SetupIsActive(1); InstallReactOS = (PINSTALL_REACTOS)GetProcAddress (hDll, "InstallReactOS"); + SetupIsActive(0); + if (InstallReactOS == NULL) { DPRINT("Failed to get address for 'InstallReactOS()'!\n");

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