Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[gadamopoulos] 51740: - Improve user api hook definitions. Add prototype of RegisterUserApiHook for xp - Add some helper macros
by gadamopoulos＠svn.reactos.org 14 May '11

14 May '11

Author: gadamopoulos Date: Sat May 14 18:17:58 2011 New Revision: 51740 URL: http://svn.reactos.org/svn/reactos?rev=51740&view=rev Log: - Improve user api hook definitions. Add prototype of RegisterUserApiHook for xp - Add some helper macros Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/include… ============================================================================== --- branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] Sat May 14 18:17:58 2011 @@ -116,6 +116,54 @@ // User api hook // +typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); + +typedef struct _UAHOWP +{ + BYTE* MsgBitArray; + DWORD Size; +} UAHOWP, *PUAHOWP; + +#define UAH_HOOK_MESSAGE(uahowp, msg) uahowp.MsgBitArray[msg/8] |= (1 << (msg % 8)); +#define UAH_IS_MESSAGE_HOOKED(uahowp, msg) (uahowp.MsgBitArray[msg/8] & (1 << (msg % 8))) +#define UAHOWP_MAX_SIZE WM_USER/8 + +typedef struct tagUSERAPIHOOK +{ + DWORD size; + WNDPROC DefWindowProcA; + WNDPROC DefWindowProcW; + UAHOWP DefWndProcArray; + FARPROC GetScrollInfo; + FARPROC SetScrollInfo; + FARPROC EnableScrollBar; + FARPROC AdjustWindowRectEx; + FARPROC SetWindowRgn; + WNDPROC_OWP PreWndProc; + WNDPROC_OWP PostWndProc; + UAHOWP WndProcArray; + WNDPROC_OWP PreDefDlgProc; + WNDPROC_OWP PostDefDlgProc; + UAHOWP DlgProcArray; + FARPROC GetSystemMetrics; + FARPROC SystemParametersInfoA; + FARPROC SystemParametersInfoW; + FARPROC ForceResetUserApiHook; + FARPROC DrawFrameControl; + FARPROC DrawCaption; + FARPROC MDIRedrawFrame; + FARPROC GetRealWindowOwner; +} USERAPIHOOK, *PUSERAPIHOOK; + +typedef enum _UAPIHK +{ + uahLoadInit, + uahStop, + uahShutdown +} UAPIHK, *PUAPIHK; + +typedef BOOL(CALLBACK *USERAPIHOOKPROC)(UAPIHK State, PUSERAPIHOOK puah); + typedef struct _USERAPIHOOKINFO { DWORD m_size; @@ -125,51 +173,12 @@ LPCWSTR m_funname2; } USERAPIHOOKINFO,*PUSERAPIHOOKINFO; -typedef enum _UAPIHK -{ - uahLoadInit, - uahStop, - uahShutdown -} UAPIHK, *PUAPIHK; +#if (WINVER == _WIN32_WINNT_WINXP) +BOOL WINAPI RegisterUserApiHook(HINSTANCE hInstance, USERAPIHOOKPROC CallbackFunc); +#elif (WINVER == _WIN32_WINNT_WS03) +BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); +#endif -typedef DWORD (CALLBACK * USERAPIHOOKPROC)(UAPIHK State, ULONG_PTR Info); - -typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); - -typedef struct _UAHOWP -{ - BYTE* MsgBitArray; - DWORD Size; -} UAHOWP, *PUAHOWP; - -typedef struct tagUSERAPIHOOK -{ - DWORD size; - WNDPROC DefWindowProcA; - WNDPROC DefWindowProcW; - UAHOWP DefWndProcArray; - FARPROC GetScrollInfo; - FARPROC SetScrollInfo; - FARPROC EnableScrollBar; - FARPROC AdjustWindowRectEx; - FARPROC SetWindowRgn; - WNDPROC_OWP PreWndProc; - WNDPROC_OWP PostWndProc; - UAHOWP WndProcArray; - WNDPROC_OWP PreDefDlgProc; - WNDPROC_OWP PostDefDlgProc; - UAHOWP DlgProcArray; - FARPROC GetSystemMetrics; - FARPROC SystemParametersInfoA; - FARPROC SystemParametersInfoW; - FARPROC ForceResetUserApiHook; - FARPROC DrawFrameControl; - FARPROC DrawCaption; - FARPROC MDIRedrawFrame; - FARPROC GetRealWindowOwner; -} USERAPIHOOK, *PUSERAPIHOOK; - -BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); BOOL WINAPI UnregisterUserApiHook(VOID); #endif

1 0

[janderwald] 51739: [USBSTOR] - Start implementing queued srb handling - Implement SRB_FUNCTION_RELEASE_QUEUE, SRB_FUNCTION_FLUSH, SRB_FUNCTION_FLUSH_QUEUE - WIP, not yet working perfectly
by janderwald＠svn.reactos.org 14 May '11

14 May '11

Author: janderwald Date: Sat May 14 18:09:00 2011 New Revision: 51739 URL: http://svn.reactos.org/svn/reactos?rev=51739&view=rev Log: [USBSTOR] - Start implementing queued srb handling - Implement SRB_FUNCTION_RELEASE_QUEUE, SRB_FUNCTION_FLUSH, SRB_FUNCTION_FLUSH_QUEUE - WIP, not yet working perfectly Added: branches/usb-bringup/drivers/usb/usbstor/queue.c (with props) Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/fdo.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Sat May 14 18:09:00 2011 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c scsi.c usbstor.c usbstor.rc) +add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c scsi.c usbstor.c usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -12,87 +12,6 @@ #include "usbstor.h" NTSTATUS -USBSTOR_HandleExecuteSCSI( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN OUT PSCSI_REQUEST_BLOCK Request, - IN PPDO_DEVICE_EXTENSION PDODeviceExtension) -{ - PCDB pCDB; - NTSTATUS Status; - - // - // get SCSI command data block - // - pCDB = (PCDB)Request->Cdb; - - DPRINT1("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); - - - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) - { - // - // sanity checks - // - ASSERT(Request->DataBuffer); - - DPRINT1("SCSIOP_READ_CAPACITY Length %\n", Request->DataTransferLength); - Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp); - } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) - { - DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); - ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); - ASSERT(Request->DataBuffer); - - // - // send mode sense command - // - Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); - } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ /*|| pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE*/) - { - DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); - - // - // send read / write command - // - Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp); - } - else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) - { - DPRINT1("SCSIOP_MEDIUM_REMOVAL\n"); - - // - // just complete the request - // - Request->SrbStatus = SRB_STATUS_SUCCESS; - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = Request->DataTransferLength; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) - { - DPRINT1("SCSIOP_TEST_UNIT_READY\n"); - - // - // send test unit command - // - Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp); - } - else - { - UNIMPLEMENTED; - Request->SrbStatus = SRB_STATUS_ERROR; - Status = STATUS_NOT_SUPPORTED; - DbgBreakPoint(); - } - - return Status; -} - -NTSTATUS USBSTOR_HandleInternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -128,7 +47,58 @@ case SRB_FUNCTION_EXECUTE_SCSI: { DPRINT1("SRB_FUNCTION_EXECUTE_SCSI\n"); - return USBSTOR_HandleExecuteSCSI(DeviceObject, Irp, Request, PDODeviceExtension); + + // + // check if request is valid + // + if (Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT)) + { + // + // data is transferred with this irp + // + if (Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) == (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) || + Request->DataTransferLength == 0 || + Irp->MdlAddress == NULL) + { + // + // invalid parameter + // + Status = STATUS_INVALID_PARAMETER; + break; + } + } + else + { + // + // sense buffer request + // + if (Request->DataTransferLength || + Request->DataBuffer || + Irp->MdlAddress) + { + // + // invalid parameter + // + Status = STATUS_INVALID_PARAMETER; + break; + } + } + + // + // add the request + // + if (!USBSTOR_QueueAddIrp(DeviceObject, Irp)) + { + // + // irp was not added to the queue + // + IoStartPacket(PDODeviceExtension->LowerDeviceObject, Irp, &Request->QueueSortKey, USBSTOR_CancelIo); + } + + // + // irp pending + // + return STATUS_PENDING; } case SRB_FUNCTION_RELEASE_DEVICE: { @@ -179,20 +149,37 @@ } case SRB_FUNCTION_RELEASE_QUEUE: { - DPRINT1("SRB_FUNCTION_RELEASE_QUEUE UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT1("SRB_FUNCTION_RELEASE_QUEUE\n"); + + // + // release queue + // + USBSTOR_QueueRelease(DeviceObject); + + + // + // set status success + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; } + case SRB_FUNCTION_FLUSH: - { - DPRINT1("SRB_FUNCTION_FLUSH UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case SRB_FUNCTION_SET_LINK_TIMEOUT: - { - DPRINT1("SRB_FUNCTION_FLUSH UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; + case SRB_FUNCTION_FLUSH_QUEUE: + { + DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE\n"); + + // + // flush all requests + // + USBSTOR_QueueFlushIrps(DeviceObject); + + // + // set status success + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; } default: Modified: branches/usb-bringup/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -142,6 +142,11 @@ } // + // intialize irp queue + // + USBSTOR_QueueInitialize(DeviceExtension); + + // // first get device & configuration & string descriptor // Status = USBSTOR_GetDescriptors(DeviceObject); Added: branches/usb-bringup/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/queue.c (added) +++ branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -1,0 +1,561 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Storage Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbstor/queue.c + * PURPOSE: USB block storage device driver. + * PROGRAMMERS: + * James Tabor + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbstor.h" + +VOID +USBSTOR_QueueInitialize( + PFDO_DEVICE_EXTENSION FDODeviceExtension) +{ + + // + // initialize queue lock + // + KeInitializeSpinLock(&FDODeviceExtension->IrpListLock); + + // + // initialize irp list head + // + InitializeListHead(&FDODeviceExtension->IrpListHead); +} + + +VOID +NTAPI +USBSTOR_CancelIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // acquire irp list lock + // + KeAcquireSpinLockAtDpcLevel(&FDODeviceExtension->IrpListLock); + + // + // now release the cancel lock + // + IoReleaseCancelSpinLock(Irp->CancelIrql); + + // + // remove the irp from the list + // + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + // + // release irp list lock + // + KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); + + // + // set cancel status + // + Irp->IoStatus.Status = STATUS_CANCELLED; + + // + // now cancel the irp + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + + +BOOLEAN +USBSTOR_QueueAddIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDRIVER_CANCEL OldDriverCancel; + KIRQL OldLevel; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + BOOLEAN IrpListFreeze; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // mark irp pending + // + IoMarkIrpPending(Irp); + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // add irp to queue + // + InsertTailList(&FDODeviceExtension->IrpListHead, &Irp->Tail.Overlay.ListEntry); + + // + // now set the driver cancel routine + // + OldDriverCancel = IoSetCancelRoutine(Irp, USBSTOR_CancelIo); + + // + // check if the irp has already been cancelled + // + if (Irp->Cancel && OldDriverCancel == NULL) + { + // + // the irp has already been cancelled + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // cancel routine requires that cancel spinlock is held + // + IoAcquireCancelSpinLock(&Irp->CancelIrql); + + // + // cancel irp + // + USBSTOR_CancelIo(DeviceObject, Irp); + + // + // irp was cancelled + // + return FALSE; + } + + // + // check if queue is freezed + // + IrpListFreeze = FDODeviceExtension->IrpListFreeze; + + // + // release list lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // if list is freezed, dont start this packet + // + return IrpListFreeze; +} + +PIRP +USBSTOR_RemoveIrp( + IN PDEVICE_OBJECT DeviceObject) +{ + KIRQL OldLevel; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PLIST_ENTRY Entry; + PIRP Irp = NULL; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // check if list is empty + // + if (!IsListEmpty(&FDODeviceExtension->IrpListHead)) + { + // + // remove entry + // + Entry = RemoveHeadList(&FDODeviceExtension->IrpListHead); + + // + // get offset to start of irp + // + Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + } + + // + // release list lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // return result + // + return Irp; +} + +VOID +USBSTOR_QueueFlushIrps( + IN PDEVICE_OBJECT DeviceObject) +{ + KIRQL OldLevel; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PLIST_ENTRY Entry; + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // complete all irps with status cancelled + // + while(!IsListEmpty(&FDODeviceExtension->IrpListHead)) + { + // + // remove irp + // + Entry = RemoveHeadList(&FDODeviceExtension->IrpListHead); + + // + // get start of irp structure + // + Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // sanity check + // + ASSERT(Request); + + // + // set srb status to flushed + // + Request->SrbStatus = SRB_STATUS_REQUEST_FLUSHED; + + // + // set unsuccessful status + // + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); +} + +VOID +USBSTOR_QueueNextRequest( + IN PDEVICE_OBJECT DeviceObject) +{ + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // remove first irp from list + // + Irp = USBSTOR_RemoveIrp(DeviceObject); + + // + // is there an irp pending + // + if (!Irp) + { + // + // no work to do + // + return; + } + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get srb + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // start next packet + // + IoStartPacket(PDODeviceExtension->LowerDeviceObject, Irp, &Request->QueueSortKey, USBSTOR_CancelIo); +} + +VOID +USBSTOR_QueueRelease( + IN PDEVICE_OBJECT DeviceObject) +{ + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PIRP Irp; + KIRQL OldLevel; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // clear freezed status + // + FDODeviceExtension->IrpListFreeze = FALSE; + + // + // release irp list lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // grab newest irp + // + Irp = USBSTOR_RemoveIrp(DeviceObject); + + // + // is there an irp + // + if (!Irp) + { + // + // no irp + // + return; + } + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get srb + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // start new packet + // + IoStartPacket(PDODeviceExtension->LowerDeviceObject, // FDO + Irp, + &Request->QueueSortKey, + USBSTOR_CancelIo); +} + + +VOID +NTAPI +USBSTOR_StartIo( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + KIRQL OldLevel; + NTSTATUS Status; + + DPRINT1("USBSTOR_StartIo\n"); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // acquire cancel spinlock + // + IoAcquireCancelSpinLock(&OldLevel); + + // + // set cancel routine to zero + // + IoSetCancelRoutine(Irp, NULL); + + // + // check if the irp has been cancelled + // + if (Irp->Cancel) + { + // + // irp has been cancelled, release cancel spinlock + // + IoReleaseCancelSpinLock(OldLevel); + + // + // irp is cancelled + // + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // check if the queue has been frozen + // + if (FDODeviceExtension->IrpListFreeze == FALSE) + { + // + // queue next request + // + USBSTOR_QueueNextRequest(DeviceObject); + + // + // start next request + // + IoStartNextPacket(DeviceObject, TRUE); + } + + // + // done + // + return; + } + + // + // release cancel spinlock + // + IoReleaseCancelSpinLock(OldLevel); + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // remove irp from list + // + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // execute scsi + // + Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp); + + // + // FIXME: synchronize action with error handling + // + USBSTOR_QueueNextRequest(IoStack->DeviceObject); + + // + // start next request + // + IoStartNextPacket(DeviceObject, TRUE); + +} Propchange: branches/usb-bringup/drivers/usb/usbstor/queue.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -1002,3 +1002,94 @@ // return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL); } + + +NTSTATUS +USBSTOR_HandleExecuteSCSI( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PCDB pCDB; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + DPRINT1("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); + + if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + { + // + // sanity checks + // + ASSERT(Request->DataBuffer); + + DPRINT1("SCSIOP_READ_CAPACITY Length %\n", Request->DataTransferLength); + Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp); + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) + { + DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); + ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); + ASSERT(Request->DataBuffer); + + // + // send mode sense command + // + Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ /*|| pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE*/) + { + DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read / write command + // + Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp); + } + else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) + { + DPRINT1("SCSIOP_MEDIUM_REMOVAL\n"); + + // + // just complete the request + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Request->DataTransferLength; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) + { + DPRINT1("SCSIOP_TEST_UNIT_READY\n"); + + // + // send test unit command + // + Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp); + } + else + { + UNIMPLEMENTED; + Request->SrbStatus = SRB_STATUS_ERROR; + Status = STATUS_NOT_SUPPORTED; + DbgBreakPoint(); + } + + return Status; +} Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -99,18 +99,6 @@ // } -VOID -NTAPI -USBSTOR_StartIo( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - // - // implement me - // - UNIMPLEMENTED -} - NTSTATUS NTAPI USBSTOR_DispatchClose( @@ -251,10 +239,9 @@ DriverObject->DriverExtension->AddDevice = USBSTOR_AddDevice; // - // FIXME: driver start i/o routine - // - //DriverObject->DriverStartIo = USBSTOR_StartIo; - + // driver start i/o routine + // + DriverObject->DriverStartIo = USBSTOR_StartIo; // // create / close Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sat May 14 18:09:00 2011 @@ -63,6 +63,9 @@ UCHAR BulkOutPipeIndex; // bulk out pipe index UCHAR MaxLUN; // max lun for device PDEVICE_OBJECT ChildPDO[16]; // max 16 child pdo devices + KSPIN_LOCK IrpListLock; // irp list lock + LIST_ENTRY IrpListHead; // irp list head + BOOLEAN IrpListFreeze; // if true the irp list is freezed }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct @@ -75,6 +78,9 @@ ULONG BlockLength; // length of block ULONG LastLogicBlockAddress; // last block address }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; + + + // // max lun command identifier @@ -361,41 +367,53 @@ // scsi.c routines // NTSTATUS -USBSTOR_SendInquiryCmd( +USBSTOR_HandleExecuteSCSI( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +//--------------------------------------------------------------------- +// +// disk.c routines +// +NTSTATUS +USBSTOR_HandleInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +USBSTOR_HandleDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +//--------------------------------------------------------------------- +// +// queue.c routines +// +VOID +NTAPI +USBSTOR_StartIo( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +VOID +USBSTOR_QueueFlushIrps( IN PDEVICE_OBJECT DeviceObject); -NTSTATUS -USBSTOR_SendCapacityCmd( +VOID +USBSTOR_QueueRelease( + IN PDEVICE_OBJECT DeviceObject); + +BOOLEAN +USBSTOR_QueueAddIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS -USBSTOR_SendModeSenseCmd( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -USBSTOR_SendReadWriteCmd( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -USBSTOR_SendTestUnitCmd( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -//--------------------------------------------------------------------- -// -// disk.c routines -// -NTSTATUS -USBSTOR_HandleInternalDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -USBSTOR_HandleDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - - +VOID +NTAPI +USBSTOR_CancelIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +VOID +USBSTOR_QueueInitialize( + PFDO_DEVICE_EXTENSION FDODeviceExtension);

1 0

[rharabien] 51738: - Fix build
by rharabien＠svn.reactos.org 14 May '11

14 May '11

Author: rharabien Date: Sat May 14 16:01:54 2011 New Revision: 51738 URL: http://svn.reactos.org/svn/reactos?rev=51738&view=rev Log: - Fix build Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sat May 14 16:01:54 2011 @@ -66,7 +66,7 @@ #endif #ifdef USE_DBGPRINT_LOGGER -#include "inc\PostDbgMesg.h" +#include "inc/PostDbgMesg.h" #define DbgPrint DbgDump_Printf #define Connect_DbgPrint() {DbgDump_SetAutoReconnect(TRUE); DbgDump_Reconnect();} #else // USE_DBGPRINT_LOGGER Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] Sat May 14 16:01:54 2011 @@ -8,7 +8,7 @@ #include "stddef.h" #include "stdarg.h" -#include "inc\CrossNt.h" +#include "inc/CrossNt.h" #include "atapi.h" // includes scsi.h #include "ntdddisk.h"

1 0

[tkreuzer] 51737: [CMAKE/NTOSKRNL] Fix warnings
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 15:58:47 2011 New Revision: 51737 URL: http://svn.reactos.org/svn/reactos?rev=51737&view=rev Log: [CMAKE/NTOSKRNL] Fix warnings Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sat May 14 15:58:47 2011 @@ -56,7 +56,7 @@ PROSSYM_KM_OWN_CONTEXT Context = (PROSSYM_KM_OWN_CONTEXT)FileContext; IO_STATUS_BLOCK Iosb; NTSTATUS Status = MiSimpleRead - (Context->FileObject, + (Context->FileObject, &Context->FileOffset, Buffer, Length, @@ -65,7 +65,7 @@ return NT_SUCCESS(Status); } -static PROSSYM_OWN_FILECONTEXT +static PROSSYM_OWN_FILECONTEXT KdbpCaptureFileForSymbols(PFILE_OBJECT FileObject) { PROSSYM_KM_OWN_CONTEXT Context = ExAllocatePool(NonPagedPool, sizeof(*Context)); @@ -205,13 +205,13 @@ else if (Address < MmSystemRangeStart) { MemoryArea = MmLocateMemoryAreaByAddress(&PsGetCurrentProcess()->Vm, Address); - if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) { goto end; } SectionObject = MemoryArea->Data.SectionData.Section; if (!(SectionObject->AllocationAttributes & SEC_IMAGE)) goto end; - if (MemoryArea->StartingAddress != KdbpImageBase) + if (MemoryArea->StartingAddress != (PVOID)KdbpImageBase) { if (KdbpRosSymInfo) { @@ -223,7 +223,7 @@ if ((FileContext = KdbpCaptureFileForSymbols(SectionObject->FileObject))) { if (RosSymCreateFromFile(FileContext, &KdbpRosSymInfo)) - KdbpImageBase = MemoryArea->StartingAddress; + KdbpImageBase = (ULONG_PTR)MemoryArea->StartingAddress; KdbpReleaseFileForSymbols(FileContext); } @@ -242,7 +242,7 @@ { DbgPrint ("<%wZ:%x (%s:%d (%s))>", - &SectionObject->FileObject->FileName, + &SectionObject->FileObject->FileName, RelativeAddress, FileName, LineNumber, FunctionName); return TRUE; }

1 0

[rharabien] 51736: [UNIATA] - Sync to 0.41b2 - Fixed bug with unnecessary call to AtapiEnableInterrupts() inside AtapiSendCommand() when DRQ is never asserted - Added registry option AtapiSendDisab...
by rharabien＠svn.reactos.org 14 May '11

14 May '11

Author: rharabien Date: Sat May 14 15:52:49 2011 New Revision: 51736 URL: http://svn.reactos.org/svn/reactos?rev=51736&view=rev Log: [UNIATA] - Sync to 0.41b2 - Fixed bug with unnecessary call to AtapiEnableInterrupts() inside AtapiSendCommand() when DRQ is never asserted - Added registry option AtapiSendDisableIntr to manage ATAPI command sending behavior. AFAIU, under VirtualBox it is unnecessary to disable interrupts around sending ATAPI commands. - Implemented registry options for BUSY and DRQ timing adjustments. - Added VirtualBox tuning option - VirtualBox value in registry. Sets timings and ATAPI (CD/DVD) related options to the most compatible values. - Fixed bug with UDMA2 support on Intel ICH1/2/3/4/5 chips. - Made some experimental changes in automatic slow-down algorithm. This code is rather old, but was not tested properly. - Fixed bug with accessing SATA registers on Intel chips - Many other fixes Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/badblock.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/badblock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

1 0

[tkreuzer] 51735: [NETEVENT] Forgot this change
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 14:24:39 2011 New Revision: 51735 URL: http://svn.reactos.org/svn/reactos?rev=51735&view=rev Log: [NETEVENT] Forgot this change Modified: trunk/reactos/dll/win32/netevent/netevt.rc Modified: trunk/reactos/dll/win32/netevent/netevt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/netevt.… ============================================================================== --- trunk/reactos/dll/win32/netevent/netevt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/netevt.rc [iso-8859-1] Sat May 14 14:24:39 2011 @@ -6,4 +6,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netevent.dll\0" #include <reactos/version.rc> -#include "netevent.rc" +#include "neteventmsg.rc"

1 0

[tkreuzer] 51734: [NETEVENT] Rename netevent.mc to neteventmsg.mc
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 14:16:42 2011 New Revision: 51734 URL: http://svn.reactos.org/svn/reactos?rev=51734&view=rev Log: [NETEVENT] Rename netevent.mc to neteventmsg.mc Added: trunk/reactos/include/reactos/mc/neteventmsg.mc - copied unchanged from r51706, trunk/reactos/include/reactos/mc/netevent.mc Removed: trunk/reactos/include/reactos/mc/netevent.mc Modified: trunk/reactos/include/reactos/mc/mc.rbuild Modified: trunk/reactos/include/reactos/mc/mc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/mc.rbui… ============================================================================== --- trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] Sat May 14 14:16:42 2011 @@ -18,7 +18,7 @@ </module> <module name="neteventmsg" type="messageheader"> - <file>netevent.mc</file> + <file>neteventmsg.mc</file> </module> <module name="ntiologc" type="messageheader"> Removed: trunk/reactos/include/reactos/mc/netevent.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… ============================================================================== --- trunk/reactos/include/reactos/mc/netevent.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/netevent.mc (removed) @@ -1,484 +1,0 @@ -; -; netevent.mc MESSAGE resources for netevent.dll -; - -MessageIdTypedef=DWORD - -SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS - Informational=0x1:STATUS_SEVERITY_INFORMATIONAL - Warning=0x2:STATUS_SEVERITY_WARNING - Error=0x3:STATUS_SEVERITY_ERROR - ) - -FacilityNames=(System=0x0:FACILITY_SYSTEM - ) - -LanguageNames=(English=0x409:MSG00409) - - -; -; message definitions -; - -; Facility=System - -; -; eventlog events 6000-6099 -; - -MessageId=6000 -Severity=Warning -Facility=System -SymbolicName=EVENT_LOG_FULL -Language=English -The %1 log file is full. -. - -MessageId=6001 -Severity=Warning -Facility=System -SymbolicName=EVENT_LogFileNotOpened -Language=English -The %1 log file cannot be opened. -. - -MessageId=6002 -Severity=Warning -Facility=System -SymbolicName=EVENT_LogFileCorrupt -Language=English -The %1 log file is corrupted and will be cleared. -. - -MessageId=6003 -Severity=Warning -Facility=System -SymbolicName=EVENT_DefaultLogCorrupt -Language=English -The Application log file could not be opened. %1 will be used as the default log file. -. - -MessageId=6004 -Severity=Warning -Facility=System -SymbolicName=EVENT_BadDriverPacket -Language=English -A driver packet received from the I/O subsystem was invalid. The data is the packet. -. - -MessageId=6005 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogStarted -Language=English -The Event log service was started. -. - -MessageId=6006 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogStopped -Language=English -The Event log service was stopped. -. - -MessageId=6007 -Severity=Warning -Facility=System -SymbolicName=TITLE_EventlogMessageBox -Language=English -Eventlog Service %0 -. - -MessageId=6008 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogAbnormalShutdown -Language=English -The previous system shutdown at %1 on %2 was unexpected. -. - -MessageId=6009 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventLogProductInfo -Language=English -ReactOS %1 %2 %3 %4. -. - -MessageId=6010 -Severity=Error -Facility=System -SymbolicName=EVENT_ServiceNoEventLog -Language=English -The %1 service was unable to set up an event source. -. - -MessageId=6011 -Severity=Error -Facility=System -SymbolicName=EVENT_ComputerNameChange -Language=English -The NetBIOS name and DNS host name of this machine have been changed from %1 to %2. -. - -MessageId=6012 -Severity=Error -Facility=System -SymbolicName=EVENT_DNSDomainNameChange -Language=English -The DNS domain assigned to this computer has been changed from %1 to %2. -. - - -; -; system events 6100 - 6199 -; - -MessageId=6100 -Severity=Error -Facility=System -SymbolicName=EVENT_UP_DRIVER_ON_MP -Language=English -A uniprocessor-specific driver was loaded on a multiprocessor system. The driver could not load. -. - - -; -; service controller events 7000-7899 -; - -MessageId=7000 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED -Language=English -The %1 service failed to start due to the following error: %n%2 -. - -MessageId=7001 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED_II -Language=English -The %1 service depends on the %2 service which failed to start because of the following error: %n%3 -. - -MessageId=7002 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED_GROUP -Language=English -The %1 service depends on the %2 group and no member of this group started. -. - -MessageId=7003 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED_NONE -Language=English -The %1 service depends on the following nonexistent service: %2 -. - -MessageId=7004 -Severity=Error -Facility=System -SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED -Language=English -The %1 call failed with the following error: %n%2 -. - -MessageId=7005 -Severity=Error -Facility=System -SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED_II -Language=English -The %1 call failed for %2 with the following error: %n%3 -. - -MessageId=7006 -Severity=Error -Facility=System -SymbolicName=EVENT_REVERTED_TO_LASTKNOWNGOOD -Language=English -The system reverted to its last known good configuration. The system is restarting.... -. - -MessageId=7007 -Severity=Error -Facility=System -SymbolicName=EVENT_BAD_ACCOUNT_NAME -Language=English -No backslash is in the account name. -. - -MessageId=7008 -Severity=Error -Facility=System -SymbolicName=EVENT_CONNECTION_TIMEOUT -Language=English -Timeout (%1 milliseconds) waiting for the %2 service to connect. -. - -MessageId=7009 -Severity=Error -Facility=System -SymbolicName=EVENT_READFILE_TIMEOUT -Language=English -Timeout (%1 milliseconds) waiting for ReadFile. -. - -MessageId=7010 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSACT_TIMEOUT -Language=English -Timeout (%1 milliseconds) waiting for a transaction response from the %2 service. -. - -MessageId=7011 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSACT_INVALID -Language=English -Message returned in transaction has incorrect size. -. - -MessageId=7012 -Severity=Error -Facility=System -SymbolicName=EVENT_FIRST_LOGON_FAILED -Language=English -Logon attempt with current password failed with the following error: %n%1 -. - -MessageId=7013 -Severity=Error -Facility=System -SymbolicName=EVENT_SECOND_LOGON_FAILED -Language=English -Second logon attempt with old password also failed with the following error: %n%1 -. - -MessageId=7014 -Severity=Error -Facility=System -SymbolicName=EVENT_INVALID_DRIVER_DEPENDENCY -Language=English -Boot-start or system-start driver (%1) must not depend on a service. -. - -MessageId=7015 -Severity=Error -Facility=System -SymbolicName=EVENT_BAD_SERVICE_STATE -Language=English -The %1 service has reported an invalid current state %2. -. - -MessageId=7016 -Severity=Error -Facility=System -SymbolicName=EVENT_CIRCULAR_DEPENDENCY_DEMAND -Language=English -Detected circular dependencies demand starting %1. -. - -MessageId=7017 -Severity=Error -Facility=System -SymbolicName=EVENT_CIRCULAR_DEPENDENCY_AUTO -Language=English -Detected circular dependencies auto-starting services. -. - -MessageId=7018 -Severity=Error -Facility=System -SymbolicName=EVENT_DEPEND_ON_LATER_SERVICE -Language=English -Circular dependency: The %1 service depends on a service in a group which starts later. -. - -MessageId=7019 -Severity=Error -Facility=System -SymbolicName=EVENT_DEPEND_ON_LATER_GROUP -Language=English -Circular dependency: The %1 service depends on a group which starts later. -. - -MessageId=7020 -Severity=Error -Facility=System -SymbolicName=EVENT_SEVERE_SERVICE_FAILED -Language=English -About to revert to the last known good configuration because the %1 service failed to start. -. - -MessageId=7021 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_HUNG -Language=English -The %1 service hung on starting. -. - -MessageId=7022 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_EXIT_FAILED -Language=English -The %1 service terminated with the following error: %n%2 -. - -MessageId=7023 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_EXIT_FAILED_SPECIFIC -Language=English -The %1 service terminated with service-specific error %2. -. - -MessageId=7024 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_AT_BOOT_FAILED -Language=English -At least one service or driver failed during system startup. Use Event Viewer to examine the event log for details. -. - -MessageId=7025 -Severity=Error -Facility=System -SymbolicName=EVENT_BOOT_SYSTEM_DRIVERS_FAILED -Language=English -The following boot-start or system-start driver(s) failed to load: %1 -. - -MessageId=7026 -Severity=Error -Facility=System -SymbolicName=EVENT_RUNNING_LASTKNOWNGOOD -Language=English -ReactOS could not be started as configured. A previous working configuration was used instead. -. - -MessageId=7027 -Severity=Error -Facility=System -SymbolicName=EVENT_TAKE_OWNERSHIP -Language=English -The %1 Registry key denied access to SYSTEM account programs so the Service Control Manager took ownership of the Registry key. -. - -MessageId=7028 -Severity=Error -Facility=System -SymbolicName=TITLE_SC_MESSAGE_BOX -Language=English -Service Control Manager %0 -. - -MessageId=7029 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_NOT_INTERACTIVE -Language=English -The %1 service is marked as an interactive service. However, the system is configured to not allow interactive services. This service may not function properly. -. - -MessageId=7030 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_CRASH -Language=English -The %1 service terminated unexpectedly. It has done this %2 time(s). The following corrective action will be taken in %3 milliseconds: %5. -. - -MessageId=7031 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_RECOVERY_FAILED -Language=English -The Service Control Manager tried to take a corrective action (%2) after the unexpected termination of the %3 service, but this action failed with the following error: %n%4 -. - -MessageId=7032 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_SCESRV_FAILED -Language=English -The Service Control Manager did not initialize successfully. The security -configuration server (scesrv.dll) failed to initialize with error %1. The -system is restarting... -. - -MessageId=7033 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_CRASH_NO_ACTION -Language=English -The %1 service terminated unexpectedly. It has done this %2 time(s). -. - -MessageId=7034 -Severity=Informational -Facility=System -SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS -Language=English -The %1 service was successfully sent a %2 control. -. - -MessageId=7035 -Severity=Informational -Facility=System -SymbolicName=EVENT_SERVICE_STATUS_SUCCESS -Language=English -Service Control Manager %0 -. - -MessageId=7036 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_CONFIG_BACKOUT_FAILED -Language=English -The Service Control Manager encountered an error undoing a configuration change -to the %1 service. The service's %2 is currently in an unpredictable state. - -If you do not correct this configuration, you may not be able to restart the %1 -service or may encounter other errors. To ensure that the service is configured -properly, use the Services snap-in in Microsoft Management Console (MMC). -. - -MessageId=7037 -Severity=Error -Facility=System -SymbolicName=EVENT_FIRST_LOGON_FAILED_II -Language=English -The %1 service was unable to log on as %2 with the currently configured -password due to the following error: %n%3%n%nTo ensure that the service is -configured properly, use the Services snap-in in Microsoft Management -Console (MMC). -. - - -; -; transport events 9000-9499 -; - -MessageId=9004 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSPORT_REGISTER_FAILED -Language=English -%2 failed to register itself with the NDIS wrapper. -. - -MessageId=9006 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSPORT_ADAPTER_NOT_FOUND -Language=English -%2 could not find adapter %3. -.

1 0

[jgardou] 51733: [ROSTESTS/CMAKE] - addendum to 51731
by jgardou＠svn.reactos.org 14 May '11

14 May '11

Author: jgardou Date: Sat May 14 14:03:44 2011 New Revision: 51733 URL: http://svn.reactos.org/svn/reactos?rev=51733&view=rev Log: [ROSTESTS/CMAKE] - addendum to 51731 Modified: trunk/rostests/apitests/dciman32/CMakeLists.txt trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/tests/pseh2/CMakeLists.txt trunk/rostests/winetests/advapi32/CMakeLists.txt trunk/rostests/winetests/advpack/CMakeLists.txt trunk/rostests/winetests/amstream/CMakeLists.txt trunk/rostests/winetests/atl/CMakeLists.txt trunk/rostests/winetests/avifil32/CMakeLists.txt trunk/rostests/winetests/browseui/CMakeLists.txt trunk/rostests/winetests/cabinet/CMakeLists.txt trunk/rostests/winetests/comcat/CMakeLists.txt trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/comdlg32/CMakeLists.txt trunk/rostests/winetests/credui/CMakeLists.txt trunk/rostests/winetests/crypt32/CMakeLists.txt trunk/rostests/winetests/cryptnet/CMakeLists.txt trunk/rostests/winetests/cryptui/CMakeLists.txt trunk/rostests/winetests/dnsapi/CMakeLists.txt trunk/rostests/winetests/dsound/CMakeLists.txt trunk/rostests/winetests/fusion/CMakeLists.txt trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/gdiplus/CMakeLists.txt trunk/rostests/winetests/hlink/CMakeLists.txt trunk/rostests/winetests/icmp/CMakeLists.txt trunk/rostests/winetests/imm32/CMakeLists.txt trunk/rostests/winetests/inetcomm/CMakeLists.txt trunk/rostests/winetests/inetmib1/CMakeLists.txt trunk/rostests/winetests/iphlpapi/CMakeLists.txt trunk/rostests/winetests/itss/CMakeLists.txt trunk/rostests/winetests/jscript/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/localspl/CMakeLists.txt trunk/rostests/winetests/localui/CMakeLists.txt trunk/rostests/winetests/lz32/CMakeLists.txt trunk/rostests/winetests/mapi32/CMakeLists.txt trunk/rostests/winetests/mlang/CMakeLists.txt trunk/rostests/winetests/msacm32/CMakeLists.txt trunk/rostests/winetests/mscms/CMakeLists.txt trunk/rostests/winetests/msctf/CMakeLists.txt trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/msi/CMakeLists.txt trunk/rostests/winetests/mstask/CMakeLists.txt trunk/rostests/winetests/msvcrt/CMakeLists.txt trunk/rostests/winetests/msvcrtd/CMakeLists.txt trunk/rostests/winetests/msvfw32/CMakeLists.txt trunk/rostests/winetests/msxml3/CMakeLists.txt trunk/rostests/winetests/netapi32/CMakeLists.txt trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/ntdsapi/CMakeLists.txt trunk/rostests/winetests/ntprint/CMakeLists.txt trunk/rostests/winetests/odbccp32/CMakeLists.txt trunk/rostests/winetests/ole32/CMakeLists.txt trunk/rostests/winetests/oleacc/CMakeLists.txt trunk/rostests/winetests/oleaut32/CMakeLists.txt trunk/rostests/winetests/opengl32/CMakeLists.txt trunk/rostests/winetests/pdh/CMakeLists.txt trunk/rostests/winetests/powrprof/CMakeLists.txt trunk/rostests/winetests/psapi/CMakeLists.txt trunk/rostests/winetests/qmgr/CMakeLists.txt trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/rasapi32/CMakeLists.txt trunk/rostests/winetests/riched20/CMakeLists.txt trunk/rostests/winetests/riched32/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rsabase/CMakeLists.txt trunk/rostests/winetests/rsaenh/CMakeLists.txt trunk/rostests/winetests/schannel/CMakeLists.txt trunk/rostests/winetests/secur32/CMakeLists.txt trunk/rostests/winetests/serialui/CMakeLists.txt trunk/rostests/winetests/setupapi/CMakeLists.txt trunk/rostests/winetests/shdocvw/CMakeLists.txt trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shlwapi/CMakeLists.txt trunk/rostests/winetests/snmpapi/CMakeLists.txt trunk/rostests/winetests/spoolss/CMakeLists.txt trunk/rostests/winetests/twain_32/CMakeLists.txt trunk/rostests/winetests/urlmon/CMakeLists.txt trunk/rostests/winetests/user32/CMakeLists.txt trunk/rostests/winetests/userenv/CMakeLists.txt trunk/rostests/winetests/usp10/CMakeLists.txt trunk/rostests/winetests/uxtheme/CMakeLists.txt trunk/rostests/winetests/version/CMakeLists.txt trunk/rostests/winetests/winhttp/CMakeLists.txt trunk/rostests/winetests/wininet/CMakeLists.txt trunk/rostests/winetests/winmm/CMakeLists.txt trunk/rostests/winetests/wintrust/CMakeLists.txt trunk/rostests/winetests/wlanapi/CMakeLists.txt trunk/rostests/winetests/wldap32/CMakeLists.txt trunk/rostests/winetests/ws2_32/CMakeLists.txt trunk/rostests/winetests/xmllite/CMakeLists.txt Modified: trunk/rostests/apitests/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dciman32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/dciman32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -5,4 +5,4 @@ target_link_libraries(dciman32_apitest wine) set_module_type(dciman32_apitest win32cui) add_importlibs(dciman32_apitest msvcrt kernel32 ntdll) -add_cab_target(dciman32_apitest 7) +add_cd_file(TARGET dciman32_apitest DESTINATION reactos/bin) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -53,4 +53,4 @@ target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) set_module_type(gdi32_apitest win32cui) add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll) -add_cab_target(gdi32_apitest 7) +add_cd_file(TARGET gdi32_apitest DESTINATION reactos/bin) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -9,4 +9,4 @@ target_link_libraries(kernel32_apitest wine ${PSEH_LIB}) set_module_type(kernel32_apitest win32cui) add_importlibs(kernel32_apitest gdi32 user32 msvcrt kernel32 ntdll) -add_cab_target(kernel32_apitest 7) +add_cd_file(TARGET kernel32_apitest DESTINATION reactos/bin) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -14,4 +14,4 @@ target_link_libraries(ntdll_apitest wine) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt kernel32 ntdll) -add_cab_target(ntdll_apitest 7) +add_cd_file(TARGET ntdll_apitest DESTINATION reactos/bin) Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -21,4 +21,4 @@ target_link_libraries(user32_apitest wine) set_module_type(user32_apitest win32cui) add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll) -add_cab_target(user32_apitest 7) +add_cd_file(TARGET user32_apitest DESTINATION reactos/bin) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -11,4 +11,4 @@ target_link_libraries(ws2_32_apitest wine) set_module_type(ws2_32_apitest win32cui) add_importlibs(ws2_32_apitest ws2_32 msvcrt kernel32 ntdll) -add_cab_target(ws2_32_apitest 7) +add_cd_file(TARGET ws2_32_apitest DESTINATION reactos/bin) Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -27,4 +27,4 @@ set_module_type(rosautotest win32cui) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) -add_cab_target(rosautotest 1) +add_cd_file(TARGET rosautotest DESTINATION reactos/system32) Modified: trunk/rostests/tests/pseh2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/CMakeLists.tx… ============================================================================== --- trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -5,4 +5,4 @@ target_link_libraries(pseh2_test wine ${PSEH_LIB}) set_module_type(pseh2_test win32cui) add_importlibs(pseh2_test msvcrt kernel32 ntdll) -add_cab_target(pseh2_test 7) +add_cd_file(TARGET pseh2_test DESTINATION reactos/bin) Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -23,4 +23,4 @@ set_module_type(advapi32_winetest win32cui) add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll) -add_cab_target(advapi32_winetest 7) +add_cd_file(TARGET advapi32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/CMakeLi… ============================================================================== --- trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -15,4 +15,4 @@ set_module_type(advpack_winetest win32cui) add_importlibs(advpack_winetest cabinet advapi32 msvcrt kernel32 ntdll) -add_cab_target(advpack_winetest 7) +add_cd_file(TARGET advpack_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/CMakeL… ============================================================================== --- trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -5,4 +5,4 @@ set_module_type(amstream_winetest win32cui) add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32 ntdll) add_dependencies(amstream_winetest dxsdk) -add_cab_target(amstream_winetest 7) +add_cd_file(TARGET amstream_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -12,4 +12,4 @@ set_module_type(atl_winetest win32cui) add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll) -add_cab_target(atl_winetest 7) +add_cd_file(TARGET atl_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/CMakeL… ============================================================================== --- trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -4,4 +4,4 @@ target_link_libraries(avifil32_winetest wine) set_module_type(avifil32_winetest win32cui) add_importlibs(avifil32_winetest avifil32 msvcrt kernel32) -add_cab_target(avifil32_winetest 7) +add_cd_file(TARGET avifil32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/CMakeL… ============================================================================== --- trunk/rostests/winetests/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(browseui_winetest wine uuid) set_module_type(browseui_winetest win32cui) add_importlibs(browseui_winetest user32 ole32 msvcrt kernel32 ntdll) -add_cab_target(browseui_winetest 7) +add_cd_file(TARGET browseui_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(cabinet_winetest wine) set_module_type(cabinet_winetest win32cui) add_importlibs(cabinet_winetest cabinet msvcrt kernel32 ntdll) -add_cab_target(cabinet_winetest 7) +add_cd_file(TARGET cabinet_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/CMakeLis… ============================================================================== --- trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(comcat_winetest wine uuid) set_module_type(comcat_winetest win32cui) add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(comcat_winetest 7) +add_cd_file(TARGET comcat_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -40,4 +40,4 @@ target_link_libraries(comctl32_winetest wine) set_module_type(comctl32_winetest win32cui) add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(comctl32_winetest 7) +add_cd_file(TARGET comctl32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -14,4 +14,4 @@ target_link_libraries(comdlg32_winetest wine) set_module_type(comdlg32_winetest win32cui) add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(comdlg32_winetest 7) +add_cd_file(TARGET comdlg32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/CMakeLis… ============================================================================== --- trunk/rostests/winetests/credui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/credui/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(credui_winetest wine) set_module_type(credui_winetest win32cui) add_importlibs(credui_winetest credui msvcrt kernel32 ntdll) -add_cab_target(credui_winetest 7) +add_cd_file(TARGET credui_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -25,4 +25,4 @@ target_link_libraries(crypt32_winetest wine) set_module_type(crypt32_winetest win32cui) add_importlibs(crypt32_winetest crypt32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(crypt32_winetest 7) +add_cd_file(TARGET crypt32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/CMakeL… ============================================================================== --- trunk/rostests/winetests/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptnet/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(cryptnet_winetest wine) set_module_type(cryptnet_winetest win32cui) add_importlibs(cryptnet_winetest cryptnet crypt32 msvcrt kernel32 ntdll) -add_cab_target(cryptnet_winetest 7) +add_cd_file(TARGET cryptnet_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cryptui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptui/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(cryptui_winetest wine) set_module_type(cryptui_winetest win32cui) add_importlibs(cryptui_winetest cryptui crypt32 user32 msvcrt kernel32 ntdll) -add_cab_target(cryptui_winetest 7) +add_cd_file(TARGET cryptui_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(dnsapi_winetest wine) set_module_type(dnsapi_winetest win32cui) add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32 ntdll) -add_cab_target(dnsapi_winetest 7) +add_cd_file(TARGET dnsapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dsound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/dsound/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -17,4 +17,4 @@ target_link_libraries(dsound_winetest wine uuid dxguid) set_module_type(dsound_winetest win32cui) add_importlibs(dsound_winetest dsound ole32 user32 msvcrt kernel32 ntdll) -add_cab_target(dsound_winetest 7) +add_cd_file(TARGET dsound_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/CMakeLis… ============================================================================== --- trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -14,4 +14,4 @@ target_link_libraries(fusion_winetest wine) set_module_type(fusion_winetest win32cui) add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll) -add_cab_target(fusion_winetest 7) +add_cd_file(TARGET fusion_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -22,4 +22,4 @@ add_executable(gdi32_winetest ${SOURCE}) set_module_type(gdi32_winetest win32cui) add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(gdi32_winetest 7) +add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/CMakeLi… ============================================================================== --- trunk/rostests/winetests/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -21,4 +21,4 @@ target_link_libraries(gdiplus_winetest wine) set_module_type(gdiplus_winetest win32cui) add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32 ntdll) -add_cab_target(gdiplus_winetest 7) +add_cd_file(TARGET gdiplus_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/CMakeList… ============================================================================== --- trunk/rostests/winetests/hlink/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -12,4 +12,4 @@ target_link_libraries(hlink_winetest wine uuid) set_module_type(hlink_winetest win32cui) add_importlibs(hlink_winetest hlink ole32 msvcrt kernel32 ntdll) -add_cab_target(hlink_winetest 7) +add_cd_file(TARGET hlink_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/icmp/CMakeLists… ============================================================================== --- trunk/rostests/winetests/icmp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/icmp/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(icmp_winetest wine uuid) set_module_type(icmp_winetest win32cui) add_importlibs(icmp_winetest icmp msvcrt kernel32 ntdll) -add_cab_target(icmp_winetest 7) +add_cd_file(TARGET icmp_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/CMakeList… ============================================================================== --- trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(imm32_winetest wine) set_module_type(imm32_winetest win32cui) add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32 ntdll) -add_cab_target(imm32_winetest 7) +add_cd_file(TARGET imm32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -12,4 +12,4 @@ target_link_libraries(inetcomm_winetest wine) set_module_type(inetcomm_winetest win32cui) add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32 ntdll) -add_cab_target(inetcomm_winetest 7) +add_cd_file(TARGET inetcomm_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetmib1/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/inetmib1/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(inetmib1_winetest wine) set_module_type(inetmib1_winetest win32cui) add_importlibs(inetmib1_winetest snmpapi msvcrt kernel32 ntdll) -add_cab_target(inetmib1_winetest 7) +add_cd_file(TARGET inetmib1_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(iphlpapi_winetest wine) set_module_type(iphlpapi_winetest win32cui) add_importlibs(iphlpapi_winetest msvcrt kernel32 ntdll) -add_cab_target(iphlpapi_winetest 7) +add_cd_file(TARGET iphlpapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists… ============================================================================== --- trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -9,4 +9,4 @@ target_link_libraries(itss_winetest wine) set_module_type(itss_winetest win32cui) add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll) -add_cab_target(itss_winetest 7) +add_cd_file(TARGET itss_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi… ============================================================================== --- trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -16,4 +16,4 @@ target_link_libraries(jscript_winetest wine) set_module_type(jscript_winetest win32cui) add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(jscript_winetest 7) +add_cd_file(TARGET jscript_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -49,4 +49,4 @@ set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(kernel32_winetest 7) +add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/CMakeL… ============================================================================== --- trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -8,4 +8,4 @@ target_link_libraries(localspl_winetest wine) set_module_type(localspl_winetest win32cui) add_importlibs(localspl_winetest advapi32 msvcrt kernel32 ntdll) -add_cab_target(localspl_winetest 7) +add_cd_file(TARGET localspl_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/CMakeLi… ============================================================================== --- trunk/rostests/winetests/localui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/localui/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -8,4 +8,4 @@ target_link_libraries(localui_winetest wine) set_module_type(localui_winetest win32cui) add_importlibs(localui_winetest winspool msvcrt kernel32 ntdll) -add_cab_target(localui_winetest 7) +add_cd_file(TARGET localui_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/CMakeLists… ============================================================================== --- trunk/rostests/winetests/lz32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/lz32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(lz32_winetest wine) set_module_type(lz32_winetest win32cui) add_importlibs(lz32_winetest lz32 msvcrt kernel32 ntdll) -add_cab_target(lz32_winetest 7) +add_cd_file(TARGET lz32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -13,4 +13,4 @@ target_link_libraries(mapi32_winetest wine uuid) set_module_type(mapi32_winetest win32cui) add_importlibs(mapi32_winetest advapi32 msvcrt kernel32 ntdll) -add_cab_target(mapi32_winetest 7) +add_cd_file(TARGET mapi32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/CMakeList… ============================================================================== --- trunk/rostests/winetests/mlang/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(mlang_winetest wine uuid) set_module_type(mlang_winetest win32cui) add_importlibs(mlang_winetest oleaut32 ole32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(mlang_winetest 7) +add_cd_file(TARGET mlang_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(msacm32_winetest wine) set_module_type(msacm32_winetest win32cui) add_importlibs(msacm32_winetest msacm32 msvcrt kernel32 ntdll) -add_cab_target(msacm32_winetest 7) +add_cd_file(TARGET msacm32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/CMakeList… ============================================================================== --- trunk/rostests/winetests/mscms/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(mscms_winetest wine) set_module_type(mscms_winetest win32cui) add_importlibs(mscms_winetest advapi32 msvcrt kernel32 ntdll) -add_cab_target(mscms_winetest 7) +add_cd_file(TARGET mscms_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeList… ============================================================================== --- trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(msctf_winetest wine) set_module_type(msctf_winetest win32cui) add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll) -add_cab_target(msctf_winetest 7) +add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -20,4 +20,4 @@ target_link_libraries(mshtml_winetest wine uuid strmiids) set_module_type(mshtml_winetest win32cui) add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt kernel32 ntdll) -add_cab_target(mshtml_winetest 7) +add_cd_file(TARGET mshtml_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -20,4 +20,4 @@ target_link_libraries(msi_winetest wine uuid) set_module_type(msi_winetest win32cui) add_importlibs(msi_winetest cabinet msi shell32 ole32 oleaut32 user32 advapi32 version msvcrt kernel32 ntdll) -add_cab_target(msi_winetest 7) +add_cd_file(TARGET msi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -13,4 +13,4 @@ target_link_libraries(mstask_winetest wine) set_module_type(mstask_winetest win32cui) add_importlibs(mstask_winetest ole32 msvcrt kernel32 ntdll) -add_cab_target(mstask_winetest 7) +add_cd_file(TARGET mstask_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -24,4 +24,4 @@ add_executable(msvcrt_winetest ${SOURCE}) set_module_type(msvcrt_winetest win32cui) add_importlibs(msvcrt_winetest msvcrt kernel32 ntdll) -add_cab_target(msvcrt_winetest 7) +add_cd_file(TARGET msvcrt_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/msvcrtd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msvcrtd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrtd/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(msvcrtd_winetest wine) set_module_type(msvcrtd_winetest win32cui) add_importlibs(msvcrtd_winetest msvcrt kernel32 ntdll) -add_cab_target(msvcrtd_winetest 7) +add_cd_file(TARGET msvcrtd_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msvfw32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(msvfw32_winetest wine) set_module_type(msvfw32_winetest win32cui) add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32 ntdll) -add_cab_target(msvfw32_winetest 7) +add_cd_file(TARGET msvfw32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -15,4 +15,4 @@ target_link_libraries(msxml3_winetest wine) set_module_type(msxml3_winetest win32cui) add_importlibs(msxml3_winetest user32 ole32 oleaut32 msvcrt kernel32 ntdll) -add_cab_target(msxml3_winetest 7) +add_cd_file(TARGET msxml3_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -14,4 +14,4 @@ target_link_libraries(netapi32_winetest wine) set_module_type(netapi32_winetest win32cui) add_importlibs(netapi32_winetest advapi32 msvcrt kernel32 ntdll) -add_cab_target(netapi32_winetest 7) +add_cd_file(TARGET netapi32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -28,4 +28,4 @@ add_executable(ntdll_winetest ${SOURCE}) set_module_type(ntdll_winetest win32cui) add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll) -add_cab_target(ntdll_winetest 7) +add_cd_file(TARGET ntdll_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdsapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/ntdsapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdsapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(ntdsapi_winetest wine) set_module_type(ntdsapi_winetest win32cui) add_importlibs(ntdsapi_winetest ntdsapi msvcrt kernel32 ntdll) -add_cab_target(ntdsapi_winetest 7) +add_cd_file(TARGET ntdsapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntprint/CMakeLi… ============================================================================== --- trunk/rostests/winetests/ntprint/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntprint/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(ntprint_winetest wine) set_module_type(ntprint_winetest win32cui) add_importlibs(ntprint_winetest msvcrt kernel32 ntdll) -add_cab_target(ntprint_winetest 7) +add_cd_file(TARGET ntprint_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/CMakeL… ============================================================================== --- trunk/rostests/winetests/odbccp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(odbccp32_winetest wine) set_module_type(odbccp32_winetest win32cui) add_importlibs(odbccp32_winetest odbccp32 msvcrt kernel32 ntdll) -add_cab_target(odbccp32_winetest 7) +add_cd_file(TARGET odbccp32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/CMakeList… ============================================================================== --- trunk/rostests/winetests/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -23,4 +23,4 @@ target_link_libraries(ole32_winetest wine uuid) set_module_type(ole32_winetest win32cui) add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(ole32_winetest 7) +add_cd_file(TARGET ole32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/CMakeLis… ============================================================================== --- trunk/rostests/winetests/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(oleacc_winetest wine) set_module_type(oleacc_winetest win32cui) add_importlibs(oleacc_winetest oleacc msvcrt kernel32 ntdll) -add_cab_target(oleacc_winetest 7) +add_cd_file(TARGET oleacc_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -31,4 +31,4 @@ set_module_type(oleaut32_winetest win32cui) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders) -add_cab_target(oleaut32_winetest 7) +add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/opengl32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(opengl32_winetest wine) set_module_type(opengl32_winetest win32cui) add_importlibs(opengl32_winetest opengl32 gdi32 user32 msvcrt kernel32 ntdll) -add_cab_target(opengl32_winetest 7) +add_cd_file(TARGET opengl32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(pdh_winetest wine) set_module_type(pdh_winetest win32cui) add_importlibs(pdh_winetest pdh msvcrt kernel32 ntdll) -add_cab_target(pdh_winetest 7) +add_cd_file(TARGET pdh_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/CMakeL… ============================================================================== --- trunk/rostests/winetests/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/powrprof/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ add_executable(powrprof_winetest pwrprof.c testlist.c) set_module_type(powrprof_winetest win32cui) add_importlibs(powrprof_winetest advapi32 powrprof msvcrt kernel32 ntdll) -add_cab_target(powrprof_winetest 7) +add_cd_file(TARGET powrprof_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/CMakeList… ============================================================================== --- trunk/rostests/winetests/psapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/psapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(psapi_winetest wine) set_module_type(psapi_winetest win32cui) add_importlibs(psapi_winetest psapi msvcrt kernel32 ntdll) -add_cab_target(psapi_winetest 7) +add_cd_file(TARGET psapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/CMakeLists… ============================================================================== --- trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -15,4 +15,4 @@ target_link_libraries(qmgr_winetest wine) set_module_type(qmgr_winetest win32cui) add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32 ntdll) -add_cab_target(qmgr_winetest 7) +add_cd_file(TARGET qmgr_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -18,4 +18,4 @@ target_link_libraries(quartz_winetest wine) set_module_type(quartz_winetest win32cui) add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(quartz_winetest 7) +add_cd_file(TARGET quartz_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rasapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/rasapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rasapi32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(rasapi32_winetest wine) set_module_type(rasapi32_winetest win32cui) add_importlibs(rasapi32_winetest msvcrt kernel32 ntdll) -add_cab_target(rasapi32_winetest 7) +add_cd_file(TARGET rasapi32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/CMakeL… ============================================================================== --- trunk/rostests/winetests/riched20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/riched20/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -13,4 +13,4 @@ target_link_libraries(riched20_winetest wine uuid) set_module_type(riched20_winetest win32cui) add_importlibs(riched20_winetest ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(riched20_winetest 7) +add_cd_file(TARGET riched20_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/CMakeL… ============================================================================== --- trunk/rostests/winetests/riched32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/riched32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(riched32_winetest wine) set_module_type(riched32_winetest win32cui) add_importlibs(riched32_winetest ole32 user32 msvcrt kernel32 ntdll) -add_cab_target(riched32_winetest 7) +add_cd_file(TARGET riched32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -27,4 +27,4 @@ set_module_type(rpcrt4_winetest win32cui) add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll) -add_cab_target(rpcrt4_winetest 7) +add_cd_file(TARGET rpcrt4_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/rsabase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsabase/CMakeLi… ============================================================================== --- trunk/rostests/winetests/rsabase/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rsabase/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(rsabase_winetest wine) set_module_type(rsabase_winetest win32cui) add_importlibs(rsabase_winetest advapi32 msvcrt kernel32 ntdll) -add_cab_target(rsabase_winetest 7) +add_cd_file(TARGET rsabase_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(rsaenh_winetest wine) set_module_type(rsaenh_winetest win32cui) add_importlibs(rsaenh_winetest advapi32 msvcrt kernel32 ntdll) -add_cab_target(rsaenh_winetest 7) +add_cd_file(TARGET rsaenh_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/CMakeL… ============================================================================== --- trunk/rostests/winetests/schannel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/schannel/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(schannel_winetest wine) set_module_type(schannel_winetest win32cui) add_importlibs(schannel_winetest msvcrt kernel32 ntdll) -add_cab_target(schannel_winetest 7) +add_cd_file(TARGET schannel_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/secur32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/secur32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -14,4 +14,4 @@ target_link_libraries(secur32_winetest wine) set_module_type(secur32_winetest win32cui) add_importlibs(secur32_winetest advapi32 msvcrt kernel32 ntdll) -add_cab_target(secur32_winetest 7) +add_cd_file(TARGET secur32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/serialui/CMakeL… ============================================================================== --- trunk/rostests/winetests/serialui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/serialui/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(serialui_winetest wine) set_module_type(serialui_winetest win32cui) add_importlibs(serialui_winetest msvcrt kernel32 ntdll) -add_cab_target(serialui_winetest 7) +add_cd_file(TARGET serialui_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -18,4 +18,4 @@ target_link_libraries(setupapi_winetest wine) set_module_type(setupapi_winetest win32cui) add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll) -add_cab_target(setupapi_winetest 7) +add_cd_file(TARGET setupapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -14,4 +14,4 @@ target_link_libraries(shdocvw_winetest wine) set_module_type(shdocvw_winetest win32cui) add_importlibs(shdocvw_winetest gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(shdocvw_winetest 7) +add_cd_file(TARGET shdocvw_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -27,4 +27,4 @@ target_link_libraries(shell32_winetest wine uuid) set_module_type(shell32_winetest win32cui) add_importlibs(shell32_winetest shlwapi gdi32 shell32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(shell32_winetest 7) +add_cd_file(TARGET shell32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -21,4 +21,4 @@ target_link_libraries(shlwapi_winetest wine uuid) set_module_type(shlwapi_winetest win32cui) add_importlibs(shlwapi_winetest shlwapi ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(shlwapi_winetest 7) +add_cd_file(TARGET shlwapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/snmpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/snmpapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(snmpapi_winetest wine) set_module_type(snmpapi_winetest win32cui) add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32 ntdll) -add_cab_target(snmpapi_winetest 7) +add_cd_file(TARGET snmpapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/CMakeLi… ============================================================================== --- trunk/rostests/winetests/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/spoolss/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(spoolss_winetest wine) set_module_type(spoolss_winetest win32cui) add_importlibs(spoolss_winetest msvcrt kernel32 ntdll) -add_cab_target(spoolss_winetest 7) +add_cd_file(TARGET spoolss_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/CMakeL… ============================================================================== --- trunk/rostests/winetests/twain_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/twain_32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(twain_32_winetest wine) set_module_type(twain_32_winetest win32cui) add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(twain_32_winetest 7) +add_cd_file(TARGET twain_32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/CMakeLis… ============================================================================== --- trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -17,4 +17,4 @@ target_link_libraries(urlmon_winetest wine uuid) set_module_type(urlmon_winetest win32cui) add_importlibs(urlmon_winetest urlmon ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(urlmon_winetest 7) +add_cd_file(TARGET urlmon_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -37,4 +37,4 @@ target_link_libraries(user32_winetest wine) set_module_type(user32_winetest win32cui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(user32_winetest 7) +add_cd_file(TARGET user32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/userenv/CMakeLi… ============================================================================== --- trunk/rostests/winetests/userenv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/userenv/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(userenv_winetest wine) set_module_type(userenv_winetest win32cui) add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32 ntdll) -add_cab_target(userenv_winetest 7) +add_cd_file(TARGET userenv_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/CMakeList… ============================================================================== --- trunk/rostests/winetests/usp10/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(usp10_winetest wine) set_module_type(usp10_winetest win32cui) add_importlibs(usp10_winetest usp10 user32 gdi32 msvcrt kernel32 ntdll) -add_cab_target(usp10_winetest 7) +add_cd_file(TARGET usp10_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/CMakeLi… ============================================================================== --- trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(uxtheme_winetest wine) set_module_type(uxtheme_winetest win32cui) add_importlibs(uxtheme_winetest user32 msvcrt kernel32 ntdll) -add_cab_target(uxtheme_winetest 7) +add_cd_file(TARGET uxtheme_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/CMakeLi… ============================================================================== --- trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -13,4 +13,4 @@ target_link_libraries(version_winetest wine) set_module_type(version_winetest win32cui) add_importlibs(version_winetest version msvcrt kernel32 ntdll) -add_cab_target(version_winetest 7) +add_cd_file(TARGET version_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/CMakeLi… ============================================================================== --- trunk/rostests/winetests/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -13,4 +13,4 @@ target_link_libraries(winhttp_winetest wine) set_module_type(winhttp_winetest win32cui) add_importlibs(winhttp_winetest winhttp crypt32 ws2_32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(winhttp_winetest 7) +add_cd_file(TARGET winhttp_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -16,4 +16,4 @@ target_link_libraries(wininet_winetest wine) set_module_type(wininet_winetest win32cui) add_importlibs(wininet_winetest wininet ws2_32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(wininet_winetest 7) +add_cd_file(TARGET wininet_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/CMakeList… ============================================================================== --- trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -16,4 +16,4 @@ target_link_libraries(winmm_winetest wine dxguid) set_module_type(winmm_winetest win32cui) add_importlibs(winmm_winetest winmm user32 msvcrt kernel32 ntdll) -add_cab_target(winmm_winetest 7) +add_cd_file(TARGET winmm_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/CMakeL… ============================================================================== --- trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -14,4 +14,4 @@ target_link_libraries(wintrust_winetest wine) set_module_type(wintrust_winetest win32cui) add_importlibs(wintrust_winetest wintrust crypt32 advapi32 msvcrt kernel32 ntdll) -add_cab_target(wintrust_winetest 7) +add_cd_file(TARGET wintrust_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wlanapi/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(wlanapi_winetest wine) set_module_type(wlanapi_winetest win32cui) add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32 ntdll) -add_cab_target(wlanapi_winetest 7) +add_cd_file(TARGET wlanapi_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(wldap32_winetest wine) set_module_type(wldap32_winetest win32cui) add_importlibs(wldap32_winetest wldap32 msvcrt kernel32 ntdll) -add_cab_target(wldap32_winetest 7) +add_cd_file(TARGET wldap32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(ws2_32_winetest wine) set_module_type(ws2_32_winetest win32cui) add_importlibs(ws2_32_winetest ws2_32 user32 msvcrt kernel32 ntdll) -add_cab_target(ws2_32_winetest 7) +add_cd_file(TARGET ws2_32_winetest DESTINATION reactos/bin) Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/CMakeLi… ============================================================================== --- trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] Sat May 14 14:03:44 2011 @@ -7,4 +7,4 @@ target_link_libraries(xmllite_winetest wine) set_module_type(xmllite_winetest win32cui) add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32 ntdll) -add_cab_target(xmllite_winetest 7) +add_cd_file(TARGET xmllite_winetest DESTINATION reactos/bin)

1 0

[akhaldi] 51732: [CMAKE] * Addendum to the previous commit by Jerome, for cmake versions older than 2.8.3
by akhaldi＠svn.reactos.org 14 May '11

14 May '11

Author: akhaldi Date: Sat May 14 13:52:40 2011 New Revision: 51732 URL: http://svn.reactos.org/svn/reactos?rev=51732&view=rev Log: [CMAKE] * Addendum to the previous commit by Jerome, for cmake versions older than 2.8.3 Added: branches/cmake-bringup/cmake/CMakeParseArguments.cmake (with props) Added: branches/cmake-bringup/cmake/CMakeParseArguments.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/CMakeParseA… ============================================================================== --- branches/cmake-bringup/cmake/CMakeParseArguments.cmake (added) +++ branches/cmake-bringup/cmake/CMakeParseArguments.cmake [iso-8859-1] Sat May 14 13:52:40 2011 @@ -1,0 +1,138 @@ +# CMAKE_PARSE_ARGUMENTS(<prefix> <options> <one_value_keywords> <multi_value_keywords> args...) +# +# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions for +# parsing the arguments given to that macro or function. +# It processes the arguments and defines a set of variables which hold the +# values of the respective options. +# +# The <options> argument contains all options for the respective macro, +# i.e. keywords which can be used when calling the macro without any value +# following, like e.g. the OPTIONAL keyword of the install() command. +# +# The <one_value_keywords> argument contains all keywords for this macro +# which are followed by one value, like e.g. DESTINATION keyword of the +# install() command. +# +# The <multi_value_keywords> argument contains all keywords for this macro +# which can be followed by more than one value, like e.g. the TARGETS or +# FILES keywords of the install() command. +# +# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the +# keywords listed in <options>, <one_value_keywords> and +# <multi_value_keywords> a variable composed of the given <prefix> +# followed by "_" and the name of the respective keyword. +# These variables will then hold the respective value from the argument list. +# For the <options> keywords this will be TRUE or FALSE. +# +# All remaining arguments are collected in a variable +# <prefix>_UNPARSED_ARGUMENTS, this can be checked afterwards to see whether +# your macro was called with unrecognized parameters. +# +# As an example here a my_install() macro, which takes similar arguments as the +# real install() command: +# +# function(MY_INSTALL) +# set(options OPTIONAL FAST) +# set(oneValueArgs DESTINATION RENAME) +# set(multiValueArgs TARGETS CONFIGURATIONS) +# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) +# ... +# +# Assume my_install() has been called like this: +# my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub) +# +# After the cmake_parse_arguments() call the macro will have set the following +# variables: +# MY_INSTALL_OPTIONAL = TRUE +# MY_INSTALL_FAST = FALSE (this option was not used when calling my_install() +# MY_INSTALL_DESTINATION = "bin" +# MY_INSTALL_RENAME = "" (was not used) +# MY_INSTALL_TARGETS = "foo;bar" +# MY_INSTALL_CONFIGURATIONS = "" (was not used) +# MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL" +# +# You can the continue and process these variables. +# +# Keywords terminate lists of values, e.g. if directly after a one_value_keyword +# another recognized keyword follows, this is interpreted as the beginning of +# the new option. +# E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in +# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION would +# be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. + +#============================================================================= +# Copyright 2010 Alexander Neundorf <neundorf(a)kde.org> +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + + +if(__CMAKE_PARSE_ARGUMENTS_INCLUDED) + return() +endif() +set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE) + + +function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames) + # first set all result variables to empty/FALSE + foreach(arg_name ${_singleArgNames} ${_multiArgNames}) + set(${prefix}_${arg_name}) + endforeach(arg_name) + + foreach(option ${_optionNames}) + set(${prefix}_${option} FALSE) + endforeach(option) + + set(${prefix}_UNPARSED_ARGUMENTS) + + set(insideValues FALSE) + set(currentArgName) + + # now iterate over all arguments and fill the result variables + foreach(currentArg ${ARGN}) + list(FIND _optionNames "${currentArg}" optionIndex) # ... then this marks the end of the arguments belonging to this keyword + list(FIND _singleArgNames "${currentArg}" singleArgIndex) # ... then this marks the end of the arguments belonging to this keyword + list(FIND _multiArgNames "${currentArg}" multiArgIndex) # ... then this marks the end of the arguments belonging to this keyword + + if(${optionIndex} EQUAL -1 AND ${singleArgIndex} EQUAL -1 AND ${multiArgIndex} EQUAL -1) + if(insideValues) + if("${insideValues}" STREQUAL "SINGLE") + set(${prefix}_${currentArgName} ${currentArg}) + set(insideValues FALSE) + elseif("${insideValues}" STREQUAL "MULTI") + list(APPEND ${prefix}_${currentArgName} ${currentArg}) + endif() + else(insideValues) + list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg}) + endif(insideValues) + else() + if(NOT ${optionIndex} EQUAL -1) + set(${prefix}_${currentArg} TRUE) + set(insideValues FALSE) + elseif(NOT ${singleArgIndex} EQUAL -1) + set(currentArgName ${currentArg}) + set(${prefix}_${currentArgName}) + set(insideValues "SINGLE") + elseif(NOT ${multiArgIndex} EQUAL -1) + set(currentArgName ${currentArg}) + set(${prefix}_${currentArgName}) + set(insideValues "MULTI") + endif() + endif() + + endforeach(currentArg) + + # propagate the result variables to the caller: + foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames}) + set(${prefix}_${arg_name} ${${prefix}_${arg_name}} PARENT_SCOPE) + endforeach(arg_name) + set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE) + +endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs) Propchange: branches/cmake-bringup/cmake/CMakeParseArguments.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 51730: [DWMAPI] add names to dwmapi.spec stubs
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 13:43:58 2011 New Revision: 51730 URL: http://svn.reactos.org/svn/reactos?rev=51730&view=rev Log: [DWMAPI] add names to dwmapi.spec stubs Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Sat May 14 13:43:58 2011 @@ -1,24 +1,24 @@ -100 stub @ -101 stub @ +100 stub DWMAPI_100 +101 stub DWMAPI_101 102 stdcall DwmEnableComposition (long) -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -111 stub @ -112 stub @ -113 stub @ +103 stub DWMAPI_103 +104 stub DWMAPI_104 +105 stub DWMAPI_105 +106 stub DWMAPI_106 +107 stub DWMAPI_107 +108 stub DWMAPI_108 +109 stub DWMAPI_109 +110 stub DWMAPI_110 +111 stub DWMAPI_111 +112 stub DWMAPI_112 +113 stub DWMAPI_113 -115 stub @ -116 stub @ -117 stub @ -118 stub @ -119 stub @ -120 stub @ +115 stub DWMAPI_114 +116 stub DWMAPI_115 +117 stub DWMAPI_116 +118 stub DWMAPI_117 +119 stub DWMAPI_118 +120 stub DWMAPI_120 @ stub DwmAttachMilContent @ stub DwmDefWindowProc

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011