Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by chorns＠svn.reactos.com

Install to system32 Modified: trunk/reactos/lib/riched20/riched20.xml Modified: trunk/reactos/lib/richedit/riched32.xml Modified: trunk/reactos/lib/serialui/serialui.xml _____ Modified: trunk/reactos/lib/riched20/riched20.xml --- trunk/reactos/lib/riched20/riched20.xml 2005-05-29 14:35:36 UTC (rev 15659) +++ trunk/reactos/lib/riched20/riched20.xml 2005-05-29 14:51:17 UTC (rev 15660) @@ -1,4 +1,4 @@ -<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installname="riched20.dll" warnings="true"> +<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" warnings="true"> <importlibrary definition="riched20.spec.def" /> <include base="riched20">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/richedit/riched32.xml --- trunk/reactos/lib/richedit/riched32.xml 2005-05-29 14:35:36 UTC (rev 15659) +++ trunk/reactos/lib/richedit/riched32.xml 2005-05-29 14:51:17 UTC (rev 15660) @@ -1,4 +1,4 @@ -<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installname="riched32.dll"> +<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll"> <importlibrary definition="riched32.spec.def" /> <include base="riched32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/serialui/serialui.xml --- trunk/reactos/lib/serialui/serialui.xml 2005-05-29 14:35:36 UTC (rev 15659) +++ trunk/reactos/lib/serialui/serialui.xml 2005-05-29 14:51:17 UTC (rev 15660) @@ -1,4 +1,4 @@ -<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installname="serialui.dll"> +<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll"> <importlibrary definition="serialui.def" /> <include base="serialui">.</include> <define name="__USE_W32API" />

19 years, 6 months

[chorns] 15659: Install more modules

by chorns＠svn.reactos.com

Install more modules Modified: trunk/reactos/apps/utils/net/route/route.xml Deleted: trunk/reactos/drivers/usb/miniport/usbehci/makefile Deleted: trunk/reactos/drivers/usb/miniport/usbohci/makefile Deleted: trunk/reactos/drivers/usb/miniport/usbuhci/makefile Deleted: trunk/reactos/drivers/usb/usbd/makefile Deleted: trunk/reactos/drivers/usb/usbhub/makefile Deleted: trunk/reactos/drivers/usb/usbport/makefile Deleted: trunk/reactos/lib/fslib/vfatxlib/Makefile Deleted: trunk/reactos/lib/msgina/makefile Modified: trunk/reactos/lib/riched20/riched20.xml Modified: trunk/reactos/lib/richedit/riched32.xml Modified: trunk/reactos/lib/secur32/secur32.xml Modified: trunk/reactos/lib/serialui/serialui.xml Modified: trunk/reactos/lib/setupapi/makefile Deleted: trunk/reactos/lib/smlib/makefile Modified: trunk/reactos/services/rpcss/rpcss.xml Modified: trunk/reactos/subsys/system/rundll32/rundll32.xml Modified: trunk/reactos/subsys/system/services/services.xml _____ Modified: trunk/reactos/apps/utils/net/route/route.xml --- trunk/reactos/apps/utils/net/route/route.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/apps/utils/net/route/route.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="route" type="win32cui" warnings="true"> +<module name="route" type="win32cui" installbase="system32" installname="route.exe" warnings="true"> <include base="route">.</include> <define name="__USE_W32API" /> <library>kernel32</library> _____ Deleted: trunk/reactos/drivers/usb/miniport/usbehci/makefile --- trunk/reactos/drivers/usb/miniport/usbehci/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/drivers/usb/miniport/usbehci/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,16 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = driver - -TARGET_NAME = usbehci - -TARGET_DDKLIBS = ntoskrnl.a usbport.a - -TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API - -TARGET_OBJECTS = \ - usbehci.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/drivers/usb/miniport/usbohci/makefile --- trunk/reactos/drivers/usb/miniport/usbohci/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/drivers/usb/miniport/usbohci/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,16 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = driver - -TARGET_NAME = usbohci - -TARGET_DDKLIBS = ntoskrnl.a usbport.a - -TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API - -TARGET_OBJECTS = \ - usbohci.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/drivers/usb/miniport/usbuhci/makefile --- trunk/reactos/drivers/usb/miniport/usbuhci/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/drivers/usb/miniport/usbuhci/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,16 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = driver - -TARGET_NAME = usbuhci - -TARGET_DDKLIBS = ntoskrnl.a usbport.a - -TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API - -TARGET_OBJECTS = \ - usbuhci.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/drivers/usb/usbd/makefile --- trunk/reactos/drivers/usb/usbd/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/drivers/usb/usbd/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,17 +0,0 @@ -# $Id: $ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = export_driver - -TARGET_NAME = usbd - -TARGET_OBJECTS = usbd.o - -TARGET_GCCLIBS = gcc - -TARGET_CFLAGS = -D__USE_W32API -O3 -s - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/drivers/usb/usbhub/makefile --- trunk/reactos/drivers/usb/usbhub/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/drivers/usb/usbhub/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,16 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = usbhub - -TARGET_DDKLIBS = ntoskrnl.a - -TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API - -TARGET_OBJECTS = \ - usbhub.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/drivers/usb/usbport/makefile --- trunk/reactos/drivers/usb/usbport/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/drivers/usb/usbport/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,16 +0,0 @@ -PATH_TO_TOP = ../../.. - -TARGET_TYPE = export_driver - -TARGET_NAME = usbport - -TARGET_DDKLIBS = ntoskrnl.a - -TARGET_CFLAGS = -Werror -Wall -I$(PATH_TO_TOP)/ntoskrnl/include -D__USE_W32API - -TARGET_OBJECTS = \ - usbport.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/lib/fslib/vfatxlib/Makefile --- trunk/reactos/lib/fslib/vfatxlib/Makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/fslib/vfatxlib/Makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,18 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = library - -TARGET_NAME = vfatxlib - -# require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror - -TARGET_OBJECTS = \ - fatx.o \ - vfatxlib.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: trunk/reactos/lib/msgina/makefile --- trunk/reactos/lib/msgina/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/msgina/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ../.. -DEFAULT = msgina -include $(TOP)/proxy.mak _____ Modified: trunk/reactos/lib/riched20/riched20.xml --- trunk/reactos/lib/riched20/riched20.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/riched20/riched20.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" warnings="true"> +<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installname="riched20.dll" warnings="true"> <importlibrary definition="riched20.spec.def" /> <include base="riched20">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/richedit/riched32.xml --- trunk/reactos/lib/richedit/riched32.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/richedit/riched32.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}"> +<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installname="riched32.dll"> <importlibrary definition="riched32.spec.def" /> <include base="riched32">.</include> <include base="ReactOS">include/wine</include> _____ Modified: trunk/reactos/lib/secur32/secur32.xml --- trunk/reactos/lib/secur32/secur32.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/secur32/secur32.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}"> +<module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="secur32.dll"> <importlibrary definition="secur32.def" /> <include base="secur32">.</include> <define name="__SECUR32__" /> _____ Modified: trunk/reactos/lib/serialui/serialui.xml --- trunk/reactos/lib/serialui/serialui.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/serialui/serialui.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}"> +<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installname="serialui.dll"> <importlibrary definition="serialui.def" /> <include base="serialui">.</include> <define name="__USE_W32API" /> _____ Modified: trunk/reactos/lib/setupapi/makefile --- trunk/reactos/lib/setupapi/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/setupapi/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,5 +1,5 @@ # This file is automatically generated. -TOP = ../.. +TOP = ..\.. DEFAULT = setupapi include $(TOP)/proxy.mak _____ Deleted: trunk/reactos/lib/smlib/makefile --- trunk/reactos/lib/smlib/makefile 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/lib/smlib/makefile 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ../.. -DEFAULT = smlib -include $(TOP)/proxy.mak _____ Modified: trunk/reactos/services/rpcss/rpcss.xml --- trunk/reactos/services/rpcss/rpcss.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/services/rpcss/rpcss.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="rpcss" type="win32cui"> +<module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe"> <include base="rpcss">.</include> <define name="__USE_W32API" /> <library>kernel32</library> _____ Modified: trunk/reactos/subsys/system/rundll32/rundll32.xml --- trunk/reactos/subsys/system/rundll32/rundll32.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/subsys/system/rundll32/rundll32.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.dll"> +<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe"> <include base="rundll32">.</include> <define name="UNICODE" /> <define name="__USE_W32API" /> _____ Modified: trunk/reactos/subsys/system/services/services.xml --- trunk/reactos/subsys/system/services/services.xml 2005-05-29 14:26:21 UTC (rev 15658) +++ trunk/reactos/subsys/system/services/services.xml 2005-05-29 14:35:36 UTC (rev 15659) @@ -1,4 +1,4 @@ -<module name="services" type="win32cui"> +<module name="services" type="win32cui" installbase="system32" installname="services.exe"> <include base="services">.</include> <include base="ReactOS">include/idl</include> <define name="__USE_W32API" />

19 years, 6 months

[gvg] 15658: Use standard debug macros

by gvg＠svn.reactos.com

Use standard debug macros Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/net/dd/pcnet/requests.c _____ Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.c --- trunk/reactos/drivers/net/dd/pcnet/pcnet.c 2005-05-29 14:09:04 UTC (rev 15657) +++ trunk/reactos/drivers/net/dd/pcnet/pcnet.c 2005-05-29 14:26:21 UTC (rev 15658) @@ -43,6 +43,9 @@ #include "pcnethw.h" #include "pcnet.h" +#define NDEBUG +#include <debug.h> + VOID STDCALL MiniportHandleInterrupt( @@ -58,14 +61,14 @@ PADAPTER Adapter = (PADAPTER)MiniportAdapterContext; USHORT Data; - PCNET_DbgPrint(("Called\n")); + DPRINT("Called\n"); NdisDprAcquireSpinLock(&Adapter->Lock); NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("CSR0 is 0x%x\n", Data)); + DPRINT("CSR0 is 0x%x\n", Data); while(Data & CSR0_INTR) { @@ -74,17 +77,17 @@ if(Data & CSR0_ERR) { - PCNET_DbgPrint(("error: %x\n", Data & (CSR0_MERR|CSR0_BABL|CSR0_CERR|CSR0_MISS))) + DPRINT("error: %x\n", Data & (CSR0_MERR|CSR0_BABL|CSR0_CERR|CSR0_MISS)); if (Data & CSR0_CERR) Adapter->Statistics.XmtCollisions++; } else if(Data & CSR0_IDON) { - PCNET_DbgPrint(("IDON\n")); + DPRINT("IDON\n"); } else if(Data & CSR0_RINT) { - PCNET_DbgPrint(("receive interrupt\n")); + DPRINT("receive interrupt\n"); while(1) { @@ -94,13 +97,13 @@ if(Descriptor->FLAGS & RD_OWN) { - PCNET_DbgPrint(("no more receive descriptors to process\n")); + DPRINT("no more receive descriptors to process\n"); break; } if(Descriptor->FLAGS & RD_ERR) { - PCNET_DbgPrint(("receive descriptor error: 0x%x\n", Descriptor->FLAGS)); + DPRINT("receive descriptor error: 0x%x\n", Descriptor->FLAGS); if (Descriptor->FLAGS & RD_BUFF) Adapter->Statistics.RcvBufferErrors++; if (Descriptor->FLAGS & RD_CRC) @@ -114,14 +117,14 @@ if(!((Descriptor->FLAGS & RD_STP) && (Descriptor->FLAGS & RD_ENP))) { - PCNET_DbgPrint(("receive descriptor not start&end: 0x%x\n", Descriptor->FLAGS)); + DPRINT("receive descriptor not start&end: 0x%x\n", Descriptor->FLAGS); break; } Buffer = Adapter->ReceiveBufferPtrVirt + Adapter->CurrentReceiveDescriptorIndex * BUFFER_SIZE; ByteCount = Descriptor->MCNT & 0xfff; - PCNET_DbgPrint(("Indicating a %d-byte packet (index %d)\n", ByteCount, Adapter->CurrentReceiveDescriptorIndex)); + DPRINT("Indicating a %d-byte packet (index %d)\n", ByteCount, Adapter->CurrentReceiveDescriptorIndex); NdisMEthIndicateReceive(Adapter->MiniportAdapterHandle, 0, Buffer, 14, Buffer+14, ByteCount-14, ByteCount-14); NdisMEthIndicateReceiveComplete(Adapter->MiniportAdapterHandle); @@ -142,20 +145,20 @@ { PTRANSMIT_DESCRIPTOR Descriptor; - PCNET_DbgPrint(("transmit interrupt\n")); + DPRINT("transmit interrupt\n"); while (Adapter->CurrentTransmitStartIndex != Adapter->CurrentTransmitEndIndex) { Descriptor = Adapter->TransmitDescriptorRingVirt + Adapter->CurrentTransmitStartIndex; - PCNET_DbgPrint(("buffer %d flags %x flags2 %x\n", - Adapter->CurrentTransmitStartIndex, - Descriptor->FLAGS, Descriptor->FLAGS2)); + DPRINT("buffer %d flags %x flags2 %x\n", + Adapter->CurrentTransmitStartIndex, + Descriptor->FLAGS, Descriptor->FLAGS2); if (Descriptor->FLAGS & TD1_OWN) { - PCNET_DbgPrint(("non-TXed buffer\n")); + DPRINT("non-TXed buffer\n"); break; } @@ -169,7 +172,7 @@ if (Descriptor->FLAGS & TD1_ERR) { - PCNET_DbgPrint(("major error: %x\n", Descriptor->FLAGS2)); + DPRINT("major error: %x\n", Descriptor->FLAGS2); if (Descriptor->FLAGS2 & TD2_RTRY) Adapter->Statistics.XmtRetryErrors++; if (Descriptor->FLAGS2 & TD2_LCAR) @@ -194,7 +197,7 @@ } else { - PCNET_DbgPrint(("UNHANDLED INTERRUPT\n")); + DPRINT1("UNHANDLED INTERRUPT\n"); ASSERT(FALSE); } @@ -205,7 +208,7 @@ NdisRawWritePortUshort(Adapter->PortOffset + RDP, CSR0_IENA); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("CSR0 is now 0x%x\n", Data)); + DPRINT("CSR0 is now 0x%x\n", Data); NdisDprReleaseSpinLock(&Adapter->Lock); } @@ -232,7 +235,7 @@ if(Status != 4) { Status = NDIS_STATUS_FAILURE; - PCNET_DbgPrint(("NdisReadPciSlotInformation failed\n")); + DPRINT("NdisReadPciSlotInformation failed\n"); BREAKPOINT; return Status; } @@ -240,7 +243,7 @@ if(buf32 != PCI_ID) { Status = NDIS_STATUS_ADAPTER_NOT_FOUND; - PCNET_DbgPrint(("card in slot isn't our: 0x%x\n", 0, buf32)); + DPRINT("card in slot isn't our: 0x%x\n", 0, buf32); BREAKPOINT; return Status; } @@ -255,20 +258,20 @@ if(Status != 4) { Status = NDIS_STATUS_FAILURE; - PCNET_DbgPrint(("NdisReadPciSlotInformation failed\n")); + DPRINT("NdisReadPciSlotInformation failed\n"); BREAKPOINT; return Status; } if(!buf32) { - PCNET_DbgPrint(("No base i/o address set\n")); + DPRINT("No base i/o address set\n"); return NDIS_STATUS_FAILURE; } buf32 &= ~1; /* even up address - comes out odd for some reason */ - PCNET_DbgPrint(("detected io address 0x%x\n", buf32)); + DPRINT("detected io address 0x%x\n", buf32); Adapter->IoBaseAddress = buf32; /* get interrupt vector */ @@ -276,12 +279,12 @@ if(Status != 1) { Status = NDIS_STATUS_FAILURE; - PCNET_DbgPrint(("NdisReadPciSlotInformation failed\n")); + DPRINT1("NdisReadPciSlotInformation failed\n"); BREAKPOINT; return Status; } - PCNET_DbgPrint(("interrupt: 0x%x\n", buf8)); + DPRINT("interrupt: 0x%x\n", buf8); Adapter->InterruptVector = buf8; return NDIS_STATUS_SUCCESS; @@ -310,14 +313,14 @@ FALSE, (PVOID *)&Adapter->InitializationBlockVirt, &PhysicalAddress); if(!Adapter->InitializationBlockVirt) { - PCNET_DbgPrint(("insufficient resources\n")); + DPRINT1("insufficient resources\n"); BREAKPOINT; return NDIS_STATUS_RESOURCES; } if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0) { - PCNET_DbgPrint(("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt)); + DPRINT("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } @@ -330,14 +333,14 @@ FALSE, (PVOID *)&Adapter->TransmitDescriptorRingVirt, &PhysicalAddress); if(!Adapter->TransmitDescriptorRingVirt) { - PCNET_DbgPrint(("insufficient resources\n")); + DPRINT1("insufficient resources\n"); BREAKPOINT; return NDIS_STATUS_RESOURCES; } if(((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) { - PCNET_DbgPrint(("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt)); + DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } @@ -351,14 +354,14 @@ FALSE, (PVOID *)&Adapter->ReceiveDescriptorRingVirt, &PhysicalAddress); if(!Adapter->ReceiveDescriptorRingVirt) { - PCNET_DbgPrint(("insufficient resources\n")); + DPRINT1("insufficient resources\n"); BREAKPOINT; return NDIS_STATUS_RESOURCES; } if(((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) { - PCNET_DbgPrint(("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt)); + DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } @@ -372,14 +375,14 @@ FALSE, (PVOID *)&Adapter->TransmitBufferPtrVirt, &PhysicalAddress); if(!Adapter->TransmitBufferPtrVirt) { - PCNET_DbgPrint(("insufficient resources\n")); + DPRINT1("insufficient resources\n"); BREAKPOINT; return NDIS_STATUS_RESOURCES; } if(((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) { - PCNET_DbgPrint(("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt)); + DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } @@ -393,14 +396,14 @@ FALSE, (PVOID *)&Adapter->ReceiveBufferPtrVirt, &PhysicalAddress); if(!Adapter->ReceiveBufferPtrVirt) { - PCNET_DbgPrint(("insufficient resources\n")); + DPRINT1("insufficient resources\n"); BREAKPOINT; return NDIS_STATUS_RESOURCES; } if(((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) { - PCNET_DbgPrint(("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt)); + DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } @@ -417,7 +420,7 @@ (TransmitDescriptor+i)->FLAGS = TD1_STP | TD1_ENP; } - PCNET_DbgPrint(("transmit ring initialized\n")); + DPRINT("transmit ring initialized\n"); /* initialize rx */ ReceiveDescriptor = Adapter->ReceiveDescriptorRingVirt; @@ -428,7 +431,7 @@ (ReceiveDescriptor+i)->FLAGS = RD_OWN; } - PCNET_DbgPrint(("receive ring initialized\n")); + DPRINT("receive ring initialized\n"); return NDIS_STATUS_SUCCESS; } @@ -449,21 +452,21 @@ /* read burned-in address from card */ for(i = 0; i < 6; i++) NdisRawReadPortUchar(Adapter->PortOffset + i, Adapter->InitializationBlockVirt->PADR + i); - PCNET_DbgPrint(("MAC address: %02x-%02x-%02x-%02x-%02x-%02x\n", - Adapter->InitializationBlockVirt->PADR[0], - Adapter->InitializationBlockVirt->PADR[1], - Adapter->InitializationBlockVirt->PADR[2], - Adapter->InitializationBlockVirt->PADR[3], - Adapter->InitializationBlockVirt->PADR[4], - Adapter->InitializationBlockVirt->PADR[5])); + DPRINT("MAC address: %02x-%02x-%02x-%02x-%02x-%02x\n", + Adapter->InitializationBlockVirt->PADR[0], + Adapter->InitializationBlockVirt->PADR[1], + Adapter->InitializationBlockVirt->PADR[2], + Adapter->InitializationBlockVirt->PADR[3], + Adapter->InitializationBlockVirt->PADR[4], + Adapter->InitializationBlockVirt->PADR[5]); /* set up receive ring */ - PCNET_DbgPrint(("Receive ring physical address: 0x%x\n", Adapter->ReceiveDescriptorRingPhys)); + DPRINT("Receive ring physical address: 0x%x\n", Adapter->ReceiveDescriptorRingPhys); Adapter->InitializationBlockVirt->RDRA = (ULONG)Adapter->ReceiveDescriptorRingPhys; Adapter->InitializationBlockVirt->RLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; /* set up transmit ring */ - PCNET_DbgPrint(("Transmit ring physical address: 0x%x\n", Adapter->TransmitDescriptorRingPhys)); + DPRINT("Transmit ring physical address: 0x%x\n", Adapter->TransmitDescriptorRingPhys); Adapter->InitializationBlockVirt->TDRA = (ULONG)Adapter->TransmitDescriptorRingPhys; Adapter->InitializationBlockVirt->TLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; } @@ -548,7 +551,7 @@ PADAPTER Adapter = (PADAPTER)MiniportAdapterContext; BOOLEAN TimerCancelled; - PCNET_DbgPrint(("Called\n")); + DPRINT("Called\n"); ASSERT(Adapter); /* stop the media detection timer */ @@ -589,8 +592,8 @@ PADAPTER Adapter = (PADAPTER)SynchronizeContext; NDIS_MEDIA_STATE MediaState = MiGetMediaState(Adapter); - PCNET_DbgPrint(("Called\n")); - PCNET_DbgPrint(("MediaState: %d\n", MediaState)); + DPRINT("Called\n"); + DPRINT("MediaState: %d\n", MediaState); if (MediaState != Adapter->MediaState) { Adapter->MediaState = MediaState; @@ -642,7 +645,7 @@ { USHORT Data = 0; - PCNET_DbgPrint(("Called\n")); + DPRINT("Called\n"); /* * first reset the chip - 32-bit reset followed by 16-bit reset. if it's in 32-bit mode, it'll reset @@ -659,7 +662,7 @@ /* pause for 1ms so the chip will have time to reset */ NdisStallExecution(1); - PCNET_DbgPrint(("chip stopped\n")); + DPRINT("chip stopped\n"); /* set the software style to 2 (32 bits) */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR58); @@ -689,7 +692,7 @@ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR2); NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG)Adapter->InitializationBlockPhys >> 16) & 0xffff); - PCNET_DbgPrint(("programmed with init block\n")); + DPRINT("programmed with init block\n"); /* Set mode to 0 */ Data = 0; @@ -705,7 +708,7 @@ NdisRawWritePortUshort(Adapter->PortOffset + BDP, BCR4_LNKSTE|BCR4_FDLSE); Adapter->MediaState = MiGetMediaState(Adapter); - PCNET_DbgPrint(("card started\n")); + DPRINT("card started\n"); Adapter->Flags &= ~RESET_IN_PROGRESS; } @@ -732,37 +735,37 @@ /* see if we can read/write now */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("Port 0x%x RAP 0x%x CSR0 0x%x RDP 0x%x, Interupt status register is 0x%x\n", Adapter->PortOffset, RAP, CSR0, RDP, Data)); + DPRINT("Port 0x%x RAP 0x%x CSR0 0x%x RDP 0x%x, Interupt status register is 0x%x\n", Adapter->PortOffset, RAP, CSR0, RDP, Data); /* read the BIA */ for(i = 0; i < 6; i++) NdisRawReadPortUchar(Adapter->PortOffset + i, &address[i]); - PCNET_DbgPrint(("burned-in address: %x:%x:%x:%x:%x:%x\n", address[0], address[1], address[2], address[3], address[4], address[5])); + DPRINT("burned-in address: %x:%x:%x:%x:%x:%x\n", address[0], address[1], address[2], address[3], address[4], address[5]); /* Read status flags from CSR0 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("CSR0: 0x%x\n", Data)); + DPRINT("CSR0: 0x%x\n", Data); /* Read status flags from CSR3 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR3); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("CSR3: 0x%x\n", Data)); + DPRINT("CSR3: 0x%x\n", Data); /* Read status flags from CSR4 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR4); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("CSR4: 0x%x\n", Data)); + DPRINT("CSR4: 0x%x\n", Data); /* Read status flags from CSR5 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR5); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("CSR5: 0x%x\n", Data)); + DPRINT("CSR5: 0x%x\n", Data); /* Read status flags from CSR6 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR6); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - PCNET_DbgPrint(("CSR6: 0x%x\n", Data)); + DPRINT("CSR6: 0x%x\n", Data); return TRUE; } @@ -810,7 +813,7 @@ if(i == MediumArraySize) { Status = NDIS_STATUS_UNSUPPORTED_MEDIA; - PCNET_DbgPrint(("unsupported media\n")); + DPRINT1("unsupported media\n"); BREAKPOINT; *OpenErrorStatus = Status; return Status; @@ -823,7 +826,7 @@ if(Status != NDIS_STATUS_SUCCESS) { Status = NDIS_STATUS_RESOURCES; - PCNET_DbgPrint(("Insufficient resources\n")); + DPRINT1("Insufficient resources\n"); BREAKPOINT; *OpenErrorStatus = Status; return Status; @@ -842,7 +845,7 @@ Status = MiQueryCard(Adapter); if(Status != NDIS_STATUS_SUCCESS) { - PCNET_DbgPrint(("MiQueryCard failed\n")); + DPRINT1("MiQueryCard failed\n"); Status = NDIS_STATUS_ADAPTER_NOT_FOUND; BREAKPOINT; break; @@ -853,7 +856,7 @@ Adapter->IoBaseAddress, NUMBER_OF_PORTS); if(Status != NDIS_STATUS_SUCCESS) { - PCNET_DbgPrint(("NdisMRegisterIoPortRange failed: 0x%x\n", Status)); + DPRINT1("NdisMRegisterIoPortRange failed: 0x%x\n", Status); BREAKPOINT break; } @@ -863,7 +866,7 @@ NDIS_DMA_32BITS, 8, BUFFER_SIZE); if(Status != NDIS_STATUS_SUCCESS) { - PCNET_DbgPrint(("NdisMAllocateMapRegisters failed: 0x%x\n", Status)); + DPRINT1("NdisMAllocateMapRegisters failed: 0x%x\n", Status); BREAKPOINT break; } @@ -873,7 +876,7 @@ Adapter->InterruptVector, TRUE, TRUE, NdisInterruptLevelSensitive); if(Status != NDIS_STATUS_SUCCESS) { - PCNET_DbgPrint(("NdisMRegisterInterrupt failed: 0x%x\n", Status)); + DPRINT("NdisMRegisterInterrupt failed: 0x%x\n", Status); BREAKPOINT break; } @@ -885,7 +888,7 @@ if(Status != NDIS_STATUS_SUCCESS) { Status = NDIS_STATUS_RESOURCES; - PCNET_DbgPrint(("MiAllocateSharedMemory failed", Status)); + DPRINT("MiAllocateSharedMemory failed", Status); BREAKPOINT break; } @@ -893,7 +896,7 @@ /* set up the initialization block */ MiPrepareInitializationBlock(Adapter); - PCNET_DbgPrint(("Interrupt registered successfully\n")); + DPRINT("Interrupt registered successfully\n"); /* Initialize and start the chip */ MiInitChip(Adapter); @@ -906,7 +909,7 @@ if(Status != NDIS_STATUS_SUCCESS && Adapter) { - PCNET_DbgPrint(("Error; freeing stuff\n")); + DPRINT("Error; freeing stuff\n"); NdisMFreeMapRegisters(Adapter->MiniportAdapterHandle); /* doesn't hurt to free if we never alloc'd? */ @@ -936,7 +939,7 @@ ASSERT(0); #endif - PCNET_DbgPrint(("returning 0x%x\n", Status)); + DPRINT("returning 0x%x\n", Status); *OpenErrorStatus = Status; return Status; } @@ -963,7 +966,7 @@ USHORT Rap; PADAPTER Adapter = (PADAPTER)MiniportAdapterContext; - PCNET_DbgPrint(("Called\n")); + DPRINT("Called\n"); /* save the old RAP value */ NdisRawReadPortUshort(Adapter->PortOffset + RAP, &Rap); @@ -974,13 +977,13 @@ if(!(Data & CSR0_INTR)) { - PCNET_DbgPrint(("not our interrupt.\n")); + DPRINT("not our interrupt.\n"); *InterruptRecognized = FALSE; *QueueMiniportHandleInterrupt = FALSE; } else { - PCNET_DbgPrint(("detected our interrupt\n")); + DPRINT("detected our interrupt\n"); /* disable interrupts */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); @@ -1011,7 +1014,7 @@ * - Called by NDIS at PASSIVE_LEVEL when it thinks we need a reset */ { - PCNET_DbgPrint(("Called\n")); + DPRINT("Called\n"); /* MiniportReset doesn't do anything at the moment... perhaps this should be fixed. */ @@ -1060,7 +1063,7 @@ PVOID SourceBuffer; UINT TotalPacketLength, SourceLength, Position = 0; - PCNET_DbgPrint(("Called\n")); + DPRINT("Called\n"); NdisDprAcquireSpinLock(&Adapter->Lock); @@ -1070,7 +1073,7 @@ (Adapter->CurrentTransmitEndIndex == NUMBER_OF_BUFFERS - 1 && Adapter->CurrentTransmitStartIndex == 0)) { - PCNET_DbgPrint(("No free space in circular buffer\n")); + DPRINT("No free space in circular buffer\n"); NdisDprReleaseSpinLock(&Adapter->Lock); return NDIS_STATUS_RESOURCES; } @@ -1080,13 +1083,13 @@ NdisQueryPacket(Packet, NULL, NULL, &NdisBuffer, &TotalPacketLength); ASSERT(TotalPacketLength <= BUFFER_SIZE); - PCNET_DbgPrint(("TotalPacketLength: %x\n", TotalPacketLength)); + DPRINT("TotalPacketLength: %x\n", TotalPacketLength); while (NdisBuffer) { NdisQueryBuffer(NdisBuffer, &SourceBuffer, &SourceLength); - PCNET_DbgPrint(("Buffer: %x Length: %x\n", SourceBuffer, SourceLength)); + DPRINT("Buffer: %x Length: %x\n", SourceBuffer, SourceLength); RtlCopyMemory(Adapter->TransmitBufferPtrVirt + Adapter->CurrentTransmitEndIndex * BUFFER_SIZE + Position, _____ Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.h --- trunk/reactos/drivers/net/dd/pcnet/pcnet.h 2005-05-29 14:09:04 UTC (rev 15657) +++ trunk/reactos/drivers/net/dd/pcnet/pcnet.h 2005-05-29 14:26:21 UTC (rev 15658) @@ -139,18 +139,7 @@ /* flags */ #define RESET_IN_PROGRESS 0x1 -/* debugging */ #if DBG -#define PCNET_DbgPrint(_x) \ -{\ - DbgPrint("%s:%d %s: ", __FILE__, __LINE__, __FUNCTION__); \ - DbgPrint _x; \ -} -#else -#define PCNET_DbgPrint(_x) -#endif - -#if DBG #define BREAKPOINT __asm__ ("int $3\n"); #else #define BREAKPOINT _____ Modified: trunk/reactos/drivers/net/dd/pcnet/requests.c --- trunk/reactos/drivers/net/dd/pcnet/requests.c 2005-05-29 14:09:04 UTC (rev 15657) +++ trunk/reactos/drivers/net/dd/pcnet/requests.c 2005-05-29 14:26:21 UTC (rev 15658) @@ -37,6 +37,9 @@ #include "pcnethw.h" #include "pcnet.h" +#define NDEBUG +#include <debug.h> + /* List of supported OIDs */ static ULONG MiniportOIDList[] = { @@ -113,7 +116,7 @@ ULONG GenericULONG; PADAPTER Adapter = (PADAPTER)MiniportAdapterContext; - PCNET_DbgPrint(("Called. OID 0x%x\n", Oid)); + DPRINT("Called. OID 0x%x\n", Oid); ASSERT(Adapter); @@ -249,7 +252,7 @@ case OID_GEN_PROTOCOL_OPTIONS: { - PCNET_DbgPrint(("OID_GEN_PROTOCOL_OPTIONS.\n")); + DPRINT("OID_GEN_PROTOCOL_OPTIONS.\n"); Status = NDIS_STATUS_NOT_SUPPORTED; break; } @@ -336,7 +339,7 @@ default: { - PCNET_DbgPrint(("Unknown OID\n")); + DPRINT1("Unknown OID\n"); Status = NDIS_STATUS_NOT_SUPPORTED; break; } @@ -360,7 +363,7 @@ NdisReleaseSpinLock(&Adapter->Lock); - PCNET_DbgPrint(("Leaving. Status is 0x%x\n", Status)); + DPRINT("Leaving. Status is 0x%x\n", Status); return Status; } @@ -397,7 +400,7 @@ ASSERT(Adapter); - PCNET_DbgPrint(("Called, OID 0x%x\n", Oid)); + DPRINT("Called, OID 0x%x\n", Oid); NdisAcquireSpinLock(&Adapter->Lock); @@ -484,7 +487,7 @@ default: { - PCNET_DbgPrint(("Invalid object ID (0x%X).\n", Oid)); + DPRINT1("Invalid object ID (0x%X).\n", Oid); *BytesRead = 0; *BytesNeeded = 0; Status = NDIS_STATUS_NOT_SUPPORTED; @@ -500,7 +503,7 @@ NdisReleaseSpinLock(&Adapter->Lock); - PCNET_DbgPrint(("Leaving. Status (0x%X).\n", Status)); + DPRINT("Leaving. Status (0x%X).\n", Status); return Status; }

19 years, 6 months

[chorns] 15657: regsvr32.exe, not regsvr32.dll

by chorns＠svn.reactos.com

regsvr32.exe, not regsvr32.dll Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.xml _____ Modified: trunk/reactos/subsys/system/regsvr32/regsvr32.xml --- trunk/reactos/subsys/system/regsvr32/regsvr32.xml 2005-05-29 11:51:37 UTC (rev 15656) +++ trunk/reactos/subsys/system/regsvr32/regsvr32.xml 2005-05-29 14:09:04 UTC (rev 15657) @@ -1,4 +1,4 @@ -<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.dll"> +<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe"> <include base="regsvr32">.</include> <define name="UNICODE" /> <define name="__USE_W32API" />

19 years, 6 months

[chorns] 15656: Autodetect nasm

by chorns＠svn.reactos.com

Autodetect nasm Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-29 11:42:46 UTC (rev 15655) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-29 11:51:37 UTC (rev 15656) @@ -301,6 +301,7 @@ MingwBackend::Process () { DetectCompiler (); + DetectNetwideAssembler (); DetectPipeSupport (); DetectPCHSupport (); CreateMakefile (); @@ -486,6 +487,9 @@ fprintf ( fMakefile, "PREFIX := %s\n", compilerPrefix.c_str () ); + fprintf ( fMakefile, + "nasm := %s\n", + nasmCommand.c_str () ); GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); @@ -683,8 +687,9 @@ MingwBackend::TryToDetectThisCompiler ( const string& compiler ) { string command = ssprintf ( - "%s -v 2>%s", + "%s -v 1>%s 2>%s", compiler.c_str (), + NUL, NUL ); int exitcode = system ( command.c_str () ); return (exitcode == 0); @@ -723,7 +728,39 @@ printf ( "not detected\n" ); } +bool +MingwBackend::TryToDetectThisNetwideAssembler ( const string& assembler ) +{ + string command = ssprintf ( + "%s -h 1>%s 2>%s", + assembler.c_str (), + NUL, + NUL ); + int exitcode = system ( command.c_str () ); + return (exitcode == 0); +} + void +MingwBackend::DetectNetwideAssembler () +{ + printf ( "Detecting netwide assembler..." ); + + nasmCommand = "nasm"; + bool detectedNasm = TryToDetectThisNetwideAssembler ( nasmCommand ); +#if defined(WIN32) + if ( !detectedNasm ) + { + nasmCommand = "nasmw"; + detectedNasm = TryToDetectThisNetwideAssembler ( nasmCommand ); + } +#endif + if ( detectedNasm ) + printf ( "detected (%s)\n", nasmCommand.c_str () ); + else + printf ( "not detected\n" ); +} + +void MingwBackend::DetectPipeSupport () { printf ( "Detecting compiler -pipe support..." ); @@ -732,10 +769,11 @@ string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( - "%s -pipe -c %s -o %s 2>%s", + "%s -pipe -c %s -o %s 1>%s 2>%s", compilerCommand.c_str (), pipe_detection.c_str (), pipe_detectionObjectFilename.c_str (), + NUL, NUL ); int exitcode = system ( command.c_str () ); FILE* f = fopen ( pipe_detectionObjectFilename.c_str (), "rb" ); @@ -761,9 +799,10 @@ string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h"; string cmd = ssprintf ( - "%s -c %s 2>%s", + "%s -c %s 1>%s 2>%s", compilerCommand.c_str (), path.c_str (), + NUL, NUL ); system ( cmd.c_str () ); path += ".gch"; _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-29 11:42:46 UTC (rev 15655) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-29 11:51:37 UTC (rev 15656) @@ -53,6 +53,7 @@ Directory* directoryTree ); std::string compilerPrefix; std::string compilerCommand; + std::string nasmCommand; bool usePipe; Directory* intermediateDirectory; Directory* outputDirectory; @@ -87,6 +88,8 @@ bool IncludeDirectoryTarget ( const std::string& directory ) const; bool TryToDetectThisCompiler ( const std::string& compiler ); void DetectCompiler (); + bool TryToDetectThisNetwideAssembler ( const std::string& assembler ); + void DetectNetwideAssembler (); void DetectPipeSupport (); void DetectPCHSupport (); void ProcessModules (); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-05-29 11:42:46 UTC (rev 15655) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-05-29 11:51:37 UTC (rev 15656) @@ -899,7 +899,7 @@ fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); fprintf ( fMakefile, "\t%s -f win32 $< -o $@ %s\n", - "$(Q)nasm", + "$(Q)${nasm}", nasmflagsMacro.c_str () ); }

19 years, 6 months

[mf] 15655: implement 'delete' command

by mf＠svn.reactos.com

implement 'delete' command Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/resource.rc Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -33,7 +33,7 @@ MENUITEM "&Flytta...\tF7", ID_FILE_MOVE MENUITEM "&Kopiera...\tF8", ID_FILE_COPY MENUITEM "&I urklipp...\tF9", 118 - MENUITEM "&Ta bort\tDel", 108 + MENUITEM "&Ta bort\tDel", ID_FILE_DELETE MENUITEM "&Byt namn...", 109 MENUITEM "&Egenskaper...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -32,7 +32,7 @@ MENUITEM "&P°esunout...\tF7" , ID_FILE_MOVE MENUITEM "&KopÝrovat...\tF8" , ID_FILE_COPY MENUITEM "&Ve schrßnce...\tF9" , 118 - MENUITEM "&Smazat\tDel" , 108 + MENUITEM "&Smazat\tDel" , ID_FILE_DELETE MENUITEM "P°&ejmenovat..." , 109 MENUITEM "V&lastnosti...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -34,7 +34,7 @@ MENUITEM "&Verschieben...\tF7" , ID_FILE_MOVE MENUITEM "&Kopieren...\tF8" , ID_FILE_COPY MENUITEM "&In Zwischenablage...\tF9" , 118 - MENUITEM "&L÷schen\tEntf" , 108 + MENUITEM "&L÷schen\tEntf" , ID_FILE_DELETE MENUITEM "&Umbenennen..." , 109 MENUITEM "&Eigenschaften...\tAlt+Eingabetaste" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -34,7 +34,7 @@ MENUITEM "&Move...\tF7" , ID_FILE_MOVE MENUITEM "&Copy...\tF8" , ID_FILE_COPY MENUITEM "&In Clipboard...\tF9" , 118 - MENUITEM "&Delete\tDel" , 108 + MENUITEM "&Delete\tDel" , ID_FILE_DELETE MENUITEM "Re&name..." , 109 MENUITEM "Propert&ies...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -30,7 +30,7 @@ MENUITEM "Mo&ver...\tF7" , ID_FILE_MOVE MENUITEM "&Copiar...\tF8" , ID_FILE_COPY MENUITEM "E&n portapapeles...\tF9" , 118 - MENUITEM "&Eliminar\tDel" , 108 + MENUITEM "&Eliminar\tDel" , ID_FILE_DELETE MENUITEM "&Renombrar..." , 109 MENUITEM "&Propiedades...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -33,7 +33,7 @@ MENUITEM "&DÚplacer...\tF7" , ID_FILE_MOVE MENUITEM "&Copier...\tF8" , ID_FILE_COPY MENUITEM "P&resse-Papiers...\tF9" , 118 - MENUITEM "&Effacer\tDel" , 108 + MENUITEM "&Effacer\tDel" , ID_FILE_DELETE MENUITEM "Re&nommer..." , 109 MENUITEM "&PropriÚtÚs...\tAlt+Entree" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -33,7 +33,7 @@ MENUITEM "?t&helyezÚs...\tF7" , ID_FILE_MOVE MENUITEM "&Mßsolßs...\tF8" , ID_FILE_COPY MENUITEM "&Vßg¾lapon...\tF9" , 118 - MENUITEM "&T÷rlÚs\tDel" , 108 + MENUITEM "&T÷rlÚs\tDel" , ID_FILE_DELETE MENUITEM "?t&nevezÚs..." , 109 MENUITEM "T&ulajdonsßgok...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -33,7 +33,7 @@ MENUITEM "&Sposta...\tF7" , ID_FILE_MOVE MENUITEM "&Copia...\tF8" , ID_FILE_COPY MENUITEM "&Negli Appunti...\tF9" , 118 - MENUITEM "&Cancella\tDel" , 108 + MENUITEM "&Cancella\tDel" , ID_FILE_DELETE MENUITEM "Ri&nomina..." , 109 MENUITEM "Propri&etÓ...\tAlt+Invio" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -29,7 +29,7 @@ MENUITEM "&Verplaatsen...\tF7" , ID_FILE_MOVE MENUITEM "&KopiÙren...\tF8" , ID_FILE_COPY MENUITEM "Naar &klembord...\tF9" , 118 - MENUITEM "Ver&wijderen\tDel" , 108 + MENUITEM "Ver&wijderen\tDel" , ID_FILE_DELETE MENUITEM "&Naam wijzigen..." , 109 MENUITEM "&Eigenschappen...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -33,7 +33,7 @@ MENUITEM "&Przenie£...\tF7" , ID_FILE_MOVE MENUITEM "&Kopiuj...\tF8" , ID_FILE_COPY MENUITEM "W s&chowku...\tF9" , 118 - MENUITEM "&Usu±\tDel" , 108 + MENUITEM "&Usu±\tDel" , ID_FILE_DELETE MENUITEM "&Zmie± nazwÛ..." , 109 MENUITEM "Ustawie&nia...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -32,7 +32,7 @@ MENUITEM "&Mover...\tF7" , ID_FILE_MOVE MENUITEM "&Copiar...\tF8" , ID_FILE_COPY MENUITEM "&In Clipboard...\tF9" , 118 - MENUITEM "E&xcluir\tDel" , 108 + MENUITEM "E&xcluir\tDel" , ID_FILE_DELETE MENUITEM "Re&nomear..." , 109 MENUITEM "&Propriedades...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR @@ -160,7 +160,7 @@ MENUITEM "&Mover...\tF7" , ID_FILE_MOVE MENUITEM "&Copiar...\tF8" , ID_FILE_COPY MENUITEM "&Na Area de Transferencia...\tF9" , 118 - MENUITEM "E&xcluir\tDel" , 108 + MENUITEM "E&xcluir\tDel" , ID_FILE_DELETE MENUITEM "Re&nomear..." , 109 MENUITEM "&Propriedades...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-29 11:42:46 UTC (rev 15655) @@ -44,6 +44,7 @@ #define ID_EXECUTE 105 #define ID_FILE_MOVE 106 #define ID_FILE_COPY 107 +#define ID_FILE_DELETE 108 #define ID_FILE_EXIT 115 #define ID_FORMAT_DISK 203 #define ID_CONNECT_NETWORK_DRIVE 252 _____ Modified: trunk/reactos/subsys/system/winefile/resource.rc --- trunk/reactos/subsys/system/winefile/resource.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/resource.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -22,6 +22,7 @@ VK_F5, ID_REFRESH, VIRTKEY, NOINVERT VK_F7, ID_FILE_MOVE, VIRTKEY, NOINVERT VK_F8, ID_FILE_COPY, VIRTKEY, NOINVERT + VK_DELETE, ID_FILE_DELETE, VIRTKEY, NOINVERT VK_RETURN, ID_ACTIVATE, VIRTKEY, NOINVERT #ifndef _NO_EXTENSIONS "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -29,7 +29,7 @@ MENUITEM "&¤ÕÕýÕ±?Þ?³...\tF7" , ID_FILE_MOVE MENUITEM "&?¯´Þ¯ÔÓ?³...\tF8" , ID_FILE_COPY MENUITEM "&? ß¾¶Õ ¯ßýÕÝÓ...\tF9" , 118 - MENUITEM "&ËõÓÙÞ?³\tDel" , 108 + MENUITEM "&ËõÓÙÞ?³\tDel" , ID_FILE_DELETE MENUITEM "¤ÕÕÞýÕÝ¯ÔÓ?³..." , 109 MENUITEM "ÐÔ¯Ú±?ÔÓ...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -30,7 +30,7 @@ MENUITEM "&Move...\tF7" , ID_FILE_MOVE MENUITEM "&Copy...\tF8" , ID_FILE_COPY MENUITEM "&In Clipboard...\tF9" , 118 - MENUITEM "&Delete\tDel" , 108 + MENUITEM "&Delete\tDel" , ID_FILE_DELETE MENUITEM "Re&name..." , 109 MENUITEM "Propert&ies...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 11:42:46 UTC (rev 15655) @@ -4175,6 +4175,18 @@ } break;} + case ID_FILE_DELETE: { + TCHAR path[BUFFER_LEN]; + SHFILEOPSTRUCT shfo = {hwnd, FO_DELETE, path}; + + get_path(pane->cur, path); + + path[lstrlen(path)+1] = '\0'; + + if (!SHFileOperation(&shfo)) + refresh_child(child); + break;} + case ID_VIEW_SORT_NAME: set_sort_order(child, SORT_NAME); break; _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-29 09:58:47 UTC (rev 15654) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-29 11:42:46 UTC (rev 15655) @@ -30,7 +30,7 @@ MENUITEM "ÊãÂ»ú¿&Mú®...\tF7" , ID_FILE_MOVE MENUITEM "©?Íãú¿&Cú®...\tF8" , ID_FILE_COPY MENUITEM "??Ë??¶?¨?Õú¿&Iú®...\tF9" , 118 - MENUITEM "?¥?²ú¿&Dú®\tDel" , 108 + MENUITEM "?¥?²ú¿&Dú®\tDel" , ID_FILE_DELETE MENUITEM "©??¹ú¿&Nú®..." , 109 MENUITEM "?¶ðÈú¿&Iú®...\tAlt+Enter" , ID_EDIT_PROPERTIES MENUITEM SEPARATOR

19 years, 6 months

[mf] 15654: switch to SHFileOperation() for file copy and move operations

by mf＠svn.reactos.com

switch to SHFileOperation() for file copy and move operations Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.dsp _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 09:39:31 UTC (rev 15653) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 09:58:47 UTC (rev 15654) @@ -3811,7 +3811,6 @@ } - static BOOL is_directory(LPCTSTR target) { /*TODO correctly handle UNIX paths */ @@ -3844,7 +3843,8 @@ target[len++] = '/'; lstrcpy(target+len, path); - } + } else + lstrcpy(target, path); /* If the target already exists as directory, create a new target below this. */ if (is_directory(path)) { @@ -3854,8 +3854,7 @@ _tsplitpath(source, NULL, NULL, fname, ext); wsprintf(target, sAppend, path, fname, ext); - } else - lstrcpy(target, path); + } return TRUE; } @@ -3960,22 +3959,6 @@ } -static DWORD CALLBACK CopyProgressRoutine( - LARGE_INTEGER TotalFileSize, - LARGE_INTEGER TotalBytesTransferred, - LARGE_INTEGER StreamSize, - LARGE_INTEGER StreamBytesTransferred, - DWORD dwStreamNumber, - DWORD dwCallbackReason, - HANDLE hSourceFile, - HANDLE hDestinationFile, - LPVOID lpData -) -{ - return PROGRESS_CONTINUE; -} - - LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA); @@ -4168,14 +4151,13 @@ TCHAR source[BUFFER_LEN], target[BUFFER_LEN]; if (prompt_target(pane, source, target)) { - /*TODO handle moving of directory trees - if (is_directory(source) && drive_from_path(source)!=drive_from_path(target)) - ... - */ - if (MoveFileWithProgress(source, target, CopyProgressRoutine, NULL, MOVEFILE_COPY_ALLOWED)) + SHFILEOPSTRUCT shfo = {hwnd, FO_MOVE, source, target}; + + source[lstrlen(source)+1] = '\0'; + target[lstrlen(target)+1] = '\0'; + + if (!SHFileOperation(&shfo)) refresh_child(child); - else - display_error(hwnd, GetLastError()); } break;} @@ -4183,14 +4165,13 @@ TCHAR source[BUFFER_LEN], target[BUFFER_LEN]; if (prompt_target(pane, source, target)) { - /*TODO handle copying of directory trees - if (is_directory(source)) - ... - */ - if (CopyFileEx(source, target, CopyProgressRoutine, NULL, NULL, COPY_FILE_RESTARTABLE|COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) + SHFILEOPSTRUCT shfo = {hwnd, FO_COPY, source, target}; + + source[lstrlen(source)+1] = '\0'; + target[lstrlen(target)+1] = '\0'; + + if (!SHFileOperation(&shfo)) refresh_child(child); - else - display_error(hwnd, GetLastError()); } break;} _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-29 09:39:31 UTC (rev 15653) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-29 09:58:47 UTC (rev 15654) @@ -45,7 +45,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D WINE_UNUSED= /FR /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -71,7 +71,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D WINE_UNUSED= /FR /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -98,7 +98,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D WINE_UNUSED= /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -125,7 +125,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "UNICODE" /D WINE_UNUSED= /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D WINE_UNUSED= /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D _WIN32_WINNT=0x0501 /D WINE_UNUSED= /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG"

19 years, 6 months

[mf] 15653: handle copy/move for already existing target directories

by mf＠svn.reactos.com

handle copy/move for already existing target directories Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 08:47:23 UTC (rev 15652) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 09:39:31 UTC (rev 15653) @@ -3811,29 +3811,52 @@ } -BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) + +static BOOL is_directory(LPCTSTR target) { - int len, ret; + /*TODO correctly handle UNIX paths */ + DWORD target_attr = GetFileAttributes(target); - get_path(pane->cur, target); + if (target_attr == INVALID_FILE_ATTRIBUTES) + return FALSE; - ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), pane->hwnd, DestinationDlgProc, (LPARAM)target); - if (ret != IDOK) + return target_attr&FILE_ATTRIBUTE_DIRECTORY? TRUE: FALSE; +} + +static BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) +{ + TCHAR path[MAX_PATH]; + int len; + + get_path(pane->cur, path); + + if (DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), pane->hwnd, DestinationDlgProc, (LPARAM)path) != IDOK) return FALSE; - if (target[0]!='/' && target[1]!=':') { - get_path(pane->cur->up, source); - len = lstrlen(source); + get_path(pane->cur, source); - if (source[len-1]!='\\' && source[len-1]!='/') - source[len++] = '/'; + /* convert relative targets to absolute paths */ + if (path[0]!='/' && path[1]!=':') { + get_path(pane->cur->up, target); + len = lstrlen(target); - lstrcpy(source+len, target); - lstrcpy(target, source); + if (target[len-1]!='\\' && target[len-1]!='/') + target[len++] = '/'; + + lstrcpy(target+len, path); } - get_path(pane->cur, source); + /* If the target already exists as directory, create a new target below this. */ + if (is_directory(path)) { + TCHAR fname[_MAX_FNAME], ext[_MAX_EXT]; + const static TCHAR sAppend[] = {'%','s','/','%','s','%','s','\0'}; + _tsplitpath(source, NULL, NULL, fname, ext); + + wsprintf(target, sAppend, path, fname, ext); + } else + lstrcpy(target, path); + return TRUE; } @@ -3937,6 +3960,22 @@ } +static DWORD CALLBACK CopyProgressRoutine( + LARGE_INTEGER TotalFileSize, + LARGE_INTEGER TotalBytesTransferred, + LARGE_INTEGER StreamSize, + LARGE_INTEGER StreamBytesTransferred, + DWORD dwStreamNumber, + DWORD dwCallbackReason, + HANDLE hSourceFile, + HANDLE hDestinationFile, + LPVOID lpData +) +{ + return PROGRESS_CONTINUE; +} + + LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM lparam) { ChildWnd* child = (ChildWnd*) GetWindowLong(hwnd, GWL_USERDATA); @@ -4129,7 +4168,11 @@ TCHAR source[BUFFER_LEN], target[BUFFER_LEN]; if (prompt_target(pane, source, target)) { - if (MoveFileEx(source, target, MOVEFILE_COPY_ALLOWED)) + /*TODO handle moving of directory trees + if (is_directory(source) && drive_from_path(source)!=drive_from_path(target)) + ... + */ + if (MoveFileWithProgress(source, target, CopyProgressRoutine, NULL, MOVEFILE_COPY_ALLOWED)) refresh_child(child); else display_error(hwnd, GetLastError()); @@ -4140,7 +4183,11 @@ TCHAR source[BUFFER_LEN], target[BUFFER_LEN]; if (prompt_target(pane, source, target)) { - if (CopyFileEx(source, target, NULL, NULL, NULL, COPY_FILE_RESTARTABLE|COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) + /*TODO handle copying of directory trees + if (is_directory(source)) + ... + */ + if (CopyFileEx(source, target, CopyProgressRoutine, NULL, NULL, COPY_FILE_RESTARTABLE|COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) refresh_child(child); else display_error(hwnd, GetLastError());

19 years, 6 months

[mf] 15652: implement file copying

by mf＠svn.reactos.com

implement file copying Modified: trunk/reactos/subsys/system/winefile/Sv.rc Modified: trunk/reactos/subsys/system/winefile/cs.rc Modified: trunk/reactos/subsys/system/winefile/de.rc Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc Modified: trunk/reactos/subsys/system/winefile/fr.rc Modified: trunk/reactos/subsys/system/winefile/hu.rc Modified: trunk/reactos/subsys/system/winefile/it.rc Modified: trunk/reactos/subsys/system/winefile/nl.rc Modified: trunk/reactos/subsys/system/winefile/pl.rc Modified: trunk/reactos/subsys/system/winefile/pt.rc Modified: trunk/reactos/subsys/system/winefile/resource.h Modified: trunk/reactos/subsys/system/winefile/resource.rc Modified: trunk/reactos/subsys/system/winefile/ru.rc Modified: trunk/reactos/subsys/system/winefile/si.rc Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/zh.rc _____ Modified: trunk/reactos/subsys/system/winefile/Sv.rc --- trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/Sv.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -31,7 +31,7 @@ POPUP "&Arkiv" { MENUITEM "&Íppna\tEnter", ID_ACTIVATE MENUITEM "&Flytta...\tF7", ID_FILE_MOVE - MENUITEM "&Kopiera...\tF8", 107 + MENUITEM "&Kopiera...\tF8", ID_FILE_COPY MENUITEM "&I urklipp...\tF9", 118 MENUITEM "&Ta bort\tDel", 108 MENUITEM "&Byt namn...", 109 _____ Modified: trunk/reactos/subsys/system/winefile/cs.rc --- trunk/reactos/subsys/system/winefile/cs.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/cs.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -30,7 +30,7 @@ POPUP "&Soubor" { MENUITEM "&Otev°Ýt\tEnter" , ID_ACTIVATE MENUITEM "&P°esunout...\tF7" , ID_FILE_MOVE - MENUITEM "&KopÝrovat...\tF8" , 107 + MENUITEM "&KopÝrovat...\tF8" , ID_FILE_COPY MENUITEM "&Ve schrßnce...\tF9" , 118 MENUITEM "&Smazat\tDel" , 108 MENUITEM "P°&ejmenovat..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/de.rc --- trunk/reactos/subsys/system/winefile/de.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/de.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -32,7 +32,7 @@ POPUP "&Datei" { MENUITEM "Í&ffnen\tEingabetaste" , ID_ACTIVATE MENUITEM "&Verschieben...\tF7" , ID_FILE_MOVE - MENUITEM "&Kopieren...\tF8" , 107 + MENUITEM "&Kopieren...\tF8" , ID_FILE_COPY MENUITEM "&In Zwischenablage...\tF9" , 118 MENUITEM "&L÷schen\tEntf" , 108 MENUITEM "&Umbenennen..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -32,7 +32,7 @@ POPUP "&File" { MENUITEM "&Open\tEnter" , ID_ACTIVATE MENUITEM "&Move...\tF7" , ID_FILE_MOVE - MENUITEM "&Copy...\tF8" , 107 + MENUITEM "&Copy...\tF8" , ID_FILE_COPY MENUITEM "&In Clipboard...\tF9" , 118 MENUITEM "&Delete\tDel" , 108 MENUITEM "Re&name..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -28,7 +28,7 @@ POPUP "&Archivo" { MENUITEM "&Abrir\tEnter" , ID_ACTIVATE MENUITEM "Mo&ver...\tF7" , ID_FILE_MOVE - MENUITEM "&Copiar...\tF8" , 107 + MENUITEM "&Copiar...\tF8" , ID_FILE_COPY MENUITEM "E&n portapapeles...\tF9" , 118 MENUITEM "&Eliminar\tDel" , 108 MENUITEM "&Renombrar..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/fr.rc --- trunk/reactos/subsys/system/winefile/fr.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/fr.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -31,7 +31,7 @@ POPUP "&Fichier" { MENUITEM "&Ouvrir\tEntrÚe" , ID_ACTIVATE MENUITEM "&DÚplacer...\tF7" , ID_FILE_MOVE - MENUITEM "&Copier...\tF8" , 107 + MENUITEM "&Copier...\tF8" , ID_FILE_COPY MENUITEM "P&resse-Papiers...\tF9" , 118 MENUITEM "&Effacer\tDel" , 108 MENUITEM "Re&nommer..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/hu.rc --- trunk/reactos/subsys/system/winefile/hu.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/hu.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -31,7 +31,7 @@ POPUP "&Fßjl" { MENUITEM "&Megynitßs\tEnter" , ID_ACTIVATE MENUITEM "?t&helyezÚs...\tF7" , ID_FILE_MOVE - MENUITEM "&Mßsolßs...\tF8" , 107 + MENUITEM "&Mßsolßs...\tF8" , ID_FILE_COPY MENUITEM "&Vßg¾lapon...\tF9" , 118 MENUITEM "&T÷rlÚs\tDel" , 108 MENUITEM "?t&nevezÚs..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/it.rc --- trunk/reactos/subsys/system/winefile/it.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/it.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -31,7 +31,7 @@ POPUP "&File" { MENUITEM "&Apri\tInvio" , ID_ACTIVATE MENUITEM "&Sposta...\tF7" , ID_FILE_MOVE - MENUITEM "&Copia...\tF8" , 107 + MENUITEM "&Copia...\tF8" , ID_FILE_COPY MENUITEM "&Negli Appunti...\tF9" , 118 MENUITEM "&Cancella\tDel" , 108 MENUITEM "Ri&nomina..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -27,7 +27,7 @@ POPUP "&Bestand" { MENUITEM "&Openen\tEnter" , ID_ACTIVATE MENUITEM "&Verplaatsen...\tF7" , ID_FILE_MOVE - MENUITEM "&KopiÙren...\tF8" , 107 + MENUITEM "&KopiÙren...\tF8" , ID_FILE_COPY MENUITEM "Naar &klembord...\tF9" , 118 MENUITEM "Ver&wijderen\tDel" , 108 MENUITEM "&Naam wijzigen..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/pl.rc --- trunk/reactos/subsys/system/winefile/pl.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/pl.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -31,7 +31,7 @@ POPUP "&Plik" { MENUITEM "&Otw¾rz\tEnter" , ID_ACTIVATE MENUITEM "&Przenie£...\tF7" , ID_FILE_MOVE - MENUITEM "&Kopiuj...\tF8" , 107 + MENUITEM "&Kopiuj...\tF8" , ID_FILE_COPY MENUITEM "W s&chowku...\tF9" , 118 MENUITEM "&Usu±\tDel" , 108 MENUITEM "&Zmie± nazwÛ..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/pt.rc --- trunk/reactos/subsys/system/winefile/pt.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/pt.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -30,7 +30,7 @@ POPUP "&Arquivo" { MENUITEM "A&brir\tEnter" , ID_ACTIVATE MENUITEM "&Mover...\tF7" , ID_FILE_MOVE - MENUITEM "&Copiar...\tF8" , 107 + MENUITEM "&Copiar...\tF8" , ID_FILE_COPY MENUITEM "&In Clipboard...\tF9" , 118 MENUITEM "E&xcluir\tDel" , 108 MENUITEM "Re&nomear..." , 109 @@ -158,7 +158,7 @@ POPUP "&Ficheiro" { MENUITEM "A&brir\tEnter" , ID_ACTIVATE MENUITEM "&Mover...\tF7" , ID_FILE_MOVE - MENUITEM "&Copiar...\tF8" , 107 + MENUITEM "&Copiar...\tF8" , ID_FILE_COPY MENUITEM "&Na Area de Transferencia...\tF9" , 118 MENUITEM "E&xcluir\tDel" , 108 MENUITEM "Re&nomear..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/resource.h --- trunk/reactos/subsys/system/winefile/resource.h 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/resource.h 2005-05-29 08:47:23 UTC (rev 15652) @@ -43,6 +43,7 @@ #define ID_ACTIVATE 101 #define ID_EXECUTE 105 #define ID_FILE_MOVE 106 +#define ID_FILE_COPY 107 #define ID_FILE_EXIT 115 #define ID_FORMAT_DISK 203 #define ID_CONNECT_NETWORK_DRIVE 252 _____ Modified: trunk/reactos/subsys/system/winefile/resource.rc --- trunk/reactos/subsys/system/winefile/resource.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/resource.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -21,6 +21,7 @@ VK_F1, ID_HELP, VIRTKEY, NOINVERT VK_F5, ID_REFRESH, VIRTKEY, NOINVERT VK_F7, ID_FILE_MOVE, VIRTKEY, NOINVERT + VK_F8, ID_FILE_COPY, VIRTKEY, NOINVERT VK_RETURN, ID_ACTIVATE, VIRTKEY, NOINVERT #ifndef _NO_EXTENSIONS "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT _____ Modified: trunk/reactos/subsys/system/winefile/ru.rc --- trunk/reactos/subsys/system/winefile/ru.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/ru.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -27,7 +27,7 @@ POPUP "&ÈÓÚÙ" { MENUITEM "&??Û¹?³\tEnter" , ID_ACTIVATE MENUITEM "&¤ÕÕýÕ±?Þ?³...\tF7" , ID_FILE_MOVE - MENUITEM "&?¯´Þ¯ÔÓ?³...\tF8" , 107 + MENUITEM "&?¯´Þ¯ÔÓ?³...\tF8" , ID_FILE_COPY MENUITEM "&? ß¾¶Õ ¯ßýÕÝÓ...\tF9" , 118 MENUITEM "&ËõÓÙÞ?³\tDel" , 108 MENUITEM "¤ÕÕÞýÕÝ¯ÔÓ?³..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/si.rc --- trunk/reactos/subsys/system/winefile/si.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/si.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -28,7 +28,7 @@ POPUP "&File" { MENUITEM "&Open\tEnter" , ID_ACTIVATE MENUITEM "&Move...\tF7" , ID_FILE_MOVE - MENUITEM "&Copy...\tF8" , 107 + MENUITEM "&Copy...\tF8" , ID_FILE_COPY MENUITEM "&In Clipboard...\tF9" , 118 MENUITEM "&Delete\tDel" , 108 MENUITEM "Re&name..." , 109 _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 08:47:23 UTC (rev 15652) @@ -3811,6 +3811,33 @@ } +BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) +{ + int len, ret; + + get_path(pane->cur, target); + + ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), pane->hwnd, DestinationDlgProc, (LPARAM)target); + if (ret != IDOK) + return FALSE; + + if (target[0]!='/' && target[1]!=':') { + get_path(pane->cur->up, source); + len = lstrlen(source); + + if (source[len-1]!='\\' && source[len-1]!='/') + source[len++] = '/'; + + lstrcpy(source+len, target); + lstrcpy(target, source); + } + + get_path(pane->cur, source); + + return TRUE; +} + + static IContextMenu2* s_pctxmenu2 = NULL; #ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ @@ -4099,39 +4126,25 @@ break; case ID_FILE_MOVE: { - TCHAR new_name[BUFFER_LEN], old_name[BUFFER_LEN]; - int len, ret; + TCHAR source[BUFFER_LEN], target[BUFFER_LEN]; - get_path(pane->cur, new_name); - - ret = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(IDD_SELECT_DESTINATION), hwnd, DestinationDlgProc, (LPARAM)new_name); - if (ret != IDOK) - break; - - if (new_name[0]!='/' && new_name[1]!=':') { - get_path(pane->cur->up, old_name); - len = lstrlen(old_name); - - if (old_name[len-1]!='\\' && old_name[len-1]!='/') - old_name[len++] = '/'; - - lstrcpy(old_name+len, new_name); - lstrcpy(new_name, old_name); + if (prompt_target(pane, source, target)) { + if (MoveFileEx(source, target, MOVEFILE_COPY_ALLOWED)) + refresh_child(child); + else + display_error(hwnd, GetLastError()); } + break;} - get_path(pane->cur, old_name); + case ID_FILE_COPY: { + TCHAR source[BUFFER_LEN], target[BUFFER_LEN]; - if (MoveFileEx(old_name, new_name, MOVEFILE_COPY_ALLOWED)) { - if (pane->treePane) { - pane->root->scanned = FALSE; - pane->cur = pane->root; - activate_entry(child, pane, hwnd); - } + if (prompt_target(pane, source, target)) { + if (CopyFileEx(source, target, NULL, NULL, NULL, COPY_FILE_RESTARTABLE|COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) + refresh_child(child); else - refresh_child(child); + display_error(hwnd, GetLastError()); } - else - display_error(hwnd, GetLastError()); break;} case ID_VIEW_SORT_NAME: _____ Modified: trunk/reactos/subsys/system/winefile/zh.rc --- trunk/reactos/subsys/system/winefile/zh.rc 2005-05-29 08:38:23 UTC (rev 15651) +++ trunk/reactos/subsys/system/winefile/zh.rc 2005-05-29 08:47:23 UTC (rev 15652) @@ -28,7 +28,7 @@ POPUP "????ú¿&Fú®" { MENUITEM "???¬ú¿&Oú®\tEnter" , ID_ACTIVATE MENUITEM "ÊãÂ»ú¿&Mú®...\tF7" , ID_FILE_MOVE - MENUITEM "©?Íãú¿&Cú®...\tF8" , 107 + MENUITEM "©?Íãú¿&Cú®...\tF8" , ID_FILE_COPY MENUITEM "??Ë??¶?¨?Õú¿&Iú®...\tF9" , 118 MENUITEM "?¥?²ú¿&Dú®\tDel" , 108 MENUITEM "©??¹ú¿&Nú®..." , 109

19 years, 6 months

[mf] 15651: refresh display after executing a context menu command

by mf＠svn.reactos.com

refresh display after executing a context menu command Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 07:29:59 UTC (rev 15650) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-29 08:38:23 UTC (rev 15651) @@ -4223,7 +4223,6 @@ idx = ListBox_GetCurSel(pane->hwnd); if (idx != -1) { - HRESULT hr; Entry* entry = (Entry*) ListBox_GetItemData(pane->hwnd, idx); LPITEMIDLIST pidl_abs = get_to_absolute_pidl(entry, hwnd); @@ -4234,7 +4233,8 @@ /* get and use the parent folder to display correct context menu in all cases */ if (SUCCEEDED(SHBindToParent(pidl_abs, &IID_IShellFolder, (LPVOID*)&parentFolder, &pidlLast))) { - hr = ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, pt.x, pt.y); + if (SUCCEEDED(ShellFolderContextMenu(parentFolder, hwnd, 1, &pidlLast, pt.x, pt.y))) + refresh_child(child); (*parentFolder->lpVtbl->Release)(parentFolder); }

19 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
82
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 May 2005