ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
May 2005
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
26 participants
814 discussions
Start a n
N
ew thread
[navaraf] 15650: Fix ASSERT conditions.
by navaraf@svn.reactos.com
Fix ASSERT conditions. Modified: trunk/reactos/drivers/usb/usbport/usbport.c _____ Modified: trunk/reactos/drivers/usb/usbport/usbport.c --- trunk/reactos/drivers/usb/usbport/usbport.c 2005-05-29 01:04:44 UTC (rev 15649) +++ trunk/reactos/drivers/usb/usbport/usbport.c 2005-05-29 07:29:59 UTC (rev 15650) @@ -48,7 +48,7 @@ PUSB_CONTROLLER_INTERFACE Interface) { DPRINT1("USBPORT_RegisterUSBPortDriver\n"); -// ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); return STATUS_SUCCESS; } @@ -65,8 +65,8 @@ USBPORT_AllocateUsbControllerInterface(OUT PUSB_CONTROLLER_INTERFACE *pControllerInterface) { DPRINT1("USBPORT_AllocateUsbControllerInterface\n"); -// ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); -// ASSERT(0 != ControllerObject); + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); + ASSERT(0 != pControllerInterface); *pControllerInterface = (PUSB_CONTROLLER_INTERFACE)ExAllocatePoolWithTag(PagedPool, sizeof(USB_CONTROLLER_INTERFACE),USB_CONTROLLER_INTERFACE_TAG); RtlZeroMemory(*pControllerInterface, sizeof(USB_CONTROLLER_INTERFACE)); @@ -78,7 +78,7 @@ USBPORT_FreeUsbControllerInterface(IN PUSB_CONTROLLER_INTERFACE ControllerInterface) { DPRINT1("USBPORT_FreeUsbControllerInterface\n"); -// ASSERT(KeGetCurrentIRQL() < DISPATCH_LEVEL); + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); ExFreePool(ControllerInterface);
19 years, 6 months
1
0
0
0
[greatlrd] 15649: remove some ros-tempöate from old building system
by greatlrd@svn.reactos.com
remove some ros-tempöate from old building system Deleted: trunk/reactos/lib/comdlg32/Makefile.ros-template Deleted: trunk/reactos/lib/dbghelp/Makefile.ros-template Deleted: trunk/reactos/lib/devenum/Makefile.ros-template Deleted: trunk/reactos/lib/dinput/Makefile.ros-template Deleted: trunk/reactos/lib/dinput8/Makefile.ros-template Deleted: trunk/reactos/lib/dxdiagn/Makefile.ros-template Deleted: trunk/reactos/lib/midimap/Makefile.ros-template Deleted: trunk/reactos/lib/mpr/Makefile.ros-template _____ Deleted: trunk/reactos/lib/comdlg32/Makefile.ros-template --- trunk/reactos/lib/comdlg32/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/comdlg32/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,20 +0,0 @@ - -TARGET_NAME = comdlg32 - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@ - -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a winspool.a - -TARGET_BASE = $(TARGET_BASE_LIB_COMDLG32) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/dbghelp/Makefile.ros-template --- trunk/reactos/lib/dbghelp/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/dbghelp/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,21 +0,0 @@ -# $Id$ - -TARGET_NAME = dbghelp - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a pseh.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/devenum/Makefile.ros-template --- trunk/reactos/lib/devenum/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/devenum/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,29 +0,0 @@ -# $Id$ - -TARGET_NAME = devenum - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -DNONAMLESSUNION -D__REACTOS__ - -TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a dxguid.a strmiids.a - - -TARGET_BASE = $(TARGET_BASE_LIB_DEVENUM) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -authors.c: -ifeq ($(HOST),mingw32-linux) - echo 'const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 };' > authors.c -else - echo const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 }; > authors.c -endif - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/dinput/Makefile.ros-template --- trunk/reactos/lib/dinput/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/dinput/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,30 +0,0 @@ -# $Id: Makefile.ros-template 12238 2004-12-20 00:53:54Z greatlrd $ - -TARGET_NAME = dinput - -TARGET_BASE = $(TARGET_BASE_LIB_DINPUT) - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a winmm.a dxguid.a - - - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -authors.c: -ifeq ($(HOST),mingw32-linux) - echo 'const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 };' > authors.c -else - echo const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 }; > authors.c -endif - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/dinput8/Makefile.ros-template --- trunk/reactos/lib/dinput8/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/dinput8/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,30 +0,0 @@ -# $Id: Makefile.ros-template 12241 2004-12-20 00:57:38Z greatlrd $ - -TARGET_NAME = dinput8 - -TARGET_BASE = $(TARGET_BASE_LIB_DINPUT8) - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a winmm.a dxguid.a - - - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -authors.c: -ifeq ($(HOST),mingw32-linux) - echo 'const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 };' > authors.c -else - echo const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 }; > authors.c -endif - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/dxdiagn/Makefile.ros-template --- trunk/reactos/lib/dxdiagn/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/dxdiagn/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,31 +0,0 @@ -# $Id$ - -TARGET_NAME = dxdiagn - -TARGET_BASE = $(TARGET_BASE_LIB_DXDIAGN) - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -DNONAMLESSUNION -D__REACTOS__ -Wno-error - -TARGET_SDKLIBS = wine.a @IMPORTS@ ole32.a wine_uuid.a ntdll.a dxguid.a strmiids.a - - -TARGET_BASE = $(TARGET_BASE_LIB_DSOUND) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -authors.c: -ifeq ($(HOST),mingw32-linux) - echo 'const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 };' > authors.c -else - echo const char * const SHELL_Authors[] = { "WINE team", "ReactOS team", 0 }; > authors.c -endif - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/midimap/Makefile.ros-template --- trunk/reactos/lib/midimap/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/midimap/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,23 +0,0 @@ -# $Id$ - -TARGET_NAME = midimap - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_LIB_BASE_MIDIMAP) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -TARGET_EXTENSION = .dll - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Deleted: trunk/reactos/lib/mpr/Makefile.ros-template --- trunk/reactos/lib/mpr/Makefile.ros-template 2005-05-29 00:04:41 UTC (rev 15648) +++ trunk/reactos/lib/mpr/Makefile.ros-template 2005-05-29 01:04:44 UTC (rev 15649) @@ -1,17 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = mpr - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ kernel32.a wine.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_MPR) - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk
19 years, 7 months
1
0
0
0
[weiden] 15648: fix gcc4 warnings
by weiden@svn.reactos.com
fix gcc4 warnings Modified: trunk/reactos/apps/utils/net/ftp/domacro.c Modified: trunk/reactos/apps/utils/net/ftp/fake.c Modified: trunk/reactos/apps/utils/net/ftp/fake.h Modified: trunk/reactos/apps/utils/net/ftp/ftp.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.xml Modified: trunk/reactos/apps/utils/net/ftp/ftp_var.h Modified: trunk/reactos/apps/utils/net/ftp/main.c Modified: trunk/reactos/apps/utils/net/ftp/prototypes.h Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c _____ Modified: trunk/reactos/apps/utils/net/ftp/domacro.c --- trunk/reactos/apps/utils/net/ftp/domacro.c 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/domacro.c 2005-05-29 00:04:41 UTC (rev 15648) @@ -36,9 +36,8 @@ register char *cp1, *cp2; int count = 2, loopflg = 0; char line2[200]; - extern char **glob(), *globerr; + extern char **glob(); struct cmd *getcmd(), *c; - extern struct cmd cmdtab[]; if (argc < 2) { (void) strcat(line, " "); _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.c --- trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-05-29 00:04:41 UTC (rev 15648) @@ -1,6 +1,7 @@ #include <stdio.h> #include <time.h> #include <winsock.h> +#include "fake.h" #include "prototypes.h" #define MAX_ASCII 100 @@ -305,12 +306,7 @@ #define EPOCHFILETIME (116444736000000000LL) #endif -struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -__inline int gettimeofday(struct timeval *tv, struct timezone *tz) +int gettimeofday(struct timeval *tv, struct timezone *tz) { FILETIME ft; LARGE_INTEGER li; _____ Modified: trunk/reactos/apps/utils/net/ftp/fake.h --- trunk/reactos/apps/utils/net/ftp/fake.h 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/fake.h 2005-05-29 00:04:41 UTC (rev 15648) @@ -8,3 +8,10 @@ #define strcasecmp strcmp #define strncasecmp strnicmp + +struct timezone { + int tz_minuteswest; /* minutes W of Greenwich */ + int tz_dsttime; /* type of dst correction */ +}; + +int gettimeofday(struct timeval *tv, struct timezone *tz); _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-05-29 00:04:41 UTC (rev 15648) @@ -320,6 +320,7 @@ #include <ctype.h> +int getreply(expecteof) int expecteof; { @@ -371,7 +372,7 @@ if (c != '\r' && (verbose > 0 || (verbose > -1 && n == '5' && dig > 4))) { if (proxflag && - (dig == 1 || dig == 5 && verbose == 0)) + ((dig == 1 || dig == 5) && verbose == 0)) printf("%s:",hostname); (void) putchar(c); (void) fflush(stdout); @@ -400,7 +401,7 @@ if (cp < &reply_string[sizeof(reply_string) - 1]) *cp++ = c; } - if (verbose > 0 || verbose > -1 && n == '5') { + if (verbose > 0 || (verbose > -1 && n == '5')) { (void) putchar(c); (void) fflush (stdout); } @@ -421,6 +422,7 @@ } } +int empty(mask, sec) struct fd_set *mask; int sec; @@ -995,7 +997,7 @@ } break2: if (bare_lfs) { - printf("WARNING! %d bare linefeeds received in ASCII mode\n"); + printf("WARNING! %d bare linefeeds received in ASCII mode\n", bare_lfs); printf("File may not have transferred correctly.\n"); (void) fflush(stdout); } @@ -1134,6 +1136,7 @@ */ int sendport = -1; +int initconn() { register char *p, *a; _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.xml --- trunk/reactos/apps/utils/net/ftp/ftp.xml 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/ftp.xml 2005-05-29 00:04:41 UTC (rev 15648) @@ -1,6 +1,7 @@ <module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true"> <include base="ftp">.</include> <define name="__USE_W32API" /> + <define name="lint" /> <library>kernel32</library> <library>ws2_32</library> <library>iphlpapi</library> _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp_var.h --- trunk/reactos/apps/utils/net/ftp/ftp_var.h 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/ftp_var.h 2005-05-29 00:04:41 UTC (rev 15648) @@ -1,5 +1,5 @@ +#include <winsock.h> #include "fake.h" -#include <winsock.h> #include <setjmp.h> //typedef void (*Sig_t)(int); _____ Modified: trunk/reactos/apps/utils/net/ftp/main.c --- trunk/reactos/apps/utils/net/ftp/main.c 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/main.c 2005-05-29 00:04:41 UTC (rev 15648) @@ -127,7 +127,6 @@ { register char *cp; int top; - struct passwd *pw = NULL; #if 0 char homedir[MAXPATHLEN]; #endif @@ -369,7 +368,7 @@ longest = 0; nmatches = 0; found = 0; - for (c = cmdtab; p = c->c_name; c++) { + for (c = cmdtab; (p = c->c_name); c++) { for (q = name; *q == *p++; q++) if (*q == 0) /* exact match? */ return (c); @@ -403,7 +402,7 @@ stringbase = line; /* scan from first of buffer */ argbase = argbuf; /* store from first of buffer */ slrflag = 0; - while (*argp++ = slurpstring()) + while ((*argp++ = slurpstring())) margc++; } _____ Modified: trunk/reactos/apps/utils/net/ftp/prototypes.h --- trunk/reactos/apps/utils/net/ftp/prototypes.h 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/prototypes.h 2005-05-29 00:04:41 UTC (rev 15648) @@ -28,5 +28,4 @@ int confirm(char *cmd, char *file); void blkfree(char **av0); int getit(int argc, char *argv[], int restartit, char *mode); -static int token(void); int sleep(int time); _____ Modified: trunk/reactos/apps/utils/net/ftp/ruserpass.c --- trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-05-28 23:38:58 UTC (rev 15647) +++ trunk/reactos/apps/utils/net/ftp/ruserpass.c 2005-05-29 00:04:41 UTC (rev 15648) @@ -53,17 +53,18 @@ char *tokstr; int tval; } toktab[]= { - "default", DEFAULT, - "login", LOGIN, - "password", PASSWD, - "passwd", PASSWD, - "account", ACCOUNT, - "machine", MACH, - "macdef", MACDEF, - 0, 0 + {"default", DEFAULT}, + {"login", LOGIN}, + {"password", PASSWD}, + {"passwd", PASSWD}, + {"account", ACCOUNT}, + {"machine", MACH}, + {"macdef", MACDEF}, + {0, 0} }; extern char *hostname; +static int token(void); int ruserpass(char *host, char **aname, char **apass, char **aacct) { @@ -125,7 +126,7 @@ while ((t = token()) && t != MACH && t != DEFAULT) switch(t) { case LOGIN: - if (token()) + if (token()) { if (*aname == 0) { *aname = malloc((unsigned) strlen(tokval) + 1); (void) strcpy(*aname, tokval); @@ -133,6 +134,7 @@ if (strcmp(*aname, tokval)) goto next; } + } break; case PASSWD: if (strcmp(*aname, "anonymous") && @@ -164,7 +166,7 @@ (void) fclose(cfile); return(0); } - while ((c=getc(cfile)) != EOF && c == ' ' || c == '\t'); + while ((c=getc(cfile)) != EOF && (c == ' ' || c == '\t')); if (c == EOF || c == '\n') { printf("Missing macdef name argument.\n"); goto bad;
19 years, 7 months
1
0
0
0
[greatlrd] 15647: this two file are not need any longer
by greatlrd@svn.reactos.com
this two file are not need any longer Deleted: trunk/reactos/lib/comctl32/Makefile.in Deleted: trunk/reactos/lib/comctl32/Makefile.ros-template _____ Deleted: trunk/reactos/lib/comctl32/Makefile.in --- trunk/reactos/lib/comctl32/Makefile.in 2005-05-28 23:34:24 UTC (rev 15646) +++ trunk/reactos/lib/comctl32/Makefile.in 2005-05-28 23:38:58 UTC (rev 15647) @@ -1,65 +0,0 @@ -EXTRADEFS = -D_COMCTL32_ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = comctl32.dll -IMPORTLIB = libcomctl32.$(IMPLIBEXT) -IMPORTS = user32 gdi32 advapi32 kernel32 -DELAYIMPORTS = winmm -EXTRALIBS = $(LIBUNICODE) - -C_SRCS = \ - animate.c \ - comboex.c \ - comctl32undoc.c \ - commctrl.c \ - datetime.c \ - draglist.c \ - flatsb.c \ - header.c \ - hotkey.c \ - imagelist.c \ - ipaddress.c \ - listview.c \ - monthcal.c \ - nativefont.c \ - pager.c \ - progress.c \ - propsheet.c \ - rebar.c \ - smoothscroll.c \ - string.c \ - status.c \ - syslink.c \ - tab.c \ - toolbar.c \ - tooltips.c \ - trackbar.c \ - treeview.c \ - updown.c - -RC_SRCS = rsrc.rc -RC_BINSRC = rsrc.rc -RC_BINARIES = \ - idb_hist_large.bmp \ - idb_hist_small.bmp \ - idb_std_large.bmp \ - idb_std_small.bmp \ - idb_view_large.bmp \ - idb_view_small.bmp \ - idc_copy.cur \ - idc_divider.cur \ - idc_divideropen.cur \ - idc_movebutton.cur \ - idi_dragarrow.ico \ - idi_tt_error_sm.ico \ - idi_tt_info_sm.ico \ - idi_tt_warn_sm.ico \ - idt_check.bmp - -SUBDIRS = tests - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Deleted: trunk/reactos/lib/comctl32/Makefile.ros-template --- trunk/reactos/lib/comctl32/Makefile.ros-template 2005-05-28 23:34:24 UTC (rev 15646) +++ trunk/reactos/lib/comctl32/Makefile.ros-template 2005-05-28 23:38:58 UTC (rev 15647) @@ -1,21 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = comctl32 - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk
19 years, 7 months
1
0
0
0
[greatlrd] 15646: Remove two file that are not need any longer
by greatlrd@svn.reactos.com
Remove two file that are not need any longer fix some compilings warings Deleted: trunk/reactos/lib/cabinet/Makefile.in Deleted: trunk/reactos/lib/cabinet/Makefile.ros-template Modified: trunk/reactos/lib/cabinet/cabextract.c Modified: trunk/reactos/lib/cabinet/cabinet_main.c _____ Deleted: trunk/reactos/lib/cabinet/Makefile.in --- trunk/reactos/lib/cabinet/Makefile.in 2005-05-28 23:26:37 UTC (rev 15645) +++ trunk/reactos/lib/cabinet/Makefile.in 2005-05-28 23:34:24 UTC (rev 15646) @@ -1,19 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = cabinet.dll -IMPORTLIB = libcabinet.$(IMPLIBEXT) -IMPORTS = kernel32 - -C_SRCS = \ - cabextract.c \ - cabinet_main.c \ - fci.c \ - fdi.c - -RC_SRCS = cabinet.rc - -@MAKE_DLL_RULES@ - -### Dependencies: _____ Deleted: trunk/reactos/lib/cabinet/Makefile.ros-template --- trunk/reactos/lib/cabinet/Makefile.ros-template 2005-05-28 23:26:37 UTC (rev 15645) +++ trunk/reactos/lib/cabinet/Makefile.ros-template 2005-05-28 23:34:24 UTC (rev 15646) @@ -1,21 +0,0 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = cabinet - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a - -TARGET_BASE = $(TARGET_BASE_LIB_CABINET) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk _____ Modified: trunk/reactos/lib/cabinet/cabextract.c --- trunk/reactos/lib/cabinet/cabextract.c 2005-05-28 23:26:37 UTC (rev 15645) +++ trunk/reactos/lib/cabinet/cabextract.c 2005-05-28 23:34:24 UTC (rev 15646) @@ -2523,9 +2523,13 @@ * print_fileinfo (internal) */ void print_fileinfo(struct cab_file *fi) { - int d = fi->date, t = fi->time; + int d; + int t; char *fname = NULL; + d = fi->date; + t = fi->time; + if (fi->attribs & cffile_A_NAME_IS_UTF) { fname = malloc(strlen(fi->filename) + 1); if (fname) { _____ Modified: trunk/reactos/lib/cabinet/cabinet_main.c --- trunk/reactos/lib/cabinet/cabinet_main.c 2005-05-28 23:26:37 UTC (rev 15645) +++ trunk/reactos/lib/cabinet/cabinet_main.c 2005-05-28 23:34:24 UTC (rev 15646) @@ -94,9 +94,10 @@ #define DUMPH(idx) idx >= sizeof(EXTRACTdest) ? 0x55 : ptr[idx] LPSTR dir; - unsigned char *ptr = (unsigned char*) dest; + unsigned char *ptr; unsigned int i; + ptr = ((unsigned char*) dest); TRACE("(dest == %0lx, what == %s)\n", (long) dest, debugstr_a(what)); if (!dest) {
19 years, 7 months
1
0
0
0
[ion] 15645: disable assert until someone fixes this
by ion@svn.reactos.com
disable assert until someone fixes this Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-05-28 23:16:12 UTC (rev 15644) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-05-28 23:26:37 UTC (rev 15645) @@ -7111,8 +7111,6 @@ _InvokeOnCancel) \ { \ PIO_STACK_LOCATION _IrpSp; \ - ASSERT(_InvokeOnSuccess || _InvokeOnError || _InvokeOnCancel ? \ - _CompletionRoutine != NULL : TRUE); \ _IrpSp = IoGetNextIrpStackLocation(_Irp); \ _IrpSp->CompletionRoutine = (PIO_COMPLETION_ROUTINE)(_CompletionRoutine); \ _IrpSp->Context = (_Context); \
19 years, 7 months
1
0
0
0
[greatlrd] 15644: mising desk.rc in the xml files
by greatlrd@svn.reactos.com
mising desk.rc in the xml files de.rc and cz.rc a resuse id was change Modified: trunk/reactos/lib/cpl/desk/cz.rc Modified: trunk/reactos/lib/cpl/desk/de.rc Modified: trunk/reactos/lib/cpl/desk/desk.xml _____ Modified: trunk/reactos/lib/cpl/desk/cz.rc --- trunk/reactos/lib/cpl/desk/cz.rc 2005-05-28 23:06:49 UTC (rev 15643) +++ trunk/reactos/lib/cpl/desk/cz.rc 2005-05-28 23:16:12 UTC (rev 15644) @@ -98,7 +98,7 @@ IDS_COLOR_4BIT "16 barev" IDS_COLOR_8BIT "256 barev" IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_32BIT "True Color (24 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu bod¨" END _____ Modified: trunk/reactos/lib/cpl/desk/de.rc --- trunk/reactos/lib/cpl/desk/de.rc 2005-05-28 23:06:49 UTC (rev 15643) +++ trunk/reactos/lib/cpl/desk/de.rc 2005-05-28 23:16:12 UTC (rev 15644) @@ -74,7 +74,7 @@ IDS_COLOR_4BIT "16 Farben" IDS_COLOR_8BIT "256 Farben" IDS_COLOR_16BIT "High Color (16 Bit)" - IDS_COLOR_32BIT "True Color (24 Bit)" + IDS_COLOR_24BIT "True Color (24 Bit)" IDS_COLOR_32BIT "True Color (32 Bit)" IDS_PIXEL "%lux%lu Pixel" END _____ Modified: trunk/reactos/lib/cpl/desk/desk.xml --- trunk/reactos/lib/cpl/desk/desk.xml 2005-05-28 23:06:49 UTC (rev 15643) +++ trunk/reactos/lib/cpl/desk/desk.xml 2005-05-28 23:16:12 UTC (rev 15644) @@ -13,10 +13,12 @@ <library>gdi32</library> <library>comctl32</library> <library>comdlg32</library> - <file>desk.c</file> + <file>desk.c</file> <file>background.c</file> <file>screensaver.c</file> <file>appearance.c</file> <file>settings.c</file> - <file>dibitmap.c</file> + <file>dibitmap.c</file> + <file>desk.rc</file> + </module>
19 years, 7 months
1
0
0
0
[ion] 15643: More fixes from yours truly
by ion@svn.reactos.com
More fixes from yours truly Modified: trunk/reactos/lib/wininet/version.rc _____ Modified: trunk/reactos/lib/wininet/version.rc --- trunk/reactos/lib/wininet/version.rc 2005-05-28 22:56:14 UTC (rev 15642) +++ trunk/reactos/lib/wininet/version.rc 2005-05-28 23:06:49 UTC (rev 15643) @@ -26,3 +26,4 @@ #define WINE_PRODUCTVERSION_STR "5.0" #include "wine/wine_common_ver.rc" +
19 years, 7 months
1
0
0
0
[ion] 15642: more build fixes
by ion@svn.reactos.com
more build fixes Modified: trunk/reactos/lib/midimap/midimap.xml Modified: trunk/reactos/lib/mpr/mpr.xml Modified: trunk/reactos/lib/netapi32/netapi32.xml _____ Modified: trunk/reactos/lib/midimap/midimap.xml --- trunk/reactos/lib/midimap/midimap.xml 2005-05-28 22:48:33 UTC (rev 15641) +++ trunk/reactos/lib/midimap/midimap.xml 2005-05-28 22:56:14 UTC (rev 15642) @@ -1,4 +1,4 @@ -<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll"> +<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" warnings="true"> <importlibrary definition="midimap.spec.def" /> <include base="midimap">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/mpr/mpr.xml --- trunk/reactos/lib/mpr/mpr.xml 2005-05-28 22:48:33 UTC (rev 15641) +++ trunk/reactos/lib/mpr/mpr.xml 2005-05-28 22:56:14 UTC (rev 15642) @@ -1,4 +1,4 @@ -<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll"> +<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}" installbase="system32" installname="mpr.dll" warnings="true"> <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/netapi32/netapi32.xml --- trunk/reactos/lib/netapi32/netapi32.xml 2005-05-28 22:48:33 UTC (rev 15641) +++ trunk/reactos/lib/netapi32/netapi32.xml 2005-05-28 22:56:14 UTC (rev 15642) @@ -1,4 +1,4 @@ -<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll"> +<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" warnings="true"> <importlibrary definition="netapi32.spec.def" /> <include base="netapi32">.</include> <include base="ReactOS">include/wine</include>
19 years, 7 months
1
0
0
0
[ion] 15641: more build fixes
by ion@svn.reactos.com
more build fixes Modified: trunk/reactos/lib/glu32/glu32.xml Modified: trunk/reactos/lib/imagehlp/imagehlp.xml Modified: trunk/reactos/lib/mesa32/mesa32.xml Modified: trunk/reactos/lib/msgina/makefile Modified: trunk/reactos/lib/setupapi/makefile Modified: trunk/reactos/lib/smlib/makefile Modified: trunk/reactos/lib/version/version.xml _____ Modified: trunk/reactos/lib/glu32/glu32.xml --- trunk/reactos/lib/glu32/glu32.xml 2005-05-28 22:40:04 UTC (rev 15640) +++ trunk/reactos/lib/glu32/glu32.xml 2005-05-28 22:48:33 UTC (rev 15641) @@ -1,4 +1,4 @@ -<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll"> +<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" warnings="true"> <importlibrary definition="glu32.def" /> <include base="glu32">include</include> <include base="glu32">libnurbs/internals</include> _____ Modified: trunk/reactos/lib/imagehlp/imagehlp.xml --- trunk/reactos/lib/imagehlp/imagehlp.xml 2005-05-28 22:40:04 UTC (rev 15640) +++ trunk/reactos/lib/imagehlp/imagehlp.xml 2005-05-28 22:48:33 UTC (rev 15641) @@ -1,4 +1,4 @@ -<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll"> +<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}" installbase="system32" installname="imagehlp.dll" warnings="true"> <importlibrary definition="imagehlp.def" /> <include base="imagehlp">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/mesa32/mesa32.xml --- trunk/reactos/lib/mesa32/mesa32.xml 2005-05-28 22:40:04 UTC (rev 15640) +++ trunk/reactos/lib/mesa32/mesa32.xml 2005-05-28 22:48:33 UTC (rev 15641) @@ -1,4 +1,4 @@ -<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll"> +<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" warnings="true"> <importlibrary definition="mesa32.def" /> <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> <include base="mesa32">include</include> _____ Modified: trunk/reactos/lib/msgina/makefile --- trunk/reactos/lib/msgina/makefile 2005-05-28 22:40:04 UTC (rev 15640) +++ trunk/reactos/lib/msgina/makefile 2005-05-28 22:48:33 UTC (rev 15641) @@ -1,5 +1,5 @@ # This file is automatically generated. -TOP = ..\.. +TOP = ../.. DEFAULT = msgina include $(TOP)/proxy.mak _____ Modified: trunk/reactos/lib/setupapi/makefile --- trunk/reactos/lib/setupapi/makefile 2005-05-28 22:40:04 UTC (rev 15640) +++ trunk/reactos/lib/setupapi/makefile 2005-05-28 22:48:33 UTC (rev 15641) @@ -1,5 +1,5 @@ # This file is automatically generated. -TOP = ..\.. +TOP = ../.. DEFAULT = setupapi include $(TOP)/proxy.mak _____ Modified: trunk/reactos/lib/smlib/makefile --- trunk/reactos/lib/smlib/makefile 2005-05-28 22:40:04 UTC (rev 15640) +++ trunk/reactos/lib/smlib/makefile 2005-05-28 22:48:33 UTC (rev 15641) @@ -1,5 +1,5 @@ # This file is automatically generated. -TOP = ..\.. +TOP = ../.. DEFAULT = smlib include $(TOP)/proxy.mak _____ Modified: trunk/reactos/lib/version/version.xml --- trunk/reactos/lib/version/version.xml 2005-05-28 22:40:04 UTC (rev 15640) +++ trunk/reactos/lib/version/version.xml 2005-05-28 22:48:33 UTC (rev 15641) @@ -1,4 +1,4 @@ -<module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll"> +<module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}" installbase="system32" installname="version.dll" warnings="true"> <importlibrary definition="version.def" /> <include base="ReactOS">include/wine</include> <define name="_DISABLE_TIDENTS" />
19 years, 7 months
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
82
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
Results per page:
10
25
50
100
200