Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 35900: implement StringCxxCat functions. Not all flags in StringCxxCatEx are supported yet.
by tkreuzer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: tkreuzer Date: Wed Sep 3 02:22:12 2008 New Revision: 35900 URL: http://svn.reactos.org/svn/reactos?rev=35900&view=rev Log: implement StringCxxCat functions. Not all flags in StringCxxCatEx are supported yet. Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/strsafe.h [iso-8859-1] Wed Sep 3 02:22:12 2008 @@ -8,11 +8,25 @@ #error Both STRSAFE_NO_CCH_FUNCTIONS and STRSAFE_NO_CB_FUNCTIONS are defined #endif +#ifndef SUCCEEDED +#define SUCCEEDED(Status) ((HRESULT)(Status) >= 0) +#endif #define STRSAFE_MAX_CCH 2147483647 #define STRSAFE_E_INVALID_PARAMETER ((HRESULT)0x80070057L) +#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) +#define STRSAFE_E_END_OF_FILE ((HRESULT)0x80070026L) + +#define STRSAFE_FILL_BEHIND_NULL 0x00000200 +#define STRSAFE_IGNORE_NULLS 0x00000200 +#define STRSAFE_FILL_ON_FAILURE 0x00000400 +#define STRSAFE_NULL_ON_FAILURE 0x00000800 +#define STRSAFE_NO_TRUNCATION 0x00001000 + #ifndef S_OK #define S_OK ((HRESULT)0x00000000L) #endif + +#define STRSAFE_MIN(a,b) (((a) < (b))?(a):(b)) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED @@ -75,6 +89,7 @@ #define StringCbCatEx StringCbCatExW #define StringCbCatN StringCbCatNW #define StringCbCatNEx StringCbCatNExW +#define StringCbCatWorker StringCxxCatWorkerW #define StringCbCopy StringCbCopyW #define StringCbCopyEx StringCbCopyExW #define StringCbCopyN StringCbCopyNW @@ -90,6 +105,7 @@ #define StringCchCatEx StringCchCatExW #define StringCchCatN StringCchCatNW #define StringCchCatNEx StringCchCatNExW +#define StringCchCatWorker StringCchCatWorkerW #define StringCchCopy StringCchCopyW #define StringCchCopyEx StringCchCopyExW #define StringCchCopyN StringCchCopyNW @@ -112,6 +128,7 @@ #define StringCbCatEx StringCbCatExA #define StringCbCatN StringCbCatNA #define StringCbCatNEx StringCbCatNExA +#define StringCbCatWorker StringCxxCatWorkerA #define StringCbCopy StringCbCopyA #define StringCbCopyEx StringCbCopyExA #define StringCbCopyN StringCbCopyNA @@ -127,6 +144,7 @@ #define StringCchCatEx StringCchCatExA #define StringCchCatN StringCchCatNA #define StringCchCatNEx StringCchCatNExA +#define StringCchCatWorker StringCchCatWorkerA #define StringCchCopy StringCchCopyA #define StringCchCopyEx StringCchCopyExA #define StringCchCopyN StringCchCopyNA @@ -156,6 +174,7 @@ #define StringCxxCatEx StringCbCatEx #define StringCxxCatN StringCbCatN #define StringCxxCatNEx StringCbCatNEx +#define StringCxxCatWorker StringCbCatWorker #define StringCxxCopy StringCbCopy #define StringCxxCopyEx StringCbCopyEx #define StringCxxCopyN StringCbCopyN @@ -178,6 +197,7 @@ #define StringCxxCatEx StringCchCatEx #define StringCxxCatN StringCchCatN #define StringCxxCatNEx StringCchCatNEx +#define StringCxxCatWorker StringCchCatWorker #define StringCxxCopy StringCchCopy #define StringCxxCopyEx StringCchCopyEx #define StringCxxCopyN StringCchCopyN @@ -218,24 +238,86 @@ /* Create inlined versions */ #define STRSAFEAPI HRESULT static __inline__ +STRSAFEAPI StringCxxCatWorker(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cxMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags, int UseN) +{ + HRESULT result; + STRSAFE_LPTSTR psz = pszDest; + size_t cch = STRSAFE_CXXtoCCH(cxDest); + + if (!pszDest || !pszSrc || cch > STRSAFE_MAX_CCH || cch == 0) + { + return STRSAFE_E_INVALID_PARAMETER; + } + + for (--psz; *(++psz) != 0 && --cch > 0;); + if (cch == 0) + { + return STRSAFE_E_INSUFFICIENT_BUFFER; + } + + if (UseN) + { + cch = STRSAFE_MIN(cxDest, STRSAFE_CXXtoCCH(cxMaxAppend)); + } + + for (--pszSrc, --psz; (*(++psz) = *(++pszSrc)) != 0 && --cch > 0;); + if (cch == 0) + { + result = STRSAFE_E_INSUFFICIENT_BUFFER; + } + else + result = S_OK; + + if (ppszDestEnd) + { + *ppszDestEnd = psz; + } + + if (pcbRemaining) + { + *pcbRemaining = STRSAFE_CCHtoCXX(cch); + } + + if (dwFlags & STRSAFE_FILL_BEHIND_NULL) + { + for (--psz, ++cch; --cch; *(++psz) = dwFlags & 0xff); + } + + if (!SUCCEEDED(result)) + { + if (dwFlags & STRSAFE_FILL_ON_FAILURE) + { + cch = STRSAFE_CXXtoCCH(cxDest); + for (--pszDest, ++cch; --cch; *(++pszDest) = dwFlags & 0xff); + } + + if (dwFlags & STRSAFE_NULL_ON_FAILURE) + { + *pszDest = 0; + } + } + + return result; +} + +STRSAFEAPI StringCxxCatEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +{ + return StringCxxCatWorker(pszDest, cxDest, pszSrc, 0, ppszDestEnd, pcbRemaining, dwFlags, 0); +} + STRSAFEAPI StringCxxCat(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc) { - return 0; // FIXME -} - -STRSAFEAPI StringCxxCatEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) -{ - return 0; // FIXME -} - -STRSAFEAPI StringCxxCatN(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend) -{ - return 0; // FIXME -} - -STRSAFEAPI StringCxxCatNEx(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) -{ - return 0; // FIXME + return StringCxxCatWorker(pszDest, cxDest, pszSrc, 0, NULL, NULL, 0, 0); +} + +STRSAFEAPI StringCxxCatN(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend) +{ + return StringCxxCatWorker(pszDest, cxDest, pszSrc, cbMaxAppend, NULL, NULL, 0, 1); +} + +STRSAFEAPI StringCxxCatNEx(STRSAFE_LPTSTR pszDest, size_t cxDest, STRSAFE_LPCTSTR pszSrc, size_t cbMaxAppend, STRSAFE_LPTSTR *ppszDestEnd, size_t *pcbRemaining, STRSAFE_DWORD dwFlags) +{ + return StringCxxCatWorker(pszDest, cxDest, pszSrc, cbMaxAppend, ppszDestEnd, pcbRemaining, dwFlags, 1); } STRSAFEAPI StringCxxCopy(STRSAFE_LPTSTR pszDest, size_t cbDest, STRSAFE_LPCTSTR pszSrc) @@ -331,6 +413,7 @@ #undef StringCxxCatEx #undef StringCxxCatN #undef StringCxxCatNEx +#undef StringCxxCatWorker #undef StringCxxCopy #undef StringCxxCopyEx #undef StringCxxCopyN @@ -347,6 +430,7 @@ #undef StringCbCatEx #undef StringCbCatN #undef StringCbCatNEx +#undef StringCbCatWorker #undef StringCbCopy #undef StringCbCopyEx #undef StringCbCopyN @@ -362,6 +446,7 @@ #undef StringCchCatEx #undef StringCchCatN #undef StringCchCatNEx +#undef StringCchCatWorker #undef StringCchCopy #undef StringCchCopyEx #undef StringCchCopyN

1 0

[cgutman] 35899: - Fail if PrepareARPPacket returned NULL - Fixes another possible crash
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Wed Sep 3 01:47:05 2008 New Revision: 35899 URL: http://svn.reactos.org/svn/reactos?rev=35899&view=rev Log: - Fail if PrepareARPPacket returned NULL - Fixes another possible crash Modified: branches/aicom-network-fixes/lib/drivers/ip/network/arp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/arp.c [iso-8859-1] Wed Sep 3 01:47:05 2008 @@ -149,6 +149,8 @@ NULL, /* Don't care */ &Address->Address, /* Target's (remote) protocol address */ ARP_OPCODE_REQUEST); /* ARP request */ + + if( !NdisPacket ) return FALSE; ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(PC(NdisPacket));

1 0

[cgutman] 35898: - Move the NULL check immediately after the memory is allocated
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Wed Sep 3 01:36:46 2008 New Revision: 35898 URL: http://svn.reactos.org/svn/reactos?rev=35898&view=rev Log: - Move the NULL check immediately after the memory is allocated Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/if.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Wed Sep 3 01:36:46 2008 @@ -34,9 +34,9 @@ NTSTATUS Status; POSK_IFADDR ifaddr = exAllocatePool ( NonPagedPool, sizeof(*ifaddr) + 2 * sizeof( struct sockaddr_in ) ); + if( !ifaddr ) return NULL; struct sockaddr_in *addr_in = (struct sockaddr_in *)&ifaddr[1]; struct sockaddr_in *dstaddr_in = (struct sockaddr_in *)&addr_in[1]; - if( !ifaddr ) return NULL; TI_DbgPrint(DEBUG_TCPIF,("Called\n"));

1 0

[cgutman] 35897: - Fail if we didn't successfully add the header
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Wed Sep 3 01:26:32 2008 New Revision: 35897 URL: http://svn.reactos.org/svn/reactos?rev=35897&view=rev Log: - Fail if we didn't successfully add the header Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Wed Sep 3 01:26:32 2008 @@ -143,6 +143,13 @@ break; } + if( !NT_SUCCESS(Status) ) { + TI_DbgPrint(MIN_TRACE, ("Cannot add header. Status = (0x%X)\n", + Status)); + FreeNdisPacket(Packet->NdisPacket); + return Status; + } + TI_DbgPrint(MID_TRACE, ("Copying data (hdr %x data %x (%d))\n", Packet->Header, Packet->Data, (PCHAR)Packet->Data - (PCHAR)Packet->Header));

1 0

[cgutman] 35896: - Set UDPInitialized to FALSE at the end of UDPShutdown
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Wed Sep 3 01:15:28 2008 New Revision: 35896 URL: http://svn.reactos.org/svn/reactos?rev=35896&view=rev Log: - Set UDPInitialized to FALSE at the end of UDPShutdown Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Wed Sep 3 01:15:28 2008 @@ -330,6 +330,8 @@ /* Deregister this protocol with IP layer */ IPRegisterProtocol(IPPROTO_UDP, NULL); + UDPInitialized = FALSE; + return STATUS_SUCCESS; }

1 0

[sserapion] 35895: fix amd64 build
by sserapion＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: sserapion Date: Wed Sep 3 00:35:20 2008 New Revision: 35895 URL: http://svn.reactos.org/svn/reactos?rev=35895&view=rev Log: fix amd64 build Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/tcsnlen.h Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/tcsnlen.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/tcsnlen.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/tcsnlen.h [iso-8859-1] Wed Sep 3 00:35:20 2008 @@ -4,7 +4,7 @@ #include <stddef.h> #include <tchar.h> -int _tcsnlen(const _TCHAR * str, size_t count) +size_t _tcsnlen(const _TCHAR * str, size_t count) { const _TCHAR * s;

1 0

[dreimer] 35894: Add arch specific makefile to clean process
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Wed Sep 3 00:19:42 2008 New Revision: 35894 URL: http://svn.reactos.org/svn/reactos?rev=35894&view=rev Log: Add arch specific makefile to clean process Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Wed Sep 3 00:19:42 2008 @@ -63,6 +63,9 @@ if exist "output-arm\." ( rd /s /q "output-arm" 1> NUL 2> NUL ) + if exist "makefile-arm.auto" ( + del "makefile-arm.auto" 1> NUL 2> NUL + ) echo Done cleaning ReactOS source directory. ) else ( echo ERROR: There is no compiler output to clean. @@ -82,6 +85,9 @@ ) if exist "output-i386\." ( rd /s /q "output-i386" 1> NUL 2> NUL + ) + if exist "makefile.auto" ( + del "makefile.auto" 1> NUL 2> NUL ) echo Done cleaning ReactOS source directory. ) else ( @@ -103,6 +109,9 @@ if exist "output-ppc\." ( rd /s /q "output-ppc" 1> NUL 2> NUL ) + if exist "makefile-ppc.auto" ( + del "makefile-ppc.auto" 1> NUL 2> NUL + ) echo Done cleaning ReactOS source directory. ) else ( echo ERROR: There is no compiler output to clean. @@ -122,6 +131,9 @@ ) if exist "output-amd64\." ( rd /s /q "output-amd64" 1> NUL 2> NUL + ) + if exist "makefile-amd64.auto" ( + del "makefile-amd64.auto" 1> NUL 2> NUL ) echo Done cleaning ReactOS source directory. ) else ( @@ -143,6 +155,9 @@ if exist "output-i386\." ( rd /s /q "output-i386" 1> NUL 2> NUL ) + if exist "makefile.auto" ( + del "makefile.auto" 1> NUL 2> NUL + ) echo Done cleaning ReactOS source directory. ) else ( echo ERROR: There is no compiler output to clean. @@ -152,9 +167,6 @@ if exist "reactos\." ( rd /s /q "reactos" 1> NUL 2> NUL ) -if exist "makefile.auto" ( - del "makefile.auto" 1> NUL 2> NUL -) goto :EOF

1 0

[amunger] 35893: Pass the ImagePath buffer as the command line, not the application name. After the recent changes, the ImaagePath buffer contains a properly formatted command line. This change allows you to start services with parameters listed in the ImagePath, like Abyss and MySQL.
by amunger＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: amunger Date: Tue Sep 2 23:33:51 2008 New Revision: 35893 URL: http://svn.reactos.org/svn/reactos?rev=35893&view=rev Log: Pass the ImagePath buffer as the command line, not the application name. After the recent changes, the ImaagePath buffer contains a properly formatted command line. This change allows you to start services with parameters listed in the ImagePath, like Abyss and MySQL. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Sep 2 23:33:51 2008 @@ -896,8 +896,8 @@ StartupInfo.cbReserved2 = 0; StartupInfo.lpReserved2 = 0; - Result = CreateProcessW(ImagePath.Buffer, - NULL, + Result = CreateProcessW(NULL, + ImagePath.Buffer, NULL, NULL, FALSE,

1 0

[dreimer] 35892: Fix the PREFIX Vars once more.
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Tue Sep 2 23:31:51 2008 New Revision: 35892 URL: http://svn.reactos.org/svn/reactos?rev=35892&view=rev Log: Fix the PREFIX Vars once more. Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Sep 2 23:31:51 2008 @@ -16,7 +16,7 @@ :: :: Parse the command line arguments. :: ROS_ARCH: Set to x86, x64, ppc or arm. -:: ROS_PREFIX: Default is mingw32. ppc could be mingw32-ppc, arm mingw32-arm, x64 mingw32-x86_64. +:: ROS_PREFIX: Default is mingw32. ppc could be ppc-pc-mingw32, arm arm-pc-mingw32, x64 x86_64-pc-mingw32. :: if "%1" == "" ( @@ -31,17 +31,17 @@ ) if /i "%_1%" == "arm" ( set ROS_ARCH=arm - set ROS_PREFIX=mingw32-arm + set ROS_PREFIX=arm-pc-mingw32 goto :EOC ) if /i "%_1%" == "ppc" ( set ROS_ARCH=ppc - set ROS_PREFIX=mingw32-ppc + set ROS_PREFIX=ppc-pc-mingw32 goto :EOC ) if /i "%_1%" == "amd64" ( set ROS_ARCH=amd64 - set ROS_PREFIX=mingw32-x86_64 + set ROS_PREFIX=x86_64-pc-mingw32 goto :EOC ) if not "%_1%" == "" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Sep 2 23:31:51 2008 @@ -32,15 +32,15 @@ ) if .%_ROSBE_ARCH%. == .1. ( set ROS_ARCH=arm - set ROS_PREFIX=mingw32-arm + set ROS_PREFIX=arm-pc-mingw32 ) if .%_ROSBE_ARCH%. == .2. ( set ROS_ARCH=ppc - set ROS_PREFIX=mingw32-ppc + set ROS_PREFIX=ppc-pc-mingw32 ) if .%_ROSBE_ARCH%. == .3. ( set ROS_ARCH=amd64 - set ROS_PREFIX=mingw32-x86_64 + set ROS_PREFIX=x86_64-pc-mingw32 ) if .%_ROSBE_ARCH%. == .. ( set ROS_ARCH=

1 0

[cgutman] 35891: - Merge aicom-network-fixes up to r35889
by cgutman＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cgutman Date: Tue Sep 2 21:12:35 2008 New Revision: 35891 URL: http://svn.reactos.org/svn/reactos?rev=35891&view=rev Log: - Merge aicom-network-fixes up to r35889 Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/efilter.c trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Tue Sep 2 21:12:35 2008 @@ -408,6 +408,8 @@ NDIS_DbgPrint(MAX_TRACE, ("Status (0x%X) Packet (0x%X) PoolHandle (0x%X).\n", Status, Packet, PoolHandle)); + *Packet = NULL; + if (Pool == NULL) { *Status = NDIS_STATUS_FAILURE; @@ -487,6 +489,8 @@ NDIS_DbgPrint(MAX_TRACE, ("Status (0x%X) PoolHandle (0x%X) " "NumberOfDescriptors (%d) ProtocolReservedLength (%d).\n", Status, PoolHandle, NumberOfDescriptors, ProtocolReservedLength)); + + *PoolHandle = NULL; if (NumberOfDescriptors > 0xffff) { @@ -528,8 +532,9 @@ *Status = NDIS_STATUS_SUCCESS; *PoolHandle = (PNDIS_HANDLE)Pool; - } else + } else { *Status = NDIS_STATUS_RESOURCES; + } } } @@ -705,6 +710,7 @@ * PoolHandle = Handle returned by NdisAllocatePacketPool */ { + *Status = NDIS_STATUS_FAILURE; } Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Tue Sep 2 21:12:35 2008 @@ -193,13 +193,14 @@ NDIS_DbgPrint(MAX_TRACE, ("Called\n")); + *ConfigurationHandle = NULL; + *Status = ZwDuplicateObject(NtCurrentProcess(), RootKeyHandle, NtCurrentProcess(), &KeyHandle, 0, 0, DUPLICATE_SAME_ACCESS); if(!NT_SUCCESS(*Status)) { NDIS_DbgPrint(MID_TRACE, ("Failed to open registry configuration for this miniport\n")); - *ConfigurationHandle = NULL; *Status = NDIS_STATUS_FAILURE; return; } @@ -743,7 +744,8 @@ if(!MiniportResource) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - *Status = NDIS_STATUS_FAILURE; + ExFreePool(IntArray); + *Status = NDIS_STATUS_RESOURCES; return; } @@ -797,6 +799,8 @@ NDIS_HANDLE RegKeyHandle; PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext; + *KeyHandle = NULL; + *Status = ZwEnumerateKey(ConfigurationHandle, Index, KeyBasicInformation, NULL, 0, &KeyInformationLength); if(*Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_SUCCESS) { @@ -885,6 +889,8 @@ OBJECT_ATTRIBUTES KeyAttributes; NDIS_HANDLE RegKeyHandle; + *KeyHandle = NULL; + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, 0); *Status = ZwOpenKey(&RegKeyHandle, KEY_ALL_ACCESS, &KeyAttributes); Modified: trunk/reactos/drivers/network/ndis/ndis/efilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/efilter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/efilter.c [iso-8859-1] Tue Sep 2 21:12:35 2008 @@ -44,6 +44,7 @@ *Filter = (PETH_FILTER)NewFilter; return TRUE; } + *Filter = NULL; return FALSE; } Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Tue Sep 2 21:12:35 2008 @@ -125,7 +125,7 @@ &MiniportBlock->AllocatedResources->List[0].PartialResourceList, ResourceListSize); *BufferSize = ResourceListSize; - *Status = STATUS_SUCCESS; + *Status = NDIS_STATUS_SUCCESS; } else { Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Tue Sep 2 21:12:35 2008 @@ -841,6 +841,8 @@ PNDIS_MINIPORT_BLOCK Adapter = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; ULONG AddressSpace = 1; /* FIXME The HAL handles this wrong atm */ + *PortOffset = 0; + NDIS_DbgPrint(MAX_TRACE, ("Called - InitialPort 0x%x, NumberOfPorts 0x%x\n", InitialPort, NumberOfPorts)); memset(&PortAddress, 0, sizeof(PortAddress)); @@ -878,7 +880,6 @@ NDIS_DbgPrint(MAX_TRACE, ("calling MmMapIoSpace\n")); - *PortOffset = 0; *PortOffset = MmMapIoSpace(TranslatedAddress, NumberOfPorts, MmNonCached); NDIS_DbgPrint(MAX_TRACE, ("Returning 0x%x for port range\n", *PortOffset)); 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] Tue Sep 2 21:12:35 2008 @@ -562,13 +562,6 @@ /* FIXME: Wait in pending case! */ - /* XXX is status_pending part of success macro? */ - if ((NT_SUCCESS(NdisStatus)) || (NdisStatus == NDIS_STATUS_PENDING)) - { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Miniport returned status (0x%X).\n", NdisStatus)); - return NdisStatus; - } - return NdisStatus; } @@ -1017,6 +1010,7 @@ RegistryPath = ExAllocatePool(PagedPool, sizeof(UNICODE_STRING)); if(!RegistryPath) { + ExFreePool(Miniport); NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return; } @@ -1028,6 +1022,8 @@ if(!RegistryBuffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(Miniport); + ExFreePool(RegistryPath); return; } @@ -1424,6 +1420,7 @@ { NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter.\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; return (NTSTATUS)NdisStatus; } @@ -1466,6 +1463,7 @@ Adapter->LookaheadBuffer = NULL; } ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + if (NdisStatus == NDIS_STATUS_SUCCESS) NdisStatus = NDIS_STATUS_FAILURE; return (NTSTATUS)NdisStatus; } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Tue Sep 2 21:12:35 2008 @@ -674,6 +674,8 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + *NdisProtocolHandle = NULL; + /* first validate the PROTOCOL_CHARACTERISTICS */ switch (ProtocolCharacteristics->MajorNdisVersion) {

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