Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[royce] 13746: fix NUL, move macros to the bootstrap makefile as necessary

by royce＠svn.reactos.com

fix NUL, move macros to the bootstrap makefile as necessary Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-25 20:53:00 UTC (rev 13745) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-25 21:21:53 UTC (rev 13746) @@ -1,27 +1,47 @@ +host_gcc = gcc +host_gpp = g++ +host_ld = ld +host_ar = ar +host_objcopy = objcopy ifeq ($(HOST),mingw32-linux) + EXEPREFIX = ./ EXEPOSTFIX = SEP = / - host_gcc = gcc - host_gpp = g++ nmkdir = mkdir -p - rm = rm + gcc = mingw32-gcc + gpp = mingw32-g++ + ld = mingw32-ld + ar = mingw32-ar + objcopy = mingw32-objcopy + dlltool = mingw32-dlltool + windres = mingw32-windres + rm = rm -f + NUL = /dev/null else # mingw32-windows + EXEPREFIX = EXEPOSTFIX = .exe SEP = \$(EMPTY_VAR) - host_gcc = gcc - host_gpp = g++ nmkdir = mkdir + gcc = gcc + gpp = g++ + ld = ld + ar = ar + objcopy = objcopy + dlltool = dlltool + windres = windres rm = del /f /q + NUL = NUL endif +.PHONY: all +.PHONY: clean + all: Makefile.auto ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) -else -$(ROS_INTERMEDIATE)tools: + ${nmkdir} $(ROS_INTERMEDIATE)tools endif - ${nmkdir} $(ROS_INTERMEDIATE)tools ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE): _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-02-25 20:53:00 UTC (rev 13745) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-02-25 21:21:53 UTC (rev 13746) @@ -80,7 +80,7 @@ " -I%s", includes[i]->directory.c_str() ); } - + for ( i = 0; i < defines.size(); i++ ) { Define& d = *defines[i]; @@ -138,7 +138,7 @@ rIf.includes, rIf.defines, rIf.ifs ); - fprintf ( + fprintf ( fMakefile, "endif\n\n" ); } @@ -162,37 +162,7 @@ void MingwBackend::GenerateGlobalVariables () const { - fprintf ( fMakefile, "EXEPREFIX = " EXEPREFIX "\n" ); - fprintf ( fMakefile, "EXEPOSTFIX = " EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "SEP = " SSEP "$(EMPTY_VAR)\n" ); - fprintf ( fMakefile, "host_gcc = gcc\n" ); - fprintf ( fMakefile, "host_gpp = g++\n" ); - fprintf ( fMakefile, "host_ld = ld\n" ); - fprintf ( fMakefile, "host_ar = ar\n" ); - fprintf ( fMakefile, "host_objcopy = objcopy\n" ); -#ifdef WIN32 - fprintf ( fMakefile, "nmkdir = mkdir\n" ); - fprintf ( fMakefile, "rm = del /f /q\n" ); - fprintf ( fMakefile, "gcc = gcc\n" ); - fprintf ( fMakefile, "gpp = g++\n" ); - fprintf ( fMakefile, "ld = ld\n" ); - fprintf ( fMakefile, "ar = ar\n" ); - fprintf ( fMakefile, "objcopy = objcopy\n" ); - fprintf ( fMakefile, "dlltool = dlltool\n" ); - fprintf ( fMakefile, "windres = windres\n" ); -#else - fprintf ( fMakefile, "nmkdir = mkdir -p\n" ); - fprintf ( fMakefile, "rm = rm -f\n" ); - fprintf ( fMakefile, "gcc = mingw32-gcc\n" ); - fprintf ( fMakefile, "gpp = mingw32-g++\n" ); - fprintf ( fMakefile, "ld = mingw32-ld\n" ); - fprintf ( fMakefile, "ar = mingw32-ar\n" ); - fprintf ( fMakefile, "objcopy = mingw32-objcopy\n" ); - fprintf ( fMakefile, "dlltool = mingw32-dlltool\n" ); - fprintf ( fMakefile, "windres = mingw32-windres\n" ); -#endif fprintf ( fMakefile, "mkdir = tools" SSEP "rmkdir" EXEPOSTFIX "\n" ); - fprintf ( fMakefile, "NUL=NUL\n" ); fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "bin2res = tools" SSEP "bin2res" SSEP "bin2res" EXEPOSTFIX "\n" ); fprintf ( fMakefile, "cabman = tools" SSEP "cabman" SSEP "cabman" EXEPOSTFIX "\n" ); @@ -208,8 +178,6 @@ fprintf ( fMakefile, "PROJECT_LFLAGS = %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "\n" ); - - fprintf ( fMakefile, ".PHONY: clean\n\n" ); } bool @@ -257,7 +225,7 @@ } return dependencies; } - + void MingwBackend::GenerateInitTarget () const {

19 years, 10 months

[frik85] 13745: Create rosmedia subfolder (artworks, themes, ...)

by frik85＠svn.reactos.com

Create rosmedia subfolder (artworks, themes, ...) Added: trunk/ReactOS Wallpapers.txt _____ Added: trunk/ReactOS Wallpapers.txt --- trunk/ReactOS Wallpapers.txt 2005-02-25 20:04:44 UTC (rev 13744) +++ trunk/ReactOS Wallpapers.txt 2005-02-25 20:53:00 UTC (rev 13745) @@ -0,0 +1,65 @@ +ReactOS Wallpapers suggestion: + + + +ReactOS Wallpapers for Version 0.2.6: + +* ReactOS Wallpaper (original with new text; GNU GPL) + http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=92 + +* ReactOS Computer Wallpaper #1 (GNU GPL) + http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=98 + +* hill and water (BSD-license) + http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=88 + +* ReactOS wallpaper - 3d with holes (GNU LGPL) + http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=65 + +* ReactOS Wallpapers (Earth) + http://reactosde.re.funpic.de/mediadetail.php?sec=Graphic%20arts&cat=wal lp&mdnr=36 + + + +GPL Wallpapers from kde-look.org: + +* Nature #1 (Fruit) + http://www.kde-look.org/content/files/16183-green.jpg + +* Nature #2 (Wood) + http://www.kde-look.org/content/files/10274-p1010076.jpg + +* Nature #3 (Sea) + http://arg0.net/users/vgough/images/2007-taupo.png + +* Nature #4 (Bees #1) + http://kdelook.org/content/files/16382-img_0511c1_xga.jpg + +* Nature #5 (Bees #2) + http://www.kde-look.org/content/files/16498-Beon.jpg + +* Nature #6 (Bees #3) + http://www.kde-look.org/content/files/6524-Bee%20in%20Flower.jpg + +* Nature #7 (Summer) + http://www.kde-look.org/content/files/20979-altabadia_summer_1200.jpg + + + +Some useful links: + +* GNOME-LOOK.ORG + http://www.gnome-look.org + +* KDE-LOOK.ORG + http://www.kde-look.org/ + +* Frik85's ReactOS Fanpage + http://frik85.reactos.at + (-> http://reactosde.re.funpic.de/mediagroup.php?sec=Graphic%20arts) + + + +History: + +2005-02-25 Klemens Friedl

19 years, 10 months

[royce] 13744: silence clean rule

by royce＠svn.reactos.com

silence clean rule Modified: branches/xmlbuildsystem/reactos/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-25 20:00:27 UTC (rev 13743) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-25 20:04:44 UTC (rev 13744) @@ -50,4 +50,4 @@ $(WMC_TARGET) -H include$(SEP)reactos$(SEP)errcodes.h -o lib$(SEP)kernel32$(SEP)errcodes.rc lib$(SEP)kernel32$(SEP)kernel32.mc clean:: - -@$(rm) Makefile.auto $(PREAUTO) + -@$(rm) Makefile.auto $(PREAUTO) 2>$(NUL)

19 years, 10 months

[royce] 13743: fixed 'make all' and added some missing clean:: rules

by royce＠svn.reactos.com

fixed 'make all' and added some missing clean:: rules Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/nci/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/wmc/makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-25 19:38:11 UTC (rev 13742) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-25 20:00:27 UTC (rev 13743) @@ -4,15 +4,17 @@ host_gcc = gcc host_gpp = g++ nmkdir = mkdir -p + rm = rm else # mingw32-windows EXEPOSTFIX = .exe SEP = \$(EMPTY_VAR) host_gcc = gcc host_gpp = g++ nmkdir = mkdir + rm = del /f /q endif -default: Makefile.auto +all: Makefile.auto ifneq ($(ROS_INTERMEDIATE),) $(ROS_INTERMEDIATE)tools: $(ROS_INTERMEDIATE) @@ -46,3 +48,6 @@ include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: $(WMC_TARGET) lib$(SEP)kernel32$(SEP)kernel32.mc $(WMC_TARGET) -H include$(SEP)reactos$(SEP)errcodes.h -o lib$(SEP)kernel32$(SEP)errcodes.rc lib$(SEP)kernel32$(SEP)kernel32.mc + +clean:: + -@$(rm) Makefile.auto $(PREAUTO) _____ Modified: branches/xmlbuildsystem/reactos/tools/Makefile --- branches/xmlbuildsystem/reactos/tools/Makefile 2005-02-25 19:38:11 UTC (rev 13742) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-02-25 20:00:27 UTC (rev 13743) @@ -19,8 +19,11 @@ $(RMKDIR_OBJECTS): %.o : %.c ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@ +clean:: + -@$(rm) $(RMKDIR_TARGET) $(RMKDIR_OBJECTS) 2>$(NUL) + BUILDNO_BASE = tools BUILDNO_TARGET = \ @@ -42,6 +45,9 @@ $(BUILDNO_OBJECTS): %.o : %.c ${host_gcc} $(BUILDNO_HOST_CFLAGS) -c $< -o $@ +clean:: + -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) + include$(SEP)reactos$(SEP)buildno.h: $(BUILDNO_TARGET) $(EXEPREFIX)$(BUILDNO_TARGET) include$(SEP)reactos$(SEP)buildno.h _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/makefile --- branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-02-25 19:38:11 UTC (rev 13742) +++ branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-02-25 20:00:27 UTC (rev 13743) @@ -19,6 +19,9 @@ $(NCI_OBJECTS): %.o : %.c ${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@ +clean:: + -@$(rm) $(NCI_TARGET) $(NCI_OBJECTS) 2>$(NUL) + # WIN32K.SYS WIN32K_SVC_DB = $(NCI_BASE)$(SEP)w32ksvc.db WIN32K_SERVICE_TABLE = subsys$(SEP)win32k$(SEP)main$(SEP)svctab.c @@ -49,3 +52,6 @@ $(KERNEL_STUBS) \ $(WIN32K_GDI_STUBS) \ $(WIN32K_USER_STUBS) + +clean:: + -@$(rm) $(NCI_SERVICE_FILES) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-02-25 19:38:11 UTC (rev 13742) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-02-25 20:00:27 UTC (rev 13743) @@ -100,3 +100,6 @@ rbuild_test: $(RBUILD_TEST_TARGET) $(RBUILD_TEST_TARGET) + +clean:: + -@$(rm) $(RBUILD_TARGET) $(RBUILD_OBJECTS) $(RBUILD_TEST_TARGET) $(RBUILD_TEST_OBJECTS) 2>$(NUL) _____ Modified: branches/xmlbuildsystem/reactos/tools/wmc/makefile --- branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-02-25 19:38:11 UTC (rev 13742) +++ branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-02-25 20:00:27 UTC (rev 13743) @@ -25,3 +25,6 @@ $(WMC_OBJECTS): %.o : %.c ${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@ + +clean:: + -@$(rm) $(WMC_TARGET) $(WMC_OBJECTS) 2>$(NUL)

19 years, 10 months

[royce] 13742: generate buildno.h and it's cousins before makefile.auto, so it's sure to exist before processing makefile.auto

by royce＠svn.reactos.com

generate buildno.h and it's cousins before makefile.auto, so it's sure to exist before processing makefile.auto Modified: branches/xmlbuildsystem/reactos/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-25 15:05:51 UTC (rev 13741) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-25 19:38:11 UTC (rev 13742) @@ -29,16 +29,18 @@ include tools/Makefile -include Makefile.auto -Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(RBUILD_TARGET) - tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw - $(MAKE) $(MAKECMDGOALS) - -init: \ +PREAUTO := \ + include$(SEP)reactos$(SEP)buildno.h \ include$(SEP)reactos$(SEP)bugcodes.h \ ntoskrnl$(SEP)bugcodes.rc \ include$(SEP)reactos$(SEP)errcodes.h \ lib$(SEP)kernel32$(SEP)errcodes.rc +Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(RBUILD_TARGET) $(PREAUTO) + tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw + $(MAKE) $(MAKECMDGOALS) + + include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: $(WMC_TARGET) ntoskrnl$(SEP)ntoskrnl.mc $(WMC_TARGET) -H include$(SEP)reactos$(SEP)bugcodes.h -o ntoskrnl$(SEP)bugcodes.rc ntoskrnl$(SEP)ntoskrnl.mc

19 years, 10 months

[fireball] 13741: Updated linux wrapper to contain more funcs (to allow UHCI in the future), also wait added into hub thread, so it *should* take much fewer cpu time then it was taking before (though I haven't tested it at all - will do later). Added dependency tracking to makefiles.

by fireball＠svn.reactos.com

Updated linux wrapper to contain more funcs (to allow UHCI in the future), also wait added into hub thread, so it *should* take much fewer cpu time then it was taking before (though I haven't tested it at all - will do later). Added dependency tracking to makefiles. Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.h Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c Modified: trunk/reactos/drivers/usb/cromwell/core/makefile Modified: trunk/reactos/drivers/usb/cromwell/core/message.c Modified: trunk/reactos/drivers/usb/cromwell/host/makefile Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hcd.h --- trunk/reactos/drivers/usb/cromwell/core/hcd.h 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/core/hcd.h 2005-02-25 15:05:51 UTC (rev 13741) @@ -161,10 +161,60 @@ struct pt_regs; +// new struct from 2.6 struct hc_driver { const char *description; /* "ehci-hcd" etc */ /* irq handler */ + irqreturn_t (*irq) (struct usb_hcd *hcd, struct pt_regs *regs); + + int flags; +#define HCD_MEMORY 0x0001 /* HC regs use memory (else I/O) */ +#define HCD_USB11 0x0010 /* USB 1.1 */ +#define HCD_USB2 0x0020 /* USB 2.0 */ + + /* called to init HCD and root hub */ + int (*reset) (struct usb_hcd *hcd); + int (*start) (struct usb_hcd *hcd); + + /* called after all devices were suspended */ + int (*suspend) (struct usb_hcd *hcd, u32 state); + + /* called before any devices get resumed */ + int (*resume) (struct usb_hcd *hcd); + + /* cleanly make HCD stop writing memory and doing I/O */ + void (*stop) (struct usb_hcd *hcd); + + /* return current frame number */ + int (*get_frame_number) (struct usb_hcd *hcd); + + /* memory lifecycle */ + struct usb_hcd *(*hcd_alloc) (void); + void (*hcd_free) (struct usb_hcd *hcd); + + /* manage i/o requests, device state */ + int (*urb_enqueue) (struct usb_hcd *hcd, struct urb *urb, + int mem_flags); + int (*urb_dequeue) (struct usb_hcd *hcd, struct urb *urb); + + /* hw synch, freeing endpoint resources that urb_dequeue can't */ + void (*endpoint_disable)(struct usb_hcd *hcd, + struct hcd_dev *dev, int bEndpointAddress); + + /* root hub support */ + int (*hub_status_data) (struct usb_hcd *hcd, char *buf); + int (*hub_control) (struct usb_hcd *hcd, + u16 typeReq, u16 wValue, u16 wIndex, + char *buf, u16 wLength); +}; + +// old version, "just in case" +#if 0 +struct hc_driver { + const char *description; /* "ehci-hcd" etc */ + + /* irq handler */ void (*irq) (struct usb_hcd *hcd, struct pt_regs *regs); int flags; @@ -206,6 +256,7 @@ u16 typeReq, u16 wValue, u16 wIndex, char *buf, u16 wLength); }; +#endif extern void STDCALL usb_hcd_giveback_urb (struct usb_hcd *hcd, struct urb *urb, struct pt_regs *regs); extern void STDCALL usb_bus_init (struct usb_bus *bus); _____ Modified: trunk/reactos/drivers/usb/cromwell/core/hub.c --- trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/core/hub.c 2005-02-25 15:05:51 UTC (rev 13741) @@ -1151,9 +1151,9 @@ //FIXME: Correct this //wait_event_interruptible(khubd_wait, !list_empty(&hub_event_list)); // interruptable_sleep_on analog - below - /*while (!list_empty(&hub_event_list)) { + while (!list_empty(&hub_event_list)) { interruptible_sleep_on(&khubd_wait); - }*/ + } if (current->flags & PF_FREEZE) refrigerator(PF_IOTHREAD); @@ -1190,6 +1190,10 @@ { pid_t pid; + // ReactOS-specific + // Create Event object, initialize other sync events + KeInitializeEvent(&khubd_wait, NotificationEvent, TRUE); // signalled state + if (usb_register(&hub_driver) < 0) { err("Unable to register USB hub driver"); return -1; _____ Modified: trunk/reactos/drivers/usb/cromwell/core/makefile --- trunk/reactos/drivers/usb/cromwell/core/makefile 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/core/makefile 2005-02-25 15:05:51 UTC (rev 13741) @@ -16,3 +16,7 @@ include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk + +# Automatic dependency tracking +DEP_OBJECTS := $(TARGET_OBJECTS) +include $(PATH_TO_TOP)/tools/depend.mk _____ Modified: trunk/reactos/drivers/usb/cromwell/core/message.c --- trunk/reactos/drivers/usb/cromwell/core/message.c 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/core/message.c 2005-02-25 15:05:51 UTC (rev 13741) @@ -15,6 +15,9 @@ #include "hcd.h" /* for usbcore internals */ +// ReactOS specific: No WAITQUEUEs here +#define wake_up(a) do {} while(0) + struct usb_api_data { wait_queue_head_t wqh; int done; _____ Modified: trunk/reactos/drivers/usb/cromwell/host/makefile --- trunk/reactos/drivers/usb/cromwell/host/makefile 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/host/makefile 2005-02-25 15:05:51 UTC (rev 13741) @@ -14,3 +14,7 @@ include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk + +# Automatic dependency tracking +DEP_OBJECTS := $(TARGET_OBJECTS) +include $(PATH_TO_TOP)/tools/depend.mk _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/linux/linux_wrapper.h 2005-02-25 15:05:51 UTC (rev 13741) @@ -12,6 +12,9 @@ * * All structs and prototypes are based on kernel source 2.5.72 * + * Modified by Aleksey Bragin (aleksey(a)reactos.com) for ReactOS needs + * + * * #include <standard-GPL-header.h> */ @@ -145,6 +148,14 @@ wait_queue_head_t wait; }; +// windows lookaside list head +typedef void* kmem_cache_t; + +struct dma_pool +{ + int dummy; +}; + /* from mod_devicetable.h */ struct usb_device_id { @@ -286,6 +297,8 @@ #define MODULE_DESCRIPTION(a) #define MODULE_LICENSE(a) #define MODULE_DEVICE_TABLE(type,name) void* module_table_##name=&name +#define MODULE_PARM(a,b) +#define MODULE_PARM_DESC(a,b) #define __devinit #define __exit @@ -313,6 +326,10 @@ #define unlikely(x) (x) #define prefetch(x) 1 +#define inw(x) READ_PORT_USHORT((PUSHORT)(x)) +#define outw(x,p) WRITE_PORT_USHORT((PUSHORT)(p),(x)) +#define outl(x,p) WRITE_PORT_ULONG((PUSHORT)(p),(x)) + /* The kernel macro for list_for_each_entry makes nonsense (have no clue * why, this is just the same definition...) */ @@ -372,7 +389,7 @@ #define down_read(a) do {} while(0) #define up_read(a) do {} while(0) -#define DECLARE_WAIT_QUEUE_HEAD(x) int x +#define DECLARE_WAIT_QUEUE_HEAD(x) KEVENT x #define DECLARE_COMPLETION(x) struct completion x @@ -383,6 +400,8 @@ /* PCI */ +#define to_pci_dev(n) container_of(n, struct pci_dev, dev) + #define pci_pool_create(a,b,c,d,e) (void*)1 #define pci_pool_alloc(a,b,c) my_pci_pool_alloc(a,b,c) @@ -427,6 +446,16 @@ #define bus_register(a) do {} while(0) #define bus_unregister(a) do {} while(0) +/* DMA */ +//#define dma_pool_alloc(a,b,c) my_dma_pool_alloc((a),(b),(c)) +#define dma_pool_alloc(a,b,c) pci_pool_alloc(a,b,c) +#define dma_pool_create(a,b,c,d,e) pci_pool_create(a,b,c,d,e) +#define dma_pool_free(a,b,c) pci_pool_free(a,b,c) +#define dma_pool_destroy(a) pci_pool_destroy(a) + +#define dma_alloc_coherent(a,b,c,d) NULL +#define dma_free_coherent(a,b,c,d) do {} while(0) + #define dma_map_single(a,b,c,d) ((u32)(b)&0xfffffff) #define dma_unmap_single(a,b,c,d) do {} while(0) #define pci_unmap_single(a,b,c,d) do {} while(0) @@ -451,11 +480,15 @@ #define PCI_ROM_RESOURCE 0 #define IORESOURCE_IO 1 -#define DECLARE_WAITQUEUE(a,b) wait_queue_head_t a=0 -#define init_waitqueue_head(a) do {} while(0) +#define DECLARE_WAITQUEUE(a,b) KEVENT a=0 +#define init_waitqueue_head(a) my_init_waitqueue_head(a) #define add_wait_queue(a,b) do {} while(0) #define remove_wait_queue(a,b) do {} while(0) +void my_init_waitqueue_head(PKEVENT a); +VOID KeMemoryBarrier(VOID); + +#define mb() KeMemoryBarrier() #define wmb() __asm__ __volatile__ ("": : :"memory") #define rmb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory") @@ -478,7 +511,7 @@ #define wait_event_interruptible(x,y) do {} while(0) #define interruptible_sleep_on(a) my_interruptible_sleep_on(a) -void my_interruptible_sleep_on(int a); +void my_interruptible_sleep_on(PKEVENT evnt); #define flush_scheduled_work() do {} while(0) #define refrigerator(x) do {} while(0) @@ -492,7 +525,26 @@ #define yield() do {} while(0) #define cpu_relax() do {} while(0) +#define WARN_ON(a) do {} while(0) + /*---------------------------------------------------------------------- --*/ +/* Lookaside lists funcs */ +/*--------------------------------------------------------------------- ---*/ +#define kmem_cache_create(a,b,c,d,e,f) my_kmem_cache_create((a),(b),(c),(d),(e),(f)) +#define kmem_cache_destroy(a) my_kmem_cache_destroy((a)) +#define kmem_cache_alloc(co, flags) my_kmem_cache_alloc((co), (flags)) +#define kmem_cache_free(co, ptr) my_kmem_cache_free((co), (ptr)) + +kmem_cache_t *my_kmem_cache_create(const char *tag, size_t alloc_size, + size_t offset, unsigned long flags, + void *ctor, + void *dtor); + +void my_kmem_cache_destroy(kmem_cache_t *co); +void *my_kmem_cache_alloc(kmem_cache_t *co, int flags); +void my_kmem_cache_free(kmem_cache_t *co, void *ptr); + +/*--------------------------------------------------------------------- ---*/ /* Kernel macros */ /*---------------------------------------------------------------------- --*/ @@ -559,6 +611,21 @@ #define PCI_DEVFN(a,b) 0 #define PCI_SLOT(a) 0 +/** + * PCI_DEVICE_CLASS - macro used to describe a specific pci device class + * @dev_class: the class, subclass, prog-if triple for this device + * @dev_class_mask: the class mask for this device + * + * This macro is used to create a struct pci_device_id that matches a + * specific PCI class. The vendor, device, subvendor, and subdevice + * fields will be set to PCI_ANY_ID. + */ +#define PCI_DEVICE_CLASS(dev_class,dev_class_mask) \ + .class = (dev_class), .class_mask = (dev_class_mask), \ + .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \ + .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID + + /*---------------------------------------------------------------------- --*/ /* Stuff from kernel */ /*---------------------------------------------------------------------- --*/ @@ -647,6 +714,9 @@ add_timer(t); } +#define time_after_eq(a,b) \ + (((long)(a) - (long)(b) >= 0)) + /*---------------------------------------------------------------------- --*/ /* Device driver and process related stuff */ /*---------------------------------------------------------------------- --*/ @@ -678,7 +748,7 @@ int my_schedule_timeout(int x); #define wake_up(x) my_wake_up(x) -void my_wake_up(void*); +void my_wake_up(PKEVENT); // cannot be mapped via macro due to collision with urb->complete static void __inline__ complete(struct completion *p) _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h --- trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_ids.h 2005-02-25 15:05:51 UTC (rev 13741) @@ -5,7 +5,10 @@ #define PCI_DEVICE_ID_NS_87560_LIO 0x000e #define PCI_VENDOR_ID_AMD 0x1022 #define PCI_VENDOR_ID_OPTI 0x1045 +#define PCI_VENDOR_ID_VIA 0x1106 +#define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_CLASS_SERIAL_USB (PCI_CLASS_SERIAL_BUS_CTLR << 8 + PCI_SUBCLASS_SB_USB) #endif + _____ Modified: trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c --- trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/sys/linuxwrapper.c 2005-02-25 15:05:51 UTC (rev 13741) @@ -134,6 +134,8 @@ { HANDLE hThread; + // TODO: Implement actual process killing + hThread = (HANDLE)pid; ZwClose(hThread); @@ -208,11 +210,19 @@ { } /*---------------------------------------------------------------------- --*/ -void my_wake_up(void* p) +void my_wake_up(PKEVENT evnt) { need_wakeup=1; + + KeSetEvent(evnt, 0, FALSE); // Signal event } /*---------------------------------------------------------------------- --*/ +void my_init_waitqueue_head(PKEVENT evnt) +{ + // this is used only in core/message.c, and it isn't needed there + //KeInitializeEvent(evnt, NotificationEvent, TRUE); // signalled state +} +/*--------------------------------------------------------------------- ---*/ /* wait until woken up (only one wait allowed!) */ int my_schedule_timeout(int x) { @@ -254,6 +264,12 @@ // printk("wait for completion done %i\n",x->done); } /*---------------------------------------------------------------------- --*/ +void my_interruptible_sleep_on(PKEVENT evnt) +{ + KeWaitForSingleObject(evnt, Executive, KernelMode, FALSE, NULL); + KeClearEvent(evnt); // reset to not-signalled +} +/*--------------------------------------------------------------------- ---*/ // Helper for pci_module_init /*---------------------------------------------------------------------- --*/ int my_pci_module_init(struct pci_driver *x) @@ -294,4 +310,55 @@ /* No free... */ return 0; } -/*--------------------------------------------------------------------- ---*/ \ No newline at end of file +/*--------------------------------------------------------------------- ---*/ +// Lookaside funcs +/*--------------------------------------------------------------------- ---*/ +kmem_cache_t *my_kmem_cache_create(const char *tag, size_t alloc_size, + size_t offset, unsigned long flags, + void *ctor, + void *dtor) +{ + //TODO: Take in account ctor and dtor - callbacks for alloc/free, flags and offset + //FIXME: We assume this cache is always NPaged + PNPAGED_LOOKASIDE_LIST Lookaside; + ULONG Tag=0x11223344; //FIXME: Make this from tag + + Lookaside = ExAllocatePool(NonPagedPool, sizeof(NPAGED_LOOKASIDE_LIST)); + + ExInitializeNPagedLookasideList( + Lookaside, + NULL, + NULL, + 0, + alloc_size, + Tag, + 0); + + return (kmem_cache_t *)Lookaside; +} +/*--------------------------------------------------------------------- ---*/ +void my_kmem_cache_destroy(kmem_cache_t *co) +{ + ExDeleteNPagedLookasideList((PNPAGED_LOOKASIDE_LIST)co); + + ExFreePool(co); +} +/*--------------------------------------------------------------------- ---*/ +void *my_kmem_cache_alloc(kmem_cache_t *co, int flags) +{ + return ExAllocateFromNPagedLookasideList((PNPAGED_LOOKASIDE_LIST)co); +} +/*--------------------------------------------------------------------- ---*/ +void my_kmem_cache_free(kmem_cache_t *co, void *ptr) +{ + ExFreeToNPagedLookasideList((PNPAGED_LOOKASIDE_LIST)co, ptr); +} +/*--------------------------------------------------------------------- ---*/ +// DMA, not used now +/*--------------------------------------------------------------------- ---*/ +void *my_dma_pool_alloc(struct dma_pool *pool, int gfp_flags, dma_addr_t *dma_handle) +{ + // HalAllocCommonBuffer + // But ideally IoGetDmaAdapter + return NULL; +} _____ Modified: trunk/reactos/drivers/usb/cromwell/usb_wrapper.h --- trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-02-25 12:20:36 UTC (rev 13740) +++ trunk/reactos/drivers/usb/cromwell/usb_wrapper.h 2005-02-25 15:05:51 UTC (rev 13741) @@ -12,3 +12,4 @@ #define CONFIG_PCI #include "linux/usb.h" +#include "linux/pci_ids.h" \ No newline at end of file

19 years, 10 months

[ekohl] 13740: - Support multiple interfaces per idl file.

by ekohl＠svn.reactos.com

- Support multiple interfaces per idl file. - Support explicit binding handles. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/header.c Modified: trunk/reactos/tools/widl/header.h Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-02-25 05:28:54 UTC (rev 13739) +++ trunk/reactos/tools/widl/ChangeLog 2005-02-25 12:20:36 UTC (rev 13740) @@ -1,5 +1,15 @@ ChangeLog +2005-02-25 ekohl + tools/widl/client.c + tools/widl/header.c + tools/widl/header.h + tools/widl/server.c + +Support multiple interfaces per idl file. +Support explicit binding handles. + + 2005-02-24 ekohl include/wine/rpcfc.h tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-02-25 05:28:54 UTC (rev 13739) +++ trunk/reactos/tools/widl/client.c 2005-02-25 12:20:36 UTC (rev 13740) @@ -225,8 +225,8 @@ static void print_message_buffer_size(func_t *func) { unsigned int alignment; - unsigned int size; - unsigned int last_size = 0; + int size; + int last_size = -1; var_t *var; if (!func->args) @@ -253,7 +253,7 @@ case RPC_FC_USHORT: case RPC_FC_SHORT: size = 2; - if (last_size != 0 && last_size < 2) + if (last_size != -1 && last_size < 2) alignment += (2 - last_size); break; @@ -261,14 +261,14 @@ case RPC_FC_LONG: case RPC_FC_FLOAT: size = 4; - if (last_size != 0 && last_size < 4) + if (last_size != -1 && last_size < 4) alignment += (4 - last_size); break; case RPC_FC_HYPER: case RPC_FC_DOUBLE: size = 8; - if (last_size != 0 && last_size < 4) + if (last_size != -1 && last_size < 4) alignment += (4 - last_size); break; @@ -280,21 +280,11 @@ error("Unknown/unsupported type!"); } - if (size == 0) - { - if (last_size != 0) - fprintf(client, " +"); - fprintf(client, " 0U"); - } - else - { - if (last_size != 0) - fprintf(client, " +"); - fprintf(client, " %uU", size + alignment); + if (last_size != -1) + fprintf(client, " +"); + fprintf(client, " %dU", (size == 0) ? 0 : size + alignment); - last_size = size; - } - + last_size = size; var = PREV_LINK(var); } @@ -379,9 +369,10 @@ static void write_function_stubs(type_t *iface) { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explitit_handle = is_attr(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); func_t *func = iface->funcs; var_t* var; + var_t* explicit_handle_var; int method_count = 0; unsigned int proc_offset = 0; @@ -390,6 +381,25 @@ { var_t *def = func->def; + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (explicit_handle) + { + if (!explicit_handle_var) + { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } + else + { + if (explicit_handle_var) + { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } + write_type(client, def->type, def, def->tname); fprintf(client, " "); write_name(client, def); @@ -411,7 +421,7 @@ fprintf(client, " _RetVal;\n"); } - if (implicit_handle) + if (implicit_handle || explicit_handle) print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); print_client("MIDL_STUB_MESSAGE _StubMsg;\n"); @@ -434,6 +444,11 @@ print_client("_Handle = %s;\n", implicit_handle); fprintf(client, "\n"); } + else if (explicit_handle) + { + print_client("_Handle = %s;\n", explicit_handle_var->name); + fprintf(client, "\n"); + } /* emit the message buffer size */ print_client("_StubMsg.BufferLength ="); @@ -445,7 +460,7 @@ indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - if (implicit_handle) + if (implicit_handle || explicit_handle) print_client("%_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); @@ -691,39 +706,47 @@ void write_client(ifref_t *ifaces) { - ifref_t *lcur = ifaces; - char *file_id = client_token; - int c; + ifref_t *iface = ifaces; if (!do_client) return; - if (!lcur) + if (!iface) return; - END_OF_LIST(lcur); + END_OF_LIST(iface); init_client(); if (!client) return; - write_formatstringsdecl(lcur->iface); - write_implicithandledecl(lcur->iface); + while (iface) + { + fprintf(client, "/********************************************************************** *******\n"); + fprintf(client, " * %s interface\n", iface->iface->name); + fprintf(client, " */\n"); + fprintf(client, "\n"); - write_clientinterfacedecl(lcur->iface); - write_stubdescdecl(lcur->iface); - write_bindinghandledecl(lcur->iface); + write_formatstringsdecl(iface->iface); + write_implicithandledecl(iface->iface); - write_function_stubs(lcur->iface); - write_stubdescriptor(lcur->iface); + write_clientinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + write_bindinghandledecl(iface->iface); - print_client("#if !defined(__RPC_WIN32__)\n"); - print_client("#error Invalid build platform for this stub.\n"); - print_client("#endif\n"); - fprintf(client, "\n"); + write_function_stubs(iface->iface); + write_stubdescriptor(iface->iface); - write_procformatstring(lcur->iface); - write_typeformatstring(); + print_client("#if !defined(__RPC_WIN32__)\n"); + print_client("#error Invalid build platform for this stub.\n"); + print_client("#endif\n"); + fprintf(client, "\n"); - fprintf(client, "\n"); + write_procformatstring(iface->iface); + write_typeformatstring(); + fprintf(client, "\n"); + + iface = PREV_LINK(iface); + } + fclose(client); } _____ Modified: trunk/reactos/tools/widl/header.c --- trunk/reactos/tools/widl/header.c 2005-02-25 05:28:54 UTC (rev 13739) +++ trunk/reactos/tools/widl/header.c 2005-02-25 12:20:36 UTC (rev 13740) @@ -427,6 +427,28 @@ fprintf(header, ";\n\n"); } + +var_t* get_explicit_handle_var(func_t* func) +{ + var_t* var; + + if (!func->args) + return NULL; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->type->type == RPC_FC_IGNORE) + return var; + + var = PREV_LINK(var); + } + + return NULL; +} + + /********** INTERFACES **********/ int is_object(attr_t *a) @@ -663,10 +685,28 @@ static void write_function_proto(type_t *iface) { + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); + var_t* explicit_handle_var; + func_t *cur = iface->funcs; while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); while (cur) { var_t *def = cur->def; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(cur); + if (explicit_handle) { + if (!explicit_handle_var) { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } else { + if (explicit_handle_var) { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } + /* FIXME: do we need to handle call_as? */ write_type(header, def->type, def, def->tname); fprintf(header, " "); _____ Modified: trunk/reactos/tools/widl/header.h --- trunk/reactos/tools/widl/header.h 2005-02-25 05:28:54 UTC (rev 13739) +++ trunk/reactos/tools/widl/header.h 2005-02-25 12:20:36 UTC (rev 13740) @@ -40,5 +40,5 @@ extern void write_expr(FILE *h, expr_t *e); extern void write_constdef(var_t *v); extern void write_externdef(var_t *v); - +extern var_t* get_explicit_handle_var(func_t* func); #endif _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-02-25 05:28:54 UTC (rev 13739) +++ trunk/reactos/tools/widl/server.c 2005-02-25 12:20:36 UTC (rev 13740) @@ -336,8 +336,10 @@ static void write_function_stubs(type_t *iface) { + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); func_t *func = iface->funcs; var_t *var; + var_t* explicit_handle_var; unsigned int proc_offset = 0; while (NEXT_LINK(func)) func = NEXT_LINK(func); @@ -345,6 +347,25 @@ { var_t *def = func->def; + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (explicit_handle) + { + if (!explicit_handle_var) + { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } + else + { + if (explicit_handle_var) + { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } + write_type(server, def->type, def, def->tname); fprintf(server, " __RPC_STUB\n"); fprintf(server, "%s_", iface->name); @@ -397,6 +418,12 @@ indent--; fprintf(server, "\n"); + if (explicit_handle) + { + print_server("%s = _pRpcMessage->Handle;\n", explicit_handle_var->name); + fprintf(server, "\n"); + } + print_server("RpcTryFinally\n"); print_server("{\n"); indent++; @@ -698,38 +725,46 @@ void write_server(ifref_t *ifaces) { - ifref_t *lcur = ifaces; - char *file_id = server_token; - int c; + ifref_t *iface = ifaces; if (!do_server) return; - if (!lcur) + if (!iface) return; - END_OF_LIST(lcur); + END_OF_LIST(iface); init_server(); if (!server) return; - write_formatstringsdecl(lcur->iface); - write_serverinterfacedecl(lcur->iface); - write_stubdescdecl(lcur->iface); + while (iface) + { + fprintf(server, "/********************************************************************** *******\n"); + fprintf(server, " * %s interface\n", iface->iface->name); + fprintf(server, " */\n"); + fprintf(server, "\n"); - write_function_stubs(lcur->iface); + write_formatstringsdecl(iface->iface); + write_serverinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); - write_stubdescriptor(lcur->iface); - write_dispatchtable(lcur->iface); + write_function_stubs(iface->iface); - print_server("#if !defined(__RPC_WIN32__)\n"); - print_server("#error Invalid build platform for this stub.\n"); - print_server("#endif\n"); - fprintf(server, "\n"); + write_stubdescriptor(iface->iface); + write_dispatchtable(iface->iface); - write_procformatstring(lcur->iface); - write_typeformatstring(); + print_server("#if !defined(__RPC_WIN32__)\n"); + print_server("#error Invalid build platform for this stub.\n"); + print_server("#endif\n"); + fprintf(server, "\n"); - fprintf(server, "\n"); + write_procformatstring(iface->iface); + write_typeformatstring(); + fprintf(server, "\n"); + + iface = PREV_LINK(iface); + } + fclose(server); }

19 years, 10 months

[arty] 13739: Reads are allowed on connecting sockets. They act like normal reads

by arty＠svn.reactos.com

Reads are allowed on connecting sockets. They act like normal reads with no data available. Modified: trunk/reactos/drivers/net/afd/afd/read.c _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2005-02-25 05:27:43 UTC (rev 13738) +++ trunk/reactos/drivers/net/afd/afd/read.c 2005-02-25 05:28:54 UTC (rev 13739) @@ -270,7 +270,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); - if( FCB->State != SOCKET_STATE_CONNECTED ) { + if( FCB->State != SOCKET_STATE_CONNECTED && + FCB->State != SOCKET_STATE_CONNECTING ) { AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", FCB->State)); return STATUS_UNSUCCESSFUL;

19 years, 10 months

[arty] 13738: Set nonblocking on all sockets initially.

by arty＠svn.reactos.com

Set nonblocking on all sockets initially. Zero flags and other junk in the ea buffer when creating a new socket. More correct error return function (check both Errno and ReturnedBytes ptrs). Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-02-25 03:02:45 UTC (rev 13737) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-02-25 05:27:43 UTC (rev 13738) @@ -16,8 +16,8 @@ #include <rosrtl/string.h> #ifdef DBG -DWORD DebugTraceLevel = DEBUG_ULTRA; -//DWORD DebugTraceLevel = 0; +//DWORD DebugTraceLevel = DEBUG_ULTRA; +DWORD DebugTraceLevel = 0; #endif /* DBG */ HANDLE GlobalHeap; @@ -120,6 +120,7 @@ Socket->SharedData.GroupID = g; Socket->SharedData.GroupType = 0; Socket->SharedData.UseSAN = FALSE; + Socket->SharedData.NonBlocking = FALSE; /* Sockets start blocking */ Socket->SanData = NULL; /* Ask alex about this */ @@ -137,6 +138,7 @@ /* Set up EA Buffer */ EABuffer = HeapAlloc(GlobalHeap, 0, SizeOfEA); + RtlZeroMemory(EABuffer, SizeOfEA); EABuffer->NextEntryOffset = 0; EABuffer->Flags = 0; EABuffer->EaNameLength = AFD_PACKET_COMMAND_LENGTH; @@ -265,19 +267,22 @@ DWORD MsafdReturnWithErrno( NTSTATUS Status, LPINT Errno, DWORD Received, LPDWORD ReturnedBytes ) { - switch (Status) { - case STATUS_CANT_WAIT: *Errno = WSAEWOULDBLOCK; break; - case STATUS_TIMEOUT: - case STATUS_SUCCESS: - /* Return Number of bytes Read */ - if( ReturnedBytes ) *ReturnedBytes = Received; break; - case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; *ReturnedBytes = 0; break; - case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; - case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; - default: { - DbgPrint("MSAFD: Error %x is unknown\n", Status); - *Errno = WSAEINVAL; break; - } break; + if( ReturnedBytes ) *ReturnedBytes = 0; + if( Errno ) { + switch (Status) { + case STATUS_CANT_WAIT: *Errno = WSAEWOULDBLOCK; break; + case STATUS_TIMEOUT: + case STATUS_SUCCESS: + /* Return Number of bytes Read */ + if( ReturnedBytes ) *ReturnedBytes = Received; break; + case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; *ReturnedBytes = 0; break; + case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; + case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; + default: { + DbgPrint("MSAFD: Error %x is unknown\n", Status); + *Errno = WSAEINVAL; break; + } break; + } } /* Success */ @@ -588,6 +593,9 @@ PollBufferSize = sizeof(*PollInfo) + (HandleCount * sizeof(AFD_HANDLE)); + AFD_DbgPrint(MID_TRACE,("HandleCount: %d BufferSize: %d\n", + HandleCount, PollBufferSize)); + /* Allocate */ PollBuffer = HeapAlloc(GlobalHeap, 0, PollBufferSize); PollInfo = (PAFD_POLL_INFO)PollBuffer;

19 years, 10 months

[arty] 13737: Noticed that I had not used the right status for EOF when consolidating

by arty＠svn.reactos.com

Noticed that I had not used the right status for EOF when consolidating some code. Added a flag that governs whether we are after or at EOF. Modified: trunk/reactos/drivers/net/afd/afd/read.c Modified: trunk/reactos/drivers/net/afd/include/afd.h _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2005-02-24 22:20:43 UTC (rev 13736) +++ trunk/reactos/drivers/net/afd/afd/read.c 2005-02-25 03:02:45 UTC (rev 13737) @@ -123,7 +123,7 @@ PIRP NextIrp; AFD_DbgPrint(MID_TRACE,("Socket shutdown from remote side\n")); - + /* Kill remaining recv irps */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { NextIrpEntry = @@ -138,7 +138,7 @@ } /* Handle closing signal */ - FCB->PollState |= AFD_EVENT_DISCONNECT; + FCB->PollState |= AFD_EVENT_DISCONNECT | SOCKET_STATE_EOF_READ; PollReeval( FCB->DeviceExt, FCB->FileObject ); } @@ -307,15 +307,19 @@ Status = STATUS_SUCCESS; } } else { - AFD_DbgPrint(MID_TRACE,("EOF Happened already\n")); - FCB->Recv.Content = 0; - FCB->Recv.BytesUsed = 0; - Status = STATUS_END_OF_FILE; + if( FCB->PollState & SOCKET_STATE_EOF_READ ) + Status = STATUS_END_OF_FILE; + else + Status = STATUS_SUCCESS; + + AFD_DbgPrint(MID_TRACE,("EOF Happened already\n")); + FCB->Recv.Content = 0; + FCB->Recv.BytesUsed = 0; ProcessClose( FCB ); return UnlockAndMaybeComplete - ( FCB, STATUS_SUCCESS, Irp, 0, NULL, FALSE); + ( FCB, Status, Irp, 0, NULL, FALSE); } if( NT_SUCCESS(Status) ) { _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-02-24 22:20:43 UTC (rev 13736) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-02-25 03:02:45 UTC (rev 13737) @@ -44,6 +44,7 @@ #define SOCKET_STATE_CONNECTED 3 #define SOCKET_STATE_LISTENING 4 #define SOCKET_STATE_MASK 0x0000ffff +#define SOCKET_STATE_EOF_READ 0x20000000 #define SOCKET_STATE_LOCKED 0x40000000 #define SOCKET_STATE_NEW 0x80000000 #define SOCKET_STATE_CLOSED 0x00000100

19 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005