Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 41801: Reverting part of r40006 that introduced a regression (Arch Blackmann HAS been committing to mingw-w64). A real fix, if this is hiding a bug elsewhere, will have to wait until a proper vendor drop of mingw-w64
by hyperion＠svn.reactos.org 08 Jul '09

08 Jul '09

Author: hyperion Date: Wed Jul 8 04:48:05 2009 New Revision: 41801 URL: http://svn.reactos.org/svn/reactos?rev=41801&view=rev Log: Reverting part of r40006 that introduced a regression (Arch Blackmann HAS been committing to mingw-w64). A real fix, if this is hiding a bug elsewhere, will have to wait until a proper vendor drop of mingw-w64 Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Wed Jul 8 04:48:05 2009 @@ -88,7 +88,7 @@ extern void _pei386_runtime_relocator (void); static long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); -static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data); +//static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data); #ifdef WPRFLAG static void duplicate_ppstrings (int ac, wchar_t ***av); #else @@ -216,7 +216,7 @@ #if defined(__i386__) || defined(_M_IX86) __writefsdword(0, 0xffffffff); #endif - AddVectoredExceptionHandler (0, (PVECTORED_EXCEPTION_HANDLER)__mingw_vex); + //AddVectoredExceptionHandler (0, (PVECTORED_EXCEPTION_HANDLER)__mingw_vex); SetUnhandledExceptionFilter (_gnu_exception_handler); _fpreset (); @@ -402,6 +402,7 @@ return action; } +#if 0 static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data) { /* TODO this is not chainablem, therefore need rewrite. Disabled the ill code. */ @@ -426,6 +427,7 @@ #endif return _gnu_exception_handler(exception_data); } +#endif #ifdef WPRFLAG

1 0

[cfinck] 444: Merge r443
by cfinck＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: cfinck Date: Tue Jul 7 23:14:16 2009 New Revision: 444 URL: http://svn.reactos.org/svn/reactos?rev=444&view=rev Log: Merge r443 Modified: branches/danny-web/www/www.reactos.org/support/ (props changed) branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php Propchange: branches/danny-web/www/www.reactos.org/support/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk/web/reactos.org/htdocs/support:288-336,343-346,443 Modified: branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php [iso-8859-1] Tue Jul 7 23:14:16 2009 @@ -36,34 +36,12 @@ function show_osversion($osvernumber) { // intern function, don't call this function directly - $tempabc = array(); - $tempd=""; + $result = mysql_query("SELECT ver_name FROM rsdb_object_osversions WHERE ver_value = '$osvernumber' LIMIT 1"); - $tempabc = str_split($osvernumber, 1); + if(!$result) + return ""; - if ($tempabc[0] != 0) { - $tempd .= $tempabc[0]; - } - if ($tempabc[1] != 0) { - $tempd .= $tempabc[1]; - } - //if ($tempabc[2] != 0) { - $tempd .= $tempabc[2]; - //} - //if ($tempabc[3] != 0) { - $tempd .= ".".$tempabc[3]; - //} - //if ($tempabc[4] != 0) { - $tempd .= ".".$tempabc[4]; - //} - if ($tempabc[5] != 0) { - $tempd .= $tempabc[5]; - } - /*else { - $tempd = "unkown"; - }*/ - - return $tempd; + return mysql_result($result, 0); } ?>

1 0

[cfinck] 443: Hey Arch, why do we have a table with all correct version numbers and then try to determine the version number from the sort key? This solution is not very elegant, but should serve us well till Danny's CompatDB rewrite is done ; -) Thanks to Javier for reporting this bug on the mailing list (http://www.reactos.org/archives/public/ros-dev/2009-July/011751.html)
by cfinck＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: cfinck Date: Tue Jul 7 23:11:40 2009 New Revision: 443 URL: http://svn.reactos.org/svn/reactos?rev=443&view=rev Log: Hey Arch, why do we have a table with all correct version numbers and then try to determine the version number from the sort key? This solution is not very elegant, but should serve us well till Danny's CompatDB rewrite is done ;-) Thanks to Javier for reporting this bug on the mailing list (http://www.reactos.org/archives/public/ros-dev/2009-July/011751.html) Modified: trunk/web/reactos.org/htdocs/support/inc/tools/osversion.php Modified: trunk/web/reactos.org/htdocs/support/inc/tools/osversion.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/support/inc… ============================================================================== --- trunk/web/reactos.org/htdocs/support/inc/tools/osversion.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/support/inc/tools/osversion.php [iso-8859-1] Tue Jul 7 23:11:40 2009 @@ -36,34 +36,12 @@ function show_osversion($osvernumber) { // intern function, don't call this function directly - $tempabc = array(); - $tempd=""; + $result = mysql_query("SELECT ver_name FROM rsdb_object_osversions WHERE ver_value = '$osvernumber' LIMIT 1"); - $tempabc = str_split($osvernumber, 1); + if(!$result) + return ""; - if ($tempabc[0] != 0) { - $tempd .= $tempabc[0]; - } - if ($tempabc[1] != 0) { - $tempd .= $tempabc[1]; - } - //if ($tempabc[2] != 0) { - $tempd .= $tempabc[2]; - //} - //if ($tempabc[3] != 0) { - $tempd .= ".".$tempabc[3]; - //} - //if ($tempabc[4] != 0) { - $tempd .= ".".$tempabc[4]; - //} - if ($tempabc[5] != 0) { - $tempd .= $tempabc[5]; - } - /*else { - $tempd = "unkown"; - }*/ - - return $tempd; + return mysql_result($result, 0); } ?>

1 0

[gschneider] 41800: AlphaBlend: - Return immediately if any bitmap size is smaller than zero - Also check calculated input bitmap size against source size - Remove outdated FIXME - Fixes three gdi32 bitmap winetests
by gschneider＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: gschneider Date: Tue Jul 7 20:58:36 2009 New Revision: 41800 URL: http://svn.reactos.org/svn/reactos?rev=41800&view=rev Log: AlphaBlend: - Return immediately if any bitmap size is smaller than zero - Also check calculated input bitmap size against source size - Remove outdated FIXME - Fixes three gdi32 bitmap winetests Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Tue Jul 7 20:58:36 2009 @@ -54,7 +54,6 @@ BlendObj->BlendFunction.BlendFlags, BlendObj->BlendFunction.SourceConstantAlpha, BlendObj->BlendFunction.AlphaFormat); - /* Validate output */ OutputRect = *DestRect; if (OutputRect.right < OutputRect.left) @@ -68,14 +67,12 @@ OutputRect.right = DestRect->left; } - /* Validate input */ - - /* FIXME when WindowOrg.x or .y are negitve this check are not vaild, - * we need convert the inputRect to the windows org and do it right */ InputRect = *SourceRect; if ( (InputRect.top < 0) || (InputRect.bottom < 0) || - (InputRect.left < 0) || (InputRect.right < 0) ) + (InputRect.left < 0) || (InputRect.right < 0) || + InputRect.right > psoSource->sizlBitmap.cx || + InputRect.bottom > psoSource->sizlBitmap.cy ) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Tue Jul 7 20:58:36 2009 @@ -48,6 +48,12 @@ XLATEOBJ *XlateObj; BLENDOBJ BlendObj; BlendObj.BlendFunction = BlendFunc; + + if (WidthDest < 0 || HeightDest < 0 || WidthSrc < 0 || HeightSrc < 0) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } DCDest = DC_LockDc(hDCDest); if (NULL == DCDest)

1 0

[gschneider] 41799: Geoffroy Couprie <geo DOT couprie AT gmail DOT com>: - Fix a printf case, where the exponent is zero - Implement exponent increment/decrement for printf in scientific notation My changes <grschneider AT gmail DOT com>: - Change some lessequal/greaterequal to equal - Exchange OR with AND operation - Modify patch identation to match current code, remove FIXME - Skipped the ecvt part of the patch (not needed, sprint has the bugs) - Fixes five msvcrt printf winetests, see bug #45
by gschneider＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: gschneider Date: Tue Jul 7 20:19:34 2009 New Revision: 41799 URL: http://svn.reactos.org/svn/reactos?rev=41799&view=rev Log: Geoffroy Couprie <geo DOT couprie AT gmail DOT com>: - Fix a printf case, where the exponent is zero - Implement exponent increment/decrement for printf in scientific notation My changes <grschneider AT gmail DOT com>: - Change some lessequal/greaterequal to equal - Exchange OR with AND operation - Modify patch identation to match current code, remove FIXME - Skipped the ecvt part of the patch (not needed, sprint has the bugs) - Fixes five msvcrt printf winetests, see bug #4584 for more information Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] Tue Jul 7 20:19:34 2009 @@ -168,7 +168,7 @@ int ro = 0; int isize; - double frac, intr; + double num2, frac, intr; double p; char c, sign, digits[66]; @@ -185,7 +185,12 @@ if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) { ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - exponent = ie/3.321928; + if (*n.__n == 0.0) + exponent = 0.0; + else + { + exponent = ie/3.321928; + } } if ( exp_sign == 'g' || exp_sign == 'G' ) @@ -201,17 +206,27 @@ if ( exp_sign == 'e' || exp_sign == 'E' ) { frac = modf(exponent,&e); - /* FIXME: this exponent over-/underflow scheme doesn't comply with the wanted behaviour - * needed at all or completely different in original? */ -#if 0 - if ( frac > 0.5 ) + if (num < 0.0) + e--; + if (frac >= 0.5) e++; - else if ( frac < -0.5 ) + else if (frac < -0.5) e--; -#endif + + num2 = num/pow(10.0L,(long double)e); + if (num2 < 1.0 && num2 > -1.0) + { + e--; + num2 = num/pow(10.0L,(long double)e); + } + else if (num2 < -10.0 && num2 > 10.0) + { + e++; + num2 = num/pow(10.0L,(long double)e); + } /* size-5 because "e+abc" is going to follow */ - buf = numberf(buf, end, num/pow(10.0L,(long double)e), 'f', size-5, precision, type); + buf = numberf(buf, end, num2, 'f', size-5, precision, type); isize = 4; while(*(buf-1) == ' ') {

1 0

[jimtabor] 41798: - Add another Vista function WindowFromPhysicalPoint to user32.
by jimtabor＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: jimtabor Date: Tue Jul 7 20:19:23 2009 New Revision: 41798 URL: http://svn.reactos.org/svn/reactos?rev=41798&view=rev Log: - Add another Vista function WindowFromPhysicalPoint to user32. Modified: trunk/reactos/dll/win32/user32/user32.pspec trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Tue Jul 7 20:19:23 2009 @@ -740,6 +740,7 @@ @ stdcall WinHelpW(long wstr long long) @ stdcall WindowFromDC(long) @ stdcall WindowFromPoint(double) +@ stdcall WindowFromPhysicalPoint(double) NtUserWindowFromPhysicalPoint @ stdcall keybd_event(long long long long) @ stdcall mouse_event(long long long long long) @ varargs wsprintfA(str str) Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Tue Jul 7 20:19:23 2009 @@ -4447,6 +4447,9 @@ DWORD WINAPI WaitForInputIdle(HANDLE,DWORD); BOOL WINAPI WaitMessage(void); HWND WINAPI WindowFromDC(HDC hDC); +#if (_WIN32_WINNT >= 0x0600) +HWND WINAPI WindowFromPhysicalPoint(POINT); +#endif HWND WINAPI WindowFromPoint(POINT); UINT WINAPI WinExec(LPCSTR,UINT); BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,ULONG_PTR); Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 7 20:19:23 2009 @@ -2814,6 +2814,11 @@ HWND NTAPI +NtUserWindowFromPhysicalPoint( + POINT Point); + +HWND +NTAPI NtUserWindowFromPoint( LONG X, LONG Y); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 7 20:19:23 2009 @@ -4663,6 +4663,16 @@ return 0; } +/* + * @unimplemented + */ +HWND APIENTRY +NtUserWindowFromPhysicalPoint(POINT Point) +{ + UNIMPLEMENTED + + return NULL; +} /* * @implemented Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Jul 7 20:19:23 2009 @@ -596,6 +596,7 @@ NtUserWaitForMsgAndEvent 1 NtUserWaitMessage 0 NtUserWin32PoolAllocationStats 6 +NtUserWindowFromPhysicalPoint 2 NtUserWindowFromPoint 2 NtUserYieldTask 0 NtUserRemoteConnect 3

1 0

[dgorbachev] 41788: "Fix" MDL PROBE FAILED! bug #4663.
by dgorbachev＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: dgorbachev Date: Mon Jul 6 22:28:11 2009 New Revision: 41788 URL: http://svn.reactos.org/svn/reactos?rev=41788&view=rev Log: "Fix" MDL PROBE FAILED! bug #4663. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Mon Jul 6 22:28:11 2009 @@ -679,6 +679,7 @@ // Oops :( // ProbeStatus = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); } _SEH2_END;

2 1

[cgutman] 41797: - Recommit r41782 now that DHCP is ready for the fix - Start the indexes at 0 (Software loopback will take index 0)
by cgutman＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: cgutman Date: Tue Jul 7 09:29:37 2009 New Revision: 41797 URL: http://svn.reactos.org/svn/reactos?rev=41797&view=rev Log: - Recommit r41782 now that DHCP is ready for the fix - Start the indexes at 0 (Software loopback will take index 0) Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/ip/network/ip.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Tue Jul 7 09:29:37 2009 @@ -883,6 +883,51 @@ NdisFreePacketPool(GlobalPacketPool); NdisFreeBufferPool(GlobalBufferPool); return Status; + } + + /* Use direct I/O */ + IPDeviceObject->Flags |= DO_DIRECT_IO; + RawIPDeviceObject->Flags |= DO_DIRECT_IO; + UDPDeviceObject->Flags |= DO_DIRECT_IO; + TCPDeviceObject->Flags |= DO_DIRECT_IO; + + /* Initialize the driver object with this driver's entry points */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = TiDispatchOpenClose; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch; + + DriverObject->DriverUnload = TiUnload; + + /* Initialize our periodic timer and its associated DPC object. When the + timer expires, the IPTimeout deferred procedure call (DPC) is queued */ + ExInitializeWorkItem( &IpWorkItem, IPTimeout, NULL ); + KeInitializeDpc(&IPTimeoutDpc, IPTimeoutDpcFn, NULL); + KeInitializeTimer(&IPTimer); + + /* Start the periodic timer with an initial and periodic + relative expiration time of IP_TIMEOUT milliseconds */ + DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; + KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); + + /* Open loopback adapter */ + Status = LoopRegisterAdapter(NULL, NULL); + if (!NT_SUCCESS(Status)) { + TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); + TCPShutdown(); + UDPShutdown(); + RawIPShutdown(); + IPShutdown(); + ChewShutdown(); + IoDeleteDevice(IPDeviceObject); + IoDeleteDevice(RawIPDeviceObject); + IoDeleteDevice(UDPDeviceObject); + IoDeleteDevice(TCPDeviceObject); + exFreePool(EntityList); + NdisFreePacketPool(GlobalPacketPool); + NdisFreeBufferPool(GlobalBufferPool); + return Status; } /* Register protocol with NDIS */ @@ -913,52 +958,6 @@ return Status; } - /* Open loopback adapter */ - Status = LoopRegisterAdapter(NULL, NULL); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - TCPShutdown(); - UDPShutdown(); - RawIPShutdown(); - IPShutdown(); - ChewShutdown(); - IoDeleteDevice(IPDeviceObject); - IoDeleteDevice(RawIPDeviceObject); - IoDeleteDevice(UDPDeviceObject); - IoDeleteDevice(TCPDeviceObject); - exFreePool(EntityList); - NdisFreePacketPool(GlobalPacketPool); - NdisFreeBufferPool(GlobalBufferPool); - LANUnregisterProtocol(); - return Status; - } - - /* Use direct I/O */ - IPDeviceObject->Flags |= DO_DIRECT_IO; - RawIPDeviceObject->Flags |= DO_DIRECT_IO; - UDPDeviceObject->Flags |= DO_DIRECT_IO; - TCPDeviceObject->Flags |= DO_DIRECT_IO; - - /* Initialize the driver object with this driver's entry points */ - DriverObject->MajorFunction[IRP_MJ_CREATE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = TiDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = TiDispatchInternal; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = TiDispatch; - - DriverObject->DriverUnload = TiUnload; - - /* Initialize our periodic timer and its associated DPC object. When the - timer expires, the IPTimeout deferred procedure call (DPC) is queued */ - ExInitializeWorkItem( &IpWorkItem, IPTimeout, NULL ); - KeInitializeDpc(&IPTimeoutDpc, IPTimeoutDpcFn, NULL); - KeInitializeTimer(&IPTimer); - - /* Start the periodic timer with an initial and periodic - relative expiration time of IP_TIMEOUT milliseconds */ - DueTime.QuadPart = -(LONGLONG)IP_TIMEOUT * 10000; - KeSetTimerEx(&IPTimer, DueTime, IP_TIMEOUT, &IPTimeoutDpc); - return STATUS_SUCCESS; } Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Tue Jul 7 09:29:37 2009 @@ -242,7 +242,7 @@ */ { KIRQL OldIrql; - UINT ChosenIndex = 1; + UINT ChosenIndex = 0; BOOLEAN IndexHasBeenChosen; IF_LIST_ITER(Interface);

1 0

[cgutman] 41796: - Remove a bad ASSERT - TCPPacketSendComplete isn't called from oskittcp
by cgutman＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: cgutman Date: Tue Jul 7 08:47:48 2009 New Revision: 41796 URL: http://svn.reactos.org/svn/reactos?rev=41796&view=rev Log: - Remove a bad ASSERT - TCPPacketSendComplete isn't called from oskittcp Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Tue Jul 7 08:47:48 2009 @@ -54,8 +54,6 @@ PNDIS_PACKET NdisPacket, NDIS_STATUS NdisStatus ) { TI_DbgPrint(DEBUG_TCP,("called %x\n", NdisPacket)); - ASSERT_LOCKED(&TCPLock); - FreeNdisPacket(NdisPacket); TI_DbgPrint(DEBUG_TCP,("done\n")); }

1 0

[cgutman] 41795: - Set Size to the size of the buffer we allocated (it previously had stack garbage in it which prevented proper buffer sizing) - Fixes a buffer overwrite - Multiple NIC support is here! (DHCP currently doesn't work for multiple NICs so a static IP address is needed for now)
by cgutman＠svn.reactos.org 07 Jul '09

07 Jul '09

Author: cgutman Date: Tue Jul 7 08:40:54 2009 New Revision: 41795 URL: http://svn.reactos.org/svn/reactos?rev=41795&view=rev Log: - Set Size to the size of the buffer we allocated (it previously had stack garbage in it which prevented proper buffer sizing) - Fixes a buffer overwrite - Multiple NIC support is here! (DHCP currently doesn't work for multiple NICs so a static IP address is needed for now) Modified: trunk/reactos/base/services/dhcp/adapter.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Tue Jul 7 08:40:54 2009 @@ -212,7 +212,7 @@ void AdapterInit() { PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE)); - DWORD Error, Size, i; + DWORD Error, Size = sizeof(MIB_IFTABLE), i; PDHCP_ADAPTER Adapter = NULL; struct interface_info *ifi = NULL;

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