Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

by royce＠svn.reactos.com

small efficiency fix Modified: trunk/reactos/lib/user32/windows/defwnd.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-02-27 15:46:46 UTC (rev 13765) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-02-27 17:03:00 UTC (rev 13766) @@ -487,7 +487,7 @@ WinPosGetMinMaxInfo(hwnd, NULL, NULL, &minTrack, &maxTrack); GetWindowRect(hwnd, &sizingRect); - GetWindowRect(hwnd, &unmodRect); + unmodRect = sizingRect; if (Style & WS_CHILD) { MapWindowPoints( 0, hWndParent, (LPPOINT)&sizingRect, 2 );

19 years, 6 months

[ekohl] 13765: ConnectNamedPipe must return TRUE if lpOverlapped is not NULL and NtFsIoControl returns STATUS_PENDING.

by ekohl＠svn.reactos.com

ConnectNamedPipe must return TRUE if lpOverlapped is not NULL and NtFsIoControl returns STATUS_PENDING. Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-02-27 14:55:01 UTC (rev 13764) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-02-27 15:46:46 UTC (rev 13765) @@ -330,6 +330,9 @@ 0, NULL, 0); + if ((lpOverlapped != NULL) && (Status == STATUS_PENDING)) + return TRUE; + if ((lpOverlapped == NULL) && (Status == STATUS_PENDING)) { Status = NtWaitForSingleObject(hNamedPipe, @@ -338,17 +341,19 @@ if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); - return(FALSE); + return FALSE; } Status = Iosb.Status; } + if ((!NT_SUCCESS(Status) && Status != STATUS_PIPE_CONNECTED) || (Status == STATUS_PENDING)) { SetLastErrorByStatus(Status); - return(FALSE); + return FALSE; } - return(TRUE); + + return TRUE; }

19 years, 6 months

[navaraf] 13764: Use unadjusted rect (the one calculated before sending WM_SIZING) for sizing calculations while resizing windows.

by navaraf＠svn.reactos.com

Use unadjusted rect (the one calculated before sending WM_SIZING) for sizing calculations while resizing windows. Modified: trunk/reactos/lib/user32/windows/defwnd.c _____ Modified: trunk/reactos/lib/user32/windows/defwnd.c --- trunk/reactos/lib/user32/windows/defwnd.c 2005-02-27 12:43:37 UTC (rev 13763) +++ trunk/reactos/lib/user32/windows/defwnd.c 2005-02-27 14:55:01 UTC (rev 13764) @@ -418,7 +418,7 @@ { HRGN DesktopRgn; MSG msg; - RECT sizingRect, mouseRect, origRect, clipRect; + RECT sizingRect, mouseRect, origRect, clipRect, unmodRect; HDC hdc; LONG hittest = (LONG)(wParam & 0x0f); HCURSOR hDragCursor = 0, hOldCursor = 0; @@ -487,6 +487,7 @@ WinPosGetMinMaxInfo(hwnd, NULL, NULL, &minTrack, &maxTrack); GetWindowRect(hwnd, &sizingRect); + GetWindowRect(hwnd, &unmodRect); if (Style & WS_CHILD) { MapWindowPoints( 0, hWndParent, (LPPOINT)&sizingRect, 2 ); @@ -623,7 +624,7 @@ if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - RECT newRect = sizingRect; + RECT newRect = unmodRect; WPARAM wpSizingHit = 0; if (hittest == HTCAPTION) OffsetRect( &newRect, dx, dy ); @@ -637,6 +638,7 @@ /* determine the hit location */ if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); + unmodRect = newRect; SendMessageA( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&newRect ); if (!iconic)

19 years, 6 months

[ekohl] 13763: - Data is now written to the readers data buffer and the reader reads from his own data buffer. This fixes Filip's wrokaround to enable the reader to read data although the writers side was closed.

by ekohl＠svn.reactos.com

- Data is now written to the readers data buffer and the reader reads from his own data buffer. This fixes Filip's wrokaround to enable the reader to read data although the writers side was closed. - Minor cleanup. Modified: trunk/reactos/drivers/fs/np/create.c Modified: trunk/reactos/drivers/fs/np/finfo.c Modified: trunk/reactos/drivers/fs/np/fsctrl.c Modified: trunk/reactos/drivers/fs/np/npfs.c Modified: trunk/reactos/drivers/fs/np/npfs.h Modified: trunk/reactos/drivers/fs/np/rw.c Modified: trunk/reactos/drivers/fs/np/volume.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-02-26 23:22:48 UTC (rev 13762) +++ trunk/reactos/drivers/fs/np/create.c 2005-02-27 12:43:37 UTC (rev 13763) @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/create.c + * FILE: drivers/fs/np/create.c * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> */ @@ -164,9 +164,9 @@ ClientFcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; /* Initialize data list. */ - if (Pipe->InboundQuota) + if (Pipe->OutboundQuota) { - ClientFcb->Data = ExAllocatePool(NonPagedPool, Pipe->InboundQuota); + ClientFcb->Data = ExAllocatePool(NonPagedPool, Pipe->OutboundQuota); if (ClientFcb->Data == NULL) { DPRINT("No memory!\n"); @@ -185,8 +185,8 @@ ClientFcb->ReadPtr = ClientFcb->Data; ClientFcb->WritePtr = ClientFcb->Data; ClientFcb->ReadDataAvailable = 0; - ClientFcb->WriteQuotaAvailable = Pipe->InboundQuota; - ClientFcb->MaxDataLength = Pipe->InboundQuota; + ClientFcb->WriteQuotaAvailable = Pipe->OutboundQuota; + ClientFcb->MaxDataLength = Pipe->OutboundQuota; KeInitializeSpinLock(&ClientFcb->DataListLock); KeInitializeEvent(&ClientFcb->ConnectEvent, SynchronizationEvent, FALSE); KeInitializeEvent(&ClientFcb->Event, SynchronizationEvent, FALSE); @@ -381,9 +381,9 @@ KeUnlockMutex(&DeviceExt->PipeListLock); } - if (Pipe->OutboundQuota) + if (Pipe->InboundQuota) { - Fcb->Data = ExAllocatePool(NonPagedPool, Pipe->OutboundQuota); + Fcb->Data = ExAllocatePool(NonPagedPool, Pipe->InboundQuota); if (Fcb->Data == NULL) { ExFreePool(Fcb); @@ -407,8 +407,8 @@ Fcb->ReadPtr = Fcb->Data; Fcb->WritePtr = Fcb->Data; Fcb->ReadDataAvailable = 0; - Fcb->WriteQuotaAvailable = Pipe->OutboundQuota; - Fcb->MaxDataLength = Pipe->OutboundQuota; + Fcb->WriteQuotaAvailable = Pipe->InboundQuota; + Fcb->MaxDataLength = Pipe->InboundQuota; KeInitializeSpinLock(&Fcb->DataListLock); Pipe->CurrentInstances++; @@ -442,9 +442,8 @@ NTSTATUS STDCALL -NpfsClose( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NpfsClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PNPFS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; @@ -493,10 +492,8 @@ { if (Fcb->OtherSide) { -#ifndef FIN_WORKAROUND_READCLOSE Fcb->OtherSide->PipeState = FILE_PIPE_CLOSING_STATE; Fcb->OtherSide->OtherSide = NULL; -#endif /* * Signaling the write event. If is possible that an other * thread waits for an empty buffer. @@ -504,40 +501,16 @@ KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE); } -#ifndef FIN_WORKAROUND_READCLOSE Fcb->PipeState = 0; -#endif } FileObject->FsContext = NULL; -#ifndef FIN_WORKAROUND_READCLOSE RemoveEntryList(&Fcb->FcbListEntry); if (Fcb->Data) ExFreePool(Fcb->Data); ExFreePool(Fcb); -#else - Fcb->PipeState = FILE_PIPE_CLOSING_STATE; - if (Fcb->OtherSide == NULL || - Fcb->OtherSide->PipeState == FILE_PIPE_CLOSING_STATE) - { - if (Server && Fcb->OtherSide != NULL && - Fcb->OtherSide->PipeState == FILE_PIPE_CLOSING_STATE) - { - RemoveEntryList(&Fcb->OtherSide->FcbListEntry); - if (Fcb->OtherSide->Data) - ExFreePool(Fcb->OtherSide->Data); - ExFreePool(Fcb->OtherSide); - } - RemoveEntryList(&Fcb->FcbListEntry); - if (Fcb->Data) - ExFreePool(Fcb->Data); - - ExFreePool(Fcb); - } -#endif - KeUnlockMutex(&Pipe->FcbListLock); if (IsListEmpty(&Pipe->ServerFcbListHead) && _____ Modified: trunk/reactos/drivers/fs/np/finfo.c --- trunk/reactos/drivers/fs/np/finfo.c 2005-02-26 23:22:48 UTC (rev 13762) +++ trunk/reactos/drivers/fs/np/finfo.c 2005-02-27 12:43:37 UTC (rev 13763) @@ -2,9 +2,9 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/finfo.c + * FILE: drivers/fs/np/finfo.c * PURPOSE: Named pipe filesystem - * PROGRAMMER: Eric Kohl <ekohl(a)rz-online.de> + * PROGRAMMER: Eric Kohl */ /* INCLUDES ******************************************************************/ @@ -36,7 +36,7 @@ // Info->CompletionMode = *BufferLength -= sizeof(FILE_PIPE_INFORMATION); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -76,7 +76,7 @@ } *BufferLength -= sizeof(FILE_PIPE_LOCAL_INFORMATION); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } @@ -93,24 +93,24 @@ PVOID SystemBuffer; ULONG BufferLength; NTSTATUS Status; - + DPRINT("NpfsQueryInformation(DeviceObject %p Irp %p)\n", DeviceObject, Irp); - + IoStack = IoGetCurrentIrpStackLocation (Irp); FileInformationClass = IoStack->Parameters.QueryFile.FileInformationClass; DeviceExtension = DeviceObject->DeviceExtension; FileObject = IoStack->FileObject; Fcb = (PNPFS_FCB)FileObject->FsContext; Pipe = Fcb->Pipe; - + SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = IoStack->Parameters.QueryFile.Length; - + DPRINT("Pipe name: %wZ\n", &Pipe->PipeName); DPRINT("FileInformationClass %d\n", FileInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); DPRINT("BufferLength %lu\n", BufferLength); - + switch (FileInformationClass) { case FilePipeInformation: @@ -134,7 +134,7 @@ default: Status = STATUS_NOT_SUPPORTED; } - + Irp->IoStatus.Status = Status; if (NT_SUCCESS(Status)) Irp->IoStatus.Information = @@ -142,8 +142,8 @@ else Irp->IoStatus.Information = 0; IoCompleteRequest (Irp, IO_NO_INCREMENT); - - return(Status); + + return Status; } @@ -196,7 +196,7 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); + return Status; } /* EOF */ _____ Modified: trunk/reactos/drivers/fs/np/fsctrl.c --- trunk/reactos/drivers/fs/np/fsctrl.c 2005-02-26 23:22:48 UTC (rev 13762) +++ trunk/reactos/drivers/fs/np/fsctrl.c 2005-02-27 12:43:37 UTC (rev 13763) @@ -2,10 +2,10 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/fsctrl.c + * FILE: drivers/fs/np/fsctrl.c * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> - * Eric Kohl <ekohl(a)rz-online.de> + * Eric Kohl */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/drivers/fs/np/npfs.c --- trunk/reactos/drivers/fs/np/npfs.c 2005-02-26 23:22:48 UTC (rev 13762) +++ trunk/reactos/drivers/fs/np/npfs.c 2005-02-27 12:43:37 UTC (rev 13763) @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/mount.c + * FILE: drivers/fs/np/mount.c * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> */ @@ -64,7 +64,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("Failed to create named pipe device! (Status %x)\n", Status); - return(Status); + return Status; } /* initialize the device object */ @@ -81,7 +81,7 @@ DeviceExtension->DefaultQuota = 8 * PAGE_SIZE; DeviceExtension->MaxQuota = 64 * PAGE_SIZE; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* EOF */ _____ Modified: trunk/reactos/drivers/fs/np/npfs.h --- trunk/reactos/drivers/fs/np/npfs.h 2005-02-26 23:22:48 UTC (rev 13762) +++ trunk/reactos/drivers/fs/np/npfs.h 2005-02-27 12:43:37 UTC (rev 13763) @@ -1,14 +1,8 @@ /* $Id$ */ -#ifndef __SERVICES_FS_NP_NPFS_H -#define __SERVICES_FS_NP_NPFS_H +#ifndef __DRIVERS_FS_NP_NPFS_H +#define __DRIVERS_FS_NP_NPFS_H -/* - * Hacky support for delayed closing of pipes. We need this to support - * reading from pipe the was closed on one end. - */ -#define FIN_WORKAROUND_READCLOSE - typedef struct _NPFS_DEVICE_EXTENSION { LIST_ENTRY PipeListHead; @@ -70,9 +64,7 @@ #define KeUnlockMutex(x) KeReleaseMutex(x, FALSE); -#define CP DPRINT("\n"); - NTSTATUS STDCALL NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS STDCALL NpfsCreateNamedPipe(PDEVICE_OBJECT DeviceObject, PIRP Irp); NTSTATUS STDCALL NpfsClose(PDEVICE_OBJECT DeviceObject, PIRP Irp); @@ -89,4 +81,4 @@ NTSTATUS STDCALL NpfsQueryVolumeInformation (PDEVICE_OBJECT DeviceObject, PIRP Irp); -#endif /* __SERVICES_FS_NP_NPFS_H */ +#endif /* __DRIVERS_FS_NP_NPFS_H */ _____ Modified: trunk/reactos/drivers/fs/np/rw.c --- trunk/reactos/drivers/fs/np/rw.c 2005-02-26 23:22:48 UTC (rev 13762) +++ trunk/reactos/drivers/fs/np/rw.c 2005-02-27 12:43:37 UTC (rev 13763) @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/np/rw.c + * FILE: drivers/fs/np/rw.c * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> */ @@ -16,8 +16,6 @@ #define NDEBUG #include <debug.h> -#define FIN_WORKAROUND_READCLOSE - /* FUNCTIONS *****************************************************************/ #ifndef NDEBUG @@ -60,7 +58,7 @@ KIRQL OldIrql; ULONG Information; PNPFS_FCB Fcb; - PNPFS_FCB ReadFcb; + PNPFS_FCB WriterFcb; PNPFS_PIPE Pipe; ULONG Length; PVOID Buffer; @@ -74,22 +72,8 @@ FileObject = IoStack->FileObject; Fcb = FileObject->FsContext; Pipe = Fcb->Pipe; - ReadFcb = Fcb->OtherSide; + WriterFcb = Fcb->OtherSide; - if (ReadFcb == NULL) - { - DPRINT("Pipe is NOT connected!\n"); - if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) - Status = STATUS_PIPE_LISTENING; - else if (Fcb->PipeState == FILE_PIPE_DISCONNECTED_STATE) - Status = STATUS_PIPE_DISCONNECTED; - else - Status = STATUS_PIPE_BROKEN; - Information = 0; - DPRINT("%x\n", Status); - goto done; - } - if (Irp->MdlAddress == NULL) { DPRINT("Irp->MdlAddress == NULL\n"); @@ -98,7 +82,7 @@ goto done; } - if (ReadFcb->Data == NULL) + if (Fcb->Data == NULL) { DPRINT("Pipe is NOT readable!\n"); Status = STATUS_UNSUCCESSFUL; @@ -106,31 +90,20 @@ goto done; } -#ifdef FIN_WORKAROUND_READCLOSE - if (ReadFcb->ReadDataAvailable == 0 && - ReadFcb->PipeState == FILE_PIPE_CLOSING_STATE) - { - DPRINT("Other end of pipe is closed!\n"); - Status = STATUS_PIPE_BROKEN; - Information = 0; - goto done; - } -#endif - Status = STATUS_SUCCESS; Length = IoStack->Parameters.Read.Length; Information = 0; Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - KeAcquireSpinLock(&ReadFcb->DataListLock, &OldIrql); + KeAcquireSpinLock(&Fcb->DataListLock, &OldIrql); while (1) { /* FIXME: check if in blocking mode */ - if (ReadFcb->ReadDataAvailable == 0) + if (Fcb->ReadDataAvailable == 0) { KeResetEvent(&Fcb->Event); - KeSetEvent(&ReadFcb->Event, IO_NO_INCREMENT, FALSE); - KeReleaseSpinLock(&ReadFcb->DataListLock, OldIrql); + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); + KeReleaseSpinLock(&Fcb->DataListLock, OldIrql); if (Information > 0) { Status = STATUS_SUCCESS; @@ -153,56 +126,44 @@ NULL); DPRINT("Finished waiting (%S)! Status: %x\n", Pipe->PipeName.Buffer, Status); -#ifndef FIN_WORKAROUND_READCLOSE - /* - * It's possible that the event was signaled because the - * other side of pipe was closed. - */ - if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE) - { - DPRINT("PipeState: %x\n", Fcb->PipeState); - Status = STATUS_PIPE_BROKEN; - goto done; - } -#endif - KeAcquireSpinLock(&ReadFcb->DataListLock, &OldIrql); + KeAcquireSpinLock(&Fcb->DataListLock, &OldIrql); } if (Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n"); /* Byte stream mode */ - while (Length > 0 && ReadFcb->ReadDataAvailable > 0) + while (Length > 0 && Fcb->ReadDataAvailable > 0) { - CopyLength = RtlRosMin(ReadFcb->ReadDataAvailable, Length); - if (ReadFcb->ReadPtr + CopyLength <= ReadFcb->Data + ReadFcb->MaxDataLength) + CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + if (Fcb->ReadPtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength) { - memcpy(Buffer, ReadFcb->ReadPtr, CopyLength); - ReadFcb->ReadPtr += CopyLength; - if (ReadFcb->ReadPtr == ReadFcb->Data + ReadFcb->MaxDataLength) + memcpy(Buffer, Fcb->ReadPtr, CopyLength); + Fcb->ReadPtr += CopyLength; + if (Fcb->ReadPtr == Fcb->Data + Fcb->MaxDataLength) { - ReadFcb->ReadPtr = ReadFcb->Data; + Fcb->ReadPtr = Fcb->Data; } } else { - TempLength = ReadFcb->Data + ReadFcb->MaxDataLength - ReadFcb->ReadPtr; - memcpy(Buffer, ReadFcb->ReadPtr, TempLength); - memcpy(Buffer + TempLength, ReadFcb->Data, CopyLength - TempLength); - ReadFcb->ReadPtr = ReadFcb->Data + CopyLength - TempLength; + TempLength = Fcb->Data + Fcb->MaxDataLength - Fcb->ReadPtr; + memcpy(Buffer, Fcb->ReadPtr, TempLength); + memcpy(Buffer + TempLength, Fcb->Data, CopyLength - TempLength); + Fcb->ReadPtr = Fcb->Data + CopyLength - TempLength; } Buffer += CopyLength; Length -= CopyLength; Information += CopyLength; - ReadFcb->ReadDataAvailable -= CopyLength; - ReadFcb->WriteQuotaAvailable += CopyLength; + Fcb->ReadDataAvailable -= CopyLength; + Fcb->WriteQuotaAvailable += CopyLength; } if (Length == 0) { - KeSetEvent(&ReadFcb->Event, IO_NO_INCREMENT, FALSE); + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); break; } } @@ -211,11 +172,11 @@ DPRINT("Message mode\n"); /* Message mode */ - if (ReadFcb->ReadDataAvailable) + if (Fcb->ReadDataAvailable) { /* Truncate the message if the receive buffer is too small */ - CopyLength = RtlRosMin(ReadFcb->ReadDataAvailable, Length); - memcpy(Buffer, ReadFcb->Data, CopyLength); + CopyLength = RtlRosMin(Fcb->ReadDataAvailable, Length); + memcpy(Buffer, Fcb->Data, CopyLength); #ifndef NDEBUG DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); @@ -223,28 +184,19 @@ #endif Information = CopyLength; - ReadFcb->ReadDataAvailable = 0; - ReadFcb->WriteQuotaAvailable = ReadFcb->MaxDataLength; + Fcb->ReadDataAvailable = 0; + Fcb->WriteQuotaAvailable = Fcb->MaxDataLength; } if (Information > 0) { - KeSetEvent(&ReadFcb->Event, IO_NO_INCREMENT, FALSE); + KeSetEvent(&WriterFcb->Event, IO_NO_INCREMENT, FALSE); break; } } - -#ifdef FIN_WORKAROUND_READCLOSE - if (ReadFcb->ReadDataAvailable == 0 && - ReadFcb->PipeState == FILE_PIPE_CLOSING_STATE) - { - DPRINT("Other end of pipe is closed!\n"); - break; - } -#endif } - KeReleaseSpinLock(&ReadFcb->DataListLock, OldIrql); + KeReleaseSpinLock(&Fcb->DataListLock, OldIrql); done: Irp->IoStatus.Status = Status; @@ -265,6 +217,7 @@ PIO_STACK_LOCATION IoStack; PFILE_OBJECT FileObject; PNPFS_FCB Fcb = NULL; + PNPFS_FCB ReaderFcb; PNPFS_PIPE Pipe = NULL; PUCHAR Buffer; NTSTATUS Status = STATUS_SUCCESS; @@ -283,6 +236,7 @@ DPRINT("Pipe name %wZ\n", &FileObject->FileName); Fcb = FileObject->FsContext; + ReaderFcb = Fcb->OtherSide; Pipe = Fcb->Pipe; Length = IoStack->Parameters.Write.Length; @@ -297,7 +251,7 @@ goto done; } - if (Fcb->OtherSide == NULL) + if (ReaderFcb == NULL) { DPRINT("Pipe is NOT connected!\n"); if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) @@ -310,7 +264,7 @@ goto done; } - if (Fcb->Data == NULL) + if (ReaderFcb->Data == NULL) { DPRINT("Pipe is NOT writable!\n"); Status = STATUS_UNSUCCESSFUL; @@ -321,7 +275,7 @@ Status = STATUS_SUCCESS; Buffer = MmGetSystemAddressForMdl (Irp->MdlAddress); - KeAcquireSpinLock(&Fcb->DataListLock, &OldIrql); + KeAcquireSpinLock(&ReaderFcb->DataListLock, &OldIrql); #ifndef NDEBUG DPRINT("Length %d Buffer %x Offset %x\n",Length,Buffer,Offset); HexDump(Buffer, Length); @@ -329,11 +283,11 @@ while(1) { - if (Fcb->WriteQuotaAvailable == 0) + if (ReaderFcb->WriteQuotaAvailable == 0) { KeResetEvent(&Fcb->Event); - KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE); - KeReleaseSpinLock(&Fcb->DataListLock, OldIrql); + KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); + KeReleaseSpinLock(&ReaderFcb->DataListLock, OldIrql); if (Fcb->PipeState != FILE_PIPE_CONNECTED_STATE) { Status = STATUS_PIPE_BROKEN; @@ -348,7 +302,6 @@ NULL); DPRINT("Finished waiting (%S)! Status: %x\n", Pipe->PipeName.Buffer, Status); -#ifndef FIN_WORKAROUND_READCLOSE /* * It's possible that the event was signaled because the * other side of pipe was closed. @@ -359,44 +312,43 @@ Status = STATUS_PIPE_BROKEN; goto done; } -#endif - KeAcquireSpinLock(&Fcb->DataListLock, &OldIrql); + KeAcquireSpinLock(&ReaderFcb->DataListLock, &OldIrql); } if (Pipe->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n"); - while (Length > 0 && Fcb->WriteQuotaAvailable > 0) + while (Length > 0 && ReaderFcb->WriteQuotaAvailable > 0) { - CopyLength = RtlRosMin(Length, Fcb->WriteQuotaAvailable); - if (Fcb->WritePtr + CopyLength <= Fcb->Data + Fcb->MaxDataLength) + CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + if (ReaderFcb->WritePtr + CopyLength <= ReaderFcb->Data + ReaderFcb->MaxDataLength) { - memcpy(Fcb->WritePtr, Buffer, CopyLength); - Fcb->WritePtr += CopyLength; - if (Fcb->WritePtr == Fcb->Data + Fcb->MaxDataLength) + memcpy(ReaderFcb->WritePtr, Buffer, CopyLength); + ReaderFcb->WritePtr += CopyLength; + if (ReaderFcb->WritePtr == ReaderFcb->Data + ReaderFcb->MaxDataLength) { - Fcb->WritePtr = Fcb->Data; + ReaderFcb->WritePtr = ReaderFcb->Data; } } else { - TempLength = Fcb->Data + Fcb->MaxDataLength - Fcb->WritePtr; - memcpy(Fcb->WritePtr, Buffer, TempLength); - memcpy(Fcb->Data, Buffer + TempLength, CopyLength - TempLength); - Fcb->WritePtr = Fcb->Data + CopyLength - TempLength; + TempLength = ReaderFcb->Data + ReaderFcb->MaxDataLength - ReaderFcb->WritePtr; + memcpy(ReaderFcb->WritePtr, Buffer, TempLength); + memcpy(ReaderFcb->Data, Buffer + TempLength, CopyLength - TempLength); + ReaderFcb->WritePtr = ReaderFcb->Data + CopyLength - TempLength; } Buffer += CopyLength; Length -= CopyLength; Information += CopyLength; - Fcb->ReadDataAvailable += CopyLength; - Fcb->WriteQuotaAvailable -= CopyLength; + ReaderFcb->ReadDataAvailable += CopyLength; + ReaderFcb->WriteQuotaAvailable -= CopyLength; } if (Length == 0) { - KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE); + KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); break; } } @@ -405,23 +357,23 @@ DPRINT("Message mode\n"); if (Length > 0) { - CopyLength = RtlRosMin(Length, Fcb->WriteQuotaAvailable); - memcpy(Fcb->Data, Buffer, CopyLength); + CopyLength = RtlRosMin(Length, ReaderFcb->WriteQuotaAvailable); + memcpy(ReaderFcb->Data, Buffer, CopyLength); Information = CopyLength; - Fcb->ReadDataAvailable = CopyLength; - Fcb->WriteQuotaAvailable = 0; + ReaderFcb->ReadDataAvailable = CopyLength; + ReaderFcb->WriteQuotaAvailable = 0; } if (Information > 0) { - KeSetEvent(&Fcb->OtherSide->Event, IO_NO_INCREMENT, FALSE); + KeSetEvent(&ReaderFcb->Event, IO_NO_INCREMENT, FALSE); break; } } } - KeReleaseSpinLock(&Fcb->DataListLock, OldIrql); + KeReleaseSpinLock(&ReaderFcb->DataListLock, OldIrql); done: Irp->IoStatus.Status = Status; _____ Modified: trunk/reactos/drivers/fs/np/volume.c --- trunk/reactos/drivers/fs/np/volume.c 2005-02-26 23:22:48 UTC (rev 13762) +++ trunk/reactos/drivers/fs/np/volume.c 2005-02-27 12:43:37 UTC (rev 13763) @@ -2,9 +2,9 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/npfs/volume.c + * FILE: drivers/fs/npfs/volume.c * PURPOSE: Named pipe filesystem - * PROGRAMMER: Eric Kohl <ekohl(a)rz-online.de> + * PROGRAMMER: Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -23,20 +23,20 @@ NpfsQueryFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, PULONG BufferLength) { - DPRINT("NpfsQueryFsDeviceInformation()\n"); - DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); - - if (*BufferLength < sizeof(FILE_FS_DEVICE_INFORMATION)) - return(STATUS_BUFFER_OVERFLOW); - - FsDeviceInfo->DeviceType = FILE_DEVICE_NAMED_PIPE; - FsDeviceInfo->Characteristics = 0; - - *BufferLength -= sizeof(FILE_FS_DEVICE_INFORMATION); - - DPRINT("NpfsQueryFsDeviceInformation() finished.\n"); - - return(STATUS_SUCCESS); + DPRINT("NpfsQueryFsDeviceInformation()\n"); + DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); + + if (*BufferLength < sizeof(FILE_FS_DEVICE_INFORMATION)) + return STATUS_BUFFER_OVERFLOW; + + FsDeviceInfo->DeviceType = FILE_DEVICE_NAMED_PIPE; + FsDeviceInfo->Characteristics = 0; + + *BufferLength -= sizeof(FILE_FS_DEVICE_INFORMATION); + + DPRINT("NpfsQueryFsDeviceInformation() finished.\n"); + + return STATUS_SUCCESS; } @@ -44,22 +44,22 @@ NpfsQueryFsAttributeInformation(PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, PULONG BufferLength) { - DPRINT("NpfsQueryFsAttributeInformation() called.\n"); - DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); - - if (*BufferLength < sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8) - return(STATUS_BUFFER_OVERFLOW); - - FsAttributeInfo->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; - FsAttributeInfo->MaximumComponentNameLength = 255; - FsAttributeInfo->FileSystemNameLength = 8; - wcscpy(FsAttributeInfo->FileSystemName, - L"NPFS"); - - DPRINT("NpfsQueryFsAttributeInformation() finished.\n"); - *BufferLength -= (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8); - - return(STATUS_SUCCESS); + DPRINT("NpfsQueryFsAttributeInformation() called.\n"); + DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); + + if (*BufferLength < sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8) + return STATUS_BUFFER_OVERFLOW; + + FsAttributeInfo->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; + FsAttributeInfo->MaximumComponentNameLength = 255; + FsAttributeInfo->FileSystemNameLength = 8; + wcscpy(FsAttributeInfo->FileSystemName, + L"NPFS"); + + DPRINT("NpfsQueryFsAttributeInformation() finished.\n"); + *BufferLength -= (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8); + + return STATUS_SUCCESS; } @@ -67,54 +67,53 @@ NpfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION Stack; - FS_INFORMATION_CLASS FsInformationClass; - NTSTATUS Status = STATUS_SUCCESS; - PVOID SystemBuffer; - ULONG BufferLength; - - /* PRECONDITION */ - assert(DeviceObject != NULL); - assert(Irp != NULL); - - DPRINT("NpfsQueryVolumeInformation(DeviceObject %x, Irp %x)\n", - DeviceObject, - Irp); - - Stack = IoGetCurrentIrpStackLocation (Irp); - FsInformationClass = Stack->Parameters.QueryVolume.FsInformationClass; - BufferLength = Stack->Parameters.QueryVolume.Length; - SystemBuffer = Irp->AssociatedIrp.SystemBuffer; - - DPRINT("FsInformationClass %d\n", FsInformationClass); - DPRINT("SystemBuffer %x\n", SystemBuffer); - - switch (FsInformationClass) - { - case FileFsDeviceInformation: - Status = NpfsQueryFsDeviceInformation(SystemBuffer, - &BufferLength); - break; - - case FileFsAttributeInformation: - Status = NpfsQueryFsAttributeInformation(SystemBuffer, - &BufferLength); - break; - - default: - Status = STATUS_NOT_SUPPORTED; - } - - Irp->IoStatus.Status = Status; - if (NT_SUCCESS(Status)) - Irp->IoStatus.Information = - Stack->Parameters.QueryVolume.Length - BufferLength; - else - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, - IO_NO_INCREMENT); - - return(Status); + PIO_STACK_LOCATION Stack; + FS_INFORMATION_CLASS FsInformationClass; + NTSTATUS Status = STATUS_SUCCESS; + PVOID SystemBuffer; + ULONG BufferLength; + + /* PRECONDITION */ + ASSERT(DeviceObject != NULL); + ASSERT(Irp != NULL); + + DPRINT("NpfsQueryVolumeInformation(DeviceObject %x, Irp %x)\n", + DeviceObject, + Irp); + + Stack = IoGetCurrentIrpStackLocation(Irp); + FsInformationClass = Stack->Parameters.QueryVolume.FsInformationClass; + BufferLength = Stack->Parameters.QueryVolume.Length; + SystemBuffer = Irp->AssociatedIrp.SystemBuffer; + + DPRINT("FsInformationClass %d\n", FsInformationClass); + DPRINT("SystemBuffer %x\n", SystemBuffer); + + switch (FsInformationClass) + { + case FileFsDeviceInformation: + Status = NpfsQueryFsDeviceInformation(SystemBuffer, + &BufferLength); + break; + + case FileFsAttributeInformation: + Status = NpfsQueryFsAttributeInformation(SystemBuffer, + &BufferLength); + break; + + default: + Status = STATUS_NOT_SUPPORTED; + } + + Irp->IoStatus.Status = Status; + if (NT_SUCCESS(Status)) + Irp->IoStatus.Information = Stack->Parameters.QueryVolume.Length - BufferLength; + else + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, + IO_NO_INCREMENT); + + return Status; } /* EOF */

19 years, 6 months

[ea] 13762: SM some simple work (wip)

by ea＠svn.reactos.com

SM some simple work (wip) Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/init.c Modified: trunk/reactos/subsys/smss/initobdir.c Modified: trunk/reactos/subsys/smss/smss.c Modified: trunk/reactos/subsys/smss/smss.h _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-02-26 23:21:58 UTC (rev 13761) +++ trunk/reactos/subsys/smss/client.c 2005-02-26 23:22:48 UTC (rev 13762) @@ -169,6 +169,8 @@ * Initialize the client data */ pClient->SubsystemId = ConnectData->Subsystem; + /* SM auto-initializes; other subsystems are required to call + * SM_API_COMPLETE_SESSION via SMDLL. */ pClient->Initialized = (IMAGE_SUBSYSTEM_NATIVE == pClient->SubsystemId); if (SbApiPortNameSize > 0) { _____ Modified: trunk/reactos/subsys/smss/init.c --- trunk/reactos/subsys/smss/init.c 2005-02-26 23:21:58 UTC (rev 13761) +++ trunk/reactos/subsys/smss/init.c 2005-02-26 23:22:48 UTC (rev 13762) @@ -36,14 +36,14 @@ static NTSTATUS SmpSignalInitEvent(VOID) { - NTSTATUS Status; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeString; - HANDLE ReactOSInitEvent; + NTSTATUS Status = STATUS_SUCCESS; + OBJECT_ATTRIBUTES ObjectAttributes = {0}; + UNICODE_STRING EventName ={0}; + HANDLE ReactOSInitEvent = NULL; - RtlRosInitUnicodeStringFromLiteral(&UnicodeString, L"\\ReactOSInitDone"); + RtlInitUnicodeString (& EventName, L"\\ReactOSInitDone"); InitializeObjectAttributes(&ObjectAttributes, - &UnicodeString, + & EventName, EVENT_ALL_ACCESS, 0, NULL); _____ Modified: trunk/reactos/subsys/smss/initobdir.c --- trunk/reactos/subsys/smss/initobdir.c 2005-02-26 23:21:58 UTC (rev 13761) +++ trunk/reactos/subsys/smss/initobdir.c 2005-02-26 23:22:48 UTC (rev 13762) @@ -23,8 +23,6 @@ * * -------------------------------------------------------------------- */ - - #include "smss.h" #define NDEBUG @@ -82,7 +80,7 @@ QueryTable[0].QueryRoutine = SmpObjectDirectoryQueryRoutine; Status = RtlQueryRegistryValues(RTL_REGISTRY_CONTROL, - L"\\Session Manager", + SM_REGISTRY_ROOT_NAME, QueryTable, NULL, NULL); _____ Modified: trunk/reactos/subsys/smss/smss.c --- trunk/reactos/subsys/smss/smss.c 2005-02-26 23:21:58 UTC (rev 13761) +++ trunk/reactos/subsys/smss/smss.c 2005-02-26 23:22:48 UTC (rev 13762) @@ -30,18 +30,32 @@ #define NDEBUG #include <debug.h> +HANDLE SmSsProcessId = 0; + /* Native image's entry point */ VOID STDCALL NtProcessStartup(PPEB Peb) { NTSTATUS Status; - + PROCESS_BASIC_INFORMATION PBI = {0}; + DisplayString(L"SMSS\n"); PrintString("ReactOS Session Manager %s (Build %s)\n", KERNEL_RELEASE_STR, KERNEL_VERSION_BUILD_STR); + /* Lookup yourself */ + Status = NtQueryInformationProcess (NtCurrentProcess(), + ProcessBasicInformation, + & PBI, + sizeof PBI, + NULL); + if(NT_SUCCESS(Status)) + { + SmSsProcessId = PBI.UniqueProcessId; + } + /* Initialize the system */ Status = InitSessionManager(); if (!NT_SUCCESS(Status)) { @@ -64,7 +78,7 @@ NULL); /* NULL for infinite */ if (!NT_SUCCESS(Status)) { - DPRINT1("SM: NtWaitForMultipleObjects failed!\n"); + DPRINT1("SM: NtWaitForMultipleObjects failed! (Status=0x%08lx)\n", Status); } else { _____ Modified: trunk/reactos/subsys/smss/smss.h --- trunk/reactos/subsys/smss/smss.h 2005-02-26 23:21:58 UTC (rev 13761) +++ trunk/reactos/subsys/smss/smss.h 2005-02-26 23:22:48 UTC (rev 13762) @@ -9,6 +9,9 @@ #define CHILD_CSRSS 0 #define CHILD_WINLOGON 1 +/* smss.c */ +extern HANDLE SmSsProcessId; + /* init.c */ NTSTATUS InitSessionManager(VOID);

19 years, 6 months

[ea] 13761: CSR: Wrong event and wrong place for mu.

by ea＠svn.reactos.com

CSR: Wrong event and wrong place for mu. Modified: trunk/reactos/subsys/csrss/csrss.c Deleted: trunk/reactos/subsys/csrss/win32mu/ _____ Modified: trunk/reactos/subsys/csrss/csrss.c --- trunk/reactos/subsys/csrss/csrss.c 2005-02-26 23:19:56 UTC (rev 13760) +++ trunk/reactos/subsys/csrss/csrss.c 2005-02-26 23:21:58 UTC (rev 13761) @@ -147,10 +147,10 @@ /********************************************************************** * NAME PRIVATE - * CsrpOpenKeInitDoneEvent/0 + * CsrpOpenSmInitDoneEvent/0 */ static NTSTATUS STDCALL -CsrpOpenKeInitDoneEvent (PHANDLE CsrssInitEvent) +CsrpOpenSmInitDoneEvent (PHANDLE CsrssInitEvent) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING EventName; @@ -194,13 +194,13 @@ Status); } /* - * Open the Ke notification event to notify we are OK after + * Open the SM notification event to notify we are OK after * subsystem server initialization. */ - Status = CsrpOpenKeInitDoneEvent(& CsrssInitEvent); + Status = CsrpOpenSmInitDoneEvent(& CsrssInitEvent); if (!NT_SUCCESS(Status)) { - DbgPrint("CSR: CsrpOpenKeInitDoneEvent failed (Status=0x%08lx)\n", + DbgPrint("CSR: CsrpOpenSmInitDoneEvent failed (Status=0x%08lx)\n", Status); } /*================================================================== @@ -209,10 +209,11 @@ if (CsrServerInitialization (CmdLineArg.Count, CmdLineArg.Vector) == TRUE) { /*============================================================= - * Tell Ke we are up and safe. If we fail to notify Ke, it will - * bugcheck the system with SESSION5_INITIALIZATION_FAILED. - * TODO: choose a better way to check user mode initialization - * is OK. + * Tell SM we are up and safe. If we fail to notify SM, it will + * die and the kernel will bugcheck with + * SESSION5_INITIALIZATION_FAILED. + * TODO: this won't be necessary, because CSR will call SM + * API SM_SESSION_COMPLETE. *===========================================================*/ NtSetEvent (CsrssInitEvent, NULL);

19 years, 6 months

[ea] 13760: sm namespace macros

by ea＠svn.reactos.com

sm namespace macros Modified: trunk/reactos/include/sm/api.h Modified: trunk/reactos/include/sm/helper.h Added: trunk/reactos/include/sm/ns.h _____ Modified: trunk/reactos/include/sm/api.h --- trunk/reactos/include/sm/api.h 2005-02-26 23:18:27 UTC (rev 13759) +++ trunk/reactos/include/sm/api.h 2005-02-26 23:19:56 UTC (rev 13760) @@ -2,9 +2,7 @@ #ifndef __SM_API_H #define __SM_API_H -#define SM_API_PORT_NAME L"\\SmApiPort" -#define SM_DBGSS_PORT_NAME L"\\DbgSsApiPort" -#define SM_DBGUI_PORT_NAME L"\\DbgUiApiPort" +#include <sm/ns.h> #pragma pack(push,4) _____ Modified: trunk/reactos/include/sm/helper.h --- trunk/reactos/include/sm/helper.h 2005-02-26 23:18:27 UTC (rev 13759) +++ trunk/reactos/include/sm/helper.h 2005-02-26 23:19:56 UTC (rev 13760) @@ -1,6 +1,6 @@ -#ifndef INCLUDE_SM_HELPER_H +#if !defined(INCLUDE_SM_HELPER_H) #define INCLUDE_SM_HELPER_H -#define _SM_HELPER_H + /* $Id$ */ /* smdll/connect.c */ _____ Added: trunk/reactos/include/sm/ns.h --- trunk/reactos/include/sm/ns.h 2005-02-26 23:18:27 UTC (rev 13759) +++ trunk/reactos/include/sm/ns.h 2005-02-26 23:19:56 UTC (rev 13760) @@ -0,0 +1,13 @@ +#if !defined(INCLUDE_SM_NS_H) +#define INCLUDE_SM_NS_H + +/* $Id: helper.h 13689 2005-02-20 16:46:10Z ea $ */ + +#define SM_REGISTRY_ROOT_NAME L"\\Session Manager" +#define SM_REGISTRY_SUBSYSTEMS_NAME L"SubSystems" + +#define SM_API_PORT_NAME L"\\SmApiPort" +#define SM_DBGSS_PORT_NAME L"\\DbgSsApiPort" +#define SM_DBGUI_PORT_NAME L"\\DbgUiApiPort" + +#endif /* ndef INCLUDE_SM_NS_H */

19 years, 6 months

[ea] 13759: DbgPrint calls DbgPrintEx

by ea＠svn.reactos.com

DbgPrint calls DbgPrintEx (which runs the code previously belonging to DbgPrint). Modified: trunk/reactos/lib/ntdll/dbg/print.c Modified: trunk/reactos/lib/ntdll/def/ntdll.def _____ Modified: trunk/reactos/lib/ntdll/dbg/print.c --- trunk/reactos/lib/ntdll/dbg/print.c 2005-02-26 20:17:44 UTC (rev 13758) +++ trunk/reactos/lib/ntdll/dbg/print.c 2005-02-26 23:18:27 UTC (rev 13759) @@ -27,10 +27,15 @@ "ret\n\t"); /* - * @implemented + * @unimplemented */ ULONG -DbgPrint(PCH Format, ...) +DbgPrintEx( + IN ULONG ComponentId, + IN ULONG Level, + IN PCH Format, + ... + ) { ANSI_STRING DebugString; CHAR Buffer[4096]; @@ -53,6 +58,29 @@ /* * @implemented */ +ULONG +DbgPrint(PCH Format, ...) +{ + ANSI_STRING DebugString; + CHAR Buffer[4096]; + va_list ap; + + /* init ansi string */ + DebugString.Buffer = Buffer; + DebugString.MaximumLength = sizeof(Buffer); + + va_start (ap, Format); + DebugString.Length = _vsnprintf (Buffer, sizeof(Buffer), Format, ap); + va_end (ap); + + + return DbgPrintEx (0, 0, DebugString.Buffer); +} + + +/* + * @implemented + */ VOID STDCALL DbgPrompt ( _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-26 20:17:44 UTC (rev 13758) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-26 23:18:27 UTC (rev 13759) @@ -23,6 +23,7 @@ CsrSetPriorityClass@8 DbgBreakPoint@0 DbgPrint +DbgPrintEx DbgPrompt@12 DbgSsHandleKmApiMsg@8 DbgSsInitialize@16

19 years, 6 months

[chorns] 13758: Build cdmake

by chorns＠svn.reactos.com

Build cdmake Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/cdmake/Makefile _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-26 19:29:51 UTC (rev 13757) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-26 20:17:44 UTC (rev 13758) @@ -58,7 +58,7 @@ include$(SEP)reactos$(SEP)errcodes.h \ lib$(SEP)kernel32$(SEP)errcodes.rc -Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(RBUILD_TARGET) $(PREAUTO) +Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw $(MAKE) $(MAKECMDGOALS) _____ Modified: branches/xmlbuildsystem/reactos/tools/Makefile --- branches/xmlbuildsystem/reactos/tools/Makefile 2005-02-26 19:29:51 UTC (rev 13757) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-02-26 20:17:44 UTC (rev 13758) @@ -51,6 +51,7 @@ include$(SEP)reactos$(SEP)buildno.h: $(BUILDNO_TARGET) $(EXEPREFIX)$(BUILDNO_TARGET) include$(SEP)reactos$(SEP)buildno.h +include tools/cdmake/makefile include tools/nci/makefile include tools/rbuild/makefile include tools/wmc/makefile _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/Makefile --- branches/xmlbuildsystem/reactos/tools/cdmake/Makefile 2005-02-26 19:29:51 UTC (rev 13757) +++ branches/xmlbuildsystem/reactos/tools/cdmake/Makefile 2005-02-26 20:17:44 UTC (rev 13758) @@ -1,40 +1,24 @@ -# -# CD-Maker -# -PATH_TO_TOP = ../.. +CDMAKE_BASE = tools$(SEP)cdmake -TARGET=cdmake$(EXE_POSTFIX) +CDMAKE_TARGET = \ + $(ROS_INTERMEDIATE)$(CDMAKE_BASE)$(SEP)cdmake$(EXEPOSTFIX) -all: $(TARGET) +CDMAKE_SOURCES = \ + $(CDMAKE_BASE)$(SEP)cdmake.c \ + $(CDMAKE_BASE)$(SEP)llmosrt.c -OBJECTS = cdmake.o llmosrt.o +CDMAKE_OBJECTS = \ + $(CDMAKE_SOURCES:.c=.o) -CLEAN_FILES = *.o cdmake$(EXE_POSTFIX) +CDMAKE_HOST_CFLAGS = -Iinclude -g -Werror -Wall -HOST_CFLAGS = -I. -Werror -Wall +CDMAKE_HOST_LFLAGS = -g -cdmake.o: cdmake.c - $(HOST_CC) $(HOST_CFLAGS) -c cdmake.c -o cdmake.o +$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) + ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET) -llmosrt.o: llmosrt.c - $(HOST_CC) $(HOST_CFLAGS) -c llmosrt.c -o llmosrt.o +$(CDMAKE_OBJECTS): %.o : %.c + ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ -cdmake$(EXE_POSTFIX): $(OBJECTS) - $(HOST_CC) $(OBJECTS) -o cdmake$(EXE_POSTFIX) - -ifeq ($(HOST),mingw32-linux) -clean: - rm -f *.o - rm -f cdmake$(EXE_POSTFIX) -endif -ifeq ($(HOST),mingw32-windows) -clean: - -del *.o - -del cdmake$(EXE_POSTFIX) -endif - -.phony: clean - -include $(PATH_TO_TOP)/rules.mak - -# EOF +clean:: + -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL)

19 years, 6 months

[chorns] 13757: Set base address of modules

by chorns＠svn.reactos.com

Set base address of modules Modified: branches/xmlbuildsystem/reactos/baseaddress.xml Modified: branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml Modified: branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml Modified: branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml Modified: branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml Modified: branches/xmlbuildsystem/reactos/lib/cards/cards.xml Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml Modified: branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml Modified: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml Modified: branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml Modified: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml Modified: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml Modified: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml Modified: branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml Modified: branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml Modified: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml Modified: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml Modified: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml Modified: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml Modified: branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml Modified: branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml Modified: branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml Modified: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml Modified: branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml Modified: branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml Modified: branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml Modified: branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml Modified: branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml Modified: branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml Modified: branches/xmlbuildsystem/reactos/lib/opengl32/opengl32.xml Modified: branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml Modified: branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml Modified: branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml Modified: branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml Modified: branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml Modified: branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml Modified: branches/xmlbuildsystem/reactos/lib/syssetup/syssetup.xml Modified: branches/xmlbuildsystem/reactos/lib/twain/twain_32.xml Modified: branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml Modified: branches/xmlbuildsystem/reactos/lib/user32/user32.xml Modified: branches/xmlbuildsystem/reactos/lib/userenv/userenv.xml Modified: branches/xmlbuildsystem/reactos/lib/version/version.xml Modified: branches/xmlbuildsystem/reactos/lib/wininet/wininet.xml Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml Modified: branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml Modified: branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml Modified: branches/xmlbuildsystem/reactos/lib/ws2help/ws2help.xml Modified: branches/xmlbuildsystem/reactos/lib/wshirda/wshirda.xml Modified: branches/xmlbuildsystem/reactos/lib/wsock32/wsock32.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml _____ Modified: branches/xmlbuildsystem/reactos/baseaddress.xml --- branches/xmlbuildsystem/reactos/baseaddress.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/baseaddress.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,89 +1,100 @@ -<property name="BASEADDRESS_DINPUT8" value="0x00400000" /> -<property name="BASEADDRESS_DXDIAGN" value="0x00400000" /> <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> -<property name="BASEADDRESS_SECURE32" value="0x10000000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> -<property name="BASEADDRESS_DSOUND" value="0x50000000" /> -<property name="BASEADDRESS_GLU32" value="0x50000000" /> -<property name="BASEADDRESS_OPENGL32" value="0x50000000" /> -<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> <property name="BASEADDRESS_DINPUT" value="0x5F580000" /> <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> <property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> -<property name="BASEADDRESS_NCPL" value="0x64EA0000" /> <property name="BASEADDRESS_MAIN" value="0x64F40000" /> <property name="BASEADDRESS_INTL" value="0x64FB0000" /> <property name="BASEADDRESS_DESK" value="0x65080000" /> <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> <property name="BASEADDRESS_ACCESS" value="0x65180000" /> -<property name="BASEADDRESS_HID" value="0x688F0000" /> -<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> -<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> -<property name="BASEADDRESS_DISPLAY" value="DISPLAY" /> +<property name="BASEADDRESS_ADVPACK" value="0x6b300000" /> +<property name="BASEADDRESS_CONTROL" value="0x6b310000" /> +<property name="BASEADDRESS_NCPA" value="0x6b320000" /> +<property name="BASEADDRESS_DBGHELP" value="0x6b330000" /> +<property name="BASEADDRESS_DINPUT8" value="0x6b340000" /> +<property name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> +<property name="BASEADDRESS_DSOUND" value="0x6b360000" /> +<property name="BASEADDRESS_GLU32" value="0x6b370000" /> +<property name="BASEADDRESS_MESA32" value="0x6b380000" /> +<property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> +<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" /> +<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> +<property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> <property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> -<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> -<property name="BASEADDRESS_WINFAX" value="0x722C0000" /> -<property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> -<property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> -<property name="BASEADDRESS_COREDLL" value="0x73d80000" /> -<property name="BASEADDRESS_LZEXPAND" value="0x73d80000" /> +<property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> -<property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> <property name="BASEADDRESS_CABINET" value="0x75120000" /> <property name="BASEADDRESS_MSGINA" value="0x75970000" /> -<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> <property name="BASEADDRESS_IMM32" value="0x75e60000" /> <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> -<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> <property name="BASEADDRESS_COMDLG32" value="0x76200000" /> <property name="BASEADDRESS_OLEAUT32" value="0x76260000" /> -<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> -<property name="BASEADDRESS_RICHEDIT" value="0x76340000" /> +<property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> -<property name="BASEADDRESS_LSASRV" value="0x76540000" /> +<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> -<property name="BASEADDRESS_ODBC32" value="0x76660000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> <property name="BASEADDRESS_SHELL32" value="0x77260000" /> <property name="BASEADDRESS_IPHLPAPI" value="0x77300000" /> -<property name="BASEADDRESS_MSACM" value="0x77400000" /> <property name="BASEADDRESS_MMDRV" value="0x77500000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> -<property name="BASEADDRESS_PACKET" value="0x77780000" /> -<property name="BASEADDRESS_W2_32" value="0x77780000" /> <property name="BASEADDRESS_MSAFD" value="0x777a0000" /> -<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> -<property name="BASEADDRESS_WINMM" value="0x777c0000" /> -<property name="BASEADDRESS_WS2HELP" value="0x777c0000" /> -<property name="BASEADDRESS_WSHIRDA" value="0x777c0000" /> -<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> +<property name="BASEADDRESS_WINMM" value="0x777d0000" /> +<property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> +<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> +<property name="BASEADDRESS_VERSION" value="0x77a90000" /> +<property name="BASEADDRESS_WS2_32" value="0x777aa000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> -<property name="BASEADDRESS_OLEPRO32" value="0x77a50000" /> -<property name="BASEADDRESS_VERSION" value="0x77a90000" /> +<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e60000" /> <property name="BASEADDRESS_GDI32" value="0x77ed0000" /> <property name="BASEADDRESS_DNSAPI" value="0x77f00000" /> +<property name="BASEADDRESS_KERNEL32" value="0x77800000" /> <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> <property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> +<property name="BASEADDRESS_NTDLL" value="0x7C900000" /> +<property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> + +<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> +<property name="BASEADDRESS_NCPL" value="0x64EA0000" /> +<property name="BASEADDRESS_HID" value="0x688F0000" /> +<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> +<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> +<property name="BASEADDRESS_DISPLAY" value="DISPLAY" /> +<property name="BASEADDRESS_ACLUI" value="0x71550000" /> +<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> +<property name="BASEADDRESS_WINFAX" value="0x722C0000" /> +<property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> +<property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> +<property name="BASEADDRESS_COREDLL" value="0x73d80000" /> +<property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> +<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> +<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> +<property name="BASEADDRESS_LSASRV" value="0x76540000" /> +<property name="BASEADDRESS_ODBC32" value="0x76660000" /> +<property name="BASEADDRESS_MSACM" value="0x77400000" /> +<property name="BASEADDRESS_PACKET" value="0x77780000" /> +<property name="BASEADDRESS_W2_32" value="0x77780000" /> +<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> +<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> <property name="BASEADDRESS_EXPAT" value="0x79000000" /> -<property name="BASEADDRESS_KERNEL32" value="0x7C800000" /> -<property name="BASEADDRESS_NTDLL" value="0x7C900000" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml --- branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/acledit/acledit.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="acledit" type="win32dll"> +<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}"> <importlibrary definition="acledit.def" /> <include base="acledit">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml --- branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/aclui/aclui.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="aclui" type="win32dll"> +<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}"> <importlibrary definition="aclui.def" /> <include base="aclui">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml --- branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/advapi32/advapi32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="advapi32" type="win32dll"> +<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}"> <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml --- branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="advpack" type="win32dll"> +<module name="advpack" type="win32dll" baseaddress="${BASEADDRESS_ADVPACK}"> <importlibrary definition="advpack.def" /> <include base="advpack">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml --- branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="cabinet" type="win32dll"> +<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}"> <dependency>winebuild</dependency> <importlibrary definition="cabinet.spec.def" /> <include base="cabinet">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/cards/cards.xml --- branches/xmlbuildsystem/reactos/lib/cards/cards.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cards/cards.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="cards" type="win32dll"> +<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}"> <importlibrary definition="cards.def" /> <include base="cards">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml --- branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="comctl32" type="win32dll"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}"> <dependency>winebuild</dependency> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml --- branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="comdlg32" type="win32dll"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}"> <dependency>winebuild</dependency> <importlibrary definition="comdlg32.spec.def" /> <include base="comdlg32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml --- branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/access/access.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="access" type="win32dll" extension=".cpl"> +<module name="access" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_ACCESS}"> <importlibrary definition="access.def" /> <include base="access">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml --- branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/appwiz/appwiz.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="appwiz" type="win32dll" extension=".cpl"> +<module name="appwiz" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_APPWIZ}"> <importlibrary definition="appwiz.def" /> <include base="appwiz">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml --- branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/control/control.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="control" type="win32gui"> +<module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}"> <include base="control">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml --- branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/desk/desk.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="desk" type="win32dll" extension=".cpl"> +<module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}"> <importlibrary definition="desk.def" /> <include base="desk">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml --- branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/intl/intl.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="intl" type="win32dll" extension=".cpl"> +<module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}"> <importlibrary definition="intl.def" /> <include base="intl">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml --- branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/main/main.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="main" type="win32dll" extension=".cpl"> +<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}"> <importlibrary definition="main.def" /> <include base="main">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml --- branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/ncpa/ncpa.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="ncpa" type="win32dll" extension=".cpl"> +<module name="ncpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_NCPA}"> <importlibrary definition="ncpa.def" /> <include base="ncpa">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml --- branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/sysdm/sysdm.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="sysdm" type="win32dll" extension=".cpl"> +<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}"> <importlibrary definition="sysdm.def" /> <include base="sysdm">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml --- branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/cpl/timedate/timedate.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="timedate" type="win32dll" extension=".cpl"> +<module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}"> <importlibrary definition="timedate.def" /> <include base="timedate">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml --- branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="crtdll" type="win32dll" mangledsymbols="true"> +<module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-lgcc</linkerflag> <importlibrary definition="crtdll.def" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml --- branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="dbghelp" type="win32dll"> +<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}"> <dependency>winebuild</dependency> <importlibrary definition="dbghelp.spec.def" /> <include base="dbghelp">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml --- branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="devenum" type="win32dll"> +<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}"> <dependency>winebuild</dependency> <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml --- branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="dinput" type="win32dll"> +<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}"> <dependency>winebuild</dependency> <importlibrary definition="dinput.spec.def" /> <include base="dinput">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml --- branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/dinput8/dinput8.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="dinput8" type="win32dll"> +<module name="dinput8" type="win32dll" baseaddress="${BASEADDRESS_DINPUT8}"> <dependency>winebuild</dependency> <importlibrary definition="dinput8.spec.def" /> <include base="dinput8">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml --- branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/dnsapi/dnsapi.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="dnsapi" type="win32dll"> +<module name="dnsapi" type="win32dll" baseaddress="${BASEADDRESS_DNSAPI}"> <importlibrary definition="dnsapi.def" /> <include base="dnsapi">include</include> <include base="adns">src</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml --- branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/dsound/dsound.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="dsound" type="win32dll"> +<module name="dsound" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}"> <importlibrary definition="dsound.def" /> <include base="dsound">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml --- branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/dxdiagn/dxdiagn.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="dxdiagn" type="win32dll"> +<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}"> <dependency>winebuild</dependency> <importlibrary definition="dxdiagn.spec.def" /> <include base="dxdiagn">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml --- branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/fmifs/fmifs.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12"> +<module name="fmifs" type="win32dll" entrypoint="_InitializeFmIfs@12" baseaddress="${BASEADDRESS_FMIFS}"> <importlibrary definition="fmifs.def" /> <include base="fmifs">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml --- branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="freetype" type="kernelmodedll"> +<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}"> <importlibrary definition="freetype.def" /> <include base="freetype">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml --- branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/gdi32/gdi32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}"> <importlibrary definition="gdi32.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml --- branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/gdiplus/gdiplus.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="gdiplus" type="win32dll"> +<module name="gdiplus" type="win32dll" baseaddress="${BASEADDRESS_GDIPLUS}"> <importlibrary definition="gdiplus.def" /> <include base="gdiplus">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml --- branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/glu32/glu32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="glu32" type="win32dll"> +<module name="glu32" type="win32dll" baseaddress="${BASEADDRESS_GLU32}"> <importlibrary definition="glu32.def" /> <include base="glu32">include</include> <include base="glu32">libnurbs/internals</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml --- branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/imagehlp/imagehlp.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="imagehlp" type="win32dll"> +<module name="imagehlp" type="win32dll" baseaddress="${BASEADDRESS_IMAGEHLP}"> <dependency>winebuild</dependency> <importlibrary definition="imagehlp.def" /> <include base="imagehlp">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml --- branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/imm32/imm32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="imm32" type="win32dll"> +<module name="imm32" type="win32dll" baseaddress="${BASEADDRESS_IMM32}"> <importlibrary definition="imm32.def" /> <include base="imm32">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml --- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="iphlpapi" type="win32dll"> +<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}"> <dependency>winebuild</dependency> <importlibrary definition="iphlpapi.spec.def" /> <include base="iphlpapi">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="kernel32" type="win32dll"> +<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}"> <importlibrary definition="kernel32.def" /> <include base="kernel32">.</include> <include base="kernel32">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml --- branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/lzexpand/lz32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="lz32" type="win32dll"> +<module name="lz32" type="win32dll" baseaddress="${BASEADDRESS_LZ32}"> <importlibrary definition="lz32.def" /> <include base="lz32">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml --- branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/mesa32/mesa32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="mesa32" type="win32dll"> +<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}"> <importlibrary definition="mesa32.def" /> <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> <include base="mesa32">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml --- branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/midimap/midimap.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="midimap" type="win32dll"> +<module name="midimap" type="win32dll" baseaddress="${BASEADDRESS_MIDIMAP}"> <dependency>winebuild</dependency> <importlibrary definition="midimap.spec.def" /> <include base="midimap">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml --- branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/mmdrv/mmdrv.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="mmdrv" type="win32dll"> +<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}"> <importlibrary definition="mmdrv.def" /> <include base="mmdrv">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml --- branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/mpr/mpr.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="mpr" type="win32dll"> +<module name="mpr" type="win32dll" baseaddress="${BASEADDRESS_MPR}"> <dependency>winebuild</dependency> <importlibrary definition="mpr.spec.def" /> <include base="mpr">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml --- branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/msafd/msafd.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="msafd" type="win32dll"> +<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}"> <importlibrary definition="msafd.def" /> <include base="msafd">include</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml --- branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/msgina/msgina.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="msgina" type="win32dll"> +<module name="msgina" type="win32dll" baseaddress="${BASEADDRESS_MSGINA}"> <importlibrary definition="msgina.def" /> <include base="msgina">.</include> <include base="msgina">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml --- branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/msimg32/msimg32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="msimg32" type="win32dll"> +<module name="msimg32" type="win32dll" baseaddress="${BASEADDRESS_MSIMG32}"> <importlibrary definition="msimg32.spec.def" /> <include base="msimg32">.</include> <include base="msimg32">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="msvcrt" type="win32dll" mangledsymbols="true"> +<module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>--enable-stdcall-fixup</linkerflag> <linkerflag>-lgcc</linkerflag> _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/msvcrt20/msvcrt20.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="msvcrt20" type="win32dll" mangledsymbols="yes"> +<module name="msvcrt20" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT20}" mangledsymbols="yes"> <importlibrary definition="msvcrt20.def" /> <include base="msvcrt20">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml --- branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/netapi32/netapi32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="netapi32" type="win32dll"> +<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}"> <dependency>winebuild</dependency> <importlibrary definition="netapi32.spec.def" /> <include base="netapi32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml --- branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/ntdll/ntdll.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="ntdll" type="nativedll"> +<module name="ntdll" type="nativedll" baseaddress="${BASEADDRESS_NTDLL}"> <importlibrary definition="def/ntdll.def" /> <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml --- branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="ole32" type="win32dll"> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}"> <dependency>winebuild</dependency> <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml --- branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="oleaut32" type="win32dll"> +<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}"> <dependency>winebuild</dependency> <importlibrary definition="oleaut32.spec.def" /> <include base="oleaut32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml --- branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/olepro32/olepro32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="olepro32" type="win32dll"> +<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}"> <dependency>winebuild</dependency> <importlibrary definition="olepro32.spec.def" /> <include base="olepro32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/opengl32/opengl32.xml --- branches/xmlbuildsystem/reactos/lib/opengl32/opengl32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/opengl32/opengl32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="opengl32" type="win32dll"> +<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}"> <importlibrary definition="opengl32.def" /> <include base="wsock32">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml --- branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/psapi/psapi.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="psapi" type="win32dll"> +<module name="psapi" type="win32dll" baseaddress="${BASEADDRESS_PSAPI}"> <importlibrary definition="psapi.def" /> <include base="psapi">.</include> <include base="psapi">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml --- branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/richedit/riched32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="riched32" type="win32dll"> +<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}"> <dependency>winebuild</dependency> <importlibrary definition="riched32.spec.def" /> <include base="riched32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml --- branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="rpcrt4" type="win32dll"> +<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}"> <dependency>winebuild</dependency> <importlibrary definition="rpcrt4.spec.def" /> <include base="rpcrt4">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml --- branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="samlib" type="win32dll"> +<module name="samlib" type="win32dll" baseaddress="${BASEADDRESS_SAMLIB}"> <importlibrary definition="samlib.def" /> <include base="samlib">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml --- branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/secur32/secur32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="secur32" type="win32dll"> +<module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}"> <importlibrary definition="secur32.def" /> <include base="secur32">.</include> <define name="__SECUR32__" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml --- branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="setupapi" type="win32dll"> +<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}"> <dependency>winebuild</dependency> <importlibrary definition="setupapi.spec.def" /> <include base="setupapi">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml --- branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="shdocvw" type="win32dll"> +<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}"> <dependency>winebuild</dependency> <importlibrary definition="shdocvw.spec.def" /> <include base="shdocvw">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml --- branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="shell32" type="win32dll"> +<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}"> <dependency>winebuild</dependency> <importlibrary definition="shell32.spec.def" /> <include base="shell32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml --- branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="shlwapi" type="win32dll"> +<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}"> <dependency>winebuild</dependency> <importlibrary definition="shlwapi.spec.def" /> <include base="shlwapi">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml --- branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/smdll/smdll.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="smdll" type="win32dll"> +<module name="smdll" type="win32dll" baseaddress="${BASEADDRESS_SMDLL}"> <importlibrary definition="smdll.def" /> <include base="smdll">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml --- branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/snmpapi/snmpapi.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="snmpapi" type="win32dll"> +<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}"> <importlibrary definition="snmpapi.def" /> <include base="snmpapi">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/syssetup/syssetup.xml --- branches/xmlbuildsystem/reactos/lib/syssetup/syssetup.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/syssetup/syssetup.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="syssetup" type="win32dll"> +<module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}"> <importlibrary definition="syssetup.def" /> <include base="syssetup">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/twain/twain_32.xml --- branches/xmlbuildsystem/reactos/lib/twain/twain_32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/twain/twain_32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="twain_32" type="win32dll"> +<module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}"> <importlibrary definition="twain_32.def" /> <include base="twain_32">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml --- branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="wine_unicode" type="win32dll"> +<module name="wine_unicode" type="win32dll" baseaddress="${BASEADDRESS_UNICODE}"> <importlibrary definition="wine_unicode.def" /> <include base="wine_unicode">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml --- branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="urlmon" type="win32dll"> +<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}"> <dependency>winebuild</dependency> <importlibrary definition="urlmon.spec.def" /> <include base="urlmon">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/user32/user32.xml --- branches/xmlbuildsystem/reactos/lib/user32/user32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/user32/user32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="user32" type="win32dll"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}"> <importlibrary definition="user32.def" /> <include base="user32">.</include> <include base="user32">include</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/userenv/userenv.xml --- branches/xmlbuildsystem/reactos/lib/userenv/userenv.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/userenv/userenv.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="userenv" type="win32dll"> +<module name="userenv" type="win32dll" baseaddress="${BASEADDRESS_USERENV}"> <importlibrary definition="userenv.def" /> <include base="userenv">.</include> <define name="__USE_W32API" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/version/version.xml --- branches/xmlbuildsystem/reactos/lib/version/version.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/version/version.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="version" type="win32dll"> +<module name="version" type="win32dll" baseaddress="${BASEADDRESS_VERSION}"> <dependency>winebuild</dependency> <importlibrary definition="version.def" /> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/wininet/wininet.xml --- branches/xmlbuildsystem/reactos/lib/wininet/wininet.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/wininet/wininet.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="wininet" type="win32dll"> +<module name="wininet" type="win32dll" baseaddress="${BASEADDRESS_WININET}"> <importlibrary definition="wininet.def" /> <include base="wininet">.</include> <library>ntdll</library> _____ Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml --- branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="winmm" type="win32dll"> +<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}"> <dependency>winebuild</dependency> <importlibrary definition="winmm.spec.def" /> <include base="winmm">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml --- branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="winspool" type="win32dll" extension=".drv"> +<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}"> <importlibrary definition="winspool.def" /> <include base="winspool">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml --- branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/ws2_32/ws2_32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="ws2_32" type="win32dll"> +<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}"> <importlibrary definition="ws2_32.def" /> <include base="ws2_32">include</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/ws2help/ws2help.xml --- branches/xmlbuildsystem/reactos/lib/ws2help/ws2help.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/ws2help/ws2help.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="ws2help" type="win32dll"> +<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}"> <importlibrary definition="ws2help.def" /> <include base="ws2help">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/wshirda/wshirda.xml --- branches/xmlbuildsystem/reactos/lib/wshirda/wshirda.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/wshirda/wshirda.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="wshirda" type="win32dll"> +<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}"> <importlibrary definition="wshirda.def" /> <include base="wshirda">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/wsock32/wsock32.xml --- branches/xmlbuildsystem/reactos/lib/wsock32/wsock32.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/lib/wsock32/wsock32.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="wsock32" type="win32dll"> +<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}"> <importlibrary definition="wsock32.def" /> <include base="wsock32">.</include> <define name="UNICODE" /> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml --- branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml 2005-02-26 17:47:14 UTC (rev 13756) +++ branches/xmlbuildsystem/reactos/subsys/system/explorer/notifyhook/notify hook.xml 2005-02-26 19:29:51 UTC (rev 13757) @@ -1,4 +1,4 @@ -<module name="notifyhook" type="win32dll"> +<module name="notifyhook" type="win32dll" baseaddress="${BASEADDRESS_NOTIFYHOOK}"> <importlibrary definition="notifyhook.def" /> <include base="notifyhook">.</include> <define name="__USE_W32API" />

19 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005