Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50232: [CMAKE] remove a def file
by tkreuzer＠svn.reactos.org 31 Dec '10

31 Dec '10

Author: tkreuzer Date: Fri Dec 31 15:11:06 2010 New Revision: 50232 URL: http://svn.reactos.org/svn/reactos?rev=50232&view=rev Log: [CMAKE] remove a def file Removed: branches/cmake-bringup/subsystems/win32/win32k/win32k_i386.def Removed: branches/cmake-bringup/subsystems/win32/win32k/win32k_i386.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/win32k_i386.def [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/win32k_i386.def (removed) @@ -1,231 +1,0 @@ -; File generated automatically from obj-i386\subsystems\win32\win32k\win32k_win32k.spec; do not edit! - -LIBRARY win32k.sys - -EXPORTS - FLOATOBJ_AddFloatObj@8=FLOATOBJ_Add@8 @1 - FLOATOBJ_DivFloatObj@8=FLOATOBJ_Div@8 @2 - FLOATOBJ_MulFloatObj@8=FLOATOBJ_Mul@8 @3 - FLOATOBJ_SubFloatObj@8=FLOATOBJ_Sub@8 @4 - BRUSHOBJ_hGetColorTransform@4 @5 - BRUSHOBJ_pvAllocRbrush@8 @6 - BRUSHOBJ_pvGetRbrush@4 @7 - BRUSHOBJ_ulGetBrushColor@4 @8 - CLIPOBJ_bEnum@12 @9 - CLIPOBJ_cEnumStart@20 @10 - CLIPOBJ_ppoGetPath@4 @11 - EngAcquireSemaphore@4 @12 - EngAllocMem@12 @13 - EngAllocPrivateUserMem@12 @14 - EngAllocSectionMem@16 @15 - EngAllocUserMem@8 @16 - EngAlphaBlend@28 @17 - EngAssociateSurface@12 @18 - EngBitBlt@44 @19 - EngBugCheckEx(a)20=NTOSKRNL.KeBugCheckEx @20 - EngCheckAbort@4 @21 - EngClearEvent@4 @22 - EngComputeGlyphSet@12 @23 - EngControlSprites@8 @24 - EngCopyBits@24 @25 - EngCreateBitmap@24 @26 - EngCreateClip@0 @27 - EngCreateDeviceBitmap@16 @28 - EngCreateDeviceSurface@16 @29 - EngCreateDriverObj@12 @30 - EngCreateEvent@4 @31 - EngCreatePalette@24 @32 - EngCreatePath@0 @33 - EngCreateSemaphore@0 @34 - EngCreateWnd@20 @35 - EngDebugBreak(a)0=NTOSKRNL.DbgBreakPoint @36 - EngDebugPrint@12 @37 - EngDeleteClip@4 @38 - EngDeleteDriverObj@12 @39 - EngDeleteEvent@4 @40 - EngDeleteFile@4 @41 - EngDeletePalette@4 @42 - EngDeletePath@4 @43 - EngDeleteSafeSemaphore@4 @44 - EngDeleteSemaphore@4 @45 - EngDeleteSurface@4 @46 - EngDeleteWnd@4 @47 - EngDeviceIoControl@28 @48 - EngDitherColor@16 @49 - EngDxIoctl@12 @50 - EngEnumForms@24 @51 - EngEraseSurface@12 @52 - EngFileIoControl@28 @53 - EngFileWrite@16 @54 - EngFillPath@28 @55 - EngFindImageProcAddress@8 @56 - EngFindResource@16 @57 - EngFntCacheAlloc@8 @58 - EngFntCacheFault@8 @59 - EngFntCacheLookUp@8 @60 - EngFreeMem@4 @61 - EngFreeModule@4 @62 - EngFreePrivateUserMem@8 @63 - EngFreeSectionMem@8 @64 - EngFreeUserMem@4 @65 - EngGetCurrentCodePage@8 @66 - EngGetCurrentProcessId(a)0=NTOSKRNL.PsGetCurrentProcessId @67 - EngGetCurrentThreadId(a)0=NTOSKRNL.PsGetCurrentThreadId @68 - EngGetDriverName@4 @69 - EngGetFileChangeTime@8 @70 - EngGetFilePath@8 @71 - EngGetForm@24 @72 - EngGetLastError@0 @73 - EngGetPrinter@20 @74 - EngGetPrinterData@24 @75 - EngGetPrinterDataFileName@4 @76 - EngGetPrinterDriver@24 @77 - EngGetProcessHandle@0 @78 - EngGetTickCount@0 @79 - EngGetType1FontList@24 @80 - EngGradientFill@40 @81 - EngHangNotification@8 @82 - EngInitializeSafeSemaphore@4 @83 - EngIsSemaphoreOwned@4 @84 - EngIsSemaphoreOwnedByCurrentThread@4 @85 - EngLineTo@36 @86 - EngLoadImage@4 @87 - EngLoadModule@4 @88 - EngLoadModuleForWrite@8 @89 - EngLockDirectDrawSurface@4 @90 - EngLockDriverObj@4 @91 - EngLockSurface@4 @92 - EngLpkInstalled@0 @93 - EngMapEvent@20 @94 - EngMapFile@12 @95 - EngMapFontFile@12 @96 - EngMapFontFileFD@12 @97 - EngMapModule@8 @98 - EngMapSection@16 @99 - EngMarkBandingSurface@4 @100 - EngModifySurface@32 @101 - EngMovePointer@16 @102 - EngMulDiv@12 @103 - EngMultiByteToUnicodeN(a)20=NTOSKRNL.RtlMultiByteToUnicodeN @104 - EngMultiByteToWideChar@20 @105 - EngNineGrid@36 @106 - EngPaint@20 @107 - EngPlgBlt@44 @108 - EngProbeForRead(a)12=NTOSKRNL.ProbeForRead @109 - EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite @110 - EngQueryDeviceAttribute@24 @111 - EngQueryFileTimeStamp@4 @112 - EngQueryLocalTime@4 @113 - EngQueryPalette@16 @114 - EngQueryPerformanceCounter@4 @115 - EngQueryPerformanceFrequency@4 @116 - EngQuerySystemAttribute@8 @117 - EngReadStateEvent@4 @118 - EngReleaseSemaphore@4 @119 - EngRestoreFloatingPointState@4 @120 - EngSaveFloatingPointState@8 @121 - EngSecureMem@8 @122 - EngSetEvent@4 @123 - EngSetLastError@4 @124 - EngSetPointerShape@40 @125 - EngSetPointerTag@20 @126 - EngSetPrinterData@20 @127 - EngSort@16 @128 - EngStretchBlt@44 @129 - EngStretchBltROP@52 @130 - EngStrokeAndFillPath@40 @131 - EngStrokePath@32 @132 - EngTextOut@40 @133 - EngTransparentBlt@32 @134 - EngUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUnicodeToMultiByteN @135 - EngUnloadImage@4 @136 - EngUnlockDirectDrawSurface@4 @137 - EngUnlockDriverObj@4 @138 - EngUnlockSurface@4 @139 - EngUnmapEvent@4 @140 - EngUnmapFile@4 @141 - EngUnmapFontFile@4 @142 - EngUnmapFontFileFD@4 @143 - EngUnsecureMem@4 @144 - EngWaitForSingleObject@8 @145 - EngWideCharToMultiByte@20 @146 - EngWritePrinter@16 @147 - FLOATOBJ_Add@8 @148 - FLOATOBJ_AddFloat@8 @149 - FLOATOBJ_AddLong@8 @150 - FLOATOBJ_Div@8 @151 - FLOATOBJ_DivFloat@8 @152 - FLOATOBJ_DivLong@8 @153 - FLOATOBJ_Equal@8 @154 - FLOATOBJ_EqualLong@8 @155 - FLOATOBJ_GetFloat@4 @156 - FLOATOBJ_GetLong@4 @157 - FLOATOBJ_GreaterThan@8 @158 - FLOATOBJ_GreaterThanLong@8 @159 - FLOATOBJ_LessThan@8 @160 - FLOATOBJ_LessThanLong@8 @161 - FLOATOBJ_Mul@8 @162 - FLOATOBJ_MulFloat@8 @163 - FLOATOBJ_MulLong@8 @164 - FLOATOBJ_Neg@4 @165 - FLOATOBJ_SetFloat@8 @166 - FLOATOBJ_SetLong@8 @167 - FLOATOBJ_Sub@8 @168 - FLOATOBJ_SubFloat@8 @169 - FLOATOBJ_SubLong@8 @170 - FONTOBJ_cGetAllGlyphHandles@8 @171 - FONTOBJ_cGetGlyphs@20 @172 - FONTOBJ_pQueryGlyphAttrs@8 @173 - FONTOBJ_pfdg@4 @174 - FONTOBJ_pifi@4 @175 - FONTOBJ_pjOpenTypeTablePointer@12 @176 - FONTOBJ_pvTrueTypeFontFile@8 @177 - FONTOBJ_pwszFontFilePaths@8 @178 - FONTOBJ_pxoGetXform@4 @179 - FONTOBJ_vGetInfo@12 @180 - HT_ComputeRGBGammaTable@24 @181 - HT_Get8BPPFormatPalette@16 @182 - HT_Get8BPPMaskPalette@24 @183 - HeapVidMemAllocAligned@20 @184 - PALOBJ_cGetColors@16 @185 - PATHOBJ_bCloseFigure@4 @186 - PATHOBJ_bEnum@8 @187 - PATHOBJ_bEnumClipLines@12 @188 - PATHOBJ_bMoveTo@12 @189 - PATHOBJ_bPolyBezierTo@12 @190 - PATHOBJ_bPolyLineTo@12 @191 - PATHOBJ_vEnumStart@4 @192 - PATHOBJ_vEnumStartClipLines@16 @193 - PATHOBJ_vGetBounds@8 @194 - RtlAnsiCharToUnicodeChar(a)4=NTOSKRNL.RtlAnsiCharToUnicodeChar @195 - RtlMultiByteToUnicodeN(a)20=NTOSKRNL.RtlMultiByteToUnicodeN @196 - RtlRaiseException(a)4=NTOSKRNL.RtlRaiseException @197 - RtlUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUnicodeToMultiByteN @198 - RtlUnicodeToMultiByteSize(a)12=NTOSKRNL.RtlUnicodeToMultiByteSize @199 - RtlUnwind(a)16=NTOSKRNL.RtlUnwind @200 - RtlUpcaseUnicodeChar(a)4=NTOSKRNL.RtlUpcaseUnicodeChar @201 - RtlUpcaseUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN @202 - STROBJ_bEnum@12 @203 - STROBJ_bEnumPositionsOnly@12 @204 - STROBJ_bGetAdvanceWidths@16 @205 - STROBJ_dwGetCodePage@4 @206 - STROBJ_fxBreakExtra@4 @207 - STROBJ_fxCharacterExtra@4 @208 - STROBJ_vEnumStart@4 @209 - VidMemFree@8 @210 - WNDOBJ_bEnum@12 @211 - WNDOBJ_cEnumStart@16 @212 - WNDOBJ_vSetConsumer@8 @213 - XFORMOBJ_bApplyXform@20 @214 - XFORMOBJ_iGetFloatObjXform@8 @215 - XFORMOBJ_iGetXform@8 @216 - XLATEOBJ_cGetPalette@16 @217 - XLATEOBJ_hGetColorTransform@4 @218 - XLATEOBJ_iXlate@8 @219 - XLATEOBJ_piVector@4 @220 - _abnormal_termination=NTOSKRNL._abnormal_termination @221 - _except_handler2=NTOSKRNL._except_handler2 @222 - _global_unwind2=NTOSKRNL._global_unwind2 @223 - _itoa=NTOSKRNL._itoa @224 - _itow=NTOSKRNL._itow @225 - _local_unwind2=NTOSKRNL._local_unwind2 @226

1 0

[mjmartin] 50231: [usb/usbehci]: - Remove all hardware related structs from usbehci.h as they are now in hardware.h. - Add debugging routines for usb descriptors, queue heads and transfer descripto...
by mjmartin＠svn.reactos.org 31 Dec '10

31 Dec '10

Author: mjmartin Date: Fri Dec 31 12:26:12 2010 New Revision: 50231 URL: http://svn.reactos.org/svn/reactos?rev=50231&view=rev Log: [usb/usbehci]: - Remove all hardware related structs from usbehci.h as they are now in hardware.h. - Add debugging routines for usb descriptors, queue heads and transfer descriptors. - This will break building usbehci, but not a problem as it is not included in the default build. Will be fixed with later commit. Modified: trunk/reactos/drivers/usb/usbehci/common.c trunk/reactos/drivers/usb/usbehci/usbehci.h Modified: trunk/reactos/drivers/usb/usbehci/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/common… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] Fri Dec 31 12:26:12 2010 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/usb/usbehci/common.c - * PURPOSE: Common operations in FDO/PDO. + * PURPOSE: Common operations. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) */ @@ -12,7 +12,109 @@ #include <wdmguid.h> #include <stdio.h> -/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ +VOID +DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) +{ + DPRINT1("Dumping Device Descriptor %x\n", DeviceDescriptor); + DPRINT1("bLength %x\n", DeviceDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType); + DPRINT1("bcdUSB %x\n", DeviceDescriptor->bcdUSB); + DPRINT1("bDeviceClass %x\n", DeviceDescriptor->bDeviceClass); + DPRINT1("bDeviceSubClass %x\n", DeviceDescriptor->bDeviceSubClass); + DPRINT1("bDeviceProtocol %x\n", DeviceDescriptor->bDeviceProtocol); + DPRINT1("bMaxPacketSize0 %x\n", DeviceDescriptor->bMaxPacketSize0); + DPRINT1("idVendor %x\n", DeviceDescriptor->idVendor); + DPRINT1("idProduct %x\n", DeviceDescriptor->idProduct); + DPRINT1("bcdDevice %x\n", DeviceDescriptor->bcdDevice); + DPRINT1("iManufacturer %x\n", DeviceDescriptor->iManufacturer); + DPRINT1("iProduct %x\n", DeviceDescriptor->iProduct); + DPRINT1("iSerialNumber %x\n", DeviceDescriptor->iSerialNumber); + DPRINT1("bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); +} + +VOID +DumpFullConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + LONG i, j; + + DPRINT1("Dumping ConfigurationDescriptor %x\n", ConfigurationDescriptor); + DPRINT1("bLength %x\n", ConfigurationDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", ConfigurationDescriptor->bDescriptorType); + DPRINT1("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength); + DPRINT1("bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); + DPRINT1("bConfigurationValue %x\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); + DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); + + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR) ((ULONG_PTR)ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + for (i=0; i < ConfigurationDescriptor->bNumInterfaces; i++) + { + DPRINT1("- Dumping InterfaceDescriptor %x\n", InterfaceDescriptor); + DPRINT1(" bLength %x\n", InterfaceDescriptor->bLength); + DPRINT1(" bDescriptorType %x\n", InterfaceDescriptor->bDescriptorType); + DPRINT1(" bInterfaceNumber %x\n", InterfaceDescriptor->bInterfaceNumber); + DPRINT1(" bAlternateSetting %x\n", InterfaceDescriptor->bAlternateSetting); + DPRINT1(" bNumEndpoints %x\n", InterfaceDescriptor->bNumEndpoints); + DPRINT1(" bInterfaceClass %x\n", InterfaceDescriptor->bInterfaceClass); + DPRINT1(" bInterfaceSubClass %x\n", InterfaceDescriptor->bInterfaceSubClass); + DPRINT1(" bInterfaceProtocol %x\n", InterfaceDescriptor->bInterfaceProtocol); + DPRINT1(" iInterface %x\n", InterfaceDescriptor->iInterface); + + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)InterfaceDescriptor + sizeof(USB_INTERFACE_DESCRIPTOR)); + + for (j=0; j < InterfaceDescriptor->bNumEndpoints; j++) + { + DPRINT1(" bLength %x\n", EndpointDescriptor->bLength); + DPRINT1(" bDescriptorType %x\n", EndpointDescriptor->bDescriptorType); + DPRINT1(" bEndpointAddress %x\n", EndpointDescriptor->bEndpointAddress); + DPRINT1(" bmAttributes %x\n", EndpointDescriptor->bmAttributes); + DPRINT1(" wMaxPacketSize %x\n", EndpointDescriptor->wMaxPacketSize); + DPRINT1(" bInterval %x\n", EndpointDescriptor->bInterval); + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)EndpointDescriptor + sizeof(USB_ENDPOINT_DESCRIPTOR)); + } + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ULONG_PTR)EndpointDescriptor; + } + +} + +VOID +DumpQueueHead(PQUEUE_HEAD QueueHead) +{ + DPRINT1("Dumping QueueHead %x\n", QueueHead); + DPRINT1(" CurrentLinkPointer %x\n", QueueHead->CurrentLinkPointer); + DPRINT1(" NextPointer %x\n", QueueHead->NextPointer); + DPRINT1(" AlternateNextPointer %x\n", QueueHead->AlternateNextPointer); + DPRINT1(" HorizontalLinkPointer %x\n", QueueHead->HorizontalLinkPointer); + DPRINT1(" Active %x\n", QueueHead->Token.Bits.Active); + DPRINT1(" Halted %x\n", QueueHead->Token.Bits.Halted); + DPRINT1(" DataBufferError %x\n", QueueHead->Token.Bits.DataBufferError); + DPRINT1(" BabbleDetected %x\n", QueueHead->Token.Bits.BabbleDetected); + DPRINT1(" TransactionError %x\n", QueueHead->Token.Bits.TransactionError); + DPRINT1(" MissedMicroFrame %x\n", QueueHead->Token.Bits.MissedMicroFrame); + DPRINT1(" PingState %x\n", QueueHead->Token.Bits.PingState); + DPRINT1(" SplitTransactionState %x\n", QueueHead->Token.Bits.SplitTransactionState); + DPRINT1(" ErrorCounter %x\n", QueueHead->Token.Bits.ErrorCounter); + DPRINT1(" First TransferDescriptor %x\n", QueueHead->TransferDescriptor); +} + +VOID +DumpTransferDescriptor(PQUEUE_TRANSFER_DESCRIPTOR TransferDescriptor) +{ + DPRINT1("Dumping Descriptor %x\n", TransferDescriptor); + DPRINT1(" Active %x\n", TransferDescriptor->Token.Bits.Active); + DPRINT1(" Halted %x\n", TransferDescriptor->Token.Bits.Halted); + DPRINT1(" DataBufferError %x\n", TransferDescriptor->Token.Bits.DataBufferError); + DPRINT1(" BabbleDetected %x\n", TransferDescriptor->Token.Bits.BabbleDetected); + DPRINT1(" TransactionError %x\n", TransferDescriptor->Token.Bits.TransactionError); + DPRINT1(" MissedMicroFrame %x\n", TransferDescriptor->Token.Bits.MissedMicroFrame); + DPRINT1(" PingState %x\n", TransferDescriptor->Token.Bits.PingState); + DPRINT1(" SplitTransactionState %x\n", TransferDescriptor->Token.Bits.SplitTransactionState); + DPRINT1(" ErrorCounter %x\n", TransferDescriptor->Token.Bits.ErrorCounter); +} NTSTATUS NTAPI GetBusInterface(PDEVICE_OBJECT DeviceObject, PBUS_INTERFACE_STANDARD busInterface) Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Fri Dec 31 12:26:12 2010 @@ -1,5 +1,6 @@ #pragma once +#include "hardware.h" #include <ntifs.h> #include <ntddk.h> #include <stdio.h> @@ -15,67 +16,11 @@ #define DEVICESTARTED 0x02 #define DEVICEBUSY 0x04 #define DEVICESTOPPED 0x08 +#define DEVICESTALLED 0x10 #define MAX_USB_DEVICES 127 #define EHCI_MAX_SIZE_TRANSFER 0x100000 - -/* USB Command Register */ -#define EHCI_USBCMD 0x00 -#define EHCI_USBSTS 0x04 -#define EHCI_USBINTR 0x08 -#define EHCI_FRINDEX 0x0C -#define EHCI_CTRLDSSEGMENT 0x10 -#define EHCI_PERIODICLISTBASE 0x14 -#define EHCI_ASYNCLISTBASE 0x18 -#define EHCI_CONFIGFLAG 0x40 -#define EHCI_PORTSC 0x44 - -/* USB Interrupt Register Flags 32 Bits */ -#define EHCI_USBINTR_INTE 0x01 -#define EHCI_USBINTR_ERR 0x02 -#define EHCI_USBINTR_PC 0x04 -#define EHCI_USBINTR_FLROVR 0x08 -#define EHCI_USBINTR_HSERR 0x10 -#define EHCI_USBINTR_ASYNC 0x20 -/* Bits 6:31 Reserved */ - -/* Status Register Flags 32 Bits */ -#define EHCI_STS_INT 0x01 -#define EHCI_STS_ERR 0x02 -#define EHCI_STS_PCD 0x04 -#define EHCI_STS_FLR 0x08 -#define EHCI_STS_FATAL 0x10 -#define EHCI_STS_IAA 0x20 -/* Bits 11:6 Reserved */ -#define EHCI_STS_HALT 0x1000 -#define EHCI_STS_RECL 0x2000 -#define EHCI_STS_PSS 0x4000 -#define EHCI_STS_ASS 0x8000 -#define EHCI_ERROR_INT ( EHCI_STS_FATAL | EHCI_STS_ERR ) - - -/* Last bit in QUEUE ELEMENT TRANSFER DESCRIPTOR Next Pointer */ -/* Used for Queue Element Transfer Descriptor Pointers - and Queue Head Horizontal Link Pointers */ -#define TERMINATE_POINTER 0x01 - -/* QUEUE ELEMENT TRANSFER DESCRIPTOR, Token defines and structs */ - -/* PIDCodes for QETD_TOKEN -OR with QUEUE_TRANSFER_DESCRIPTOR Token.PIDCode*/ -#define PID_CODE_OUT_TOKEN 0x00 -#define PID_CODE_IN_TOKEN 0x01 -#define PID_CODE_SETUP_TOKEN 0x02 - -/* Split Transaction States -OR with QUEUE_TRANSFER_DESCRIPTOR Token.SplitTransactionState */ -#define DO_START_SPLIT 0x00 -#define DO_COMPLETE_SPLIT 0x01 - -/* Ping States, OR with QUEUE_TRANSFER_DESCRIPTOR Token. */ -#define PING_STATE_DO_OUT 0x00 -#define PING_STATE_DO_PING 0x01 #define C_HUB_LOCAL_POWER 0 #define C_HUB_OVER_CURRENT 1 @@ -96,113 +41,6 @@ #define PORT_INDICATOR 22 #define USB_PORT_STATUS_CHANGE 0x4000 -/* QUEUE ELEMENT TRANSFER DESCRIPTOR TOKEN */ -typedef struct _QETD_TOKEN_BITS -{ - ULONG PingState:1; - ULONG SplitTransactionState:1; - ULONG MissedMicroFrame:1; - ULONG TransactionError:1; - ULONG BabbelDetected:1; - ULONG DataBufferError:1; - ULONG Halted:1; - ULONG Active:1; - ULONG PIDCode:2; - ULONG ErrorCounter:2; - ULONG CurrentPage:3; - ULONG InterruptOnComplete:1; - ULONG TotalBytesToTransfer:15; - ULONG DataToggle:1; -} QETD_TOKEN_BITS, *PQETD_TOKEN_BITS; - - -/* QUEUE ELEMENT TRANSFER DESCRIPTOR */ -typedef struct _QUEUE_TRANSFER_DESCRIPTOR -{ - ULONG NextPointer; - ULONG AlternateNextPointer; - union - { - QETD_TOKEN_BITS Bits; - ULONG DWord; - } Token; - ULONG BufferPointer[5]; -} QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; - -/* EndPointSpeeds of END_POINT_CAPABILITIES */ -#define QH_ENDPOINT_FULLSPEED 0x00 -#define QH_ENDPOINT_LOWSPEED 0x01 -#define QH_ENDPOINT_HIGHSPEED 0x02 - -typedef struct _END_POINT_CAPABILITIES1 -{ - ULONG DeviceAddress:7; - ULONG InactiveOnNextTransaction:1; - ULONG EndPointNumber:4; - ULONG EndPointSpeed:2; - ULONG QEDTDataToggleControl:1; - ULONG HeadOfReclamation:1; - ULONG MaximumPacketLength:11; - ULONG ControlEndPointFlag:1; - ULONG NakCountReload:4; -} END_POINT_CAPABILITIES1, *PEND_POINT_CAPABILITIES1; - -typedef struct _END_POINT_CAPABILITIES2 -{ - ULONG InterruptScheduleMask:8; - ULONG SplitCompletionMask:8; - ULONG HubAddr:6; - ULONG PortNumber:6; - /* Multi */ - ULONG NumberOfTransactionPerFrame:2; -} END_POINT_CAPABILITIES2, *PEND_POINT_CAPABILITIES2; - - -/* QUEUE HEAD defines and structs */ - -/* QUEUE HEAD Select Types, OR with QUEUE_HEAD HorizontalLinkPointer */ -#define QH_TYPE_IDT 0x00 -#define QH_TYPE_QH 0x02 -#define QH_TYPE_SITD 0x04 -#define QH_TYPE_FSTN 0x06 - -/* QUEUE HEAD */ -typedef struct _QUEUE_HEAD -{ - ULONG HorizontalLinkPointer; - END_POINT_CAPABILITIES1 EndPointCapabilities1; - END_POINT_CAPABILITIES2 EndPointCapabilities2; - /* TERMINATE_POINTER not valid for this member */ - ULONG CurrentLinkPointer; - /* TERMINATE_POINTER valid */ - ULONG QETDPointer; - /* TERMINATE_POINTER valid, bits 1:4 is NAK_COUNTER */ - ULONG AlternateNextPointer; - /* Only DataToggle, InterruptOnComplete, ErrorCounter, PingState valid */ - union - { - QETD_TOKEN_BITS Bits; - ULONG DWord; - } Token; - ULONG BufferPointer[5]; -} QUEUE_HEAD, *PQUEUE_HEAD; - -typedef struct _EHCI_SETUP_FORMAT -{ - UCHAR bmRequestType; - UCHAR bRequest; - USHORT wValue; - USHORT wIndex; - USHORT wLength; -} EHCI_SETUP_FORMAT, *PEHCI_SETUP_FORMAT; - -typedef struct _STRING_DESCRIPTOR -{ - UCHAR bLength; /* Size of this descriptor in bytes */ - UCHAR bDescriptorType; /* STRING Descriptor Type */ - UCHAR bString[0]; /* UNICODE encoded string */ -} STRING_DESCRIPTOR, *PSTRING_DESCRIPTOR; - typedef struct _USB_ENDPOINT { ULONG Flags; @@ -234,102 +72,16 @@ USB_DEVICE_SPEED DeviceSpeed; USB_DEVICE_TYPE DeviceType; USB_DEVICE_DESCRIPTOR DeviceDescriptor; + UNICODE_STRING LanguageIDs; + UNICODE_STRING iManufacturer; + UNICODE_STRING iProduct; + UNICODE_STRING iSerialNumber; USB_CONFIGURATION *ActiveConfig; USB_INTERFACE *ActiveInterface; USB_CONFIGURATION **Configs; - } USB_DEVICE, *PUSB_DEVICE; -/* USBCMD register 32 bits */ -typedef struct _EHCI_USBCMD_CONTENT -{ - ULONG Run : 1; - ULONG HCReset : 1; - ULONG FrameListSize : 2; - ULONG PeriodicEnable : 1; - ULONG AsyncEnable : 1; - ULONG DoorBell : 1; - ULONG LightReset : 1; - ULONG AsyncParkCount : 2; - ULONG Reserved : 1; - ULONG AsyncParkEnable : 1; - ULONG Reserved1 : 4; - ULONG IntThreshold : 8; - ULONG Reserved2 : 8; - -} EHCI_USBCMD_CONTENT, *PEHCI_USBCMD_CONTENT; - -typedef struct _EHCI_USBSTS_CONTENT -{ - ULONG USBInterrupt:1; - ULONG ErrorInterrupt:1; - ULONG DetectChangeInterrupt:1; - ULONG FrameListRolloverInterrupt:1; - ULONG HostSystemErrorInterrupt:1; - ULONG AsyncAdvanceInterrupt:1; - ULONG Reserved:6; - ULONG HCHalted:1; - ULONG Reclamation:1; - ULONG PeriodicScheduleStatus:1; - ULONG AsynchronousScheduleStatus:1; -} EHCI_USBSTS_CONTEXT, *PEHCI_USBSTS_CONTEXT; - -typedef struct _EHCI_USBPORTSC_CONTENT -{ - ULONG CurrentConnectStatus:1; - ULONG ConnectStatusChange:1; - ULONG PortEnabled:1; - ULONG PortEnableChanged:1; - ULONG OverCurrentActive:1; - ULONG OverCurrentChange:1; - ULONG ForcePortResume:1; - ULONG Suspend:1; - ULONG PortReset:1; - ULONG Reserved:1; - ULONG LineStatus:2; - ULONG PortPower:1; - ULONG PortOwner:1; -} EHCI_USBPORTSC_CONTENT, *PEHCI_USBPORTSC_CONTENT; - -typedef struct _EHCI_HCS_CONTENT -{ - ULONG PortCount : 4; - ULONG PortPowerControl: 1; - ULONG Reserved : 2; - ULONG PortRouteRules : 1; - ULONG PortPerCHC : 4; - ULONG CHCCount : 4; - ULONG PortIndicator : 1; - ULONG Reserved2 : 3; - ULONG DbgPortNum : 4; - ULONG Reserved3 : 8; - -} EHCI_HCS_CONTENT, *PEHCI_HCS_CONTENT; - -typedef struct _EHCI_HCC_CONTENT -{ - ULONG CurAddrBits : 1; - ULONG VarFrameList : 1; - ULONG ParkMode : 1; - ULONG Reserved : 1; - ULONG IsoSchedThreshold : 4; - ULONG EECPCapable : 8; - ULONG Reserved2 : 16; - -} EHCI_HCC_CONTENT, *PEHCI_HCC_CONTENT; - -typedef struct _EHCI_CAPS { - UCHAR Length; - UCHAR Reserved; - USHORT HCIVersion; - union - { - EHCI_HCS_CONTENT HCSParams; - ULONG HCSParamsLong; - }; - ULONG HCCParams; - UCHAR PortRoute [8]; -} EHCI_CAPS, *PEHCI_CAPS; + typedef struct _COMMON_DEVICE_EXTENSION { @@ -380,26 +132,21 @@ BUS_INTERFACE_STANDARD BusInterface; - EHCI_CAPS ECHICaps; - union { - PULONG ResourcePort; - PULONG ResourceMemory; + ULONG ResourcePort; + ULONG ResourceMemory; }; - PULONG PeriodicFramList; - PULONG AsyncListQueueHeadPtr; - PHYSICAL_ADDRESS PeriodicFramListPhysAddr; - PHYSICAL_ADDRESS AsyncListQueueHeadPtrPhysAddr; - - FAST_MUTEX AsyncListMutex; + EHCI_HOST_CONTROLLER hcd; + PERIODICFRAMELIST PeriodicFrameList; + FAST_MUTEX FrameListMutex; BOOLEAN AsyncComplete; - PULONG ResourceBase; - ULONG Size; + //PULONG ResourceBase; + //ULONG Size; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct _PDO_DEVICE_EXTENSION @@ -425,6 +172,12 @@ FAST_MUTEX ListLock; } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; +typedef struct _WORKITEMDATA +{ + WORK_QUEUE_ITEM WorkItem; + PVOID Context; +} WORKITEMDATA, *PWORKITEMDATA; + VOID NTAPI UrbWorkerThread(PVOID Context); @@ -464,7 +217,7 @@ NTSTATUS NTAPI FdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); -BOOLEAN +USBD_STATUS ExecuteControlRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, UCHAR Address, ULONG Port, PVOID Buffer, ULONG BufferLength); VOID @@ -485,5 +238,16 @@ PUSB_DEVICE DeviceHandleToUsbDevice(PPDO_DEVICE_EXTENSION PdoDeviceExtension, PUSB_DEVICE_HANDLE DeviceHandle); -BOOLEAN -ResetPort(PFDO_DEVICE_EXTENSION FdoDeviceExtension, UCHAR Port); +VOID +DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); + +VOID +DumpFullConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); + + +VOID +DumpTransferDescriptor(PQUEUE_TRANSFER_DESCRIPTOR TransferDescriptor); + +VOID +DumpQueueHead(PQUEUE_HEAD QueueHead); +

1 0

[mjmartin] 50230: [usb/usbehci]: - Implement creating and deleting Queue Heads and Transfer Descriptors from common buffer. - Implement linking/unlinking QueueHeads to create a linked list for Asyn...
by mjmartin＠svn.reactos.org 31 Dec '10

31 Dec '10

Author: mjmartin Date: Fri Dec 31 12:01:21 2010 New Revision: 50230 URL: http://svn.reactos.org/svn/reactos?rev=50230&view=rev Log: [usb/usbehci]: - Implement creating and deleting Queue Heads and Transfer Descriptors from common buffer. - Implement linking/unlinking QueueHeads to create a linked list for Asynchronous Schedule traversal. - Implement BuildSetupPacketFromURB for creating a setup packet from a URB. - Implement SubmitControlTransfer. Added: trunk/reactos/drivers/usb/usbehci/hwiface.c (with props) trunk/reactos/drivers/usb/usbehci/hwiface.h (with props) trunk/reactos/drivers/usb/usbehci/transfer.c (with props) trunk/reactos/drivers/usb/usbehci/transfer.h (with props) Added: trunk/reactos/drivers/usb/usbehci/hwiface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hwifac… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hwiface.c (added) +++ trunk/reactos/drivers/usb/usbehci/hwiface.c [iso-8859-1] Fri Dec 31 12:01:21 2010 @@ -1,0 +1,175 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/hwiface.c + * PURPOSE: EHCI Interface routines: Queue Heads and Queue Element + Transfer Descriptors. + * TODO: Periodic Frame List, Isochronous Transaction Descriptors + and Split-transaction ITD. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + */ + +#include "hwiface.h" +#include "physmem.h" +#define NDEBUG +#include <debug.h> + +/* Queue Element Transfer Descriptors */ + +PQUEUE_TRANSFER_DESCRIPTOR +CreateDescriptor(PEHCI_HOST_CONTROLLER hcd, UCHAR PIDCode, ULONG TotalBytesToTransfer) +{ + PQUEUE_TRANSFER_DESCRIPTOR Descriptor; + ULONG PhysicalAddress; + UCHAR i; + KIRQL OldIrql; + + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + Descriptor = (PQUEUE_TRANSFER_DESCRIPTOR)AllocateMemory(hcd, sizeof(QUEUE_TRANSFER_DESCRIPTOR), &PhysicalAddress); + RtlZeroMemory(Descriptor, sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + Descriptor->NextPointer = TERMINATE_POINTER; + Descriptor->AlternateNextPointer = TERMINATE_POINTER; + Descriptor->Token.Bits.DataToggle = TRUE; + Descriptor->Token.Bits.InterruptOnComplete = TRUE; + Descriptor->Token.Bits.ErrorCounter = 0x03; + Descriptor->Token.Bits.Active = TRUE; + Descriptor->Token.Bits.PIDCode = PIDCode; + Descriptor->Token.Bits.TotalBytesToTransfer = TotalBytesToTransfer; + Descriptor->PhysicalAddr = PhysicalAddress; + for (i=0;i<5;i++) + Descriptor->BufferPointer[i] = 0; + + KeReleaseSpinLock(&hcd->Lock, OldIrql); + + return Descriptor; +} + +VOID +FreeDescriptor(PQUEUE_TRANSFER_DESCRIPTOR Descriptor) +{ + ReleaseMemory((ULONG)Descriptor); +} + +/* Queue Head */ + +VOID +DumpQueueHeadList(PEHCI_HOST_CONTROLLER hcd) +{ + KIRQL OldIrql; + + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + PQUEUE_HEAD QueueHead = (PQUEUE_HEAD)hcd->CommonBufferVA; + PQUEUE_HEAD FirstQueueHead = QueueHead; + DPRINT1("Dumping QueueHead List!!!!!!!!!!!!!\n"); + while (1) + { + DPRINT1("QueueHead Address %x\n", QueueHead); + DPRINT1("QueueHead->PreviousQueueHead = %x\n", QueueHead->PreviousQueueHead); + DPRINT1("QueueHead->NextQueueHead = %x\n", QueueHead->NextQueueHead); + DPRINT1(" ---> PhysicalAddress %x\n", (ULONG)MmGetPhysicalAddress(QueueHead).LowPart); + DPRINT1("QueueHead->HorizontalLinkPointer %x\n", QueueHead->HorizontalLinkPointer); + QueueHead = QueueHead->NextQueueHead; + DPRINT1("Next QueueHead %x\n", QueueHead); + if (QueueHead == FirstQueueHead) break; + } + DPRINT1("-----------------------------------\n"); + KeReleaseSpinLock(&hcd->Lock, OldIrql); +} + +PQUEUE_HEAD +CreateQueueHead(PEHCI_HOST_CONTROLLER hcd) +{ + PQUEUE_HEAD CurrentQH; + ULONG PhysicalAddress , i; + KIRQL OldIrql; + + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + CurrentQH = (PQUEUE_HEAD)AllocateMemory(hcd, sizeof(QUEUE_HEAD), &PhysicalAddress); + RtlZeroMemory(CurrentQH, sizeof(QUEUE_HEAD)); + + ASSERT(CurrentQH); + CurrentQH->PhysicalAddr = PhysicalAddress; + CurrentQH->HorizontalLinkPointer = TERMINATE_POINTER; + CurrentQH->CurrentLinkPointer = TERMINATE_POINTER; + CurrentQH->AlternateNextPointer = TERMINATE_POINTER; + CurrentQH->NextPointer = TERMINATE_POINTER; + + /* 1 for non high speed, 0 for high speed device */ + CurrentQH->EndPointCharacteristics.ControlEndPointFlag = 0; + CurrentQH->EndPointCharacteristics.HeadOfReclamation = FALSE; + CurrentQH->EndPointCharacteristics.MaximumPacketLength = 64; + + /* Set NakCountReload to max value possible */ + CurrentQH->EndPointCharacteristics.NakCountReload = 0xF; + + /* Get the Initial Data Toggle from the QEDT */ + CurrentQH->EndPointCharacteristics.QEDTDataToggleControl = TRUE; + + /* High Speed Device */ + CurrentQH->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; + + CurrentQH->EndPointCapabilities.NumberOfTransactionPerFrame = 0x03; + + CurrentQH->Token.DWord = 0; + CurrentQH->NextQueueHead = NULL; + CurrentQH->PreviousQueueHead = NULL; + for (i=0; i<5; i++) + CurrentQH->BufferPointer[i] = 0; + + CurrentQH->Token.Bits.InterruptOnComplete = TRUE; + + KeReleaseSpinLock(&hcd->Lock, OldIrql); + return CurrentQH; +} + +VOID +LinkQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead) +{ + KIRQL OldIrql; + PQUEUE_HEAD CurrentHead = (PQUEUE_HEAD)hcd->AsyncListQueue; + PQUEUE_HEAD PreviousHead = CurrentHead->PreviousQueueHead; + + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + QueueHead->HorizontalLinkPointer = (CurrentHead->HorizontalLinkPointer | QH_TYPE_QH) & ~TERMINATE_POINTER; + QueueHead->NextQueueHead = CurrentHead; + QueueHead->PreviousQueueHead = PreviousHead; + + CurrentHead->PreviousQueueHead = QueueHead; + if (PreviousHead) + PreviousHead->NextQueueHead = QueueHead; + + CurrentHead->HorizontalLinkPointer = QueueHead->PhysicalAddr | QH_TYPE_QH; + + KeReleaseSpinLock(&hcd->Lock, OldIrql); +} + +VOID +UnlinkQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead) +{ + KIRQL OldIrql; + PQUEUE_HEAD PreviousHead = QueueHead->PreviousQueueHead; + PQUEUE_HEAD NextHead = QueueHead->NextQueueHead; + KeAcquireSpinLock(&hcd->Lock, &OldIrql); + + if (PreviousHead) + { + PreviousHead->NextQueueHead = NextHead; + PreviousHead->HorizontalLinkPointer = QueueHead->HorizontalLinkPointer; + } + if (NextHead) + NextHead->PreviousQueueHead = PreviousHead; + + KeReleaseSpinLock(&hcd->Lock, OldIrql); +} + +VOID +DeleteQueueHead(PQUEUE_HEAD QueueHead) +{ + ReleaseMemory((ULONG)QueueHead); +} + Propchange: trunk/reactos/drivers/usb/usbehci/hwiface.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/hwiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hwifac… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hwiface.h (added) +++ trunk/reactos/drivers/usb/usbehci/hwiface.h [iso-8859-1] Fri Dec 31 12:01:21 2010 @@ -1,0 +1,24 @@ +#include "hardware.h" +#include <ntddk.h> + +PQUEUE_TRANSFER_DESCRIPTOR +CreateDescriptor(PEHCI_HOST_CONTROLLER hcd, UCHAR PIDCode, ULONG TotalBytesToTransfer); + +VOID +FreeDescriptor(PQUEUE_TRANSFER_DESCRIPTOR Descriptor); + +VOID +DumpQueueHeadList(PEHCI_HOST_CONTROLLER hcd); + +PQUEUE_HEAD +CreateQueueHead(PEHCI_HOST_CONTROLLER hcd); + +VOID +LinkQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead); + +VOID +UnlinkQueueHead(PEHCI_HOST_CONTROLLER hcd, PQUEUE_HEAD QueueHead); + +VOID +DeleteQueueHead(PQUEUE_HEAD QueueHead); + Propchange: trunk/reactos/drivers/usb/usbehci/hwiface.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/transfer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/transf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/transfer.c (added) +++ trunk/reactos/drivers/usb/usbehci/transfer.c [iso-8859-1] Fri Dec 31 12:01:21 2010 @@ -1,0 +1,217 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/transfer.c + * PURPOSE: Transfers to EHCI. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + */ + +#include "transfer.h" +#include <debug.h> + +VOID +BuildSetupPacketFromURB(PEHCI_HOST_CONTROLLER hcd, PURB Urb, PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup) +{ + switch (Urb->UrbHeader.Function) + { + /* CLEAR FEATURE */ + case URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE: + case URB_FUNCTION_CLEAR_FEATURE_TO_INTERFACE: + case URB_FUNCTION_CLEAR_FEATURE_TO_ENDPOINT: + DPRINT1("Not implemented!\n"); + break; + + /* GET CONFIG */ + case URB_FUNCTION_GET_CONFIGURATION: + CtrlSetup->bRequest = USB_REQUEST_GET_CONFIGURATION; + CtrlSetup->bmRequestType.B = 0x80; + CtrlSetup->wLength = 1; + break; + + /* GET DESCRIPTOR */ + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + CtrlSetup->bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup->wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; + CtrlSetup->wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + CtrlSetup->wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + CtrlSetup->wLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + CtrlSetup->bmRequestType.B = 0x80; + break; + + /* GET INTERFACE */ + case URB_FUNCTION_GET_INTERFACE: + CtrlSetup->bRequest = USB_REQUEST_GET_CONFIGURATION; + CtrlSetup->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup->bmRequestType.B = 0x80; + CtrlSetup->wLength = 1; + break; + + /* GET STATUS */ + case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + CtrlSetup->bRequest = USB_REQUEST_GET_STATUS; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + CtrlSetup->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup->bmRequestType.B = 0x80; + CtrlSetup->wLength = 2; + break; + + case URB_FUNCTION_GET_STATUS_FROM_INTERFACE: + CtrlSetup->bRequest = USB_REQUEST_GET_STATUS; + ASSERT(Urb->UrbControlGetStatusRequest.Index != 0); + CtrlSetup->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup->bmRequestType.B = 0x81; + CtrlSetup->wLength = 2; + break; + + case URB_FUNCTION_GET_STATUS_FROM_ENDPOINT: + CtrlSetup->bRequest = USB_REQUEST_GET_STATUS; + ASSERT(Urb->UrbControlGetStatusRequest.Index != 0); + CtrlSetup->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup->bmRequestType.B = 0x82; + CtrlSetup->wLength = 2; + break; + + /* SET ADDRESS */ + + /* SET CONFIG */ + case URB_FUNCTION_SELECT_CONFIGURATION: + CtrlSetup->bRequest = USB_REQUEST_SET_CONFIGURATION; + CtrlSetup->bmRequestType.B = 0x00; + break; + + /* SET DESCRIPTOR */ + case URB_FUNCTION_SET_DESCRIPTOR_TO_DEVICE: + case URB_FUNCTION_SET_DESCRIPTOR_TO_INTERFACE: + case URB_FUNCTION_SET_DESCRIPTOR_TO_ENDPOINT: + DPRINT1("Not implemented\n"); + break; + + /* SET FEATURE */ + case URB_FUNCTION_SET_FEATURE_TO_DEVICE: + CtrlSetup->bRequest = USB_REQUEST_SET_FEATURE; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + CtrlSetup->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup->bmRequestType.B = 0x80; + break; + + case URB_FUNCTION_SET_FEATURE_TO_INTERFACE: + CtrlSetup->bRequest = USB_REQUEST_SET_FEATURE; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + CtrlSetup->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup->bmRequestType.B = 0x81; + break; + + case URB_FUNCTION_SET_FEATURE_TO_ENDPOINT: + CtrlSetup->bRequest = USB_REQUEST_SET_FEATURE; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + CtrlSetup->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup->bmRequestType.B = 0x82; + break; + + /* SET INTERFACE*/ + case URB_FUNCTION_SELECT_INTERFACE: + DPRINT1("Not implemented\n"); + break; + + /* SYNC FRAME */ + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + DPRINT1("Not implemented\n"); + break; + default: + DPRINT1("Unknown USB Request!\n"); + break; + } +} + +BOOLEAN +SubmitControlTransfer(PEHCI_HOST_CONTROLLER hcd, + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, + PVOID TransferBuffer, + ULONG TransferBufferLength, + PIRP IrpToComplete) +{ + PQUEUE_HEAD QueueHead; + PQUEUE_TRANSFER_DESCRIPTOR Descriptor[3]; + ULONG MdlPhysicalAddr; + PKEVENT Event = NULL; + PMDL pMdl = NULL; + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetupVA, CtrlPhysicalPA; + + CtrlSetupVA = (PUSB_DEFAULT_PIPE_SETUP_PACKET)AllocateMemory(hcd, + sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), + (ULONG*)&CtrlPhysicalPA); + + RtlCopyMemory(CtrlSetupVA, CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + /* If no Irp then wait on completion */ + if (IrpToComplete == NULL) + { + Event = ExAllocatePool(NonPagedPool, sizeof(KEVENT)); + KeInitializeEvent(Event, NotificationEvent, FALSE); + } + + /* Allocate Mdl for Buffer */ + pMdl = IoAllocateMdl(TransferBuffer, + TransferBufferLength, + FALSE, + FALSE, + NULL); + + /* Lock Physical Pages */ + MmBuildMdlForNonPagedPool(pMdl); + //MmProbeAndLockPages(pMdl, KernelMode, IoReadAccess); + + MdlPhysicalAddr = MmGetPhysicalAddress((PVOID)TransferBuffer).LowPart; + + QueueHead = CreateQueueHead(hcd); + + Descriptor[0] = CreateDescriptor(hcd, + PID_CODE_SETUP_TOKEN, + sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + + Descriptor[0]->Token.Bits.InterruptOnComplete = FALSE; + Descriptor[0]->Token.Bits.DataToggle = FALSE; + + /* Save the first descriptor */ + QueueHead->TransferDescriptor = Descriptor[0]; + + Descriptor[1] = CreateDescriptor(hcd, + PID_CODE_IN_TOKEN, + TransferBufferLength); + + Descriptor[2] = CreateDescriptor(hcd, + PID_CODE_OUT_TOKEN, + 0); + + Descriptor[1]->Token.Bits.InterruptOnComplete = FALSE; + + /* Link the descriptors */ + Descriptor[0]->NextDescriptor = Descriptor[1]; + Descriptor[1]->NextDescriptor = Descriptor[2]; + Descriptor[1]->PreviousDescriptor = Descriptor[0]; + Descriptor[2]->PreviousDescriptor = Descriptor[1]; + + /* Assign the descritors buffers */ + Descriptor[0]->BufferPointer[0] = (ULONG)CtrlPhysicalPA; + Descriptor[1]->BufferPointer[0] = MdlPhysicalAddr; + + Descriptor[0]->NextPointer = Descriptor[1]->PhysicalAddr; + Descriptor[1]->NextPointer = Descriptor[2]->PhysicalAddr; + QueueHead->NextPointer = Descriptor[0]->PhysicalAddr; + + QueueHead->IrpToComplete = IrpToComplete; + QueueHead->MdlToFree = pMdl; + QueueHead->Event = Event; + + /* Link in the QueueHead */ + LinkQueueHead(hcd, QueueHead); + + if (IrpToComplete == NULL) + { + DPRINT1("Waiting For Completion %x!\n", Event); + KeWaitForSingleObject(Event, Suspended, KernelMode, FALSE, NULL); + ExFreePool(Event); + } + + return TRUE; +} Propchange: trunk/reactos/drivers/usb/usbehci/transfer.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/transfer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/transf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/transfer.h (added) +++ trunk/reactos/drivers/usb/usbehci/transfer.h [iso-8859-1] Fri Dec 31 12:01:21 2010 @@ -1,0 +1,20 @@ +#pragma once + +#include "hardware.h" +#include "hwiface.h" +#include "physmem.h" +#include <usb.h> +#include <ntddk.h> + +BOOLEAN +SubmitControlTransfer(PEHCI_HOST_CONTROLLER hcd, + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup, + PVOID TransferBuffer, + ULONG TransferBufferLength, + PIRP IrpToComplete); + +VOID +BuildSetupPacketFromURB(PEHCI_HOST_CONTROLLER hcd, + PURB Urb, + PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup); + Propchange: trunk/reactos/drivers/usb/usbehci/transfer.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jimtabor] 50229: [Win32k|User32] - Add hack to mark desktop window as a desktop window and notes for creating a desktop with tips in win32k. Move user position code from window to winpos.
by jimtabor＠svn.reactos.org 31 Dec '10

31 Dec '10

Author: jimtabor Date: Fri Dec 31 04:43:35 2010 New Revision: 50229 URL: http://svn.reactos.org/svn/reactos?rev=50229&view=rev Log: [Win32k|User32] - Add hack to mark desktop window as a desktop window and notes for creating a desktop with tips in win32k. Move user position code from window to winpos. Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Fri Dec 31 04:43:35 2010 @@ -1831,92 +1831,6 @@ return FALSE; } - -/* - * @implemented - */ -HWND WINAPI -WindowFromPoint(POINT Point) -{ - //TODO: Determine what the actual parameters to - // NtUserWindowFromPoint are. - return NtUserWindowFromPoint(Point.x, Point.y); -} - - -/* - * @implemented - */ -int WINAPI -MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints) -{ - PWND FromWnd, ToWnd; - POINT Delta; - UINT i; - - FromWnd = ValidateHwndOrDesk(hWndFrom); - if (!FromWnd) - return 0; - - ToWnd = ValidateHwndOrDesk(hWndTo); - if (!ToWnd) - return 0; - - Delta.x = FromWnd->rcClient.left - ToWnd->rcClient.left; - Delta.y = FromWnd->rcClient.top - ToWnd->rcClient.top; - - for (i = 0; i != cPoints; i++) - { - lpPoints[i].x += Delta.x; - lpPoints[i].y += Delta.y; - } - - return MAKELONG(LOWORD(Delta.x), LOWORD(Delta.y)); -} - - -/* - * @implemented - */ -BOOL WINAPI -ScreenToClient(HWND hWnd, LPPOINT lpPoint) -{ - PWND Wnd, DesktopWnd; - - Wnd = ValidateHwnd(hWnd); - if (!Wnd) - return FALSE; - - DesktopWnd = GetThreadDesktopWnd(); - - lpPoint->x += DesktopWnd->rcClient.left - Wnd->rcClient.left; - lpPoint->y += DesktopWnd->rcClient.top - Wnd->rcClient.top; - - return TRUE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ClientToScreen(HWND hWnd, LPPOINT lpPoint) -{ - PWND Wnd, DesktopWnd; - - Wnd = ValidateHwnd(hWnd); - if (!Wnd) - return FALSE; - - DesktopWnd = GetThreadDesktopWnd(); - - lpPoint->x += Wnd->rcClient.left - DesktopWnd->rcClient.left; - lpPoint->y += Wnd->rcClient.top - DesktopWnd->rcClient.top; - - return TRUE; -} - - /* * @implemented */ @@ -1926,7 +1840,6 @@ { return NtUserSetWindowContextHelpId(hwnd, dwContextHelpId); } - /* * @implemented Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Fri Dec 31 04:43:35 2010 @@ -1,8 +1,7 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/window.c + * FILE: dll/win32/user32/windows/winpos.c * PURPOSE: Window management * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -111,3 +110,88 @@ { return NtUserCallHwndLock( hWnd, HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS); } + +/* + * @implemented + */ +HWND WINAPI +WindowFromPoint(POINT Point) +{ + //TODO: Determine what the actual parameters to + // NtUserWindowFromPoint are. + return NtUserWindowFromPoint(Point.x, Point.y); +} + + +/* + * @implemented + */ +int WINAPI +MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints) +{ + PWND FromWnd, ToWnd; + POINT Delta; + UINT i; + + FromWnd = ValidateHwndOrDesk(hWndFrom); + if (!FromWnd) + return 0; + + ToWnd = ValidateHwndOrDesk(hWndTo); + if (!ToWnd) + return 0; + + Delta.x = FromWnd->rcClient.left - ToWnd->rcClient.left; + Delta.y = FromWnd->rcClient.top - ToWnd->rcClient.top; + + for (i = 0; i != cPoints; i++) + { + lpPoints[i].x += Delta.x; + lpPoints[i].y += Delta.y; + } + + return MAKELONG(LOWORD(Delta.x), LOWORD(Delta.y)); +} + + +/* + * @implemented + */ +BOOL WINAPI +ScreenToClient(HWND hWnd, LPPOINT lpPoint) +{ + PWND Wnd, DesktopWnd; + + Wnd = ValidateHwnd(hWnd); + if (!Wnd) + return FALSE; + + DesktopWnd = GetThreadDesktopWnd(); + + lpPoint->x += DesktopWnd->rcClient.left - Wnd->rcClient.left; + lpPoint->y += DesktopWnd->rcClient.top - Wnd->rcClient.top; + + return TRUE; +} + + +/* + * @implemented + */ +BOOL WINAPI +ClientToScreen(HWND hWnd, LPPOINT lpPoint) +{ + PWND Wnd, DesktopWnd; + + Wnd = ValidateHwnd(hWnd); + if (!Wnd) + return FALSE; + + DesktopWnd = GetThreadDesktopWnd(); + + lpPoint->x += Wnd->rcClient.left - DesktopWnd->rcClient.left; + lpPoint->y += Wnd->rcClient.top - DesktopWnd->rcClient.top; + + return TRUE; +} + Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Fri Dec 31 04:43:35 2010 @@ -65,6 +65,7 @@ return (LRESULT)TRUE; case WM_CREATE: + NtUserSetWindowFNID(Wnd, FNID_DESKTOP); // Anti-ReactOS hack! case WM_CLOSE: return 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Fri Dec 31 04:43:35 2010 @@ -1036,12 +1036,16 @@ } ExFreePoolWithTag(DesktopName.Buffer, TAG_STRING); +//// why is this here? +#if 0 if (! NT_SUCCESS(Status)) { DPRINT1("Failed to create desktop handle\n"); SetLastNtError(Status); RETURN( NULL); } +#endif +//// /* * Create a handle for CSRSS and notify CSRSS for Creating Desktop Window. @@ -1072,7 +1076,35 @@ SetLastNtError(Status); RETURN( NULL); } - +#if 0 // Turn on when server side proc is ready. + // + // Create desktop window. + // + ClassName.Buffer = ((PWSTR)((ULONG_PTR)(WORD)(gpsi->atomSysClass[ICLS_DESKTOP]))); + ClassName.Length = 0; + RtlZeroMemory(&MenuName, sizeof(MenuName)); + RtlZeroMemory(&WindowName, sizeof(WindowName)); + + RtlZeroMemory(&Cs, sizeof(Cs)); + Cs.x = UserGetSystemMetrics(SM_XVIRTUALSCREEN); + Cs.y = UserGetSystemMetrics(SM_YVIRTUALSCREEN); + Cs.cx = UserGetSystemMetrics(SM_CXVIRTUALSCREEN); + Cs.cy = UserGetSystemMetrics(SM_CYVIRTUALSCREEN); + Cs.style = WS_POPUP|WS_CLIPCHILDREN; + Cs.hInstance = hModClient; // Experimental mode... Move csr stuff to User32. hModuleWin; // Server side winproc! + Cs.lpszName = (LPCWSTR) &WindowName; + Cs.lpszClass = (LPCWSTR) &ClassName; + + pWndDesktop = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName); + if (!pWnd) + { + DPRINT1("Failed to create Desktop window handle\n"); + } + else + { + DesktopObject->pDeskInfo->spwnd = pWndDesktop; + } +#endif W32Thread = PsGetCurrentThreadWin32Thread(); if (!W32Thread->rpdesk) IntSetThreadDesktop(DesktopObject,FALSE); @@ -1089,7 +1121,7 @@ RtlZeroMemory(&Cs, sizeof(Cs)); Cs.cx = Cs.cy = 100; Cs.style = WS_POPUP|WS_CLIPCHILDREN; - Cs.hInstance = hModClient; + Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Leave it to Timo to not pass on notes! Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszClass = (LPCWSTR) &ClassName; @@ -1103,6 +1135,14 @@ DesktopObject->spwndMessage = pWnd; } + /* Now,,, + if !(WinStaObject->Flags & WSF_NOIO) is (not set) for desktop input output mode (see wiki) + Create Tooltip. Saved in DesktopObject->spwndTooltip. + Tooltip dwExStyle: WS_EX_TOOLWINDOW|WS_EX_TOPMOST + hWndParent are spwndMessage. Use hModuleWin for server side winproc! + The rest is same as message window. + http://msdn.microsoft.com/en-us/library/bb760250(VS.85).aspx + */ RETURN( Desktop); CLEANUP: Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Dec 31 04:43:35 2010 @@ -2130,7 +2130,6 @@ } Window->rcClient = Window->rcWindow; - /* Link the window*/ if (NULL != ParentWindow) { @@ -2140,7 +2139,7 @@ else IntLinkHwnd(Window, hwndInsertAfter); } - + /* Send the NCCREATE message */ Result = co_IntSendMessage(UserHMGetHandle(Window), WM_NCCREATE, 0, (LPARAM) Cs); if (!Result) @@ -3886,8 +3885,8 @@ // From user land we only set these. if (fnID != FNID_DESTROY) - { - if ( ((fnID < FNID_BUTTON) && (fnID > FNID_GHOST)) || + { // Hacked so we can mark desktop~! + if ( (/*(fnID < FNID_BUTTON)*/ (fnID < FNID_FIRST) && (fnID > FNID_GHOST)) || Wnd->fnid != 0 ) { EngSetLastError(ERROR_INVALID_PARAMETER);

1 0

[spetreolle] 50228: [CMAKE] Add all winetests to bootcd, thanks to unix find :)
by spetreolle＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: spetreolle Date: Thu Dec 30 22:17:33 2010 New Revision: 50228 URL: http://svn.reactos.org/svn/reactos?rev=50228&view=rev Log: [CMAKE] Add all winetests to bootcd, thanks to unix find :) Modified: 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/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/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] Thu Dec 30 22:17:33 2010 @@ -23,3 +23,4 @@ set_module_type(advapi32_winetest win32cui) add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll) +add_cab_target(advapi32_winetest 7) 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] Thu Dec 30 22:17:33 2010 @@ -15,3 +15,4 @@ set_module_type(advpack_winetest win32cui) add_importlibs(advpack_winetest cabinet advapi32 msvcrt kernel32 ntdll) +add_cab_target(advpack_winetest 7) 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] Thu Dec 30 22:17:33 2010 @@ -4,4 +4,5 @@ target_link_libraries(amstream_winetest wine uuid) set_module_type(amstream_winetest win32cui) add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32 ntdll) -add_dependencies(amstream_winetest dxsdk) +add_dependencies(amstream_winetest dxsdk) +add_cab_target(amstream_winetest 7) 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] Thu Dec 30 22:17:33 2010 @@ -12,3 +12,4 @@ set_module_type(atl_winetest win32cui) add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll) +add_cab_target(atl_winetest 7) 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] Thu Dec 30 22:17:33 2010 @@ -4,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -38,3 +38,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) 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] Thu Dec 30 22:17:33 2010 @@ -14,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -25,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -17,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -14,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -22,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -21,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -12,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -12,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +7,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) 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] Thu Dec 30 22:17:33 2010 @@ -14,3 +14,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) 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] Thu Dec 30 22:17:33 2010 @@ -8,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -8,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -13,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -18,3 +18,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) 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] Thu Dec 30 22:17:33 2010 @@ -20,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -13,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -24,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -15,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -14,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -28,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -23,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -31,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -15,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -18,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -13,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -28,3 +28,4 @@ set_module_type(rpcrt4_winetest win32cui) add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll) +add_cab_target(rpcrt4_winetest 7) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -14,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -18,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -14,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -27,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -21,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -17,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -35,3 +35,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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -13,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -13,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -16,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -16,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -14,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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) 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] Thu Dec 30 22:17:33 2010 @@ -7,3 +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)

1 0

[spetreolle] 50227: [CMAKE] Add rosautotest and kernel32_winetest to bootcdregtest. cmake bootcdregtest lives.
by spetreolle＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: spetreolle Date: Thu Dec 30 21:49:36 2010 New Revision: 50227 URL: http://svn.reactos.org/svn/reactos?rev=50227&view=rev Log: [CMAKE] Add rosautotest and kernel32_winetest to bootcdregtest. cmake bootcdregtest lives. Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt 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] Thu Dec 30 21:49:36 2010 @@ -19,7 +19,12 @@ shutdown.cpp tools.cpp) -add_executable(rosautotest ${SOURCE}) +add_executable(rosautotest +#${CMAKE_CURRENT_BINARY_DIR}/rosautotest_precomp.h.gch +${SOURCE}) +#add_pch(rosautotest ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) set_module_type(rosautotest win32cui) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) + +add_cab_target(rosautotest 1) 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] Thu Dec 30 21:49:36 2010 @@ -45,3 +45,5 @@ target_link_libraries(kernel32_winetest wine) set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) + +add_cab_target(kernel32_winetest 7)

1 0

[akhaldi] 50226: [CMAKE] - Wine lib isn't needed for rosautotest.
by akhaldi＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: akhaldi Date: Thu Dec 30 17:58:18 2010 New Revision: 50226 URL: http://svn.reactos.org/svn/reactos?rev=50226&view=rev Log: [CMAKE] - Wine lib isn't needed for rosautotest. Modified: trunk/rostests/rosautotest/CMakeLists.txt 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] Thu Dec 30 17:58:18 2010 @@ -21,7 +21,5 @@ add_executable(rosautotest ${SOURCE}) -target_link_libraries(rosautotest wine) - set_module_type(rosautotest win32cui) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll)

1 0

[akhaldi] 50225: [CMAKE] - Update oleaut32 winetest. - Add rosautotest to build.
by akhaldi＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: akhaldi Date: Thu Dec 30 17:55:25 2010 New Revision: 50225 URL: http://svn.reactos.org/svn/reactos?rev=50225&view=rev Log: [CMAKE] - Update oleaut32 winetest. - Add rosautotest to build. Added: trunk/rostests/rosautotest/CMakeLists.txt (with props) Modified: trunk/rostests/CMakeLists.txt trunk/rostests/winetests/oleaut32/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=50225&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Thu Dec 30 17:55:25 2010 @@ -3,7 +3,7 @@ #add_subdirectory(dibtests) #add_subdirectory(dxtest) #add_subdirectory(regtests) -#add_subdirectory(rosautotest) +add_subdirectory(rosautotest) #add_subdirectory(tests) #add_subdirectory(win32) add_subdirectory(winetests) Added: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt (added) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Thu Dec 30 17:55:25 2010 @@ -1,0 +1,27 @@ + +set_unicode() +set_cpp() + +list(APPEND SOURCE + CConfiguration.cpp + CFatalException.cpp + CInvalidParameterException.cpp + CJournaledTestList.cpp + CProcess.cpp + CSimpleException.cpp + CTest.cpp + CTestInfo.cpp + CTestList.cpp + CVirtualTestList.cpp + CWebService.cpp + CWineTest.cpp + main.cpp + shutdown.cpp + tools.cpp) + +add_executable(rosautotest ${SOURCE}) + +target_link_libraries(rosautotest wine) + +set_module_type(rosautotest win32cui) +add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) Propchange: trunk/rostests/rosautotest/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native 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] Thu Dec 30 17:55:25 2010 @@ -5,10 +5,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_TYPELIB(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl) +add_typelib(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl) add_dependencies(oleaut32_typelibs stdole2) -ADD_INTERFACE_DEFINITIONS(oleaut32_idlheaders test_reg.idl tmarshal.idl) +add_interface_definitions(oleaut32_idlheaders test_reg.idl tmarshal.idl) add_idl_interface(tmarshal.idl) list(APPEND SOURCE

1 0

[akhaldi] 50224: [CMAKE] - Disable some resource files (mostly japanese ones) with a FIXME. They prevent us from compiling in unix due to an iconv issue. - Lower the minimum required cmake version ...
by akhaldi＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: akhaldi Date: Thu Dec 30 15:39:10 2010 New Revision: 50224 URL: http://svn.reactos.org/svn/reactos?rev=50224&view=rev Log: [CMAKE] - Disable some resource files (mostly japanese ones) with a FIXME. They prevent us from compiling in unix due to an iconv issue. - Lower the minimum required cmake version to 2.6 - Fix browseui resource paths. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/base/applications/calc/resource.rc branches/cmake-bringup/base/applications/dxdiag/rsrc.rc branches/cmake-bringup/base/applications/mplay32/rsrc.rc branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc branches/cmake-bringup/base/applications/mstsc/rsrc.rc branches/cmake-bringup/base/applications/notepad/rsrc.rc branches/cmake-bringup/base/applications/paint/rsrc.rc branches/cmake-bringup/base/applications/rapps/rsrc.rc branches/cmake-bringup/base/applications/regedit/rsrc.rc branches/cmake-bringup/base/applications/screensavers/logon/logon.rc branches/cmake-bringup/base/setup/vmwinst/rsrc.rc branches/cmake-bringup/base/setup/welcome/rsrc.rc branches/cmake-bringup/base/system/winlogon/rsrc.rc branches/cmake-bringup/dll/cpl/desk/rsrc.rc branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc branches/cmake-bringup/dll/win32/browseui/browseui.rc branches/cmake-bringup/dll/win32/netid/rsrc.rc branches/cmake-bringup/dll/win32/netshell/netshell.rc branches/cmake-bringup/dll/win32/shell32/shell32.rc branches/cmake-bringup/dll/win32/syssetup/syssetup.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.6) project(REACTOS) if(NOT ARCH) Modified: branches/cmake-bringup/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -52,7 +52,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -10,7 +10,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -8,7 +8,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +// #include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -20,7 +20,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" @@ -29,3 +29,4 @@ #include "lang/sk-SK.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" + Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -60,3 +60,4 @@ #define IDS_COLUMNUSER 306 #define IDS_COLUMNCOMPUTER 307 #define IDS_COLUMNEVENTDATA 308 + Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -16,10 +16,10 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" +//#include "lang/pl-PL.rc" FIXME: iconv issue #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Modified: branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -28,7 +28,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -20,7 +20,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -48,7 +48,7 @@ #include "lang/hy-AM.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/paint/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -21,7 +21,7 @@ #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -3,7 +3,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: branches/cmake-bringup/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -38,7 +38,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -20,7 +20,7 @@ #include "lang/es-ES.rc" #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Modified: branches/cmake-bringup/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -23,7 +23,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom… ============================================================================== --- branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -51,7 +51,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" Modified: branches/cmake-bringup/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo… ============================================================================== --- branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -15,7 +15,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" Modified: branches/cmake-bringup/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/rsrc… ============================================================================== --- branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -11,7 +11,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/powercfg/… ============================================================================== --- branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -10,7 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/sysdm/rsr… ============================================================================== --- branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -10,7 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: branches/cmake-bringup/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/browseui.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -30,17 +30,17 @@ // // REGISTRY // -IDR_ADDRESSBAND REGISTRY "res\\addressband.rgs" -IDR_ADDRESSEDITBOX REGISTRY "res\\addresseditbox.rgs" -IDR_ACLMULTI REGISTRY "res\\autocompletecontainer.rgs" -IDR_BANDPROXY REGISTRY "res\\bandproxy.rgs" -IDR_BANDSITE REGISTRY "res\\rebarbandsite.rgs" -IDR_BANDSITEMENU REGISTRY "res\\bandsitemenu.rgs" -IDR_BRANDBAND REGISTRY "res\\brandband.rgs" -IDR_COMMONBROWSER REGISTRY "res\\commonbrowser.rgs" -IDR_GLOBALFOLDERSETTINGS REGISTRY "res\\globalfoldersettings.rgs" -IDR_INTERNETTOOLBAR REGISTRY "res\\internettoolbar.rgs" -IDR_REGTREEOPTIONS REGISTRY "res\\regtreeoptions.rgs" +IDR_ADDRESSBAND REGISTRY "res/addressband.rgs" +IDR_ADDRESSEDITBOX REGISTRY "res/addresseditbox.rgs" +IDR_ACLMULTI REGISTRY "res/autocompletecontainer.rgs" +IDR_BANDPROXY REGISTRY "res/bandproxy.rgs" +IDR_BANDSITE REGISTRY "res/rebarbandsite.rgs" +IDR_BANDSITEMENU REGISTRY "res/bandsitemenu.rgs" +IDR_BRANDBAND REGISTRY "res/brandband.rgs" +IDR_COMMONBROWSER REGISTRY "res/commonbrowser.rgs" +IDR_GLOBALFOLDERSETTINGS REGISTRY "res/globalfoldersettings.rgs" +IDR_INTERNETTOOLBAR REGISTRY "res/internettoolbar.rgs" +IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" /* Modified: branches/cmake-bringup/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/r… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -9,7 +9,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/it-IT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netshel… ============================================================================== --- branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -33,7 +33,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -60,7 +60,7 @@ #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu… ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -63,7 +63,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010 @@ -13,7 +13,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +//#include "lang/ja-JP.rc" FIXME: iconv issue #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

[mjmartin] 50223: [usb/usbehci]: - Reorganization code to put hardware related structures and routines in own source files. - Modify ResetPort to correctly reset the port instead of the controller....
by mjmartin＠svn.reactos.org 30 Dec '10

30 Dec '10

Author: mjmartin Date: Thu Dec 30 15:12:46 2010 New Revision: 50223 URL: http://svn.reactos.org/svn/reactos?rev=50223&view=rev Log: [usb/usbehci]: - Reorganization code to put hardware related structures and routines in own source files. - Modify ResetPort to correctly reset the port instead of the controller. - Implement allocating chunks of memory from the Common Buffer for use with the rest of source code. Added: trunk/reactos/drivers/usb/usbehci/hardware.c (with props) trunk/reactos/drivers/usb/usbehci/hardware.h (with props) trunk/reactos/drivers/usb/usbehci/physmem.c (with props) trunk/reactos/drivers/usb/usbehci/physmem.h (with props) Added: trunk/reactos/drivers/usb/usbehci/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.c (added) +++ trunk/reactos/drivers/usb/usbehci/hardware.c [iso-8859-1] Thu Dec 30 15:12:46 2010 @@ -1,0 +1,275 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/hardware.c + * PURPOSE: Hardware related routines. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + */ + +#include "hardware.h" +#define NDEBUG +#include <debug.h> + +//FORCEINLINE +VOID +SetAsyncListQueueRegister(PEHCI_HOST_CONTROLLER hcd, ULONG PhysicalAddr) +{ + ULONG OpRegisters = hcd->OpRegisters; + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_ASYNCLISTBASE), PhysicalAddr); +} + +//FORCEINLINE +ULONG +GetAsyncListQueueRegister(PEHCI_HOST_CONTROLLER hcd) +{ + ULONG OpRegisters = hcd->OpRegisters; + return READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_ASYNCLISTBASE)); +} + +//FORCEINLINE +VOID +SetPeriodicFrameListRegister(PEHCI_HOST_CONTROLLER hcd, ULONG PhysicalAddr) +{ + ULONG OpRegisters = hcd->OpRegisters; + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_PERIODICLISTBASE), PhysicalAddr); +} + +//FORCEINLINE +ULONG +GetPeriodicFrameListRegister(PEHCI_HOST_CONTROLLER hcd) +{ + ULONG OpRegisters = hcd->OpRegisters; + return READ_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_PERIODICLISTBASE)); +} + +//FORCEINLINE +ULONG +ReadControllerStatus(PEHCI_HOST_CONTROLLER hcd) +{ + ULONG OpRegisters = hcd->OpRegisters; + return READ_REGISTER_ULONG ((PULONG) (OpRegisters + EHCI_USBSTS)); +} + +//FORCEINLINE +VOID +ClearControllerStatus(PEHCI_HOST_CONTROLLER hcd, ULONG Status) +{ + ULONG OpRegisters = hcd->OpRegisters; + WRITE_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBSTS), Status); +} + +VOID +ResetPort(PEHCI_HOST_CONTROLLER hcd, UCHAR Port) +{ + ULONG tmp; + ULONG OpRegisters = hcd->OpRegisters; + DPRINT1("Reset Port %x\n", Port); + + tmp = READ_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * Port))); + if (tmp & 0x400) + { + DPRINT1("Non HighSpeed device connected. Releasing ownership.\n"); + WRITE_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * Port)), 0x2000); + } + + /* Get current port state */ + tmp = READ_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * Port))); + + /* Set reset and clear enable */ + tmp |= 0x100; + tmp &= ~0x04; + WRITE_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * Port)), tmp); + + /* USB 2.0 Spec 10.2.8.1, more than 50ms */ + KeStallExecutionProcessor(100); + + /* Clear reset */ + tmp &= ~0x100; + WRITE_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * Port)), tmp); + + KeStallExecutionProcessor(100); + + tmp = READ_REGISTER_ULONG((PULONG) ((OpRegisters + EHCI_PORTSC) + (4 * Port))); + + if (tmp & 0x100) + { + DPRINT1("EHCI ERROR: Port Reset did not complete!\n"); + } +} + +VOID +StopEhci(PEHCI_HOST_CONTROLLER hcd) +{ + ULONG OpRegisters = hcd->OpRegisters; + PEHCI_USBCMD_CONTENT UsbCmd; + PEHCI_USBSTS_CONTEXT UsbSts; + LONG FailSafe; + LONG tmp; + + DPRINT1("Stopping Ehci controller\n"); + + WRITE_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBINTR), 0); + + tmp = READ_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) & tmp; + UsbCmd->Run = FALSE; + WRITE_REGISTER_ULONG((PULONG) (OpRegisters + EHCI_USBCMD), tmp); + + /* Wait for the device to stop */ + for (FailSafe = 100; FailSafe > 1; FailSafe++) + { + KeStallExecutionProcessor(10); + tmp = READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBSTS)); + UsbSts = (PEHCI_USBSTS_CONTEXT)&tmp; + + if (UsbSts->HCHalted) + { + break; + } + } + if (!UsbSts->HCHalted) + DPRINT1("EHCI ERROR: Controller is not responding to Stop request!\n"); +} + +VOID +StartEhci(PEHCI_HOST_CONTROLLER hcd) +{ + ULONG OpRegisters = hcd->OpRegisters; + PEHCI_USBCMD_CONTENT UsbCmd; + PEHCI_USBSTS_CONTEXT UsbSts; + LONG FailSafe; + LONG tmp; + LONG tmp2; + + DPRINT("Starting Ehci controller\n"); + + tmp = READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBSTS)); + UsbSts = (PEHCI_USBSTS_CONTEXT)&tmp; + + if (!UsbSts->HCHalted) + { + StopEhci(hcd); + } + + tmp = READ_REGISTER_ULONG ((PULONG)(OpRegisters + EHCI_USBCMD)); + + /* Reset the device */ + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->HCReset = TRUE; + WRITE_REGISTER_ULONG ((PULONG)(OpRegisters + EHCI_USBCMD), tmp); + + /* Wait for the device to reset */ + for (FailSafe = 100; FailSafe > 1; FailSafe++) + { + KeStallExecutionProcessor(10); + tmp = READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT)&tmp; + + if (!UsbCmd->HCReset) + { + break; + } + DPRINT("Waiting for reset, USBCMD: %x\n", READ_REGISTER_ULONG ((PULONG)(OpRegisters + EHCI_USBCMD))); + } + + if (UsbCmd->HCReset) + { + DPRINT1("EHCI ERROR: Controller failed to reset! Will attempt to continue.\n"); + } + + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + + /* Disable Interrupts on the device */ + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBINTR), 0); + /* Clear the Status */ + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBSTS), 0x0000001f); + + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_CTRLDSSEGMENT), 0); + + SetAsyncListQueueRegister(hcd, hcd->AsyncListQueue->PhysicalAddr | QH_TYPE_QH); + /* Set the ansync and periodic to disable */ + UsbCmd->PeriodicEnable = FALSE; + UsbCmd->AsyncEnable = TRUE; + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBCMD), tmp); + + /* Set the threshold */ + UsbCmd->IntThreshold = 1; + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBCMD), tmp); + + /* Turn back on interrupts */ + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBINTR), + EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR + /*| EHCI_USBINTR_FLROVR*/ | EHCI_USBINTR_PC); + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBINTR), + EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR + /*| EHCI_USBINTR_FLROVR*/ | EHCI_USBINTR_PC); + + UsbCmd->Run = TRUE; + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBCMD), tmp); + + /* Wait for the device to start */ + for (;;) + { + KeStallExecutionProcessor(10); + tmp2 = READ_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_USBSTS)); + UsbSts = (PEHCI_USBSTS_CONTEXT)&tmp2; + + if (!UsbSts->HCHalted) + { + break; + } + DPRINT("Waiting for start, USBSTS: %x\n", READ_REGISTER_ULONG ((PULONG)(OpRegisters + EHCI_USBSTS))); + } + + /* Set all port routing to ECHI controller */ + WRITE_REGISTER_ULONG((PULONG)(OpRegisters + EHCI_CONFIGFLAG), 1); +} + +VOID +GetCapabilities(PEHCI_CAPS PCap, ULONG CapRegister) +{ + PEHCI_HCS_CONTENT PHCS; + LONG i; + + if (!PCap) + return; + + PCap->Length = READ_REGISTER_UCHAR((PUCHAR)CapRegister); + PCap->Reserved = READ_REGISTER_UCHAR((PUCHAR)(CapRegister + 1)); + PCap->HCIVersion = READ_REGISTER_USHORT((PUSHORT)(CapRegister + 2)); + PCap->HCSParamsLong = READ_REGISTER_ULONG((PULONG)(CapRegister + 4)); + PCap->HCCParams = READ_REGISTER_ULONG((PULONG)(CapRegister + 8)); + + DPRINT1("Length %d\n", PCap->Length); + DPRINT1("Reserved %d\n", PCap->Reserved); + DPRINT1("HCIVersion %x\n", PCap->HCIVersion); + DPRINT1("HCSParams %x\n", PCap->HCSParamsLong); + DPRINT1("HCCParams %x\n", PCap->HCCParams); + + if (PCap->HCCParams & 0x02) + DPRINT1("Frame list size is configurable\n"); + + if (PCap->HCCParams & 0x01) + DPRINT1("64bit address mode not supported!\n"); + + DPRINT1("Number of Ports: %d\n", PCap->HCSParams.PortCount); + + if (PCap->HCSParams.PortPowerControl) + DPRINT1("Port Power Control is enabled\n"); + + if (!PCap->HCSParams.CHCCount) + { + DPRINT1("Number of Companion Host controllers %x\n", PCap->HCSParams.CHCCount); + DPRINT1("Number of Ports Per CHC: %d\n", PCap->HCSParams.PortPerCHC); + } + + PHCS = (PEHCI_HCS_CONTENT)&PCap->HCSParams; + if (PHCS->PortRouteRules) + { + for (i = 0; i < PCap->HCSParams.PortCount; i++) + { + PCap->PortRoute[i] = READ_REGISTER_UCHAR((PUCHAR) (CapRegister + 12 + i)); + } + } +} Propchange: trunk/reactos/drivers/usb/usbehci/hardware.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.h (added) +++ trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] Thu Dec 30 15:12:46 2010 @@ -1,0 +1,307 @@ +#pragma once + +#include <ntddk.h> + +/* USB Command Register */ +#define EHCI_USBCMD 0x00 +#define EHCI_USBSTS 0x04 +#define EHCI_USBINTR 0x08 +#define EHCI_FRINDEX 0x0C +#define EHCI_CTRLDSSEGMENT 0x10 +#define EHCI_PERIODICLISTBASE 0x14 +#define EHCI_ASYNCLISTBASE 0x18 +#define EHCI_CONFIGFLAG 0x40 +#define EHCI_PORTSC 0x44 + +/* USB Interrupt Register Flags 32 Bits */ +#define EHCI_USBINTR_INTE 0x01 +#define EHCI_USBINTR_ERR 0x02 +#define EHCI_USBINTR_PC 0x04 +#define EHCI_USBINTR_FLROVR 0x08 +#define EHCI_USBINTR_HSERR 0x10 +#define EHCI_USBINTR_ASYNC 0x20 +/* Bits 6:31 Reserved */ + +/* Status Register Flags 32 Bits */ +#define EHCI_STS_INT 0x01 +#define EHCI_STS_ERR 0x02 +#define EHCI_STS_PCD 0x04 +#define EHCI_STS_FLR 0x08 +#define EHCI_STS_FATAL 0x10 +#define EHCI_STS_IAA 0x20 +/* Bits 11:6 Reserved */ +#define EHCI_STS_HALT 0x1000 +#define EHCI_STS_RECL 0x2000 +#define EHCI_STS_PSS 0x4000 +#define EHCI_STS_ASS 0x8000 +#define EHCI_ERROR_INT ( EHCI_STS_FATAL | EHCI_STS_ERR ) + + +/* Last bit in QUEUE ELEMENT TRANSFER DESCRIPTOR Next Pointer */ +/* Used for Queue Element Transfer Descriptor Pointers + and Queue Head Horizontal Link Pointers */ +#define TERMINATE_POINTER 0x01 + +/* QUEUE ELEMENT TRANSFER DESCRIPTOR, Token defines and structs */ + +/* PIDCodes for QETD_TOKEN +OR with QUEUE_TRANSFER_DESCRIPTOR Token.PIDCode*/ +#define PID_CODE_OUT_TOKEN 0x00 +#define PID_CODE_IN_TOKEN 0x01 +#define PID_CODE_SETUP_TOKEN 0x02 + +/* Split Transaction States +OR with QUEUE_TRANSFER_DESCRIPTOR Token.SplitTransactionState */ +#define DO_START_SPLIT 0x00 +#define DO_COMPLETE_SPLIT 0x01 + +/* Ping States, OR with QUEUE_TRANSFER_DESCRIPTOR Token. */ +#define PING_STATE_DO_OUT 0x00 +#define PING_STATE_DO_PING 0x01 + +typedef struct _PERIODICFRAMELIST +{ + PULONG VirtualAddr; + PHYSICAL_ADDRESS PhysicalAddr; + ULONG Size; +} PERIODICFRAMELIST, *PPERIODICFRAMELIST; + + +/* QUEUE ELEMENT TRANSFER DESCRIPTOR TOKEN */ +typedef struct _QETD_TOKEN_BITS +{ + ULONG PingState:1; + ULONG SplitTransactionState:1; + ULONG MissedMicroFrame:1; + ULONG TransactionError:1; + ULONG BabbleDetected:1; + ULONG DataBufferError:1; + ULONG Halted:1; + ULONG Active:1; + ULONG PIDCode:2; + ULONG ErrorCounter:2; + ULONG CurrentPage:3; + ULONG InterruptOnComplete:1; + ULONG TotalBytesToTransfer:15; + ULONG DataToggle:1; +} QETD_TOKEN_BITS, *PQETD_TOKEN_BITS; + +/* QUEUE ELEMENT TRANSFER DESCRIPTOR */ +typedef struct _QUEUE_TRANSFER_DESCRIPTOR +{ + //Hardware + ULONG NextPointer; + ULONG AlternateNextPointer; + union + { + QETD_TOKEN_BITS Bits; + ULONG DWord; + } Token; + ULONG BufferPointer[5]; + + //Software + ULONG PhysicalAddr; + struct _QUEUE_TRANSFER_DESCRIPTOR *PreviousDescriptor; + struct _QUEUE_TRANSFER_DESCRIPTOR *NextDescriptor; +} QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; + +/* EndPointSpeeds of END_POINT_CHARACTERISTICS */ +#define QH_ENDPOINT_FULLSPEED 0x00 +#define QH_ENDPOINT_LOWSPEED 0x01 +#define QH_ENDPOINT_HIGHSPEED 0x02 + +typedef struct _END_POINT_CHARACTERISTICS +{ + ULONG DeviceAddress:7; + ULONG InactiveOnNextTransaction:1; + ULONG EndPointNumber:4; + ULONG EndPointSpeed:2; + ULONG QEDTDataToggleControl:1; + ULONG HeadOfReclamation:1; + ULONG MaximumPacketLength:11; + ULONG ControlEndPointFlag:1; + ULONG NakCountReload:4; +} END_POINT_CHARACTERISTICS, *PEND_POINT_CHARACTERISTICS; + +typedef struct _END_POINT_CAPABILITIES +{ + ULONG InterruptScheduleMask:8; + ULONG SplitCompletionMask:8; + ULONG HubAddr:6; + ULONG PortNumber:6; + /* Multi */ + ULONG NumberOfTransactionPerFrame:2; +} END_POINT_CAPABILITIES, *PEND_POINT_CAPABILITIES; + + +/* QUEUE HEAD defines and structs */ + +/* QUEUE HEAD Select Types, OR with QUEUE_HEAD HorizontalLinkPointer */ +#define QH_TYPE_IDT 0x00 +#define QH_TYPE_QH 0x02 +#define QH_TYPE_SITD 0x04 +#define QH_TYPE_FSTN 0x06 + +/* QUEUE HEAD */ +typedef struct _QUEUE_HEAD +{ + //Hardware + ULONG HorizontalLinkPointer; + END_POINT_CHARACTERISTICS EndPointCharacteristics; + END_POINT_CAPABILITIES EndPointCapabilities; + /* TERMINATE_POINTER not valid for this member */ + ULONG CurrentLinkPointer; + /* TERMINATE_POINTER valid */ + ULONG NextPointer; + /* TERMINATE_POINTER valid, bits 1:4 is NAK_COUNTER */ + ULONG AlternateNextPointer; + /* Only DataToggle, InterruptOnComplete, ErrorCounter, PingState valid */ + union + { + QETD_TOKEN_BITS Bits; + ULONG DWord; + } Token; + ULONG BufferPointer[5]; + + //Software + ULONG PhysicalAddr; + struct _QUEUE_HEAD *PreviousQueueHead; + struct _QUEUE_HEAD *NextQueueHead; + PQUEUE_TRANSFER_DESCRIPTOR TransferDescriptor; + PIRP IrpToComplete; + PMDL MdlToFree; + PKEVENT Event; +} QUEUE_HEAD, *PQUEUE_HEAD; + +/* USBCMD register 32 bits */ +typedef struct _EHCI_USBCMD_CONTENT +{ + ULONG Run : 1; + ULONG HCReset : 1; + ULONG FrameListSize : 2; + ULONG PeriodicEnable : 1; + ULONG AsyncEnable : 1; + ULONG DoorBell : 1; + ULONG LightReset : 1; + ULONG AsyncParkCount : 2; + ULONG Reserved : 1; + ULONG AsyncParkEnable : 1; + ULONG Reserved1 : 4; + ULONG IntThreshold : 8; + ULONG Reserved2 : 8; + +} EHCI_USBCMD_CONTENT, *PEHCI_USBCMD_CONTENT; + +typedef struct _EHCI_USBSTS_CONTENT +{ + ULONG USBInterrupt:1; + ULONG ErrorInterrupt:1; + ULONG DetectChangeInterrupt:1; + ULONG FrameListRolloverInterrupt:1; + ULONG HostSystemErrorInterrupt:1; + ULONG AsyncAdvanceInterrupt:1; + ULONG Reserved:6; + ULONG HCHalted:1; + ULONG Reclamation:1; + ULONG PeriodicScheduleStatus:1; + ULONG AsynchronousScheduleStatus:1; +} EHCI_USBSTS_CONTEXT, *PEHCI_USBSTS_CONTEXT; + +typedef struct _EHCI_USBPORTSC_CONTENT +{ + ULONG CurrentConnectStatus:1; + ULONG ConnectStatusChange:1; + ULONG PortEnabled:1; + ULONG PortEnableChanged:1; + ULONG OverCurrentActive:1; + ULONG OverCurrentChange:1; + ULONG ForcePortResume:1; + ULONG Suspend:1; + ULONG PortReset:1; + ULONG Reserved:1; + ULONG LineStatus:2; + ULONG PortPower:1; + ULONG PortOwner:1; +} EHCI_USBPORTSC_CONTENT, *PEHCI_USBPORTSC_CONTENT; + +typedef struct _EHCI_HCS_CONTENT +{ + ULONG PortCount : 4; + ULONG PortPowerControl: 1; + ULONG Reserved : 2; + ULONG PortRouteRules : 1; + ULONG PortPerCHC : 4; + ULONG CHCCount : 4; + ULONG PortIndicator : 1; + ULONG Reserved2 : 3; + ULONG DbgPortNum : 4; + ULONG Reserved3 : 8; + +} EHCI_HCS_CONTENT, *PEHCI_HCS_CONTENT; + +typedef struct _EHCI_HCC_CONTENT +{ + ULONG CurAddrBits : 1; + ULONG VarFrameList : 1; + ULONG ParkMode : 1; + ULONG Reserved : 1; + ULONG IsoSchedThreshold : 4; + ULONG EECPCapable : 8; + ULONG Reserved2 : 16; + +} EHCI_HCC_CONTENT, *PEHCI_HCC_CONTENT; + +typedef struct _EHCI_CAPS { + UCHAR Length; + UCHAR Reserved; + USHORT HCIVersion; + union + { + EHCI_HCS_CONTENT HCSParams; + ULONG HCSParamsLong; + }; + ULONG HCCParams; + UCHAR PortRoute [8]; +} EHCI_CAPS, *PEHCI_CAPS; + +typedef struct _EHCI_HOST_CONTROLLER +{ + ULONG OpRegisters; + EHCI_CAPS ECHICaps; + PVOID CommonBufferVA; + PHYSICAL_ADDRESS CommonBufferPA; + ULONG CommonBufferSize; + PQUEUE_HEAD AsyncListQueue; + KSPIN_LOCK Lock; +} EHCI_HOST_CONTROLLER, *PEHCI_HOST_CONTROLLER; + +ULONG +ReadControllerStatus(PEHCI_HOST_CONTROLLER hcd); + +VOID +ClearControllerStatus(PEHCI_HOST_CONTROLLER hcd, ULONG Status); + +VOID +GetCapabilities(PEHCI_CAPS PCap, ULONG CapRegister); + +VOID +ResetPort(PEHCI_HOST_CONTROLLER hcd, UCHAR Port); + +VOID +StartEhci(PEHCI_HOST_CONTROLLER hcd); + +VOID +StopEhci(PEHCI_HOST_CONTROLLER hcd); + +VOID +SetAsyncListQueueRegister(PEHCI_HOST_CONTROLLER hcd, ULONG PhysicalAddr); + +ULONG +GetAsyncListQueueRegister(PEHCI_HOST_CONTROLLER hcd); + +VOID +SetPeriodicFrameListRegister(PEHCI_HOST_CONTROLLER hcd, ULONG PhysicalAddr); + +ULONG +GetPeriodicFrameListRegister(PEHCI_HOST_CONTROLLER hcd); + Propchange: trunk/reactos/drivers/usb/usbehci/hardware.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/physmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/physme… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/physmem.c (added) +++ trunk/reactos/drivers/usb/usbehci/physmem.c [iso-8859-1] Thu Dec 30 15:12:46 2010 @@ -1,0 +1,94 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/physmem.c + * PURPOSE: Common Buffer routines. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + */ + +#include "physmem.h" +#include "debug.h" + +#define SMALL_ALLOCATION_SIZE 32 + +VOID +DumpPages() +{ + //PMEM_HEADER MemBlock = (PMEM_HEADER)EhciSharedMemory.VirtualAddr; +} + +// Returns Virtual Address of Allocated Memory +ULONG +AllocateMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Size, ULONG *PhysicalAddress) +{ + PMEM_HEADER MemoryPage = (PMEM_HEADER)hcd->CommonBufferVA; + ULONG PageCount = 0; + ULONG NumberOfPages = hcd->CommonBufferSize / PAGE_SIZE; + ULONG BlocksNeeded; + ULONG i,j, freeCount; + ULONG RetAddr = 0; + + Size = ((Size + SMALL_ALLOCATION_SIZE - 1) / SMALL_ALLOCATION_SIZE) * SMALL_ALLOCATION_SIZE; + BlocksNeeded = Size / SMALL_ALLOCATION_SIZE; + + do + { + if (MemoryPage->IsFull) + { + PageCount++; + MemoryPage = (PMEM_HEADER)((ULONG)MemoryPage + PAGE_SIZE); + continue; + } + freeCount = 0; + for (i = 0; i < sizeof(MemoryPage->Entry); i++) + { + if (!MemoryPage->Entry[i].InUse) + { + freeCount++; + } + else + { + freeCount = 0; + } + + if (freeCount == BlocksNeeded) + { + for (j = 0; j < freeCount; j++) + { + MemoryPage->Entry[i-j].InUse = 1; + MemoryPage->Entry[i-j].Blocks = 0; + } + + MemoryPage->Entry[i-freeCount + 1].Blocks = BlocksNeeded; + + RetAddr = (ULONG)MemoryPage + (SMALL_ALLOCATION_SIZE * (i - freeCount + 1)) + sizeof(MEM_HEADER); + + *PhysicalAddress = (ULONG)hcd->CommonBufferPA.LowPart + (RetAddr - (ULONG)hcd->CommonBufferVA); + return RetAddr; + } + } + + PageCount++; + MemoryPage = (PMEM_HEADER)((ULONG)MemoryPage + PAGE_SIZE); + } while (PageCount < NumberOfPages); + + return 0; +} + +VOID +ReleaseMemory(ULONG Address) +{ + PMEM_HEADER MemoryPage; + ULONG Index, i; + + MemoryPage = (PMEM_HEADER)(Address & ~(PAGE_SIZE - 1)); + + Index = (Address - ((ULONG)MemoryPage + sizeof(MEM_HEADER))) / SMALL_ALLOCATION_SIZE; + + for (i = 0; i < MemoryPage->Entry[Index].Blocks; i++) + { + MemoryPage->Entry[Index + i].InUse = 0; + MemoryPage->Entry[Index + i].Blocks = 0; + } +} Propchange: trunk/reactos/drivers/usb/usbehci/physmem.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/physmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/physme… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/physmem.h (added) +++ trunk/reactos/drivers/usb/usbehci/physmem.h [iso-8859-1] Thu Dec 30 15:12:46 2010 @@ -1,0 +1,25 @@ +#pragma once + +#include "hardware.h" + +typedef struct _MEM_ENTRY +{ + UCHAR InUse:1; + UCHAR Blocks:7; +} MEM_ENTRY, *PMEM_ENTRY; + +typedef struct _MEM_HEADER +{ + UCHAR IsFull; + MEM_ENTRY Entry[127]; +} MEM_HEADER, *PMEM_HEADER; + +VOID +DumpPages(); + +ULONG +AllocateMemory(PEHCI_HOST_CONTROLLER hcd, ULONG Size, ULONG *PhysicalAddress); + +VOID +ReleaseMemory(ULONG Address); + Propchange: trunk/reactos/drivers/usb/usbehci/physmem.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs