Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[janderwald] 49457: [KS] - Fix several bugs in KsProbeStreamIrp - If requestor is KernelMode - just save a pointer in Irp->AssociatedIrp.SystemBuffer (currently not used) - If requestor is UserMode...

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Nov 3 11:16:33 2010 New Revision: 49457 URL: http://svn.reactos.org/svn/reactos?rev=49457&view=rev Log: [KS] - Fix several bugs in KsProbeStreamIrp - If requestor is KernelMode - just save a pointer in Irp->AssociatedIrp.SystemBuffer (currently not used) - If requestor is UserMode mark irp as buffered. Also set Flag IRP_INPUT_OPERATION when the ioctl is IOCTL_KS_READ_STREAM. This is important to propagate modifications to KSSTREAM_HEADERS (in particular DataUsed member) - ReactOS KS can now be used in WinXP in combination with KSStudio. In order to make it fully work, ks needs to implement software bus functions [PORTCLS] - Rewrite internal irp queue handling - It now supports multiple KSSTREAM_HEADERs per Irp, variable sized KSSTREAM_HEADERs per irp. - Store the mapped virtual address not in the KSSTREAM_HEADER, as user programs will receive then invalid addresses - Add checks whether this irp is for an sink pin or source pin - Fix multiple bugs when the pin is looped buffer mode (How did this work before?) - ReactOS portcls + WinXP now properly works with audio recording [WDMAUD_KERNEL] - Don't free associated stream header anymore - Tested with VBox 3.2.10 + VmWare Player 3.1.2 + WinXP Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -661,6 +661,11 @@ if (Irp->RequestorMode == KernelMode || Irp->AssociatedIrp.SystemBuffer) { + if (Irp->RequestorMode == KernelMode) + { + /* no need to allocate stream header */ + Irp->AssociatedIrp.SystemBuffer = Irp->UserBuffer; + } AllocMdl: /* check if alloc mdl flag is passed */ if (!(ProbeFlags & KSPROBE_ALLOCATEMDL)) @@ -910,6 +915,9 @@ return STATUS_INSUFFICIENT_RESOURCES; } + /* mark irp as buffered so that changes the stream headers are propagated back */ + Irp->Flags = IRP_DEALLOCATE_BUFFER | IRP_BUFFERED_IO; + _SEH2_TRY { if (ProbeFlags & KSPROBE_STREAMWRITE) @@ -923,6 +931,9 @@ { /* stream reads means writing */ ProbeForWrite(Irp->UserBuffer, Length, sizeof(UCHAR)); + + /* set input operation flags */ + Irp->Flags |= IRP_INPUT_OPERATION; } /* copy stream buffer */ Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -38,7 +38,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - /* build a request which looks like \{ObjectClass}\CreateParameters + /* build a request which looks like {ObjectClass}\CreateParameters * For pins the parent is the reference string used in registration * For clocks it is full path for pin\{ClockGuid}\ClockCreateParams */ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -319,9 +319,11 @@ DEFINE_ABSTRACT_UNKNOWN() STDMETHOD_(NTSTATUS, Init)(THIS_ - IN KSPIN_CONNECT *ConnectDetails, + IN PKSPIN_CONNECT ConnectDetails, + IN PKSPIN_DESCRIPTOR Descriptor, IN ULONG FrameSize, - IN ULONG Alignment) PURE; + IN ULONG Alignment, + IN ULONG TagSupportEnabled) PURE; STDMETHOD_(NTSTATUS, AddMapping)(THIS_ IN PIRP Irp, @@ -360,9 +362,11 @@ #define IMP_IIrpQueue \ STDMETHODIMP_(NTSTATUS) Init(THIS_ \ - IN KSPIN_CONNECT *ConnectDetails, \ + IN PKSPIN_CONNECT ConnectDetails, \ + IN PKSPIN_DESCRIPTOR Descriptor, \ IN ULONG FrameSize, \ - IN ULONG Alignment); \ + IN ULONG Alignment, \ + IN ULONG TagSupportEnabled); \ \ STDMETHODIMP_(NTSTATUS) AddMapping(THIS_ \ IN PIRP Irp, \ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -35,31 +35,40 @@ virtual ~CIrpQueue(){} protected: - volatile ULONG m_CurrentOffset; - LONG m_NumMappings; - ULONG m_NumDataAvailable; + PKSPIN_CONNECT m_ConnectDetails; + PKSPIN_DESCRIPTOR m_Descriptor; + KSPIN_LOCK m_IrpListLock; LIST_ENTRY m_IrpList; LIST_ENTRY m_FreeIrpList; - PIRP m_Irp; ULONG m_OutOfMapping; ULONG m_MaxFrameSize; ULONG m_Alignment; + ULONG m_TagSupportEnabled; + ULONG m_NumDataAvailable; + volatile ULONG m_CurrentOffset; + + PIRP m_Irp; + LONG m_Ref; }; -#define OFFSET_HEADERINDEX (0) -#define OFFSET_STREAMHEADER (2) -#define OFFSET_HEADERCOUNT (3) - - -#define STREAMHEADER_INDEX(Irp) (PtrToUlong(Irp->Tail.Overlay.DriverContext[OFFSET_HEADERINDEX])) -#define STREAMHEADER_COUNT(Irp) (PtrToUlong(Irp->Tail.Overlay.DriverContext[OFFSET_HEADERCOUNT])) -#define STREAMHEADER_CURRENT(Irp) (Irp->Tail.Overlay.DriverContext[OFFSET_STREAMHEADER]) +typedef struct +{ + ULONG StreamHeaderCount; + ULONG StreamHeaderIndex; + ULONG TotalStreamData; + + PKSSTREAM_HEADER CurStreamHeader; + PVOID * Data; + PVOID * Tags; +}KSSTREAM_DATA, *PKSSTREAM_DATA; + +#define STREAM_DATA_OFFSET (0) NTSTATUS @@ -81,13 +90,17 @@ NTSTATUS NTAPI CIrpQueue::Init( - IN KSPIN_CONNECT *ConnectDetails, + IN PKSPIN_CONNECT ConnectDetails, + IN PKSPIN_DESCRIPTOR Descriptor, IN ULONG FrameSize, - IN ULONG Alignment) + IN ULONG Alignment, + IN ULONG TagSupportEnabled) { m_ConnectDetails = ConnectDetails; + m_Descriptor = Descriptor; m_MaxFrameSize = FrameSize; m_Alignment = Alignment; + m_TagSupportEnabled = TagSupportEnabled; InitializeListHead(&m_IrpList); InitializeListHead(&m_FreeIrpList); @@ -103,110 +116,158 @@ OUT PULONG Data) { PKSSTREAM_HEADER Header; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_UNSUCCESSFUL; PIO_STACK_LOCATION IoStack; - ULONG NumHeaders, NumData, Index; + ULONG Index, Length; PMDL Mdl; + PKSSTREAM_DATA StreamData; PC_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + // allocate stream data + StreamData = (PKSSTREAM_DATA)AllocateItem(NonPagedPool, sizeof(KSSTREAM_DATA), TAG_PORTCLASS); + if (!StreamData) + { + // not enough memory + return STATUS_INSUFFICIENT_RESOURCES; + } // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - if (!Irp->MdlAddress) - { - // ioctl from KsStudio - // Wdmaud already probes buffers, therefore no need to probe it again - // probe the stream irp - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM) - Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, 0); - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) - Status = KsProbeStreamIrp(Irp, KSSTREAM_READ | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, 0); - else - PC_ASSERT(0); - - // check for success - if (!NT_SUCCESS(Status)) - { - DPRINT("KsProbeStreamIrp failed with %x\n", Status); - return Status; - } + // lets probe the irp + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM) + { + // probe IOCTL_KS_WRITE_STREAM + Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, 0); + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) + { + // probe IOCTL_KS_READ_STREAM + Status = KsProbeStreamIrp(Irp, KSSTREAM_READ | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, 0); + } + + // check for success + if (!NT_SUCCESS(Status)) + { + // irp probing failed + FreeItem(StreamData, TAG_PORTCLASS); + return Status; } // get first stream header - - if (Irp->RequestorMode == UserMode) - Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; - else - Header = (PKSSTREAM_HEADER)Irp->UserBuffer; + Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + + // store header + StreamData->CurStreamHeader = Header; // sanity check PC_ASSERT(Header); - // calculate num headers - NumHeaders = IoStack->Parameters.DeviceIoControl.OutputBufferLength / Header->Size; - - // assume headers of same length - PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength % Header->Size == 0); - - - // get first audio buffer + // first calculate the numbers of stream headers + Length = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + + do + { + /* subtract size */ + Length -= Header->Size; + + /* increment header count */ + StreamData->StreamHeaderCount++; + + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) + { + // irp sink + StreamData->TotalStreamData += Header->DataUsed; + } + else + { + // irp source + StreamData->TotalStreamData += Header->FrameExtent; + } + + /* move to next header */ + Header = (PKSSTREAM_HEADER)((ULONG_PTR)Header + Header->Size); + + }while(Length); + + // sanity check + ASSERT(StreamData->StreamHeaderCount); + + // allocate array for storing the pointers of the data */ + StreamData->Data = (PVOID*)AllocateItem(NonPagedPool, sizeof(PVOID) * StreamData->StreamHeaderCount, TAG_PORTCLASS); + if (!StreamData->Data) + { + // out of memory + FreeItem(StreamData, TAG_PORTCLASS); + + // done + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (m_TagSupportEnabled) + { + // allocate array for storing the pointers of the data */ + StreamData->Tags = (PVOID*)AllocateItem(NonPagedPool, sizeof(PVOID) * StreamData->StreamHeaderCount, TAG_PORTCLASS); + if (!StreamData->Data) + { + // out of memory + FreeItem(StreamData->Data, TAG_PORTCLASS); + FreeItem(StreamData, TAG_PORTCLASS); + + // done + return STATUS_INSUFFICIENT_RESOURCES; + } + } + + + // now get a system address for the user buffers + Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; Mdl = Irp->MdlAddress; - // sanity check - PC_ASSERT(Mdl); - - // store the current stream header - Irp->Tail.Overlay.DriverContext[OFFSET_STREAMHEADER] = (PVOID)Header; - // store header count - Irp->Tail.Overlay.DriverContext[OFFSET_HEADERCOUNT] = UlongToPtr(NumHeaders); - - // store current header index - Irp->Tail.Overlay.DriverContext[OFFSET_HEADERINDEX] = UlongToPtr(0); - - NumData = 0; - // prepare all headers - for(Index = 0; Index < NumHeaders; Index++) - { - // sanity checks - PC_ASSERT(Header); - PC_ASSERT(Mdl); - - if (Irp->RequestorMode == UserMode) - { - Header->Data = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); - } - - if (!Header->Data) - { - // insufficient resources - ExFreePool(Irp->AssociatedIrp.SystemBuffer); - Irp->AssociatedIrp.SystemBuffer = NULL; - // complete and forget request - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); + + for(Index = 0; Index < StreamData->StreamHeaderCount; Index++) + { + /* get system address */ + StreamData->Data[Index] = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); + + /* check for success */ + if (!StreamData->Data[Index]) + { + // out of resources + FreeItem(StreamData->Data, TAG_PORTCLASS); + + if (m_TagSupportEnabled) + { + // free tag array + FreeItem(StreamData->Tags, TAG_PORTCLASS); + } + + FreeItem(StreamData, TAG_PORTCLASS); + // done return STATUS_INSUFFICIENT_RESOURCES; } - // increment num mappings - InterlockedIncrement(&m_NumMappings); - - // increment available data - InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, - (max(Header->DataUsed, Header->FrameExtent))); - - NumData += max(Header->DataUsed, Header->FrameExtent); - - // move to next header + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) + { + // increment available data + InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, Header->DataUsed); + } + else if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) + { + // increment available data + InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, Header->FrameExtent); + } + + // move to next header / mdl + Mdl = Mdl->Next; Header = (PKSSTREAM_HEADER)((ULONG_PTR)Header + Header->Size); - - // move to next mdl - Mdl = Mdl->Next; - } - - DPRINT("StreamHeaders %u NumData %u FrameSize %u NumDataAvailable %u\n", NumHeaders, NumData, m_MaxFrameSize, m_NumDataAvailable); - *Data = NumData; + + } + + // store stream data + Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET] = (PVOID)StreamData; + + *Data = StreamData->TotalStreamData; // mark irp as pending IoMarkIrpPending(Irp); @@ -218,7 +279,7 @@ m_OutOfMapping = FALSE; // done - return Status; + return STATUS_SUCCESS; } NTSTATUS @@ -229,8 +290,7 @@ { PIRP Irp; ULONG Offset; - //PIO_STACK_LOCATION IoStack; - PKSSTREAM_HEADER StreamHeader; + PKSSTREAM_DATA StreamData; // check if there is an irp in the partially processed if (m_Irp) @@ -247,6 +307,7 @@ m_Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(m_Irp, IO_NO_INCREMENT); m_Irp = Irp = NULL; + m_CurrentOffset = 0; } } else @@ -259,26 +320,32 @@ if (!Irp) { // no irp buffer available - DPRINT("NoIrp\n"); return STATUS_UNSUCCESSFUL; } - // get stream header - StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; - - // sanity check - PC_ASSERT(StreamHeader); - - // store buffersize - if (StreamHeader->DataUsed) - *BufferSize = StreamHeader->DataUsed - Offset; + // get stream data + StreamData = (PKSSTREAM_DATA)Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; + + // sanity check + PC_ASSERT(StreamData); + + // get buffer size + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) + { + // sink pin + *BufferSize = StreamData->CurStreamHeader->DataUsed - Offset; + } else - *BufferSize = StreamHeader->FrameExtent - Offset; - + { + // source pin + *BufferSize = StreamData->CurStreamHeader->FrameExtent - Offset; + } + + // sanity check PC_ASSERT(*BufferSize); // store buffer - *Buffer = &((PUCHAR)StreamHeader->Data)[Offset]; + *Buffer = &((PUCHAR)StreamData->Data[StreamData->StreamHeaderIndex])[Offset]; // unset flag that no irps are available m_OutOfMapping = FALSE; @@ -291,102 +358,111 @@ CIrpQueue::UpdateMapping( IN ULONG BytesWritten) { - PKSSTREAM_HEADER StreamHeader; - ULONG Size, NumData, Index; - - if (!m_Irp) - { - // silence buffer was used - return; - } - - // get stream header - StreamHeader = (PKSSTREAM_HEADER)STREAMHEADER_CURRENT(m_Irp); - - // sanity check - // ASSERT(StreamHeader); + PKSSTREAM_DATA StreamData; + ULONG Size; + PIO_STACK_LOCATION IoStack; + + // sanity check + ASSERT(m_Irp); + + // get stream data + StreamData = (PKSSTREAM_DATA)m_Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; + + // sanity check + ASSERT(StreamData); // add to current offset InterlockedExchangeAdd((volatile PLONG)&m_CurrentOffset, (LONG)BytesWritten); + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) + { + // store written bytes (source pin) + StreamData->CurStreamHeader->DataUsed += BytesWritten; + } + // decrement available data counter m_NumDataAvailable -= BytesWritten; - if (StreamHeader->DataUsed) - Size = StreamHeader->DataUsed; + // get audio buffer size + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_OUT) + Size = StreamData->CurStreamHeader->FrameExtent; else - Size = StreamHeader->FrameExtent; - + Size = StreamData->CurStreamHeader->DataUsed; + + // sanity check PC_ASSERT(Size); if (m_CurrentOffset >= Size) { - if (STREAMHEADER_INDEX(m_Irp) + 1 < STREAMHEADER_COUNT(m_Irp)) - { - // the irp has at least one more stream header - m_Irp->Tail.Overlay.DriverContext[OFFSET_HEADERINDEX] = UlongToPtr(STREAMHEADER_INDEX(m_Irp) + 1); - - // get next stream header - StreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamHeader + StreamHeader->Size); - - // store next stream header - STREAMHEADER_CURRENT(m_Irp) = (PVOID)StreamHeader; - - // reset current offset + // sanity check + PC_ASSERT(Size == m_CurrentOffset); + + if (StreamData->StreamHeaderIndex + 1 < StreamData->StreamHeaderCount) + { + // move to next stream header + StreamData->CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamData->CurStreamHeader + StreamData->CurStreamHeader->Size); + + // increment stream header index + StreamData->StreamHeaderIndex++; + + // reset offset m_CurrentOffset = 0; // done return; } - // irp has been processed completly - NumData = 0; - if (m_Irp->RequestorMode == KernelMode) - StreamHeader = (PKSSTREAM_HEADER)m_Irp->UserBuffer; - else - StreamHeader = (PKSSTREAM_HEADER)m_Irp->AssociatedIrp.SystemBuffer; - - // loop all stream headers - for(Index = 0; Index < STREAMHEADER_COUNT(m_Irp); Index++) - { - PC_ASSERT(StreamHeader); - - // add size of buffer - // depends on if the buffer is input / output - if (StreamHeader->DataUsed) - Size = StreamHeader->DataUsed; - else - Size = StreamHeader->FrameExtent; - - // increment size - NumData += Size; - - // get next stream header - StreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamHeader + StreamHeader->Size); - } - + // + // all stream buffers have been played + // check if this is a looped buffer + // if (m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) { // looped streaming repeat the buffers untill // the caller decides to stop the streams // reset stream header index - m_Irp->Tail.Overlay.DriverContext[OFFSET_HEADERINDEX] = UlongToPtr(0); + StreamData->StreamHeaderIndex = 0; + + // reset stream header + StreamData->CurStreamHeader = (PKSSTREAM_HEADER)m_Irp->AssociatedIrp.SystemBuffer; + + // increment available data + InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, StreamData->TotalStreamData); + // re-insert irp KsAddIrpToCancelableQueue(&m_IrpList, &m_IrpListLock, m_Irp, KsListEntryTail, NULL); + // clear current irp m_Irp = NULL; + // reset offset m_CurrentOffset = 0; - // increment available data - InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, NumData); + // done return; } + // free stream data array + FreeItem(StreamData->Data, TAG_PORTCLASS); + + if (m_TagSupportEnabled) + { + // free tag array + FreeItem(StreamData->Tags, TAG_PORTCLASS); + } + + // free stream data + FreeItem(StreamData, TAG_PORTCLASS); + + // get io stack + IoStack = IoGetCurrentIrpStackLocation(m_Irp); + // store operation status m_Irp->IoStatus.Status = STATUS_SUCCESS; - m_Irp->IoStatus.Information = 0; + + // store operation length + m_Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; // complete the request IoCompleteRequest(m_Irp, IO_SOUND_INCREMENT); @@ -411,6 +487,8 @@ NTAPI CIrpQueue::CancelBuffers() { + //TODO: own cancel routine + // is there an active irp if (m_Irp) { @@ -422,8 +500,7 @@ // cancel all irps KsCancelIo(&m_IrpList, &m_IrpListLock); - // reset number of mappings - m_NumMappings = 0; + // reset number of data available m_NumDataAvailable = 0; @@ -440,44 +517,83 @@ OUT PULONG ByteCount, OUT PULONG Flags) { - PKSSTREAM_HEADER StreamHeader; - PIRP Irp; - - *Flags = 0; + PKSSTREAM_DATA StreamData; + + /* sanity checks */ PC_ASSERT(Tag != NULL); - - // get an irp from the queue - Irp = KsRemoveIrpFromCancelableQueue(&m_IrpList, &m_IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + PC_ASSERT(PhysicalAddress); + PC_ASSERT(VirtualAddress); + PC_ASSERT(ByteCount); + PC_ASSERT(Flags); + + if (!m_Irp) + { + // get an irp from the queue + m_Irp = KsRemoveIrpFromCancelableQueue(&m_IrpList, &m_IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + } // check if there is an irp - if (!Irp) + if (!m_Irp) { // no irp available m_OutOfMapping = TRUE; return STATUS_NOT_FOUND; } - //FIXME support more than one stream header - PC_ASSERT(STREAMHEADER_COUNT(Irp) == 1); - - // HACK get stream header - StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; - - // store mapping in the free list - ExInterlockedInsertTailList(&m_FreeIrpList, &Irp->Tail.Overlay.ListEntry, &m_IrpListLock); - - // return mapping - *PhysicalAddress = MmGetPhysicalAddress(StreamHeader->Data); - *VirtualAddress = StreamHeader->Data; - *ByteCount = StreamHeader->DataUsed; - - // decrement mapping count - InterlockedDecrement(&m_NumMappings); - // decrement num data available - m_NumDataAvailable -= StreamHeader->DataUsed; + // get stream data + StreamData = (PKSSTREAM_DATA)m_Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; + + // sanity check + PC_ASSERT(StreamData->StreamHeaderIndex < StreamData->StreamHeaderCount); + + // setup mapping + *PhysicalAddress = MmGetPhysicalAddress(StreamData->Data[StreamData->StreamHeaderIndex]); + *VirtualAddress = StreamData->Data[StreamData->StreamHeaderIndex]; // store tag in irp - Irp->Tail.Overlay.DriverContext[3] = Tag; + StreamData->Tags[StreamData->StreamHeaderIndex] = Tag; + + // mapping size + if (m_Descriptor->DataFlow == KSPIN_DATAFLOW_IN) + { + // sink pin + *ByteCount = StreamData->CurStreamHeader->DataUsed; + + // decrement num data available + m_NumDataAvailable -= StreamData->CurStreamHeader->DataUsed; + } + else + { + // source pin + *ByteCount = StreamData->CurStreamHeader->FrameExtent; + + // decrement num data available + m_NumDataAvailable -= StreamData->CurStreamHeader->FrameExtent; + } + + if (StreamData->StreamHeaderIndex + 1 == StreamData->StreamHeaderCount) + { + // last mapping + *Flags = 1; + + // insert mapping into free list + ExInterlockedInsertTailList(&m_FreeIrpList, &m_Irp->Tail.Overlay.ListEntry, &m_IrpListLock); + + // clear irp + m_Irp = NULL; + + } + else + { + // one more mapping in the irp + *Flags = 0; + + // increment header index + StreamData->StreamHeaderIndex++; + + // move to next header + StreamData->CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamData->CurStreamHeader + StreamData->CurStreamHeader->Size); + } // done return STATUS_SUCCESS; @@ -490,34 +606,123 @@ { PIRP Irp; PLIST_ENTRY CurEntry; - PKSSTREAM_HEADER StreamHeader; - - DPRINT("CIrpQueue::ReleaseMappingWithTag Tag %p\n", Tag); + PKSSTREAM_DATA StreamData; + PIO_STACK_LOCATION IoStack; + ULONG Index; + + // first check if there is an active irp + if (m_Irp) + { + // now check if there are already used mappings + StreamData = (PKSSTREAM_DATA)m_Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; + + if (StreamData->StreamHeaderIndex) + { + // check if the released mapping is one current processed irps + for(Index = 0; Index < StreamData->StreamHeaderIndex; Index++) + { + // check if it is the same tag + if (StreamData->Tags[Index] == Tag) + { + // mark mapping as released + StreamData->Tags[Index] = NULL; + + // done + return STATUS_SUCCESS; + } + + } + } + } // remove irp from used list CurEntry = ExInterlockedRemoveHeadList(&m_FreeIrpList, &m_IrpListLock); + // sanity check PC_ASSERT(CurEntry); // get irp from list entry Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); - // HACK get stream header - StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; - - // driver must release items in the same order - PC_ASSERT(Irp->Tail.Overlay.DriverContext[3] == Tag); - - // irp has been processed completly - Irp->IoStatus.Status = STATUS_SUCCESS; - - // frame extend contains the original request size, DataUsed contains the real buffer size - // is different when kmixer performs channel conversion, upsampling etc - - Irp->IoStatus.Information = StreamHeader->FrameExtent; - - // complete the request - IoCompleteRequest(Irp, IO_SOUND_INCREMENT); + // get stream data + StreamData = (PKSSTREAM_DATA)Irp->Tail.Overlay.DriverContext[STREAM_DATA_OFFSET]; + + // sanity check + PC_ASSERT(StreamData->StreamHeaderIndex + 1 == StreamData->StreamHeaderCount); + + // check if the released mapping is one of these + for(Index = 0; Index < StreamData->StreamHeaderCount; Index++) + { + if (StreamData->Tags[Index] == Tag) + { + // mark mapping as released + StreamData->Tags[Index] = NULL; + + // done + break; + } + else + { + // + // we assume that mappings are released in the same order as they have been acquired + // therefore if the current mapping is not the searched one, it must have been already + // released + // + PC_ASSERT(StreamData->Tags[Index] == NULL); + } + } + + // check if this is the last one released mapping + if (Index + 1 == StreamData->StreamHeaderCount) + { + // last mapping released + // now check if this is a looped buffer + if (m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING) + { + // looped buffers are not completed when they have been played + // they are completed when the stream is set to stop + + // reset stream header index + StreamData->StreamHeaderIndex = 0; + + // reset stream header + StreamData->CurStreamHeader = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + + // increment available data + InterlockedExchangeAdd((PLONG)&m_NumDataAvailable, StreamData->TotalStreamData); + + // re-insert irp + KsAddIrpToCancelableQueue(&m_IrpList, &m_IrpListLock, Irp, KsListEntryTail, NULL); + + // done + return STATUS_SUCCESS; + } + + // + // time to complete non looped buffer + // + + // free stream data array + FreeItem(StreamData->Data, TAG_PORTCLASS); + + // free stream tags array + FreeItem(StreamData->Tags, TAG_PORTCLASS); + + // free stream data + FreeItem(StreamData, TAG_PORTCLASS); + + // get io stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // store operation status + Irp->IoStatus.Status = STATUS_SUCCESS; + + // store operation length + Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + + // complete the request + IoCompleteRequest(Irp, IO_SOUND_INCREMENT); + } return STATUS_SUCCESS; } @@ -545,38 +750,18 @@ { KIRQL OldLevel; BOOLEAN Ret = FALSE; - PIRP Irp; - PLIST_ENTRY CurEntry; - + //PIRP Irp; + //PLIST_ENTRY CurEntry; + //PKSSTREAM_DATA StreamData; + + // lock list KeAcquireSpinLock(&m_IrpListLock, &OldLevel); - if (!IsListEmpty(&m_FreeIrpList)) - { - // get first entry - CurEntry = RemoveHeadList(&m_FreeIrpList); - // get irp from list entry - Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); - - // get tag of first acquired buffer - *FirstTag = Irp->Tail.Overlay.DriverContext[3]; - - // put back irp - InsertHeadList(&m_FreeIrpList, &Irp->Tail.Overlay.ListEntry); - - // get last entry - CurEntry = RemoveTailList(&m_FreeIrpList); - // get irp from list entry - Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); - - // get tag of first acquired buffer - *LastTag = Irp->Tail.Overlay.DriverContext[3]; - - // put back irp - InsertTailList(&m_FreeIrpList, &Irp->Tail.Overlay.ListEntry); - - // indicate success - Ret = TRUE; - } + // initialize to zero + *FirstTag = NULL; + *LastTag = NULL; + + UNIMPLEMENTED; // release lock KeReleaseSpinLock(&m_IrpListLock, OldLevel); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -604,7 +604,7 @@ } } - Status = m_IrpQueue->Init(ConnectDetails, 0, 0); + Status = m_IrpQueue->Init(ConnectDetails, KsPinDescriptor, 0, 0, FALSE); if (!NT_SUCCESS(Status)) { DPRINT("IrpQueue_Init failed with %x\n", Status); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -702,7 +702,7 @@ if (Gap > BufferLength) { // insert silence samples - DPRINT1("Inserting Silence Buffer Offset %lu GapLength %lu\n", m_CommonBufferOffset, BufferLength); + DPRINT("Inserting Silence Buffer Offset %lu GapLength %lu\n", m_CommonBufferOffset, BufferLength); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; @@ -761,7 +761,7 @@ if (Gap > BufferLength) { // insert silence samples - DPRINT1("Overlap Inserting Silence Buffer Size %lu Offset %lu Gap %lu Position %lu\n", m_CommonBufferSize, m_CommonBufferOffset, Gap, Position); + DPRINT("Overlap Inserting Silence Buffer Size %lu Offset %lu Gap %lu Position %lu\n", m_CommonBufferSize, m_CommonBufferOffset, Gap, Position); m_Stream->Silence((PUCHAR)m_CommonBuffer + m_CommonBufferOffset, BufferLength); m_CommonBufferOffset += BufferLength; @@ -1303,7 +1303,7 @@ m_Stream->Silence(m_CommonBuffer, m_CommonBufferSize); - Status = m_IrpQueue->Init(ConnectDetails, m_FrameSize, 0); + Status = m_IrpQueue->Init(ConnectDetails, KsPinDescriptor, m_FrameSize, 0, FALSE); if (!NT_SUCCESS(Status)) { m_IrpQueue->Release(); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -919,7 +919,7 @@ } // initialize irp queue - Status = m_IrpQueue->Init(ConnectDetails, m_AllocatorFraming.FrameSize, m_AllocatorFraming.FileAlignment); + Status = m_IrpQueue->Init(ConnectDetails, KsPinDescriptor, m_AllocatorFraming.FrameSize, m_AllocatorFraming.FileAlignment, TRUE); if (!NT_SUCCESS(Status)) { // this should never happen Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -283,7 +283,7 @@ CPortPinWaveRT::HandleKsStream( IN PIRP Irp) { - DPRINT("IPortPinWaveRT_HandleKsStream entered State %u Stream %p\n", m_State, m_Stream); + DPRINT("IPortPinWaveRT_HandleKsStream entered State %u Stream %p is UNIMPLEMENTED\n", m_State, m_Stream); return STATUS_PENDING; } @@ -587,7 +587,7 @@ goto cleanup; } - Status = m_IrpQueue->Init(ConnectDetails, 0, 0); + Status = m_IrpQueue->Init(ConnectDetails, KsPinDescriptor, 0, 0, FALSE); if (!NT_SUCCESS(Status)) { goto cleanup; @@ -624,7 +624,7 @@ // delay of 10 milisec m_Delay = Int32x32To64(10, -10000); - Status = m_Stream->AllocateAudioBuffer(16384 * 11, &m_Mdl, &m_CommonBufferSize, &m_CommonBufferOffset, &m_CacheType); + Status = m_Stream->AllocateAudioBuffer(16384 * 11, &m_Mdl, &m_CommonBufferSize, &m_CommonBufferOffset, &m_CacheType); if (!NT_SUCCESS(Status)) { DPRINT("AllocateAudioBuffer failed with %x\n", Status); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Wed Nov 3 11:16:33 2010 @@ -452,15 +452,17 @@ /* now free the mdl */ IoFreeMdl(Context->Mdl); - /* now free the stream header */ - ExFreePool(Irp->AssociatedIrp.SystemBuffer); - DPRINT("IoCompletion Irp %p IoStatus %lx Information %lx Length %lu\n", Irp, Irp->IoStatus.Status, Irp->IoStatus.Information, Length); if (Irp->IoStatus.Status == STATUS_SUCCESS) { /* store the length */ Irp->IoStatus.Information = Length; + } + else + { + /* failed */ + Irp->IoStatus.Information = 0; } /* free context */

13 years, 11 months

[fireball] 49456: [TASKMGR] - Fix Russian translation, by spb-ivan92. See issue #5685 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Nov 3 09:09:57 2010 New Revision: 49456 URL: http://svn.reactos.org/svn/reactos?rev=49456&view=rev Log: [TASKMGR] - Fix Russian translation, by spb-ivan92. See issue #5685 for more details. Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc [iso-8859-1] Wed Nov 3 09:09:57 2010 @@ -641,10 +641,10 @@ IDS_MSG_UNABLEDEBUGPROCESS "Îòëàäêà ïðîöåññà íåâîçìîæíà" IDS_MSG_WARNINGDEBUG "ÂÍÈÌÀÍÈÅ: Îòëàäêà ýòîãî ïðîöåññà ìîæåò çàêîí÷èòüñÿ ïîòåðåé äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?" IDS_MSG_TASKMGRWARNING "Îøèáêà Ìåíåäæåðà çàäà÷" - IDS_MSG_WARNINGTERMINATING "ÂÍÈÌÀÍÈÅ: Çàâåðøåíèå ïðîöåññà ìîæåò ïîâëå÷ íåóñòîé÷èâóþ ðàáîòó ñèñòåìû è ïîòåðþ äàííûõ\nÑîõðàíèòå âàæíûå äàííûå ïåðåä ïðîäîëæåíèåì.\nÏðîäîëæèòü çàâåðøåíèå ïðîöåññà?" + IDS_MSG_WARNINGTERMINATING "ÂÍÈÌÀÍÈÅ: Çàâåðøåíèå ïðîöåññà ìîæåò ïîâëå÷ü íåóñòîé÷èâóþ ðàáîòó ñèñòåìû è ïîòåðþ äàííûõ\nÑîõðàíèòå âàæíûå äàííûå ïåðåä ïðîäîëæåíèåì.\nÏðîäîëæèòü çàâåðøåíèå ïðîöåññà?" IDS_MSG_UNABLETERMINATEPRO "Íå óäàëîñü çàâåðøèòü ïðîöåññ" IDS_MSG_UNABLECHANGEPRIORITY "Íå óäàëîñü èçìåíèòü ïðèîðèòåò" - IDS_MSG_WARNINGCHANGEPRIORITY "ÂÍÈÌÀÍÈÅ: Èçìåíåíèå ïðèîðèòåòà ìîæåò ïîâëå÷ íåóñòîé÷èâóþ ðàáîòó è ïîòåðþ äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?" + IDS_MSG_WARNINGCHANGEPRIORITY "ÂÍÈÌÀÍÈÅ: Èçìåíåíèå ïðèîðèòåòà ìîæåò ïîâëå÷ü íåóñòîé÷èâóþ ðàáîòó è ïîòåðþ äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?" IDS_MSG_TRAYICONCPUUSAGE "Çàãðóçêà ÖÏ: %d%%" IDS_STATUS_MEMUSAGE "Âûäåëåíèå ïàìÿòè: %dK / %dK" IDS_STATUS_CPUUSAGE "Çàãðóçêà ÖÏ: %3d%%"

13 years, 11 months

[tkreuzer] 49455: [WIN32K] Change all Init functions to be NTAPI instead of FASTCALL, return NTSTATUS, and be an INIT_FUNCTION (saving incredible 2k). Simplify the initialization sequence by using ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Nov 3 00:51:19 2010 New Revision: 49455 URL: http://svn.reactos.org/svn/reactos?rev=49455&view=rev Log: [WIN32K] Change all Init functions to be NTAPI instead of FASTCALL, return NTSTATUS, and be an INIT_FUNCTION (saving incredible 2k). Simplify the initialization sequence by using a simple macro. Delete a comment that is not true anymore. Move some globals to appropriate file. Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/accelerator.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/device.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/guicheck.h trunk/reactos/subsystems/win32/win32k/include/hotkey.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/subsystems/win32/win32k/include/ldevobj.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/ntuser.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/include/win32kp.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/include/xlateobj.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -20,15 +20,16 @@ static HSEMAPHORE ghsemGraphicsDeviceList; static ULONG giDevNum = 1; -BOOL +INIT_FUNCTION +NTSTATUS NTAPI InitDeviceImpl() { ghsemGraphicsDeviceList = EngCreateSemaphore(); if (!ghsemGraphicsDeviceList) - return FALSE; - - return TRUE; + return STATUS_INSUFFICIENT_RESOURCES; + + return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -26,7 +26,8 @@ /** Private functions *********************************************************/ -BOOL +INIT_FUNCTION +NTSTATUS NTAPI InitLDEVImpl() { @@ -34,7 +35,7 @@ ghsemLDEVList = EngCreateSemaphore(); if (!ghsemLDEVList) { - return FALSE; + return STATUS_INSUFFICIENT_RESOURCES; } /* Allocate a LDEVOBJ for win32k */ @@ -44,7 +45,7 @@ GDITAG_LDEV); if (!gpldevWin32k) { - return FALSE; + return STATUS_NO_MEMORY; } /* Initialize the LDEVOBJ for win32k */ @@ -62,7 +63,7 @@ gpldevWin32k->pGdiDriverInfo->ExportSectionPointer = NULL; gpldevWin32k->pGdiDriverInfo->ImageLength = 0; // FIXME; - return TRUE; + return STATUS_SUCCESS; } PLDEVOBJ Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -18,12 +18,14 @@ static PPDEVOBJ gppdevList = NULL; static HSEMAPHORE ghsemPDEV; -BOOL +INIT_FUNCTION +NTSTATUS NTAPI InitPDEVImpl() { ghsemPDEV = EngCreateSemaphore(); - return TRUE; + if (!ghsemPDEV) return STATUS_INSUFFICIENT_RESOURCES; + return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -634,11 +634,13 @@ pexlo->xlo.pulXlate = pexlo->aulXlate; } -VOID +INIT_FUNCTION +NTSTATUS +NTAPI InitXlateImpl(VOID) { - EXLATEOBJ_vInitTrivial(&gexloTrivial); + return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -11,7 +11,9 @@ LPACCEL Table; } ACCELERATOR_TABLE, *PACCELERATOR_TABLE; -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitAcceleratorImpl(VOID); NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -159,7 +159,7 @@ extern PDC defaultDCstate; -NTSTATUS FASTCALL InitDcImpl(VOID); +INIT_FUNCTION NTSTATUS NTAPI InitDcImpl(); PPDEVOBJ FASTCALL IntEnumHDev(VOID); PDC NTAPI DC_AllocDcWithHandle(); VOID FASTCALL DC_InitDC(HDC DCToInit); Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -45,7 +45,9 @@ HWND hWnd; } SHELL_HOOK_WINDOW, *PSHELL_HOOK_WINDOW; -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitDesktopImpl(VOID); NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/device.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/device.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -30,7 +30,8 @@ PUNICODE_STRING pustrDescription, PDEVMODEW pdmDefault); -BOOL +INIT_FUNCTION +NTSTATUS NTAPI InitDeviceImpl(); Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -59,6 +59,8 @@ BASEFLAG_READY_TO_DIE = 0x1000 }; +extern PSECTION_OBJECT GdiTableSection; + BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(HGDIOBJ ObjectHandle); BOOL INTERNAL_CALL GDIOBJ_SetOwnership(HGDIOBJ ObjectHandle, PEPROCESS Owner); BOOL INTERNAL_CALL GDIOBJ_CopyOwnership(HGDIOBJ CopyFrom, HGDIOBJ CopyTo); @@ -74,6 +76,11 @@ VOID INTERNAL_CALL GDIOBJ_LockMultipleObjs(ULONG ulCount, IN HGDIOBJ* ahObj, OUT PGDIOBJ* apObj); PVOID INTERNAL_CALL GDI_MapHandleTable(PSECTION_OBJECT SectionObject, PEPROCESS Process); + +INIT_FUNCTION +NTSTATUS +NTAPI +InitGdiHandleTable(); #define GDIOBJ_GetObjectType(Handle) \ GDI_HANDLE_GET_TYPE(Handle) Modified: trunk/reactos/subsystems/win32/win32k/include/guicheck.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/guicheck.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/guicheck.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -4,6 +4,9 @@ BOOL FASTCALL IntCreatePrimarySurface(VOID); VOID FASTCALL IntDestroyPrimarySurface(VOID); -NTSTATUS FASTCALL InitGuiCheckImpl (VOID); +INIT_FUNCTION +NTSTATUS +NTAPI +InitGuiCheckImpl (VOID); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/include/hotkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hotkey.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hotkey.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -13,7 +13,9 @@ UINT vk; } HOT_KEY_ITEM, *PHOT_KEY_ITEM; -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitHotkeyImpl(VOID); //NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -27,10 +27,16 @@ #define KBL_PRELOAD 2 #define KBL_RESET 4 -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitInputImpl(VOID); -NTSTATUS FASTCALL + +INIT_FUNCTION +NTSTATUS +NTAPI InitKeyboardImpl(VOID); + PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); VOID W32kUnregisterPrimitiveMessageQueue(VOID); PKBL W32kGetDefaultKeyLayout(VOID); Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -82,32 +82,6 @@ POINTL *pptlDitherOrg, ULONG ulMode); -VOID InitXlateImpl(VOID); - -XLATEOBJ* FASTCALL -IntEngCreateXlate(USHORT DestPalType, - USHORT SourcePalType, - HPALETTE PaletteDest, - HPALETTE PaletteSource); - -XLATEOBJ* FASTCALL -IntEngCreateMonoXlate(USHORT SourcePalType, - HPALETTE PaletteDest, - HPALETTE PaletteSource, - ULONG BackgroundColor); - -XLATEOBJ* FASTCALL -IntEngCreateSrcMonoXlate(HPALETTE PaletteDest, - ULONG Color0, - ULONG Color1); - -XLATEOBJ* -IntCreateBrushXlate(BRUSH *pbrush, SURFACE * psurf, COLORREF crBackgroundClr); - -HPALETTE FASTCALL -IntEngGetXlatePalette(XLATEOBJ *XlateObj, - ULONG Palette); - BOOL APIENTRY IntEngPolyline(SURFOBJ *DestSurf, CLIPOBJ *Clip, Modified: trunk/reactos/subsystems/win32/win32k/include/ldevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/ldevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/ldevobj.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -63,7 +63,8 @@ PLDEVOBJ pldev, HANDLE hDriver); -BOOL +INIT_FUNCTION +NTSTATUS NTAPI InitLDEVImpl(); Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -104,7 +104,9 @@ PROSMENUITEMINFO ItemInfo); -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitMenuImpl(VOID); NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -32,7 +32,10 @@ } MONITOR, *PMONITOR; /* functions */ -NTSTATUS InitMonitorImpl(); +INIT_FUNCTION +NTSTATUS +NTAPI +InitMonitorImpl(); NTSTATUS CleanupMonitorImpl(); NTSTATUS IntAttachMonitor(PDEVOBJ *pGdiDevice, ULONG DisplayNumber); Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -138,7 +138,9 @@ MsqDestroyMessageQueue(PUSER_MESSAGE_QUEUE MessageQueue); PUSER_MESSAGE_QUEUE FASTCALL MsqGetHardwareMessageQueue(VOID); -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI MsqInitializeImpl(VOID); BOOLEAN FASTCALL co_MsqDispatchOneSentMessage(PUSER_MESSAGE_QUEUE MessageQueue); Modified: trunk/reactos/subsystems/win32/win32k/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -11,7 +11,7 @@ extern PSERVERINFO gpsi; -NTSTATUS FASTCALL InitUserImpl(VOID); +INIT_FUNCTION NTSTATUS NTAPI InitUserImpl(VOID); VOID FASTCALL CleanupUserImpl(VOID); VOID FASTCALL UserEnterShared(VOID); VOID FASTCALL UserEnterExclusive(VOID); Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -74,8 +74,7 @@ GDIOBJ_ShareUnlockObjByPtr(&ppal->BaseObject) BOOL INTERNAL_CALL PALETTE_Cleanup(PVOID ObjectBody); - -HPALETTE FASTCALL PALETTE_Init (VOID); +INIT_FUNCTION NTSTATUS NTAPI InitPaletteImpl(); VOID FASTCALL PALETTE_ValidateFlags (PALETTEENTRY* lpPalE, INT size); INT FASTCALL PALETTE_ToPhysical (PDC dc, COLORREF color); Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -174,17 +174,10 @@ PPDEVOBJ ppdev, PDEVCAPS pDevCaps); -BOOL +INIT_FUNCTION +NTSTATUS NTAPI InitPDEVImpl(); - -BOOL -NTAPI -InitLDEVImpl(); - -BOOL -NTAPI -InitDeviceImpl(); PSIZEL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -26,7 +26,10 @@ extern PKTIMER MasterTimer; -NTSTATUS FASTCALL InitTimerImpl(VOID); +INIT_FUNCTION +NTSTATUS +NTAPI +InitTimerImpl(VOID); BOOL FASTCALL DestroyTimersForThread(PTHREADINFO pti); BOOL FASTCALL DestroyTimersForWindow(PTHREADINFO pti, PWND Window); BOOL FASTCALL IntKillTimer(PWND Window, UINT_PTR IDEvent, BOOL SystemTimer); Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -10,6 +10,9 @@ #pragma once #define INTERNAL_CALL APIENTRY + +#define PLACE_IN_SECTION(s) __attribute__((section(s))) +#define INIT_FUNCTION PLACE_IN_SECTION("INIT") /* Internal Win32k Headers */ #include <include/accelerator.h> Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -50,7 +50,9 @@ HWND* FASTCALL IntWinListChildren(PWND Window); -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitWindowImpl (VOID); NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -62,7 +62,9 @@ extern WINSTATION_OBJECT *InputWindowStation; extern PPROCESSINFO LogonProcess; -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitWindowStationImpl(VOID); NTSTATUS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -47,5 +47,9 @@ VOID NTAPI EXLATEOBJ_vInitXlateFromDCs(PEXLATEOBJ pexlo, PDC pdcSrc, PDC pdcDst); VOID NTAPI EXLATEOBJ_vInitSrcMonoXlate(PEXLATEOBJ pexlo, PPALETTE ppalDst, ULONG Color0, ULONG Color1); VOID NTAPI EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo); +INIT_FUNCTION +NTSTATUS +NTAPI +InitXlateImpl(VOID); //#define XLATEOBJ_iXlate(pxo, Color) ((EXLATEOBJ*)pxo)->pfnXlate(pxo, Color) Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -16,16 +16,11 @@ PGDI_HANDLE_TABLE INTERNAL_CALL GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject); BOOL INTERNAL_CALL GDI_CleanupForProcess (struct _EPROCESS *Process); -/* FIXME */ -PGDI_HANDLE_TABLE GdiHandleTable = NULL; -PSECTION_OBJECT GdiTableSection = NULL; HANDLE GlobalUserHeap = NULL; PSECTION_OBJECT GlobalUserHeapSection = NULL; PSERVERINFO gpsi = NULL; // Global User Server Information. - -HSEMAPHORE hsemDriverMgmt = NULL; SHORT gusLanguageID; @@ -315,8 +310,6 @@ END_CLEANUP; } -/* Only used in ntuser/input.c KeyboardThreadMain(). If it's - not called there anymore, please delete */ NTSTATUS Win32kInitWin32Thread(PETHREAD Thread) { @@ -354,11 +347,22 @@ C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE); +// Return on failure +#define NT_ROF(x) \ + Status = (x); \ + if (!NT_SUCCESS(Status)) \ + { \ + DPRINT1("Failed '%s' (0x%lx)\n", #x, Status); \ + return Status; \ + } + /* * This definition doesn't work */ -NTSTATUS APIENTRY -DriverEntry ( +INIT_FUNCTION +NTSTATUS +APIENTRY +DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { @@ -407,146 +411,48 @@ } /* Allocate global server info structure */ + gpsi = UserHeapAlloc(sizeof(SERVERINFO)); if (!gpsi) { - gpsi = UserHeapAlloc(sizeof(SERVERINFO)); - if (gpsi) - { - RtlZeroMemory(gpsi, sizeof(SERVERINFO)); - DPRINT("Global Server Data -> %x\n", gpsi); - } - else - { - ASSERT(FALSE); - } - } - - if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); - - /* Create the GDI handle table */ - GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); - if (GdiHandleTable == NULL) - { - DPRINT1("Failed to initialize the GDI handle table.\n"); + DPRINT1("Failed allocate server info structure!\n"); return STATUS_UNSUCCESSFUL; } - /* Initialize default palettes */ - PALETTE_Init(); + RtlZeroMemory(gpsi, sizeof(SERVERINFO)); + DPRINT("Global Server Data -> %x\n", gpsi); + + NT_ROF(InitGdiHandleTable()); + NT_ROF(InitPaletteImpl()); /* Create stock objects, ie. precreated objects commonly used by win32 applications */ CreateStockObjects(); CreateSysColorObjects(); - InitXlateImpl(); - InitPDEVImpl(); - InitLDEVImpl(); - InitDeviceImpl(); - - Status = InitDcImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize Device context implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitUserImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize user implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitHotkeyImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize hotkey implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitWindowStationImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize window station implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitDesktopImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize desktop implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitWindowImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize window implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitMenuImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize menu implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = InitInputImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize input implementation.\n"); - return(Status); - } - - Status = InitKeyboardImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize keyboard implementation.\n"); - return(Status); - } - - Status = InitMonitorImpl(); - if (!NT_SUCCESS(Status)) - { - DbgPrint("Failed to initialize monitor implementation!\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = MsqInitializeImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize message queue implementation.\n"); - return(Status); - } - - Status = InitTimerImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize timer implementation.\n"); - return(Status); - } - - Status = InitAcceleratorImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize accelerator implementation.\n"); - return(Status); - } - - Status = InitGuiCheckImpl(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to initialize GUI check implementation.\n"); - return(Status); - } + NT_ROF(InitXlateImpl()); + NT_ROF(InitPDEVImpl()); + NT_ROF(InitLDEVImpl()); + NT_ROF(InitDeviceImpl()); + NT_ROF(InitDcImpl()); + NT_ROF(InitUserImpl()); + NT_ROF(InitHotkeyImpl()); + NT_ROF(InitWindowStationImpl()); + NT_ROF(InitDesktopImpl()); + NT_ROF(InitWindowImpl()); + NT_ROF(InitMenuImpl()); + NT_ROF(InitInputImpl()); + NT_ROF(InitKeyboardImpl()); + NT_ROF(InitMonitorImpl()); + NT_ROF(MsqInitializeImpl()); + NT_ROF(InitTimerImpl()); + NT_ROF(InitAcceleratorImpl()); + NT_ROF(InitGuiCheckImpl()); /* Initialize FreeType library */ if (!InitFontSupport()) { DPRINT1("Unable to initialize font support\n"); - return STATUS_UNSUCCESSFUL; + return Status; } gusLanguageID = IntGdiGetLanguageID(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -56,7 +56,9 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitAcceleratorImpl(VOID) { return(STATUS_SUCCESS); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -170,8 +170,9 @@ /* PRIVATE FUNCTIONS **********************************************************/ +INIT_FUNCTION NTSTATUS -FASTCALL +NTAPI InitDesktopImpl(VOID) { /* Set Desktop Object Attributes */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -130,7 +130,9 @@ } -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitGuiCheckImpl (VOID) { return STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -51,7 +51,9 @@ /* FUNCTIONS *****************************************************************/ -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitHotkeyImpl(VOID) { InitializeListHead(&gHotkeyList); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -922,7 +922,9 @@ DPRINT1("Raw Input Thread Exit!\n"); } -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitInputImpl(VOID) { NTSTATUS Status; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -58,7 +58,10 @@ /* FUNCTIONS *****************************************************************/ /* Initialization -- Right now, just zero the key state and init the lock */ -NTSTATUS FASTCALL InitKeyboardImpl(VOID) +INIT_FUNCTION +NTSTATUS +NTAPI +InitKeyboardImpl(VOID) { RtlZeroMemory(&gQueueKeyStateTable,0x100); return STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -86,7 +86,9 @@ ( ((r).bottom >= y)) && \ ( ((r).top <= y)) ) -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitMenuImpl(VOID) { return(STATUS_SUCCESS); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -28,7 +28,9 @@ /* INITALIZATION FUNCTIONS ****************************************************/ +INIT_FUNCTION NTSTATUS +NTAPI InitMonitorImpl() { DPRINT("Initializing monitor implementation...\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -140,7 +140,9 @@ } -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI MsqInitializeImpl(VOID) { /*CurrentFocusMessageQueue = NULL;*/ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -53,8 +53,10 @@ /* FUNCTIONS *****************************************************************/ - -NTSTATUS FASTCALL InitUserImpl(VOID) +INIT_FUNCTION +NTSTATUS +NTAPI +InitUserImpl(VOID) { NTSTATUS Status; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -527,7 +527,9 @@ return pTmr ? TRUE : FALSE; } -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitTimerImpl(VOID) { ULONG BitmapBytes; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -29,7 +29,9 @@ * Initialize windowing implementation. */ -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitWindowImpl(VOID) { return STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -56,7 +56,9 @@ }; -NTSTATUS FASTCALL +INIT_FUNCTION +NTSTATUS +NTAPI InitWindowStationImpl(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -58,7 +58,9 @@ /** Internal functions ********************************************************/ +INIT_FUNCTION NTSTATUS +NTAPI InitDcImpl() { psurfDefaultBitmap = SURFACE_ShareLockSurface(StockObjects[DEFAULT_BITMAP]); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -81,6 +81,8 @@ }; static LARGE_INTEGER ShortDelay; +PGDI_HANDLE_TABLE GdiHandleTable = NULL; +PSECTION_OBJECT GdiTableSection = NULL; /** INTERNAL FUNCTIONS ********************************************************/ @@ -151,7 +153,9 @@ * Allocate GDI object table. * \param Size - number of entries in the object table. */ -PGDI_HANDLE_TABLE INTERNAL_CALL +INIT_FUNCTION +PGDI_HANDLE_TABLE +INTERNAL_CALL GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject) { PGDI_HANDLE_TABLE HandleTable = NULL; @@ -220,6 +224,23 @@ return HandleTable; } + +INIT_FUNCTION +NTSTATUS +NTAPI +InitGdiHandleTable() +{ + /* Create the GDI handle table */ + GdiHandleTable = GDIOBJ_iAllocHandleTable(&GdiTableSection); + if (GdiHandleTable == NULL) + { + DPRINT1("Failed to initialize the GDI handle table.\n"); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; +} + static void FASTCALL LockErrorDebugOutput(HGDIOBJ hObj, PGDI_TABLE_ENTRY Entry, LPSTR Function) Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Wed Nov 3 00:51:19 2010 @@ -57,7 +57,10 @@ } // Create the system palette -HPALETTE FASTCALL PALETTE_Init(VOID) +INIT_FUNCTION +NTSTATUS +NTAPI +InitPaletteImpl() { int i; HPALETTE hpalette; @@ -68,7 +71,7 @@ sizeof(LOGPALETTE) + (NB_RESERVED_COLORS * sizeof(PALETTEENTRY)), TAG_PALETTE); - if (!palPtr) return FALSE; + if (!palPtr) return STATUS_NO_MEMORY; palPtr->palVersion = 0x300; palPtr->palNumEntries = NB_RESERVED_COLORS; @@ -131,7 +134,7 @@ appalSurfaceDefault[BMF_JPEG] = &gpalRGB; appalSurfaceDefault[BMF_PNG] = &gpalRGB; - return hpalette; + return STATUS_SUCCESS; } VOID FASTCALL PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size)

13 years, 11 months

[cgutman] 49454: [LWIP] - Commit a forgotten change from r49426

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Nov 3 00:19:05 2010 New Revision: 49454 URL: http://svn.reactos.org/svn/reactos?rev=49454&view=rev Log: [LWIP] - Commit a forgotten change from r49426 Modified: branches/tcp-rewrite-branch/lib/drivers/lwip/src/include/arch/cc.h Modified: branches/tcp-rewrite-branch/lib/drivers/lwip/src/include/arch/cc.h URL: http://svn.reactos.org/svn/reactos/branches/tcp-rewrite-branch/lib/drivers/… ============================================================================== --- branches/tcp-rewrite-branch/lib/drivers/lwip/src/include/arch/cc.h [iso-8859-1] (original) +++ branches/tcp-rewrite-branch/lib/drivers/lwip/src/include/arch/cc.h [iso-8859-1] Wed Nov 3 00:19:05 2010 @@ -51,11 +51,9 @@ #define LWIP_PLATFORM_ASSERT(x) ASSERTMSG(x, FALSE) /* Synchronization */ -#define SYS_ARCH_DECL_PROTECT(lev) \ - sys_prot_t lev; \ - sys_arch_decl_protect(&lev) -#define SYS_ARCH_PROTECT(lev) sys_arch_protect(&lev) -#define SYS_ARCH_UNPROTECT(lev) sys_arch_unprotect(&lev) +#define SYS_ARCH_DECL_PROTECT(lev) sys_prot_t (lev) +#define SYS_ARCH_PROTECT(lev) sys_arch_protect(&(lev)) +#define SYS_ARCH_UNPROTECT(lev) sys_arch_unprotect(lev) /* Compiler hints for packing structures */ #define PACK_STRUCT_STRUCT

13 years, 11 months

[tkreuzer] 49453: [CMAKE] - fix add_importlib_target - fix win32dll entrypoint (we wouldn't need to specify one, if the one in mingw lib had enough underscores)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Nov 2 21:31:45 2010 New Revision: 49453 URL: http://svn.reactos.org/svn/reactos?rev=49453&view=rev Log: [CMAKE] - fix add_importlib_target - fix win32dll entrypoint (we wouldn't need to specify one, if the one in mingw lib had enough underscores) Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=494… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Nov 2 21:31:45 2010 @@ -63,7 +63,8 @@ set_entrypoint(${MODULE} mainCRTStartup) endif () if(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} __DllMainCRTStartup) + # Need this only because mingw library is broken + set_entrypoint(${MODULE} DllMainCRTStartup@12) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() @@ -96,16 +97,21 @@ macro(add_importlib_target _def_file) get_filename_component(_name ${_def_file} NAME_WE) + add_custom_command( + OUTPUT {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib + COMMAND LINK /LIB /MACHINE:X86 /DEF:${_def_file} /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib + DEPENDS ${_def_file} + ) add_custom_target( lib${_name} - COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - DEPENDS ${_def_file}) + DEPENDS {CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib + ) endmacro() macro(add_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.lib) - #add_dependencies(${MODULE} lib${LIB}) + add_dependencies(${MODULE} lib${LIB}) endforeach() endmacro()

13 years, 11 months

[tkreuzer] 49452: [MINGW] add CRTDLL definition so that the startup code for dlls is actually compiled

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Nov 2 20:39:19 2010 New Revision: 49452 URL: http://svn.reactos.org/svn/reactos?rev=49452&view=rev Log: [MINGW] add CRTDLL definition so that the startup code for dlls is actually compiled Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:39:19 2010 @@ -55,6 +55,7 @@ set_property(TARGET mingw_wmain PROPERTY COMPILE_DEFINITIONS WPRFLAG UNICODE _UNICODE) add_dependencies(mingw_wmain psdk) +add_definitions(-DCRTDLL) add_library(mingw_dllmain crtdll.c dllargv.c) add_dependencies(mingw_dllmain psdk) @@ -69,4 +70,4 @@ add_library(getopt getopt.c) set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) -add_dependencies(getopt psdk) +add_dependencies(getopt psdk)

13 years, 11 months

[akhaldi] 49451: [CMAKE] - Minor formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 2 20:27:06 2010 New Revision: 49451 URL: http://svn.reactos.org/svn/reactos?rev=49451&view=rev Log: [CMAKE] - Minor formatting. Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=494… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Tue Nov 2 20:27:06 2010 @@ -6,7 +6,6 @@ add_definitions(-Dinline=__inline) if(NOT CMAKE_CROSSCOMPILING) - else() @@ -100,8 +99,7 @@ add_custom_target( lib${_name} COMMAND LINK /LIB /MACHINE:X86 /DEF:${CMAKE_CURRENT_BINARY_DIR}/${_file}.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - DEPENDS ${_def_file} - ) + DEPENDS ${_def_file}) endmacro() macro(add_importlibs MODULE) @@ -117,4 +115,3 @@ set(PSEH_LIB "") endif() -

13 years, 11 months

[akhaldi] 49450: [CMAKE] - Move more dlls with no stubs into using def files instead of spec files.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 2 20:23:56 2010 New Revision: 49450 URL: http://svn.reactos.org/svn/reactos?rev=49450&view=rev Log: [CMAKE] - Move more dlls with no stubs into using def files instead of spec files. Added: branches/cmake-bringup/dll/win32/rsabase/rsabase.def (with props) branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def (with props) branches/cmake-bringup/dll/win32/samsrv/samsrv.def (with props) branches/cmake-bringup/dll/win32/sensapi/sensapi.def (with props) branches/cmake-bringup/dll/win32/serialui/serialui.def (with props) branches/cmake-bringup/dll/win32/shfolder/shfolder.def (with props) branches/cmake-bringup/dll/win32/smdll/smdll.def (with props) branches/cmake-bringup/dll/win32/sndblst/sndblst.def (with props) branches/cmake-bringup/dll/win32/sti/sti.def (with props) branches/cmake-bringup/dll/win32/twain_32/twain_32.def (with props) branches/cmake-bringup/dll/win32/uext2/uext2.def (with props) branches/cmake-bringup/dll/win32/ufat/ufat.def (with props) branches/cmake-bringup/dll/win32/ufatx/ufatx.def (with props) branches/cmake-bringup/dll/win32/untfs/untfs.def (with props) branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def (with props) branches/cmake-bringup/dll/win32/version/version.def (with props) branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def (with props) branches/cmake-bringup/dll/win32/winfax/winfax.def (with props) branches/cmake-bringup/dll/win32/wing32/wing32.def (with props) branches/cmake-bringup/dll/win32/winhttp/winhttp.def (with props) branches/cmake-bringup/dll/win32/winsta/winsta.def (with props) branches/cmake-bringup/dll/win32/wmi/wmi.def (with props) branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def (with props) branches/cmake-bringup/dll/win32/ws2help/ws2help.def (with props) branches/cmake-bringup/dll/win32/wshirda/wshirda.def (with props) branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def (with props) branches/cmake-bringup/dll/win32/wuapi/wuapi.def (with props) branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def (with props) branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def (with props) branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def (with props) branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def (with props) Modified: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt branches/cmake-bringup/dll/win32/version/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase… ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -2,10 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(rsabase.dll rsabase.spec) +add_library(rsabase SHARED version.rc rsabase.def) -add_library(rsabase SHARED version.rc - ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def) +if(NOT MSVC) + set_source_files_properties(rsabase.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(rsabase 0) Added: branches/cmake-bringup/dll/win32/rsabase/rsabase.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase… ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/rsabase.def (added) +++ branches/cmake-bringup/dll/win32/rsabase/rsabase.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,31 @@ + +LIBRARY rsabase.dll + +EXPORTS + CPAcquireContext(a)16=rsaenh.CPAcquireContext @1 + CPCreateHash(a)20=rsaenh.CPCreateHash @2 + CPDecrypt(a)28=rsaenh.CPDecrypt @3 + CPDeriveKey(a)20=rsaenh.CPDeriveKey @4 + CPDestroyHash(a)8=rsaenh.CPDestroyHash @5 + CPDestroyKey(a)8=rsaenh.CPDestroyKey @6 + CPDuplicateHash(a)20=rsaenh.CPDuplicateHash @7 + CPDuplicateKey(a)20=rsaenh.CPDuplicateKey @8 + CPEncrypt(a)32=rsaenh.CPEncrypt @9 + CPExportKey(a)28=rsaenh.CPExportKey @10 + CPGenKey(a)16=rsaenh.CPGenKey @11 + CPGenRandom(a)12=rsaenh.CPGenRandom @12 + CPGetHashParam(a)24=rsaenh.CPGetHashParam @13 + CPGetKeyParam(a)24=rsaenh.CPGetKeyParam @14 + CPGetProvParam(a)20=rsaenh.CPGetProvParam @15 + CPGetUserKey(a)12=rsaenh.CPGetUserKey @16 + CPHashData(a)20=rsaenh.CPHashData @17 + CPHashSessionKey(a)16=rsaenh.CPHashSessionKey @18 + CPImportKey(a)24=rsaenh.CPImportKey @19 + CPReleaseContext(a)8=rsaenh.CPReleaseContext @20 + CPSetHashParam(a)20=rsaenh.CPSetHashParam @21 + CPSetKeyParam(a)20=rsaenh.CPSetKeyParam @22 + CPSetProvParam(a)16=rsaenh.CPSetProvParam @23 + CPSignHash(a)28=rsaenh.CPSignHash @24 + CPVerifySignature(a)28=rsaenh.CPVerifySignature @25 + DllRegisterServer(a)0=rsaenh.DllRegisterServer @26 PRIVATE + DllUnregisterServer(a)0=rsaenh.DllUnregisterServer @27 PRIVATE Propchange: branches/cmake-bringup/dll/win32/rsabase/rsabase.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,10 +1,9 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(rsaenh.dll rsaenh.spec) add_library(rsaenh SHARED aes.c @@ -19,7 +18,11 @@ rsaenh.c sha2.c version.rc - ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) + rsaenh.def) + +if(NOT MSVC) + set_source_files_properties(rsaenh.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(rsaenh win32dll) @@ -27,5 +30,4 @@ add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) - add_cab_target(rsaenh 1) Added: branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def (added) +++ branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,31 @@ + +LIBRARY rsaenh.dll + +EXPORTS + CPAcquireContext@16=RSAENH_CPAcquireContext@16 @1 + CPCreateHash@20=RSAENH_CPCreateHash@20 @2 + CPDecrypt@28=RSAENH_CPDecrypt@28 @3 + CPDeriveKey@20=RSAENH_CPDeriveKey@20 @4 + CPDestroyHash@8=RSAENH_CPDestroyHash@8 @5 + CPDestroyKey@8=RSAENH_CPDestroyKey@8 @6 + CPDuplicateHash@20=RSAENH_CPDuplicateHash@20 @7 + CPDuplicateKey@20=RSAENH_CPDuplicateKey@20 @8 + CPEncrypt@32=RSAENH_CPEncrypt@32 @9 + CPExportKey@28=RSAENH_CPExportKey@28 @10 + CPGenKey@16=RSAENH_CPGenKey@16 @11 + CPGenRandom@12=RSAENH_CPGenRandom@12 @12 + CPGetHashParam@24=RSAENH_CPGetHashParam@24 @13 + CPGetKeyParam@24=RSAENH_CPGetKeyParam@24 @14 + CPGetProvParam@20=RSAENH_CPGetProvParam@20 @15 + CPGetUserKey@12=RSAENH_CPGetUserKey@12 @16 + CPHashData@20=RSAENH_CPHashData@20 @17 + CPHashSessionKey@16=RSAENH_CPHashSessionKey@16 @18 + CPImportKey@24=RSAENH_CPImportKey@24 @19 + CPReleaseContext@8=RSAENH_CPReleaseContext@8 @20 + CPSetHashParam@20=RSAENH_CPSetHashParam@20 @21 + CPSetKeyParam@20=RSAENH_CPSetKeyParam@20 @22 + CPSetProvParam@16=RSAENH_CPSetProvParam@16 @23 + CPSignHash@28=RSAENH_CPSignHash@28 @24 + CPVerifySignature@28=RSAENH_CPVerifySignature@28 @25 + DllRegisterServer@0 @26 PRIVATE + DllUnregisterServer@0 @27 PRIVATE Propchange: branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,10 +1,11 @@ set_unicode() -spec2def(samsrv.dll samsrv.spec) +add_library(samsrv SHARED samsrv.c samsrv.rc samsrv.def) -add_library(samsrv SHARED samsrv.c samsrv.rc - ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def) +if(NOT MSVC) + set_source_files_properties(samsrv.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(samsrv 0) Added: branches/cmake-bringup/dll/win32/samsrv/samsrv.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/samsrv.def (added) +++ branches/cmake-bringup/dll/win32/samsrv/samsrv.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,6 @@ + +LIBRARY samsrv.dll + +EXPORTS + SamIInitialize@0 @1 + SampInitializeRegistry@0 @2 Propchange: branches/cmake-bringup/dll/win32/samsrv/samsrv.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -2,9 +2,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(sensapi.dll sensapi.spec) +add_library(sensapi SHARED sensapi.c sensapi.def) -add_library(sensapi SHARED sensapi.c ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def) +if(NOT MSVC) + set_source_files_properties(sensapi.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(sensapi win32dll) Added: branches/cmake-bringup/dll/win32/sensapi/sensapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/sensapi.def (added) +++ branches/cmake-bringup/dll/win32/sensapi/sensapi.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,7 @@ + +LIBRARY sensapi.dll + +EXPORTS + IsDestinationReachableA@8 @1 + IsDestinationReachableW@8 @2 + IsNetworkAlive@4 @3 Propchange: branches/cmake-bringup/dll/win32/sensapi/sensapi.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,9 +1,11 @@ set_unicode() -spec2def(serialui.dll serialui.spec) +add_library(serialui SHARED serialui.c serialui.rc serialui.def) -add_library(serialui SHARED serialui.c serialui.rc ${CMAKE_CURRENT_BINARY_DIR}/serialui.def) +if(NOT MSVC) + set_source_files_properties(serialui.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(serialui win32dll) Added: branches/cmake-bringup/dll/win32/serialui/serialui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/serialui.def (added) +++ branches/cmake-bringup/dll/win32/serialui/serialui.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,10 @@ + +LIBRARY serialui.dll + +EXPORTS + drvCommConfigDialogA@12 @1 + drvCommConfigDialogW@12 @2 + drvSetDefaultCommConfigA@12 @3 + drvSetDefaultCommConfigW@12 @4 + drvGetDefaultCommConfigA@12 @5 + drvGetDefaultCommConfigW@12 @6 Propchange: branches/cmake-bringup/dll/win32/serialui/serialui.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -2,10 +2,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(shfolder.dll shfolder.spec) +add_library(shfolder SHARED version.rc shfolder.def) -add_library(shfolder SHARED version.rc - ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def) +if(NOT MSVC) + set_source_files_properties(shfolder.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(shfolder 0) Added: branches/cmake-bringup/dll/win32/shfolder/shfolder.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/shfolder.def (added) +++ branches/cmake-bringup/dll/win32/shfolder/shfolder.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,6 @@ + +LIBRARY shfolder.dll + +EXPORTS + SHGetFolderPathA(a)20=shell32.SHGetFolderPathA @1 + SHGetFolderPathW(a)20=shell32.SHGetFolderPathW @2 Propchange: branches/cmake-bringup/dll/win32/shfolder/shfolder.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,13 +1,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - -spec2def(smdll.dll smdll.spec) add_library(smdll SHARED dllmain.c query.c smdll.rc - ${CMAKE_CURRENT_BINARY_DIR}/smdll.def) + smdll.def) + +if(NOT MSVC) + set_source_files_properties(smdll.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() target_link_libraries(smdll smlib) Added: branches/cmake-bringup/dll/win32/smdll/smdll.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/s… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/smdll.def (added) +++ branches/cmake-bringup/dll/win32/smdll/smdll.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,9 @@ + +LIBRARY smdll.dll + +EXPORTS + SmCompleteSession@12 @1 + SmConnectApiPort@16 @2 + SmExecuteProgram@8 @3 + SmQueryInformation@20 @4 + SmLookupSubsystem@20 @5 Propchange: branches/cmake-bringup/dll/win32/smdll/smdll.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -4,9 +4,11 @@ add_definitions(-DDEBUG_NT4) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -spec2def(sndblst.dll sndblst.spec) +add_library(sndblst SHARED sndblst.c sndblst.def) -add_library(sndblst SHARED sndblst.c ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def) +if(NOT MSVC) + set_source_files_properties(sndblst.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(sndblst win32dll) Added: branches/cmake-bringup/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/sndblst.def (added) +++ branches/cmake-bringup/dll/win32/sndblst/sndblst.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,11 @@ + +LIBRARY sndblst.dll + +EXPORTS + DriverProc@20 @1 + widMessage@20 @2 + wodMessage@20 @3 + midMessage@20 @4 + modMessage@20 @5 + mxdMessage@20 @6 + auxMessage@20 @7 Propchange: branches/cmake-bringup/dll/win32/sndblst/sndblst.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -10,14 +10,16 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(sti.dll sti.spec) - add_library(sti SHARED regsvr.c sti.c sti_main.c sti_wia.idl - ${CMAKE_CURRENT_BINARY_DIR}/sti.def) + sti.def) + +if(NOT MSVC) + set_source_files_properties(sti.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(sti 0) @@ -35,7 +37,5 @@ kernel32 ntdll) - - rpcproxy(sti sti_wia.idl) add_cab_target(sti 1) Added: branches/cmake-bringup/dll/win32/sti/sti.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/sti… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/sti.def (added) +++ branches/cmake-bringup/dll/win32/sti/sti.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,11 @@ + +LIBRARY sti.dll + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject@12 @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE + StiCreateInstance@16=StiCreateInstanceW@16 @5 + StiCreateInstanceA@16 @6 + StiCreateInstanceW@16 @7 Propchange: branches/cmake-bringup/dll/win32/sti/sti.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_3… ============================================================================== --- branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,7 +1,5 @@ add_definitions(-D_DLL -D__USE_CRTIMP) - -spec2def(twain_32.dll twain_32.spec) add_library(twain_32 SHARED capability.c @@ -11,7 +9,11 @@ dsm_ctrl.c twain32_main.c twain_32.rc - ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def) + twain_32.def) + +if(NOT MSVC) + set_source_files_properties(twain_32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(twain_32 win32dll) Added: branches/cmake-bringup/dll/win32/twain_32/twain_32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_3… ============================================================================== --- branches/cmake-bringup/dll/win32/twain_32/twain_32.def (added) +++ branches/cmake-bringup/dll/win32/twain_32/twain_32.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,5 @@ + +LIBRARY twain_32.dll + +EXPORTS + DSM_Entry@24 @1 Propchange: branches/cmake-bringup/dll/win32/twain_32/twain_32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/C… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,10 +1,9 @@ -spec2def(uext2.dll uext2.spec) +add_library(uext2 SHARED uext2.c uext2.rc uext2.def) -add_library(uext2 SHARED - uext2.c - uext2.rc - ${CMAKE_CURRENT_BINARY_DIR}/uext2.def) +if(NOT MSVC) + set_source_files_properties(uext2.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(uext2 win32dll) Added: branches/cmake-bringup/dll/win32/uext2/uext2.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/u… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/uext2.def (added) +++ branches/cmake-bringup/dll/win32/uext2/uext2.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,6 @@ + +LIBRARY uext2.dll + +EXPORTS + ChkdskEx@24=Ext2Chkdsk@24 @1 + FormatEx@24=Ext2Format@24 @2 Propchange: branches/cmake-bringup/dll/win32/uext2/uext2.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,10 +1,9 @@ -spec2def(ufat.dll ufat.spec) +add_library(ufat SHARED ufat.c ufat.rc ufat.def) -add_library(ufat SHARED - ufat.c - ufat.rc - ${CMAKE_CURRENT_BINARY_DIR}/ufat.def) +if(NOT MSVC) + set_source_files_properties(ufat.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(ufat win32dll) Added: branches/cmake-bringup/dll/win32/ufat/ufat.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/uf… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/ufat.def (added) +++ branches/cmake-bringup/dll/win32/ufat/ufat.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,6 @@ + +LIBRARY ufat.dll + +EXPORTS + ChkdskEx@24=VfatChkdsk@24 @1 + FormatEx@24=VfatFormat@24 @2 Propchange: branches/cmake-bringup/dll/win32/ufat/ufat.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,8 +1,9 @@ -spec2def(ufatx.dll ufatx.spec) +add_library(ufatx SHARED ufatx.rc ufatx.def) -add_library(ufatx SHARED ufatx.rc - ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) +if(NOT MSVC) + set_source_files_properties(ufatx.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(ufatx 0) Added: branches/cmake-bringup/dll/win32/ufatx/ufatx.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/u… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/ufatx.def (added) +++ branches/cmake-bringup/dll/win32/ufatx/ufatx.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,5 @@ + +LIBRARY ufatx.dll + +EXPORTS + FormatEx@24=VfatxFormat@24 @1 Propchange: branches/cmake-bringup/dll/win32/ufatx/ufatx.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,10 +1,9 @@ -spec2def(untfs.dll untfs.spec) +add_library(untfs SHARED untfs.c untfs.rc untfs.def) -add_library(untfs SHARED - untfs.c - untfs.rc - ${CMAKE_CURRENT_BINARY_DIR}/untfs.def) +if(NOT MSVC) + set_source_files_properties(untfs.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(untfs win32dll) Added: branches/cmake-bringup/dll/win32/untfs/untfs.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/u… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/untfs.def (added) +++ branches/cmake-bringup/dll/win32/untfs/untfs.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,6 @@ + +LIBRARY untfs.dll + +EXPORTS + ChkdskEx@24=NtfsChkdsk@24 @1 + FormatEx@24=NtfsFormat@24 @2 Propchange: branches/cmake-bringup/dll/win32/untfs/untfs.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,11 +1,11 @@ set_unicode() -spec2def(vdmdbg.dll vdmdbg.spec) +list(APPEND SOURCE vdmdbg.c vdmdbg.def) -list(APPEND SOURCE - vdmdbg.c - ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) +if(NOT MSVC) + set_source_files_properties(vdmdbg.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(vdmdbg SHARED ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch Added: branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def (added) +++ branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,26 @@ + +LIBRARY vdmdbg.dll + +EXPORTS + VDMBreakThread@8 @1 + VDMDetectWOW@0 @2 + VDMEnumProcessWOW@8 @3 + VDMEnumTaskWOW@12 @4 + VDMEnumTaskWOWEx@12 @5 + VDMGetContext@12 @6 + VDMGetDbgFlags@4 @7 + VDMGetModuleSelector@20 @8 + VDMGetPointer@20 @9 + VDMGetSegmentInfo@16 @10 + VDMGetSelectorModule@32 @11 + VDMGlobalFirst@24 @12 + VDMGlobalNext@24 @13 + VDMIsModuleLoaded@4 @14 + VDMKillWOW@0 @15 + VDMModuleFirst@20 @16 + VDMModuleNext@20 @17 + VDMProcessException@4 @18 + VDMSetContext@12 @19 + VDMSetDbgFlags@8 @20 + VDMStartTaskInWOW@12 @21 + VDMTerminateTaskWOW@8 @22 Propchange: branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) -spec2def(version.dll version.spec) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -9,7 +8,11 @@ install.c resource.c version.rc - ${CMAKE_CURRENT_BINARY_DIR}/version.def) + version.def) + +if(NOT MSVC) + set_source_files_properties(version.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(version 0) Added: branches/cmake-bringup/dll/win32/version/version.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/version.def (added) +++ branches/cmake-bringup/dll/win32/version/version.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,16 @@ + +LIBRARY version.dll + +EXPORTS + GetFileVersionInfoA@16 @1 + GetFileVersionInfoSizeA@8 @2 + GetFileVersionInfoSizeW@8 @3 + GetFileVersionInfoW@16 @4 + VerFindFileA@32 @5 + VerFindFileW@32 @6 + VerInstallFileA@32 @7 + VerInstallFileW@32 @8 + VerLanguageNameA(a)12=kernel32.VerLanguageNameA @9 + VerLanguageNameW(a)12=kernel32.VerLanguageNameW @10 + VerQueryValueA@16 @11 + VerQueryValueW@16 @12 Propchange: branches/cmake-bringup/dll/win32/version/version.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -9,17 +9,20 @@ ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) -spec2def(wdmaud.drv wdmaud.spec) - add_library(wdmaud.drv SHARED wdmaud.c mixer.c mmixer.c legacy.c wdmaud.rc - ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def) + wdmaud.def) + +if(NOT MSVC) + set_source_files_properties(wdmaud.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(wdmaud.drv win32dll) + set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") target_link_libraries(wdmaud.drv @@ -28,4 +31,3 @@ mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) - Added: branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def (added) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,10 @@ + +LIBRARY wdmaud.drv + +EXPORTS + DriverProc@20 @1 + mxdMessage@20 @2 + auxMessage@20 @3 + wodMessage@20 @4 + widMessage@20 @5 + modMessage@20 @6 Propchange: branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,12 +1,12 @@ -spec2def(winfax.dll winfax.spec) +add_library(winfax SHARED winfax.c winfax.rc winfax.def) -add_library(winfax SHARED winfax.c winfax.rc - ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) +if(NOT MSVC) + set_source_files_properties(winfax.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(winfax 0) +add_importlibs(winfax kernel32 ntdll) - -add_importlibs(winfax kernel32 ntdll) add_dependencies(winfax psdk) Added: branches/cmake-bringup/dll/win32/winfax/winfax.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/winfax.def (added) +++ branches/cmake-bringup/dll/win32/winfax/winfax.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,59 @@ + +LIBRARY winfax.dll + +EXPORTS + FaxAbort@8 @1 + FaxAccessCheck@8 @2 + FaxClose@4 @3 + FaxCompleteJobParamsA@8 @4 + FaxCompleteJobParamsW@8 @5 + FaxConnectFaxServerA@8 @6 + FaxConnectFaxServerW@8 @7 + FaxEnableRoutingMethodA@12 @8 + FaxEnableRoutingMethodW@12 @9 + FaxEnumGlobalRoutingInfoA@12 @10 + FaxEnumGlobalRoutingInfoW@12 @11 + FaxEnumJobsA@12 @12 + FaxEnumJobsW@12 @13 + FaxEnumPortsA@12 @14 + FaxEnumPortsW@12 @15 + FaxEnumRoutingMethodsA@12 @16 + FaxEnumRoutingMethodsW@12 @17 + FaxFreeBuffer@4 @18 + FaxGetConfigurationA@8 @19 + FaxGetConfigurationW@8 @20 + FaxGetDeviceStatusA@8 @21 + FaxGetDeviceStatusW@8 @22 + FaxGetJobA@12 @23 + FaxGetJobW@12 @24 + FaxGetLoggingCategoriesA@12 @25 + FaxGetLoggingCategoriesW@12 @26 + FaxGetPageData@24 @27 + FaxGetPortA@8 @28 + FaxGetPortW@8 @29 + FaxGetRoutingInfoA@16 @30 + FaxGetRoutingInfoW@16 @31 + FaxInitializeEventQueue@20 @32 + FaxOpenPort@16 @33 + FaxPrintCoverPageA@8 @34 + FaxPrintCoverPageW@8 @35 + FaxRegisterRoutingExtensionW@24 @36 + FaxRegisterServiceProviderW@16 @37 + FaxSendDocumentA@20 @38 + FaxSendDocumentForBroadcastA@20 @39 + FaxSendDocumentForBroadcastW@20 @40 + FaxSendDocumentW@20 @41 + FaxSetConfigurationA@8 @42 + FaxSetConfigurationW@8 @43 + FaxSetGlobalRoutingInfoA@8 @44 + FaxSetGlobalRoutingInfoW@8 @45 + FaxSetJobA@16 @46 + FaxSetJobW@16 @47 + FaxSetLoggingCategoriesA@12 @48 + FaxSetLoggingCategoriesW@12 @49 + FaxSetPortA@8 @50 + FaxSetPortW@8 @51 + FaxSetRoutingInfoA@16 @52 + FaxSetRoutingInfoW@16 @53 + FaxStartPrintJobA@16 @54 + FaxStartPrintJobW@16 @55 Propchange: branches/cmake-bringup/dll/win32/winfax/winfax.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,12 +1,12 @@ set_unicode() -spec2def(wing32.dll wing32.spec) +add_library(wing32 SHARED wing32.c wing32.def) -add_library(wing32 SHARED wing32.c - ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) +if(NOT MSVC) + set_source_files_properties(wing32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(wing32 0) - add_importlibs(wing32 user32 gdi32) add_dependencies(wing32 psdk) Added: branches/cmake-bringup/dll/win32/wing32/wing32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/wing32.def (added) +++ branches/cmake-bringup/dll/win32/wing32/wing32.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,14 @@ + +LIBRARY wing32.dll + +EXPORTS + WinGBitBlt@32 @1 + WinGCreateBitmap@12 @2 + WinGCreateDC@0 @3 + WinGCreateHalfToneBrush@12 @4 + WinGCreateHalfTonePalette@0 @5 + WinGGetDIBColorTable@16 @6 + WinGGetDIBPointer@8 @7 + WinGRecommendDIBFormat@4 @8 + WinGSetDIBColorTable@16 @9 + WinGStretchBlt@40 @10 Propchange: branches/cmake-bringup/dll/win32/wing32/wing32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(winhttp.dll winhttp.spec) add_library(winhttp SHARED cookie.c @@ -12,7 +10,11 @@ request.c session.c url.c - ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def) + winhttp.def) + +if(NOT MSVC) + set_source_files_properties(winhttp.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(winhttp win32dll) Added: branches/cmake-bringup/dll/win32/winhttp/winhttp.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/winhttp.def (added) +++ branches/cmake-bringup/dll/win32/winhttp/winhttp.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,35 @@ + +LIBRARY winhttp.dll + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject@12 @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE + WinHttpAddRequestHeaders@16 @5 + WinHttpCheckPlatform@0 @6 + WinHttpCloseHandle@4 @7 + WinHttpConnect@16 @8 + WinHttpCrackUrl@16 @9 + WinHttpCreateUrl@16 @10 + WinHttpDetectAutoProxyConfigUrl@8 @11 + WinHttpGetDefaultProxyConfiguration@4 @12 + WinHttpGetIEProxyConfigForCurrentUser@4 @13 + WinHttpGetProxyForUrl@16 @14 + WinHttpOpen@20 @15 + WinHttpOpenRequest@28 @16 + WinHttpQueryAuthSchemes@16 @17 + WinHttpQueryDataAvailable@8 @18 + WinHttpQueryHeaders@24 @19 + WinHttpQueryOption@16 @20 + WinHttpReadData@16 @21 + WinHttpReceiveResponse@8 @22 + WinHttpSendRequest@28 @23 + WinHttpSetCredentials@24 @24 + WinHttpSetDefaultProxyConfiguration@4 @25 + WinHttpSetOption@16 @26 + WinHttpSetStatusCallback@16 @27 + WinHttpSetTimeouts@20 @28 + WinHttpTimeFromSystemTime@8 @29 + WinHttpTimeToSystemTime@8 @30 + WinHttpWriteData@16 @31 Propchange: branches/cmake-bringup/dll/win32/winhttp/winhttp.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,5 +1,3 @@ - -spec2def(winsta.dll winsta.spec) list(APPEND SOURCE logon.c @@ -10,7 +8,11 @@ server.c ws.c winsta.rc - ${CMAKE_CURRENT_BINARY_DIR}/winsta.def) + winsta.def) + +if(NOT MSVC) + set_source_files_properties(winsta.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(winsta SHARED ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch Added: branches/cmake-bringup/dll/win32/winsta/winsta.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/winsta.def (added) +++ branches/cmake-bringup/dll/win32/winsta/winsta.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,124 @@ + +LIBRARY winsta.dll + +EXPORTS + LogonIdFromWinStationNameA@12 @1 + LogonIdFromWinStationNameW@12 @2 + RemoteAssistancePrepareSystemRestore@4 @3 + ServerGetInternetConnectorStatus@12 @4 + ServerLicensingClose@4 @5 + ServerLicensingDeactivateCurrentPolicy@4 @6 + ServerLicensingFreePolicyInformation@4 @7 + ServerLicensingGetAvailablePolicyIds@12 @8 + ServerLicensingGetPolicy@8 @9 + ServerLicensingGetPolicyInformationA@16 @10 + ServerLicensingGetPolicyInformationW@16 @11 + ServerLicensingLoadPolicy@8 @12 + ServerLicensingOpenA@4 @13 + ServerLicensingOpenW@4 @14 + ServerLicensingSetPolicy@12 @15 + ServerLicensingUnloadPolicy@8 @16 + ServerQueryInetConnectorInformationA@16 @17 + ServerQueryInetConnectorInformationW@16 @18 + ServerSetInternetConnectorStatus@12 @19 + WinStationActivateLicense@16 @20 + WinStationAutoReconnect@4 @21 + WinStationBroadcastSystemMessage@40 @22 + WinStationCheckAccess@12 @23 + WinStationCheckLoopBack@16 @24 + WinStationCloseServer@16 @25 + WinStationConnectA@4 @26 + WinStationConnectCallback@20 @27 + WinStationConnectEx@8 @28 + WinStationConnectW@20 @29 + WinStationDisconnect@12 @30 + WinStationDynVirtualChanRead@20 @31 + WinStationDynVirtualChanWrite@16 @32 + WinStationEnumerateA@12 @33 + WinStationEnumerateLicenses@12 @34 + WinStationEnumerateProcesses@8 @35 + WinStationEnumerateW@12 @36 + WinStationEnumerate_IndexedA@20 @37 + WinStationEnumerate_IndexedW@20 @38 + WinStationFreeGAPMemory@12 @39 + WinStationFreeMemory@4 @40 + WinStationFreeUserCertificates@4 @41 + WinStationFreeUserCredentials@4 @42 + WinStationGenerateLicense@16 @43 + WinStationGetAllProcesses@16 @44 + WinStationGetConnectionProperty@12 @45 + WinStationGetInitialApplication@20 @46 + WinStationGetLanAdapterNameA@24 @47 + WinStationGetLanAdapterNameW@24 @48 + WinStationGetLoggedOnCount@8 @49 + WinStationGetMachinePolicy@8 @50 + WinStationGetProcessSid@24 @51 + WinStationGetTermSrvCountersValue@12 @52 + WinStationGetUserCertificates@4 @53 + WinStationGetUserCredentials@4 @54 + WinStationGetUserProfile@16 @55 + WinStationInstallLicense@12 @56 + WinStationIsHelpAssistantSession@8 @57 + WinStationIsSessionPermitted@0 @58 + WinStationNameFromLogonIdA@12 @59 + WinStationNameFromLogonIdW@12 @60 + WinStationNtsdDebug@20 @61 + WinStationOpenServerA@4 @62 + WinStationOpenServerW@4 @63 + WinStationQueryAllowConcurrentConnections@0 @64 + WinStationQueryEnforcementCore@24 @65 + WinStationQueryInformationA@24 @66 + WinStationQueryInformationW@24 @67 + WinStationQueryLicense@12 @68 + WinStationQueryLogonCredentialsW@4 @69 + WinStationQueryUpdateRequired@8 @70 + WinStationRegisterConsoleNotification@12 @71 + WinStationRegisterConsoleNotificationEx@16 @72 + WinStationRegisterNotificationEvent@16 @73 + WinStationRemoveLicense@12 @74 + WinStationRenameA@12 @75 + WinStationRenameW@12 @76 + WinStationRequestSessionsList@12 @77 + WinStationReset@12 @78 + WinStationSendMessageA@40 @79 + WinStationSendMessageW@40 @80 + WinStationSendWindowMessage@32 @81 + WinStationServerPing@4 @82 + WinStationSetInformationA@20 @83 + WinStationSetInformationW@20 @84 + WinStationSetPoolCount@12 @85 + WinStationShadow@20 @86 + WinStationShadowStop@12 @87 + WinStationShutdownSystem@8 @88 + WinStationSwitchToServicesSession@0 @89 + WinStationSystemShutdownStarted@0 @90 + WinStationSystemShutdownWait@8 @91 + WinStationTerminateProcess@12 @92 + WinStationUnRegisterConsoleNotification@8 @93 + WinStationUnRegisterNotificationEvent@4 @94 + WinStationUserLoginAccessCheck@16 @95 + WinStationVirtualOpen@12 @96 + WinStationVirtualOpenEx@16 @97 + WinStationWaitSystemEvent@12 @98 + _NWLogonQueryAdmin@12 @99 + _NWLogonSetAdmin@12 @100 + _WinStationAnnoyancePopup@8 @101 + _WinStationBeepOpen@12 @102 + _WinStationBreakPoint@12 @103 + _WinStationCallback@12 @104 + _WinStationCheckForApplicationName@48 @105 + _WinStationFUSCanRemoteUserDisconnect@12 @106 + _WinStationGetApplicationInfo@16 @107 + _WinStationNotifyDisconnectPipe@0 @108 + _WinStationNotifyLogoff@0 @109 + _WinStationNotifyLogon@32 @110 + _WinStationNotifyNewSession@8 @111 + _WinStationReInitializeSecurity@4 @112 + _WinStationReadRegistry@4 @113 + _WinStationSessionInitialized@0 @114 + _WinStationShadowTarget@40 @115 + _WinStationShadowTargetSetup@8 @116 + _WinStationUpdateClientCachedCredentials@28 @117 + _WinStationUpdateSettings@12 @118 + _WinStationUpdateUserConfig@4 @119 + _WinStationWaitForConnect@0 @120 Propchange: branches/cmake-bringup/dll/win32/winsta/winsta.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,8 +1,9 @@ -spec2def(wmi.dll wmi.spec) +add_library(wmi SHARED wmi.rc wmi.def) -add_library(wmi SHARED wmi.rc - ${CMAKE_CURRENT_BINARY_DIR}/wmi.def) +if(NOT MSVC) + set_source_files_properties(wmi.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(wmi 0) Added: branches/cmake-bringup/dll/win32/wmi/wmi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/wmi… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/wmi.def (added) +++ branches/cmake-bringup/dll/win32/wmi/wmi.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,49 @@ + +LIBRARY wmi.dll + +EXPORTS + CloseTrace(a)4=advapi32.CloseTrace @1 + ControlTraceA(a)16=advapi32.ControlTraceA @2 + ControlTraceW(a)16=advapi32.ControlTraceW @3 + CreateTraceInstanceId(a)8=advapi32.CreateTraceInstanceId @4 + EnableTrace(a)20=advapi32.EnableTrace @5 + GetTraceEnableFlags(a)4=advapi32.GetTraceEnableFlags @6 + GetTraceEnableLevel(a)4=advapi32.GetTraceEnableLevel @7 + GetTraceLoggerHandle(a)4=advapi32.GetTraceLoggerHandle @8 + OpenTraceA(a)4=advapi32.OpenTraceA @9 + OpenTraceW(a)4=advapi32.OpenTraceW @10 + ProcessTrace(a)16=advapi32.ProcessTrace @11 + QueryAllTracesA(a)12=advapi32.QueryAllTracesA @12 + QueryAllTracesW(a)12=advapi32.QueryAllTracesW @13 + RegisterTraceGuidsA(a)32=advapi32.RegisterTraceGuidsA @14 + RegisterTraceGuidsW(a)32=advapi32.RegisterTraceGuidsW @15 + RemoveTraceCallback(a)4=advapi32.RemoveTraceCallback @16 + SetTraceCallback(a)8=advapi32.SetTraceCallback @17 + StartTraceA(a)12=advapi32.StartTraceA @18 + StartTraceW(a)12=advapi32.StartTraceW @19 + TraceEvent(a)8=advapi32.TraceEvent @20 + TraceEventInstance(a)16=advapi32.TraceEventInstance @21 + UnregisterTraceGuids(a)4=advapi32.UnregisterTraceGuids @22 + WmiCloseBlock(a)0=advapi32.WmiCloseBlock @23 + WmiDevInstToInstanceNameA(a)0=advapi32.WmiDevInstToInstanceNameA @24 + WmiDevInstToInstanceNameW(a)0=advapi32.WmiDevInstToInstanceNameW @25 + WmiEnumerateGuids(a)0=advapi32.WmiEnumerateGuids @26 + WmiExecuteMethodA(a)0=advapi32.WmiExecuteMethodA @27 + WmiExecuteMethodW(a)0=advapi32.WmiExecuteMethodW @28 + WmiFileHandleToInstanceNameA(a)0=advapi32.WmiFileHandleToInstanceNameA @29 + WmiFileHandleToInstanceNameW(a)0=advapi32.WmiFileHandleToInstanceNameW @30 + WmiFreeBuffer(a)0=advapi32.WmiFreeBuffer @31 + WmiMofEnumerateResourcesA(a)0=advapi32.WmiMofEnumerateResourcesA @32 + WmiMofEnumerateResourcesW(a)0=advapi32.WmiMofEnumerateResourcesW @33 + WmiNotificationRegistrationA(a)0=advapi32.WmiNotificationRegistrationA @34 + WmiNotificationRegistrationW(a)0=advapi32.WmiNotificationRegistrationW @35 + WmiOpenBlock(a)0=advapi32.WmiOpenBlock @36 + WmiQueryAllDataA(a)0=advapi32.WmiQueryAllDataA @37 + WmiQueryAllDataW(a)0=advapi32.WmiQueryAllDataW @38 + WmiQueryGuidInformation(a)0=advapi32.WmiQueryGuidInformation @39 + WmiQuerySingleInstanceA(a)0=advapi32.WmiQuerySingleInstanceA @40 + WmiQuerySingleInstanceW(a)0=advapi32.WmiQuerySingleInstanceW @41 + WmiSetSingleInstanceA(a)0=advapi32.WmiSetSingleInstanceA @42 + WmiSetSingleInstanceW(a)0=advapi32.WmiSetSingleInstanceW @43 + WmiSetSingleItemA(a)0=advapi32.WmiSetSingleItemA @44 + WmiSetSingleItemW(a)0=advapi32.WmiSetSingleItemW @45 Propchange: branches/cmake-bringup/dll/win32/wmi/wmi.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,10 +1,9 @@ add_definitions(-DLE) -include_directories(inc) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - -spec2def(ws2_32_new.dll ws2_32.spec) +include_directories( + inc + ${REACTOS_SOURCE_DIR}/include/reactos/winsock) add_library(ws2_32_new SHARED src/addrconv.c @@ -44,7 +43,11 @@ src/startup.c src/wsautil.c ws2_32.rc - ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) + ws2_32.def) + +if(NOT MSVC) + set_source_files_properties(ws2_32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(ws2_32_new win32dll) Added: branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def (added) +++ branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,121 @@ + +LIBRARY ws2_32_new.dll + +EXPORTS + WEP@0 @500 + WPUCompleteOverlappedRequest@20 @24 + WSAAccept@20 @25 + WSAAddressToStringA@20 @26 + WSAAddressToStringW@20 @27 + WSAAsyncGetHostByAddr@28 @102 + WSAAsyncGetHostByName@20 @103 + WSAAsyncGetProtoByName@20 @105 + WSAAsyncGetProtoByNumber@20 @104 + WSAAsyncGetServByName@24 @107 + WSAAsyncGetServByPort@24 @106 + WSAAsyncSelect@16 @101 + WSACancelAsyncRequest@4 @108 + WSACancelBlockingCall@0 @113 + WSACleanup@0 @116 + WSACloseEvent@4 @28 + WSAConnect@28 @29 + WSACreateEvent@0 @30 + WSADuplicateSocketA@12 @31 + WSADuplicateSocketW@12 @32 + WSAEnumNameSpaceProvidersA@8 @33 + WSAEnumNameSpaceProvidersW@8 @34 + WSAEnumNetworkEvents@12 @35 + WSAEnumProtocolsA@12 @36 + WSAEnumProtocolsW@12 @37 + WSAEventSelect@12 @38 + WSAGetLastError@0 @111 + WSAGetOverlappedResult@20 @39 + WSAGetQOSByName@12 @40 + WSAGetServiceClassInfoA@16 @41 + WSAGetServiceClassInfoW@16 @42 + WSAGetServiceClassNameByClassIdA@12 @43 + WSAGetServiceClassNameByClassIdW@12 @44 + WSAHtonl@12 @45 + WSAHtons@12 @46 + WSAInstallServiceClassA@4 @47 + WSAInstallServiceClassW@4 @48 + WSAIoctl@36 @49 + WSAIsBlocking@0 @114 + WSAJoinLeaf@32 @50 + WSALookupServiceBeginA@12 @58 + WSALookupServiceBeginW@12 @59 + WSALookupServiceEnd@4 @60 + WSALookupServiceNextA@16 @61 + WSALookupServiceNextW@16 @62 + WSANSPIoctl@32 @63 + WSANtohl@12 @64 + WSANtohs@12 @65 + WSAProviderConfigChange@12 @66 + WSARecv@28 @67 + WSARecvDisconnect@8 @68 + WSARecvFrom@36 @69 + WSARemoveServiceClass@4 @70 + WSAResetEvent@4 @71 + WSASend@28 @72 + WSASendDisconnect@8 @73 + WSASendTo@36 @74 + WSASetBlockingHook@4 @109 + WSASetEvent@4 @75 + WSASetLastError@4 @112 + WSASetServiceA@12 @76 + WSASetServiceW@12 @77 + WSASocketA@24 @78 + WSASocketW@24 @79 + WSAStartup@8 @115 + WSAStringToAddressA@20 @80 + WSAStringToAddressW@20 @81 + WSAUnhookBlockingHook@0 @110 + WSAWaitForMultipleEvents@20 @82 + WSApSetPostRoutine@4 @83 + FreeAddrInfoW@4=freeaddrinfo@4 @84 + WSCDeinstallProvider@8 @85 + WSCEnableNSProvider@8 @86 + WSCEnumProtocols@16 @87 + WSCGetProviderPath@16 @88 + WSCInstallNameSpace@20 @89 + WSCInstallProvider@20 @90 + WSCUnInstallNameSpace@4 @91 + WSCUpdateProvider@20 @92 + WSCWriteNameSpaceOrder@8 @93 + WSCWriteProviderOrder@8 @94 + __WSAFDIsSet@8 @151 + accept@12 @1 + bind@12 @2 + closesocket@4 @3 + connect@12 @4 + freeaddrinfo@4 @95 + getaddrinfo@16 @96 + gethostbyaddr@12 @51 + gethostbyname@4 @52 + gethostname@8 @57 + getnameinfo@28 @97 + getpeername@12 @5 + getprotobyname@4 @53 + getprotobynumber@4 @54 + getservbyname@8 @55 + getservbyport@8 @56 + getsockname@12 @6 + getsockopt@20 @7 + htonl@4 @8 + htons@4 @9 + inet_addr@4 @11 + inet_ntoa@4 @12 + ioctlsocket@12 @10 + listen@8 @13 + ntohl@4 @14 + ntohs@4 @15 + recv@16 @16 + recvfrom@24 @17 + select@20 @18 + send@16 @19 + sendto@24 @20 + setsockopt@20 @21 + shutdown@8 @22 + socket@12 @23 + GetAddrInfoW@16 @98 + GetNameInfoW@28 @99 Propchange: branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,7 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - -spec2def(ws2help.dll ws2help.spec) add_library(ws2help SHARED apc.c @@ -9,7 +7,11 @@ dllmain.c handle.c notify.c - ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) + ws2help.def) + +if(NOT MSVC) + set_source_files_properties(ws2help.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(ws2help win32dll) Added: branches/cmake-bringup/dll/win32/ws2help/ws2help.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/ws2help.def (added) +++ branches/cmake-bringup/dll/win32/ws2help/ws2help.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,27 @@ + +LIBRARY ws2help.dll + +EXPORTS + WahCloseApcHelper@4 @1 + WahCloseHandleHelper@4 @2 + WahCloseNotificationHandleHelper@4 @3 + WahCloseSocketHandle@8 @4 + WahCloseThread@8 @5 + WahCompleteRequest@20 @6 + WahCreateHandleContextTable@4 @7 + WahCreateNotificationHandle@8 @8 + WahCreateSocketHandle@8 @9 + WahDestroyHandleContextTable@4 @10 + WahDisableNonIFSHandleSupport@0 @11 + WahEnableNonIFSHandleSupport@0 @12 + WahEnumerateHandleContexts@12 @13 + WahInsertHandleContext@8 @14 + WahNotifyAllProcesses@4 @15 + WahOpenApcHelper@4 @16 + WahOpenCurrentThread@8 @17 + WahOpenHandleHelper@4 @18 + WahOpenNotificationHandleHelper@4 @19 + WahQueueUserApc@16 @20 + WahReferenceContextByHandle@8 @21 + WahRemoveHandleContext@8 @22 + WahWaitForNotification@16 @23 Propchange: branches/cmake-bringup/dll/win32/ws2help/ws2help.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,9 +1,11 @@ set_unicode() -spec2def(wshirda.dll wshirda.spec) +add_library(wshirda SHARED wshirda.c wshirda.rc wshirda.def) -add_library(wshirda SHARED wshirda.c wshirda.rc ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) +if(NOT MSVC) + set_source_files_properties(wshirda.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(wshirda win32dll) Added: branches/cmake-bringup/dll/win32/wshirda/wshirda.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/wshirda.def (added) +++ branches/cmake-bringup/dll/win32/wshirda/wshirda.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,15 @@ + +LIBRARY wshirda.dll + +EXPORTS + WSHEnumProtocols@16 @1 + WSHGetProviderGuid@8 @2 + WSHGetSockaddrType@12 @3 + WSHGetSocketInformation@32 @4 + WSHGetWSAProtocolInfo@12 @5 + WSHGetWildcardSockaddr@12 @6 + WSHGetWinsockMapping@8 @7 + WSHIoctl@52 @8 + WSHNotify@20 @9 + WSHOpenSocket@24 @10 + WSHSetSocketInformation@32 @11 Propchange: branches/cmake-bringup/dll/win32/wshirda/wshirda.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -3,10 +3,11 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) -spec2def(wshtcpip.dll wshtcpip.spec) +add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc wshtcpip.def) -add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc - ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) +if(NOT MSVC) + set_source_files_properties(wshtcpip.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(wshtcpip 0) Added: branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def (added) +++ branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,20 @@ + +LIBRARY wshtcpip.dll + +EXPORTS + WSHAddressToString@20 @1 + WSHEnumProtocols@16 @2 + WSHGetBroadcastSockaddr@12 @3 + WSHGetProviderGuid@8 @4 + WSHGetSockaddrType@12 @5 + WSHGetSocketInformation@32 @6 + WSHGetWildcardSockaddr@12 @7 + WSHGetWinsockMapping@8 @8 + WSHGetWSAProtocolInfo@12 @9 + WSHIoctl@52 @10 + WSHJoinLeaf@52 @11 + WSHNotify@20 @12 + WSHOpenSocket@24 @13 + WSHOpenSocket2@32 @14 + WSHSetSocketInformation@32 @15 + WSHStringToAddress@20 @16 Propchange: branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -5,8 +5,6 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(wuapi.dll wuapi.spec) add_library(wuapi SHARED downloader.c @@ -16,7 +14,11 @@ searcher.c session.c updates.c - ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) + wuapi.def) + +if(NOT MSVC) + set_source_files_properties(wuapi.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(wuapi win32dll) Added: branches/cmake-bringup/dll/win32/wuapi/wuapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/w… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/wuapi.def (added) +++ branches/cmake-bringup/dll/win32/wuapi/wuapi.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,8 @@ + +LIBRARY wuapi.dll + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject@12 @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE Propchange: branches/cmake-bringup/dll/win32/wuapi/wuapi.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -2,9 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(xinput1_1.dll xinput1_1.spec) +add_library(xinput1_1 SHARED xinput1_1_main.c version.rc xinput1_1.def) -add_library(xinput1_1 SHARED xinput1_1_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) +if(NOT MSVC) + set_source_files_properties(xinput1_1.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(xinput1_1 win32dll) Added: branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def (added) +++ branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,9 @@ + +LIBRARY xinput1_1.dll + +EXPORTS + XInputEnable(a)4=xinput1_3.XInputEnable @1 + XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @2 + XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3 + XInputSetState(a)8=xinput1_3.XInputSetState @4 + XInputGetState(a)8=xinput1_3.XInputGetState @5 Propchange: branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -2,9 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(xinput1_2.dll xinput1_2.spec) +add_library(xinput1_2 SHARED xinput1_2_main.c version.rc xinput1_2.def) -add_library(xinput1_2 SHARED xinput1_2_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) +if(NOT MSVC) + set_source_files_properties(xinput1_2.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_importlibs(xinput1_2 kernel32) Added: branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def (added) +++ branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,9 @@ + +LIBRARY xinput1_2.dll + +EXPORTS + XInputEnable(a)4=xinput1_3.XInputEnable @1 + XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @2 + XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3 + XInputSetState(a)8=xinput1_3.XInputSetState @4 + XInputGetState(a)8=xinput1_3.XInputGetState @5 Propchange: branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -2,9 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(xinput1_3.dll xinput1_3.spec) +add_library(xinput1_3 SHARED xinput1_3_main.c version.rc xinput1_3.def) -add_library(xinput1_3 SHARED xinput1_3_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) +if(NOT MSVC) + set_source_files_properties(xinput1_3.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(xinput1_3 win32dll) @@ -12,5 +14,4 @@ add_importlibs(xinput1_3 msvcrt kernel32 ntdll) - add_cab_target(xinput1_3 1) Added: branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def (added) +++ branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,12 @@ + +LIBRARY xinput1_3.dll + +EXPORTS + DllMain@12 @1 + XInputGetState@8 @2 + XInputSetState@8 @3 + XInputGetCapabilities@12 @4 + XInputEnable@4 @5 + XInputGetDSoundAudioDeviceGuids@12 @6 + XInputGetBatteryInformation@12 @7 + XInputGetKeystroke@12 @8 Propchange: branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -2,9 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(xinput9_1_0.dll xinput9_1_0.spec) +add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc xinput9_1_0.def) -add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) +if(NOT MSVC) + set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_importlibs(xinput9_1_0 kernel32) Added: branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def (added) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def [iso-8859-1] Tue Nov 2 20:23:56 2010 @@ -1,0 +1,8 @@ + +LIBRARY xinput9_1_0.dll + +EXPORTS + XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @1 + XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @2 + XInputSetState(a)8=xinput1_3.XInputSetState @3 + XInputGetState(a)8=xinput1_3.XInputGetState @4 Propchange: branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 11 months

[akhaldi] 49449: [CMAKE] - Move more dlls with no stubs into using def files instead of spec files.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 2 19:58:29 2010 New Revision: 49449 URL: http://svn.reactos.org/svn/reactos?rev=49449&view=rev Log: [CMAKE] - Move more dlls with no stubs into using def files instead of spec files. Added: branches/cmake-bringup/dll/win32/iccvid/iccvid.def (with props) branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def (with props) branches/cmake-bringup/dll/win32/jscript/jscript.def (with props) branches/cmake-bringup/dll/win32/localui/localui.def (with props) branches/cmake-bringup/dll/win32/lpk/lpk.def (with props) branches/cmake-bringup/dll/win32/lz32/lz32.def (with props) branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def (with props) branches/cmake-bringup/dll/win32/mcicda/mcicda.def (with props) branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def (with props) branches/cmake-bringup/dll/win32/mciseq/mciseq.def (with props) branches/cmake-bringup/dll/win32/mciwave/mciwave.def (with props) branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def (with props) branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def (with props) branches/cmake-bringup/dll/win32/msafd/msafd.def (with props) branches/cmake-bringup/dll/win32/msg711.acm/msg711.def (with props) branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def (with props) branches/cmake-bringup/dll/win32/msimg32/msimg32.def (with props) branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def (with props) branches/cmake-bringup/dll/win32/msrle32/msrle32.def (with props) branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def (with props) branches/cmake-bringup/dll/win32/mswsock/mswsock.def (with props) branches/cmake-bringup/dll/win32/netid/netid.def (with props) branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def (with props) branches/cmake-bringup/dll/win32/objsel/objsel.def (with props) branches/cmake-bringup/dll/win32/oledlg/oledlg.def (with props) branches/cmake-bringup/dll/win32/olepro32/olepro32.def (with props) branches/cmake-bringup/dll/win32/powrprof/powrprof.def (with props) branches/cmake-bringup/dll/win32/psapi/psapi.def (with props) branches/cmake-bringup/dll/win32/riched20/riched20.def (with props) branches/cmake-bringup/dll/win32/riched32/riched32.def (with props) Removed: branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt branches/cmake-bringup/dll/win32/localui/CMakeLists.txt branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt branches/cmake-bringup/dll/win32/netid/CMakeLists.txt branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… ============================================================================== --- branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,11 +1,12 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(iccvid.dll iccvid.spec) +add_library(iccvid SHARED iccvid.c rsrc.rc iccvid.def) -add_library(iccvid SHARED iccvid.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/iccvid.def) +if(NOT MSVC) + set_source_files_properties(iccvid.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(iccvid win32dll) Added: branches/cmake-bringup/dll/win32/iccvid/iccvid.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… ============================================================================== --- branches/cmake-bringup/dll/win32/iccvid/iccvid.def (added) +++ branches/cmake-bringup/dll/win32/iccvid/iccvid.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY iccvid.dll + +EXPORTS + DriverProc@20=ICCVID_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/iccvid/iccvid.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -4,10 +4,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(imaadp32.acm imaadp32.acm.spec) +add_library(imaadp32.acm SHARED imaadp32.c imaadp32.def) -add_library(imaadp32.acm SHARED imaadp32.c - ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def) +if(NOT MSVC) + set_source_files_properties(imaadp32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(imaadp32.acm 0) set_target_properties(imaadp32.acm PROPERTIES SUFFIX ".acm") Added: branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… ============================================================================== --- branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def (added) +++ branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY imaadp32.acm + +EXPORTS + DriverProc@20=ADPCM_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iprtpri… ============================================================================== --- branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt (removed) @@ -1,15 +1,0 @@ - -add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(itircl.dll itircl.spec) - -add_library(itircl SHARED itircl_main.c ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) - -set_module_type(itircl win32dll) - -target_link_libraries(itircl wine) - -add_importlibs(itircl kernel32 ntdll) -add_dependencies(itircl psdk) -add_cab_target(itircl 1) Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -10,8 +10,6 @@ -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(jscript.dll jscript.spec) add_library(jscript SHARED activex.c @@ -34,7 +32,11 @@ function.c global.c rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) + jscript.def) + +if(NOT MSVC) + set_source_files_properties(jscript.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(jscript win32dll) Added: branches/cmake-bringup/dll/win32/jscript/jscript.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/jscript.def (added) +++ branches/cmake-bringup/dll/win32/jscript/jscript.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,8 @@ + +LIBRARY jscript.dll + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject@12 @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE Propchange: branches/cmake-bringup/dll/win32/jscript/jscript.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,9 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(localui.dll localui.spec) +add_library(localui SHARED localui.c localui.rc localui.def) -add_library(localui SHARED localui.c localui.rc ${CMAKE_CURRENT_BINARY_DIR}/localui.def) +if(NOT MSVC) + set_source_files_properties(localui.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(localui win32dll) Added: branches/cmake-bringup/dll/win32/localui/localui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/localui.def (added) +++ branches/cmake-bringup/dll/win32/localui/localui.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY localui.dll + +EXPORTS + InitializePrintMonitorUI@0 @1 Propchange: branches/cmake-bringup/dll/win32/localui/localui.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lpk/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -4,9 +4,11 @@ add_definitions(-DLANGPACK) include_directories(include) -spec2def(lpk.dll lpk.spec) +add_library(lpk SHARED dllmain.c stub.c lpk.rc lpk.def) -add_library(lpk SHARED dllmain.c stub.c lpk.rc ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) +if(NOT MSVC) + set_source_files_properties(lpk.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(lpk win32dll) Added: branches/cmake-bringup/dll/win32/lpk/lpk.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/lpk… ============================================================================== --- branches/cmake-bringup/dll/win32/lpk/lpk.def (added) +++ branches/cmake-bringup/dll/win32/lpk/lpk.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,15 @@ + +LIBRARY lpk.dll + +EXPORTS + LpkInitialize@4 @1 + LpkTabbedTextOut@48 @2 + LpkDllInitialize@12 @3 + LpkDrawTextEx@40 @4 + LpkEditControl @5 DATA + LpkExtTextOut@36 @6 + LpkGetCharacterPlacement@28 @7 + LpkGetTextExtentExPoint@36 @8 + LpkPSMTextOut@24 @9 + LpkUseGDIWidthCache@20 @10 + ftsWordBreak@20 @11 Propchange: branches/cmake-bringup/dll/win32/lpk/lpk.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,10 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(lz32.dll lz32.spec) +add_library(lz32 SHARED version.rc lz32.def) -add_library(lz32 SHARED version.rc - ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) +if(NOT MSVC) + set_source_files_properties(lz32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(lz32 0) Added: branches/cmake-bringup/dll/win32/lz32/lz32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/lz… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/lz32.def (added) +++ branches/cmake-bringup/dll/win32/lz32/lz32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,16 @@ + +LIBRARY lz32.dll + +EXPORTS + CopyLZFile(a)8=kernel32.CopyLZFile @1 + GetExpandedNameA(a)8=kernel32.GetExpandedNameA @2 + GetExpandedNameW(a)8=kernel32.GetExpandedNameW @3 + LZClose(a)4=kernel32.LZClose @4 + LZCopy(a)8=kernel32.LZCopy @5 + LZDone(a)0=kernel32.LZDone @6 + LZInit(a)4=kernel32.LZInit @7 + LZOpenFileA(a)12=kernel32.LZOpenFileA @8 + LZOpenFileW(a)12=kernel32.LZOpenFileW @9 + LZRead(a)12=kernel32.LZRead @10 + LZSeek(a)12=kernel32.LZSeek @11 + LZStart(a)0=kernel32.LZStart @12 Propchange: branches/cmake-bringup/dll/win32/lz32/lz32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(mciavi32.dll mciavi32.spec) add_library(mciavi32 SHARED info.c @@ -10,7 +8,11 @@ mmoutput.c wnd.c mciavi_res.rc - ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def) + mciavi32.def) + +if(NOT MSVC) + set_source_files_properties(mciavi32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(mciavi32 win32dll) Added: branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def (added) +++ branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY mciavi32.dll + +EXPORTS + DriverProc@20=MCIAVI_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… ============================================================================== --- branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mcicda/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,10 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mcicda.dll mcicda.spec) +add_library(mcicda SHARED mcicda.c mcicda.def) -add_library(mcicda SHARED mcicda.c - ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def) +if(NOT MSVC) + set_source_files_properties(mcicda.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(mcicda 0) Added: branches/cmake-bringup/dll/win32/mcicda/mcicda.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… ============================================================================== --- branches/cmake-bringup/dll/win32/mcicda/mcicda.def (added) +++ branches/cmake-bringup/dll/win32/mcicda/mcicda.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY mcicda.dll + +EXPORTS + DriverProc@20=MCICDA_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/mcicda/mcicda.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,9 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mciqtz32.dll mciqtz32.spec) +add_library(mciqtz32 SHARED mciqtz.c version.rc mciqtz32.def) -add_library(mciqtz32 SHARED mciqtz.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def) +if(NOT MSVC) + set_source_files_properties(mciqtz32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(mciqtz32 win32dll) Added: branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… ============================================================================== --- branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def (added) +++ branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY mciqtz32.dll + +EXPORTS + DriverProc@20=MCIQTZ_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… ============================================================================== --- branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,10 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mciseq.dll mciseq.spec) +add_library(mciseq SHARED mcimidi.c mciseq.def) -add_library(mciseq SHARED mcimidi.c - ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def) +if(NOT MSVC) + set_source_files_properties(mciseq.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(mciseq 0) Added: branches/cmake-bringup/dll/win32/mciseq/mciseq.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… ============================================================================== --- branches/cmake-bringup/dll/win32/mciseq/mciseq.def (added) +++ branches/cmake-bringup/dll/win32/mciseq/mciseq.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY mciseq.dll + +EXPORTS + DriverProc@20=MCIMIDI_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/mciseq/mciseq.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… ============================================================================== --- branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mciwave/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,14 +1,18 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D_WINE) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP + -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mciwave.dll mciwave.spec) -add_library(mciwave SHARED mciwave.c - ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def) +add_library(mciwave SHARED mciwave.c mciwave.def) + +if(NOT MSVC) + set_source_files_properties(mciwave.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(mciwave 0) Added: branches/cmake-bringup/dll/win32/mciwave/mciwave.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… ============================================================================== --- branches/cmake-bringup/dll/win32/mciwave/mciwave.def (added) +++ branches/cmake-bringup/dll/win32/mciwave/mciwave.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY mciwave.dll + +EXPORTS + DriverProc@20=MCIWAVE_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/mciwave/mciwave.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mmdrv/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,8 +2,6 @@ set_unicode() add_definitions(-DNDEBUG) - -spec2def(mmdrv.dll mmdrv.spec) add_library(mmdrv SHARED entry.c @@ -13,7 +11,11 @@ common.c wave.c wave_io.c - ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) + mmdrv.def) + +if(NOT MSVC) + set_source_files_properties(mmdrv.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(mmdrv 0) Added: branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/m… ============================================================================== --- branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def (added) +++ branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,6 @@ + +LIBRARY mmdrv.dll + +EXPORTS + DriverProc@20 @1 + wodMessage@20 @2 Propchange: branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… ============================================================================== --- branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msadp32.acm/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -4,10 +4,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(msadp32.acm msadp32.acm.spec) +add_library(msadp32.acm SHARED msadp32.c msadp32.def) -add_library(msadp32.acm SHARED msadp32.c - ${CMAKE_CURRENT_BINARY_DIR}/msadp32.def) +if(NOT MSVC) + set_source_files_properties(msadp32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(msadp32.acm 0) set_target_properties(msadp32.acm PROPERTIES SUFFIX "") Added: branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… ============================================================================== --- branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def (added) +++ branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY msadp32.acm + +EXPORTS + DriverProc@20=ADPCM_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/C… ============================================================================== --- branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msafd/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,10 +1,9 @@ set_unicode() -include_directories(BEFORE include) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) - -spec2def(msafd.dll msafd.spec) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/include/reactos/drivers) list(APPEND SOURCE msafd.rc @@ -13,7 +12,11 @@ misc/helpers.c misc/sndrcv.c misc/stubs.c - ${CMAKE_CURRENT_BINARY_DIR}/msafd.def) + msafd.def) + +if(NOT MSVC) + set_source_files_properties(msafd.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(msafd SHARED ${CMAKE_CURRENT_BINARY_DIR}/msafd_msafd.h.gch Added: branches/cmake-bringup/dll/win32/msafd/msafd.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/m… ============================================================================== --- branches/cmake-bringup/dll/win32/msafd/msafd.def (added) +++ branches/cmake-bringup/dll/win32/msafd/msafd.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY msafd.dll + +EXPORTS + WSPStartup@76 @1 Propchange: branches/cmake-bringup/dll/win32/msafd/msafd.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… ============================================================================== --- branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,13 +1,15 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D__WINESRC__) +add_definitions( + -D_DLL -D__USE_CRTIMP + -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(msg711.acm msg711.acm.spec) +add_library(msg711.acm SHARED msg711.c msg711.def) -add_library(msg711.acm SHARED msg711.c - ${CMAKE_CURRENT_BINARY_DIR}/msg711.def) +if(NOT MSVC) + set_source_files_properties(msg711.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(msg711.acm 0) set_target_properties(msg711.acm PROPERTIES SUFFIX "") Added: branches/cmake-bringup/dll/win32/msg711.acm/msg711.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… ============================================================================== --- branches/cmake-bringup/dll/win32/msg711.acm/msg711.def (added) +++ branches/cmake-bringup/dll/win32/msg711.acm/msg711.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY msg711.acm + +EXPORTS + DriverProc@20=G711_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/msg711.acm/msg711.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,13 +1,15 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) -add_definitions(-D__WINESRC__) +add_definitions( + -D_DLL -D__USE_CRTIMP + -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(msgsm32.acm msgsm32.acm.spec) +add_library(msgsm32.acm SHARED msgsm32.c msgsm32.def) -add_library(msgsm32.acm SHARED msgsm32.c - ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def) +if(NOT MSVC) + set_source_files_properties(msgsm32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(msgsm32.acm 0) set_target_properties(msgsm32.acm PROPERTIES SUFFIX "") Added: branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def (added) +++ branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY msgsm32.acm + +EXPORTS + DriverProc@20=GSM_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -6,11 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(mshtml.tlb mshtml.tlb.spec) - -add_library(mshtml.tlb SHARED - rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) +add_library(mshtml.tlb SHARED rsrc.rc) set_entrypoint(mshtml.tlb 0) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") Modified: branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msimg32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,9 +2,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -spec2def(msimg32.dll msimg32.spec) +add_library(msimg32 SHARED msimg32_main.c msimg32.def) -add_library(msimg32 SHARED msimg32_main.c ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) +if(NOT MSVC) + set_source_files_properties(msimg32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(msimg32 win32dll) Added: branches/cmake-bringup/dll/win32/msimg32/msimg32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… ============================================================================== --- branches/cmake-bringup/dll/win32/msimg32/msimg32.def (added) +++ branches/cmake-bringup/dll/win32/msimg32/msimg32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,9 @@ + +LIBRARY msimg32.dll + +EXPORTS + AlphaBlend(a)44=gdi32.GdiAlphaBlend @1 + DllInitialize@12=DllMain@12 @2 PRIVATE + GradientFill(a)24=gdi32.GdiGradientFill @3 + TransparentBlt(a)44=gdi32.GdiTransparentBlt @4 + vSetDdrawflag@0 @5 Propchange: branches/cmake-bringup/dll/win32/msimg32/msimg32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,10 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(msisys.ocx msisys.ocx.spec) +add_library(msisys SHARED msisys.c msisys.def) -add_library(msisys SHARED msisys.c - ${CMAKE_CURRENT_BINARY_DIR}/msisys.def) +if(NOT MSVC) + set_source_files_properties(msisys.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(msisys win32ocx) Added: branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def (added) +++ branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,8 @@ + +LIBRARY msisys.ocx + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject@12 @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE Propchange: branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… ============================================================================== --- branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,12 +1,15 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(msrle32.dll msrle32.spec) +add_library(msrle32 SHARED msrle32.c rsrc.rc msrle32.def) -add_library(msrle32 SHARED msrle32.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def) +if(NOT MSVC) + set_source_files_properties(msrle32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(msrle32 win32dll) Added: branches/cmake-bringup/dll/win32/msrle32/msrle32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… ============================================================================== --- branches/cmake-bringup/dll/win32/msrle32/msrle32.def (added) +++ branches/cmake-bringup/dll/win32/msrle32/msrle32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY msrle32.dll + +EXPORTS + DriverProc@20=MSRLE32_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/msrle32/msrle32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… ============================================================================== --- branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,12 +1,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__) -add_definitions(-D_WINE) +add_definitions( + -D__WINESRC__ + -D_WINE) -spec2def(msvidc32.dll msvidc32.spec) +add_library(msvidc32 SHARED msvideo1.c rsrc.rc msvidc32.def) -add_library(msvidc32 SHARED msvideo1.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msvidc32.def) +if(NOT MSVC) + set_source_files_properties(msvidc32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(msvidc32 win32dll) Added: branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… ============================================================================== --- branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def (added) +++ branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY msvidc32.dll + +EXPORTS + DriverProc@20=CRAM_DriverProc@20 @1 PRIVATE Propchange: branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… ============================================================================== --- branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -10,7 +10,11 @@ extensions.c stubs.c mswsock.rc - ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) + mswsock.def) + +if(NOT MSVC) + set_source_files_properties(mswsock.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(mswsock win32dll) Added: branches/cmake-bringup/dll/win32/mswsock/mswsock.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… ============================================================================== --- branches/cmake-bringup/dll/win32/mswsock/mswsock.def (added) +++ branches/cmake-bringup/dll/win32/mswsock/mswsock.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,36 @@ + +LIBRARY mswsock.dll + +EXPORTS + AcceptEx@32 @1 + EnumProtocolsA(a)12=ws2_32.WSAEnumProtocolsA @2 + EnumProtocolsW(a)12=ws2_32.WSAEnumProtocolsW @3 + GetAcceptExSockaddrs@32 @4 + GetAddressByNameA@40 @5 + GetAddressByNameW@40 @6 + GetNameByTypeA@12 @7 + GetNameByTypeW@12 @8 + GetServiceA@28 @9 + GetServiceW@28 @10 + GetTypeByNameA@8 @11 + GetTypeByNameW@8 @12 + MigrateWinsockConfiguration@12 @13 + NPLoadNameSpaces@12 @14 + NSPStartup@8 @15 + ServiceMain@8 @16 + SetServiceA@24 @17 + SetServiceW@24 @18 + StartWsdpService@0 @19 + StopWsdpService@0 @20 + SvchostPushServiceGlobals@4 @21 + TransmitFile@28 @22 + WSARecvEx@16 @23 + WSPStartup@76 @24 + dn_expand@20 @25 + getnetbyname@4 @26 + inet_network@4 @27 + rcmd@24 @28 + rexec@24 @29 + rresvport@4 @30 + s_perror@4 @31 + sethostname@8 @32 Propchange: branches/cmake-bringup/dll/win32/mswsock/mswsock.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/C… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,7 +1,9 @@ -spec2def(netid.dll netid.spec) +add_library(netid SHARED netid.c netid.rc netid.def) -add_library(netid SHARED netid.c netid.rc ${CMAKE_CURRENT_BINARY_DIR}/netid.def) +if(NOT MSVC) + set_source_files_properties(netid.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(netid win32dll) Added: branches/cmake-bringup/dll/win32/netid/netid.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/n… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/netid.def (added) +++ branches/cmake-bringup/dll/win32/netid/netid.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY netid.dll + +EXPORTS + CreateNetIDPropertyPage@0 @1 Propchange: branches/cmake-bringup/dll/win32/netid/netid.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… ============================================================================== --- branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,12 +2,15 @@ set_unicode() add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -spec2def(ntmarta.dll ntmarta.spec) +add_library(ntmarta SHARED ntmarta.c ntmarta.rc ntmarta.def) -add_library(ntmarta SHARED ntmarta.c ntmarta.rc ${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def) +if(NOT MSVC) + set_source_files_properties(ntmarta.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(ntmarta win32dll) @@ -17,5 +20,4 @@ kernel32 ntdll) - add_cab_target(ntmarta 1) Added: branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… ============================================================================== --- branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def (added) +++ branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,13 @@ + +LIBRARY ntmarta.dll + +EXPORTS + AccFreeIndexArray@12 @1 + AccGetInheritanceSource@40 @2 + AccRewriteGetExplicitEntriesFromAcl@12 @3 + AccRewriteGetHandleRights@32 @4 + AccRewriteGetNamedRights@32 @5 + AccRewriteSetEntriesInAcl@16 @6 + AccRewriteSetHandleRights@16 @7 + AccRewriteSetNamedRights@16 @8 + AccTreeResetNamedSecurityInfo@44 @9 Propchange: branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… ============================================================================== --- branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -6,14 +6,16 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(objsel.dll objsel.spec) - add_library(objsel SHARED factory.c objsel.c regsvr.c objsel.rc - ${CMAKE_CURRENT_BINARY_DIR}/objsel.def) + objsel.def) + +if(NOT MSVC) + set_source_files_properties(objsel.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(objsel win32dll) @@ -28,5 +30,4 @@ kernel32 ntdll) - add_cab_target(objsel 1) Added: branches/cmake-bringup/dll/win32/objsel/objsel.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… ============================================================================== --- branches/cmake-bringup/dll/win32/objsel/objsel.def (added) +++ branches/cmake-bringup/dll/win32/objsel/objsel.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,8 @@ + +LIBRARY objsel.dll + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject@12 @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE Propchange: branches/cmake-bringup/dll/win32/objsel/objsel.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,15 +1,17 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - -spec2def(oledlg.dll oledlg.spec) add_library(oledlg SHARED insobjdlg.c oledlg_main.c pastespl.c rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/oledlg.def) + oledlg.def) + +if(NOT MSVC) + set_source_files_properties(oledlg.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(oledlg win32dll) Added: branches/cmake-bringup/dll/win32/oledlg/oledlg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/oledlg/oledlg.def (added) +++ branches/cmake-bringup/dll/win32/oledlg/oledlg.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,27 @@ + +LIBRARY oledlg.dll + +EXPORTS + OleUIAddVerbMenuA@36 @1 + OleUICanConvertOrActivateAs@12 @2 + OleUIInsertObjectA@4 @3 + OleUIPasteSpecialA@4 @4 + OleUIEditLinksA@4 @5 + OleUIChangeIconA@4 @6 + OleUIConvertA@4 @7 + OleUIBusyA@4 @8 + OleUIUpdateLinksA@16 @9 + OleUIPromptUserA @10 + OleUIObjectPropertiesA@4 @11 + OleUIChangeSourceA@4 @12 + OleUIPromptUserW @13 + OleUIAddVerbMenuW@36 @14 + OleUIBusyW@4 @15 + OleUIChangeIconW@4 @16 + OleUIChangeSourceW@4 @17 + OleUIConvertW@4 @18 + OleUIEditLinksW@4 @19 + OleUIInsertObjectW@4 @20 + OleUIObjectPropertiesW@4 @21 + OleUIPasteSpecialW@4 @22 + OleUIUpdateLinksW@16 @23 Propchange: branches/cmake-bringup/dll/win32/oledlg/oledlg.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro3… ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,20 +2,19 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(olepro32.dll olepro32.spec) +add_library(olepro32 SHARED olepro32stubs.c version.rc olepro32.def) -add_library(olepro32 SHARED olepro32stubs.c version.rc - ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def) +if(NOT MSVC) + set_source_files_properties(olepro32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(olepro32 0) -target_link_libraries(olepro32 - wine) +target_link_libraries(olepro32 wine) add_importlibs(olepro32 oleaut32 kernel32 ntdll) - add_cab_target(olepro32 1) Added: branches/cmake-bringup/dll/win32/olepro32/olepro32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro3… ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/olepro32.def (added) +++ branches/cmake-bringup/dll/win32/olepro32/olepro32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,15 @@ + +LIBRARY olepro32.dll + +EXPORTS + OleIconToCursor(a)8=oleaut32.OleIconToCursor @248 + OleCreatePropertyFrameIndirect(a)4=oleaut32.OleCreatePropertyFrameIndirect @249 + OleCreatePropertyFrame(a)44=oleaut32.OleCreatePropertyFrame @250 + OleLoadPicture(a)20=oleaut32.OleLoadPicture @251 + OleCreatePictureIndirect(a)16=oleaut32.OleCreatePictureIndirect @252 + OleCreateFontIndirect(a)12=oleaut32.OleCreateFontIndirect @253 + OleTranslateColor(a)12=oleaut32.OleTranslateColor @254 + DllCanUnloadNow@0 @255 PRIVATE + DllGetClassObject@12 @256 PRIVATE + DllRegisterServer@0 @257 PRIVATE + DllUnregisterServer@0 @258 PRIVATE Propchange: branches/cmake-bringup/dll/win32/olepro32/olepro32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,9 +1,11 @@ set_unicode() -spec2def(powrprof.dll powrprof.spec) +add_library(powrprof SHARED powrprof.c powrprof.rc powrprof.def) -add_library(powrprof SHARED powrprof.c powrprof.rc ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) +if(NOT MSVC) + set_source_files_properties(powrprof.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(powrprof win32dll) Added: branches/cmake-bringup/dll/win32/powrprof/powrprof.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/powrprof.def (added) +++ branches/cmake-bringup/dll/win32/powrprof/powrprof.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,27 @@ + +LIBRARY powrprof.dll + +EXPORTS + CallNtPowerInformation@20 @1 + CanUserWritePwrScheme@0 @2 + DeletePwrScheme@4 @3 + EnumPwrSchemes@8 @4 + GetActivePwrScheme@4 @5 + GetCurrentPowerPolicies@8 @6 + GetPwrCapabilities@4 @7 + GetPwrDiskSpindownRange@8 @8 + IsAdminOverrideActive@4 @9 + IsPwrHibernateAllowed@0 @10 + IsPwrShutdownAllowed@0 @11 + IsPwrSuspendAllowed@0 @12 + PowerGetActiveScheme@8 @13 + PowerReadDCValue@28 @14 + ReadGlobalPwrPolicy@4 @15 + ReadProcessorPwrScheme@8 @16 + ReadPwrScheme@8 @17 + SetActivePwrScheme@12 @18 + SetSuspendState@12 @19 + WriteGlobalPwrPolicy@4 @20 + WriteProcessorPwrScheme@8 @21 + WritePwrScheme@16 @22 + ValidatePowerPolicies@8 @23 Propchange: branches/cmake-bringup/dll/win32/powrprof/powrprof.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,11 +1,13 @@ - -spec2def(psapi.dll psapi.spec) list(APPEND SOURCE malloc.c psapi.c psapi.rc - ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) + psapi.def) + +if(NOT MSVC) + set_source_files_properties(psapi.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(psapi SHARED ${CMAKE_CURRENT_BINARY_DIR}/psapi_precomp.h.gch Added: branches/cmake-bringup/dll/win32/psapi/psapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/p… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/psapi.def (added) +++ branches/cmake-bringup/dll/win32/psapi/psapi.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,29 @@ + +LIBRARY psapi.dll + +EXPORTS + EmptyWorkingSet@4 @1 + EnumDeviceDrivers@12 @2 + EnumPageFilesA@8 @3 + EnumPageFilesW@8 @4 + EnumProcessModules@16 @5 + EnumProcesses@12 @6 + GetDeviceDriverBaseNameA@12 @7 + GetDeviceDriverBaseNameW@12 @8 + GetDeviceDriverFileNameA@12 @9 + GetDeviceDriverFileNameW@12 @10 + GetMappedFileNameA@16 @11 + GetMappedFileNameW@16 @12 + GetModuleBaseNameA@16 @13 + GetModuleBaseNameW@16 @14 + GetModuleFileNameExA@16 @15 + GetModuleFileNameExW@16 @16 + GetModuleInformation@16 @17 + GetPerformanceInfo@8 @18 + GetProcessImageFileNameA@12 @19 + GetProcessImageFileNameW@12 @20 + GetProcessMemoryInfo@12 @21 + GetWsChanges@12 @22 + InitializeProcessForWsWatch@4 @23 + QueryWorkingSet@12 @24 + QueryWorkingSetEx@12 @25 Propchange: branches/cmake-bringup/dll/win32/psapi/psapi.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,10 +1,9 @@ -add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(riched20.dll riched20.spec) add_library(riched20 SHARED caret.c @@ -27,7 +26,11 @@ wrap.c writer.c version.rc - ${CMAKE_CURRENT_BINARY_DIR}/riched20.def) + riched20.def) + +if(NOT MSVC) + set_source_files_properties(riched20.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(riched20 win32dll) @@ -49,5 +52,4 @@ kernel32 ntdll) - add_cab_target(riched20 1) Added: branches/cmake-bringup/dll/win32/riched20/riched20.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/riched20.def (added) +++ branches/cmake-bringup/dll/win32/riched20/riched20.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,13 @@ + +LIBRARY riched20.dll + +EXPORTS + IID_IRichEditOle @2 DATA + IID_IRichEditOleCallback @3 DATA + CreateTextServices@12 @4 + IID_ITextServices @5 DATA + IID_ITextHost @6 DATA + IID_ITextHost2 @7 DATA + REExtendedRegisterClass@0 @8 + RichEdit10ANSIWndProc@16 @9 + RichEditANSIWndProc@16 @10 Propchange: branches/cmake-bringup/dll/win32/riched20/riched20.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -2,9 +2,11 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(riched32.dll riched32.spec) +add_library(riched32 SHARED richedit.c version.rc riched32.def) -add_library(riched32 SHARED richedit.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched32.def) +if(NOT MSVC) + set_source_files_properties(riched32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(riched32 win32dll) Added: branches/cmake-bringup/dll/win32/riched32/riched32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/riched32.def (added) +++ branches/cmake-bringup/dll/win32/riched32/riched32.def [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,0 +1,5 @@ + +LIBRARY riched32.dll + +EXPORTS + DllGetVersion@4 @2 PRIVATE Propchange: branches/cmake-bringup/dll/win32/riched32/riched32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wsock32… ============================================================================== --- branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wsock32/CMakeLists.txt [iso-8859-1] Tue Nov 2 19:58:29 2010 @@ -1,10 +1,13 @@ set_unicode() -add_library(wsock32 SHARED stubs.c wsock32.rc) +add_library(wsock32 SHARED stubs.c wsock32.rc wsock32.def) + +if(NOT MSVC) + set_source_files_properties(wsock32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(wsock32 win32dll) -target_link_libraries(wsock32 ${CMAKE_CURRENT_SOURCE_DIR}/wsock32.def) add_importlibs(wsock32 ws2_32 kernel32 ntdll) add_cab_target(wsock32 1)

13 years, 11 months

[akhaldi] 49448: [CMAKE] - Move some dlls with no stubs into using def files instead of spec files.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 2 18:19:44 2010 New Revision: 49448 URL: http://svn.reactos.org/svn/reactos?rev=49448&view=rev Log: [CMAKE] - Move some dlls with no stubs into using def files instead of spec files. Added: branches/cmake-bringup/dll/win32/acledit/acledit.def (with props) branches/cmake-bringup/dll/win32/aclui/aclui.def (with props) branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def (with props) branches/cmake-bringup/dll/win32/advpack/advpack.def (with props) branches/cmake-bringup/dll/win32/avicap32/avicap32.def (with props) branches/cmake-bringup/dll/win32/avifil32/avifil32.def (with props) branches/cmake-bringup/dll/win32/batt/batt.def (with props) branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def (with props) branches/cmake-bringup/dll/win32/cards/cards.def (with props) branches/cmake-bringup/dll/win32/comcat/comcat.def (with props) branches/cmake-bringup/dll/win32/compstui/compstui.def (with props) branches/cmake-bringup/dll/win32/crtdll/crtdll.def (with props) branches/cmake-bringup/dll/win32/getuname/getuname.def (with props) branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def (with props) Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt branches/cmake-bringup/dll/win32/gdi32/gdi32.def branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -4,11 +4,14 @@ list(APPEND SOURCE acledit.c stubs.c - acledit.rc) + acledit.rc + acledit.def) -spec2def(acledit.dll acledit.spec) +if(NOT MSVC) + set_source_files_properties(acledit.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() -add_library(acledit SHARED ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/acledit.def) +add_library(acledit SHARED ${SOURCE}) set_module_type(acledit win32dll) Added: branches/cmake-bringup/dll/win32/acledit/acledit.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/acledit.def (added) +++ branches/cmake-bringup/dll/win32/acledit/acledit.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,11 @@ + +LIBRARY acledit.dll + +EXPORTS + EditAuditInfo@4 @1 + EditOwnerInfo@4 @2 + EditPermissionInfo@4 @3 + FMExtensionProcW@12 @4 + SedDiscretionaryAclEditor@52 @5 + SedSystemAclEditor@48 @6 + SedTakeOwnership@56 @7 Propchange: branches/cmake-bringup/dll/win32/acledit/acledit.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -10,9 +10,12 @@ misc.c sidcache.c aclui.rc - ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) + aclui.def) -spec2def(aclui.dll aclui.spec) +if(NOT MSVC) + set_source_files_properties(aclui.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() + add_library(aclui SHARED ${CMAKE_CURRENT_BINARY_DIR}/aclui_precomp.h.gch @@ -20,7 +23,6 @@ set_module_type(aclui win32dll) - add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kernel32 ntdll) add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) Added: branches/cmake-bringup/dll/win32/aclui/aclui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/a… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/aclui.def (added) +++ branches/cmake-bringup/dll/win32/aclui/aclui.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,7 @@ + +LIBRARY aclui.dll + +EXPORTS + CreateSecurityPage@4 @1 + EditSecurity@8 @2 + IID_ISecurityInformation @3 DATA Propchange: branches/cmake-bringup/dll/win32/aclui/aclui.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -3,9 +3,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(actxprxy.dll actxprxy.spec) +add_library(actxprxy SHARED usrmarshal.c actxprxy.def) -add_library(actxprxy SHARED usrmarshal.c ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) +if(NOT MSVC) + set_source_files_properties(actxprxy.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(actxprxy 0) Added: branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def (added) +++ branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,9 @@ + +LIBRARY actxprxy.dll + +EXPORTS + GetProxyDllInfo@8 @3 PRIVATE + DllCanUnloadNow@0 @4 PRIVATE + DllGetClassObject@12 @5 PRIVATE + DllRegisterServer@0 @6 PRIVATE + DllUnregisterServer@0 @7 PRIVATE Propchange: branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -8,9 +8,11 @@ files.c install.c reg.c - ${CMAKE_CURRENT_BINARY_DIR}/advpack.def) + advpack.def) -spec2def(advpack.dll advpack.spec) +if(NOT MSVC) + set_source_files_properties(advpack.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(advpack SHARED ${SOURCE}) Added: branches/cmake-bringup/dll/win32/advpack/advpack.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… ============================================================================== --- branches/cmake-bringup/dll/win32/advpack/advpack.def (added) +++ branches/cmake-bringup/dll/win32/advpack/advpack.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,86 @@ + +LIBRARY advpack.dll + +EXPORTS + AddDelBackupEntryA@16 @1 + AddDelBackupEntryW@16 @2 + AddDelBackupEntry@16=AddDelBackupEntryA@16 @3 + AdvInstallFileA@28 @4 + AdvInstallFileW@28 @5 + AdvInstallFile@28=AdvInstallFileA@28 @6 + CloseINFEngine@4 @7 + DelNodeA@8 @8 + DelNodeW@8 @9 + DelNode@8=DelNodeA@8 @10 + DelNodeRunDLL32A@16 @11 + DelNodeRunDLL32W@16 @12 + DelNodeRunDLL32@16=DelNodeRunDLL32A@16 @13 + DllMain@12 @14 PRIVATE + DoInfInstall@4 @15 + ExecuteCabA@12 @16 + ExecuteCabW@12 @17 + ExecuteCab@12=ExecuteCabA@12 @18 + ExtractFilesA@24 @19 + ExtractFilesW@24 @20 + ExtractFiles@24=ExtractFilesA@24 @21 + FileSaveMarkNotExistA@12 @22 + FileSaveMarkNotExistW@12 @23 + FileSaveMarkNotExist@12=FileSaveMarkNotExistA@12 @24 + FileSaveRestoreA@20 @25 + FileSaveRestoreW@20 @26 + FileSaveRestore@20=FileSaveRestoreA@20 @27 + FileSaveRestoreOnINFA@28 @28 + FileSaveRestoreOnINFW@28 @29 + FileSaveRestoreOnINF@28=FileSaveRestoreOnINFA@28 @30 + GetVersionFromFileA@16 @31 + GetVersionFromFileW@16 @32 + GetVersionFromFile@16=GetVersionFromFileA@16 @33 + GetVersionFromFileExA@16 @34 + GetVersionFromFileExW@16 @35 + GetVersionFromFileEx@16=GetVersionFromFileExA@16 @36 + IsNTAdmin@8 @37 + LaunchINFSectionA@16 @38 + LaunchINFSectionW@16 @39 + LaunchINFSection@16=LaunchINFSectionA@16 @40 + LaunchINFSectionExA@16 @41 + LaunchINFSectionExW@16 @42 + LaunchINFSectionEx@16=LaunchINFSectionExA@16 @43 + NeedReboot@4 @44 + NeedRebootInit@0 @45 + OpenINFEngineA@20 @46 + OpenINFEngineW@20 @47 + OpenINFEngine@20=OpenINFEngineA@20 @48 + RebootCheckOnInstallA@16 @49 + RebootCheckOnInstallW@16 @50 + RebootCheckOnInstall@16=RebootCheckOnInstallA@16 @51 + RegInstallA@12 @52 + RegInstallW@12 @53 + RegInstall@12=RegInstallA@12 @54 + RegRestoreAllA@12 @55 + RegRestoreAllW@12 @56 + RegRestoreAll@12=RegRestoreAllA@12 @57 + RegSaveRestoreA@28 @58 + RegSaveRestoreW@28 @59 + RegSaveRestore@28=RegSaveRestoreA@28 @60 + RegSaveRestoreOnINFA@28 @61 + RegSaveRestoreOnINFW@28 @62 + RegSaveRestoreOnINF@28=RegSaveRestoreOnINFA@28 @63 + RegisterOCX@16 @64 + RunSetupCommandA@32 @65 + RunSetupCommandW@32 @66 + RunSetupCommand@32=RunSetupCommandA@32 @67 + SetPerUserSecValuesA@4 @68 + SetPerUserSecValuesW@4 @69 + SetPerUserSecValues@4=SetPerUserSecValuesA@4 @70 + TranslateInfStringA@32 @71 + TranslateInfStringW@32 @72 + TranslateInfString@32=TranslateInfStringA@32 @73 + TranslateInfStringExA@32 @74 + TranslateInfStringExW@32 @75 + TranslateInfStringEx@32=TranslateInfStringExA@32 @76 + UserInstStubWrapperA@16 @77 + UserInstStubWrapperW@16 @78 + UserInstStubWrapper@16=UserInstStubWrapperA@16 @79 + UserUnInstStubWrapperA@16 @80 + UserUnInstStubWrapperW@16 @81 + UserUnInstStubWrapper@16=UserUnInstStubWrapperA@16 @82 Propchange: branches/cmake-bringup/dll/win32/advpack/advpack.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avicap32/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,9 +1,11 @@ set_unicode() -spec2def(avicap32.dll avicap32.spec) +add_library(avicap32 SHARED avicap32.c avicap32.rc avicap32.def) -add_library(avicap32 SHARED avicap32.c avicap32.rc ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) +if(NOT MSVC) + set_source_files_properties(avicap32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(avicap32 win32dll) Added: branches/cmake-bringup/dll/win32/avicap32/avicap32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avicap3… ============================================================================== --- branches/cmake-bringup/dll/win32/avicap32/avicap32.def (added) +++ branches/cmake-bringup/dll/win32/avicap32/avicap32.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,10 @@ + +LIBRARY avicap32.dll + +EXPORTS + AppCleanup@4 @1 + capCreateCaptureWindowA@32 @2 + capCreateCaptureWindowW@32 @3 + capGetDriverDescriptionA@20 @4 + capGetDriverDescriptionW@20 @5 + videoThunk32@20 @6 Propchange: branches/cmake-bringup/dll/win32/avicap32/avicap32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,11 +1,11 @@ add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D_DLL -D__USE_CRTIMP) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(avifil32.dll avifil32.spec) add_library(avifil32 SHARED acmstream.c @@ -20,7 +20,11 @@ tmpfile.c wavfile.c rsrc.rc - ${CMAKE_CURRENT_BINARY_DIR}/avifil32.def) + avifil32.def) + +if(NOT MSVC) + set_source_files_properties(avifil32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(avifil32 win32dll) @@ -39,5 +43,4 @@ kernel32 ntdll) - add_cab_target(avifil32 1) Added: branches/cmake-bringup/dll/win32/avifil32/avifil32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/avifil32.def (added) +++ branches/cmake-bringup/dll/win32/avifil32/avifil32.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,83 @@ + +LIBRARY avifil32.dll + +EXPORTS + AVIBuildFilter@12=AVIBuildFilterA@12 @1 + AVIBuildFilterA@12 @2 + AVIBuildFilterW@12 @3 + AVIClearClipboard@0 @4 + AVIFileAddRef@4 @5 + AVIFileCreateStream@12=AVIFileCreateStreamA@12 @6 + AVIFileCreateStreamA@12 @7 + AVIFileCreateStreamW@12 @8 + AVIFileEndRecord@4 @9 + AVIFileExit@0 @10 + AVIFileGetStream@16 @11 + AVIFileInfo@12=AVIFileInfoA@12 @12 + AVIFileInfoA@12 @13 + AVIFileInfoW@12 @14 + AVIFileInit@0 @15 + AVIFileOpen@16=AVIFileOpenA@16 @16 + AVIFileOpenA@16 @17 + AVIFileOpenW@16 @18 + AVIFileReadData@16 @19 + AVIFileRelease@4 @20 + AVIFileWriteData@16 @21 + AVIGetFromClipboard@4 @22 + AVIMakeCompressedStream@16 @23 + AVIMakeFileFromStreams@12 @24 + AVIMakeStreamFromClipboard@12 @25 + AVIPutFileOnClipboard@4 @26 + AVISave=AVISaveA @27 + AVISaveA @28 + AVISaveOptions@20 @29 + AVISaveOptionsFree@8 @30 + AVISaveV@24=AVISaveVA@24 @31 + AVISaveVA@24 @32 + AVISaveVW@24 @33 + AVISaveW @34 + AVIStreamAddRef@4 @35 + AVIStreamBeginStreaming@16 @36 + AVIStreamCreate@16 @37 + AVIStreamEndStreaming@4 @38 + AVIStreamFindSample@12 @39 + AVIStreamGetFrame@8 @40 + AVIStreamGetFrameClose@4 @41 + AVIStreamGetFrameOpen@8 @42 + AVIStreamInfo@12=AVIStreamInfoA@12 @43 + AVIStreamInfoA@12 @44 + AVIStreamInfoW@12 @45 + AVIStreamLength@4 @46 + AVIStreamOpenFromFile@24=AVIStreamOpenFromFileA@24 @47 + AVIStreamOpenFromFileA@24 @48 + AVIStreamOpenFromFileW@24 @49 + AVIStreamRead@28 @50 + AVIStreamReadData@16 @51 + AVIStreamReadFormat@16 @52 + AVIStreamRelease@4 @53 + AVIStreamSampleToTime@8 @54 + AVIStreamSetFormat@16 @55 + AVIStreamStart@4 @56 + AVIStreamTimeToSample@8 @57 + AVIStreamWrite@32 @58 + AVIStreamWriteData@16 @59 + CLSID_AVISimpleUnMarshal @60 DATA + CreateEditableStream@8 @61 + DllCanUnloadNow@0 @62 PRIVATE + DllGetClassObject@12 @63 PRIVATE + DllRegisterServer@0 @64 PRIVATE + DllUnregisterServer@0 @65 PRIVATE + EditStreamClone@8 @66 + EditStreamCopy@16 @67 + EditStreamCut@16 @68 + EditStreamPaste@24 @69 + EditStreamSetInfo@12=EditStreamSetInfoA@12 @70 + EditStreamSetInfoA@12 @71 + EditStreamSetInfoW@12 @72 + EditStreamSetName@8=EditStreamSetNameA@8 @73 + EditStreamSetNameA@8 @74 + EditStreamSetNameW@8 @75 + IID_IAVIEditStream @76 DATA + IID_IAVIFile @77 DATA + IID_IAVIStream @78 DATA + IID_IGetFrame @79 DATA Propchange: branches/cmake-bringup/dll/win32/avifil32/avifil32.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,9 +1,11 @@ set_unicode() -spec2def(batt.dll batt.spec) +add_library(batt SHARED batt.c batt.rc batt.def) -add_library(batt SHARED batt.c batt.rc ${CMAKE_CURRENT_BINARY_DIR}/batt.def) +if(NOT MSVC) + set_source_files_properties(batt.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(batt win32dll) Added: branches/cmake-bringup/dll/win32/batt/batt.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/ba… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/batt.def (added) +++ branches/cmake-bringup/dll/win32/batt/batt.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,6 @@ + +LIBRARY batt.dll + +EXPORTS + BatteryClassCoInstaller@16 @1 + BatteryClassInstall@12 @2 Propchange: branches/cmake-bringup/dll/win32/batt/batt.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,9 +1,11 @@ set_unicode() -spec2def(beepmidi.dll beepmidi.spec) +add_library(beepmidi SHARED beepmidi.c beepmidi.def) -add_library(beepmidi SHARED beepmidi.c ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def) +if(NOT MSVC) + set_source_files_properties(beepmidi.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(beepmidi 0) Added: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def (added) +++ branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,6 @@ + +LIBRARY beepmidi.dll + +EXPORTS + DriverProc@20 @1 + modMessage@20 @2 Propchange: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -4,9 +4,11 @@ # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN add_definitions(-DCARDSTYLE_DEFAULT) -spec2def(cards.dll cards.spec) +add_library(cards SHARED cards.c cards.rc cards.def) -add_library(cards SHARED cards.c cards.rc ${CMAKE_CURRENT_BINARY_DIR}/cards.def) +if(NOT MSVC) + set_source_files_properties(cards.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(cards win32dll) Added: branches/cmake-bringup/dll/win32/cards/cards.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/c… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/cards.def (added) +++ branches/cmake-bringup/dll/win32/cards/cards.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,10 @@ + +LIBRARY cards.dll + +EXPORTS + WEP@4 @1 + cdtAnimate@20 @2 + cdtDraw@24 @3 + cdtDrawExt@32 @4 + cdtInit@8 @5 + cdtTerm@0 @6 Propchange: branches/cmake-bringup/dll/win32/cards/cards.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comcat/… ============================================================================== --- branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comcat/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,12 +1,16 @@ add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(comcat.dll comcat.spec) +add_library(comcat SHARED comcat_main.c version.rc comcat.def) -add_library(comcat SHARED comcat_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/comcat.def) +if(NOT MSVC) + set_source_files_properties(comcat.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_entrypoint(comcat 0) Added: branches/cmake-bringup/dll/win32/comcat/comcat.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comcat/… ============================================================================== --- branches/cmake-bringup/dll/win32/comcat/comcat.def (added) +++ branches/cmake-bringup/dll/win32/comcat/comcat.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,8 @@ + +LIBRARY comcat.dll + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject(a)12=ole32.DllGetClassObject @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE Propchange: branches/cmake-bringup/dll/win32/comcat/comcat.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -3,9 +3,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(compstui.dll compstui.spec) +add_library(compstui SHARED compstui_main.c compstui.def) -add_library(compstui SHARED compstui_main.c ${CMAKE_CURRENT_BINARY_DIR}/compstui.def) +if(NOT MSVC) + set_source_files_properties(compstui.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(compstui win32dll) Added: branches/cmake-bringup/dll/win32/compstui/compstui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/compstui.def (added) +++ branches/cmake-bringup/dll/win32/compstui/compstui.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,8 @@ + +LIBRARY compstui.dll + +EXPORTS + CommonPropertySheetUIA@16 @1 + CommonPropertySheetUIW@16 @2 + GetCPSUIUserData@4 @3 + SetCPSUIUserData@8 @4 Propchange: branches/cmake-bringup/dll/win32/compstui/compstui.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -10,12 +10,14 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) -spec2def(crtdll.dll crtdll.spec) - list(APPEND SOURCE dllmain.c crtdll.rc - ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def) + crtdll.def) + +if(NOT MSVC) + set_source_files_properties(crtdll.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(crtdll SHARED ${CMAKE_CURRENT_BINARY_DIR}/crtdll_precomp.h.gch Added: branches/cmake-bringup/dll/win32/crtdll/crtdll.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/crtdll.def (added) +++ branches/cmake-bringup/dll/win32/crtdll/crtdll.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,530 @@ + +LIBRARY crtdll.dll + +EXPORTS + ??2@YAPAXI@Z=msvcrt.??2@YAPAXI@Z @1 + ??3@YAXPAX@Z=msvcrt.??3@YAXPAX@Z @2 + ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z @3 + _CIacos=msvcrt._CIacos @4 + _CIasin=msvcrt._CIasin @5 + _CIatan=msvcrt._CIatan @6 + _CIatan2=msvcrt._CIatan2 @7 + _CIcos=msvcrt._CIcos @8 + _CIcosh=msvcrt._CIcosh @9 + _CIexp=msvcrt._CIexp @10 + _CIfmod=msvcrt._CIfmod @11 + _CIlog=msvcrt._CIlog @12 + _CIlog10=msvcrt._CIlog10 @13 + _CIpow=msvcrt._CIpow @14 + _CIsin=msvcrt._CIsin @15 + _CIsinh=msvcrt._CIsinh @16 + _CIsqrt=msvcrt._CIsqrt @17 + _CItan=msvcrt._CItan @18 + _CItanh=msvcrt._CItanh @19 + _HUGE_dll=msvcrt._HUGE @20 DATA + _XcptFilter=msvcrt._XcptFilter @21 + __GetMainArgs @22 + __argc_dll=msvcrt.__argc @23 DATA + __argv_dll=msvcrt.__argv @24 DATA + __dllonexit=msvcrt.__dllonexit @25 + __doserrno=msvcrt.__doserrno @26 + __fpecode=msvcrt.__fpecode @27 + __isascii=msvcrt.__isascii @28 + __iscsym=msvcrt.__iscsym @29 + __iscsymf=msvcrt.__iscsymf @30 + __mb_cur_max_dll=msvcrt.__mb_cur_max @31 DATA + __pxcptinfoptrs=msvcrt.__pxcptinfoptrs @32 + __threadhandle=msvcrt.__threadhandle @33 + __threadid=msvcrt.__threadid @34 + __toascii=msvcrt.__toascii @35 + _abnormal_termination=msvcrt._abnormal_termination @36 + _access=msvcrt._access @37 + _acmdln_dll=msvcrt._acmdln @38 DATA + _aexit_rtn_dll=msvcrt._aexit_rtn @39 DATA + _amsg_exit=msvcrt._amsg_exit @40 + _assert=msvcrt._assert @41 + _basemajor_dll=CRTDLL__basemajor_dll @42 DATA + _baseminor_dll=CRTDLL__baseminor_dll @43 DATA + _baseversion_dll=CRTDLL__baseversion_dll @44 DATA + _beep=msvcrt._beep @45 + _beginthread=msvcrt._beginthread @46 + _c_exit=msvcrt._c_exit @47 + _cabs=msvcrt._cabs @48 + _cexit=msvcrt._cexit @49 + _cgets=msvcrt._cgets @50 + _chdir=msvcrt._chdir @51 + _chdrive=msvcrt._chdrive @52 + _chgsign=msvcrt._chgsign @53 + _chmod=msvcrt._chmod @54 + _chsize=msvcrt._chsize @55 + _clearfp=msvcrt._clearfp @56 + _close=msvcrt._close @57 + _commit=msvcrt._commit @58 + _commode_dll=msvcrt._commode @59 DATA + _control87=msvcrt._control87 @60 + _controlfp=msvcrt._controlfp @61 + _copysign=msvcrt._copysign @62 + _cprintf=msvcrt._cprintf @63 + _cpumode_dll=CRTDLL__cpumode_dll @64 DATA + _cputs=msvcrt._cputs @65 + _creat=msvcrt._creat @66 + _cscanf=msvcrt._cscanf @67 + _ctype=msvcrt._ctype @68 DATA + _cwait=msvcrt._cwait @69 + _daylight_dll=msvcrt._daylight @70 DATA + _dup=msvcrt._dup @71 + _dup2=msvcrt._dup2 @72 + _ecvt=msvcrt._ecvt @73 + _endthread=msvcrt._endthread @74 + _environ_dll=msvcrt._environ @75 DATA + _eof=msvcrt._eof @76 + _errno=msvcrt._errno @77 + _except_handler2=msvcrt._except_handler2 @78 + _execl=msvcrt._execl @79 + _execle=msvcrt._execle @80 + _execlp=msvcrt._execlp @81 + _execlpe=msvcrt._execlpe @82 + _execv=msvcrt._execv @83 + _execve=msvcrt._execve @84 + _execvp=msvcrt._execvp @85 + _execvpe=msvcrt._execvpe @86 + _exit=msvcrt._exit @87 + _expand=msvcrt._expand @88 + _fcloseall=msvcrt._fcloseall @89 + _fcvt=msvcrt._fcvt @90 + _fdopen=msvcrt._fdopen @91 + _fgetchar=msvcrt._fgetchar @92 + _fgetwchar=msvcrt._fgetwchar @93 + _filbuf=msvcrt._filbuf @94 + _fileinfo_dll=msvcrt._fileinfo @95 DATA + _filelength=msvcrt._filelength @96 + _fileno=msvcrt._fileno @97 + _findclose=msvcrt._findclose @98 + _findfirst=msvcrt._findfirst @99 + _findnext=msvcrt._findnext @100 + _finite=msvcrt._finite @101 + _flsbuf=msvcrt._flsbuf @102 + _flushall=msvcrt._flushall @103 + _fmode_dll=msvcrt._fmode @104 DATA + _fpclass=msvcrt._fpclass @105 + _fpieee_flt=msvcrt._fpieee_flt @106 + _fpreset=msvcrt._fpreset @107 + _fputchar=msvcrt._fputchar @108 + _fputwchar=msvcrt._fputwchar @109 + _fsopen=msvcrt._fsopen @110 + _fstat=CRTDLL__fstat @111 + _ftime=msvcrt._ftime @112 + _ftol=msvcrt._ftol @113 + _fullpath=msvcrt._fullpath @114 + _futime=msvcrt._futime @115 + _gcvt=msvcrt._gcvt @116 + _get_osfhandle=msvcrt._get_osfhandle @117 + _getch=msvcrt._getch @118 + _getche=msvcrt._getche @119 + _getcwd=msvcrt._getcwd @120 + _getdcwd=msvcrt._getdcwd @121 + _getdiskfree=msvcrt._getdiskfree @122 + _getdllprocaddr=msvcrt._getdllprocaddr @123 + _getdrive=msvcrt._getdrive @124 + _getdrives=msvcrt._getdrives @125 + _getpid=msvcrt._getpid @126 + _getsystime=msvcrt._getsystime @127 + _getw=msvcrt._getw @128 + _global_unwind2=msvcrt._global_unwind2 @129 + _heapchk=msvcrt._heapchk @130 + _heapmin=msvcrt._heapmin @131 + _heapset=msvcrt._heapset @132 + _heapwalk=msvcrt._heapwalk @133 + _hypot=msvcrt._hypot @134 + _initterm=msvcrt._initterm @135 + _iob=msvcrt._iob @136 DATA + _isatty=msvcrt._isatty @137 + _isctype=msvcrt._isctype @138 + _ismbbalnum=msvcrt._ismbbalnum @139 + _ismbbalpha=msvcrt._ismbbalpha @140 + _ismbbgraph=msvcrt._ismbbgraph @141 + _ismbbkalnum=msvcrt._ismbbkalnum @142 + _ismbbkana=msvcrt._ismbbkana @143 + _ismbbkpunct=msvcrt._ismbbkpunct @144 + _ismbblead=msvcrt._ismbblead @145 + _ismbbprint=msvcrt._ismbbprint @146 + _ismbbpunct=msvcrt._ismbbpunct @147 + _ismbbtrail=msvcrt._ismbbtrail @148 + _ismbcalpha=msvcrt._ismbcalpha @149 + _ismbcdigit=msvcrt._ismbcdigit @150 + _ismbchira=msvcrt._ismbchira @151 + _ismbckata=msvcrt._ismbckata @152 + _ismbcl0=msvcrt._ismbcl0 @153 + _ismbcl1=msvcrt._ismbcl1 @154 + _ismbcl2=msvcrt._ismbcl2 @155 + _ismbclegal=msvcrt._ismbclegal @156 + _ismbclower=msvcrt._ismbclower @157 + _ismbcprint=msvcrt._ismbcprint @158 + _ismbcspace=msvcrt._ismbcspace @159 + _ismbcsymbol=msvcrt._ismbcsymbol @160 + _ismbcupper=msvcrt._ismbcupper @161 + _ismbslead=msvcrt._ismbslead @162 + _ismbstrail=msvcrt._ismbstrail @163 + _isnan=msvcrt._isnan @164 + _itoa=msvcrt._itoa @165 + _itow=msvcrt._itow @166 + _j0=msvcrt._j0 @167 + _j1=msvcrt._j1 @168 + _jn=msvcrt._jn @169 + _kbhit=msvcrt._kbhit @170 + _lfind=msvcrt._lfind @171 + _loaddll=msvcrt._loaddll @172 + _local_unwind2=msvcrt._local_unwind2 @173 + _locking=msvcrt._locking @174 + _logb=msvcrt._logb @175 + _lrotl=msvcrt._lrotl @176 + _lrotr=msvcrt._lrotr @177 + _lsearch=msvcrt._lsearch @178 + _lseek=msvcrt._lseek @179 + _ltoa=msvcrt._ltoa @180 + _ltow=msvcrt._ltow @181 + _makepath=msvcrt._makepath @182 + _matherr=msvcrt._matherr @183 + _mbbtombc=msvcrt._mbbtombc @184 + _mbbtype=msvcrt._mbbtype @185 + _mbccpy=msvcrt._mbccpy @186 + _mbcjistojms=msvcrt._mbcjistojms @187 + _mbcjmstojis=msvcrt._mbcjmstojis @188 + _mbclen=msvcrt._mbclen @189 + _mbctohira=msvcrt._mbctohira @190 + _mbctokata=msvcrt._mbctokata @191 + _mbctolower=msvcrt._mbctolower @192 + _mbctombb=msvcrt._mbctombb @193 + _mbctoupper=msvcrt._mbctoupper @194 + _mbctype=msvcrt._mbctype @195 DATA + _mbsbtype=msvcrt._mbsbtype @196 + _mbscat=msvcrt._mbscat @197 + _mbschr=msvcrt._mbschr @198 + _mbscmp=msvcrt._mbscmp @199 + _mbscpy=msvcrt._mbscpy @200 + _mbscspn=msvcrt._mbscspn @201 + _mbsdec=msvcrt._mbsdec @202 + _mbsdup=msvcrt._mbsdup @203 + _mbsicmp=msvcrt._mbsicmp @204 + _mbsinc=msvcrt._mbsinc @205 + _mbslen=msvcrt._mbslen @206 + _mbslwr=msvcrt._mbslwr @207 + _mbsnbcat=msvcrt._mbsnbcat @208 + _mbsnbcmp=msvcrt._mbsnbcmp @209 + _mbsnbcnt=msvcrt._mbsnbcnt @210 + _mbsnbcpy=msvcrt._mbsnbcpy @211 + _mbsnbicmp=msvcrt._mbsnbicmp @212 + _mbsnbset=msvcrt._mbsnbset @213 + _mbsncat=msvcrt._mbsncat @214 + _mbsnccnt=msvcrt._mbsnccnt @215 + _mbsncmp=msvcrt._mbsncmp @216 + _mbsncpy=msvcrt._mbsncpy @217 + _mbsnextc=msvcrt._mbsnextc @218 + _mbsnicmp=msvcrt._mbsnicmp @219 + _mbsninc=msvcrt._mbsninc @220 + _mbsnset=msvcrt._mbsnset @221 + _mbspbrk=msvcrt._mbspbrk @222 + _mbsrchr=msvcrt._mbsrchr @223 + _mbsrev=msvcrt._mbsrev @224 + _mbsset=msvcrt._mbsset @225 + _mbsspn=msvcrt._mbsspn @226 + _mbsspnp=msvcrt._mbsspnp @227 + _mbsstr=msvcrt._mbsstr @228 + _mbstok=msvcrt._mbstok @229 + _mbstrlen=msvcrt._mbstrlen @230 + _mbsupr=msvcrt._mbsupr @231 + _memccpy=msvcrt._memccpy @232 + _memicmp=msvcrt._memicmp @233 + _mkdir=msvcrt._mkdir @234 + _mktemp=msvcrt._mktemp @235 + _msize=msvcrt._msize @236 + _nextafter=msvcrt._nextafter @237 + _onexit=msvcrt._onexit @238 + _open=msvcrt._open @239 + _open_osfhandle=msvcrt._open_osfhandle @240 + _osmajor_dll=CRTDLL__osmajor_dll @241 DATA + _osminor_dll=CRTDLL__osminor_dll @242 DATA + _osmode_dll=CRTDLL__osmode_dll @243 DATA + _osver_dll=msvcrt._osver @244 DATA + _osversion_dll=CRTDLL__osversion_dll @245 DATA + _pclose=msvcrt._pclose @246 + _pctype_dll=msvcrt._pctype @247 DATA + _pgmptr_dll=msvcrt._pgmptr @248 DATA + _pipe=msvcrt._pipe @249 + _popen=msvcrt._popen @250 + _purecall=msvcrt._purecall @251 + _putch=msvcrt._putch @252 + _putenv=msvcrt._putenv @253 + _putw=msvcrt._putw @254 + _pwctype_dll=msvcrt._pwctype @255 DATA + _read=msvcrt._read @256 + _rmdir=msvcrt._rmdir @257 + _rmtmp=msvcrt._rmtmp @258 + _rotl=msvcrt._rotl @259 + _rotr=msvcrt._rotr @260 + _scalb=msvcrt._scalb @261 + _searchenv=msvcrt._searchenv @262 + _seterrormode=msvcrt._seterrormode @263 + _setjmp=msvcrt._setjmp @264 + _setmode=msvcrt._setmode @265 + _setsystime=msvcrt._setsystime @266 + _sleep=msvcrt._sleep @267 + _snprintf=msvcrt._snprintf @268 + _snwprintf=msvcrt._snwprintf @269 + _sopen=msvcrt._sopen @270 + _spawnl=msvcrt._spawnl @271 + _spawnle=msvcrt._spawnle @272 + _spawnlp=msvcrt._spawnlp @273 + _spawnlpe=msvcrt._spawnlpe @274 + _spawnv=msvcrt._spawnv @275 + _spawnve=msvcrt._spawnve @276 + _spawnvp=msvcrt._spawnvp @277 + _spawnvpe=msvcrt._spawnvpe @278 + _splitpath=msvcrt._splitpath @279 + _stat=CRTDLL__stat @280 + _statusfp=msvcrt._statusfp @281 + _strcmpi=msvcrt._strcmpi @282 + _strdate=msvcrt._strdate @283 + _strdec @284 + _strdup=msvcrt._strdup @285 + _strerror=msvcrt._strerror @286 + _stricmp=msvcrt._stricmp @287 + _stricoll=msvcrt._stricoll @288 + _strinc @289 + _strlwr=msvcrt._strlwr @290 + _strncnt @291 + _strnextc @292 + _strnicmp=msvcrt._strnicmp @293 + _strninc @294 + _strnset=msvcrt._strnset @295 + _strrev=msvcrt._strrev @296 + _strset=msvcrt._strset @297 + _strspnp @298 + _strtime=msvcrt._strtime @299 + _strupr=msvcrt._strupr @300 + _swab=msvcrt._swab @301 + _sys_errlist=msvcrt._sys_errlist @302 DATA + _sys_nerr_dll=msvcrt._sys_nerr @303 DATA + _tell=msvcrt._tell @304 + _tempnam=msvcrt._tempnam @305 + _timezone_dll=msvcrt._timezone @306 DATA + _tolower=msvcrt._tolower @307 + _toupper=msvcrt._toupper @308 + _tzname=msvcrt._tzname @309 DATA + _tzset=msvcrt._tzset @310 + _ultoa=msvcrt._ultoa @311 + _ultow=msvcrt._ultow @312 + _umask=msvcrt._umask @313 + _ungetch=msvcrt._ungetch @314 + _unlink=msvcrt._unlink @315 + _unloaddll=msvcrt._unloaddll @316 + _utime=msvcrt._utime @317 + _vsnprintf=msvcrt._vsnprintf @318 + _vsnwprintf=msvcrt._vsnwprintf @319 + _wcsdup=msvcrt._wcsdup @320 + _wcsicmp=msvcrt._wcsicmp @321 + _wcsicoll=msvcrt._wcsicoll @322 + _wcslwr=msvcrt._wcslwr @323 + _wcsnicmp=msvcrt._wcsnicmp @324 + _wcsnset=msvcrt._wcsnset @325 + _wcsrev=msvcrt._wcsrev @326 + _wcsset=msvcrt._wcsset @327 + _wcsupr=msvcrt._wcsupr @328 + _winmajor_dll=msvcrt._winmajor @329 DATA + _winminor_dll=msvcrt._winminor @330 DATA + _winver_dll=msvcrt._winver @331 DATA + _write=msvcrt._write @332 + _wtoi=msvcrt._wtoi @333 + _wtol=msvcrt._wtol @334 + _y0=msvcrt._y0 @335 + _y1=msvcrt._y1 @336 + _yn=msvcrt._yn @337 + abort=msvcrt.abort @338 + abs=msvcrt.abs @339 + acos=msvcrt.acos @340 + asctime=msvcrt.asctime @341 + asin=msvcrt.asin @342 + atan=msvcrt.atan @343 + atan2=msvcrt.atan2 @344 + atexit=msvcrt.atexit @345 + atof=msvcrt.atof @346 + atoi=msvcrt.atoi @347 + atol=msvcrt.atol @348 + bsearch=msvcrt.bsearch @349 + calloc=msvcrt.calloc @350 + ceil=msvcrt.ceil @351 + clearerr=msvcrt.clearerr @352 + clock=msvcrt.clock @353 + cos=msvcrt.cos @354 + cosh=msvcrt.cosh @355 + ctime=msvcrt.ctime @356 + difftime=msvcrt.difftime @357 + div=msvcrt.div @358 + exit=msvcrt.exit @359 + exp=msvcrt.exp @360 + fabs=msvcrt.fabs @361 + fclose=msvcrt.fclose @362 + feof=msvcrt.feof @363 + ferror=msvcrt.ferror @364 + fflush=msvcrt.fflush @365 + fgetc=msvcrt.fgetc @366 + fgetpos=msvcrt.fgetpos @367 + fgets=msvcrt.fgets @368 + fgetwc=msvcrt.fgetwc @369 + floor=msvcrt.floor @370 + fmod=msvcrt.fmod @371 + fopen=msvcrt.fopen @372 + fprintf=msvcrt.fprintf @373 + fputc=msvcrt.fputc @374 + fputs=msvcrt.fputs @375 + fputwc=msvcrt.fputwc @376 + fread=msvcrt.fread @377 + free=msvcrt.free @378 + freopen=msvcrt.freopen @379 + frexp=msvcrt.frexp @380 + fscanf=msvcrt.fscanf @381 + fseek=msvcrt.fseek @382 + fsetpos=msvcrt.fsetpos @383 + ftell=msvcrt.ftell @384 + fwprintf=msvcrt.fwprintf @385 + fwrite=msvcrt.fwrite @386 + fwscanf=msvcrt.fwscanf @387 + getc=msvcrt.getc @388 + getchar=msvcrt.getchar @389 + getenv=msvcrt.getenv @390 + gets=msvcrt.gets @391 + gmtime=msvcrt.gmtime @392 + is_wctype=msvcrt.is_wctype @393 + isalnum=msvcrt.isalnum @394 + isalpha=msvcrt.isalpha @395 + iscntrl=msvcrt.iscntrl @396 + isdigit=msvcrt.isdigit @397 + isgraph=msvcrt.isgraph @398 + isleadbyte=msvcrt.isleadbyte @399 + islower=msvcrt.islower @400 + isprint=msvcrt.isprint @401 + ispunct=msvcrt.ispunct @402 + isspace=msvcrt.isspace @403 + isupper=msvcrt.isupper @404 + iswalnum=msvcrt.iswalnum @405 + iswalpha=msvcrt.iswalpha @406 + iswascii=msvcrt.iswascii @407 + iswcntrl=msvcrt.iswcntrl @408 + iswctype=msvcrt.iswctype @409 + iswdigit=msvcrt.iswdigit @410 + iswgraph=msvcrt.iswgraph @411 + iswlower=msvcrt.iswlower @412 + iswprint=msvcrt.iswprint @413 + iswpunct=msvcrt.iswpunct @414 + iswspace=msvcrt.iswspace @415 + iswupper=msvcrt.iswupper @416 + iswxdigit=msvcrt.iswxdigit @417 + isxdigit=msvcrt.isxdigit @418 + labs=msvcrt.labs @419 + ldexp=msvcrt.ldexp @420 + ldiv=msvcrt.ldiv @421 + localeconv=msvcrt.localeconv @422 + localtime=msvcrt.localtime @423 + log=msvcrt.log @424 + log10=msvcrt.log10 @425 + longjmp=msvcrt.longjmp @426 + malloc=msvcrt.malloc @427 + mblen=msvcrt.mblen @428 + mbstowcs=msvcrt.mbstowcs @429 + mbtowc=msvcrt.mbtowc @430 + memchr=msvcrt.memchr @431 + memcmp=msvcrt.memcmp @432 + memcpy=msvcrt.memcpy @433 + memmove=msvcrt.memmove @434 + memset=msvcrt.memset @435 + mktime=msvcrt.mktime @436 + modf=msvcrt.modf @437 + perror=msvcrt.perror @438 + pow=msvcrt.pow @439 + printf=msvcrt.printf @440 + putc=msvcrt.putc @441 + putchar=msvcrt.putchar @442 + puts=msvcrt.puts @443 + qsort=msvcrt.qsort @444 + raise=msvcrt.raise @445 + rand=msvcrt.rand @446 + realloc=msvcrt.realloc @447 + remove=msvcrt.remove @448 + rename=msvcrt.rename @449 + rewind=msvcrt.rewind @450 + scanf=msvcrt.scanf @451 + setbuf=msvcrt.setbuf @452 + setlocale=msvcrt.setlocale @453 + setvbuf=msvcrt.setvbuf @454 + signal=msvcrt.signal @455 + sin=msvcrt.sin @456 + sinh=msvcrt.sinh @457 + sprintf=msvcrt.sprintf @458 + sqrt=msvcrt.sqrt @459 + srand=msvcrt.srand @460 + sscanf=msvcrt.sscanf @461 + strcat=msvcrt.strcat @462 + strchr=msvcrt.strchr @463 + strcmp=msvcrt.strcmp @464 + strcoll=msvcrt.strcoll @465 + strcpy=msvcrt.strcpy @466 + strcspn=msvcrt.strcspn @467 + strerror=msvcrt.strerror @468 + strftime=msvcrt.strftime @469 + strlen=msvcrt.strlen @470 + strncat=msvcrt.strncat @471 + strncmp=msvcrt.strncmp @472 + strncpy=msvcrt.strncpy @473 + strpbrk=msvcrt.strpbrk @474 + strrchr=msvcrt.strrchr @475 + strspn=msvcrt.strspn @476 + strstr=msvcrt.strstr @477 + strtod=msvcrt.strtod @478 + strtok=msvcrt.strtok @479 + strtol=msvcrt.strtol @480 + strtoul=msvcrt.strtoul @481 + strxfrm=msvcrt.strxfrm @482 + swprintf=msvcrt.swprintf @483 + swscanf=msvcrt.swscanf @484 + system=msvcrt.system @485 + tan=msvcrt.tan @486 + tanh=msvcrt.tanh @487 + time=msvcrt.time @488 + tmpfile=msvcrt.tmpfile @489 + tmpnam=msvcrt.tmpnam @490 + tolower=msvcrt.tolower @491 + toupper=msvcrt.toupper @492 + towlower=msvcrt.towlower @493 + towupper=msvcrt.towupper @494 + ungetc=msvcrt.ungetc @495 + ungetwc=msvcrt.ungetwc @496 + vfprintf=msvcrt.vfprintf @497 + vfwprintf=msvcrt.vfwprintf @498 + vprintf=msvcrt.vprintf @499 + vsprintf=msvcrt.vsprintf @500 + vswprintf=msvcrt.vswprintf @501 + vwprintf=msvcrt.vwprintf @502 + wcscat=msvcrt.wcscat @503 + wcschr=msvcrt.wcschr @504 + wcscmp=msvcrt.wcscmp @505 + wcscoll=msvcrt.wcscoll @506 + wcscpy=msvcrt.wcscpy @507 + wcscspn=msvcrt.wcscspn @508 + wcsftime=msvcrt.wcsftime @509 + wcslen=msvcrt.wcslen @510 + wcsncat=msvcrt.wcsncat @511 + wcsncmp=msvcrt.wcsncmp @512 + wcsncpy=msvcrt.wcsncpy @513 + wcspbrk=msvcrt.wcspbrk @514 + wcsrchr=msvcrt.wcsrchr @515 + wcsspn=msvcrt.wcsspn @516 + wcsstr=msvcrt.wcsstr @517 + wcstod=msvcrt.wcstod @518 + wcstok=msvcrt.wcstok @519 + wcstol=msvcrt.wcstol @520 + wcstombs=msvcrt.wcstombs @521 + wcstoul=msvcrt.wcstoul @522 + wcsxfrm=msvcrt.wcsxfrm @523 + wctomb=msvcrt.wctomb @524 + wprintf=msvcrt.wprintf @525 + wscanf=msvcrt.wscanf @526 Propchange: branches/cmake-bringup/dll/win32/crtdll/crtdll.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -3,8 +3,6 @@ add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DLANGPACK) - -spec2def(gdi32.dll gdi32.spec) include_directories(include) @@ -39,7 +37,11 @@ objects/utils.c objects/path.c gdi32.rc - ${CMAKE_CURRENT_BINARY_DIR}/gdi32.def) + gdi32.def) + +if(NOT MSVC) + set_source_files_properties(gdi32.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() add_library(gdi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/gdi32_precomp.h.gch Modified: branches/cmake-bringup/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/g… ============================================================================== --- branches/cmake-bringup/dll/win32/gdi32/gdi32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/gdi32/gdi32.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -2,613 +2,613 @@ LIBRARY gdi32.dll EXPORTS - AbortDoc - AbortPath - AddFontMemResourceEx - AddFontResourceA - AddFontResourceExA - AddFontResourceExW - AddFontResourceTracking - AddFontResourceW - AngleArc - AnimatePalette - AnyLinkedFonts=NtGdiAnyLinkedFonts - Arc - ArcTo - BRUSHOBJ_hGetColorTransform=NtGdiBRUSHOBJ_hGetColorTransform - BRUSHOBJ_pvAllocRbrush=NtGdiBRUSHOBJ_pvAllocRbrush - BRUSHOBJ_pvGetRbrush=NtGdiBRUSHOBJ_pvGetRbrush - BRUSHOBJ_ulGetBrushColor=NtGdiBRUSHOBJ_ulGetBrushColor - BeginPath - BitBlt - CLIPOBJ_bEnum=NtGdiCLIPOBJ_bEnum - CLIPOBJ_cEnumStart=NtGdiCLIPOBJ_cEnumStart - CLIPOBJ_ppoGetPath=NtGdiCLIPOBJ_ppoGetPath - CancelDC - CheckColorsInGamut - ChoosePixelFormat - Chord - ClearBitmapAttributes - ClearBrushAttributes - CloseEnhMetaFile - CloseFigure - CloseMetaFile - ColorCorrectPalette - ColorMatchToTarget - CombineRgn - CombineTransform=NtGdiCombineTransform - CopyEnhMetaFileA - CopyEnhMetaFileW - CopyMetaFileA - CopyMetaFileW - CreateBitmap - CreateBitmapIndirect - CreateBrushIndirect - CreateColorSpaceA - CreateColorSpaceW - CreateCompatibleBitmap - CreateCompatibleDC - CreateDCA - CreateDCW - CreateDIBPatternBrush - CreateDIBPatternBrushPt - CreateDIBSection - CreateDIBitmap - CreateDiscardableBitmap - CreateEllipticRgn=NtGdiCreateEllipticRgn - CreateEllipticRgnIndirect - CreateEnhMetaFileA - CreateEnhMetaFileW - CreateFontA - CreateFontIndirectA - CreateFontIndirectExA - CreateFontIndirectExW - CreateFontIndirectW - CreateFontW - CreateHalftonePalette=NtGdiCreateHalftonePalette - CreateHatchBrush - CreateICA - CreateICW - CreateMetaFileA - CreateMetaFileW - CreatePalette - CreatePatternBrush - CreatePen - CreatePenIndirect - CreatePolyPolygonRgn - CreatePolygonRgn - CreateRectRgn - CreateRectRgnIndirect - CreateRoundRectRgn=NtGdiCreateRoundRectRgn - CreateScalableFontResourceA - CreateScalableFontResourceW - CreateSolidBrush - DPtoLP - DdEntry0=NtGdiDxgGenericThunk - DdEntry10=NtGdiDdBeginMoCompFrame - DdEntry11=NtGdiDdBlt - DdEntry12=NtGdiDdCanCreateSurface - DdEntry13=NtGdiDdCanCreateD3DBuffer - DdEntry14=NtGdiDdColorControl - DdEntry15=NtGdiDdCreateDirectDrawObject - DdEntry16=NtGdiDdCreateSurface - DdEntry17=NtGdiDdCreateD3DBuffer - DdEntry18=NtGdiDdCreateMoComp - DdEntry19=NtGdiDdCreateSurfaceObject - DdEntry1=NtGdiD3dContextCreate - DdEntry20=NtGdiDdDeleteDirectDrawObject - DdEntry21=NtGdiDdDeleteSurfaceObject - DdEntry22=NtGdiDdDestroyMoComp - DdEntry23=NtGdiDdDestroySurface - DdEntry24=NtGdiDdDestroyD3DBuffer - DdEntry25=NtGdiDdEndMoCompFrame - DdEntry26=NtGdiDdFlip - DdEntry27=NtGdiDdFlipToGDISurface - DdEntry28=NtGdiDdGetAvailDriverMemory - DdEntry29=NtGdiDdGetBltStatus - DdEntry2=NtGdiD3dContextDestroy - DdEntry30=NtGdiDdGetDC - DdEntry31=NtGdiDdGetDriverInfo - DdEntry32=NtGdiDdGetDxHandle - DdEntry33=NtGdiDdGetFlipStatus - DdEntry34=NtGdiDdGetInternalMoCompInfo - DdEntry35=NtGdiDdGetMoCompBuffInfo - DdEntry36=NtGdiDdGetMoCompGuids - DdEntry37=NtGdiDdGetMoCompFormats - DdEntry38=NtGdiDdGetScanLine - DdEntry39=NtGdiDdLock - DdEntry3=NtGdiD3dContextDestroyAll - DdEntry40=NtGdiDdLockD3D - DdEntry41=NtGdiDdQueryDirectDrawObject - DdEntry42=NtGdiDdQueryMoCompStatus - DdEntry43=NtGdiDdReenableDirectDrawObject - DdEntry44=NtGdiDdReleaseDC - DdEntry45=NtGdiDdRenderMoComp - DdEntry46=NtGdiDdResetVisrgn - DdEntry47=NtGdiDdSetColorKey - DdEntry48=NtGdiDdSetExclusiveMode - DdEntry49=NtGdiDdSetGammaRamp - DdEntry4=NtGdiD3dValidateTextureStageState - DdEntry50=NtGdiDdCreateSurfaceEx - DdEntry51=NtGdiDdSetOverlayPosition - DdEntry52=NtGdiDdUnattachSurface - DdEntry53=NtGdiDdUnlock - DdEntry54=NtGdiDdUnlockD3D - DdEntry55=NtGdiDdUpdateOverlay - DdEntry56=NtGdiDdWaitForVerticalBlank - DdEntry5=NtGdiD3dDrawPrimitives2 - DdEntry6=NtGdiDdGetDriverState - DdEntry7=NtGdiDdAddAttachedSurface - DdEntry8=NtGdiDdAlphaBlt - DdEntry9=NtGdiDdAttachSurface - DeleteColorSpace=NtGdiDeleteColorSpace - DeleteDC - DeleteEnhMetaFile - DeleteMetaFile - DeleteObject - DescribePixelFormat - DeviceCapabilitiesExA - DeviceCapabilitiesExW - DrawEscape - Ellipse - EnableEUDC=NtGdiEnableEudc - EndDoc - EndFormPage - EndPage - EndPath - EngAcquireSemaphore - EngAlphaBlend=NtGdiEngAlphaBlend - EngAssociateSurface=NtGdiEngAssociateSurface - EngBitBlt=NtGdiEngBitBlt - EngCheckAbort=NtGdiEngCheckAbort - EngComputeGlyphSet - EngCopyBits=NtGdiEngCopyBits - EngCreateBitmap=NtGdiEngCreateBitmap - EngCreateClip=NtGdiEngCreateClip - EngCreateDeviceBitmap=NtGdiEngCreateDeviceBitmap - EngCreateDeviceSurface=NtGdiEngCreateDeviceSurface - EngCreatePalette=NtGdiEngCreatePalette - EngCreateSemaphore - EngDeleteClip=NtGdiEngDeleteClip - EngDeletePalette=NtGdiEngDeletePalette - EngDeletePath=NtGdiEngDeletePath - EngDeleteSemaphore - EngDeleteSurface=NtGdiEngDeleteSurface - EngEraseSurface=NtGdiEngEraseSurface - EngFillPath=NtGdiEngFillPath - EngFindResource - EngFreeModule - EngGetCurrentCodePage - EngGetDriverName - EngGetPrinterDataFileName - EngGradientFill=NtGdiEngGradientFill - EngLineTo=NtGdiEngLineTo - EngLoadModule - EngLockSurface=NtGdiEngLockSurface - EngMarkBandingSurface=NtGdiEngMarkBandingSurface - EngMultiByteToUnicodeN=RtlMultiByteToUnicodeN - EngMultiByteToWideChar - EngPaint=NtGdiEngPaint - EngPlgBlt=NtGdiEngPlgBlt - EngQueryEMFInfo - EngQueryLocalTime - EngReleaseSemaphore - EngStretchBlt=NtGdiEngStretchBlt - EngStretchBltROP=NtGdiEngStretchBltROP - EngStrokeAndFillPath=NtGdiEngStrokeAndFillPath - EngStrokePath=NtGdiEngStrokePath - EngTextOut=NtGdiEngTextOut - EngTransparentBlt=NtGdiEngTransparentBlt - EngUnicodeToMultiByteN=RtlUnicodeToMultiByteN - EngUnlockSurface=NtGdiEngUnlockSurface - EngWideCharToMultiByte - EnumEnhMetaFile - EnumFontFamiliesA - EnumFontFamiliesExA - EnumFontFamiliesExW - EnumFontFamiliesW - EnumFontsA - EnumFontsW - EnumICMProfilesA - EnumICMProfilesW - EnumMetaFile - EnumObjects - EqualRgn=NtGdiEqualRgn - Escape - EudcLoadLinkW - EudcUnloadLinkW - ExcludeClipRect - ExtCreatePen - ExtCreateRegion - ExtEscape - ExtFloodFill - ExtSelectClipRgn - ExtTextOutA - ExtTextOutW - FONTOBJ_cGetAllGlyphHandles=NtGdiFONTOBJ_cGetAllGlyphHandles - FONTOBJ_cGetGlyphs=NtGdiFONTOBJ_cGetGlyphs - FONTOBJ_pQueryGlyphAttrs=NtGdiFONTOBJ_pQueryGlyphAttrs - FONTOBJ_pfdg=NtGdiFONTOBJ_pfdg - FONTOBJ_pifi=NtGdiFONTOBJ_pifi - FONTOBJ_pvTrueTypeFontFile=NtGdiFONTOBJ_pvTrueTypeFontFile - FONTOBJ_pxoGetXform=NtGdiFONTOBJ_pxoGetXform - FONTOBJ_vGetInfo=NtGdiFONTOBJ_vGetInfo - FillPath - FillRgn - FixBrushOrgEx - FlattenPath - FloodFill - FontIsLinked=NtGdiFontIsLinked - FrameRgn - GdiAddFontResourceW - GdiAddGlsBounds - GdiAddGlsRecord - GdiAlphaBlend - GdiArtificialDecrementDriver - GdiCleanCacheDC - GdiComment - GdiConsoleTextOut=NtGdiConsoleTextOut - GdiConvertAndCheckDC - GdiConvertBitmap - GdiConvertBitmapV5 - GdiConvertBrush - GdiConvertDC - GdiConvertEnhMetaFile - GdiConvertFont - GdiConvertMetaFilePict - GdiConvertPalette - GdiConvertRegion - GdiConvertToDevmodeW - GdiCreateLocalEnhMetaFile - GdiCreateLocalMetaFilePict - GdiDeleteLocalDC - GdiDeleteSpoolFileHandle - GdiDescribePixelFormat=NtGdiDescribePixelFormat - GdiDllInitialize - GdiDrawStream - GdiEndDocEMF - GdiEndPageEMF - GdiEntry10 - GdiEntry11 - GdiEntry12 - GdiEntry13 - GdiEntry14 - GdiEntry15 - GdiEntry16 - GdiEntry1 - GdiEntry2 - GdiEntry3 - GdiEntry4 - GdiEntry5 - GdiEntry6 - GdiEntry7 - GdiEntry8 - GdiEntry9 - GdiFixUpHandle - GdiFlush - GdiFullscreenControl=NtGdiFullscreenControl - GdiGetBatchLimit - GdiGetBitmapBitsSize - GdiGetCharDimensions - GdiGetCodePage - GdiGetDC - GdiGetDevmodeForPage - GdiGetLocalBrush - GdiGetLocalDC - GdiGetLocalFont - GdiGetPageCount - GdiGetPageHandle - GdiGetSpoolFileHandle - GdiGetSpoolMessage=NtGdiGetSpoolMessage - GdiGradientFill - GdiInitSpool=NtGdiInitSpool - GdiInitializeLanguagePack - GdiIsMetaFileDC - GdiIsMetaPrintDC - GdiIsPlayMetafileDC - GdiPlayDCScript - GdiPlayEMF - GdiPlayJournal - GdiPlayPageEMF - GdiPlayPrivatePageEMF - GdiPlayScript - GdiPrinterThunk - GdiProcessSetup - GdiQueryFonts=NtGdiQueryFonts - GdiQueryTable - GdiRealizationInfo - GdiReleaseDC - GdiReleaseLocalDC - GdiResetDCEMF - GdiSetAttrs - GdiSetBatchLimit - GdiSetLastError - GdiSetPixelFormat=NtGdiSetPixelFormat - GdiSetServerAttr - GdiStartDocEMF - GdiStartPageEMF - GdiSwapBuffers=NtGdiSwapBuffers - GdiTransparentBlt - GdiValidateHandle - GetArcDirection - GetAspectRatioFilterEx - GetBitmapAttributes - GetBitmapBits=NtGdiGetBitmapBits - GetBitmapDimensionEx=NtGdiGetBitmapDimension - GetBkColor - GetBkMode - GetBoundsRect - GetBrushAttributes - GetBrushOrgEx - GetCharABCWidthsA - GetCharABCWidthsFloatA - GetCharABCWidthsFloatW - GetCharABCWidthsI - GetCharABCWidthsW - GetCharWidth32A - GetCharWidth32W - GetCharWidthA=GetCharWidth32A - GetCharWidthFloatA - GetCharWidthFloatW - GetCharWidthI - GetCharWidthInfo=NtGdiGetCharWidthInfo - GetCharWidthW - GetCharacterPlacementA - GetCharacterPlacementW - GetClipBox - GetClipRgn - GetColorAdjustment=NtGdiGetColorAdjustment - GetColorSpace - GetCurrentObject - GetCurrentPositionEx - GetDCBrushColor - GetDCOrgEx - GetDCPenColor - GetDIBColorTable - GetDIBits - GetDeviceCaps - GetDeviceGammaRamp - GetETM - GetEUDCTimeStamp - GetEUDCTimeStampExW - GetEnhMetaFileA - GetEnhMetaFileBits - GetEnhMetaFileDescriptionA - GetEnhMetaFileDescriptionW - GetEnhMetaFileHeader - GetEnhMetaFilePaletteEntries - GetEnhMetaFilePixelFormat - GetEnhMetaFileW - GetFontAssocStatus - GetFontData - GetFontLanguageInfo - GetFontResourceInfoW - GetFontUnicodeRanges=NtGdiGetFontUnicodeRanges - GetGlyphIndicesA - GetGlyphIndicesW=NtGdiGetGlyphIndicesW - GetGlyphOutline=GetGlyphOutlineA - GetGlyphOutlineA - GetGlyphOutlineW - GetGlyphOutlineWow - GetGraphicsMode - GetHFONT - GetICMProfileA - GetICMProfileW - GetKerningPairs=GetKerningPairsA - GetKerningPairsA - GetKerningPairsW - GetLayout - GetLogColorSpaceA - GetLogColorSpaceW - GetMapMode - GetMetaFileA - GetMetaFileBitsEx - GetMetaFileW - GetMetaRgn - GetMiterLimit=NtGdiGetMiterLimit - GetNearestColor=NtGdiGetNearestColor - GetNearestPaletteIndex=NtGdiGetNearestPaletteIndex - GetObjectA - GetObjectType - GetObjectW - GetOutlineTextMetricsA - GetOutlineTextMetricsW - GetPaletteEntries - GetPath - GetPixel - GetPixelFormat - GetPolyFillMode - GetROP2 - GetRandomRgn=NtGdiGetRandomRgn - GetRasterizerCaps=NtGdiGetRasterizerCaps - GetRegionData - GetRelAbs - GetRgnBox - GetStockObject - GetStretchBltMode - GetStringBitmapA - GetStringBitmapW - GetSystemPaletteEntries - GetSystemPaletteUse=NtGdiGetSystemPaletteUse - GetTextAlign - GetTextCharacterExtra - GetTextCharset - GetTextCharsetInfo=NtGdiGetTextCharsetInfo - GetTextColor - GetTextExtentExPointA - GetTextExtentExPointI - GetTextExtentExPointW - GetTextExtentExPointWPri - GetTextExtentPoint32A - GetTextExtentPoint32W - GetTextExtentPointA - GetTextExtentPointI - GetTextExtentPointW - GetTextFaceA - GetTextFaceAliasW - GetTextFaceW - GetTextMetricsA - GetTextMetricsW - GetTransform=NtGdiGetTransform - GetViewportExtEx - GetViewportOrgEx - GetWinMetaFileBits - GetWindowExtEx - GetWindowOrgEx - GetWorldTransform - HT_Get8BPPFormatPalette=NtGdiHT_Get8BPPFormatPalette - HT_Get8BPPMaskPalette=NtGdiHT_Get8BPPMaskPalette - IntersectClipRect - InvertRgn - IsValidEnhMetaRecord - IsValidEnhMetaRecordOffExt - LPtoDP - LineDDA - LineTo - MaskBlt - MirrorRgn - ModifyWorldTransform - MoveToEx - NamedEscape - OffsetClipRgn - OffsetRgn - OffsetViewportOrgEx - OffsetWindowOrgEx - PATHOBJ_bEnum=NtGdiPATHOBJ_bEnum - PATHOBJ_bEnumClipLines=NtGdiPATHOBJ_bEnumClipLines - PATHOBJ_vEnumStart=NtGdiPATHOBJ_vEnumStart - PATHOBJ_vEnumStartClipLines=NtGdiPATHOBJ_vEnumStartClipLines - PATHOBJ_vGetBounds=NtGdiPATHOBJ_vGetBounds - PaintRgn - PatBlt - PathToRegion - Pie - PlayEnhMetaFile - PlayEnhMetaFileRecord - PlayMetaFile - PlayMetaFileRecord - PlgBlt - PolyBezier - PolyBezierTo - PolyDraw - PolyPatBlt - PolyPolygon - PolyPolyline - PolyTextOutA - PolyTextOutW - Polygon - Polyline - PolylineTo - PtInRegion - PtVisible=NtGdiPtVisible - QueryFontAssocStatus - RealizePalette - RectInRegion - RectVisible=NtGdiRectVisible - Rectangle - RemoveFontMemResourceEx - RemoveFontResourceA - RemoveFontResourceExA - RemoveFontResourceExW - RemoveFontResourceTracking - RemoveFontResourceW - ResetDCA - ResetDCW - ResizePalette - RestoreDC - RoundRect - STROBJ_bEnum=NtGdiSTROBJ_bEnum - STROBJ_bEnumPositionsOnly=NtGdiSTROBJ_bEnumPositionsOnly - STROBJ_bGetAdvanceWidths=NtGdiSTROBJ_bGetAdvanceWidths - STROBJ_dwGetCodePage=NtGdiSTROBJ_dwGetCodePage - STROBJ_vEnumStart=NtGdiSTROBJ_vEnumStart - SaveDC - ScaleViewportExtEx - ScaleWindowExtEx - SelectBrushLocal - SelectClipPath - SelectClipRgn - SelectFontLocal - SelectObject - SelectPalette - SetAbortProc - SetArcDirection - SetBitmapAttributes - SetBitmapBits=NtGdiSetBitmapBits - SetBitmapDimensionEx=NtGdiSetBitmapDimension - SetBkColor - SetBkMode - SetBoundsRect - SetBrushAttributes - SetBrushOrgEx - SetColorAdjustment - SetColorSpace - SetDCBrushColor - SetDCPenColor - SetDIBColorTable - SetDIBits - SetDIBitsToDevice - SetDeviceGammaRamp - SetEnhMetaFileBits - SetFontEnumeration=NtGdiSetFontEnumeration - SetGraphicsMode - SetICMMode - SetICMProfileA - SetICMProfileW - SetLayout - SetLayoutWidth - SetMagicColors=NtGdiSetMagicColors - SetMapMode - SetMapperFlags - SetMetaFileBitsEx - SetMetaRgn - SetMiterLimit - SetPaletteEntries - SetPixel - SetPixelFormat - SetPixelV - SetPolyFillMode - SetROP2 - SetRectRgn - SetRelAbs - SetStretchBltMode - SetSystemPaletteUse=NtGdiSetSystemPaletteUse - SetTextAlign - SetTextCharacterExtra - SetTextColor - SetTextJustification - SetViewportExtEx - SetViewportOrgEx - SetVirtualResolution=NtGdiSetVirtualResolution - SetWinMetaFileBits - SetWindowExtEx - SetWindowOrgEx - SetWorldTransform - StartDocA - StartDocW - StartFormPage - StartPage - StretchBlt - StretchDIBits - StrokeAndFillPath - StrokePath - SwapBuffers - TextOutA - TextOutW - TranslateCharsetInfo - UnloadNetworkFonts - UnrealizeObject - UpdateColors - UpdateICMRegKeyA - UpdateICMRegKeyW - WidenPath - XFORMOBJ_bApplyXform=NtGdiXFORMOBJ_bApplyXform - XFORMOBJ_iGetXform=NtGdiXFORMOBJ_iGetXform - XLATEOBJ_cGetPalette=NtGdiXLATEOBJ_cGetPalette - XLATEOBJ_hGetColorTransform=NtGdiXLATEOBJ_hGetColorTransform - XLATEOBJ_iXlate=NtGdiXLATEOBJ_iXlate - XLATEOBJ_piVector - bInitSystemAndFontsDirectoriesW - bMakePathNameW - cGetTTFFromFOT - gdiPlaySpoolStream + AbortDoc@4 @1 + AbortPath@4 @2 + AddFontMemResourceEx@16 @3 + AddFontResourceA@4 @4 + AddFontResourceExA@12 @5 + AddFontResourceExW@12 @6 + AddFontResourceTracking@8 @7 + AddFontResourceW@4 @8 + AngleArc@24 @9 + AnimatePalette@16 @10 + AnyLinkedFonts@0=NtGdiAnyLinkedFonts@0 @11 + Arc@36 @12 + ArcTo@36 @13 + BRUSHOBJ_hGetColorTransform@4=NtGdiBRUSHOBJ_hGetColorTransform@4 @14 + BRUSHOBJ_pvAllocRbrush@8=NtGdiBRUSHOBJ_pvAllocRbrush@8 @15 + BRUSHOBJ_pvGetRbrush@4=NtGdiBRUSHOBJ_pvGetRbrush@4 @16 + BRUSHOBJ_ulGetBrushColor@4=NtGdiBRUSHOBJ_ulGetBrushColor@4 @17 + BeginPath@4 @18 + BitBlt@36 @19 + CLIPOBJ_bEnum@12=NtGdiCLIPOBJ_bEnum@12 @20 + CLIPOBJ_cEnumStart@20=NtGdiCLIPOBJ_cEnumStart@20 @21 + CLIPOBJ_ppoGetPath@4=NtGdiCLIPOBJ_ppoGetPath@4 @22 + CancelDC@4 @23 + CheckColorsInGamut@16 @24 + ChoosePixelFormat@8 @25 + Chord@36 @26 + ClearBitmapAttributes@8 @27 + ClearBrushAttributes@8 @28 + CloseEnhMetaFile@4 @29 + CloseFigure@4 @30 + CloseMetaFile@4 @31 + ColorCorrectPalette@16 @32 + ColorMatchToTarget@12 @33 + CombineRgn@16 @34 + CombineTransform@12=NtGdiCombineTransform@12 @35 + CopyEnhMetaFileA@8 @36 + CopyEnhMetaFileW@8 @37 + CopyMetaFileA@8 @38 + CopyMetaFileW@8 @39 + CreateBitmap@20 @40 + CreateBitmapIndirect@4 @41 + CreateBrushIndirect@4 @42 + CreateColorSpaceA@4 @43 + CreateColorSpaceW@4 @44 + CreateCompatibleBitmap@12 @45 + CreateCompatibleDC@4 @46 + CreateDCA@16 @47 + CreateDCW@16 @48 + CreateDIBPatternBrush@8 @49 + CreateDIBPatternBrushPt@8 @50 + CreateDIBSection@24 @51 + CreateDIBitmap@24 @52 + CreateDiscardableBitmap@12 @53 + CreateEllipticRgn@16=NtGdiCreateEllipticRgn@16 @54 + CreateEllipticRgnIndirect@4 @55 + CreateEnhMetaFileA@16 @56 + CreateEnhMetaFileW@16 @57 + CreateFontA@56 @58 + CreateFontIndirectA@4 @59 + CreateFontIndirectExA@4 @60 + CreateFontIndirectExW@4 @61 + CreateFontIndirectW@4 @62 + CreateFontW@56 @63 + CreateHalftonePalette@4=NtGdiCreateHalftonePalette@4 @64 + CreateHatchBrush@8 @65 + CreateICA@16 @66 + CreateICW@16 @67 + CreateMetaFileA@4 @68 + CreateMetaFileW@4 @69 + CreatePalette@4 @70 + CreatePatternBrush@4 @71 + CreatePen@12 @72 + CreatePenIndirect@4 @73 + CreatePolyPolygonRgn@16 @74 + CreatePolygonRgn@12 @75 + CreateRectRgn@16 @76 + CreateRectRgnIndirect@4 @77 + CreateRoundRectRgn@24=NtGdiCreateRoundRectRgn@24 @78 + CreateScalableFontResourceA@16 @79 + CreateScalableFontResourceW@16 @80 + CreateSolidBrush@4 @81 + DPtoLP@12 @82 + DdEntry0@24=NtGdiDxgGenericThunk@24 @83 + DdEntry10@8=NtGdiDdBeginMoCompFrame@8 @84 + DdEntry11@12=NtGdiDdBlt@12 @85 + DdEntry12@8=NtGdiDdCanCreateSurface@8 @86 + DdEntry13@8=NtGdiDdCanCreateD3DBuffer@8 @87 + DdEntry14@8=NtGdiDdColorControl@8 @88 + DdEntry15@4=NtGdiDdCreateDirectDrawObject@4 @89 + DdEntry16@32=NtGdiDdCreateSurface@32 @90 + DdEntry17@32=NtGdiDdCreateD3DBuffer@32 @91 + DdEntry18@8=NtGdiDdCreateMoComp@8 @92 + DdEntry19@24=NtGdiDdCreateSurfaceObject@24 @93 + DdEntry1@16=NtGdiD3dContextCreate@16 @94 + DdEntry20@4=NtGdiDdDeleteDirectDrawObject@4 @95 + DdEntry21@4=NtGdiDdDeleteSurfaceObject@4 @96 + DdEntry22@8=NtGdiDdDestroyMoComp@8 @97 + DdEntry23@8=NtGdiDdDestroySurface@8 @98 + DdEntry24@4=NtGdiDdDestroyD3DBuffer@4 @99 + DdEntry25@8=NtGdiDdEndMoCompFrame@8 @100 + DdEntry26@20=NtGdiDdFlip@20 @101 + DdEntry27@8=NtGdiDdFlipToGDISurface@8 @102 + DdEntry28@8=NtGdiDdGetAvailDriverMemory@8 @103 + DdEntry29@8=NtGdiDdGetBltStatus@8 @104 + DdEntry2@4=NtGdiD3dContextDestroy@4 @105 + DdEntry30@8=NtGdiDdGetDC@8 @106 + DdEntry31@8=NtGdiDdGetDriverInfo@8 @107 + DdEntry32@12=NtGdiDdGetDxHandle@12 @108 + DdEntry33@8=NtGdiDdGetFlipStatus@8 @109 + DdEntry34@8=NtGdiDdGetInternalMoCompInfo@8 @110 + DdEntry35@8=NtGdiDdGetMoCompBuffInfo@8 @111 + DdEntry36@8=NtGdiDdGetMoCompGuids@8 @112 + DdEntry37@8=NtGdiDdGetMoCompFormats@8 @113 + DdEntry38@8=NtGdiDdGetScanLine@8 @114 + DdEntry39@12=NtGdiDdLock@12 @115 + DdEntry3@4=NtGdiD3dContextDestroyAll@4 @116 + DdEntry40@8=NtGdiDdLockD3D@8 @117 + DdEntry41@44=NtGdiDdQueryDirectDrawObject@44 @118 + DdEntry42@8=NtGdiDdQueryMoCompStatus@8 @119 + DdEntry43@8=NtGdiDdReenableDirectDrawObject@8 @120 + DdEntry44@4=NtGdiDdReleaseDC@4 @121 + DdEntry45@8=NtGdiDdRenderMoComp@8 @122 + DdEntry46@8=NtGdiDdResetVisrgn@8 @123 + DdEntry47@8=NtGdiDdSetColorKey@8 @124 + DdEntry48@8=NtGdiDdSetExclusiveMode@8 @125 + DdEntry49@12=NtGdiDdSetGammaRamp@12 @126 + DdEntry4@4=NtGdiD3dValidateTextureStageState@4 @127 + DdEntry50@12=NtGdiDdCreateSurfaceEx@12 @128 + DdEntry51@12=NtGdiDdSetOverlayPosition@12 @129 + DdEntry52@8=NtGdiDdUnattachSurface@8 @130 + DdEntry53@8=NtGdiDdUnlock@8 @131 + DdEntry54@8=NtGdiDdUnlockD3D@8 @132 + DdEntry55@12=NtGdiDdUpdateOverlay@12 @133 + DdEntry56@8=NtGdiDdWaitForVerticalBlank@8 @134 + DdEntry5@28=NtGdiD3dDrawPrimitives2@28 @135 + DdEntry6@4=NtGdiDdGetDriverState@4 @136 + DdEntry7@12=NtGdiDdAddAttachedSurface@12 @137 + DdEntry8@12=NtGdiDdAlphaBlt@12 @138 + DdEntry9@8=NtGdiDdAttachSurface@8 @139 + DeleteColorSpace@4=NtGdiDeleteColorSpace@4 @140 + DeleteDC@4 @141 + DeleteEnhMetaFile@4 @142 + DeleteMetaFile@4 @143 + DeleteObject@4 @144 + DescribePixelFormat@16 @145 + DeviceCapabilitiesExA@20 @146 + DeviceCapabilitiesExW@20 @147 + DrawEscape@16 @148 + Ellipse@20 @149 + EnableEUDC@4=NtGdiEnableEudc@4 @150 + EndDoc@4 @151 + EndFormPage@4 @152 + EndPage@4 @153 + EndPath@4 @154 + EngAcquireSemaphore@4 @155 + EngAlphaBlend@28=NtGdiEngAlphaBlend@28 @156 + EngAssociateSurface@12=NtGdiEngAssociateSurface@12 @157 + EngBitBlt@44=NtGdiEngBitBlt@44 @158 + EngCheckAbort@4=NtGdiEngCheckAbort@4 @159 + EngComputeGlyphSet@12 @160 + EngCopyBits@24=NtGdiEngCopyBits@24 @161 + EngCreateBitmap@24=NtGdiEngCreateBitmap@24 @162 + EngCreateClip@0=NtGdiEngCreateClip@0 @163 + EngCreateDeviceBitmap@16=NtGdiEngCreateDeviceBitmap@16 @164 + EngCreateDeviceSurface@16=NtGdiEngCreateDeviceSurface@16 @165 + EngCreatePalette@24=NtGdiEngCreatePalette@24 @166 + EngCreateSemaphore@0 @167 + EngDeleteClip@4=NtGdiEngDeleteClip@4 @168 + EngDeletePalette@4=NtGdiEngDeletePalette@4 @169 + EngDeletePath@4=NtGdiEngDeletePath@4 @170 + EngDeleteSemaphore@4 @171 + EngDeleteSurface@4=NtGdiEngDeleteSurface@4 @172 + EngEraseSurface@12=NtGdiEngEraseSurface@12 @173 + EngFillPath@28=NtGdiEngFillPath@28 @174 + EngFindResource@16 @175 + EngFreeModule@4 @176 + EngGetCurrentCodePage@8 @177 + EngGetDriverName@4 @178 + EngGetPrinterDataFileName@4 @179 + EngGradientFill@40=NtGdiEngGradientFill@40 @180 + EngLineTo@36=NtGdiEngLineTo@36 @181 + EngLoadModule@4 @182 + EngLockSurface@4=NtGdiEngLockSurface@4 @183 + EngMarkBandingSurface@4=NtGdiEngMarkBandingSurface@4 @184 + EngMultiByteToUnicodeN@20=RtlMultiByteToUnicodeN@20 @185 + EngMultiByteToWideChar@20 @186 + EngPaint@20=NtGdiEngPaint@20 @187 + EngPlgBlt@44=NtGdiEngPlgBlt@44 @188 + EngQueryEMFInfo@8 @189 + EngQueryLocalTime@4 @190 + EngReleaseSemaphore@4 @191 + EngStretchBlt@44=NtGdiEngStretchBlt@44 @192 + EngStretchBltROP@52=NtGdiEngStretchBltROP@52 @193 + EngStrokeAndFillPath@40=NtGdiEngStrokeAndFillPath@40 @194 + EngStrokePath@32=NtGdiEngStrokePath@32 @195 + EngTextOut@40=NtGdiEngTextOut@40 @196 + EngTransparentBlt@32=NtGdiEngTransparentBlt@32 @197 + EngUnicodeToMultiByteN@20=RtlUnicodeToMultiByteN@20 @198 + EngUnlockSurface@4=NtGdiEngUnlockSurface@4 @199 + EngWideCharToMultiByte@20 @200 + EnumEnhMetaFile@20 @201 + EnumFontFamiliesA@16 @202 + EnumFontFamiliesExA@20 @203 + EnumFontFamiliesExW@20 @204 + EnumFontFamiliesW@16 @205 + EnumFontsA@16 @206 + EnumFontsW@16 @207 + EnumICMProfilesA@12 @208 + EnumICMProfilesW@12 @209 + EnumMetaFile@16 @210 + EnumObjects@16 @211 + EqualRgn@8=NtGdiEqualRgn@8 @212 + Escape@20 @213 + EudcLoadLinkW@16 @214 + EudcUnloadLinkW@8 @215 + ExcludeClipRect@20 @216 + ExtCreatePen@20 @217 + ExtCreateRegion@12 @218 + ExtEscape@24 @219 + ExtFloodFill@20 @220 + ExtSelectClipRgn@12 @221 + ExtTextOutA@32 @222 + ExtTextOutW@32 @223 + FONTOBJ_cGetAllGlyphHandles@8=NtGdiFONTOBJ_cGetAllGlyphHandles@8 @224 + FONTOBJ_cGetGlyphs@20=NtGdiFONTOBJ_cGetGlyphs@20 @225 + FONTOBJ_pQueryGlyphAttrs@8=NtGdiFONTOBJ_pQueryGlyphAttrs@8 @226 + FONTOBJ_pfdg@4=NtGdiFONTOBJ_pfdg@4 @227 + FONTOBJ_pifi@4=NtGdiFONTOBJ_pifi@4 @228 + FONTOBJ_pvTrueTypeFontFile@8=NtGdiFONTOBJ_pvTrueTypeFontFile@8 @229 + FONTOBJ_pxoGetXform@4=NtGdiFONTOBJ_pxoGetXform@4 @230 + FONTOBJ_vGetInfo@12=NtGdiFONTOBJ_vGetInfo@12 @231 + FillPath@4 @232 + FillRgn@12 @233 + FixBrushOrgEx@16 @234 + FlattenPath@4 @235 + FloodFill@16 @236 + FontIsLinked@4=NtGdiFontIsLinked@4 @237 + FrameRgn@20 @238 + GdiAddFontResourceW@12 @239 + GdiAddGlsBounds@8 @240 + GdiAddGlsRecord@16 @241 + GdiAlphaBlend@44 @242 + GdiArtificialDecrementDriver@8 @243 + GdiCleanCacheDC@4 @244 + GdiComment@12 @245 + GdiConsoleTextOut@16=NtGdiConsoleTextOut@16 @246 + GdiConvertAndCheckDC@4 @247 + GdiConvertBitmap@4 @248 + GdiConvertBitmapV5@16 @249 + GdiConvertBrush@4 @250 + GdiConvertDC@4 @251 + GdiConvertEnhMetaFile@4 @252 + GdiConvertFont@4 @253 + GdiConvertMetaFilePict@4 @254 + GdiConvertPalette@4 @255 + GdiConvertRegion@4 @256 + GdiConvertToDevmodeW@4 @257 + GdiCreateLocalEnhMetaFile@4 @258 + GdiCreateLocalMetaFilePict@4 @259 + GdiDeleteLocalDC@4 @260 + GdiDeleteSpoolFileHandle@4 @261 + GdiDescribePixelFormat@16=NtGdiDescribePixelFormat@16 @262 + GdiDllInitialize@12 @263 + GdiDrawStream@12 @264 + GdiEndDocEMF@4 @265 + GdiEndPageEMF@8 @266 + GdiEntry10@8 @267 + GdiEntry11@8 @268 + GdiEntry12@8 @269 + GdiEntry13@0 @270 + GdiEntry14@12 @271 + GdiEntry15@12 @272 + GdiEntry16@12 @273 + GdiEntry1@8 @274 + GdiEntry2@44 @275 + GdiEntry3@4 @276 + GdiEntry4@8 @277 + GdiEntry5@4 @278 + GdiEntry6@8 @279 + GdiEntry7@8 @280 + GdiEntry8@4 @281 + GdiEntry9@24 @282 + GdiFixUpHandle@4 @283 + GdiFlush@0 @284 + GdiFullscreenControl@20=NtGdiFullscreenControl@20 @285 + GdiGetBatchLimit@0 @286 + GdiGetBitmapBitsSize@4 @287 + GdiGetCharDimensions@12 @288 + GdiGetCodePage@4 @289 + GdiGetDC@4 @290 + GdiGetDevmodeForPage@16 @291 + GdiGetLocalBrush@4 @292 + GdiGetLocalDC@4 @293 + GdiGetLocalFont@4 @294 + GdiGetPageCount@4 @295 + GdiGetPageHandle@12 @296 + GdiGetSpoolFileHandle@12 @297 + GdiGetSpoolMessage@16=NtGdiGetSpoolMessage@16 @298 + GdiGradientFill@24 @299 + GdiInitSpool@0=NtGdiInitSpool@0 @300 + GdiInitializeLanguagePack@4 @301 + GdiIsMetaFileDC@4 @302 + GdiIsMetaPrintDC@4 @303 + GdiIsPlayMetafileDC@4 @304 + GdiPlayDCScript@24 @305 + GdiPlayEMF@20 @306 + GdiPlayJournal@20 @307 + GdiPlayPageEMF@20 @308 + GdiPlayPrivatePageEMF@12 @309 + GdiPlayScript@28 @310 + GdiPrinterThunk@12 @311 + GdiProcessSetup@0 @312 + GdiQueryFonts@12=NtGdiQueryFonts@12 @313 + GdiQueryTable@0 @314 + GdiRealizationInfo@8 @315 + GdiReleaseDC@4 @316 + GdiReleaseLocalDC@4 @317 + GdiResetDCEMF@8 @318 + GdiSetAttrs@4 @319 + GdiSetBatchLimit@4 @320 + GdiSetLastError@4 @321 + GdiSetPixelFormat@8=NtGdiSetPixelFormat@8 @322 + GdiSetServerAttr@8 @323 + GdiStartDocEMF@8 @324 + GdiStartPageEMF@4 @325 + GdiSwapBuffers@4=NtGdiSwapBuffers@4 @326 + GdiTransparentBlt@44 @327 + GdiValidateHandle@4 @328 + GetArcDirection@4 @329 + GetAspectRatioFilterEx@8 @330 + GetBitmapAttributes@4 @331 + GetBitmapBits@12=NtGdiGetBitmapBits@12 @332 + GetBitmapDimensionEx@8=NtGdiGetBitmapDimension@8 @333 + GetBkColor@4 @334 + GetBkMode@4 @335 + GetBoundsRect@12 @336 + GetBrushAttributes@4 @337 + GetBrushOrgEx@8 @338 + GetCharABCWidthsA@16 @339 + GetCharABCWidthsFloatA@16 @340 + GetCharABCWidthsFloatW@16 @341 + GetCharABCWidthsI@20 @342 + GetCharABCWidthsW@16 @343 + GetCharWidth32A@16 @344 + GetCharWidth32W@16 @345 + GetCharWidthA@16=GetCharWidth32A@16 @346 + GetCharWidthFloatA@16 @347 + GetCharWidthFloatW@16 @348 + GetCharWidthI@20 @349 + GetCharWidthInfo@8=NtGdiGetCharWidthInfo@8 @350 + GetCharWidthW@16 @351 + GetCharacterPlacementA@24 @352 + GetCharacterPlacementW@24 @353 + GetClipBox@8 @354 + GetClipRgn@8 @355 + GetColorAdjustment@8=NtGdiGetColorAdjustment@8 @356 + GetColorSpace@4 @357 + GetCurrentObject@8 @358 + GetCurrentPositionEx@8 @359 + GetDCBrushColor@4 @360 + GetDCOrgEx@8 @361 + GetDCPenColor@4 @362 + GetDIBColorTable@16 @363 + GetDIBits@28 @364 + GetDeviceCaps@8 @365 + GetDeviceGammaRamp@8 @366 + GetETM@8 @367 + GetEUDCTimeStamp@0 @368 + GetEUDCTimeStampExW@4 @369 + GetEnhMetaFileA@4 @370 + GetEnhMetaFileBits@12 @371 + GetEnhMetaFileDescriptionA@12 @372 + GetEnhMetaFileDescriptionW@12 @373 + GetEnhMetaFileHeader@12 @374 + GetEnhMetaFilePaletteEntries@12 @375 + GetEnhMetaFilePixelFormat@12 @376 + GetEnhMetaFileW@4 @377 + GetFontAssocStatus@4 @378 + GetFontData@20 @379 + GetFontLanguageInfo@4 @380 + GetFontResourceInfoW@16 @381 + GetFontUnicodeRanges@8=NtGdiGetFontUnicodeRanges@8 @382 + GetGlyphIndicesA@20 @383 + GetGlyphIndicesW@20=NtGdiGetGlyphIndicesW@20 @384 + GetGlyphOutline@28=GetGlyphOutlineA@28 @385 + GetGlyphOutlineA@28 @386 + GetGlyphOutlineW@28 @387 + GetGlyphOutlineWow@28 @388 + GetGraphicsMode@4 @389 + GetHFONT@4 @390 + GetICMProfileA@12 @391 + GetICMProfileW@12 @392 + GetKerningPairs@12=GetKerningPairsA@12 @393 + GetKerningPairsA@12 @394 + GetKerningPairsW@12 @395 + GetLayout@4 @396 + GetLogColorSpaceA@12 @397 + GetLogColorSpaceW@12 @398 + GetMapMode@4 @399 + GetMetaFileA@4 @400 + GetMetaFileBitsEx@12 @401 + GetMetaFileW@4 @402 + GetMetaRgn@8 @403 + GetMiterLimit@8=NtGdiGetMiterLimit@8 @404 + GetNearestColor@8=NtGdiGetNearestColor@8 @405 + GetNearestPaletteIndex@8=NtGdiGetNearestPaletteIndex@8 @406 + GetObjectA@12 @407 + GetObjectType@4 @408 + GetObjectW@12 @409 + GetOutlineTextMetricsA@12 @410 + GetOutlineTextMetricsW@12 @411 + GetPaletteEntries@16 @412 + GetPath@16 @413 + GetPixel@12 @414 + GetPixelFormat@4 @415 + GetPolyFillMode@4 @416 + GetROP2@4 @417 + GetRandomRgn@12=NtGdiGetRandomRgn@12 @418 + GetRasterizerCaps@8=NtGdiGetRasterizerCaps@8 @419 + GetRegionData@12 @420 + GetRelAbs@8 @421 + GetRgnBox@8 @422 + GetStockObject@4 @423 + GetStretchBltMode@4 @424 + GetStringBitmapA@20 @425 + GetStringBitmapW@20 @426 + GetSystemPaletteEntries@16 @427 + GetSystemPaletteUse@4=NtGdiGetSystemPaletteUse@4 @428 + GetTextAlign@4 @429 + GetTextCharacterExtra@4 @430 + GetTextCharset@4 @431 + GetTextCharsetInfo@12=NtGdiGetTextCharsetInfo@12 @432 + GetTextColor@4 @433 + GetTextExtentExPointA@28 @434 + GetTextExtentExPointI@28 @435 + GetTextExtentExPointW@28 @436 + GetTextExtentExPointWPri@28 @437 + GetTextExtentPoint32A@16 @438 + GetTextExtentPoint32W@16 @439 + GetTextExtentPointA@16 @440 + GetTextExtentPointI@16 @441 + GetTextExtentPointW@16 @442 + GetTextFaceA@12 @443 + GetTextFaceAliasW@12 @444 + GetTextFaceW@12 @445 + GetTextMetricsA@8 @446 + GetTextMetricsW@8 @447 + GetTransform@12=NtGdiGetTransform@12 @448 + GetViewportExtEx@8 @449 + GetViewportOrgEx@8 @450 + GetWinMetaFileBits@20 @451 + GetWindowExtEx@8 @452 + GetWindowOrgEx@8 @453 + GetWorldTransform@8 @454 + HT_Get8BPPFormatPalette@16=NtGdiHT_Get8BPPFormatPalette@16 @455 + HT_Get8BPPMaskPalette@24=NtGdiHT_Get8BPPMaskPalette@24 @456 + IntersectClipRect@20 @457 + InvertRgn@8 @458 + IsValidEnhMetaRecord@8 @459 + IsValidEnhMetaRecordOffExt@16 @460 + LPtoDP@12 @461 + LineDDA@24 @462 + LineTo@12 @463 + MaskBlt@48 @464 + MirrorRgn@8 @465 + ModifyWorldTransform@12 @466 + MoveToEx@16 @467 + NamedEscape@28 @468 + OffsetClipRgn@12 @469 + OffsetRgn@12 @470 + OffsetViewportOrgEx@16 @471 + OffsetWindowOrgEx@16 @472 + PATHOBJ_bEnum@8=NtGdiPATHOBJ_bEnum@8 @473 + PATHOBJ_bEnumClipLines@12=NtGdiPATHOBJ_bEnumClipLines@12 @474 + PATHOBJ_vEnumStart@4=NtGdiPATHOBJ_vEnumStart@4 @475 + PATHOBJ_vEnumStartClipLines@16=NtGdiPATHOBJ_vEnumStartClipLines@16 @476 + PATHOBJ_vGetBounds@8=NtGdiPATHOBJ_vGetBounds@8 @477 + PaintRgn@8 @478 + PatBlt@24 @479 + PathToRegion@4 @480 + Pie@36 @481 + PlayEnhMetaFile@12 @482 + PlayEnhMetaFileRecord@16 @483 + PlayMetaFile@8 @484 + PlayMetaFileRecord@16 @485 + PlgBlt@40 @486 + PolyBezier@12 @487 + PolyBezierTo@12 @488 + PolyDraw@16 @489 + PolyPatBlt@20 @490 + PolyPolygon@16 @491 + PolyPolyline@16 @492 + PolyTextOutA@12 @493 + PolyTextOutW@12 @494 + Polygon@12 @495 + Polyline@12 @496 + PolylineTo@12 @497 + PtInRegion@12 @498 + PtVisible@12=NtGdiPtVisible@12 @499 + QueryFontAssocStatus@0 @500 + RealizePalette@4 @501 + RectInRegion@8 @502 + RectVisible@8=NtGdiRectVisible@8 @503 + Rectangle@20 @504 + RemoveFontMemResourceEx@4 @505 + RemoveFontResourceA@4 @506 + RemoveFontResourceExA@12 @507 + RemoveFontResourceExW@12 @508 + RemoveFontResourceTracking@8 @509 + RemoveFontResourceW@4 @510 + ResetDCA@8 @511 + ResetDCW@8 @512 + ResizePalette@8 @513 + RestoreDC@8 @514 + RoundRect@28 @515 + STROBJ_bEnum@12=NtGdiSTROBJ_bEnum@12 @516 + STROBJ_bEnumPositionsOnly@12=NtGdiSTROBJ_bEnumPositionsOnly@12 @517 + STROBJ_bGetAdvanceWidths@16=NtGdiSTROBJ_bGetAdvanceWidths@16 @518 + STROBJ_dwGetCodePage@4=NtGdiSTROBJ_dwGetCodePage@4 @519 + STROBJ_vEnumStart@4=NtGdiSTROBJ_vEnumStart@4 @520 + SaveDC@4 @521 + ScaleViewportExtEx@24 @522 + ScaleWindowExtEx@24 @523 + SelectBrushLocal@8 @524 + SelectClipPath@8 @525 + SelectClipRgn@8 @526 + SelectFontLocal@8 @527 + SelectObject@8 @528 + SelectPalette@12 @529 + SetAbortProc@8 @530 + SetArcDirection@8 @531 + SetBitmapAttributes@8 @532 + SetBitmapBits@12=NtGdiSetBitmapBits@12 @533 + SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16 @534 + SetBkColor@8 @535 + SetBkMode@8 @536 + SetBoundsRect@12 @537 + SetBrushAttributes@8 @538 + SetBrushOrgEx@16 @539 + SetColorAdjustment@8 @540 + SetColorSpace@8 @541 + SetDCBrushColor@8 @542 + SetDCPenColor@8 @543 + SetDIBColorTable@16 @544 + SetDIBits@28 @545 + SetDIBitsToDevice@48 @546 + SetDeviceGammaRamp@8 @547 + SetEnhMetaFileBits@8 @548 + SetFontEnumeration@4=NtGdiSetFontEnumeration@4 @549 + SetGraphicsMode@8 @550 + SetICMMode@8 @551 + SetICMProfileA@8 @552 + SetICMProfileW@8 @553 + SetLayout@8 @554 + SetLayoutWidth@12 @555 + SetMagicColors@12=NtGdiSetMagicColors@12 @556 + SetMapMode@8 @557 + SetMapperFlags@8 @558 + SetMetaFileBitsEx@8 @559 + SetMetaRgn@4 @560 + SetMiterLimit@12 @561 + SetPaletteEntries@16 @562 + SetPixel@16 @563 + SetPixelFormat@12 @564 + SetPixelV@16 @565 + SetPolyFillMode@8 @566 + SetROP2@8 @567 + SetRectRgn@20 @568 + SetRelAbs@8 @569 + SetStretchBltMode@8 @570 + SetSystemPaletteUse@8=NtGdiSetSystemPaletteUse@8 @571 + SetTextAlign@8 @572 + SetTextCharacterExtra@8 @573 + SetTextColor@8 @574 + SetTextJustification@12 @575 + SetViewportExtEx@16 @576 + SetViewportOrgEx@16 @577 + SetVirtualResolution@20=NtGdiSetVirtualResolution@20 @578 + SetWinMetaFileBits@16 @579 + SetWindowExtEx@16 @580 + SetWindowOrgEx@16 @581 + SetWorldTransform@8 @582 + StartDocA@8 @583 + StartDocW@8 @584 + StartFormPage@4 @585 + StartPage@4 @586 + StretchBlt@44 @587 + StretchDIBits@52 @588 + StrokeAndFillPath@4 @589 + StrokePath@4 @590 + SwapBuffers@4 @591 + TextOutA@20 @592 + TextOutW@20 @593 + TranslateCharsetInfo@12 @594 + UnloadNetworkFonts@4 @595 + UnrealizeObject@4 @596 + UpdateColors@4 @597 + UpdateICMRegKeyA@16 @598 + UpdateICMRegKeyW@16 @599 + WidenPath@4 @600 + XFORMOBJ_bApplyXform@20=NtGdiXFORMOBJ_bApplyXform@20 @601 + XFORMOBJ_iGetXform@8=NtGdiXFORMOBJ_iGetXform@8 @602 + XLATEOBJ_cGetPalette@16=NtGdiXLATEOBJ_cGetPalette@16 @603 + XLATEOBJ_hGetColorTransform@4=NtGdiXLATEOBJ_hGetColorTransform@4 @604 + XLATEOBJ_iXlate@8=NtGdiXLATEOBJ_iXlate@8 @605 + XLATEOBJ_piVector@4 @606 + bInitSystemAndFontsDirectoriesW@8 @607 + bMakePathNameW@16 @608 + cGetTTFFromFOT@28 @609 + gdiPlaySpoolStream@24 @610 Modified: branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/getuname/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -3,9 +3,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(getuname.dll getuname.spec) +add_library(getuname SHARED getuname.c getuname.rc getuname.def) -add_library(getuname SHARED getuname.c getuname.rc ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) +if(NOT MSVC) + set_source_files_properties(getuname.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(getuname win32dll) Added: branches/cmake-bringup/dll/win32/getuname/getuname.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/getunam… ============================================================================== --- branches/cmake-bringup/dll/win32/getuname/getuname.def (added) +++ branches/cmake-bringup/dll/win32/getuname/getuname.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,5 @@ + +LIBRARY getuname.dll + +EXPORTS + GetUName@8 @1 Propchange: branches/cmake-bringup/dll/win32/getuname/getuname.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hnetcfg… ============================================================================== --- branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hnetcfg/CMakeLists.txt [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,10 +1,10 @@ add_definitions(-D__WINESRC__) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(hnetcfg.dll hnetcfg.spec) add_library(hnetcfg SHARED apps.c @@ -15,7 +15,11 @@ profile.c regsvr.c service.c - ${CMAKE_CURRENT_BINARY_DIR}/hnetcfg.def) + hnetcfg.def) + +if(NOT MSVC) + set_source_files_properties(hnetcfg.def PROPERTIES EXTERNAL_OBJECT TRUE) +endif() set_module_type(hnetcfg win32dll) @@ -27,5 +31,4 @@ kernel32 ntdll) - add_cab_target(hnetcfg 1) Added: branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hnetcfg… ============================================================================== --- branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def (added) +++ branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def [iso-8859-1] Tue Nov 2 18:19:44 2010 @@ -1,0 +1,8 @@ + +LIBRARY hnetcfg.dll + +EXPORTS + DllCanUnloadNow@0 @1 PRIVATE + DllGetClassObject@12 @2 PRIVATE + DllRegisterServer@0 @3 PRIVATE + DllUnregisterServer@0 @4 PRIVATE Propchange: branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 11 months

← Newer
1
...
40
41
42
43
44
45
46
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2010