Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[hpoussin] 21906: Initialize the status block before sending the IRP
by hpoussin＠svn.reactos.org 15 May '06

15 May '06

Author: hpoussin Date: Mon May 15 14:55:51 2006 New Revision: 21906 URL: http://svn.reactos.ru/svn/reactos?rev=21906&view=rev Log: Initialize the status block before sending the IRP Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.c… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.c (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.c Mon May 15 14:55:51 2006 @@ -50,6 +50,10 @@ DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } + + /* Initialize the status block before sending the IRP */ + IoStatus.Status = STATUS_NOT_SUPPORTED; + IoStatus.Information = 0; Status = IoCallDriver(Pdo, Irp);

1 0

[hpoussin] 21905: Revert 21903 1) ReactOS is extremely long to parse .inf files (no .pnf files as on Windows). Remember we want to keep ReactOS fast (when running) and small (on disk). 2) nVidia already provides a .inf file for its devices. You will still need it for other devices, so why not also use it for PCI System Management and Memory Controller? 3) Windows doesn't recognize natively the nVidia chipset, even with lastest updates. 4) I only care about devices emulated by VMware/Qemu/Bochs/V
by hpoussin＠svn.reactos.org 15 May '06

15 May '06

Author: hpoussin Date: Mon May 15 12:43:33 2006 New Revision: 21905 URL: http://svn.reactos.ru/svn/reactos?rev=21905&view=rev Log: Revert 21903 1) ReactOS is extremely long to parse .inf files (no .pnf files as on Windows). Remember we want to keep ReactOS fast (when running) and small (on disk). 2) nVidia already provides a .inf file for its devices. You will still need it for other devices, so why not also use it for PCI System Management and Memory Controller? 3) Windows doesn't recognize natively the nVidia chipset, even with lastest updates. 4) I only care about devices emulated by VMware/Qemu/Bochs/Virtual PC, ie virtual machines. 5) If you add PnP IDs of some nVidia devices, someone else will want to add PnP IDs for other chipsets (Via, C3, Intel, ...) 6) While you are at it, why don't you add 40Mb to recognize the same amount of devices as Windows XP? Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/machine.inf (original) +++ trunk/reactos/media/inf/machine.inf Mon May 15 12:43:33 2006 @@ -24,7 +24,6 @@ [Manufacturer] %GenericMfg% = GenericMfg %IntelMfg% = IntelMfg -%NVIDIAMfg% = NVIDIAMfg [GenericMfg] %*PNP0000.DeviceDesc% = NO_DRV,*PNP0000 @@ -59,21 +58,6 @@ %PCI\VEN_8086&DEV_7180.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7180 %PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190 %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7192 - -[NVIDIAMfg] -;PCI System Management -%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_0064 -%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_0084 -%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_00D4 -%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_00E4 -%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_01b4 - -;Memory Controller -%PCI\VEN_10DE&DEV_01ExU.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01EB&REV_C1 -%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV, PCI\VEN_10DE&DEV_01EC -%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV, PCI\VEN_10DE&DEV_01ED -%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV, PCI\VEN_10DE&DEV_01EE -%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01EF ;---------------------------- NO DRIVER REQ ----------------------------- @@ -157,8 +141,3 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" - -NVIDIAMfg = "NVIDIA" -PCI\VEN_10DE&DEV_01ExU.DeviceDesc = "NVIDIA nForce2 Ultra 400 Memory Controller" -PCI\VEN_10DE&DEV_01Ex.DeviceDesc = "NVIDIA nForce2 Memory Controller" -PCI\VEN_10de&DEV_01b4.DeviceDesc = "NVIDIA nForce PCI System Management"

1 0

[greatlrd] 21904: bug 1486 : patch from w3seek USER32: Convert WM_MDICREATE messages from/to unicode
by greatlrd＠svn.reactos.org 14 May '06

14 May '06

Author: greatlrd Date: Mon May 15 01:26:24 2006 New Revision: 21904 URL: http://svn.reactos.ru/svn/reactos?rev=21904&view=rev Log: bug 1486 : patch from w3seek USER32: Convert WM_MDICREATE messages from/to unicode Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/me… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Mon May 15 01:26:24 2006 @@ -471,12 +471,12 @@ return FALSE; } xs->cs = *(CREATESTRUCTW *)AnsiMsg->lParam; - if (HIWORD(xs->cs.lpszName)) + if (!IS_INTRESOURCE(xs->cs.lpszName)) { RtlCreateUnicodeStringFromAsciiz(&UnicodeBuffer, (LPSTR)xs->cs.lpszName); xs->lpszName = xs->cs.lpszName = UnicodeBuffer.Buffer; } - if (HIWORD(xs->cs.lpszClass)) + if (!IS_ATOM(xs->cs.lpszClass)) { RtlCreateUnicodeStringFromAsciiz(&UnicodeBuffer, (LPSTR)xs->cs.lpszClass); xs->lpszClass = xs->cs.lpszClass = UnicodeBuffer.Buffer; @@ -498,7 +498,7 @@ *cs = *(MDICREATESTRUCTW *)AnsiMsg->lParam; - if (HIWORD(cs->szClass)) + if (!IS_ATOM(cs->szClass)) { RtlCreateUnicodeStringFromAsciiz(&UnicodeBuffer, (LPSTR)cs->szClass); cs->szClass = UnicodeBuffer.Buffer; @@ -607,12 +607,9 @@ { UNICODE_STRING UnicodeString; MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)UnicodeMsg->lParam; - if (HIWORD(cs->szTitle)) - { - RtlInitUnicodeString(&UnicodeString, (PCWSTR)cs->szTitle); - RtlFreeUnicodeString(&UnicodeString); - } - if (HIWORD(cs->szClass)) + RtlInitUnicodeString(&UnicodeString, (PCWSTR)cs->szTitle); + RtlFreeUnicodeString(&UnicodeString); + if (!IS_ATOM(cs->szClass)) { RtlInitUnicodeString(&UnicodeString, (PCWSTR)cs->szClass); RtlFreeUnicodeString(&UnicodeString); @@ -762,7 +759,51 @@ } break; } - } + + case WM_MDICREATE: + { + ANSI_STRING AnsiBuffer; + UNICODE_STRING UnicodeString; + MDICREATESTRUCTA *cs = + (MDICREATESTRUCTA *)HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)); + + if (!cs) + { + return FALSE; + } + + *cs = *(MDICREATESTRUCTA *)UnicodeMsg->lParam; + + if (!IS_ATOM(cs->szClass)) + { + RtlInitUnicodeString(&UnicodeString, (LPCWSTR)cs->szClass); + if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiBuffer, + &UnicodeString, + TRUE))) + { + return FALSE; + } + cs->szClass = AnsiBuffer.Buffer; + } + + RtlInitUnicodeString(&UnicodeString, (LPCWSTR)cs->szTitle); + if (! NT_SUCCESS(RtlUnicodeStringToAnsiString(&AnsiBuffer, + &UnicodeString, + TRUE))) + { + if (!IS_ATOM(cs->szClass)) + { + RtlInitAnsiString(&AnsiBuffer, cs->szClass); + RtlFreeAnsiString(&AnsiBuffer); + } + return FALSE; + } + cs->szTitle = AnsiBuffer.Buffer; + + AnsiMsg->lParam = (LPARAM)cs; + break; + } + } return TRUE; } @@ -835,6 +876,21 @@ RtlInitAnsiString(&AString, (PSTR) AnsiMsg->lParam); RtlFreeAnsiString(&AString); } + break; + } + + case WM_MDICREATE: + { + ANSI_STRING AnsiString; + MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)AnsiMsg->lParam; + RtlInitAnsiString(&AnsiString, (PCSTR)cs->szTitle); + RtlFreeAnsiString(&AnsiString); + if (!IS_ATOM(cs->szClass)) + { + RtlInitAnsiString(&AnsiString, (PCSTR)cs->szClass); + RtlFreeAnsiString(&AnsiString); + } + HeapFree(GetProcessHeap(), 0, cs); break; }

1 0

[cwittich] 21903: -added NVIDIA nForce2 Memory Controller -added NVIDIA nForce2 PCI System Management
by cwittich＠svn.reactos.org 14 May '06

14 May '06

Author: cwittich Date: Mon May 15 00:05:08 2006 New Revision: 21903 URL: http://svn.reactos.ru/svn/reactos?rev=21903&view=rev Log: -added NVIDIA nForce2 Memory Controller -added NVIDIA nForce2 PCI System Management Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/machine.inf (original) +++ trunk/reactos/media/inf/machine.inf Mon May 15 00:05:08 2006 @@ -24,6 +24,7 @@ [Manufacturer] %GenericMfg% = GenericMfg %IntelMfg% = IntelMfg +%NVIDIAMfg% = NVIDIAMfg [GenericMfg] %*PNP0000.DeviceDesc% = NO_DRV,*PNP0000 @@ -58,6 +59,21 @@ %PCI\VEN_8086&DEV_7180.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7180 %PCI\VEN_8086&DEV_7190.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7190 %PCI\VEN_8086&DEV_7192.DeviceDesc% = NO_DRV,PCI\VEN_8086&DEV_7192 + +[NVIDIAMfg] +;PCI System Management +%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_0064 +%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_0084 +%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_00D4 +%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_00E4 +%PCI\VEN_10de&DEV_01b4.DeviceDesc% = NO_DRV,PCI\VEN_10de&DEV_01b4 + +;Memory Controller +%PCI\VEN_10DE&DEV_01ExU.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01EB&REV_C1 +%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV, PCI\VEN_10DE&DEV_01EC +%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV, PCI\VEN_10DE&DEV_01ED +%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV, PCI\VEN_10DE&DEV_01EE +%PCI\VEN_10DE&DEV_01Ex.DeviceDesc% = NO_DRV,PCI\VEN_10DE&DEV_01EF ;---------------------------- NO DRIVER REQ ----------------------------- @@ -141,3 +157,8 @@ PCI\VEN_8086&DEV_7180.DeviceDesc = "Intel 82443LX/EX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7190.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" PCI\VEN_8086&DEV_7192.DeviceDesc = "Intel 82443BX/ZX/DX Pentium(R) II CPU to PCI-Bridge" + +NVIDIAMfg = "NVIDIA" +PCI\VEN_10DE&DEV_01ExU.DeviceDesc = "NVIDIA nForce2 Ultra 400 Memory Controller" +PCI\VEN_10DE&DEV_01Ex.DeviceDesc = "NVIDIA nForce2 Memory Controller" +PCI\VEN_10de&DEV_01b4.DeviceDesc = "NVIDIA nForce PCI System Management"

1 0

[hpoussin] 21902: No need to link to ole32/oleaut32
by hpoussin＠svn.reactos.org 14 May '06

14 May '06

Author: hpoussin Date: Sun May 14 18:51:08 2006 New Revision: 21902 URL: http://svn.reactos.ru/svn/reactos?rev=21902&view=rev Log: No need to link to ole32/oleaut32 Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild Modified: trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/screensav… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild (original) +++ trunk/reactos/base/applications/screensavers/matrix/matrix.rbuild Sun May 14 18:51:08 2006 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true"> - <include base="matrix">.</include> + <include base="matrix">.</include> <linkerflag>-lstdc++</linkerflag> <define name="__USE_W32API" /> @@ -15,12 +15,10 @@ <library>user32</library> <library>gdi32</library> <library>winspool</library> - <library>comctl32</library> + <library>comctl32</library> <library>comdlg32</library> - <library>advapi32</library> + <library>advapi32</library> <library>shell32</library> - <library>ole32</library> - <library>oleaut32</library> <library>uuid</library> <file>config.c</file>

1 0

[fireball] 21901: - Revert dependencies part of r21866 since it breaks compiling on MSVC 2005 (it complains to missing libs which we don't yet compile - like ntdll.lib, gdi32.lib, user32.lib and so on)
by fireball＠svn.reactos.org 13 May '06

13 May '06

Author: fireball Date: Sun May 14 02:11:25 2006 New Revision: 21901 URL: http://svn.reactos.ru/svn/reactos?rev=21901&view=rev Log: - Revert dependencies part of r21866 since it breaks compiling on MSVC 2005 (it complains to missing libs which we don't yet compile - like ntdll.lib, gdi32.lib, user32.lib and so on) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/v… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun May 14 02:11:25 2006 @@ -646,41 +646,20 @@ std::string vcproj_guid, const std::vector<Dependency*>& dependencies ) { - //vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); - - fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"{%s}\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() ); - - vector<const IfableData*> ifs_list; - ifs_list.push_back ( &module.project.non_if_data ); - ifs_list.push_back ( &module.non_if_data ); - + vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file ); + + fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() ); //FIXME: only omit ProjectDependencies in VS 2005 when there are no dependencies //NOTE: VS 2002 do not use ProjectSection; it uses GlobalSection instead - if (configuration.VSProjectVersion != "7.00") { - - bool has_dependencies = false; - - - - - while ( ifs_list.size() ) - { - const IfableData& data = *ifs_list.back(); - ifs_list.pop_back(); - const vector<Library*>& libs = data.libraries; - for ( unsigned i = 0; i < libs.size(); i++ ) - { - if ( !has_dependencies ) { - fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" ); - has_dependencies = true; - } - - fprintf ( OUT, "\t\t{%s} = {%s}\r\n", libs[i]->importedModule->guid.c_str(), libs[i]->importedModule->guid.c_str()); - } - } - if ( has_dependencies ) - fprintf ( OUT, "\tEndProjectSection\r\n" ); + if ((configuration.VSProjectVersion == "7.10") || (dependencies.size() > 0)) { + fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" ); + for ( size_t i = 0; i < dependencies.size(); i++ ) + { + Dependency& dependency = *dependencies[i]; + fprintf ( OUT, "\t\t%s = %s\r\n", dependency.module.guid.c_str(), dependency.module.guid.c_str() ); + } + fprintf ( OUT, "\tEndProjectSection\r\n" ); } fprintf ( OUT, "EndProject\r\n" );

1 0

[arty] 21900: Fix duplicate default routes when IP address is set manually.
by arty＠svn.reactos.org 13 May '06

13 May '06

Author: arty Date: Sat May 13 11:11:22 2006 New Revision: 21900 URL: http://svn.reactos.ru/svn/reactos?rev=21900&view=rev Log: Fix duplicate default routes when IP address is set manually. Modified: trunk/reactos/lib/drivers/ip/network/router.c Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/drivers/ip/network/rout… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c (original) +++ trunk/reactos/lib/drivers/ip/network/router.c Sat May 13 11:11:22 2006 @@ -219,7 +219,7 @@ return NULL; } - INIT_TAG(Router, TAG('R','O','U','T')); + INIT_TAG(Router, TAG('R','O','U','T')); RtlCopyMemory( &FIBE->NetworkAddress, NetworkAddress, sizeof(FIBE->NetworkAddress) ); @@ -414,8 +414,33 @@ * for providing this reference */ { + KIRQL OldIrql; + PFIB_ENTRY FIBE; + PLIST_ENTRY CurrentEntry; + PLIST_ENTRY NextEntry; + PFIB_ENTRY Current; PNEIGHBOR_CACHE_ENTRY NCE; - PFIB_ENTRY FIBE; + + TcpipAcquireSpinLock(&FIBLock, &OldIrql); + + CurrentEntry = FIBListHead.Flink; + while (CurrentEntry != &FIBListHead) { + NextEntry = CurrentEntry->Flink; + Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); + + NCE = Current->Router; + + if( AddrIsEqual(NetworkAddress, &Current->NetworkAddress) && + AddrIsEqual(Netmask, &Current->Netmask) ) { + TI_DbgPrint(DEBUG_ROUTER,("Attempting to add duplicate route to %s\n", A2S(NetworkAddress))); + TcpipReleaseSpinLock(&FIBLock, OldIrql); + return NULL; + } + + CurrentEntry = NextEntry; + } + + TcpipReleaseSpinLock(&FIBLock, OldIrql); /* The NCE references RouterAddress. The NCE is referenced for us */ NCE = NBFindOrCreateNeighbor(Interface, RouterAddress);

1 0

[arty] 21899: - Live update of static IP address from ctl panel. - Fix removing adapter route on IP address delete.
by arty＠svn.reactos.org 13 May '06

13 May '06

Author: arty Date: Sat May 13 10:41:23 2006 New Revision: 21899 URL: http://svn.reactos.ru/svn/reactos?rev=21899&view=rev Log: - Live update of static IP address from ctl panel. - Fix removing adapter route on IP address delete. Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/router.c Modified: trunk/reactos/dll/cpl/ncpa/tcpip_properties.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/tcpip_properti… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/tcpip_properties.c (original) +++ trunk/reactos/dll/cpl/ncpa/tcpip_properties.c Sat May 13 10:41:23 2006 @@ -71,6 +71,7 @@ if (! Enabled) { SendDlgItemMessage(Dlg, IDC_DNS1, IPM_CLEARADDRESS, 0, 0); SendDlgItemMessage(Dlg, IDC_DNS2, IPM_CLEARADDRESS, 0, 0); + } } @@ -132,10 +133,13 @@ ValidateAndStore(HWND Dlg, PTCPIP_PROPERTIES_DATA DlgData) { DWORD IpAddress; + MIB_IPFORWARDROW RowToAdd = { 0 }, RowToRem = { 0 }; DlgData->DhcpEnabled = (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_USEDHCP)); if (! DlgData->DhcpEnabled) { + DhcpReleaseIpAddressLease( DlgData->AdapterIndex ); + if (4 != SendMessageW(GetDlgItem(Dlg, IDC_IPADDR), IPM_GETADDRESS, 0, (LPARAM) &IpAddress)) { ShowError(Dlg, IDS_ENTER_VALID_IPADDRESS); @@ -156,11 +160,26 @@ } else { DlgData->Gateway = htonl(IpAddress); } + DhcpStaticRefreshParams + ( DlgData->AdapterIndex, DlgData->IpAddress, DlgData->SubnetMask ); + + RowToRem.dwForwardMask = 0; + RowToRem.dwForwardMetric1 = 1; + RowToRem.dwForwardNextHop = DlgData->OldGateway; + + DeleteIpForwardEntry( &RowToRem ); + + RowToAdd.dwForwardMask = 0; + RowToAdd.dwForwardMetric1 = 1; + RowToAdd.dwForwardNextHop = DlgData->Gateway; + + CreateIpForwardEntry( &RowToAdd ); ASSERT(BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)); } else { DlgData->IpAddress = INADDR_NONE; DlgData->SubnetMask = INADDR_NONE; DlgData->Gateway = INADDR_NONE; + DhcpLeaseIpAddress( DlgData->AdapterIndex ); } if (BST_CHECKED == IsDlgButtonChecked(Dlg, IDC_FIXEDDNS)) { @@ -251,7 +270,8 @@ goto cleanup; } - MessageBox(NULL, TEXT("You need to reboot before the new parameters take effect."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); + // arty ... Not needed anymore ... We update the address live now + //MessageBox(NULL, TEXT("You need to reboot before the new parameters take effect."), TEXT("Reboot required"), MB_OK | MB_ICONWARNING); ret = TRUE; cleanup: Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpip… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Sat May 13 10:41:23 2006 @@ -1548,6 +1548,7 @@ ForEachInterface(IF) { if( IF->Index == *NteIndex ) { + IPRemoveInterfaceRoute( IF ); IF->Unicast.Type = IP_ADDRESS_V4; IF->Unicast.Address.IPv4Address = 0; IF->Netmask.Type = IP_ADDRESS_V4; Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.c… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c Sat May 13 10:41:23 2006 @@ -305,14 +305,19 @@ TCPDisposeInterfaceData( IF->TCPContext ); IF->TCPContext = NULL; + TI_DbgPrint(DEBUG_IP,("Removing interface Addr %s\n", A2S(&IF->Unicast))); + TI_DbgPrint(DEBUG_IP,(" Mask %s\n", A2S(&IF->Netmask))); + AddrWidenAddress(&GeneralRoute,&IF->Unicast,&IF->Netmask); + RouterRemoveRoute(&GeneralRoute, &IF->Unicast); /* Remove permanent NCE, but first we have to find it */ NCE = NBLocateNeighbor(&IF->Unicast); if (NCE) NBRemoveNeighbor(NCE); - + else + TI_DbgPrint(DEBUG_IP, ("Could not delete IF route (0x%X)\n", IF)); } VOID IPUnregisterInterface( Modified: trunk/reactos/lib/drivers/ip/network/router.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/drivers/ip/network/rout… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/router.c (original) +++ trunk/reactos/lib/drivers/ip/network/router.c Sat May 13 10:41:23 2006 @@ -18,6 +18,30 @@ LIST_ENTRY FIBListHead; KSPIN_LOCK FIBLock; +void RouterDumpRoutes() { + PLIST_ENTRY CurrentEntry; + PLIST_ENTRY NextEntry; + PFIB_ENTRY Current; + PNEIGHBOR_CACHE_ENTRY NCE; + + TI_DbgPrint(DEBUG_ROUTER,("Dumping Routes\n")); + + CurrentEntry = FIBListHead.Flink; + while (CurrentEntry != &FIBListHead) { + NextEntry = CurrentEntry->Flink; + Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); + + NCE = Current->Router; + + TI_DbgPrint(DEBUG_ROUTER,("Examining FIBE %x\n", Current)); + TI_DbgPrint(DEBUG_ROUTER,("... NetworkAddress %s\n", A2S(&Current->NetworkAddress))); + TI_DbgPrint(DEBUG_ROUTER,("... NCE->Address . %s\n", A2S(&NCE->Address))); + + CurrentEntry = NextEntry; + } + + TI_DbgPrint(DEBUG_ROUTER,("Dumping Routes ... Done\n")); +} VOID FreeFIB( PVOID Object) @@ -331,13 +355,17 @@ PNEIGHBOR_CACHE_ENTRY NCE; TI_DbgPrint(DEBUG_ROUTER, ("Called\n")); + TI_DbgPrint(DEBUG_ROUTER, ("Deleting Route From: %s\n", A2S(Router))); + TI_DbgPrint(DEBUG_ROUTER, (" To: %s\n", A2S(Target))); TcpipAcquireSpinLock(&FIBLock, &OldIrql); - CurrentEntry = FIBListHead.Flink; - while (CurrentEntry != &FIBListHead) { - NextEntry = CurrentEntry->Flink; - Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); + RouterDumpRoutes(); + + CurrentEntry = FIBListHead.Flink; + while (CurrentEntry != &FIBListHead) { + NextEntry = CurrentEntry->Flink; + Current = CONTAINING_RECORD(CurrentEntry, FIB_ENTRY, ListEntry); NCE = Current->Router; @@ -355,6 +383,8 @@ TI_DbgPrint(DEBUG_ROUTER, ("Deleting route\n")); DestroyFIBE( Current ); } + + RouterDumpRoutes(); TcpipReleaseSpinLock(&FIBLock, OldIrql);

1 0

[cwittich] 21898: display workgroup/domain name
by cwittich＠svn.reactos.org 12 May '06

12 May '06

Author: cwittich Date: Sat May 13 00:05:19 2006 New Revision: 21898 URL: http://svn.reactos.ru/svn/reactos?rev=21898&view=rev Log: display workgroup/domain name Modified: trunk/reactos/dll/cpl/sysdm/computer.c trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Modified: trunk/reactos/dll/cpl/sysdm/computer.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/computer.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/computer.c (original) +++ trunk/reactos/dll/cpl/sysdm/computer.c Sat May 13 00:05:19 2006 @@ -27,6 +27,7 @@ */ #include <windows.h> #include <stdlib.h> +#include <lm.h> #include "resource.h" #include "sysdm.h" @@ -50,7 +51,12 @@ { SendDlgItemMessage(hwndDlg,IDC_COMPUTERNAME,WM_SETTEXT,0,(LPARAM)ComputerName); } - /* FIXME: get the workgroup */ + LPWKSTA_INFO_101 wki; + if (NetWkstaGetInfo(NULL,101,(LPBYTE*)&wki) == NERR_Success) + { + SendDlgItemMessage(hwndDlg,IDC_WORKGROUPDOMAIN_NAME,WM_SETTEXT,0,(LPARAM)wki->wki101_langroup); + NetApiBufferFree(&wki); + } break; } } Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild?… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Sat May 13 00:05:19 2006 @@ -10,6 +10,7 @@ <library>kernel32</library> <library>user32</library> <library>comctl32</library> + <library>netapi32</library> <file>advanced.c</file> <file>computer.c</file> <file>environment.c</file>

1 0

[fireball] 21897: - Bug 1476: Include rosldr.h in halxbox.h
by fireball＠svn.reactos.org 12 May '06

12 May '06

Author: fireball Date: Fri May 12 23:51:50 2006 New Revision: 21897 URL: http://svn.reactos.ru/svn/reactos?rev=21897&view=rev Log: - Bug 1476: Include rosldr.h in halxbox.h Modified: trunk/reactos/hal/halx86/xbox/halxbox.h Modified: trunk/reactos/hal/halx86/xbox/halxbox.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/halx86/xbox/halxbox.h?r… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halxbox.h (original) +++ trunk/reactos/hal/halx86/xbox/halxbox.h Fri May 12 23:51:50 2006 @@ -14,6 +14,7 @@ #include <hal.h> #include <ntdddisk.h> +#include <rosldr.h> extern UCHAR XboxFont8x16[256 * 16];

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2006