Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 38310: - CCHAR is 'char', not 'const char'
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 13:24:35 2008 New Revision: 38310 URL: http://svn.reactos.org/svn/reactos?rev=38310&view=rev Log: - CCHAR is 'char', not 'const char' Modified: trunk/reactos/include/host/typedefs.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Tue Dec 23 13:24:35 2008 @@ -47,8 +47,8 @@ /* Basic types Emulate a LLP64 memory model using a LP64 compiler */ typedef void VOID, *PVOID; -typedef char CHAR, *PCHAR, *PSTR; -typedef const char CCHAR, *PCSTR, *LPCSTR; +typedef char CHAR, CCHAR, *PCHAR, *PSTR; +typedef const char *PCSTR, *LPCSTR; typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE, BOOLEAN, *PBOOLEAN; typedef short SHORT, *PSHORT; typedef unsigned short USHORT, *PUSHORT, WORD, *PWORD, *LPWORD, WCHAR, *PWCHAR, *PWSTR, *LPWSTR;

1 0

[jimtabor] 38309: - Add One Param Call GetCursorPos. This will be used when GDIPOINTER is deprecated.
by jimtabor＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: jimtabor Date: Tue Dec 23 13:04:40 2008 New Revision: 38309 URL: http://svn.reactos.org/svn/reactos?rev=38309&view=rev Log: - Add One Param Call GetCursorPos. This will be used when GDIPOINTER is deprecated. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue Dec 23 13:04:40 2008 @@ -396,9 +396,26 @@ /* FIXME: Should use UserEnterShared */ RETURN(IntEnumClipboardFormats(Param)); - case ONEPARAM_ROUTINE_CSRSS_GUICHECK: + case ONEPARAM_ROUTINE_CSRSS_GUICHECK: IntUserManualGuiCheck(Param); RETURN(TRUE); + + case ONEPARAM_ROUTINE_GETCURSORPOS: + { + BOOL Ret = TRUE; + PPOINTL pptl; + _SEH2_TRY + { + pptl = (PPOINTL)Param; + *pptl = gpsi->ptCursor; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + } + _SEH2_END; + RETURN(Ret); + } } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param);

1 0

[sginsberg] 38308: - Welcome -w. Goodbye 3rd party warnings.
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 13:00:05 2008 New Revision: 38308 URL: http://svn.reactos.org/svn/reactos?rev=38308&view=rev Log: - Welcome -w. Goodbye 3rd party warnings. Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] Tue Dec 23 13:00:05 2008 @@ -3,6 +3,7 @@ <module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="src/drivers/windows/icd/mesa.def" /> <linkerflag>-enable-stdcall-fixup</linkerflag> + <compilerflag>-w</compilerflag> <library>ntdll</library> <library>kernel32</library> <library>user32</library>

1 0

[sginsberg] 38307: - Never, ever, mix warning fixes with code logic changes. Should fix setup boot.
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 12:46:59 2008 New Revision: 38307 URL: http://svn.reactos.org/svn/reactos?rev=38307&view=rev Log: - Never, ever, mix warning fixes with code logic changes. Should fix setup boot. Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] Tue Dec 23 12:46:59 2008 @@ -429,7 +429,7 @@ { // Read Failure DebugTrace(DEBUG_TRACE_MISC, "Cache read failiure while reading in volume meta data", 0); - try_return( RC = STATUS_ACCESS_DENIED ); + try_return(); } else { Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Tue Dec 23 12:46:59 2008 @@ -255,7 +255,7 @@ DebugTrace(DEBUG_TRACE_MOUNT, "OEM[%s]", BootSector->Oem); if (BootSector->Oem[0]) { - try_return (Status = STATUS_WRONG_VOLUME); + try_return(); } // Allocating memory for reading in Super Block...

1 0

[sginsberg] 38306: - Make KS compile warning-free, add a note to janderwald (!!!)
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 12:28:07 2008 New Revision: 38306 URL: http://svn.reactos.org/svn/reactos?rev=38306&view=rev Log: - Make KS compile warning-free, add a note to janderwald (!!!) Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/worker.c Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Tue Dec 23 12:28:07 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys" allowwarnings="true"> +<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys"> <include base="ks">.</include> <include base="ks">..</include> <include base="ks">../include</include> Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c [iso-8859-1] Tue Dec 23 12:28:07 2008 @@ -62,8 +62,8 @@ IN PKSWORKER Worker) { KS_WORKER * KsWorker; - KIRQL OldIrql; - ULONG bWait = FALSE; + KIRQL OldIrql = 0; // hack!!! janderwald!!! + //ULONG bWait = FALSE; if (!Worker) return;

1 0

[sginsberg] 38305: - Forgot a comment
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 12:18:23 2008 New Revision: 38305 URL: http://svn.reactos.org/svn/reactos?rev=38305&view=rev Log: - Forgot a comment Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Tue Dec 23 12:18:23 2008 @@ -1,6 +1,7 @@ #ifndef _OSKITFREEBSD_H #define _OSKITFREEBSD_H +// Hacky? Yep #undef PAGE_SIZE #undef PAGE_SHIFT #include <ntddk.h>

1 0

[sginsberg] 38304: - Kill oskittcp warnings. Somewhat hacky? Yes indeed.
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 12:16:48 2008 New Revision: 38304 URL: http://svn.reactos.org/svn/reactos?rev=38304&view=rev Log: - Kill oskittcp warnings. Somewhat hacky? Yes indeed. Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -98,10 +98,12 @@ struct type *slh_first; /* first element */ \ } +#if 0 #define SLIST_ENTRY(type) \ struct { \ struct type *sle_next; /* next element */ \ } +#endif /* * Singly-linked List functions. Modified: trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -132,7 +132,7 @@ static __inline int bsd_log ( int blah, const char* fmt, ... ) { va_list arg; - int i; + int i = 0; va_start(arg, fmt); #ifndef __NTDRIVER__ i = vprintf ( fmt, arg ); @@ -238,10 +238,14 @@ char **envv; }; int execve __P((struct proc *, struct execve_args *, int *retval)); + +#if 0 struct fork_args { int dummy; }; int fork __P((struct proc *, struct fork_args *, int retval[])); +#endif + struct sync_args { int dummy; }; Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -1,6 +1,8 @@ #ifndef _OSKITFREEBSD_H #define _OSKITFREEBSD_H +#undef PAGE_SIZE +#undef PAGE_SHIFT #include <ntddk.h> #ifdef linux Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp.rbuild [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="oskittcp" type="staticlibrary" allowwarnings="true"> +<module name="oskittcp" type="staticlibrary"> <define name="__NTDRIVER__"/> <define name="KERNEL"/> <define name="_DISABLE_TIDENTS"/> Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -102,7 +102,7 @@ OS_DbgPrint(OSK_MID_TRACE,("Called\n")); - if( nam ) OskitDumpBuffer( nam->m_data, nam->m_len ); + if( nam ) OskitDumpBuffer((OSK_PCHAR)nam->m_data, nam->m_len ); #ifndef __REACTOS__ if (in_ifaddr == 0) { Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -35,12 +35,12 @@ void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ) { if( !OtcpEvent.TCPMalloc ) panic("no malloc"); return OtcpEvent.TCPMalloc - ( OtcpEvent.ClientData, (OSK_UINT)bytes, file, line ); + ( OtcpEvent.ClientData, (OSK_UINT)bytes, (OSK_PCHAR)file, line ); } void fbsd_free( void *data, char *file, unsigned line, ... ) { if( !OtcpEvent.TCPFree ) panic("no free"); - OtcpEvent.TCPFree( OtcpEvent.ClientData, data, file, line ); + OtcpEvent.TCPFree( OtcpEvent.ClientData, data, (OSK_PCHAR)file, line ); } void InitOskitTCP() { @@ -155,7 +155,7 @@ uio.uio_rw = UIO_READ; uio.uio_iovcnt = 1; iov.iov_len = Len; - iov.iov_base = Data; + iov.iov_base = (char *)Data; OS_DbgPrint(OSK_MID_TRACE,("Reading %d bytes from TCP:\n", Len)); @@ -260,7 +260,7 @@ struct iovec iov; iov.iov_len = Len; - iov.iov_base = Data; + iov.iov_base = (char *)Data; uio.uio_iov = &iov; uio.uio_iovcnt = 1; uio.uio_offset = 0; @@ -406,7 +406,7 @@ void OskitTCPReceiveDatagram( OSK_PCHAR Data, OSK_UINT Len, OSK_UINT IpHeaderLen ) { - struct mbuf *Ip = m_devget( Data, Len, 0, NULL, NULL ); + struct mbuf *Ip = m_devget( (char *)Data, Len, 0, NULL, NULL ); struct ip *iph; if( !Ip ) return; /* drop the segment */ Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -88,7 +88,7 @@ #endif register struct mbuf *m = m0; register int hlen = sizeof (struct ip); - int len, off, error = 0; + int len = 0, off, error = 0; /* * It might seem obvious at first glance that one could easily * make a one-behind cache out of this by simply making `iproute' @@ -108,7 +108,7 @@ */ struct route iproute; struct sockaddr_in *dst; - struct in_ifaddr *ia; + struct in_ifaddr *ia = NULL; #ifdef DIAGNOSTIC if ((m->m_flags & M_PKTHDR) == 0) @@ -380,7 +380,7 @@ m_copydata( m, 0, htons(ip->ip_len), new_m->m_data ); new_m->m_len = htons(ip->ip_len); error = OtcpEvent.PacketSend( OtcpEvent.ClientData, - new_m->m_data, new_m->m_len ); + (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m ); goto done; } @@ -520,7 +520,7 @@ m_copydata( m, 0, htons(ip->ip_len), new_m->m_data ); new_m->m_len = htons(ip->ip_len); error = OtcpEvent.PacketSend( OtcpEvent.ClientData, - new_m->m_data, new_m->m_len ); + (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m ); goto done; } Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c [iso-8859-1] Tue Dec 23 12:16:48 2008 @@ -486,7 +486,7 @@ * else do it below (after getting remote address). */ if (tp->t_state != TCPS_LISTEN) - tcp_dooptions(tp, optp, optlen, ti, &to); + tcp_dooptions(tp, (u_char *)optp, optlen, ti, &to); /* * Header prediction: check for the two common cases @@ -687,7 +687,7 @@ taop = &tao_noncached; bzero(taop, sizeof(*taop)); } - tcp_dooptions(tp, optp, optlen, ti, &to); + tcp_dooptions(tp, (u_char *)optp, optlen, ti, &to); if (iss) tp->iss = iss; else @@ -1974,7 +1974,7 @@ int offer; { register struct rtentry *rt; - struct ifnet *ifp; + struct ifnet *ifp = NULL; register int rtt, mss; u_long bufsize; struct inpcb *inp;

1 0

[hyperion] 38303: modified include/reactos/libs/pseh/pseh2.h Actually support PSEH 2 on top of native syntax
by hyperion＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: hyperion Date: Tue Dec 23 12:12:21 2008 New Revision: 38303 URL: http://svn.reactos.org/svn/reactos?rev=38303&view=rev Log: modified include/reactos/libs/pseh/pseh2.h Actually support PSEH 2 on top of native syntax Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Tue Dec 23 12:12:21 2008 @@ -23,6 +23,7 @@ #ifndef KJK_PSEH2_H_ #define KJK_PSEH2_H_ +#if defined(__GNUC__) struct _EXCEPTION_RECORD; struct _EXCEPTION_POINTERS; struct _CONTEXT; @@ -72,8 +73,6 @@ #ifdef __cplusplus } #endif - -#if defined(__GNUC__) #if defined(__i386__) typedef struct __SEHTrampoline

1 0

[sginsberg] 38302: - Silence ext2 FSD warnings. Also fix some bugs where the return status wasn't properly set. - 'allowwarnings=true' -- not anymore
by sginsberg＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: sginsberg Date: Tue Dec 23 11:43:25 2008 New Revision: 38302 URL: http://svn.reactos.org/svn/reactos?rev=38302&view=rev Log: - Silence ext2 FSD warnings. Also fix some bugs where the return status wasn't properly set. - 'allowwarnings=true' -- not anymore Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild trunk/reactos/drivers/filesystems/ext2/inc/protos.h trunk/reactos/drivers/filesystems/ext2/inc/struct.h trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c trunk/reactos/drivers/filesystems/ext2/src/cleanup.c trunk/reactos/drivers/filesystems/ext2/src/close.c trunk/reactos/drivers/filesystems/ext2/src/create.c trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c trunk/reactos/drivers/filesystems/ext2/src/ext2init.c trunk/reactos/drivers/filesystems/ext2/src/fastio.c trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c trunk/reactos/drivers/filesystems/ext2/src/flush.c trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c trunk/reactos/drivers/filesystems/ext2/src/io.c trunk/reactos/drivers/filesystems/ext2/src/metadata.c trunk/reactos/drivers/filesystems/ext2/src/misc.c trunk/reactos/drivers/filesystems/ext2/src/read.c trunk/reactos/drivers/filesystems/ext2/src/write.c Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys" allowwarnings="true"> +<module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="ext2fs">inc</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/filesystems/ext2/inc/protos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/protos.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/protos.h [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -548,7 +548,7 @@ extern BOOLEAN NTAPI Ext2FastIoUnlockAllByKey( IN PFILE_OBJECT FileObject, -PEPROCESS ProcessId, +PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); Modified: trunk/reactos/drivers/filesystems/ext2/inc/struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/i… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/inc/struct.h [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -35,6 +35,7 @@ #define except(x) if (0 && (x)) #define finally if (1) #define GetExceptionInformation() 0 +#define GetExceptionCode() 0 // we will use the LARGE_INTEGER structure as defined by NT Modified: trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/DiskIO.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -168,7 +168,7 @@ { DebugTrace(DEBUG_TRACE_MISC, " !!!! Unable to create an IRP", 0 ); Status = STATUS_INSUFFICIENT_RESOURCES; - try_return( Status ); + try_return(); } // Modified: trunk/reactos/drivers/filesystems/ext2/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/cleanup.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -140,7 +140,7 @@ { DebugTrace( DEBUG_TRACE_FILE_OBJ, "###### File Pointer 0x%LX [Cleanup]", PtrFileObject); } - try_return( RC ); + try_return(); } @@ -345,7 +345,7 @@ CompleteIrp = TRUE; } - try_return( RC ); + try_return(); try_exit: NOTHING; Modified: trunk/reactos/drivers/filesystems/ext2/src/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/close.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -142,7 +142,7 @@ { DebugTrace( DEBUG_TRACE_SPECIAL, "###### File Pointer 0x%LX [Close]", PtrFileObject); } - try_return( RC ); + try_return(); } // Get the FCB and CCB pointers @@ -400,7 +400,7 @@ DebugTrace(DEBUG_TRACE_MISC, "VCB Close Requested !!!", 0); CompleteIrp = TRUE; } - try_return( RC ); + try_return(); try_exit: NOTHING; Modified: trunk/reactos/drivers/filesystems/ext2/src/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/create.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -180,6 +180,9 @@ UNICODE_STRING AbsolutePathName; UNICODE_STRING RenameLinkTargetFileName; + /* Silence GCC warnings */ + RtlZeroMemory(&RelatedObjectName, sizeof(UNICODE_STRING)); + ASSERT(PtrIrpContext); ASSERT(PtrIrp); @@ -200,7 +203,7 @@ // Asynchronous processing required... RC = Ext2PostRequest(PtrIrpContext, PtrIrp); DeferredProcessing = TRUE; - try_return(RC); + try_return(); } // Obtaining the parameters specified by the user. @@ -259,7 +262,7 @@ if (PtrIrp->Overlay.AllocationSize.HighPart) { RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } // Getting a pointer to the supplied security context @@ -324,7 +327,7 @@ // Verify Volume... // if (!NT_SUCCESS(RC = Ext2VerifyVolume(PtrVCB))) // { - // try_return(RC); + // try_return(); // } // If the volume has been locked, fail the request @@ -333,7 +336,7 @@ { DebugTrace(DEBUG_TRACE_MISC, "Volume locked. Failing Create", 0 ); RC = STATUS_ACCESS_DENIED; - try_return(RC); + try_return(); } @@ -348,34 +351,34 @@ if ((OpenTargetDirectory) || (PtrExtAttrBuffer)) { RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } if (DirectoryOnlyRequested) { // a volume is not a directory RC = STATUS_NOT_A_DIRECTORY; - try_return(RC); + try_return(); } if ((RequestedDisposition != FILE_OPEN) && (RequestedDisposition != FILE_OPEN_IF)) { // cannot create a new volume, I'm afraid ... RC = STATUS_ACCESS_DENIED; - try_return(RC); + try_return(); } DebugTrace(DEBUG_TRACE_MISC, "Volume open requested", 0 ); RC = Ext2OpenVolume(PtrVCB, PtrIrpContext, PtrIrp, ShareAccess, PtrSecurityContext, PtrNewFileObject); ReturnedInformation = PtrIrp->IoStatus.Information; - try_return(RC); + try_return(); } if (OpenByFileId) { DebugTrace(DEBUG_TRACE_MISC, "Open by File Id requested", 0 ); RC = STATUS_ACCESS_DENIED; - try_return(RC); + try_return(); } // Relative path name specified... @@ -386,20 +389,20 @@ { // we must have a directory as the "related" object RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } // Performing validity checks... if ((RelatedObjectName.Length == 0) || (RelatedObjectName.Buffer[0] != L'\\')) { RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } if ((TargetObjectName.Length != 0) && (TargetObjectName.Buffer[0] == L'\\')) { RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } // Creating an absolute path-name. @@ -408,7 +411,7 @@ if (!(AbsolutePathName.Buffer = Ext2AllocatePool(PagedPool, AbsolutePathName.MaximumLength ))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } RtlZeroMemory(AbsolutePathName.Buffer, AbsolutePathName.MaximumLength); @@ -429,14 +432,14 @@ if (TargetObjectName.Buffer[0] != L'\\') { RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } { AbsolutePathName.MaximumLength = TargetObjectName.Length; if (!(AbsolutePathName.Buffer = Ext2AllocatePool(PagedPool, AbsolutePathName.MaximumLength ))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } RtlZeroMemory(AbsolutePathName.Buffer, AbsolutePathName.MaximumLength); @@ -456,12 +459,12 @@ (RequestedDisposition == FILE_OVERWRITE_IF)) { RC = STATUS_FILE_IS_A_DIRECTORY; - try_return(RC); + try_return(); } RC = Ext2OpenRootDirectory(PtrVCB, PtrIrpContext, PtrIrp, ShareAccess, PtrSecurityContext, PtrNewFileObject); DebugTrace(DEBUG_TRACE_MISC, " === Root directory opened", 0 ); - try_return(RC); + try_return(); } @@ -562,7 +565,7 @@ // Can have only a directory in the middle of the path... // RC = STATUS_OBJECT_PATH_NOT_FOUND; - try_return( RC ); + try_return(); } } else // searching on the disk... @@ -600,7 +603,7 @@ if( !CurrInodeNo ) { RC = STATUS_OBJECT_PATH_NOT_FOUND; - try_return( RC ); + try_return(); } // Set the allocation size for the object is specified //IoSetShareAccess(DesiredAccess, ShareAccess, PtrNewFileObject, &(PtrNewFCB->FCBShareAccess)); @@ -647,7 +650,7 @@ else { RC = STATUS_OBJECT_PATH_NOT_FOUND; - try_return( RC ); + try_return(); } } @@ -660,7 +663,7 @@ // Can have only a directory in the middle of the path... // RC = STATUS_OBJECT_PATH_NOT_FOUND; - try_return( RC ); + try_return(); } PtrCurrFileObject = NULL; @@ -681,7 +684,7 @@ { ReturnedInformation = FILE_EXISTS; RC = STATUS_OBJECT_NAME_COLLISION; - try_return(RC); + try_return(); } // Is this the type of file I was looking for? @@ -692,18 +695,18 @@ // Deny access! // Cannot open a special file... RC = STATUS_ACCESS_DENIED; - try_return( RC ); + try_return(); } if( DirectoryOnlyRequested && Type != EXT2_FT_DIR ) { RC = STATUS_NOT_A_DIRECTORY; - try_return( RC ); + try_return(); } if( FileOnlyRequested && Type == EXT2_FT_DIR ) { RC = STATUS_FILE_IS_A_DIRECTORY; - try_return(RC); + try_return(); } PtrCurrFileObject = PtrNewFileObject; @@ -733,7 +736,7 @@ PtrObjectName ) ) ) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } if( Type == EXT2_FT_DIR ) @@ -781,7 +784,7 @@ (RequestedDisposition == FILE_OVERWRITE) || (RequestedDisposition == FILE_OVERWRITE_IF ))) { RC = STATUS_FILE_IS_A_DIRECTORY; - try_return(RC); + try_return(); } @@ -798,7 +801,7 @@ &(PtrNewFCB->FCBShareAccess), TRUE))) { // Ext2CloseCCB(PtrNewCCB); - try_return(RC); + try_return(); } } else @@ -1008,7 +1011,7 @@ if (!(PtrCCB = Ext2AllocateCCB())) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } // initialize the CCB Modified: trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/dircntrl.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -429,7 +429,7 @@ { // Read Failure DebugTrace(DEBUG_TRACE_MISC, "Cache read failiure while reading in volume meta data", 0); - try_return( STATUS_ACCESS_DENIED ); + try_return( RC = STATUS_ACCESS_DENIED ); } else { @@ -694,11 +694,11 @@ case FileFullDirectoryInformation: // FullDirInformation-> DebugTrace(DEBUG_TRACE_DIRINFO, " === FileFullDirectoryInformation - Not handled", 0 ); - try_return( RC ); + try_return(); case FileNamesInformation: // NamesInformation-> DebugTrace(DEBUG_TRACE_DIRINFO, " === FileNamesInformation - Not handled", 0 ); - try_return( RC ); + try_return(); default: DebugTrace(DEBUG_TRACE_DIRINFO, " === Invalid Dir Info class - Not handled", 0 ); try_return( RC = STATUS_INVALID_INFO_CLASS ); @@ -719,7 +719,7 @@ RC = STATUS_NO_SUCH_FILE; else RC = STATUS_NO_MORE_FILES; - try_return( RC ); + try_return(); } else if( BytesReturned ) { Modified: trunk/reactos/drivers/filesystems/ext2/src/ext2init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/ext2init.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -85,7 +85,7 @@ // in your commercial driver implementation, it would be // advisable for your driver to print an appropriate error // message to the system error log before leaving - // try_return(RC); + // try_return(); // } // we should have the registry data (if any), allocate zone memory ... @@ -98,7 +98,7 @@ if (!NT_SUCCESS(RC = Ext2InitializeZones())) { // we failed, print a message and leave ... - try_return(RC); + try_return(); } #endif @@ -143,7 +143,7 @@ &(Ext2GlobalData.Ext2DeviceObject)))) { // failed to create a device object, leave ... - try_return(RC); + try_return(); } Modified: trunk/reactos/drivers/filesystems/ext2/src/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fastio.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -593,7 +593,7 @@ *************************************************************************/ BOOLEAN NTAPI Ext2FastIoUnlockAllByKey( IN PFILE_OBJECT FileObject, -PEPROCESS ProcessId, +PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) Modified: trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fileinfo.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -144,7 +144,7 @@ { // This is not allowed. Caller must use get/set volume information instead. RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } // ASSERT(PtrFCB->NodeIdentifier.NodeType == EXT2_NODE_TYPE_FCB); @@ -205,14 +205,14 @@ DebugTrace(DEBUG_TRACE_FILEINFO, "FileNetworkOpenInformation requested for %S", PtrFCB->FCBName->ObjectName.Buffer ); RC = Ext2GetNetworkOpenInformation(PtrFCB, (PFILE_NETWORK_OPEN_INFORMATION)PtrSystemBuffer, &BufferLength); // RC = STATUS_INVALID_PARAMETER; - // try_return(RC); + // try_return(); break; #endif // _WIN32_WINNT >= 0x0400 case FileInternalInformation: DebugTrace(DEBUG_TRACE_FILEINFO, "FileInternalInformation requested for %S", PtrFCB->FCBName->ObjectName.Buffer ); // RC = Ext2GetInternalInformation(...); RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); break; case FileEaInformation: DebugTrace(DEBUG_TRACE_FILEINFO, "FileEaInformation requested for %S", PtrFCB->FCBName->ObjectName.Buffer ); @@ -246,7 +246,7 @@ // RC = Ext2GetFileStreamInformation(...); RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); break; case FileAllInformation: @@ -274,11 +274,11 @@ if (!NT_SUCCESS(RC = Ext2GetBasicInformation(PtrFCB, (PFILE_BASIC_INFORMATION)&(PtrAllInfo->BasicInformation), &BufferLength))) { - try_return(RC); + try_return(); } if (!NT_SUCCESS(RC = Ext2GetStandardInformation(PtrFCB, &(PtrAllInfo->StandardInformation), &BufferLength))) { - try_return(RC); + try_return(); } // Similarly, get all of the others ... } @@ -291,19 +291,19 @@ case FileAlternateNameInformation: DebugTrace(DEBUG_TRACE_FILEINFO, "FileAlternateNameInformation requested for %S", PtrFCB->FCBName->ObjectName.Buffer ); RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); // RC = Ext2GetAltNameInformation(...); break; case FileCompressionInformation: DebugTrace(DEBUG_TRACE_FILEINFO, "FileCompressionInformation requested for %S", PtrFCB->FCBName->ObjectName.Buffer ); RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); // RC = Ext2GetCompressionInformation(...); break; default: RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } // If we completed successfully, the return the amount of information transferred. @@ -409,7 +409,7 @@ DebugTrace(DEBUG_TRACE_FILEINFO, "Attempt to set FileEndOfFileInformation for %S", PtrFCB->FCBName->ObjectName.Buffer ); // RC = Ext2SetEOF(...); RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); break; case FilePositionInformation: @@ -449,7 +449,7 @@ case FileLinkInformation: DebugTrace(DEBUG_TRACE_FILEINFO, "Attempt to set FileLinkInformation for %S", PtrFCB->FCBName->ObjectName.Buffer ); RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); // When you implement your rename/link routine, be careful to // check the following two arguments: // TargetFileObject = PtrIoStackLocation->Parameters.SetFile.FileObject; @@ -484,7 +484,7 @@ default: DebugTrace(DEBUG_TRACE_FILEINFO, "Unrecoganised SetFileInformation code for %S", PtrFCB->FCBName->ObjectName.Buffer ); RC = STATUS_INVALID_PARAMETER; - try_return(RC); + try_return(); } } @@ -934,7 +934,7 @@ // "un-delete" the file. Ext2ClearFlag(PtrFCB->FCBFlags, EXT2_FCB_DELETE_ON_CLOSE); PtrFileObject->DeletePending = FALSE; - try_return(RC); + try_return(); } // Do some checking to see if the file can even be deleted. @@ -942,7 +942,7 @@ if (PtrFCB->FCBFlags & EXT2_FCB_DELETE_ON_CLOSE) { // All done! - try_return(RC); + try_return(); } if (PtrFCB->FCBFlags & EXT2_FCB_READ_ONLY) Modified: trunk/reactos/drivers/filesystems/ext2/src/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/flush.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -138,7 +138,7 @@ // If we cannot wait, post the request immediately since a flush is inherently blocking/synchronous. if (!CanWait) { PostRequest = TRUE; - try_return(RC); + try_return(); } // Check the type of object passed-in. That will determine the course of @@ -160,7 +160,7 @@ Ext2FlushLogicalVolume(PtrIrpContext, PtrIrp, PtrVCB); - try_return(RC); + try_return(); } if (!(PtrFCB->FCBFlags & EXT2_FCB_DIRECTORY)) Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -221,8 +221,6 @@ PEXT2_GROUP_DESCRIPTOR PtrGroupDescriptor = NULL; - PEXT2_INODE PtrInode = NULL; - // Inititalising variables PtrVPB = IrpSp->Parameters.MountVolume.Vpb; @@ -257,7 +255,7 @@ DebugTrace(DEBUG_TRACE_MOUNT, "OEM[%s]", BootSector->Oem); if (BootSector->Oem[0]) { - try_return (STATUS_WRONG_VOLUME); + try_return (Status = STATUS_WRONG_VOLUME); } // Allocating memory for reading in Super Block... @@ -299,7 +297,7 @@ (PDEVICE_OBJECT *)&PtrVolumeDeviceObject)) // The Volume Device Object ) { - try_return( Status ); + try_return(); } // @@ -444,7 +442,7 @@ PtrRootFileObject = IoCreateStreamFileObject(NULL, TargetDeviceObject ); if( !PtrRootFileObject ) { - try_return( Status ); + try_return(); } // // Associate the file stream with the Volume parameter block... @@ -473,7 +471,7 @@ PtrVCB, PtrObjectName ) ) ) { - try_return( Status ); + try_return(); } Modified: trunk/reactos/drivers/filesystems/ext2/src/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/io.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -76,7 +76,7 @@ if ( !PtrSyncEvent ) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return ( RC ); + try_return(); } KeInitializeEvent( PtrSyncEvent, SynchronizationEvent, FALSE ); } @@ -87,7 +87,7 @@ if ( !PtrIoContext ) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return ( RC ); + try_return(); } RtlZeroMemory( PtrIoContext, sizeof(EXT2_IO_CONTEXT) ); @@ -198,13 +198,13 @@ KeWaitForSingleObject( PtrSyncEvent, Executive, KernelMode, FALSE, (PLARGE_INTEGER)NULL ); DbgPrint("DEADLY WAIT DONE\n"); - try_return ( RC ); + try_return(); } else { // Asynchronous IO... RC = STATUS_PENDING; - try_return ( RC ); + try_return(); } try_exit: NOTHING; @@ -259,7 +259,7 @@ if ( !PtrSyncEvent ) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return ( RC ); + try_return(); } KeInitializeEvent( PtrSyncEvent, SynchronizationEvent, FALSE ); } @@ -271,7 +271,7 @@ if ( !PtrIoContext ) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return ( RC ); + try_return(); } RtlZeroMemory( PtrIoContext, sizeof(EXT2_IO_CONTEXT) ); Modified: trunk/reactos/drivers/filesystems/ext2/src/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/metadata.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -83,7 +83,7 @@ DebugTrace(DEBUG_TRACE_MISC, "&&&&&& Invalid Inode no. Group no %d - too big", GroupNo ); DebugTrace(DEBUG_TRACE_MISC, "Only %d groups available on disk", PtrVcb->NoOfGroups ); RC = STATUS_UNSUCCESSFUL; - try_return( RC ); + try_return(); } //if( PtrVcb->InodeTableBlock[ GroupNo ] == 0 ) @@ -91,7 +91,7 @@ { DebugTrace(DEBUG_TRACE_MISC, "&&&&&& Inode Table Group Invalid - Group no %d ", GroupNo ); RC = STATUS_UNSUCCESSFUL; - try_return( RC ); + try_return(); } // Inode numbers start at 1 and not from 0 @@ -135,7 +135,7 @@ (PVOID*)&PtrPinnedReadBuffer )) { RC = STATUS_UNSUCCESSFUL; - try_return( RC ); + try_return(); } else { @@ -736,14 +736,14 @@ DebugTrace(DEBUG_TRACE_MISC, "&&&&&& Invalid Inode no. Group no %d - too big", GroupNo ); DebugTrace(DEBUG_TRACE_MISC, "Only %d groups available on disk", PtrVcb->NoOfGroups ); RC = STATUS_UNSUCCESSFUL; - try_return( RC ); + try_return(); } if( PtrVcb->PtrGroupDescriptors[ GroupNo ].InodeTablesBlock == 0 ) { DebugTrace(DEBUG_TRACE_MISC, "&&&&&& Inode Table Group Invalid - Group no %d ", GroupNo ); RC = STATUS_UNSUCCESSFUL; - try_return( RC ); + try_return(); } Index = ( InodeNo - 1 ) - ( GroupNo * PtrVcb->InodesPerGroup ); @@ -781,7 +781,7 @@ (PVOID*)&PtrPinnedBuffer ) ) { RC = STATUS_UNSUCCESSFUL; - try_return( RC ); + try_return(); } else { Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -92,27 +92,27 @@ // allocate memory for each of the zones and initialize the zones ... if (!(Ext2GlobalData.ObjectNameZone = Ext2AllocatePool(NonPagedPool, SizeOfObjectNameZone ))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } if (!(Ext2GlobalData.CCBZone = Ext2AllocatePool(NonPagedPool, SizeOfCCBZone ))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } if (!(Ext2GlobalData.FCBZone = Ext2AllocatePool(NonPagedPool, SizeOfFCBZone ))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } if (!(Ext2GlobalData.ByteLockZone = Ext2AllocatePool(NonPagedPool, SizeOfByteLockZone ))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } if (!(Ext2GlobalData.IrpContextZone = Ext2AllocatePool(NonPagedPool, SizeOfIrpContextZone ))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } // initialize each of the zone headers ... @@ -120,7 +120,7 @@ Ext2QuadAlign(sizeof(Ext2ObjectName)), Ext2GlobalData.ObjectNameZone, SizeOfObjectNameZone))) { // failed the initialization, leave ... - try_return(RC); + try_return(); } if (!NT_SUCCESS(RC = ExInitializeZone(&(Ext2GlobalData.CCBZoneHeader), @@ -128,7 +128,7 @@ Ext2GlobalData.CCBZone, SizeOfCCBZone))) { // failed the initialization, leave ... - try_return(RC); + try_return(); } if (!NT_SUCCESS(RC = ExInitializeZone(&(Ext2GlobalData.FCBZoneHeader), @@ -136,7 +136,7 @@ Ext2GlobalData.FCBZone, SizeOfFCBZone))) { // failed the initialization, leave ... - try_return(RC); + try_return(); } if (!NT_SUCCESS(RC = ExInitializeZone(&(Ext2GlobalData.ByteLockZoneHeader), @@ -144,7 +144,7 @@ Ext2GlobalData.ByteLockZone, SizeOfByteLockZone))) { // failed the initialization, leave ... - try_return(RC); + try_return(); } if (!NT_SUCCESS(RC = ExInitializeZone(&(Ext2GlobalData.IrpContextZoneHeader), @@ -152,7 +152,7 @@ Ext2GlobalData.IrpContextZone, SizeOfIrpContextZone))) { // failed the initialization, leave ... - try_return(RC); + try_return(); } try_exit: NOTHING; Modified: trunk/reactos/drivers/filesystems/ext2/src/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/read.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -255,7 +255,7 @@ if (ReadLength == 0) { // a 0 byte read can be immediately succeeded - try_return(RC); + try_return(); } // Is this a read of the volume itself ? @@ -320,7 +320,7 @@ { RC = STATUS_END_OF_FILE; NumberBytesRead = 0; - try_return( RC ); + try_return(); } } if( PagingIo || NonBufferedIo ) @@ -332,7 +332,7 @@ PtrIrpContext, PtrIrp, PtrVCB, ByteOffset, ReadLength, SynchronousIo); - try_return(RC); + try_return(); } else { @@ -357,7 +357,7 @@ RC = STATUS_UNSUCCESSFUL; NumberBytesRead = 0; - try_return( RC ); + try_return(); } else { @@ -367,7 +367,7 @@ PtrBCB = NULL; RC = STATUS_SUCCESS; NumberBytesRead = ReadLength; - try_return(RC); + try_return(); } } @@ -400,7 +400,7 @@ if ( ( PtrFCB->FCBFlags & EXT2_FCB_DIRECTORY ) && !PagingIo ) { RC = STATUS_INVALID_DEVICE_REQUEST; - try_return(RC); + try_return(); } PtrReqdFCB = &(PtrFCB->NTRequiredFCB); @@ -448,7 +448,7 @@ // If the flush failed, return error to the caller if (!NT_SUCCESS(RC = PtrIrp->IoStatus.Status)) { - try_return(RC); + try_return(); } } } @@ -573,7 +573,7 @@ NumberBytesRead = PtrIrp->IoStatus.Information; RC = PtrIrp->IoStatus.Status; - try_return(RC); + try_return(); } // This is a regular run-of-the-mill cached I/O request. Let the @@ -593,13 +593,13 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); } // We have the data RC = PtrIrp->IoStatus.Status; NumberBytesRead = PtrIrp->IoStatus.Information; - try_return(RC); + try_return(); } else // NonBuffered or Paged IO { @@ -693,7 +693,7 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); DebugTrace(DEBUG_TRACE_ASYNC, "Cache read failiure while reading in volume meta data - Retrying", 0); } } @@ -732,7 +732,7 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); DebugTrace(DEBUG_TRACE_ASYNC, "Cache read failiure while reading in volume meta data - Retrying", 0); } @@ -839,7 +839,7 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); DebugTrace(DEBUG_TRACE_ASYNC, "Cache read failiure while reading in volume meta data - Retrying", 0); } @@ -1146,7 +1146,7 @@ { CompleteIrp = FALSE; } - try_return( RC ); + try_return(); } try_exit: NOTHING; @@ -1374,7 +1374,7 @@ if (!(PtrMdl = IoAllocateMdl(PtrIrp->UserBuffer, Length, FALSE, FALSE, PtrIrp))) { RC = STATUS_INSUFFICIENT_RESOURCES; - try_return(RC); + try_return(); } // Probe and lock the pages described by the MDL Modified: trunk/reactos/drivers/filesystems/ext2/src/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/write.c [iso-8859-1] Tue Dec 23 11:43:25 2008 @@ -241,7 +241,7 @@ if (WriteLength == 0) { // a 0 byte write can be immediately succeeded - try_return(RC); + try_return(); } // Is this a write of the volume itself ? @@ -310,14 +310,14 @@ // RC = STATUS_END_OF_FILE; NumberBytesWritten = 0; - try_return( RC ); + try_return(); } } // Lock the callers buffer if (!NT_SUCCESS(RC = Ext2LockCallersBuffer(PtrIrp, TRUE, WriteLength))) { - try_return(RC); + try_return(); } // Forward the request to the lower level driver @@ -337,7 +337,7 @@ PtrIrpContext, PtrIrp, PtrVCB, ByteOffset, WriteLength, SynchronousIo ); - try_return(RC); + try_return(); } else { @@ -375,7 +375,7 @@ // Go ahead and complete the IRP... } - try_return(RC); + try_return(); } @@ -433,7 +433,7 @@ // Nope... User initiated directory writes are not allowed! // Fail this request... RC = STATUS_INVALID_DEVICE_REQUEST; - try_return(RC); + try_return(); } } @@ -496,7 +496,7 @@ // If the flush failed, return error to the caller if (!NT_SUCCESS(RC = PtrIrp->IoStatus.Status)) { - try_return(RC); + try_return(); } // Attempt the purge and ignore the return code @@ -555,7 +555,7 @@ // Page request for writing outside the file... // No op this IRP by completing it... // - try_return(RC); + try_return(); } if( ByteOffset.QuadPart + WriteLength > PtrReqdFCB->CommonFCBHeader.AllocationSize.QuadPart ) @@ -688,7 +688,7 @@ NumberBytesWritten = PtrIrp->IoStatus.Information; RC = PtrIrp->IoStatus.Status; - try_return(RC); + try_return(); } // This is a regular run-of-the-mill cached I/O request. Let the @@ -781,7 +781,7 @@ Ext2DeallocateUnicodeString( &ErrorMessage ); RC = STATUS_INSUFFICIENT_RESOURCES; - try_return ( RC ); + try_return(); } if( ( ByteOffset.QuadPart + WriteLength ) > DirectBlockSize && @@ -813,7 +813,7 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); DebugTrace(DEBUG_TRACE_ASYNC, "Cache read failiure while reading in volume meta data", 0); } } @@ -852,7 +852,7 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); DebugTrace(DEBUG_TRACE_ASYNC, "Cache read failiure while reading in volume meta data - Retrying", 0); } @@ -944,7 +944,7 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); DebugTrace(DEBUG_TRACE_ASYNC, "Cache read failiure while reading in volume meta data - Retrying", 0); } @@ -1055,7 +1055,7 @@ // Mark Irp Pending ... IoMarkIrpPending( PtrIrp ); RC = STATUS_PENDING; - try_return(RC); + try_return(); DebugTrace(DEBUG_TRACE_ASYNC, "Cache read failiure while reading in volume meta data - Retrying", 0); } @@ -1324,7 +1324,7 @@ { CompleteIrp = FALSE; } - try_return( RC ); + try_return(); } try_exit: NOTHING;

1 0

[fireball] 38301: - Get back to using deprecated functions (because of linux...). - Disable warning 4996.
by fireball＠svn.reactos.org 23 Dec '08

23 Dec '08

Author: fireball Date: Tue Dec 23 08:35:23 2008 New Revision: 38301 URL: http://svn.reactos.org/svn/reactos?rev=38301&view=rev Log: - Get back to using deprecated functions (because of linux...). - Disable warning 4996. Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/backend.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/pch.h trunk/reactos/tools/rbuild/rbuild.vcproj trunk/reactos/tools/rbuild/testsupportcode.cpp Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -60,7 +60,7 @@ if ( !f ) throw FileNotFoundException ( filename ); - if ( fstat ( _fileno ( f ), &statbuf ) != 0 ) + if ( fstat ( fileno ( f ), &statbuf ) != 0 ) { fclose ( f ); throw AccessDeniedException ( filename ); Modified: trunk/reactos/tools/rbuild/backend/backend.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/backe… ============================================================================== --- trunk/reactos/tools/rbuild/backend/backend.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/backend.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -32,7 +32,7 @@ Backend::Factory::Factory ( const std::string& name_, const std::string& description_ ) { string name(name_); - _strlwr ( &name[0] ); + strlwr ( &name[0] ); if ( !ref++ ) factories = new map<string,Factory*>; (*factories)[name] = this; @@ -55,7 +55,7 @@ Configuration& configuration ) { string sname ( name ); - _strlwr ( &sname[0] ); + strlwr ( &sname[0] ); if ( !factories || !factories->size () ) throw InvalidOperationException ( __FILE__, __LINE__, Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -268,7 +268,7 @@ string::size_type pos = file.find_last_of (sSep); if ( pos != string::npos ) file.erase ( 0, pos+1 ); - if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) file = ReplaceExtension ( file, ".res" ); else file = ReplaceExtension ( file, ".obj" ); @@ -429,7 +429,7 @@ string fullpath = files[i]->file.relative_path + sSep + files[i]->file.name; string file = string(".") + &fullpath[cbproj_path.size()]; - if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); else source_files.push_back ( file ); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -621,7 +621,7 @@ if ( !f ) throw FileNotFoundException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) ); - if ( fstat ( _fileno ( f ), &statbuf ) != 0 ) + if ( fstat ( fileno ( f ), &statbuf ) != 0 ) { fclose ( f ); throw AccessDeniedException ( NormalizeFilename ( xmlbuildfile.topIncludeFilename ) ); @@ -1064,7 +1064,7 @@ { usePipe = (exitcode == 0); fclose ( f ); - _unlink ( pipe_detectionObjectFilename.c_str () ); + unlink ( pipe_detectionObjectFilename.c_str () ); } else usePipe = false; @@ -1097,7 +1097,7 @@ { use_pch = true; fclose ( f ); - _unlink ( path.c_str () ); + unlink ( path.c_str () ); } else use_pch = false; Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -63,7 +63,7 @@ GetTargetMacro ( const Module& module, bool with_dollar ) { string s ( module.name ); - _strupr ( &s[0] ); + strupr ( &s[0] ); s += "_TARGET"; if ( with_dollar ) return ssprintf ( "$(%s)", s.c_str() ); @@ -2399,13 +2399,13 @@ const char * crtAttr = module.CRT.c_str (); const char * crtLib = NULL; - if ( _stricmp ( crtAttr, "libc" ) == 0 ) + if ( stricmp ( crtAttr, "libc" ) == 0 ) crtLib = "crt"; - else if ( _stricmp ( crtAttr, "msvcrt" ) == 0 ) + else if ( stricmp ( crtAttr, "msvcrt" ) == 0 ) crtLib = "msvcrt"; - else if ( _stricmp ( crtAttr, "libcntpr" ) == 0 ) + else if ( stricmp ( crtAttr, "libcntpr" ) == 0 ) crtLib = "libcntpr"; - else if ( _stricmp ( crtAttr, "ntdll" ) == 0 ) + else if ( stricmp ( crtAttr, "ntdll" ) == 0 ) crtLib = "ntdll"; if ( crtLib ) Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -21,6 +21,7 @@ */ #ifdef _MSC_VER #pragma warning ( disable : 4786 ) +#pragma warning ( disable : 4996 ) #endif//_MSC_VER #include <iostream> @@ -340,7 +341,7 @@ string::size_type pos = file.find_last_of (DEF_SSEP); if ( pos != string::npos ) file.erase ( 0, pos+1 ); - if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) file = ReplaceExtension ( file, ".res" ); else file = ReplaceExtension ( file, ".obj" ); Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -108,11 +108,11 @@ string file = path + std::string("\\") + files[i]->file.name; source_files.push_back ( file ); - if ( !_stricmp ( Right(file,2).c_str(), ".c" ) ) + if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) c_srcs.push_back ( file ); - if ( !_stricmp ( Right(file,2).c_str(), ".h" ) ) + if ( !stricmp ( Right(file,2).c_str(), ".h" ) ) header_files.push_back ( file ); - if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); } const vector<Include*>& incs = data.includes; Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -159,9 +159,9 @@ module.output->relative_path ); string file = path + std::string("\\") + files[i]->file.name; - if ( !_stricmp ( Right(file,3).c_str(), ".rc" ) ) + if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); - else if ( !_stricmp ( Right(file,2).c_str(), ".h" ) ) + else if ( !stricmp ( Right(file,2).c_str(), ".h" ) ) header_files.push_back ( file ); else source_files.push_back ( file ); Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -88,7 +88,7 @@ { const File& file = *files[i]; string fileExtension = GetExtension ( file.file ); - if ( !_stricmp ( fileExtension.c_str (), extension.c_str () ) ) + if ( !stricmp ( fileExtension.c_str (), extension.c_str () ) ) return true; } return false; Modified: trunk/reactos/tools/rbuild/directory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/directory.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/directory.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/directory.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -26,7 +26,7 @@ #endif//_MSC_VER #ifdef WIN32 -#define MKDIR(s) _mkdir(s) +#define MKDIR(s) mkdir(s) #else #define MKDIR(s) mkdir(s, 0755) #endif Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -238,9 +238,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !_stricmp ( p, "true" ) || !_stricmp ( p, "yes" ) ) + if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) return true; - else if ( !_stricmp ( p, "false" ) || !_stricmp ( p, "no" ) ) + else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) return false; else { @@ -358,26 +358,26 @@ { CRT = att->value; - if ( _stricmp ( CRT.c_str (), "auto" ) == 0 ) + if ( stricmp ( CRT.c_str (), "auto" ) == 0 ) CRT = GetDefaultModuleCRT (); } else CRT = GetDefaultModuleCRT (); const char * crtAttr = CRT.c_str (); - if ( crtAttr == NULL || _stricmp ( crtAttr, "none" ) == 0 ) + if ( crtAttr == NULL || stricmp ( crtAttr, "none" ) == 0 ) dynamicCRT = false; - else if ( _stricmp ( crtAttr, "libc" ) == 0 ) + else if ( stricmp ( crtAttr, "libc" ) == 0 ) dynamicCRT = false; - else if ( _stricmp ( crtAttr, "msvcrt" ) == 0 ) + else if ( stricmp ( crtAttr, "msvcrt" ) == 0 ) dynamicCRT = true; - else if ( _stricmp ( crtAttr, "libcntpr" ) == 0 ) + else if ( stricmp ( crtAttr, "libcntpr" ) == 0 ) dynamicCRT = false; - else if ( _stricmp ( crtAttr, "ntdll" ) == 0 ) + else if ( stricmp ( crtAttr, "ntdll" ) == 0 ) dynamicCRT = true; - else if ( _stricmp ( crtAttr, "static" ) == 0 ) + else if ( stricmp ( crtAttr, "static" ) == 0 ) dynamicCRT = false; - else if ( _stricmp ( crtAttr, "dll" ) == 0 ) + else if ( stricmp ( crtAttr, "dll" ) == 0 ) dynamicCRT = true; else { @@ -609,9 +609,9 @@ const XMLAttribute* att = e.GetAttribute ( "first", false ); if ( att != NULL ) { - if ( !_stricmp ( att->value.c_str(), "true" ) ) + if ( !stricmp ( att->value.c_str(), "true" ) ) first = true; - else if ( _stricmp ( att->value.c_str(), "false" ) ) + else if ( stricmp ( att->value.c_str(), "false" ) ) { throw XMLInvalidBuildFileException ( e.location, @@ -626,11 +626,11 @@ { // check for c++ file string ext = GetExtension ( e.value ); - if ( !_stricmp ( ext.c_str(), ".cpp" ) ) + if ( !stricmp ( ext.c_str(), ".cpp" ) ) cplusplus = true; - else if ( !_stricmp ( ext.c_str(), ".cc" ) ) + else if ( !stricmp ( ext.c_str(), ".cc" ) ) cplusplus = true; - else if ( !_stricmp ( ext.c_str(), ".cxx" ) ) + else if ( !stricmp ( ext.c_str(), ".cxx" ) ) cplusplus = true; } File* pFile = new File ( directory, @@ -1857,9 +1857,9 @@ if ( att != NULL ) { const char* p = att->value.c_str(); - if ( !_stricmp ( p, "true" ) || !_stricmp ( p, "yes" ) ) + if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) ) isInternal = true; - else if ( !_stricmp ( p, "false" ) || !_stricmp ( p, "no" ) ) + else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) ) isInternal = false; else { Modified: trunk/reactos/tools/rbuild/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/pch.h?rev=383… ============================================================================== --- trunk/reactos/tools/rbuild/pch.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/pch.h [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -20,6 +20,7 @@ #ifdef _MSC_VER #pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information +#pragma warning ( disable : 4996 ) // CRT deprecate #endif//_MSC_VER #include <string> Modified: trunk/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.vcproj [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS;_CRT_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="1" DefaultCharIsUnsigned="true" Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/testsupportco… ============================================================================== --- trunk/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp [iso-8859-1] Tue Dec 23 08:35:23 2008 @@ -293,7 +293,7 @@ bool TestSupportCode::IsTestFile ( string& filename ) const { - if ( _stricmp ( GetFilename ( filename ).c_str (), "setup.c" ) == 0 ) + if ( stricmp ( GetFilename ( filename ).c_str (), "setup.c" ) == 0 ) return false; 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