Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 40913: Fix PCH rule for C++
by hyperion＠svn.reactos.org 13 May '09

13 May '09

Author: hyperion Date: Thu May 14 00:09:15 2009 New Revision: 40913 URL: http://svn.reactos.org/svn/reactos?rev=40913&view=rev Log: Fix PCH rule for C++ Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Thu May 14 00:09:15 2009 @@ -211,7 +211,7 @@ ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d: $(2) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_DEPENDS) - $${gpp} -MF ${call RBUILD_cxxflags,$(1),$(4)} -M -MP -MT $$@ $$< + $${gpp} -MF $$@ ${call RBUILD_cxxflags,$(1),$(4)} -M -MP -MT $$@ $$< -include ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d

1 0

[sedwards] 40912: next time I'll copy the changes properly
by sedwards＠svn.reactos.org 13 May '09

13 May '09

Author: sedwards Date: Thu May 14 00:03:25 2009 New Revision: 40912 URL: http://svn.reactos.org/svn/reactos?rev=40912&view=rev Log: next time I'll copy the changes properly Modified: trunk/reactos/tools/ssprintf.cpp Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?rev=409… ============================================================================== --- trunk/reactos/tools/ssprintf.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/ssprintf.cpp [iso-8859-1] Thu May 14 00:03:25 2009 @@ -46,7 +46,7 @@ #include <ieee.h> #endif -#if defined(__FreeBSD__) || defined(__APPLE__) defined(__sun__) || defined(__CYGWIN__) +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__sun__) || defined(__CYGWIN__) # define __isnan isnan # define __finite finite # define powl __builtin_powl

1 0

[sedwards] 40911: minor SunOS fix
by sedwards＠svn.reactos.org 13 May '09

13 May '09

Author: sedwards Date: Wed May 13 23:35:05 2009 New Revision: 40911 URL: http://svn.reactos.org/svn/reactos?rev=40911&view=rev Log: minor SunOS fix Modified: trunk/reactos/tools/ssprintf.cpp Modified: trunk/reactos/tools/ssprintf.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/ssprintf.cpp?rev=409… ============================================================================== --- trunk/reactos/tools/ssprintf.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/ssprintf.cpp [iso-8859-1] Wed May 13 23:35:05 2009 @@ -41,7 +41,12 @@ } #endif -#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__CYGWIN__) +#if defined(__sun__) +#include <alloca.h> +#include <ieee.h> +#endif + +#if defined(__FreeBSD__) || defined(__APPLE__) defined(__sun__) || defined(__CYGWIN__) # define __isnan isnan # define __finite finite # define powl __builtin_powl

1 0

[mjmartin] 40910: - GlobalReAlloc: SetUserValueHeap and SetUserFlagsHeap after RtlReAllocateHeap. - LocalReAlloc: Add missing SetUserFlagsHeap after RtlAllocateHeap. SetUserValueHeap and SetUserFlagsHeap after RtlReAllocateHeap.
by mjmartin＠svn.reactos.org 13 May '09

13 May '09

Author: mjmartin Date: Wed May 13 13:48:32 2009 New Revision: 40910 URL: http://svn.reactos.org/svn/reactos?rev=40910&view=rev Log: - GlobalReAlloc: SetUserValueHeap and SetUserFlagsHeap after RtlReAllocateHeap. - LocalReAlloc: Add missing SetUserFlagsHeap after RtlAllocateHeap. SetUserValueHeap and SetUserFlagsHeap after RtlReAllocateHeap. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c [iso-8859-1] Wed May 13 13:48:32 2009 @@ -547,6 +547,20 @@ /* And do the re-allocation */ Ptr = RtlReAllocateHeap(hProcessHeap, Flags, Ptr, dwBytes); + + if (Ptr) + { + /* Allocation succeeded, so save our entry */ + RtlSetUserValueHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + Ptr, + hMem); + RtlSetUserFlagsHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + Ptr, + Flags); + } + } /* Make sure we have a pointer by now */ Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Wed May 13 13:48:32 2009 @@ -354,6 +354,11 @@ HEAP_NO_SERIALIZE, Ptr, hMem); + RtlSetUserFlagsHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + Ptr, + Flags); + } } else @@ -375,6 +380,19 @@ /* And do the re-allocation */ Ptr = RtlReAllocateHeap(hProcessHeap, Flags, Ptr, dwBytes); + + if (Ptr) + { + /* Allocation succeeded, so save our entry */ + RtlSetUserValueHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + Ptr, + hMem); + RtlSetUserFlagsHeap(hProcessHeap, + HEAP_NO_SERIALIZE, + Ptr, + Flags); + } } /* Make sure we have a pointer by now */

1 0

[cgutman] 40909: - Use FindOnLinkInterface to get the interface - Return NULL if TCPContext is NULL (which means we don't have a valid IP address) - Should fix a crash when using multiple NICs but they still won't work (DHCP bug?)
by cgutman＠svn.reactos.org 13 May '09

13 May '09

Author: cgutman Date: Wed May 13 05:16:30 2009 New Revision: 40909 URL: http://svn.reactos.org/svn/reactos?rev=40909&view=rev Log: - Use FindOnLinkInterface to get the interface - Return NULL if TCPContext is NULL (which means we don't have a valid IP address) - Should fix a crash when using multiple NICs but they still won't work (DHCP bug?) Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Wed May 13 05:16:30 2009 @@ -74,7 +74,7 @@ OSK_UINT FindType, OSK_SOCKADDR *ReqAddr, OSK_IFADDR *Interface ) { - PNEIGHBOR_CACHE_ENTRY NCE; + PIP_INTERFACE IF; IP_ADDRESS Destination; struct sockaddr_in *addr_in = (struct sockaddr_in *)ReqAddr; @@ -90,23 +90,20 @@ TI_DbgPrint(DEBUG_TCPIF,("Address is %x\n", addr_in->sin_addr.s_addr)); - NCE = RouteGetRouteToDestination(&Destination); + IF = FindOnLinkInterface(&Destination); - if( !NCE || !NCE->Interface ) { - TI_DbgPrint(DEBUG_TCPIF,("no neighbor cache or no interface (%x %x)\n", - NCE, NCE ? NCE->Interface : 0)); - return NULL; + if (!IF || !IF->TCPContext) { + /* TCPContext can be NULL if we don't have an IP address yet */ + TI_DbgPrint(DEBUG_TCPIF, ("No interface or TCP context (%x) (%x)\n", + IF, IF ? IF->TCPContext : 0)); + return NULL; } - TI_DbgPrint(DEBUG_TCPIF,("NCE: %x\n", NCE)); - TI_DbgPrint(DEBUG_TCPIF,("NCE->Interface: %x\n", NCE->Interface)); - TI_DbgPrint(DEBUG_TCPIF,("NCE->Interface->TCPContext: %x\n", - NCE->Interface->TCPContext)); + addr_in = (struct sockaddr_in *) + ((POSK_IFADDR)IF->TCPContext)->ifa_addr; - addr_in = (struct sockaddr_in *) - ((POSK_IFADDR)NCE->Interface->TCPContext)->ifa_addr; TI_DbgPrint(DEBUG_TCPIF,("returning addr %x\n", addr_in->sin_addr.s_addr)); - return NCE->Interface->TCPContext; + return IF->TCPContext; }

1 0

[cgutman] 40908: - Remove some extra junk
by cgutman＠svn.reactos.org 13 May '09

13 May '09

Author: cgutman Date: Wed May 13 04:43:20 2009 New Revision: 40908 URL: http://svn.reactos.org/svn/reactos?rev=40908&view=rev Log: - Remove some extra junk Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed May 13 04:43:20 2009 @@ -15,17 +15,6 @@ #include "efilter.h" #include <buffer.h> - -#undef NdisMSendComplete -VOID -EXPORT -NdisMSendComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN PNDIS_PACKET Packet, - IN NDIS_STATUS Status); - -/* Root of the scm database */ -#define SERVICES_ROOT L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\" /* * Define to 1 to get a debugger breakpoint at the end of NdisInitializeWrapper @@ -1080,7 +1069,7 @@ } if( NdisStatus != NDIS_STATUS_PENDING ) { - NdisMSendComplete + MiniSendComplete ( Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus ); } break;

1 0

[hpoussin] 40907: Fix build
by hpoussin＠svn.reactos.org 12 May '09

12 May '09

Author: hpoussin Date: Wed May 13 02:06:41 2009 New Revision: 40907 URL: http://svn.reactos.org/svn/reactos?rev=40907&view=rev Log: Fix build Modified: trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Wed May 13 02:06:41 2009 @@ -396,7 +396,7 @@ return FALSE; } - hDC = CreateICW(L"DISPLAY", NULL, NULL, NULL); bpp 0 + hDC = CreateICW(L"DISPLAY", NULL, NULL, NULL); if (!hDC) { ERR("Failed to create information context (error %d)\n", GetLastError());

1 0

[hpoussin] 40906: No need to create a DC to get the display depth Incidentally, this partly unregresses the /CONSOLE switch if blue.sys is installed
by hpoussin＠svn.reactos.org 12 May '09

12 May '09

Author: hpoussin Date: Wed May 13 01:48:25 2009 New Revision: 40906 URL: http://svn.reactos.org/svn/reactos?rev=40906&view=rev Log: No need to create a DC to get the display depth Incidentally, this partly unregresses the /CONSOLE switch if blue.sys is installed Modified: trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Wed May 13 01:48:25 2009 @@ -396,9 +396,10 @@ return FALSE; } - hDC = GetDC(NULL); + hDC = CreateICW(L"DISPLAY", NULL, NULL, NULL); bpp 0 if (!hDC) { + ERR("Failed to create information context (error %d)\n", GetLastError()); return FALSE; }

1 0

[cgutman] 40905: - Add paint to bootcd
by cgutman＠svn.reactos.org 12 May '09

12 May '09

Author: cgutman Date: Tue May 12 23:17:49 2009 New Revision: 40905 URL: http://svn.reactos.org/svn/reactos?rev=40905&view=rev Log: - Add paint to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue May 12 23:17:49 2009 @@ -69,6 +69,7 @@ base\applications\network\tracert\tracert.exe 1 base\applications\network\whois\whois.exe 1 base\applications\notepad\notepad.exe 1 +base\applications\paint\paint.exe 1 base\applications\regedit\regedit.exe 4 base\applications\regedit\clb\clb.dll 1 base\applications\regedt32\regedt32.exe 1

1 0

[mjmartin] 40904: - Revert part of r40893. MapViewOfFile, UnmapViewOfFile and FlushViewOfFile do not SetLastError on Success. Kernel32_winetest for codepage back to 0 failures.
by mjmartin＠svn.reactos.org 12 May '09

12 May '09

Author: mjmartin Date: Tue May 12 22:58:09 2009 New Revision: 40904 URL: http://svn.reactos.org/svn/reactos?rev=40904&view=rev Log: - Revert part of r40893. MapViewOfFile, UnmapViewOfFile and FlushViewOfFile do not SetLastError on Success. Kernel32_winetest for codepage back to 0 failures. Modified: trunk/reactos/dll/win32/kernel32/mem/section.c Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] Tue May 12 22:58:09 2009 @@ -219,7 +219,6 @@ return NULL; } - SetLastError(ERROR_SUCCESS); /* Return the base */ return ViewBase; } @@ -262,7 +261,6 @@ return FALSE; } - SetLastError(ERROR_SUCCESS); /* Otherwise, return sucess */ return TRUE; } @@ -385,7 +383,6 @@ return FALSE; } - SetLastError(ERROR_SUCCESS); /* Return success */ return TRUE; }

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