Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 14485: Replace polling mode in IRP_MJ_READ by an interrupt mode.
by hpoussin＠svn.reactos.com 03 Apr '05

03 Apr '05

Replace polling mode in IRP_MJ_READ by an interrupt mode. It is a lot less CPU consuming... Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-04-03 21:31:41 UTC (rev 14484) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-04-03 21:36:15 UTC (rev 14485) @@ -64,29 +64,37 @@ SerialReceiveByte( IN PKDPC Dpc, IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION - IN PVOID pByte, // real type UCHAR - IN PVOID Unused) + IN PVOID Unused1, + IN PVOID Unused2) { PSERIAL_DEVICE_EXTENSION DeviceExtension; + PUCHAR ComPortBase; UCHAR Byte; KIRQL Irql; + UCHAR IER; NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)pDeviceExtension; - Byte = (UCHAR)(ULONG_PTR)pByte; - DPRINT1("Serial: received byte on COM%lu: 0x%02x (%c)\n", - DeviceExtension->ComPort, Byte, Byte); + ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); - Status = PushCircularBufferEntry(&DeviceExtension->InputBuffer, Byte); - if (!NT_SUCCESS(Status)) + while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) { - /* FIXME: count buffer overflow */ - return; + Byte = READ_PORT_UCHAR(SER_RBR(ComPortBase)); + DPRINT("Serial: Byte received on COM%lu: 0x%02x\n", + DeviceExtension->ComPort, Byte); + Status = PushCircularBufferEntry(&DeviceExtension->InputBuffer, Byte); + if (NT_SUCCESS(Status)) + DeviceExtension->SerialPerfStats.ReceivedCount++; + else + DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; } - DPRINT1("Serial: push to buffer done\n"); + KeSetEvent(&DeviceExtension->InputBufferNotEmpty, 0, FALSE); KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); - InterlockedIncrement(&DeviceExtension->SerialPerfStats.ReceivedCount); + + /* allow new interrupts */ + IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); + WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_DATA_RECEIVED); } VOID STDCALL @@ -100,6 +108,7 @@ PUCHAR ComPortBase; UCHAR Byte; KIRQL Irql; + UCHAR IER; NTSTATUS Status; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)pDeviceExtension; @@ -113,9 +122,15 @@ if (!NT_SUCCESS(Status)) break; WRITE_PORT_UCHAR(SER_THR(ComPortBase), Byte); + DPRINT("Serial: Byte sent to COM%lu: 0x%02x\n", + DeviceExtension->ComPort, Byte); DeviceExtension->SerialPerfStats.TransmittedCount++; - } + } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); + + /* allow new interrupts */ + IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); + WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_THR_EMPTY); } BOOLEAN STDCALL @@ -125,7 +140,6 @@ { PDEVICE_OBJECT DeviceObject; PSERIAL_DEVICE_EXTENSION DeviceExtension; - UCHAR Byte; PUCHAR ComPortBase; UCHAR Iir; @@ -139,32 +153,32 @@ Iir &= SR_IIR_ID_MASK; if ((Iir & SR_IIR_SELF) != 0) { return FALSE; } - /* FIXME: sometimes, update DeviceExtension->IER */ /* FIXME: sometimes, update DeviceExtension->MCR */ switch (Iir) { case SR_IIR_MSR_CHANGE: { + UCHAR IER; DPRINT1("Serial: SR_IIR_MSR_CHANGE\n"); + DeviceExtension->MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); /* FIXME: what to do? */ + IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); + WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_MSR_CHANGE); return TRUE; } case SR_IIR_THR_EMPTY: { DPRINT("Serial: SR_IIR_THR_EMPTY\n"); - return KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); + + KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); + return TRUE; } case SR_IIR_DATA_RECEIVED: { - DPRINT1("Serial: SR_IIR_DATA_RECEIVED\n"); - while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) - { - Byte = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - DPRINT1("Serial: Byte received: 0x%02x (%c)\n", Byte, Byte); - if (!KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, (PVOID)(ULONG_PTR)Byte, NULL)) - break; - } + DPRINT("Serial: SR_IIR_DATA_RECEIVED\n"); + + KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); return TRUE; } case SR_IIR_ERROR: _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-03 21:31:41 UTC (rev 14484) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-03 21:36:15 UTC (rev 14485) @@ -78,6 +78,7 @@ IoInitializeRemoveLock(&DeviceExtension->RemoveLock, SERIAL_TAG, 0, 0); KeInitializeSpinLock(&DeviceExtension->InputBufferLock); KeInitializeSpinLock(&DeviceExtension->OutputBufferLock); + KeInitializeEvent(&DeviceExtension->InputBufferNotEmpty, NotificationEvent, FALSE); KeInitializeDpc(&DeviceExtension->ReceivedByteDpc, SerialReceiveByte, DeviceExtension); KeInitializeDpc(&DeviceExtension->SendByteDpc, SerialSendByte, DeviceExtension); Fdo->Flags |= DO_POWER_PAGABLE; @@ -144,6 +145,7 @@ UNICODE_STRING ComPort; ULONG Vector = 0; ULONG i, j; + UCHAR IER; KIRQL Dirql; KAFFINITY Affinity = 0; KINTERRUPT_MODE InterruptMode = Latched; @@ -195,8 +197,6 @@ DeviceExtension->BaseAddress, Dirql); if (!DeviceExtension->BaseAddress) return STATUS_INSUFFICIENT_RESOURCES; - /* FIXME: we should be able to continue and use polling method - * for read/write if we don't have an interrupt */ if (!Dirql) return STATUS_INSUFFICIENT_RESOURCES; ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; @@ -205,7 +205,6 @@ DeviceExtension->UartType = SerialDetectUartType(ComPortBase); /* Get current settings */ - DeviceExtension->IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); DeviceExtension->MCR = READ_PORT_UCHAR(SER_MCR(ComPortBase)); DeviceExtension->MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); DeviceExtension->WaitMask = 0; @@ -279,11 +278,13 @@ DeviceExtension->PnpState = dsStarted; - DeviceExtension->IER |= 0x1f; /* Activate interrupt mode */ - DeviceExtension->IER &= ~1; /* FIXME: Disable receive byte interrupt */ - WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER); + /* Activate interrupt modes */ + IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); + IER |= SR_IER_DATA_RECEIVED | SR_IER_THR_EMPTY | SR_IER_LSR_CHANGE | SR_IER_MSR_CHANGE; + WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER); - DeviceExtension->MCR |= 0x03; /* Activate DTR, RTS */ + /* Activate DTR, RTS */ + DeviceExtension->MCR |= SR_MCR_DTR | SR_MCR_RTS; WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); return STATUS_SUCCESS; @@ -331,11 +332,19 @@ ULONG Irq; DPRINT1("Serial: no allocated resources for this device! Creating fake list\n"); - /* These values are resources of the ONLY serial - * port that will be managed by this driver - * (default is COM2) */ - ComPortBase = 0x2f8; - Irq = 3; + switch (((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->SerialPortNu mber) + { + case 0: + ComPortBase = 0x3f8; + Irq = 4; + break; + case 1: + ComPortBase = 0x2f8; + Irq = 3; + break; + default: + ComPortBase = Irq = 0; + } /* Create resource list */ ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-04-03 21:31:41 UTC (rev 14484) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-04-03 21:36:15 UTC (rev 14485) @@ -7,7 +7,6 @@ * * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) */ -/* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ #define NDEBUG #include "serial.h" @@ -30,84 +29,81 @@ PUCHAR ComPortBase; ULONG Length; PUCHAR Buffer; - ULONG Information = 0; - LARGE_INTEGER SystemTime, ByteTimeoutTime; UCHAR ReceivedByte; - BOOLEAN IsByteReceived; - //KIRQL Irql; + KTIMER TotalTimeoutTimer; + KIRQL Irql; + ULONG ObjectCount; + PVOID ObjectsArray[2]; + ULONG Information = 0; + NTSTATUS Status; - DPRINT("Serial: ReadBytes() called\n"); - DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); - /* FIXME: remove disabling interrupts */ - WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER & ~1); + DPRINT("Serial: UseIntervalTimeout = %s, IntervalTimeout = %lu\n", + WorkItemData->UseIntervalTimeout ? "YES" : "NO", + WorkItemData->UseIntervalTimeout ? WorkItemData->IntervalTimeout.QuadPart : 0); + DPRINT("Serial: UseTotalTimeout = %s\n", + WorkItemData->UseTotalTimeout ? "YES" : "NO"); + + ObjectCount = 1; + ObjectsArray[0] = &DeviceExtension->InputBufferNotEmpty; + if (WorkItemData->UseTotalTimeout) + { + KeInitializeTimer(&TotalTimeoutTimer); + KeSetTimer(&TotalTimeoutTimer, WorkItemData->TotalTimeoutTime, NULL); + ObjectsArray[ObjectCount] = &TotalTimeoutTimer; + ObjectCount++; + } + + /* while buffer is not fully filled */ while (Length > 0) { - /* Calculate dead line to receive the next byte */ - KeQuerySystemTime(&SystemTime); - ByteTimeoutTime.QuadPart = SystemTime.QuadPart + - WorkItemData->IntervalTimeout * 10000; + /* read already received bytes from buffer */ + KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); + while (!IsCircularBufferEmpty(&DeviceExtension->InputBuffer) + && Length > 0) + { + PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); + DPRINT("Serial: reading byte from buffer: 0x%02x\n", ReceivedByte); + + Buffer[Information++] = ReceivedByte; + Length--; + } + KeClearEvent(&DeviceExtension->InputBufferNotEmpty); + KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); - IsByteReceived = FALSE; - while (TRUE) + if (WorkItemData->DontWait + && !(WorkItemData->ReadAtLeastOneByte && Information == 0)) { -#if 1 - if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) != 0) - { - ReceivedByte = READ_PORT_UCHAR(ComPortBase); - DPRINT("Serial: received byte 0x%02x (%c)\n", ReceivedByte, ReceivedByte); - IsByteReceived = TRUE; - break; - } - else if (WorkItemData->DontWait && - !(WorkItemData->ReadAtLeastOneByte && Information == 0)) - { - DPRINT("Serial: read buffer empty\n"); - break; - } -#else - KeAcquireSpinLock(&DeviceExtension->InputBufferLock, &Irql); - if (!IsCircularBufferEmpty(&DeviceExtension->InputBuffer)) - { - CHECKPOINT1; - PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); - KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); - DPRINT("Serial: reading byte from buffer 0x%02x (%c)\n", ReceivedByte, ReceivedByte); - IsByteReceived = TRUE; - break; - } - else if (WorkItemData->DontWait && - !(WorkItemData->ReadAtLeastOneByte && Information == 0)) - { - DPRINT("Serial: read buffer empty\n"); - break; - } - KeReleaseSpinLock(&DeviceExtension->InputBufferLock, Irql); -#endif - if (IsByteReceived) break; - KeQuerySystemTime(&SystemTime); - if (WorkItemData->UseIntervalTimeout && Information > 0) - { - if (SystemTime.QuadPart >= ByteTimeoutTime.QuadPart) - break; - } - if (WorkItemData->UseTotalTimeout) - { - if (SystemTime.QuadPart >= WorkItemData->TotalTimeoutTime.QuadPart) - break; - } + DPRINT("Serial: buffer empty. Don't wait more bytes\n"); + break; } - if (!IsByteReceived) break; - Buffer[Information++] = ReceivedByte; - Length--; + + Status = KeWaitForMultipleObjects( + ObjectCount, + ObjectsArray, + WaitAny, + Executive, + KernelMode, + FALSE, + (WorkItemData->UseIntervalTimeout && Information > 0) ? &WorkItemData->IntervalTimeout : NULL, + NULL); + + if (Status == STATUS_TIMEOUT /* interval timeout */ + || Status == STATUS_WAIT_1) /* total timeout */ + { + DPRINT("Serial: timeout when reading bytes. Status = 0x%08lx\n", Status); + break; + } } - /* FIXME: remove enabling interrupts */ - WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER); + /* stop total timeout timer */ + if (WorkItemData->UseTotalTimeout) + KeCancelTimer(&TotalTimeoutTimer); + Irp->IoStatus.Information = Information; if (Information == 0) Irp->IoStatus.Status = STATUS_TIMEOUT; @@ -148,8 +144,6 @@ DPRINT("Serial: IRP_MJ_READ\n"); - /* FIXME: pend operation if possible */ - Stack = IoGetCurrentIrpStackLocation(Irp); Length = Stack->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); @@ -200,7 +194,7 @@ if (DeviceExtension->SerialTimeOuts.ReadIntervalTimeout != 0) { WorkItemData->UseIntervalTimeout = TRUE; - WorkItemData->IntervalTimeout = DeviceExtension->SerialTimeOuts.ReadIntervalTimeout; + WorkItemData->IntervalTimeout.QuadPart = DeviceExtension->SerialTimeOuts.ReadIntervalTimeout; } if (DeviceExtension->SerialTimeOuts.ReadTotalTimeoutMultiplier != 0 || DeviceExtension->SerialTimeOuts.ReadTotalTimeoutConstant != 0) _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-04-03 21:31:41 UTC (rev 14484) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-04-03 21:36:15 UTC (rev 14485) @@ -54,10 +54,12 @@ typedef enum { UartUnknown, - Uart8250, - Uart16450, - Uart16550, - Uart16550A + Uart8250, /* initial version */ + Uart16450, /* + 38.4 Kbps */ + Uart16550, /* + 115 Kbps */ + Uart16550A,/* + FIFO 16 bytes */ + Uart16650, /* + FIFO 32 bytes, 230 Kbps, power management, auto-flow */ + Uart16750 /* + FIFO 64 bytes, 460 Kbps */ } UART_TYPE; typedef struct _CIRCULAR_BUFFER @@ -90,14 +92,14 @@ SERIALPERF_STATS SerialPerfStats; SERIAL_TIMEOUTS SerialTimeOuts; - BOOLEAN IsOpened; + BOOLEAN IsOpened; + KEVENT InputBufferNotEmpty; CIRCULAR_BUFFER InputBuffer; KSPIN_LOCK InputBufferLock; CIRCULAR_BUFFER OutputBuffer; KSPIN_LOCK OutputBufferLock; /* Current values */ - UCHAR IER; /* Base+1, Interrupt Enable Register */ UCHAR MCR; /* Base+4, Modem Control Register */ UCHAR MSR; /* Base+6, Modem Status Register */ } SERIAL_DEVICE_EXTENSION, *PSERIAL_DEVICE_EXTENSION; @@ -108,7 +110,7 @@ BOOLEAN UseIntervalTimeout; BOOLEAN UseTotalTimeout; - ULONG IntervalTimeout; + LARGE_INTEGER IntervalTimeout; LARGE_INTEGER TotalTimeoutTime; BOOLEAN DontWait; BOOLEAN ReadAtLeastOneByte; @@ -120,22 +122,28 @@ /* Baud master clock */ #define BAUD_CLOCK 1843200 -#define CLOCKS_PER_BIT 16 +#define CLOCKS_PER_BIT 16 /* UART registers and bits */ -#define SER_RBR(x) ((x)+0) -#define SER_THR(x) ((x)+0) -#define SER_DLL(x) ((x)+0) -#define SER_IER(x) ((x)+1) -#define SER_DLM(x) ((x)+1) -#define SER_IIR(x) ((x)+2) +#define SER_RBR(x) ((x)+0) /* Receive Register */ +#define SER_THR(x) ((x)+0) /* Transmit Register */ +#define SER_DLL(x) ((x)+0) /* Baud Rate Divisor LSB */ +#define SER_IER(x) ((x)+1) /* Interrupt Enable Register */ +#define SR_IER_DATA_RECEIVED 0x01 +#define SR_IER_THR_EMPTY 0x02 +#define SR_IER_LSR_CHANGE 0x04 +#define SR_IER_MSR_CHANGE 0x08 +#define SR_IER_SLEEP_MODE 0x10 /* Uart >= 16750 */ +#define SR_IER_LOW_POWER 0x20 /* Uart >= 16750 */ +#define SER_DLM(x) ((x)+1) /* Baud Rate Divisor MSB */ +#define SER_IIR(x) ((x)+2) /* Interrupt Identification Register */ #define SR_IIR_SELF 0x00 #define SR_IIR_ID_MASK 0x07 #define SR_IIR_MSR_CHANGE SR_IIR_SELF #define SR_IIR_THR_EMPTY (SR_IIR_SELF | 2) #define SR_IIR_DATA_RECEIVED (SR_IIR_SELF | 4) #define SR_IIR_ERROR (SR_IIR_SELF | 6) -#define SER_FCR(x) ((x)+2) +#define SER_FCR(x) ((x)+2) /* FIFO Control Register (Uart >= 16550A) */ #define SR_FCR_ENABLE_FIFO 0x01 #define SR_FCR_CLEAR_RCVR (0x02 | SR_FCR_ENABLE_FIFO) #define SR_FCR_CLEAR_XMIT (0x04 | SR_FCR_ENABLE_FIFO) @@ -143,7 +151,7 @@ #define SR_FCR_4_BYTES (0x40 | SR_FCR_ENABLE_FIFO) #define SR_FCR_8_BYTES (0x80 | SR_FCR_ENABLE_FIFO) #define SR_FCR_14_BYTES (0xC0 | SR_FCR_ENABLE_FIFO) -#define SER_LCR(x) ((x)+3) +#define SER_LCR(x) ((x)+3) /* Line Control Register */ #define SR_LCR_CS5 0x00 #define SR_LCR_CS6 0x01 #define SR_LCR_CS7 0x02 @@ -157,16 +165,16 @@ #define SR_LCR_PSP 0x38 #define SR_LCR_BRK 0x40 #define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((x)+4) +#define SER_MCR(x) ((x)+4) /* Modem Control Register */ #define SR_MCR_DTR 0x01 #define SR_MCR_RTS 0x02 -#define SER_LSR(x) ((x)+5) +#define SER_LSR(x) ((x)+5) /* Line Status Register */ #define SR_LSR_DR 0x01 #define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((x)+6) +#define SER_MSR(x) ((x)+6) /* Modem Status Register */ #define SR_MSR_CTS 0x10 #define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((x)+7) +#define SER_SCR(x) ((x)+7) /* Scratch Pad Register */ /************************************ circularbuffer.c */

1 0

[hpoussin] 14484: Add WaitAll and WaitAny values
by hpoussin＠svn.reactos.com 03 Apr '05

03 Apr '05

Add WaitAll and WaitAny values Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-04-03 19:25:58 UTC (rev 14483) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-04-03 21:31:41 UTC (rev 14484) @@ -101,6 +101,8 @@ /* FIXME: Unknown definitions */ struct _SET_PARTITION_INFORMATION_EX; typedef ULONG WAIT_TYPE; +#define WaitAll 0 +#define WaitAny 1 typedef HANDLE TRACEHANDLE; typedef PVOID PWMILIB_CONTEXT; typedef PVOID PSYSCTL_IRP_DISPOSITION;

1 0

[chorns] 14483: Partial 'make install' implementation
by chorns＠svn.reactos.com 03 Apr '05

03 Apr '05

Partial 'make install' implementation Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/media/directory.xml Modified: branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml Added: branches/xmlbuildsystem/reactos/media/fonts/fonts.xml Added: branches/xmlbuildsystem/reactos/media/inf/inf.xml Modified: branches/xmlbuildsystem/reactos/media/nls/nls.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Added: branches/xmlbuildsystem/reactos/tools/rbuild/installfile.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-03 19:25:58 UTC (rev 14483) @@ -21,6 +21,11 @@ # a path separator at the end. The variable defaults to the current # directory. # +# ROS_INSTALL +# This variable controls where to install output files to when using +# 'make install'. N.B. Don't put a path separator at the end. The variable +# defaults to .\reactos. +# # ROS_BUILDMAP # This variable controls if map files are to be generated for executable # output files. Map files have the extension .map. The value can be either @@ -63,6 +68,7 @@ endif endif ifeq ($(HALFVERBOSEECHO),yes) + ECHO_CP =@echo [COPY] $@ ECHO_MKDIR =@echo [MKDIR] $@ ECHO_BUILDNO =@echo [BUILDNO] $@ ECHO_INVOKE =@echo [INVOKE] $< @@ -87,6 +93,7 @@ ECHO_REGTESTS=@echo [REGTESTS] $@ ECHO_TEST =@echo [TEST] $@ else + ECHO_CP = ECHO_MKDIR = ECHO_BUILDNO = ECHO_INVOKE = _____ Modified: branches/xmlbuildsystem/reactos/media/directory.xml --- branches/xmlbuildsystem/reactos/media/directory.xml 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/media/directory.xml 2005-04-03 19:25:58 UTC (rev 14483) @@ -1,6 +1,12 @@ <directory name="drivers"> <xi:include href="drivers/directory.xml" /> </directory> +<directory name="fonts"> + <xi:include href="fonts/fonts.xml" /> +</directory> +<directory name="inf"> + <xi:include href="inf/inf.xml" /> +</directory> <directory name="nls"> <xi:include href="nls/nls.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml --- branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/media/drivers/etc/etc.xml 2005-04-03 19:25:58 UTC (rev 14483) @@ -1 +1,2 @@ <cdfile base="reactos">services</cdfile> +<installfile base="system32/drivers/etc">services</installfile> _____ Added: branches/xmlbuildsystem/reactos/media/fonts/fonts.xml --- branches/xmlbuildsystem/reactos/media/fonts/fonts.xml 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/media/fonts/fonts.xml 2005-04-03 19:25:58 UTC (rev 14483) @@ -0,0 +1,28 @@ +<installfile base="media/fonts">c0419bt_.ttf</installfile> +<installfile base="media/fonts">c0582bt_.ttf</installfile> +<installfile base="media/fonts">c0583bt_.ttf</installfile> +<installfile base="media/fonts">c0611bt_.ttf</installfile> +<installfile base="media/fonts">c0632bt_.ttf</installfile> +<installfile base="media/fonts">c0633bt_.ttf</installfile> +<installfile base="media/fonts">c0648bt_.ttf</installfile> +<installfile base="media/fonts">c0649bt_.ttf</installfile> +<installfile base="media/fonts">cour.ttf</installfile> +<installfile base="media/fonts">courb.ttf</installfile> +<installfile base="media/fonts">courbi.ttf</installfile> +<installfile base="media/fonts">helb____.ttf</installfile> +<installfile base="media/fonts">TGMarlett.ttf</installfile> +<installfile base="media/fonts">timr____.ttf</installfile> +<installfile base="media/fonts">UTB_____.ttf</installfile> +<installfile base="media/fonts">UTBI____.ttf</installfile> +<installfile base="media/fonts">UTI_____.ttf</installfile> +<installfile base="media/fonts">UTRG____.ttf</installfile> +<installfile base="media/fonts">Vera.ttf</installfile> +<installfile base="media/fonts">VeraBd.ttf</installfile> +<installfile base="media/fonts">VeraBI.ttf</installfile> +<installfile base="media/fonts">VeraIt.ttf</installfile> +<installfile base="media/fonts">VeraMoBd.ttf</installfile> +<installfile base="media/fonts">VeraMoBI.ttf</installfile> +<installfile base="media/fonts">VeraMoIt.ttf</installfile> +<installfile base="media/fonts">VeraMono.ttf</installfile> +<installfile base="media/fonts">VeraSe.ttf</installfile> +<installfile base="media/fonts">VeraSeBd.ttf</installfile> _____ Added: branches/xmlbuildsystem/reactos/media/inf/inf.xml --- branches/xmlbuildsystem/reactos/media/inf/inf.xml 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/media/inf/inf.xml 2005-04-03 19:25:58 UTC (rev 14483) @@ -0,0 +1,4 @@ +<installfile base="system32/inf">layout.inf</installfile> +<installfile base="system32/inf">NET_NIC.inf</installfile> +<installfile base="system32/inf">scsi.inf</installfile> +<installfile base="system32/inf">syssetup.inf</installfile> _____ Modified: branches/xmlbuildsystem/reactos/media/nls/nls.xml --- branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/media/nls/nls.xml 2005-04-03 19:25:58 UTC (rev 14483) @@ -1,3 +1,59 @@ <cdfile base="reactos">c_437.nls</cdfile> <cdfile base="reactos">c_1252.nls</cdfile> <cdfile base="reactos">l_intl.nls</cdfile> + +<installfile base="system32">c_037.nls</installfile> +<installfile base="system32">c_037.nls</installfile> +<installfile base="system32">c_10000.nls</installfile> +<installfile base="system32">c_10006.nls</installfile> +<installfile base="system32">c_10007.nls</installfile> +<installfile base="system32">c_10029.nls</installfile> +<installfile base="system32">c_1006.nls</installfile> +<installfile base="system32">c_10079.nls</installfile> +<installfile base="system32">c_10081.nls</installfile> +<installfile base="system32">c_1026.nls</installfile> +<installfile base="system32">c_1250.nls</installfile> +<installfile base="system32">c_1251.nls</installfile> +<installfile base="system32" newname="ansi.nls">c_1252.nls</installfile> +<installfile base="system32">c_1253.nls</installfile> +<installfile base="system32">c_1254.nls</installfile> +<installfile base="system32">c_1255.nls</installfile> +<installfile base="system32">c_1256.nls</installfile> +<installfile base="system32">c_1257.nls</installfile> +<installfile base="system32">c_1258.nls</installfile> +<installfile base="system32">c_20866.nls</installfile> +<installfile base="system32">c_28591.nls</installfile> +<installfile base="system32">c_28592.nls</installfile> +<installfile base="system32">c_28593.nls</installfile> +<installfile base="system32">c_28594.nls</installfile> +<installfile base="system32">c_28595.nls</installfile> +<installfile base="system32">c_28596.nls</installfile> +<installfile base="system32">c_28597.nls</installfile> +<installfile base="system32">c_28598.nls</installfile> +<installfile base="system32">c_28599.nls</installfile> +<installfile base="system32">c_424.nls</installfile> +<installfile base="system32" newname="oem.nls">c_437.nls</installfile> +<installfile base="system32">c_500.nls</installfile> +<installfile base="system32">c_737.nls</installfile> +<installfile base="system32">c_775.nls</installfile> +<installfile base="system32">c_850.nls</installfile> +<installfile base="system32">c_852.nls</installfile> +<installfile base="system32">c_855.nls</installfile> +<installfile base="system32">c_856.nls</installfile> +<installfile base="system32">c_857.nls</installfile> +<installfile base="system32">c_860.nls</installfile> +<installfile base="system32">c_861.nls</installfile> +<installfile base="system32">c_862.nls</installfile> +<installfile base="system32">c_863.nls</installfile> +<installfile base="system32">c_864.nls</installfile> +<installfile base="system32">c_865.nls</installfile> +<installfile base="system32">c_866.nls</installfile> +<installfile base="system32">c_869.nls</installfile> +<installfile base="system32">c_874.nls</installfile> +<installfile base="system32">c_875.nls</installfile> +<installfile base="system32">c_878.nls</installfile> +<installfile base="system32">c_932.nls</installfile> +<installfile base="system32">c_936.nls</installfile> +<installfile base="system32">c_949.nls</installfile> +<installfile base="system32">c_950.nls</installfile> +<installfile base="system32" newname="casemap.nls">l_intl.nls</installfile> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-03 19:25:58 UTC (rev 14483) @@ -20,6 +20,28 @@ typedef set<string> set_string; typedef map<string,Directory*> directory_map; + +string +v2s ( const string_list& v, int wrap_at ) +{ + if ( !v.size() ) + return ""; + string s; + int wrap_count = 0; + for ( size_t i = 0; i < v.size(); i++ ) + { + if ( !v[i].size() ) + continue; + if ( wrap_at > 0 && wrap_count++ == wrap_at ) + s += " \\\n\t\t"; + else if ( s.size() ) + s += " "; + s += v[i]; + } + return s; +} + + class Directory { public: @@ -262,6 +284,7 @@ GenerateGlobalVariables (); GenerateXmlBuildFilesMacro (); ProcessModules (); + GenerateInstallTarget (); GenerateDirectories (); CheckAutomaticDependencies (); CloseMakefile (); @@ -590,3 +613,85 @@ // TODO FIXME - eventually check for ROS_USE_PCH env var and // allow that to override use_pch if true } + +string +MingwBackend::GetNonModuleInstallDirectories ( const string& installDirectory ) +{ + string directories; + for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) + { + const InstallFile& installfile = *ProjectNode.installfiles[i]; + string targetDirectory ( installDirectory + SSEP + installfile.base ); + if ( directories.size () > 0 ) + directories += " "; + directories += MingwModuleHandler::PassThruCacheDirectory ( + FixupTargetFilename ( targetDirectory ), + true ); + } + return directories; +} + +string +MingwBackend::GetInstallDirectories ( const string& installDirectory ) +{ + return GetNonModuleInstallDirectories ( installDirectory ); +} + +void +MingwBackend::GetNonModuleInstallFiles ( + vector<string>& out ) const +{ + for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) + { + const InstallFile& installfile = *ProjectNode.installfiles[i]; + out.push_back ( NormalizeFilename ( installfile.GetPath () ) ); + } +} + +void +MingwBackend::GetInstallFiles ( + vector<string>& out ) const +{ + GetNonModuleInstallFiles ( out ); +} + +void +MingwBackend::OutputInstallfileCopyCommands ( const string& installDirectory ) +{ + for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) + { + const InstallFile& installfile = *ProjectNode.installfiles[i]; + string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname; + string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( + FixupTargetFilename ( targetFilenameNoFixup ), + true ); + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s\n", + installfile.GetPath ().c_str (), + targetFilename.c_str () ); + } +} + +void +MingwBackend::GenerateInstallTarget () +{ + string installDirectoryNoFixup = "reactos"; + string installDirectory = MingwModuleHandler::PassThruCacheDirectory ( + FixupTargetFilename ( installDirectoryNoFixup ), + true ); + string installDirectories = GetInstallDirectories ( installDirectoryNoFixup ); + vector<string> vInstallFiles; + GetInstallFiles ( vInstallFiles ); + string installFiles = v2s ( vInstallFiles, 5 ); + + fprintf ( fMakefile, + "install: all %s %s %s\n", + installDirectory.c_str (), + installDirectories.c_str (), + installFiles.c_str () ); + OutputInstallfileCopyCommands ( installDirectoryNoFixup ); + fprintf ( fMakefile, + "\n" ); +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-03 19:25:58 UTC (rev 14483) @@ -12,6 +12,9 @@ class Directory; class MingwModuleHandler; +extern std::string +v2s ( const string_list& v, int wrap_at ); + class MingwBackend : public Backend { public: @@ -41,6 +44,12 @@ void DetectPipeSupport (); void DetectPCHSupport (); void ProcessModules (); + std::string GetNonModuleInstallDirectories ( const std::string& installDirectory ); + std::string GetInstallDirectories ( const std::string& installDirectory ); + void GetNonModuleInstallFiles ( std::vector<std::string>& out ) const; + void GetInstallFiles ( std::vector<std::string>& out ) const; + void OutputInstallfileCopyCommands ( const std::string& installDirectory ); + void GenerateInstallTarget (); FILE* fMakefile; bool use_pch; Directory *int_directories, *out_directories; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-03 19:25:58 UTC (rev 14483) @@ -41,26 +41,6 @@ } string -v2s ( const string_list& v, int wrap_at ) -{ - if ( !v.size() ) - return ""; - string s; - int wrap_count = 0; - for ( size_t i = 0; i < v.size(); i++ ) - { - if ( !v[i].size() ) - continue; - if ( wrap_at > 0 && wrap_count++ == wrap_at ) - s += " \\\n\t\t"; - else if ( s.size() ) - s += " "; - s += v[i]; - } - return s; -} - -string GetTargetMacro ( const Module& module, bool with_dollar ) { string s ( module.name ); @@ -1570,6 +1550,7 @@ } } + MingwBuildToolModuleHandler::MingwBuildToolModuleHandler ( const Module& module_ ) : MingwModuleHandler ( module_ ) { @@ -2206,6 +2187,8 @@ string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd ); string targetFilename ( GetTargetMacro ( module ) ); fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, "\t${cp} %s %s\n", m.GetPath ().c_str (), targetFilename.c_str () ); @@ -2221,8 +2204,12 @@ { const CDFile& cdfile = *module.project.cdfiles[i]; string targetFilenameNoFixup = bootcdDirectory + SSEP + cdfile.base + SSEP + cdfile.nameoncd; - string targetFilename = GetTargetMacro(module); + string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( + FixupTargetFilename ( targetFilenameNoFixup ), + true ); fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, "\t${cp} %s %s\n", cdfile.GetPath ().c_str (), targetFilename.c_str () ); _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/installfile.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/installfile.cpp 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/installfile.cpp 2005-04-03 19:25:58 UTC (rev 14483) @@ -0,0 +1,42 @@ +#include "pch.h" +#include <assert.h> + +#include "rbuild.h" + +using std::string; + +InstallFile::InstallFile ( const Project& project_, + const XMLElement& installfileNode, + const string& path ) + : project ( project_ ), + node ( installfileNode ) +{ + const XMLAttribute* att = node.GetAttribute ( "base", false ); + if ( att != NULL ) + base = att->value; + else + base = ""; + + att = node.GetAttribute ( "newname", false ); + if ( att != NULL ) + newname = att->value; + else + newname = node.value; + name = node.value; + this->path = path; +} + +InstallFile::~InstallFile () +{ +} + +string +InstallFile::GetPath () const +{ + return path + SSEP + name; +} + +void +InstallFile::ProcessXML() +{ +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-04-03 19:25:58 UTC (rev 14483) @@ -24,6 +24,8 @@ delete linkerFlags[i]; for ( i = 0; i < cdfiles.size (); i++ ) delete cdfiles[i]; + for ( i = 0; i < installfiles.size (); i++ ) + delete installfiles[i]; delete head; } @@ -220,6 +222,8 @@ non_if_data.ProcessXML (); for ( i = 0; i < cdfiles.size (); i++ ) cdfiles[i]->ProcessXML (); + for ( i = 0; i < installfiles.size (); i++ ) + installfiles[i]->ProcessXML (); } void @@ -251,6 +255,12 @@ cdfiles.push_back ( cdfile ); subs_invalid = true; } + else if ( e.name == "installfile" ) + { + InstallFile* installfile = new InstallFile ( *this, e, path ); + installfiles.push_back ( installfile ); + subs_invalid = true; + } else if ( e.name == "directory" ) { const XMLAttribute* att = e.GetAttribute ( "name", true ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-04-03 19:25:58 UTC (rev 14483) @@ -58,6 +58,7 @@ class AutomaticDependency; class Bootstrap; class CDFile; +class InstallFile; class PchFile; class StubbedComponent; class StubbedSymbol; @@ -89,6 +90,7 @@ std::vector<Module*> modules; std::vector<LinkerFlag*> linkerFlags; std::vector<CDFile*> cdfiles; + std::vector<InstallFile*> installfiles; IfableData non_if_data; Project ( const std::string& filename ); @@ -518,6 +520,25 @@ }; +class InstallFile +{ +public: + const Project& project; + const XMLElement& node; + std::string name; + std::string base; + std::string newname; + std::string path; + + InstallFile ( const Project& project, + const XMLElement& bootstrapNode, + const std::string& path ); + ~InstallFile (); + void ProcessXML (); + std::string GetPath () const; +}; + + class PchFile { public: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.mak 2005-04-03 19:25:58 UTC (rev 14483) @@ -117,6 +117,7 @@ define.cpp \ exception.cpp \ include.cpp \ + installfile.cpp \ linkerflag.cpp \ module.cpp \ project.cpp \ @@ -209,6 +210,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-04-03 19:15:14 UTC (rev 14482) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-04-03 19:25:58 UTC (rev 14483) @@ -341,6 +341,24 @@ None. +Installfile element +------------------- +An installfile element specifies the name of a file that is to be installed when using 'make install'. + +Syntax: + <installfile base="reactos" newname="ReadMe.txt">ReadMe.txt</installfile> + +Attributes: + base - Put file in this directory within the install directory. This attribute is optional. + newname - Name of file within the install directory. This attribute is optional. + +Value: + Name of file. + +Elements: + None. + + Invoke element -------------- An invoke element specifies the name of a module which is to be executed before the current module is processed.

1 0

[ekohl] 14482: Support marshalling of 'unique' strings.
by ekohl＠svn.reactos.com 03 Apr '05

03 Apr '05

Support marshalling of 'unique' strings. Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-04-03 19:06:49 UTC (rev 14481) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-04-03 19:15:14 UTC (rev 14482) @@ -388,8 +388,13 @@ TRACE("(pStubMsg == ^%p, pszMessage == ^%p, pFormat == ^%p)\n", pStubMsg, pszMessage, pFormat); assert(pFormat); - if (*pFormat == RPC_FC_C_CSTRING) { + if (pszMessage == NULL) { TRACE("string=%s\n", debugstr_a(pszMessage)); + len = 0; + esize = 0; + } + else if (*pFormat == RPC_FC_C_CSTRING) { + TRACE("string=%s\n", debugstr_a(pszMessage)); len = strlen(pszMessage)+1; esize = 1; } @@ -416,8 +421,10 @@ c += 8; /* offset: 0 */ NDR_LOCAL_UINT32_WRITE(c, len); /* actual length: (same) */ c += 4; - memcpy(c, pszMessage, len*esize); /* the string itself */ - c += len*esize; + if (len != 0) { + memcpy(c, pszMessage, len*esize); /* the string itself */ + c += len*esize; + } pStubMsg->Buffer = c; STD_OVERFLOW_CHECK(pStubMsg); @@ -435,7 +442,12 @@ TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); assert(pFormat); - if (*pFormat == RPC_FC_C_CSTRING) { + if (pMemory == NULL) { + /* we need 12 octets for the [maxlen, offset, len] DWORDS */ + TRACE("string=NULL\n"); + pStubMsg->BufferLength += 12 + BUFFER_PARANOIA; + } + else if (*pFormat == RPC_FC_C_CSTRING) { /* we need 12 octets for the [maxlen, offset, len] DWORDS, + 1 octet for '\0' */ TRACE("string=%s\n", debugstr_a(pMemory)); pStubMsg->BufferLength += strlen(pMemory) + 13 + BUFFER_PARANOIA; @@ -528,6 +540,11 @@ /* for clients, memory should be provided by caller */ } + if (len == 0) { + *ppMemory = NULL; + return NULL; + } + pMem = *ppMemory + ofs*esize; if (pMem != pStubMsg->Buffer) @@ -572,6 +589,8 @@ switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ break; + case RPC_FC_UP: /* unique pointer */ + break; default: FIXME("unhandled ptr type=%02x\n", type); } @@ -609,6 +628,8 @@ switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ break; + case RPC_FC_UP: /* unique pointer */ + break; default: FIXME("unhandled ptr type=%02x\n", type); } @@ -645,6 +666,8 @@ switch (type) { case RPC_FC_RP: /* ref pointer (always non-null) */ break; + case RPC_FC_UP: /* unique pointer */ + break; default: FIXME("unhandled ptr type=%02x\n", type); }

1 0

[frik85] 14481: ReactOS Package Manager
by frik85＠svn.reactos.com 03 Apr '05

03 Apr '05

ReactOS Package Manager More information: http://reactos.com/wiki/index.php/ReactOS_Package_Manager * Maarten Bosma (Dr. Fred) * Klemens Friedl (frik85) Added: trunk/rosapps/packmgr/ Added: trunk/rosapps/packmgr/gui/ Added: trunk/rosapps/packmgr/gui/en.rc Added: trunk/rosapps/packmgr/gui/generic.rc Added: trunk/rosapps/packmgr/gui/main.cpp Added: trunk/rosapps/packmgr/gui/main.h Added: trunk/rosapps/packmgr/gui/makefile Added: trunk/rosapps/packmgr/gui/packmgr.rc Added: trunk/rosapps/packmgr/gui/res/ Added: trunk/rosapps/packmgr/gui/res/blank.ico Added: trunk/rosapps/packmgr/gui/res/development.ico Added: trunk/rosapps/packmgr/gui/res/games.ico Added: trunk/rosapps/packmgr/gui/res/graphics.ico Added: trunk/rosapps/packmgr/gui/res/inet.ico Added: trunk/rosapps/packmgr/gui/res/install.ico Added: trunk/rosapps/packmgr/gui/res/installed.ico Added: trunk/rosapps/packmgr/gui/res/installsource.ico Added: trunk/rosapps/packmgr/gui/res/multimedia.ico Added: trunk/rosapps/packmgr/gui/res/office.ico Added: trunk/rosapps/packmgr/gui/res/others.ico Added: trunk/rosapps/packmgr/gui/res/packetmanager.ico Added: trunk/rosapps/packmgr/gui/res/toolbar.bmp Added: trunk/rosapps/packmgr/gui/res/tools.ico Added: trunk/rosapps/packmgr/gui/res/uninstall.ico Added: trunk/rosapps/packmgr/gui/res/update.ico Added: trunk/rosapps/packmgr/gui/resource.h Added: trunk/rosapps/packmgr/help.txt Added: trunk/rosapps/packmgr/lib/ Added: trunk/rosapps/packmgr/lib/download.cpp Added: trunk/rosapps/packmgr/lib/en.rc Added: trunk/rosapps/packmgr/lib/error.h Added: trunk/rosapps/packmgr/lib/expat.h Added: trunk/rosapps/packmgr/lib/functions.cpp Added: trunk/rosapps/packmgr/lib/log.cpp Added: trunk/rosapps/packmgr/lib/log.h Added: trunk/rosapps/packmgr/lib/main.cpp Added: trunk/rosapps/packmgr/lib/makefile Added: trunk/rosapps/packmgr/lib/package.cpp Added: trunk/rosapps/packmgr/lib/package.def Added: trunk/rosapps/packmgr/lib/package.hpp Added: trunk/rosapps/packmgr/lib/package.rc Added: trunk/rosapps/packmgr/lib/script.cpp Added: trunk/rosapps/packmgr/lib/script.h Added: trunk/rosapps/packmgr/lib/tree.cpp Added: trunk/rosapps/packmgr/makefile Added: trunk/rosapps/packmgr/tree/ Added: trunk/rosapps/packmgr/tree/abiword.inst.rps Added: trunk/rosapps/packmgr/tree/abiword.xml Added: trunk/rosapps/packmgr/tree/mozcontrol.xml Added: trunk/rosapps/packmgr/tree/mozillacontrol.inst.rps Added: trunk/rosapps/packmgr/tree/tree.xml _____ Added: trunk/rosapps/packmgr/gui/en.rc --- trunk/rosapps/packmgr/gui/en.rc 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/gui/en.rc 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,43 @@ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +/* Dialogs */ +IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 180, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Options" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "There are no options yet.", 0, 50, 95, 80, 8 +END + +IDD_DOIT DIALOG DISCARDABLE 0, 0, 180, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Performing Operations" +FONT 8, "MS Sans Serif" +BEGIN + + CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 + + CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 + + CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 + + PUSHBUTTON "Abort", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED +END + +IDR_POPUP MENU DISCARDABLE +BEGIN + POPUP "PopUp", MENUBARBREAK + BEGIN + MENUITEM "No Action", 1, GRAYED + MENUITEM "Install (recommended)", 2, GRAYED + MENUITEM "Install from Source", 3, GRAYED + MENUITEM "Update", 4, GRAYED + MENUITEM "Unnstall", 5, GRAYED + MENUITEM SEPARATOR + MENUITEM "Options", 8 + MENUITEM SEPARATOR + MENUITEM "DoIt", 6 + END +END + _____ Added: trunk/rosapps/packmgr/gui/generic.rc --- trunk/rosapps/packmgr/gui/generic.rc 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/gui/generic.rc 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,24 @@ + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_MAIN ICON DISCARDABLE "res/packetmanager.ico" +IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" + +/* TreeIcons - Categories */ +1 ICON DISCARDABLE "res/blank.ico" +2 ICON DISCARDABLE "res/inet.ico" +3 ICON DISCARDABLE "res/office.ico" +4 ICON DISCARDABLE "res/graphics.ico" +5 ICON DISCARDABLE "res/multimedia.ico" +6 ICON DISCARDABLE "res/development.ico" +7 ICON DISCARDABLE "res/games.ico" +8 ICON DISCARDABLE "res/tools.ico" +9 ICON DISCARDABLE "res/others.ico" +10 ICON DISCARDABLE "res/installed.ico" + +/* TreeIcons - Actions */ +11 ICON DISCARDABLE "res/install.ico" +12 ICON DISCARDABLE "res/installsource.ico" +13 ICON DISCARDABLE "res/update.ico" +14 ICON DISCARDABLE "res/uninstall.ico" + _____ Added: trunk/rosapps/packmgr/gui/main.cpp --- trunk/rosapps/packmgr/gui/main.cpp 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/gui/main.cpp 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,401 @@ +//////////////////////////////////////////////////////// +// +// main.cpp +// +// Implementation of the Package Manager GUI +// +// +// Maarten Bosma, 09.01.2004 +// maarten.paul(a)bosma.de +// +//////////////////////////////////////////////////////////////////// + +#include "main.h" + + +// Application's Entry Point +int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow) +{ + HWND hwnd; + MSG msg; + WNDCLASSEX wc = {0}; + + // Window creation + wc.cbSize = sizeof(WNDCLASSEX); + wc.lpszClassName = L"pgkmgr"; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = (WNDPROC)WndProc; + wc.hInstance = hinst; + wc.hIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_MAIN)); + wc.hbrBackground = (HBRUSH)(COLOR_SCROLLBAR); + + RegisterClassEx(&wc); + + hwnd = CreateWindow(L"pgkmgr", + L"ReactOS - Package Manager v0.3", + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, + CW_USEDEFAULT, + 500, 600, + NULL, NULL, + hinst, + NULL); + + + // Toolbar creation + InitCommonControls(); + + hTBar = CreateToolbarEx(hwnd, WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT, 0, 8, hinst, IDB_TOOLBAR, + Buttons, sizeof(Buttons)/sizeof(TBBUTTON), TBSIZE, TBSIZE, TBSIZE, TBSIZE, sizeof(TBBUTTON)); + + // Show the windows + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + + // Load the tree + int error = PML_LoadTree(&tree, "tree.xml", AddItem); + + if(error) + { + MessageBox(0,PML_TransError(error),0,0); + return 0; + } + + // Read the help + Help(); + + // Start getting messages + while(GetMessage(&msg,NULL,0,0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + // Close our handle + PML_CloseTree (tree); + + return 0; +} + +// Add a item to our tree +int AddItem (int id, const char* name, int parent, int icon) +{ + TV_INSERTSTRUCT tvins; + + tvins.item.lParam = (UINT)id; + tvins.item.mask = TVIF_TEXT|TVIF_PARAM; + tvins.item.pszText = (WCHAR*)name; //that is ok + tvins.item.cchTextMax = strlen(name); + tvins.hInsertAfter = TVI_LAST; + + if(icon) + { + tvins.item.iImage = icon; + tvins.item.iSelectedImage = icon; + tvins.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE; + } + + if (parent==0) + tvins.hParent = TVI_ROOT; + else + tvins.hParent = nodes[parent]; + + nodes[id] = (HTREEITEM)SendMessage(hTree, TVM_INSERTITEMA, 0, (LPARAM)&tvins); + + return 0; +} + +// Load the Help from file and display it +void Help (void) +{ + string source; + + ifstream file("help.txt", ios_base::in); + getline(file, source, '\0'); + + SetText(source.c_str()); +} + +// Create our Controls +void InitControls (HWND hwnd) +{ + + HINSTANCE hinst = GetModuleHandle(NULL); + + // Create the controls + hTree = CreateWindowEx(0, WC_TREEVIEW, L"TreeView", WS_CHILD|WS_VISIBLE|WS_BORDER|TVS_HASLINES|TVS_LINESATROOT|TVS_HASBUTTON S, + 0, 0, 0, 0, hwnd, NULL, hinst, NULL); + + hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, L"edit", PML_TransError(IDS_LOAD), WS_CHILD|WS_VISIBLE|ES_MULTILINE, + 0, 0, 100, 100, hwnd, NULL, hinst, NULL); + + hPopup = LoadMenu(hinst, MAKEINTRESOURCE(IDR_POPUP)); + + // Create Tree Icons + HIMAGELIST hIcon = ImageList_Create(16,16,ILC_COLOR32,1,1); + SendMessage(hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hIcon); + + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(1))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(11))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(12))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(13))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(14))); + + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(2))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(3))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(4))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(5))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(6))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(7))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(8))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(9))); + ImageList_AddIcon(hIcon, LoadIcon(hinst, MAKEINTRESOURCE(10))); + + // Setup Hotkeys + RegisterHotKey(hwnd, 1, MOD_CONTROL, VK_1); + RegisterHotKey(hwnd, 2, MOD_CONTROL, VK_2); + RegisterHotKey(hwnd, 3, MOD_CONTROL, VK_3); + RegisterHotKey(hwnd, 4, MOD_CONTROL, VK_4); + RegisterHotKey(hwnd, 0, MOD_CONTROL, VK_0); +} + +// Set the Icons +int SetIcon (int id, int icon) +{ + TVITEMEX item; + + item.hItem = nodes[id]; + item.iImage = icon; + item.iSelectedImage = icon; + item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; + + TreeView_SetItem(hTree, &item); + + return 1; +} + +// En- or Disable a Button inside of the toolbar and the Context Menu +int SetButton (DWORD id, BOOL state) +{ + // Change the Toorbar Button + TBBUTTONINFO ti; + + ti.cbSize = sizeof (ti); + ti.dwMask = TBIF_STATE; + + if(state) + ti.fsState = TBSTATE_ENABLED; + else + ti.fsState = TBSTATE_INDETERMINATE; + + SendMessage (hTBar, TB_SETBUTTONINFO, id, (LPARAM)&ti); + + // Change the Context Menu item + MENUITEMINFO mi; + + mi.cbSize = sizeof (mi); + mi.fMask = MIIM_STATE; + + if(state) + mi.fState = MFS_ENABLED; + + else + mi.fState = MFS_GRAYED; + + SetMenuItemInfo(hPopup, id, FALSE, &mi); + + return 1; +} + +// Set the text of the text box +int SetText (const char* text) +{ + int i = 0; + string source = text; + + // the windows does not need "\n" + // for new lines but "\r\n" + for(i=0; source[i]; i++) + if(source[i]=='\n' && source[i]!='\r') + source.insert (i++, "\r"); + + SetWindowTextA(hEdit, source.c_str()); + + return 0; +} + +// Windows Message Callback (this is where most things happen) +LRESULT CALLBACK WndProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) + { + // at the very beginning ... + case WM_CREATE: + { + InitControls(hwnd); + } + break; + + // calculate the size of the controls + case WM_SIZE: + { + RECT rcl; + SendMessage(hTBar, TB_AUTOSIZE, 0L, 0L); + GetWindowRect(hTBar, &rcl); + + int win_top = rcl.bottom - rcl.top; + int win_hight = HIWORD(lParam) - win_top; + + MoveWindow(hTree, 0, win_top, LOWORD(lParam), splitter_pos*win_hight/100, TRUE); + MoveWindow(hEdit, 0, (splitter_pos*win_hight/100)+win_top, LOWORD(lParam), win_hight, TRUE); + } + break; + + // for the treeview + case WM_NOTIFY: + { + if(((LPNMHDR)lParam)->code == TVN_SELCHANGED) + { + selected = ((LPNMTREEVIEW)lParam)->itemNew.lParam; + PML_LoadPackage (tree, selected, SetButton, SetText); + } + + else if ((int)(((LPNMHDR)lParam)->code) == NM_RCLICK) // <= ahhh LISP + { + // which item has been click on + HTREEITEM item = TreeView_GetDropHilight(hTree); + + if(item != NULL) + { + // mark the one as seleacted + SendMessage (hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)item); + TreeView_EnsureVisible (hTree, item); + } + + // create the context menu + if(selected != 0) + { + POINT pt; + GetCursorPos (&pt); + TrackPopupMenu (GetSubMenu(hPopup, 0), 0, (UINT)pt.x, (UINT)pt.y, 0, hwnd, NULL); + } + } + } + break; + + // for the toolbar + case WM_COMMAND: + { + // All Actions + if(LOWORD(wParam) <= 5 && LOWORD(wParam) >= 1) + { + if(selected) + if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon) == ERR_OK) + break; + + MessageBeep(MB_ICONHAND); + } + + // DoIt + else if(LOWORD(wParam)==6) + { + if(PML_DoIt(tree, SetStatus) == ERR_OK) + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DOIT), hwnd, StatusProc); + else + MessageBeep(MB_ICONHAND); + } + + // Help + else if(LOWORD(wParam)==7) + Help(); + + // Options + else if(LOWORD(wParam)==8) + DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsProc); + + else + MessageBox(0,0,0,0); + } + break; + + // prozess hotkeys + case WM_HOTKEY: + { + if(PML_SetAction(tree, selected, wParam, SetIcon) != ERR_OK) + MessageBeep(MB_ICONHAND); + } + break; + + // ... at the very end + case WM_DESTROY: + { + PostQuitMessage(0); + return 0; + } + } + + return DefWindowProc (hwnd, message, wParam, lParam); +} + +// Warning: This function is called from another thread +int SetStatus (int status1, int status2, WCHAR* text) +{ + // Set the Rage to 1000 + SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETRANGE32, 0, 1000); + SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETRANGE32, 0, 1000); + + // The prozessbars and the text filds + if(text) + SetDlgItemText(hStatus, IDC_TSTATUS, text); + + if(status1!=-1) + SendMessage(GetDlgItem(hStatus, IDC_STATUS1), PBM_SETPOS, status1, 0); + + if(status2!=-1) + SendMessage(GetDlgItem(hStatus, IDC_STATUS2), PBM_SETPOS, status2, 0); + + // If the Status is 1000 very thing is done + if(status1==1000) + { + EndDialog(hStatus, TRUE); + MessageBox(0,PML_TransError(status2),0,0); + } + + return 0; +} + +// Callback for the Status Dialog +INT_PTR CALLBACK StatusProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + hStatus = hwnd; + + } break; + + case WM_COMMAND: // can only be the about button + case WM_CLOSE: // the close-window-[x] + { + PML_Abort(); + EndDialog(hwnd, TRUE); + return 0; + } + } + + return 0; +} + +// Callback for the Options Dialog +INT_PTR CALLBACK OptionsProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_CLOSE: + EndDialog(hwnd, TRUE); + return 0; + } + + return 0; +} _____ Added: trunk/rosapps/packmgr/gui/main.h --- trunk/rosapps/packmgr/gui/main.h 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/gui/main.h 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,62 @@ +/////////////////////////////////////////////////// +// +// main.h +// main.cpp's lumber room :) +/////////////////////////////////////////////////// + +#include <windows.h> +#include <ntos/keyboard.h> +#include <commctrl.h> +#include <iostream> +#include <fstream> + +#include <package.hpp> +#include "resource.h" + +/* Some Variables */ + +int selected, splitter_pos = 50; + +pTree tree; +HMENU hPopup; +HWND hTBar, hTree, hEdit, hStatus; +HTREEITEM nodes [MAXNODES]; + +/* Window Callbacks */ + +LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); +INT_PTR CALLBACK StatusProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK OptionsProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +/* Prototypes */ + +void Help (void); + +int AddItem (int id, const char* name, int parent, int icon); +int SetText (const char* text); +int SetStatus (int status1, int status2, WCHAR* text); + +/* Toolbar Releated */ + +#define TBSTYLE_FLAT 2048 + +// This is the struct where the toolbar is defined +TBBUTTON Buttons [] = +{ + {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0}, + + {0, 1, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // No Action + {1, 2, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Install + {2, 3, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Install from source + {3, 4, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Update + {4, 5, TBSTATE_INDETERMINATE, TBSTYLE_BUTTON, 0L, 0}, // Unistall + + {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0}, + {5, 6, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // DoIt (tm) + {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0}, + + {6, 7, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // Help + {7, 8, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0L, 0}, // Options + + {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, 0}, +}; _____ Added: trunk/rosapps/packmgr/gui/makefile --- trunk/rosapps/packmgr/gui/makefile 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/gui/makefile 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,24 @@ + +TARGET_NAME = packmgr +TARGET_TYPE = program +TARGET_APPTYPE = windows +PATH_TO_TOP = ../../../reactos + +TARGET_SDKLIBS = kernel32.a user32.a package.a gdi32.a comctl32.a shell32.a + +TARGET_GCCLIBS = stdc++ uuid + +TARGET_OBJECTS = main.o + + +TARGET_CFLAGS = \ + -D__USE_W32API -DWIN32 -D_ROS_ \ + -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 \ + -DUNICODE -Wall -I../lib + +TARGET_CPPFLAGS = $(TARGET_CFLAGS) +TARGET_RCFLAGS = -D__USE_W32API -DNDEBUG -DWIN32 -D_ROS_ -D__WINDRES__ -DUNICODE + +include $(PATH_TO_TOP)/rules.mak +include $(TOOLS_PATH)/helper.mk +include $(TOOLS_PATH)/depend.mk _____ Added: trunk/rosapps/packmgr/gui/packmgr.rc --- trunk/rosapps/packmgr/gui/packmgr.rc 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/gui/packmgr.rc 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,18 @@ + +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Package Manager\0" +#define REACTOS_STR_INTERNAL_NAME "packmgr\0" +#define REACTOS_STR_ORIGINAL_FILENAME "packmgr.exe\0" + +#include <reactos/version.rc> + +/* For all langs */ +#include "generic.rc" + +/* Language specific */ + +#include "en.rc" + +/* EOF */ _____ Added: trunk/rosapps/packmgr/gui/res/blank.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/blank.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/development.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/development.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/games.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/games.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/graphics.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/graphics.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/inet.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/inet.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/install.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/install.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/installed.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/installed.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/installsource.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/installsource.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/multimedia.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/multimedia.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/office.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/office.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/others.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/others.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/packetmanager.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/packetmanager.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/toolbar.bmp (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/toolbar.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/tools.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/tools.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/uninstall.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/uninstall.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/res/update.ico (Binary files differ) Property changes on: trunk/rosapps/packmgr/gui/res/update.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/rosapps/packmgr/gui/resource.h --- trunk/rosapps/packmgr/gui/resource.h 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/gui/resource.h 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,14 @@ +#include "../lib/error.h" + +#define IDI_MAIN 0 + +#define TBSIZE 32 +#define IDB_TOOLBAR 0x102 +#define IDD_OPTIONS 0x103 +#define IDD_DOIT 0x104 +#define IDR_POPUP 0x105 + +#define IDC_STATUS1 0x110 +#define IDC_STATUS2 0x111 +#define IDC_CANCEL 0x112 +#define IDC_TSTATUS 0x113 _____ Added: trunk/rosapps/packmgr/help.txt --- trunk/rosapps/packmgr/help.txt 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/help.txt 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,9 @@ +Welcome to ReactOS's Package Manager ! + +WARNING: This is still pre-alfa software you can't do much with it yet. + +This is the online help. You can show it at any time by clicking on the the Questionmark Icon above. + +You can use this package manager like this: click on the +You can also use the Buttons [ctrl] + [0] to [4] to set the action. + _____ Added: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,117 @@ +//////////////////////////////////////////////////////// +// +// download.cpp +// +// Stuff related to downloading +// +// +// Maarten Bosma, 09.01.2004 +// maarten.paul(a)bosma.de +// +//////////////////////////////////////////////////////// + +#include "package.hpp" +#include "expat.h" +#include "log.h" +#include <wine/urlmon.h> + +// Server there all the files lie +const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; + +HRESULT WINAPI URLDownloadToFileA( + LPUNKNOWN pCaller, + LPCSTR szURL, + LPCSTR szFileName, + DWORD dwReserved, + LPBINDSTATUSCALLBACK lpfnCB +); + + +// Download a file +char* PML_Download (const char* name, const char* local_name = "packmgr.txt", const char* server = tree_server, BOOL totemp = TRUE) +{ + char url [MAX_PATH]; + static char path [MAX_PATH]; + + // get temp dir + if(totemp) + GetTempPathA (200, path); + + // create the local file name + if(local_name) + strcat(path, local_name); + else + strcat(path, "tmp.tmp"); + + // get the url + if(server) strcpy(url, server); + strcat(url, name); + + // make sure there is no old file + DeleteFileA (path); + + // download the file + if(URLDownloadToFileA (NULL, url, path, 0, NULL) != S_OK) + { + Log("! ERROR: Unable to download "); + LogAdd(url); + + return NULL; + } + + return path; +} + +// Download and prozess a xml file +int PML_XmlDownload (const char* url, void* usrdata, XML_StartElementHandler start, + XML_EndElementHandler end, XML_CharacterDataHandler text) +{ + char buffer[255]; + int done = 0; + + // logging + Log("* prozess the xml file: "); + LogAdd(url); + + // download the file + char* filename = PML_Download(url); + + if(!filename) + { + Log("! ERROR: Could not download the xml file"); + return ERR_DOWNL; + } + + // open the file + FILE* file = fopen(filename, "r"); + if(!file) + { + Log("! ERROR: Could not open the xml file"); + return ERR_GENERIC; + } + + // parse the xml file + XML_Parser parser = XML_ParserCreate(NULL); + XML_SetUserData (parser, usrdata); + XML_SetElementHandler(parser, start, end); + XML_SetCharacterDataHandler(parser, text); + + while (!done) + { + size_t len = fread (buffer, 1, sizeof(buffer), file); + done = len < sizeof(buffer); + + buffer[len] = 0; + if(!XML_Parse(parser, buffer, len, done)) + { + Log("! ERROR: Could not parse the xml file"); + return ERR_GENERIC; + } + } + + XML_ParserFree(parser); + fclose(file); + + return ERR_OK; +} + _____ Added: trunk/rosapps/packmgr/lib/en.rc --- trunk/rosapps/packmgr/lib/en.rc 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/lib/en.rc 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,19 @@ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_LOAD "Loading ..." + ERR_OK "Operation done." + ERR_PACK "Not all packages could be installed\n\nPlease have a look at the log file for details." + ERR_GENERIC "An error occured. \nFor more information please have a look at the log file." + ERR_DOWNL "A needed file could not be downloaded!\nFor more information please have a look at the log file." + ERR_FILE "Error while Script Execution.\nFile could not be opened." + + ERR_SYNATX "Error while Script Execution.\nWrong Synatx." + ERR_CALL "Error while Script Execution.\nCould not find function." + ERR_PARAMETER "Error while Script Execution.\nWrong Parameter(s)." +END + +/* EOF */ _____ Added: trunk/rosapps/packmgr/lib/error.h --- trunk/rosapps/packmgr/lib/error.h 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/lib/error.h 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,16 @@ +// error.h + +#define ERR_OK 0x000 +#define ERR_GENERIC 0x001 +#define ERR_DOWNL 0x002 +#define ERR_NOTODO 0x003 // without text yet +#define ERR_PACK 0x004 + +// Script +#define ERR_SYNATX 0x011 +#define ERR_CALL 0x012 +#define ERR_PARAMETER 0x013 +#define ERR_FILE 0x014 + +#define IDS_LOAD 0x254 +#define NOTFOUND -1 _____ Added: trunk/rosapps/packmgr/lib/expat.h --- trunk/rosapps/packmgr/lib/expat.h 2005-04-03 15:47:15 UTC (rev 14480) +++ trunk/rosapps/packmgr/lib/expat.h 2005-04-03 19:06:49 UTC (rev 14481) @@ -0,0 +1,1081 @@ +/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. +*/ + +#ifndef XmlParse_INCLUDED +#define XmlParse_INCLUDED 1 + +#ifdef __VMS +/* 0 1 2 3 0 1 2 3 + 1234567890123456789012345678901 1234567890123456789012345678901 */ +#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler +#define XML_SetUnparsedEntityDeclHandler XML_SetUnparsedEntDeclHandler +#define XML_SetStartNamespaceDeclHandler XML_SetStartNamespcDeclHandler +#define XML_SetExternalEntityRefHandlerArg XML_SetExternalEntRefHandlerArg +#endif + +#include <stdlib.h> + +#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) +#define XML_USE_MSC_EXTENSIONS 1 +#endif + +/* Expat tries very hard to make the API boundary very specifically + defined. There are two macros defined to control this boundary; + each of these can be defined before including this header to + achieve some different behavior, but doing so it not recommended or + tested frequently. + + XMLCALL - The calling convention to use for all calls across the + "library boundary." This will default to cdecl, and + try really hard to tell the compiler that's what we + want. + + XMLIMPORT - Whatever magic is needed to note that a function is + to be imported from a dynamically loaded library + (.dll, .so, or .sl, depending on your platform). + + The XMLCALL macro was added in Expat 1.95.7. The only one which is + expected to be directly useful in client code is XMLCALL. + + Note that on at least some Unix versions, the Expat library must be + compiled with the cdecl calling convention as the default since + system headers may assume the cdecl convention. +*/ +#ifndef XMLCALL +#if defined(XML_USE_MSC_EXTENSIONS) +#define XMLCALL __cdecl +#elif defined(__GNUC__) && defined(__i386) +//MF#define XMLCALL __attribute__((cdecl)) +#define XMLCALL//MF +#else +/* For any platform which uses this definition and supports more than + one calling convention, we need to extend this definition to + declare the convention used on that platform, if it's possible to + do so. + + If this is the case for your platform, please file a bug report + with information on how to identify your platform via the C + pre-processor and how to specify the same calling convention as the + platform's malloc() implementation. +*/ +#define XMLCALL +#endif +#endif /* not defined XMLCALL */ + + +#if !defined(XML_STATIC) && !defined(XMLIMPORT) +#ifndef XML_BUILDING_EXPAT +/* using Expat from an application */ + +#ifdef XML_USE_MSC_EXTENSIONS +#define XMLIMPORT __declspec(dllimport) +#endif + +#endif +#endif /* not defined XML_STATIC */ + +/* If we didn't define it above, define it away: */ +#ifndef XMLIMPORT +#define XMLIMPORT +#endif [truncated at 1000 lines; 2399 more skipped]

1 0

[hbirr] 14480: Removed some calls to NtOpenProcess. They aren't necessary because the process data structure contains already a process handle.
by hbirr＠svn.reactos.com 03 Apr '05

03 Apr '05

Removed some calls to NtOpenProcess. They aren't necessary because the process data structure contains already a process handle. Modified: trunk/reactos/subsys/csrss/api/process.c Modified: trunk/reactos/subsys/csrss/win32csr/conio.c _____ Modified: trunk/reactos/subsys/csrss/api/process.c --- trunk/reactos/subsys/csrss/api/process.c 2005-04-03 14:38:42 UTC (rev 14479) +++ trunk/reactos/subsys/csrss/api/process.c 2005-04-03 15:47:15 UTC (rev 14480) @@ -95,7 +95,7 @@ /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ Status = NtOpenProcess(&pProcessData->Process, PROCESS_DUP_HANDLE | PROCESS_VM_OPERATION | - PROCESS_VM_WRITE | PROCESS_CREATE_THREAD, + PROCESS_VM_WRITE | PROCESS_CREATE_THREAD | SYNCHRONIZE, &ObjectAttributes, &ClientId); if (!NT_SUCCESS(Status)) @@ -195,7 +195,6 @@ { PCSRSS_PROCESS_DATA NewProcessData; NTSTATUS Status; - HANDLE Process; CSRSS_API_REQUEST ApiRequest; CSRSS_API_REPLY ApiReply; @@ -240,8 +239,6 @@ } else { - CLIENT_ID ClientId; - NewProcessData->Console = ProcessData->Console; InterlockedIncrement( &(ProcessData->Console->Header.ReferenceCount) ); CsrInsertObject(NewProcessData, @@ -253,27 +250,15 @@ &(NewProcessData->Console->ActiveBuffer->Header) ); RtlLeaveCriticalSection(&ProcessDataLock); - ClientId.UniqueProcess = (HANDLE)NewProcessData->ProcessId; - Status = NtOpenProcess( &Process, PROCESS_DUP_HANDLE, 0, &ClientId ); + Status = NtDuplicateObject( NtCurrentProcess(), NewProcessData->Console->ActiveEvent, NewProcessData->Process, &NewProcessData->ConsoleEvent, SYNCHRONIZE, FALSE, 0 ); if( !NT_SUCCESS( Status ) ) { - DbgPrint( "CSR: NtOpenProcess() failed for handle duplication\n" ); - InterlockedDecrement( &(NewProcessData->Console->Header.ReferenceCount) ); - CsrFreeProcessData( NewProcessData->ProcessId ); - Reply->Status = Status; - return Status; - } - Status = NtDuplicateObject( NtCurrentProcess(), NewProcessData->Console->ActiveEvent, Process, &NewProcessData->ConsoleEvent, SYNCHRONIZE, FALSE, 0 ); - if( !NT_SUCCESS( Status ) ) - { DbgPrint( "CSR: NtDuplicateObject() failed: %x\n", Status ); - NtClose( Process ); InterlockedDecrement( &(NewProcessData->Console->Header.ReferenceCount) ); CsrFreeProcessData( NewProcessData->ProcessId ); Reply->Status = Status; return Status; } - NtClose( Process ); NewProcessData->CtrlDispatcher = Request->Data.CreateProcessRequest.CtrlDispatcher; RtlEnterCriticalSection(&ProcessDataLock ); InsertHeadList(&NewProcessData->Console->ProcessList, &NewProcessData->ProcessEntry); _____ Modified: trunk/reactos/subsys/csrss/win32csr/conio.c --- trunk/reactos/subsys/csrss/win32csr/conio.c 2005-04-03 14:38:42 UTC (rev 14479) +++ trunk/reactos/subsys/csrss/win32csr/conio.c 2005-04-03 15:47:15 UTC (rev 14480) @@ -238,9 +238,6 @@ CSR_API(CsrAllocConsole) { PCSRSS_CONSOLE Console; - OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID ClientId; - HANDLE Process; NTSTATUS Status; DPRINT("CsrAllocConsole\n"); @@ -293,35 +290,10 @@ return Reply->Status = Status; } - ClientId.UniqueThread = NULL; - ClientId.UniqueProcess = ProcessData->ProcessId; - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ - Status = NtOpenProcess(&Process, - PROCESS_DUP_HANDLE, - &ObjectAttributes, - &ClientId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtOpenProcess() failed for handle duplication, Status: 0x%x\n", Status); - Console->Header.ReferenceCount--; - ProcessData->Console = 0; - Win32CsrReleaseObject(ProcessData, Reply->Data.AllocConsoleReply.OutputHandle); - Win32CsrReleaseObject(ProcessData, Reply->Data.AllocConsoleReply.InputHandle); - Reply->Status = Status; - return Status; - } - if (! DuplicateHandle(GetCurrentProcess(), ProcessData->Console->ActiveEvent, - Process, &ProcessData->ConsoleEvent, EVENT_ALL_ACCESS, FALSE, 0)) + ProcessData->Process, &ProcessData->ConsoleEvent, EVENT_ALL_ACCESS, FALSE, 0)) { DPRINT1("DuplicateHandle() failed: %d\n", GetLastError); - CloseHandle(Process); Console->Header.ReferenceCount--; Win32CsrReleaseObject(ProcessData, Reply->Data.AllocConsoleReply.OutputHandle); Win32CsrReleaseObject(ProcessData, Reply->Data.AllocConsoleReply.InputHandle); @@ -329,7 +301,6 @@ Reply->Status = Status; return Status; } - CloseHandle(Process); ProcessData->CtrlDispatcher = Request->Data.AllocConsoleRequest.CtrlDispatcher; DPRINT("CSRSS:CtrlDispatcher address: %x\n", ProcessData->CtrlDispatcher); InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry);

1 0

[ea] 14479: WinTrust.dll: Update EXPORTS table
by ea＠svn.reactos.com 03 Apr '05

03 Apr '05

WinTrust.dll: Update EXPORTS table Modified: trunk/reactos/lib/wintrust/wintrust.def _____ Modified: trunk/reactos/lib/wintrust/wintrust.def --- trunk/reactos/lib/wintrust/wintrust.def 2005-04-03 14:32:47 UTC (rev 14478) +++ trunk/reactos/lib/wintrust/wintrust.def 2005-04-03 14:38:42 UTC (rev 14479) @@ -1,3 +1,131 @@ - LIBRARY wintrust.dll +EXPORTS +;CryptCATVerifyMember +;CryptSIPGetInfo +;CryptSIPGetRegWorkingFlags +;GenericChainCertificateTrust +;GenericChainFinalProv +;HTTPSCertificateTrust +;SoftpubDefCertInit +;SoftpubFreeDefUsageCallData +;SoftpubLoadDefUsageCallData +;WTHelperCertFindIssuerCertificate +;AddPersonalTrustDBPages +;CatalogCompactHashDatabase +;CryptCATAdminAcquireContext +;CryptCATAdminAddCatalog +;CryptCATAdminCalcHashFromFileHandle +;CryptCATAdminEnumCatalogFromHash +;CryptCATAdminPauseServiceForBackup +;CryptCATAdminReleaseCatalogContext +;CryptCATAdminReleaseContext +;CryptCATAdminRemoveCatalog +;CryptCATAdminResolveCatalogPath +;CryptCATCDFClose +;CryptCATCDFEnumAttributes +;CryptCATCDFEnumAttributesWithCDFTag +;CryptCATCDFEnumCatAttributes +;CryptCATCDFEnumMembers +;CryptCATCDFEnumMembersByCDFTag +;CryptCATCDFEnumMembersByCDFTagEx +;CryptCATCDFOpen +;CryptCATCatalogInfoFromContext +;CryptCATClose +;CryptCATEnumerateAttr +;CryptCATEnumerateCatAttr +;CryptCATEnumerateMember +;CryptCATGetAttrInfo +;CryptCATGetCatAttrInfo +;CryptCATGetMemberInfo +;CryptCATHandleFromStore +;CryptCATOpen +;CryptCATPersistStore +;CryptCATPutAttrInfo +;CryptCATPutCatAttrInfo +;CryptCATPutMemberInfo +;CryptCATStoreFromHandle +;CryptSIPCreateIndirectData +;CryptSIPGetSignedDataMsg +;CryptSIPPutSignedDataMsg +;CryptSIPRemoveSignedDataMsg +;CryptSIPVerifyIndirectData +;DllRegisterServer +;DllUnregisterServer +;DriverCleanupPolicy +;DriverFinalPolicy +;DriverInitializePolicy +;FindCertsByIssuer +;HTTPSFinalProv +;I_CryptCatAdminMigrateToNewCatDB +;IsCatalogFile +;MsCatConstructHashTag +;MsCatFreeHashTag +;OfficeCleanupPolicy +;OfficeInitializePolicy +;OpenPersonalTrustDBDialog +;OpenPersonalTrustDBDialogEx +;SoftpubAuthenticode +;SoftpubCheckCert +;SoftpubCleanup +;SoftpubDllRegisterServer +;SoftpubDllUnregisterServer +;SoftpubDumpStructure +;SoftpubInitialize +;SoftpubLoadMessage +;SoftpubLoadSignature +;TrustDecode +;TrustFindIssuerCertificate +;TrustFreeDecode +;TrustIsCertificateSelfSigned +;TrustOpenStores +;WTHelperCertCheckValidSignature +;WTHelperCertIsSelfSigned +;WTHelperCheckCertUsage +;WTHelperGetAgencyInfo +;WTHelperGetFileHandle +;WTHelperGetFileHash +;WTHelperGetFileName +;WTHelperGetKnownUsages +;WTHelperGetProvCertFromChain +;WTHelperGetProvPrivateDataFromChain +;WTHelperGetProvSignerFromChain +;WTHelperIsInRootStore +;WTHelperOpenKnownStores +;WTHelperProvDataFromStateData +;WVTAsn1CatMemberInfoDecode +;WVTAsn1CatMemberInfoEncode +;WVTAsn1CatNameValueDecode +;WVTAsn1CatNameValueEncode +;WVTAsn1SpcFinancialCriteriaInfoDecode +;WVTAsn1SpcFinancialCriteriaInfoEncode +;WVTAsn1SpcIndirectDataContentDecode +;WVTAsn1SpcIndirectDataContentEncode +;WVTAsn1SpcLinkDecode +;WVTAsn1SpcLinkEncode +;WVTAsn1SpcMinimalCriteriaInfoDecode +;WVTAsn1SpcMinimalCriteriaInfoEncode +;WVTAsn1SpcPeImageDataDecode +;WVTAsn1SpcPeImageDataEncode +;WVTAsn1SpcSigInfoDecode +;WVTAsn1SpcSigInfoEncode +;WVTAsn1SpcSpAgencyInfoDecode +;WVTAsn1SpcSpAgencyInfoEncode +;WVTAsn1SpcSpOpusInfoDecode +;WVTAsn1SpcSpOpusInfoEncode +;WVTAsn1SpcStatementTypeDecode +;WVTAsn1SpcStatementTypeEncode +WinVerifyTrust@12 +;WinVerifyTrustEx +WintrustAddActionID +;WintrustAddDefaultForUsage +;WintrustCertificateTrust +;WintrustGetDefaultForUsage +;WintrustGetRegPolicyFlags +;WintrustLoadFunctionPointers +;WintrustRemoveActionID +;WintrustSetRegPolicyFlags +;mscat32DllRegisterServer +;mscat32DllUnregisterServer +;mssip32DllRegisterServer +;mssip32DllUnregisterServer ; EOF

1 0

[mf] 14478: activate printer folder menu
by mf＠svn.reactos.com 03 Apr '05

03 Apr '05

activate printer folder menu Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-04-03 13:45:23 UTC (rev 14477) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-04-03 14:32:47 UTC (rev 14478) @@ -323,7 +323,7 @@ ICON_ID icon_id = ICID_NONE; - if (get_path(path)) + if (get_path(path) && _tcsncmp(path,TEXT("::{"),3)) icon_id = g_Globals._icon_cache.extract(path); if (icon_id == ICID_NONE) { _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-04-03 13:45:23 UTC (rev 14477) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2005-04-03 14:32:47 UTC (rev 14478) @@ -485,6 +485,9 @@ _shellpath_info(info) //@@ copies info -> no referenz to _create_info ! { /**todo Conversion of shell path into path string -> store into URL history + const String& path = GetDesktopFolder().get_name(info._shell_path, SHGDN_FORADDRESSBAR); + const String& parsingpath = GetDesktopFolder().get_name(info._shell_path, SHGDN_FORPARSING); + // store path into history if (info._path && *info._path) _url_history.push(info._path); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-04-03 13:45:23 UTC (rev 14477) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-04-03 14:32:47 UTC (rev 14478) @@ -235,7 +235,7 @@ TCHAR buffer[MAX_PATH]; - if ((scan_flags&SCAN_FILESYSTEM) && get_path(buffer)) { + if ((scan_flags&SCAN_FILESYSTEM) && get_path(buffer) && _tcsncmp(buffer,TEXT("::{"),3)) { Entry* entry = NULL; // eliminate useless GCC warning by initializing entry LPTSTR p = buffer + _tcslen(buffer); _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h 2005-04-03 13:45:23 UTC (rev 14477) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h 2005-04-03 14:32:47 UTC (rev 14478) @@ -50,13 +50,14 @@ #define IDC_NETWORK 0x100E #define IDC_CONNECTIONS 0x100F #define IDC_DRIVES 0x1010 -#define IDC_SETTINGS_MENU 0x1011 -#define IDC_CONTROL_PANEL 0x1012 +#define IDC_CONTROL_PANEL 0x1011 +#define IDC_SETTINGS_MENU 0x1012 #define IDC_PRINTERS 0x1013 -#define IDC_BROWSE 0x1014 -#define IDC_SEARCH_PROGRAM 0x1015 -#define IDC_SEARCH 0x1016 -#define IDC_TERMINATE 0x1017 +#define IDC_PRINTERS_MENU 0x1014 +#define IDC_BROWSE 0x1015 +#define IDC_SEARCH_PROGRAM 0x1016 +#define IDC_SEARCH 0x1017 +#define IDC_TERMINATE 0x1018 #define IDC_FIRST_MENU 0x3000 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-04-03 13:45:23 UTC (rev 14477) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-04-03 14:32:47 UTC (rev 14478) @@ -1854,31 +1854,52 @@ ExplorerPropertySheet(g_Globals._hwndDesktopBar); break; + case IDC_CONTROL_PANEL: { + CloseStartMenu(id); +#ifndef _NO_MDI + XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); + bool mdi = XMLBool(explorer_options, "mdi", true); + + if (mdi) + MDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}"), 0); + else +#endif + SDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}"), 0); + break;} + case IDC_SETTINGS_MENU: CreateSubmenu(id, CSIDL_CONTROLS, ResString(IDS_SETTINGS_MENU)); break; - case IDC_PRINTERS: + case IDC_PRINTERS: { + CloseStartMenu(id); #ifdef _ROS_ // to be removed when printer folder will be implemented MessageBox(0, TEXT("printer folder not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); #else - CreateSubmenu(id, CSIDL_PRINTERS, CSIDL_PRINTHOOD, ResString(IDS_PRINTERS)); -#endif - break; - - case IDC_CONTROL_PANEL: { - CloseStartMenu(id); #ifndef _NO_MDI XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); bool mdi = XMLBool(explorer_options, "mdi", true); if (mdi) - MDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}"), 0); + MDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B 30309D}"), 0); else #endif - SDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}"), 0); + SDIMainFrame::Create(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{ 21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069-A2DE-08002B 30309D}"), 0); +#endif break;} + case IDC_PRINTERS_MENU: + CreateSubmenu(id, CSIDL_PRINTERS, CSIDL_PRINTHOOD, ResString(IDS_PRINTERS)); +/* StartMenuFolders new_folders; + + try { + new_folders.push_back(ShellPath(TEXT("::{20D04FE0-3AEA-1069-A2D8-08002B3 0309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\\::{2227A280-3AEA-1069- A2DE-08002B30309D}"))); + } catch(COMException&) { + } + + CreateSubmenu(id, new_folders, ResString(IDS_PRINTERS));*/ + break; + case IDC_ADMIN: CreateSubmenu(id, CSIDL_COMMON_ADMINTOOLS, CSIDL_ADMINTOOLS, ResString(IDS_ADMIN)); break; @@ -2009,16 +2030,11 @@ { super::AddEntries(); -#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) - if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCONTROLPANEL)) -#endif - AddButton(ResString(IDS_CONTROL_PANEL), ICID_CONFIG, false, IDC_CONTROL_PANEL); - #ifdef _ROS_ // to be removed when printer/network will be implemented - AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS); + AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS_MENU); AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS); #else - AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS); + AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS_MENU); AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, true, IDC_CONNECTIONS); #endif AddButton(ResString(IDS_ADMIN), ICID_CONFIG, true, IDC_ADMIN); @@ -2029,6 +2045,13 @@ AddButton(ResString(IDS_SETTINGS_MENU), ICID_CONFIG, true, IDC_SETTINGS_MENU); AddButton(ResString(IDS_DESKTOPBAR_SETTINGS), ICID_CONFIG, false, ID_DESKTOPBAR_SETTINGS); + + AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS); + +#ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) + if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCONTROLPANEL)) +#endif + AddButton(ResString(IDS_CONTROL_PANEL), ICID_CONFIG, false, IDC_CONTROL_PANEL); } void BrowseMenu::AddEntries()

1 0

[greatlrd] 14477: minor change that I did forget
by greatlrd＠svn.reactos.com 03 Apr '05

03 Apr '05

minor change that I did forget Modified: trunk/reactos/subsys/system/cmd/En.rc _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-03 13:40:15 UTC (rev 14476) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-03 13:45:23 UTC (rev 14477) @@ -147,7 +147,7 @@ /%c Yes. Kill even *.* without asking.\n \ /%c Zap. Delete hidden, read-only and system files).\n" -STRING_DEL_HELP3, " %lu file%s deleted\n" +STRING_DEL_HELP3, " %lu file deleted\n" STRING_DEL_HELP4, " %lu files deleted\n"

1 0

[greatlrd] 14476: Remove more hardcode string to En.rc
by greatlrd＠svn.reactos.com 03 Apr '05

03 Apr '05

Remove more hardcode string to En.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-04-03 13:04:10 UTC (rev 14475) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-04-03 13:40:15 UTC (rev 14476) @@ -134,6 +134,23 @@ Type DATE without parameters to display the current date setting and\n \ a prompt for a new one. Press ENTER to keep the same date." +STRING_DEL_HELP1, "Deletes one or more files.\n\n \ +DEL [/%c /%c /%c /%c /%c /%c /%c] file ...\n \ +DELETE [/%c /%c /%c /%c /%c /%c /%c] file ...\n \ +ERASE [/%c /%c /%c /%c /%c /%c /%c] file ...\n\n \ + file Specifies the file(s) to delete.\n\n \ + /%c Nothing.\n \ + /%c Prompt. Ask before deleting each file.\n \ + /%c Total. Display total number of deleted files and freed disk space.\n \ + /%c Quiet.\n \ + /%c Wipe. Overwrite the file with random numbers before deleting it.\n \ + /%c Yes. Kill even *.* without asking.\n \ + /%c Zap. Delete hidden, read-only and system files).\n" + +STRING_DEL_HELP3, " %lu file%s deleted\n" + +STRING_DEL_HELP4, " %lu files deleted\n" + STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT" STRING_MKDIR_HELP, "Creates a directory.\n\n \ @@ -144,14 +161,18 @@ STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM [Comment]" +STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you sure (Y/N)?" + + STRING_CHOICE_OPTION, "YN" STRING_COPY_OPTION, "YNA" +STRING_DEL_OPTION, "AENPQSTWXYZ" STRING_ALIAS_ERROR, "Command line too long after alias expansion!\n" @@ -168,12 +189,24 @@ STRING_CMD_ERROR3, "Can't redirect to file %s\n" STRING_CMD_ERROR4, "Running %s...\n" STRING_CMD_ERROR5, "Running cmdexit.bat...\n" +STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" +STRING_COLOR_ERROR2, "error in color specification" +STRING_COLOR_ERROR3, "Color %x\n" +STRING_COLOR_ERROR4, "same colors error!" STRING_CONSOLE_ERROR, "Unknown error: %d\n" STRING_COPY_ERROR1, "Error: Cannot open source - %s!\n" STRING_COPY_ERROR2, "Error: Can't copy onto itself!\n" STRING_COPY_ERROR3, "Error writing destination!\n" STRING_COPY_ERROR4, "Error: Not implemented yet!\n" STRING_DATE_ERROR, "Invalid date." +STRING_DEL_ERROR1, "Wildcards!\n\n" +STRING_DEL_ERROR2, "Full path: %s\n" +STRING_DEL_ERROR3, "File part: %s\n" +STRING_DEL_ERROR4, "Full filename: %s\n" +STRING_DEL_ERROR5, "The file %s will be deleted! " +STRING_DEL_ERROR6, "Are you sure (Y/N)?" +STRING_DEL_ERROR7, "Deleting: %s\n" +STRING_DEL_ERROR8, "No Wildcards!\n" STRING_PARAM_ERROR, "Required parameter missing\n" _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-04-03 13:04:10 UTC (rev 14475) +++ trunk/reactos/subsys/system/cmd/color.c 2005-04-03 13:40:15 UTC (rev 14476) @@ -41,10 +41,12 @@ DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if ((wColor & 0xF) == (wColor &0xF0) >> 4) { - ConErrPuts (_T("Same colors error! (Background and foreground can't be the same color)")); + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPuts (_T((LPTSTR)szMsg)); } else { @@ -72,6 +74,8 @@ */ INT CommandColor (LPTSTR first, LPTSTR rest) { + WCHAR szMsg[RC_STRING_MAX_SIZE]; + if (_tcsncmp (rest, _T("/?"), 2) == 0) { ColorHelp (); @@ -88,15 +92,18 @@ if (StringToColor (&wColor, &rest) == FALSE) { - ConErrPuts(_T("error in color specification")); + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPuts (_T((LPTSTR)szMsg)); return 1; } - ConErrPrintf (_T("Color %x\n"), wColor); + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), wColor); if ((wColor & 0xF) == (wColor &0xF0) >> 4) { - ConErrPuts (_T("same colors error!")); + LoadString( GetModuleHandle(NULL), STRING_COLOR_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), wColor); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-04-03 13:04:10 UTC (rev 14475) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-04-03 13:40:15 UTC (rev 14476) @@ -303,7 +303,7 @@ TCHAR Options[3]; WCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, (LPTSTR) Options,sizeof(lpOptions)); + LoadString( GetModuleHandle(NULL), STRING_COPY_OPTION, (LPTSTR) Options,sizeof(Options)+sizeof(WCHAR)); lpOptions = _T(Options); LoadString( GetModuleHandle(NULL), STRING_COPY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-04-03 13:04:10 UTC (rev 14475) +++ trunk/reactos/subsys/system/cmd/del.c 2005-04-03 13:40:15 UTC (rev 14476) @@ -35,6 +35,7 @@ */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_DEL @@ -108,29 +109,30 @@ HANDLE hFile; WIN32_FIND_DATA f; + LPTSTR lpOptions; + TCHAR Options[11]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; + LONG ch; + + + + LoadString( GetModuleHandle(NULL), STRING_DEL_OPTION, (LPTSTR) Options,sizeof(Options)+sizeof(WCHAR)); + lpOptions = _T(Options); + if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Deletes one or more files.\n" - "\n" - "DEL [/N /P /T /Q /W /Y /Z] file ...\n" - "DELETE [/N /P /T /Q /W /Y /Z] file ...\n" - "ERASE [/N /P /T /Q /W /Y /Z] file ...\n" - "\n" - " file Specifies the file(s) to delete.\n" - "\n" - " /N Nothing.\n" - " /P Prompt. Ask before deleting each file.\n" - " /T Total. Display total number of deleted files and freed disk space.\n" - " /Q Quiet.\n" - " /W Wipe. Overwrite the file with random numbers before deleting it.\n" - " /Y Yes. Kill even *.* without asking.\n" - " /Z Zap. Delete hidden, read-only and system files).\n")); - + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf (_T((LPTSTR)szMsg), + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10], + lpOptions[2],Options[3],lpOptions[6],lpOptions[4],lpOptions[7],lpOptions [9],lpOptions[10] + ); return 0; } arg = split (param, &args, FALSE); - + if (args > 0) { /* check for options anywhere in command line */ @@ -140,39 +142,49 @@ { if (_tcslen (arg[i]) >= 2) { - switch (_totupper (arg[i][1])) - { - case _T('N'): - dwFlags |= DEL_NOTHING; - break; + + ch = _totupper (arg[i][1]); + + if (_totupper (lpOptions[2]) == ch) + { + dwFlags |= DEL_NOTHING; + } - case _T('P'): - dwFlags |= DEL_PROMPT; - break; + else if (_totupper (lpOptions[3]) == ch) + { + dwFlags |= DEL_PROMPT; + } + + else if (_totupper (lpOptions[4]) == ch) + { + dwFlags |= DEL_QUIET; + } - case _T('Q'): - dwFlags |= DEL_QUIET; - break; + else if (_totupper (lpOptions[5]) == ch) + { + dwFlags |= DEL_SUBDIR; + } - case _T('S'): - dwFlags |= DEL_SUBDIR; - break; + else if (_totupper (lpOptions[6]) == ch) + { + dwFlags |= DEL_TOTAL; + } - case _T('T'): - dwFlags |= DEL_TOTAL; - break; + else if (_totupper (lpOptions[7]) == ch) + { + dwFlags |= DEL_WIPE; + } - case _T('W'): - dwFlags |= DEL_WIPE; - break; - case _T('Y'): - dwFlags |= DEL_YES; - break; - case _T('Z'): - dwFlags |= DEL_ZAP; - break; - } + else if (_totupper (lpOptions[9]) == ch) + { + dwFlags |= DEL_YES; + } + else if (_totupper (lpOptions[10]) == ch) + { + dwFlags |= DEL_ZAP; + } + } nEvalArgs++; @@ -199,9 +211,11 @@ { if (!((dwFlags & DEL_YES) || (dwFlags & DEL_QUIET) || (dwFlags & DEL_PROMPT))) { - res = FilePromptYN (_T("All files in the directory will be deleted!\n" - "Are you sure (Y/N)?")); + + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + res = FilePromptYN (_T( (LPTSTR) szMsg)); + if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) break; } @@ -217,7 +231,8 @@ { /* wildcards in filespec */ #ifdef _DEBUG - ConErrPrintf (_T("Wildcards!\n\n")); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR1, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); #endif GetFullPathName (arg[i], @@ -226,8 +241,12 @@ &pFilePart); #ifdef _DEBUG - ConErrPrintf (_T("Full path: %s\n"), szFullPath); - ConErrPrintf (_T("File part: %s\n"), pFilePart); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR2, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), pFilePart); + #endif hFile = FindFirstFile (szFullPath, &f); @@ -249,13 +268,18 @@ _tcscpy (pFilePart, f.cFileName); #ifdef _DEBUG - ConErrPrintf (_T("Full filename: %s\n"), szFullPath); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR4, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); + #endif /* ask for deleting */ if (dwFlags & DEL_PROMPT) - { - ConErrPrintf (_T("The file %s will be deleted! "), szFullPath); - res = FilePromptYN (_T("Are you sure (Y/N)?")); + { + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); + res = FilePromptYN (_T((LPTSTR)szMsg)); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -264,7 +288,10 @@ } if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) - ConErrPrintf (_T("Deleting: %s\n"), szFullPath); + { + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + } /* delete the file */ if (!(dwFlags & DEL_NOTHING)) @@ -307,7 +334,8 @@ { /* no wildcards in filespec */ #ifdef _DEBUG - ConErrPrintf (_T("No Wildcards!\n")); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR8, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg)); #endif GetFullPathName (arg[i], MAX_PATH, @@ -317,8 +345,11 @@ /*ask for deleting */ if((dwFlags & DEL_PROMPT) && (FindFirstFile(szFullPath, &f) != INVALID_HANDLE_VALUE)) //Don't ask if the file doesn't exist, the following code will make the error-msg { - ConErrPrintf (_T("The file %s will be deleted! "), szFullPath); - res = FilePromptYN (_T("Are you sure (Y/N)?")); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR5, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR6, (LPTSTR) szMsg,sizeof(szMsg)); + res = FilePromptYN (_T((LPTSTR)szMsg)); if ((res == PROMPT_NO) || (res == PROMPT_BREAK)) { @@ -327,10 +358,14 @@ } #ifdef _DEBUG - ConErrPrintf (_T("Full path: %s\n"), szFullPath); + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR3, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); #endif if (!(dwFlags & DEL_QUIET) && !(dwFlags & DEL_TOTAL)) - ConOutPrintf (_T("Deleting %s\n"), szFullPath); + { + LoadString( GetModuleHandle(NULL), STRING_DEL_ERROR7, (LPTSTR) szMsg,sizeof(szMsg)); + ConErrPrintf (_T((LPTSTR)szMsg), szFullPath); + } if (!(dwFlags & DEL_NOTHING)) { @@ -380,12 +415,16 @@ if (!(dwFlags & DEL_QUIET)) { - if (dwFiles == 0) - ConOutPrintf (_T(" 0 files deleted\n")); + if (dwFiles < 2) + { + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP3, (LPTSTR) szMsg,sizeof(szMsg)); + } else - ConOutPrintf (_T(" %lu file%s deleted\n"), - dwFiles, - (dwFiles == 1) ? _T("") : _T("s")); + { + LoadString( GetModuleHandle(NULL), STRING_DEL_HELP4, (LPTSTR) szMsg,sizeof(szMsg)); + } + + ConOutPrintf (_T((LPTSTR)szMsg), dwFiles); } return 0; _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-04-03 13:04:10 UTC (rev 14475) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-04-03 13:40:15 UTC (rev 14476) @@ -2,8 +2,8 @@ #define STRING_CHOICE_OPTION 200 #define STRING_COPY_OPTION 201 +#define STRING_DEL_OPTION 202 - #define STRING_ALIAS_ERROR 300 #define STRING_BATCH_ERROR 301 #define STRING_CHCP_ERROR1 302 @@ -18,13 +18,25 @@ #define STRING_CMD_ERROR3 311 #define STRING_CMD_ERROR4 312 #define STRING_CMD_ERROR5 313 -#define STRING_CONSOLE_ERROR 314 -#define STRING_COPY_ERROR1 315 -#define STRING_COPY_ERROR2 316 -#define STRING_COPY_ERROR3 317 -#define STRING_COPY_ERROR4 318 -#define STRING_DATE_ERROR 319 -#define STRING_PARAM_ERROR 320 +#define STRING_COLOR_ERROR1 314 +#define STRING_COLOR_ERROR2 315 +#define STRING_COLOR_ERROR3 316 +#define STRING_COLOR_ERROR4 317 +#define STRING_CONSOLE_ERROR 318 +#define STRING_COPY_ERROR1 319 +#define STRING_COPY_ERROR2 320 +#define STRING_COPY_ERROR3 321 +#define STRING_COPY_ERROR4 322 +#define STRING_DATE_ERROR 323 +#define STRING_DEL_ERROR1 324 +#define STRING_DEL_ERROR2 325 +#define STRING_DEL_ERROR3 326 +#define STRING_DEL_ERROR4 327 +#define STRING_DEL_ERROR5 328 +#define STRING_DEL_ERROR6 329 +#define STRING_DEL_ERROR7 330 +#define STRING_DEL_ERROR8 331 +#define STRING_PARAM_ERROR 332 #define STRING_ATTRIB_HELP 400 #define STRING_ALIAS_HELP 401 @@ -49,10 +61,14 @@ #define STRING_DATE_HELP2 420 #define STRING_DATE_HELP3 421 #define STRING_DATE_HELP4 422 -#define STRING_EXIT_HELP 423 -#define STRING_MKDIR_HELP 424 -#define STRING_RMDIR_HELP 425 -#define STRING_REM_HELP 426 +#define STRING_DEL_HELP1 423 +#define STRING_DEL_HELP2 424 +#define STRING_DEL_HELP3 425 +#define STRING_DEL_HELP4 426 +#define STRING_EXIT_HELP 427 +#define STRING_MKDIR_HELP 428 +#define STRING_RMDIR_HELP 429 +#define STRING_REM_HELP 430

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs