Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[greatlrd] 49977: using s3virge windows 2000 ddk sample for refens to our own dx interface, the premida2 and premida3 dx example are very messy

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Dec 7 19:13:38 2010 New Revision: 49977 URL: http://svn.reactos.org/svn/reactos?rev=49977&view=rev Log: using s3virge windows 2000 ddk sample for refens to our own dx interface, the premida2 and premida3 dx example are very messy Modified: branches/reactx/reactos/drivers/video/displays/framebuf/dd.c branches/reactx/reactos/drivers/video/displays/framebuf/enable.c branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h Modified: branches/reactx/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/dd.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/dd.c [iso-8859-1] Tue Dec 7 19:13:38 2010 @@ -24,7 +24,7 @@ DWORD CALLBACK -DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd) +DdCanCreateSurface( PDD_CANCREATESURFACEDATA pccsd) { /* We do not needit if we need it here it is PPDEV ppdev=(PPDEV)pccsd->lpDD->dhpdev; @@ -38,7 +38,7 @@ } /* We do not support texture yet so we fail here */ - if (pccsd->lplpSList[0]->lpSurfMore->ddsCapsEx.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + if (pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSD_TEXTURESTAGE) { pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; } @@ -54,11 +54,10 @@ } DWORD CALLBACK -DdCreateSurface( LPDDHAL_CREATESURFACEDATA pcsd ) +DdCreateSurface( PDD_CREATESURFACEDATA pcsd ) { - PPDEV pDev = (PPDEV)pcsd->lpDD->dhpdev; - DD_SURFACE_LOCAL* lpSurfaceLocal; - DD_SURFACE_GLOBAL* lpSurfaceGlobal; + PDD_SURFACE_LOCAL lpSurfaceLocal; + PDD_SURFACE_GLOBAL lpSurfaceGlobal; LPDDSURFACEDESC lpSurfaceDesc; /* Driver DdCreateSurface should only support to create one surface not more that */ @@ -102,16 +101,16 @@ { /* We maybe should alloc it with EngAlloc for now we trusting ddraw alloc it */ - lpSurfaceGlobal->lpGbl->fpVidMem = 0; + lpSurfaceGlobal->fpVidMem = 0; } else { /* We maybe should alloc it with EngAlloc for now we trusting ddraw alloc it */ - lpSurfaceGlobal->lpGbl->fpVidMem = 0; + lpSurfaceGlobal->fpVidMem = 0; - if ( (lpSurfaceLocal->lpSurfMore->ddsCapsEx.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) && + if ( (lpSurfaceLocal->lpSurfMore->ddsCapsEx.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) ) { if (lpSurfaceDesc->dwFlags & DDSD_PIXELFORMAT) { Modified: branches/reactx/reactos/drivers/video/displays/framebuf/enable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/enable.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/enable.c [iso-8859-1] Tue Dec 7 19:13:38 2010 @@ -24,16 +24,20 @@ static DRVFN DrvFunctionTable[] = { - {INDEX_DrvEnablePDEV, (PFN)DrvEnablePDEV}, - {INDEX_DrvCompletePDEV, (PFN)DrvCompletePDEV}, - {INDEX_DrvDisablePDEV, (PFN)DrvDisablePDEV}, - {INDEX_DrvEnableSurface, (PFN)DrvEnableSurface}, - {INDEX_DrvDisableSurface, (PFN)DrvDisableSurface}, - {INDEX_DrvAssertMode, (PFN)DrvAssertMode}, - {INDEX_DrvGetModes, (PFN)DrvGetModes}, - {INDEX_DrvSetPalette, (PFN)DrvSetPalette}, - {INDEX_DrvSetPointerShape, (PFN)DrvSetPointerShape}, - {INDEX_DrvMovePointer, (PFN)DrvMovePointer} + { INDEX_DrvEnablePDEV, (PFN) DrvEnablePDEV}, + { INDEX_DrvCompletePDEV, (PFN) DrvCompletePDEV}, + { INDEX_DrvDisablePDEV, (PFN) DrvDisablePDEV}, + { INDEX_DrvEnableSurface, (PFN) DrvEnableSurface}, + { INDEX_DrvDisableSurface, (PFN) DrvDisableSurface}, + { INDEX_DrvAssertMode, (PFN) DrvAssertMode}, + { INDEX_DrvGetModes, (PFN) DrvGetModes}, + { INDEX_DrvSetPalette, (PFN) DrvSetPalette}, + { INDEX_DrvSetPointerShape, (PFN) DrvSetPointerShape}, + { INDEX_DrvMovePointer, (PFN) DrvMovePointer}, + { INDEX_DrvMovePointer, (PFN) DrvMovePointer}, + { INDEX_DrvGetDirectDrawInfo, (PFN) DrvGetDirectDrawInfo}, + { INDEX_DrvEnableDirectDraw, (PFN) DrvEnableDirectDraw}, + { INDEX_DrvDisableDirectDraw, (PFN) DrvDisableDirectDraw}, }; Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] Tue Dec 7 19:13:38 2010 @@ -79,10 +79,10 @@ #define ALLOC_TAG 'FUBF' DWORD CALLBACK -DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd ); +DdCanCreateSurface( PDD_CANCREATESURFACEDATA pccsd ); DWORD CALLBACK -DdCreateSurface( LPDDHAL_CREATESURFACEDATA pcsd); +DdCreateSurface( PDD_CREATESURFACEDATA pcsd); DWORD CALLBACK DdMapMemory(PDD_MAPMEMORYDATA lpMapMemory);

14 years, 1 month

[greatlrd] 49976: fix last compile issue

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Dec 7 17:55:25 2010 New Revision: 49976 URL: http://svn.reactos.org/svn/reactos?rev=49976&view=rev Log: fix last compile issue Modified: branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c Modified: branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] Tue Dec 7 17:55:25 2010 @@ -49,19 +49,20 @@ /* Fill in the HAL Callback pointers */ pCallBacks->dwSize = sizeof(DD_CALLBACKS); - pCallBacks->dwFlags = DDHAL_CB32_CANCREATESURFACE | + pCallBacks->dwFlags = DDHAL_CB32_MAPMEMORY | + DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_CREATESURFACE ; // = DDHAL_CB32_WAITFORVERTICALBLANK | - // DDHAL_CB32_MAPMEMORY | // DDHAL_CB32_GETSCANLINE | - pCallBacks->CreateSurface = DdCreateSurface; - // pCallBacks->SetColorKey = DdSetColorKey; - // pCallBacks->WaitForVerticalBlank = DdWaitForVerticalBlank; - pCallBacks->CanCreateSurface = DdCanCreateSurface; - // pCallBacks->CreatePalette = DdCreatePalette; - // pCallBacks->GetScanLine = DdGetScanLine; - // pCallBacks->MapMemory = DdMapMemory; + pCallBacks->CanCreateSurface = (PDD_CANCREATESURFACE) DdCanCreateSurface; + pCallBacks->CreateSurface = (PDD_CREATESURFACE) DdCreateSurface; + pCallBacks->MapMemory = (PDD_MAPMEMORY) DdMapMemory; + // pCallBacks->SetColorKey = (PDD_SETCOLORKEY) DdSetColorKey; + // pCallBacks->WaitForVerticalBlank = (PDD_WAITFORVERTICALBLANK) DdWaitForVerticalBlank; + // pCallBacks->CreatePalette = (PDD_CREATEPALETTE) DdCreatePalette; + // pCallBacks->GetScanLine = (PDD_GETSCANLINE) DdGetScanLine; + /* Unused on Microsoft Windows 2000 and later and should be ignored by the driver. ' pCallBacks->DestroyDriver @@ -82,29 +83,28 @@ // DDHAL_SURFCB32_BLT | // DDHAL_SURFCB32_GETBLTSTATUS | // DDHAL_SURFCB32_GETFLIPSTATUS; - // pSurfaceCallBacks->DestroySurface = DdDestroySurface; - // pSurfaceCallBacks->Flip = DdFlip; - // pSurfaceCallBacks->SetClipList = DdSetClipList; - // pSurfaceCallBacks->Lock = DdLock; - // pSurfaceCallBacks->Unlock = DdUnlock; - // pSurfaceCallBacks->Blt = DdBlt; - // pSurfaceCallBacks->SetColorKey = DdSetColorKey; - // pSurfaceCallBacks->AddAttachedSurface = DdAddAttachedSurface; - // pSurfaceCallBacks->GetBltStatus = DdGetBltStatus; - // pSurfaceCallBacks->GetFlipStatus = DdGetFlipStatus; - // pSurfaceCallBacks->UpdateOverlay = DdUpdateOverlay; - // pSurfaceCallBacks->SetOverlayPosition = DdSetOverlayPosition; - // pSurfaceCallBacks->SetPalette = DdSetPalette; + // pSurfaceCallBacks->DestroySurface = (PDD_SURFCB_DESTROYSURFACE) DdDestroySurface; + // pSurfaceCallBacks->Flip = (PDD_SURFCB_FLIP) DdFlip; + // pSurfaceCallBacks->SetClipList = (PDD_SURFCB_SETCLIPLIST) DdSetClipList; + // pSurfaceCallBacks->Lock = (PDD_SURFCB_LOCK ) DdLock; + // pSurfaceCallBacks->Unlock = (PDD_SURFCB_UNLOCK) DdUnlock; + // pSurfaceCallBacks->Blt = (PDD_SURFCB_BLT) DdBlt; + // pSurfaceCallBacks->SetColorKey = (PDD_SURFCB_SETCOLORKEY) DdSetColorKey; + // pSurfaceCallBacks->AddAttachedSurface = (PDD_SURFCB_ADDATTACHEDSURFACE) DdAddAttachedSurface; + // pSurfaceCallBacks->GetBltStatus = (PDD_SURFCB_GETBLTSTATUS) DdGetBltStatus; + // pSurfaceCallBacks->GetFlipStatus = (PDD_SURFCB_GETFLIPSTATUS) DdGetFlipStatus; + // pSurfaceCallBacks->UpdateOverlay = (PDD_SURFCB_UPDATEOVERLAY) DdUpdateOverlay; + // pSurfaceCallBacks->SetOverlayPosition = (PDD_SURFCB_SETOVERLAYPOSITION) DdSetOverlayPosition; + // pSurfaceCallBacks->SetPalette = (PDD_SURFCB_SETPALETTE) DdSetPalette; } if (pPaletteCallBacks !=NULL) { memset(pPaletteCallBacks,0,sizeof(DD_PALETTECALLBACKS)); /* FILL pPaletteCallBacks with hal stuff */ - pPaletteCallBacks->dwSize = sizeof(DD_PALETTECALLBACKS); - pPaletteCallBacks->dwFlags = 0; - // pPaletteCallBacks->DestroyPalette; - // pPaletteCallBacks->SetEntries; + pPaletteCallBacks->dwSize = sizeof(DD_PALETTECALLBACKS); + // pPaletteCallBacks->DestroyPalette = (PDD_PALCB_DESTROYPALETTE) DdDestorypalette; + // pPaletteCallBacks->SetEntries = (PDD_PALCB_SETENTRIES) DdSetentries; } ppdev->bDDInitialized = TRUE;

14 years, 1 month

[janderwald] 49975: [AUDIO-BRINGUP] - Silence traces

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Dec 7 17:46:25 2010 New Revision: 49975 URL: http://svn.reactos.org/svn/reactos?rev=49975&view=rev Log: [AUDIO-BRINGUP] - Silence traces Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c Modified: branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Tue Dec 7 17:46:25 2010 @@ -293,7 +293,6 @@ HeapFree(GetProcessHeap(), 0, DetailData); return MM_STATUS_NO_MEMORY; } - DPRINT1("DeviceName %S\n", DetailData->DevicePath); wcscpy(*DeviceName, DetailData->DevicePath); HeapFree(GetProcessHeap(), 0, DetailData); Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Tue Dec 7 17:46:25 2010 @@ -44,7 +44,7 @@ return TranslateInternalMmResult(Result); } - SND_TRACE(L"%d devices of type %d found\n", DeviceCount, DeviceType); + //SND_TRACE(L"%d devices of type %d found\n", DeviceCount, DeviceType); for ( i = 0; i < DeviceCount; ++ i ) @@ -112,7 +112,7 @@ case DRV_LOAD : { MMRESULT Result; - SND_TRACE(L"DRV_LOAD\n"); + //SND_TRACE(L"DRV_LOAD\n"); Result = InitEntrypointMutexes(); @@ -130,7 +130,7 @@ } /* Populate the device lists */ - SND_TRACE(L"Populating device lists\n"); + //SND_TRACE(L"Populating device lists\n"); PopulateWdmDeviceList(WAVE_OUT_DEVICE_TYPE); PopulateWdmDeviceList(WAVE_IN_DEVICE_TYPE); PopulateWdmDeviceList(MIDI_OUT_DEVICE_TYPE); @@ -138,7 +138,7 @@ PopulateWdmDeviceList(AUX_DEVICE_TYPE); PopulateWdmDeviceList(MIXER_DEVICE_TYPE); - SND_TRACE(L"Initialisation complete\n"); + //SND_TRACE(L"Initialisation complete\n"); return 1L; } @@ -163,14 +163,14 @@ case DRV_ENABLE : case DRV_DISABLE : { - SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n"); + //SND_TRACE(L"DRV_ENABLE / DRV_DISABLE\n"); return 1L; } case DRV_OPEN : case DRV_CLOSE : { - SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n"); + //SND_TRACE(L"DRV_OPEN / DRV_CLOSE\n"); return 1L; } Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Tue Dec 7 17:46:25 2010 @@ -1056,9 +1056,9 @@ AllPinsCount = 0; MMixerGetAllUpOrDownstreamPinsFromNodeIndex(MixerContext, Topology, LineTerminator, TRUE, &AllPinsCount, AllPins); - DPRINT1("LineTerminator %lu\n", LineTerminator); - DPRINT1("PinCount %lu\n", AllPinsCount); - DPRINT1("AllNodesCount %lu\n", AllNodesCount); + DPRINT("LineTerminator %lu\n", LineTerminator); + DPRINT("PinCount %lu\n", AllPinsCount); + DPRINT("AllNodesCount %lu\n", AllNodesCount); /* now construct the source lines which are attached to the destination line */ Index = AllPinsCount; @@ -1268,7 +1268,7 @@ return MM_STATUS_UNSUCCESSFUL; } - DPRINT1("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); + DPRINT("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); /* sanity check */ ASSERT(MixerData->MixerInfo == NULL || MixerData->MixerInfo == MixerInfo); @@ -1551,7 +1551,7 @@ ULONG DestinationLineID, LineTerminator; LPMIXERLINE_EXT DstLine; - DPRINT1("DeviceName %S\n", MixerData->DeviceName); + DPRINT("DeviceName %S\n", MixerData->DeviceName); /* get topology pin count */ MMixerGetTopologyPinCount(Topology, &PinCount); Modified: branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Tue Dec 7 17:46:25 2010 @@ -146,16 +146,15 @@ } if (MixerLine->cbStruct != sizeof(MIXERLINEW)) - { - DPRINT1("MixerLine Expected %lu but got %lu\n", sizeof(MIXERLINEW), MixerLine->cbStruct); - return MM_STATUS_INVALID_PARAMETER; - } - + { + DPRINT1("MixerLine Expected %lu but got %lu\n", sizeof(MIXERLINEW), MixerLine->cbStruct); + return MM_STATUS_INVALID_PARAMETER; + } /* clear hmixer from flags */ Flags &=~MIXER_OBJECTF_HMIXER; - DPRINT1("MMixerGetLineInfo MixerId %lu Flags %lu\n", MixerId, Flags); + DPRINT("MMixerGetLineInfo MixerId %lu Flags %lu\n", MixerId, Flags); if (Flags == MIXER_GETLINEINFOF_DESTINATION) { @@ -511,7 +510,7 @@ return MM_STATUS_INVALID_PARAMETER; } - DPRINT1("MMixerSetControlDetails ControlType %lx MixerControlName %S MixerLineName %S NodeID %lu\n", MixerControl->Control.dwControlType, MixerControl->Control.szName, MixerLine->Line.szName, NodeId); + DPRINT("MMixerSetControlDetails ControlType %lx MixerControlName %S MixerLineName %S NodeID %lu\n", MixerControl->Control.dwControlType, MixerControl->Control.szName, MixerLine->Line.szName, NodeId); switch(MixerControl->Control.dwControlType) { case MIXERCONTROL_CONTROLTYPE_MUTE:

14 years, 1 month

[janderwald] 49974: [PORTCLS] - Merge from the audio branch - Fix node property handler - Take advantage of IPinCount interface

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Dec 7 17:23:09 2010 New Revision: 49974 URL: http://svn.reactos.org/svn/reactos?rev=49974&view=rev Log: [PORTCLS] - Merge from the audio branch - Fix node property handler - Take advantage of IPinCount interface Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/ (props changed) trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Dec 7 17:23:09 2010 @@ -1,0 +1,1 @@ +/branches/audio-bringup/drivers/wdm/audio/backpln/portcls:49194-49973 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Tue Dec 7 17:23:09 2010 @@ -14,10 +14,13 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data, IN PSUBDEVICE_DESCRIPTOR Descriptor, - IN BOOL Global) + IN BOOL Global, + IN ISubdevice *SubDevice) { KSPIN_CINSTANCES * Instances; KSP_PIN * Pin = (KSP_PIN*)Request; + ULONG FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible; + NTSTATUS Status; if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) { @@ -28,12 +31,31 @@ Instances = (KSPIN_CINSTANCES*)Data; - if (Global) - Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxGlobalInstanceCount; + // check if the miniport supports the IPinCount interface + Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); + + if (NT_SUCCESS(Status)) + { + if (Global) + { + Instances->PossibleCount = GlobalPossible; + Instances->CurrentCount = GlobalCurrent; + } + else + { + Instances->PossibleCount = FilterPossible; + Instances->CurrentCount = FilterCurrent; + } + } else - Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxFilterInstanceCount; - - Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount; + { + if (Global) + Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxGlobalInstanceCount; + else + Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxFilterInstanceCount; + + Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount; + } IoStatus->Information = sizeof(KSPIN_CINSTANCES); IoStatus->Status = STATUS_SUCCESS; @@ -45,10 +67,13 @@ IN PIO_STATUS_BLOCK IoStatus, IN PKSIDENTIFIER Request, IN OUT PVOID Data, - IN PSUBDEVICE_DESCRIPTOR Descriptor) + IN PSUBDEVICE_DESCRIPTOR Descriptor, + IN ISubdevice *SubDevice) { PULONG Result; KSP_PIN * Pin = (KSP_PIN*)Request; + ULONG FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible; + NTSTATUS Status; if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) { @@ -58,7 +83,19 @@ } Result = (PULONG)Data; - *Result = Descriptor->Factory.Instances[Pin->PinId].MinFilterInstanceCount; + + + // check if the miniport supports the IPinCount interface + Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible); + + if (NT_SUCCESS(Status)) + { + *Result = FilterNecessary; + } + else + { + *Result = Descriptor->Factory.Instances[Pin->PinId].MinFilterInstanceCount; + } IoStatus->Information = sizeof(ULONG); IoStatus->Status = STATUS_SUCCESS; @@ -236,13 +273,13 @@ Status = KsPinPropertyHandler(Irp, Request, Data, Descriptor->Factory.PinDescriptorCount, Descriptor->Factory.KsPinDescriptor); break; case KSPROPERTY_PIN_GLOBALCINSTANCES: - Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, TRUE); + Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, TRUE, SubDevice); break; case KSPROPERTY_PIN_CINSTANCES: - Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, FALSE); + Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, FALSE, SubDevice); break; case KSPROPERTY_PIN_NECESSARYINSTANCES: - Status = HandleNecessaryPropertyInstances(&Irp->IoStatus, Request, Data, Descriptor); + Status = HandleNecessaryPropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, SubDevice); break; case KSPROPERTY_PIN_DATAINTERSECTION: Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Tue Dec 7 17:23:09 2010 @@ -165,7 +165,7 @@ // get instance / value size InstanceSize = IoStack->Parameters.DeviceIoControl.InputBufferLength; - Instance = Data; + Instance = Request; ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; // initialize property request @@ -273,17 +273,15 @@ if (PropertyRequest->PropertyItem && PropertyRequest->PropertyItem->Handler) { // now call the handler - UNICODE_STRING GuidBuffer; - RtlStringFromGUID(Property->Set, &GuidBuffer); - DPRINT1("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p\n", - PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, - PropertyRequest->PropertyItem->Handler, PropertyRequest); -#if 0 + //UNICODE_STRING GuidBuffer; + //RtlStringFromGUID(Property->Set, &GuidBuffer); + //DPRINT("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p PropertyItemFlags %lx PropertyItemId %lu\n", + // PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, + // PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id); + Status = PropertyRequest->PropertyItem->Handler(PropertyRequest); -#else - Status = STATUS_NOT_FOUND; -#endif - Irp->IoStatus.Information = PropertyRequest->ValueSize; + //DPRINT("Status %lx ValueSize %lu Information %lu\n", Status, PropertyRequest->ValueSize, Irp->IoStatus.Information); + Irp->IoStatus.Information = PropertyRequest->ValueSize; if (Status != STATUS_PENDING) {

14 years, 1 month

[greatlrd] 49973: fix some compile issue

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Dec 7 16:08:48 2010 New Revision: 49973 URL: http://svn.reactos.org/svn/reactos?rev=49973&view=rev Log: fix some compile issue Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] Tue Dec 7 16:08:48 2010 @@ -20,6 +20,13 @@ #pragma once +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + #include <stdarg.h> #include <windef.h> #include <guiddef.h> @@ -27,7 +34,7 @@ #include <winddi.h> #include <winioctl.h> #include <ntddvdeo.h> -#include <ddrawi.h> + //#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT

14 years, 1 month

[janderwald] 49972: [AUDIO-BRINGUP] - Fix major bug which made change volume / mute requests fail

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Dec 7 15:52:25 2010 New Revision: 49972 URL: http://svn.reactos.org/svn/reactos?rev=49972&view=rev Log: [AUDIO-BRINGUP] - Fix major bug which made change volume / mute requests fail Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Tue Dec 7 15:52:25 2010 @@ -256,7 +256,7 @@ PEVENT_NOTIFICATION_ENTRY NotificationEntry; /* enumerate list and add a notification entry */ - Entry = MixerInfo->LineList.Flink; + Entry = MixerInfo->EventList.Flink; while(Entry != &MixerInfo->EventList) { /* get notification entry offset */

14 years, 1 month

[greatlrd] 49971: Start cleanup the old dx code for 2d add DdMapMemory not yet finish. The code are not mapped out yet. Plan to add hw support for DdLock and DdUnlock

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Dec 7 15:38:51 2010 New Revision: 49971 URL: http://svn.reactos.org/svn/reactos?rev=49971&view=rev Log: Start cleanup the old dx code for 2d add DdMapMemory not yet finish. The code are not mapped out yet. Plan to add hw support for DdLock and DdUnlock Modified: branches/reactx/reactos/drivers/video/displays/framebuf/dd.c branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c branches/reactx/reactos/drivers/video/displays/framebuf/enable.c branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.rbuild Modified: branches/reactx/reactos/drivers/video/displays/framebuf/dd.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/dd.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/dd.c [iso-8859-1] Tue Dec 7 15:38:51 2010 @@ -24,93 +24,169 @@ DWORD CALLBACK -DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA pccsd) +DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd) { + /* We do not needit if we need it here it is + PPDEV ppdev=(PPDEV)pccsd->lpDD->dhpdev; + */ - /* We do not support 3d buffer so we fail here */ - if ((pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) && - (pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) - { - pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; - return DDHAL_DRIVER_HANDLED; - } - - - /* Check if another pixel format or not, we fail for now */ - if (pccsd->bIsDifferentPixelFormat) - { - /* check the fourcc diffent FOURCC, but we only support BMP for now */ - //if(pccsd->lpDDSurfaceDesc->ddpfPixelFormat.dwFlags & DDPF_FOURCC) - //{ - // /* We do not support other pixel format */ - // switch (pccsd->lpDDSurfaceDesc->ddpfPixelFormat.dwFourCC) - // { - // default: - // pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; - // return DDHAL_DRIVER_HANDLED; - // } - //} - // /* check the texture support, we do not support testure for now */ - //else if((pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) - //{ - // /* We do not support texture surface */ - // pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; - // return DDHAL_DRIVER_HANDLED; - //} - - /* Fail */ - pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; - return DDHAL_DRIVER_HANDLED; + pccsd->ddRVal = DD_OK; + /* We do not support 3d buffer in video ram so we fail here */ + if (pccsd->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; } - pccsd->ddRVal = DD_OK; - return DDHAL_DRIVER_HANDLED; + /* We do not support texture yet so we fail here */ + if (pccsd->lplpSList[0]->lpSurfMore->ddsCapsEx.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; + } + + /* Check if another pixel format or not, we fail for now */ + if (pccsd->bIsDifferentPixelFormat) + { + /* We do not support FOUR_CC */ + pccsd->ddRVal = DDERR_INVALIDPIXELFORMAT; + } + + return DDHAL_DRIVER_HANDLED; } DWORD CALLBACK -DdCreateSurface(PDD_CREATESURFACEDATA pcsd) +DdCreateSurface( LPDDHAL_CREATESURFACEDATA pcsd ) { - int i; + PPDEV pDev = (PPDEV)pcsd->lpDD->dhpdev; + DD_SURFACE_LOCAL* lpSurfaceLocal; + DD_SURFACE_GLOBAL* lpSurfaceGlobal; + LPDDSURFACEDESC lpSurfaceDesc; - if (pcsd->dwSCnt < 1) - { - pcsd->ddRVal = DDERR_GENERIC; - return DDHAL_DRIVER_NOTHANDLED; - } + /* Driver DdCreateSurface should only support to create one surface not more that */ + if (pcsd->dwSCnt != 1) + { + pcsd->ddRVal = DDERR_GENERIC; + return DDHAL_DRIVER_HANDLED; + } + + lpSurfaceLocal = pcsd->lplpSList[0]; + lpSurfaceGlobal = lpSurfaceLocal->lpGbl; + lpSurfaceDesc = pcsd->lpDDSurfaceDesc; - for (i=0; i<(int)pcsd->dwSCnt; i++) + /* ReactOS / Windows NT is supposed to guarantee that ddpfSurface.dwSize is valid */ + if ( lpSurfaceGlobal->ddpfSurface.dwSize == sizeof(DDPIXELFORMAT) ) { - pcsd->lplpSList[i]->lpGbl->lPitch = (DWORD)(pcsd->lplpSList[i]->lpGbl->wWidth * - (pcsd->lplpSList[i]->lpGbl->ddpfSurface.dwRGBBitCount / 8)); + pcsd->ddRVal = DDERR_GENERIC; + return DDHAL_DRIVER_HANDLED; + } - pcsd->lplpSList[i]->lpGbl->dwBlockSizeX = pcsd->lplpSList[i]->lpGbl->lPitch * - (DWORD)(pcsd->lplpSList[i]->lpGbl->wHeight); + /* We do not have any private surface data for dx */ + lpSurfaceGlobal->dwReserved1 = 0; - pcsd->lplpSList[i]->lpGbl->dwBlockSizeY = 1; - if ( pcsd->lplpSList[i] ->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + /* Support diffent Bpp deep */ + if (lpSurfaceDesc->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED4) + { + lpSurfaceGlobal->lPitch = ((lpSurfaceGlobal->wWidth/2) + 31) & ~31; + } + else if (lpSurfaceDesc->ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) + { + lpSurfaceGlobal->lPitch = (lpSurfaceGlobal->wWidth + 31) & ~31; + } + else + { + lpSurfaceGlobal->lPitch = lpSurfaceGlobal->wWidth*(lpSurfaceDesc->ddpfPixelFormat.dwRGBBitCount/8); + } + + if ( lpSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + /* We maybe should alloc it with EngAlloc + for now we trusting ddraw alloc it */ + lpSurfaceGlobal->lpGbl->fpVidMem = 0; + } + else + { + /* We maybe should alloc it with EngAlloc + for now we trusting ddraw alloc it */ + + lpSurfaceGlobal->lpGbl->fpVidMem = 0; + + if ( (lpSurfaceLocal->lpSurfMore->ddsCapsEx.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) && { - /* We maybe should alloc it with EngAlloc - for now we trusting ddraw alloc it */ - pcsd->lplpSList[i]->lpGbl->fpVidMem = 0; + if (lpSurfaceDesc->dwFlags & DDSD_PIXELFORMAT) + { + lpSurfaceGlobal->lPitch = ((lpSurfaceDesc->ddpfPixelFormat.dwRGBBitCount * lpSurfaceGlobal->wWidth+31)/32)*4; //make it DWORD aligned + lpSurfaceGlobal->dwUserMemSize = lpSurfaceGlobal->wWidth * lpSurfaceGlobal->wHeight * lpSurfaceGlobal->lPitch; + lpSurfaceGlobal->fpVidMem = DDHAL_PLEASEALLOC_USERMEM; + } + } + else + { + lpSurfaceGlobal->dwBlockSizeX = lpSurfaceGlobal->wWidth; + lpSurfaceGlobal->dwBlockSizeY = lpSurfaceGlobal->wHeight; + lpSurfaceGlobal->fpVidMem = DDHAL_PLEASEALLOC_BLOCKSIZE; + } + } + + pcsd->lpDDSurfaceDesc->lPitch = lpSurfaceGlobal->lPitch; + pcsd->lpDDSurfaceDesc->dwFlags |= DDSD_PITCH; + + pcsd->ddRVal = DD_OK; + return DDHAL_DRIVER_HANDLED; +} + +DWORD CALLBACK +DdMapMemory(PDD_MAPMEMORYDATA lpMapMemory) +{ + + VIDEO_SHARE_MEMORY ShareMemory; + VIDEO_SHARE_MEMORY_INFORMATION ShareMemoryInformation; + DWORD ReturnedDataLength; + PPDEV ppdev = (PPDEV) lpMapMemory->lpDD->dhpdev; + + lpMapMemory->ddRVal = DD_OK; + + if (lpMapMemory->bMap) + { + ShareMemory.ProcessHandle = lpMapMemory->hProcess; + ShareMemory.RequestedVirtualAddress = 0; + ShareMemory.ViewOffset = 0; + ShareMemory.ViewSize = ppdev->ScreenHeight * ppdev->ScreenDelta; + + if (EngDeviceIoControl(ppdev->hDriver, + IOCTL_VIDEO_SHARE_VIDEO_MEMORY, + &ShareMemory, + sizeof(VIDEO_SHARE_MEMORY), + &ShareMemoryInformation, + sizeof(VIDEO_SHARE_MEMORY_INFORMATION), + &ReturnedDataLength)) + { + lpMapMemory->ddRVal = DDERR_GENERIC; } else { + lpMapMemory->fpProcess = (FLATPTR) ShareMemoryInformation.VirtualAddress; + } + } + else + { + ShareMemory.ProcessHandle = lpMapMemory->hProcess; + ShareMemory.ViewOffset = 0; + ShareMemory.ViewSize = 0; + ShareMemory.RequestedVirtualAddress = (VOID*) lpMapMemory->fpProcess; - /* We maybe should alloc it with EngAlloc - for now we trusting ddraw alloc it */ - pcsd->lplpSList[i]->lpGbl->fpVidMem = DDHAL_PLEASEALLOC_BLOCKSIZE; + if (EngDeviceIoControl(ppdev->hDriver, + IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY, + &ShareMemory, + sizeof(VIDEO_SHARE_MEMORY), + NULL, + 0, + &ReturnedDataLength)) + { + lpMapMemory->ddRVal = DDERR_GENERIC; } + } - pcsd->lpDDSurfaceDesc->lPitch = pcsd->lplpSList[i]->lpGbl->lPitch; - pcsd->lpDDSurfaceDesc->dwFlags |= DDSD_PITCH; - - } // for i - - - - pcsd->ddRVal = DD_OK; - return DDHAL_DRIVER_HANDLED; + + return(DDHAL_DRIVER_HANDLED); } - Modified: branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/ddenable.c [iso-8859-1] Tue Dec 7 15:38:51 2010 @@ -36,95 +36,79 @@ OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, OUT DD_PALETTECALLBACKS *pPaletteCallBacks) { - PPDEV ppdev = (PPDEV)dhpdev; - - if (ppdev->bDDInitialized == TRUE) - { - return TRUE; - } - - /* Setup pixel format */ - ppdev->ddpfDisplay.dwSize = sizeof( DDPIXELFORMAT ); - ppdev->ddpfDisplay.dwFourCC = 0; - - ppdev->ddpfDisplay.dwRBitMask = ppdev->RedMask; - ppdev->ddpfDisplay.dwGBitMask = ppdev->GreenMask; - ppdev->ddpfDisplay.dwBBitMask = ppdev->BlueMask; - - ppdev->ddpfDisplay.dwRGBBitCount=ppdev->BitsPerPixel; - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0; - ppdev->ddpfDisplay.dwFlags = DDPF_RGB; - - ppdev->pvmList = NULL; - - switch(ppdev->iDitherFormat) - { - case BMF_8BPP: - ppdev->ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; - break; - - case BMF_16BPP: - switch(ppdev->RedMask) - { - case 0x7C00: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0x8000; - break; - - default: - break; - } - break; - - case BMF_24BPP: - break; - - case BMF_32BPP: - ppdev->ddpfDisplay.dwRGBAlphaBitMask = 0xff000000; - break; - - default: - /* FIXME unknown pixel bits */ - ppdev->ddpfDisplay.dwRGBBitCount=0; - break; - } - - if (pCallBacks !=NULL) - { - memset(pCallBacks,0,sizeof(DD_CALLBACKS)); - - /* FILL pCallBacks with hal stuff */ - pCallBacks->dwSize = sizeof(DDHAL_DDCALLBACKS); - pCallBacks->CanCreateSurface = (PDD_CANCREATESURFACE)DdCanCreateSurface; - pCallBacks->CreateSurface = (PDD_CREATESURFACE)DdCreateSurface; - - /* Fill in the HAL Callback flags */ - pCallBacks->dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_CREATESURFACE; - } - - if (pSurfaceCallBacks !=NULL) - { - memset(pSurfaceCallBacks,0,sizeof(DD_SURFACECALLBACKS)); - - /* FILL pSurfaceCallBacks with hal stuff */ - // pSurfaceCallBacks.dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); - // pSurfaceCallBacks.DestroySurface = DdDestroySurface; - // pSurfaceCallBacks.Lock = DdLock; - // pSurfaceCallBacks.Blt = DdBlt; - - // pSurfaceCallBacks->dwFlags = DDHAL_SURFCB32_DESTROYSURFACE | DDHAL_SURFCB32_LOCK | DDHAL_SURFCB32_BLT ; - } - - if (pPaletteCallBacks !=NULL) - { - memset(pPaletteCallBacks,0,sizeof(DD_PALETTECALLBACKS)); - /* FILL pPaletteCallBacks with hal stuff */ - /* We will not support this callback in the framebuf.dll */ - } - - - /* Fixme fill the ppdev->dxHalInfo with the info we need */ - ppdev->bDDInitialized = TRUE; - return ppdev->bDDInitialized; + PPDEV ppdev = (PPDEV)dhpdev; + + if (ppdev->bDDInitialized == TRUE) + { + return TRUE; + } + + if (pCallBacks !=NULL) + { + memset(pCallBacks,0,sizeof(DD_CALLBACKS)); + /* Fill in the HAL Callback pointers */ + + pCallBacks->dwSize = sizeof(DD_CALLBACKS); + pCallBacks->dwFlags = DDHAL_CB32_CANCREATESURFACE | + DDHAL_CB32_CREATESURFACE ; + // = DDHAL_CB32_WAITFORVERTICALBLANK | + // DDHAL_CB32_MAPMEMORY | + // DDHAL_CB32_GETSCANLINE | + + pCallBacks->CreateSurface = DdCreateSurface; + // pCallBacks->SetColorKey = DdSetColorKey; + // pCallBacks->WaitForVerticalBlank = DdWaitForVerticalBlank; + pCallBacks->CanCreateSurface = DdCanCreateSurface; + // pCallBacks->CreatePalette = DdCreatePalette; + // pCallBacks->GetScanLine = DdGetScanLine; + // pCallBacks->MapMemory = DdMapMemory; + + /* Unused on Microsoft Windows 2000 and later and should be ignored by the driver. ' + pCallBacks->DestroyDriver + pCallBacks->SetMode + */ + + } + + if (pSurfaceCallBacks !=NULL) + { + memset(pSurfaceCallBacks,0,sizeof(DD_SURFACECALLBACKS)); + + /* FILL pSurfaceCallBacks with hal stuff */ + // pSurfaceCallBacks->dwSize = sizeof(DDHAL_DDSURFACECALLBACKS); + // DDHAL_SURFCB32_DESTROYSURFACE | + // DDHAL_SURFCB32_FLIP | + // DDHAL_SURFCB32_LOCK | + // DDHAL_SURFCB32_BLT | + // DDHAL_SURFCB32_GETBLTSTATUS | + // DDHAL_SURFCB32_GETFLIPSTATUS; + // pSurfaceCallBacks->DestroySurface = DdDestroySurface; + // pSurfaceCallBacks->Flip = DdFlip; + // pSurfaceCallBacks->SetClipList = DdSetClipList; + // pSurfaceCallBacks->Lock = DdLock; + // pSurfaceCallBacks->Unlock = DdUnlock; + // pSurfaceCallBacks->Blt = DdBlt; + // pSurfaceCallBacks->SetColorKey = DdSetColorKey; + // pSurfaceCallBacks->AddAttachedSurface = DdAddAttachedSurface; + // pSurfaceCallBacks->GetBltStatus = DdGetBltStatus; + // pSurfaceCallBacks->GetFlipStatus = DdGetFlipStatus; + // pSurfaceCallBacks->UpdateOverlay = DdUpdateOverlay; + // pSurfaceCallBacks->SetOverlayPosition = DdSetOverlayPosition; + // pSurfaceCallBacks->SetPalette = DdSetPalette; + } + + if (pPaletteCallBacks !=NULL) + { + memset(pPaletteCallBacks,0,sizeof(DD_PALETTECALLBACKS)); + /* FILL pPaletteCallBacks with hal stuff */ + pPaletteCallBacks->dwSize = sizeof(DD_PALETTECALLBACKS); + pPaletteCallBacks->dwFlags = 0; + // pPaletteCallBacks->DestroyPalette; + // pPaletteCallBacks->SetEntries; + } + + ppdev->bDDInitialized = TRUE; + return ppdev->bDDInitialized; } BOOL APIENTRY @@ -136,29 +120,17 @@ OUT DWORD *pdwNumFourCCCodes, OUT DWORD *pdwFourCC) { - PPDEV ppdev = (PPDEV)dhpdev; - LONG i; - DWORD heap = 1; /* we always alloc one heap */ - BOOL bDDrawHeap = FALSE; - - if (ppdev == NULL) + PPDEV ppdev = (PPDEV)dhpdev; + DWORD heap = 1; /* we always alloc one heap */ + BOOL bDDrawHeap = FALSE; + + if (ppdev->bDDInitialized == FALSE); + { return FALSE; - - /* check so pHalInfo, pdwNumHeaps, pdwNumFourCCCodes is not NULL - pdwFourCC and pvmList can be null - */ - - if (pHalInfo == NULL) - return FALSE; - - if (pdwNumHeaps == NULL) - return FALSE; - - if (pdwNumFourCCCodes == NULL) - return FALSE; - - /* Setup heap */ - if ( (ppdev->ScreenWidth < ppdev->MemWidth) || (ppdev->ScreenHeight < ppdev->MemHeight)) + } + + /* Setup heap */ + if ( (ppdev->ScreenWidth < ppdev->MemWidth) || (ppdev->ScreenHeight < ppdev->MemHeight)) { bDDrawHeap = TRUE; heap++; @@ -167,41 +139,45 @@ ppdev->dwHeap = heap; *pdwNumHeaps = heap; - /* We do not support other fourcc */ + /* We do not support other fourcc */ *pdwNumFourCCCodes = 0; - /* - check see if pvmList and pdwFourCC are frist call - or frist. Secon call we fill in pHalInfo info + /* + check see if pvmList and pdwFourCC are frist call + or frist. Secon call we fill in pHalInfo info */ - if(!(pvmList && pdwFourCC)) - { - - RtlZeroMemory(pHalInfo, sizeof(DD_HALINFO)); - pHalInfo->dwSize = sizeof(DD_HALINFO); - - pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTQUEUE | DDCAPS_BLTCOLORFILL | DDCAPS_READSCANLINE | - DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_CANBLTSYSMEM; - - pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTSTRETCHY | DDFXCAPS_BLTSTRETCHX | - DDFXCAPS_BLTSTRETCHYN | DDFXCAPS_BLTSTRETCHXN | - DDFXCAPS_BLTSHRINKY | DDFXCAPS_BLTSHRINKX | - DDFXCAPS_BLTSHRINKYN | DDFXCAPS_BLTSHRINKXN | - DDFXCAPS_BLTMIRRORUPDOWN | DDFXCAPS_BLTMIRRORLEFTRIGHT; - - pHalInfo->ddCaps.dwCaps2 = DDCAPS2_NONLOCALVIDMEM | DDCAPS2_NONLOCALVIDMEMCAPS; - - pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP; - - pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_SRCBLT | DDCKEYCAPS_SRCBLTCLRSPACE; - - pHalInfo->ddCaps.dwSVBCaps = DDCAPS_BLT; - pHalInfo->ddCaps.ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; - - /* Calc how much memmory is left on the video cards memmory */ - pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; + if(!(pvmList && pdwFourCC)) + { + RtlZeroMemory(pHalInfo, sizeof(DD_HALINFO)); + pHalInfo->dwSize = sizeof(DD_HALINFO); + + pHalInfo->ddCaps.dwCaps = DDCAPS_NOHARDWARE; + /* we do not support all this caps + pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | DDCAPS_BLTQUEUE | DDCAPS_BLTCOLORFILL | DDCAPS_READSCANLINE | + DDCAPS_BLTSTRETCH | DDCAPS_COLORKEY | DDCAPS_CANBLTSYSMEM; + + pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTSTRETCHY | DDFXCAPS_BLTSTRETCHX | + DDFXCAPS_BLTSTRETCHYN | DDFXCAPS_BLTSTRETCHXN | + DDFXCAPS_BLTSHRINKY | DDFXCAPS_BLTSHRINKX | + DDFXCAPS_BLTSHRINKYN | DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTMIRRORUPDOWN | DDFXCAPS_BLTMIRRORLEFTRIGHT; + + pHalInfo->ddCaps.dwCaps2 = DDCAPS2_NONLOCALVIDMEM | DDCAPS2_NONLOCALVIDMEMCAPS; + + pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP; + + pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_SRCBLT | DDCKEYCAPS_SRCBLTCLRSPACE; + + pHalInfo->ddCaps.dwSVBCaps = DDCAPS_BLT; + pHalInfo->ddCaps.ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_NONLOCALVIDMEM; + */ + + pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FLIP; + + /* Calc how much memmory is left on the video cards memmory */ + pHalInfo->ddCaps.dwVidMemTotal = (ppdev->MemHeight - ppdev->ScreenHeight) * ppdev->ScreenDelta; /* fill in some basic info that we need */ pHalInfo->vmiData.pvPrimary = ppdev->ScreenPtr; @@ -211,50 +187,45 @@ pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = ppdev->BitsPerPixel; - pHalInfo->vmiData.ddpfDisplay.dwRBitMask = ppdev->RedMask; + pHalInfo->vmiData.ddpfDisplay.dwRBitMask = ppdev->RedMask; pHalInfo->vmiData.ddpfDisplay.dwGBitMask = ppdev->GreenMask; pHalInfo->vmiData.ddpfDisplay.dwBBitMask = ppdev->BlueMask; pHalInfo->vmiData.dwOffscreenAlign = 4; - if ( ppdev->BitsPerPixel == 8 ) - { + if ( ppdev->BitsPerPixel == 8 ) + { pHalInfo->vmiData.ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED8; } - /* FIXME - Config the rops we do not doing that yet - for we need write the rops table - */ - for(i=0;i<DD_ROP_SPACE;i++ ) + if ( ppdev->BitsPerPixel == 4 ) { - // pHALInfo->ddCaps.dwSVBRops[i] = rops[i]; - // pHALInfo->ddCaps.dwRops[i] = rops[i]; + pHalInfo->vmiData.ddpfDisplay.dwFlags |= DDPF_PALETTEINDEXED4; } - } - - /* Now build pvmList info */ - if(pvmList) - { - ppdev->pvmList = pvmList; - - if ( bDDrawHeap == TRUE) - { - pvmList->dwFlags = VIDMEM_ISLINEAR ; + } + + /* Now build pvmList info */ + if(pvmList) + { + ppdev->pvmList = pvmList; + + if ( bDDrawHeap == TRUE) + { + pvmList->dwFlags = VIDMEM_ISLINEAR ; pvmList->fpStart = ppdev->ScreenHeight * ppdev->ScreenDelta; pvmList->fpEnd = ppdev->MemHeight * ppdev->ScreenDelta - 1; - pvmList->ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - pvmList++; - } - - pvmList->fpStart = 0; - pvmList->fpEnd = (ppdev->MemHeight * ppdev->ScreenDelta) - 1; - pvmList->dwFlags = VIDMEM_ISNONLOCAL | VIDMEM_ISLINEAR | VIDMEM_ISWC; - pvmList->ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER ; - pvmList->ddsCapsAlt.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER; - - pvmList = ppdev->pvmList; - } - - return TRUE; + pvmList->ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + pvmList++; + } + + pvmList->fpStart = 0; + pvmList->fpEnd = (ppdev->MemHeight * ppdev->ScreenDelta) - 1; + pvmList->dwFlags = VIDMEM_ISNONLOCAL | VIDMEM_ISLINEAR | VIDMEM_ISWC; + pvmList->ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER ; + pvmList->ddsCapsAlt.dwCaps = DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER; + + pvmList = ppdev->pvmList; + } + + return TRUE; } Modified: branches/reactx/reactos/drivers/video/displays/framebuf/enable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/enable.c [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/enable.c [iso-8859-1] Tue Dec 7 15:38:51 2010 @@ -19,6 +19,8 @@ */ #include "framebuf.h" + +HSEMAPHORE g_cs = (HSEMAPHORE)0; static DRVFN DrvFunctionTable[] = { @@ -52,17 +54,39 @@ ULONG cj, PDRVENABLEDATA pded) { + ULONG i; + BOOL status = FALSE; + ULONG SupportedVersions[] = + { + DDI_DRIVER_VERSION_NT5, // win2000 + DDI_DRIVER_VERSION_NT5_01, // win xp + DDI_DRIVER_VERSION_NT5_01_SP1, // win xp sp1 + }; + if (cj >= sizeof(DRVENABLEDATA)) { pded->c = sizeof(DrvFunctionTable) / sizeof(DRVFN); pded->pdrvfn = DrvFunctionTable; - pded->iDriverVersion = DDI_DRIVER_VERSION_NT5; - return TRUE; + + // check see if it win2000/win xp or reactos, if no version found return false + for (i=0; i < sizeof(SupportedVersions) / sizeof(ULONG) ; i++) + { + if (SupportedVersions[i] == iEngineVersion ) + { + pded->iDriverVersion = SupportedVersions[i]; + + // Initialize sync semaphore. + g_cs = EngCreateSemaphore(); + if (g_cs) + { + status = TRUE; + } + break; + } + } + } - else - { - return FALSE; - } + return status; } /* Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.h [iso-8859-1] Tue Dec 7 15:38:51 2010 @@ -27,6 +27,7 @@ #include <winddi.h> #include <winioctl.h> #include <ntddvdeo.h> +#include <ddrawi.h> //#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT @@ -69,6 +70,15 @@ #define DEVICE_NAME L"framebuf" #define ALLOC_TAG 'FUBF' + +DWORD CALLBACK +DdCanCreateSurface( LPDDHAL_CANCREATESURFACEDATA pccsd ); + +DWORD CALLBACK +DdCreateSurface( LPDDHAL_CREATESURFACEDATA pcsd); + +DWORD CALLBACK +DdMapMemory(PDD_MAPMEMORYDATA lpMapMemory); DHPDEV APIENTRY @@ -159,3 +169,24 @@ IN PPALETTEENTRY ppalent, IN ULONG iStart, IN ULONG cColors); + +VOID APIENTRY +DrvDisableDirectDraw( + IN DHPDEV dhpdev); + +BOOL APIENTRY +DrvEnableDirectDraw( + IN DHPDEV dhpdev, + OUT DD_CALLBACKS *pCallBacks, + OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, + OUT DD_PALETTECALLBACKS *pPaletteCallBacks); + +BOOL APIENTRY +DrvGetDirectDrawInfo( + IN DHPDEV dhpdev, + OUT DD_HALINFO *pHalInfo, + OUT DWORD *pdwNumHeaps, + OUT VIDEOMEMORY *pvmList, + OUT DWORD *pdwNumFourCCCodes, + OUT DWORD *pdwFourCC); + Modified: branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/video/di… ============================================================================== --- branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/drivers/video/displays/framebuf/framebuf.rbuild [iso-8859-1] Tue Dec 7 15:38:51 2010 @@ -9,5 +9,7 @@ <file>pointer.c</file> <file>screen.c</file> <file>surface.c</file> + <file>ddenable.c</file> + <file>dd.c</file> <file>framebuf.rc</file> </module>

14 years, 1 month

[janderwald] 49970: [AUDIO-BRINGUP] - Implement registering source / destination lines + controls of alternative mixers - Implement support function for retrieving mixer by name

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Dec 7 15:19:22 2010 New Revision: 49970 URL: http://svn.reactos.org/svn/reactos?rev=49970&view=rev Log: [AUDIO-BRINGUP] - Implement registering source / destination lines + controls of alternative mixers - Implement support function for retrieving mixer by name Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/priv.h branches/audio-bringup/lib/drivers/sound/mmixer/sup.c Modified: branches/audio-bringup/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Tue Dec 7 15:19:22 2010 @@ -249,13 +249,16 @@ /* initialize mixer destination line */ DestinationLine->Line.cbStruct = sizeof(MIXERLINEW); + DestinationLine->Line.cChannels = 2; /* FIXME */ + DestinationLine->Line.cConnections = 0; + DestinationLine->Line.cControls = 0; + DestinationLine->Line.dwComponentType = (bInputMixer == 0 ? MIXERLINE_COMPONENTTYPE_DST_SPEAKERS : MIXERLINE_COMPONENTTYPE_DST_WAVEIN); + DestinationLine->Line.dwDestination = MixerInfo->MixCaps.cDestinations; + DestinationLine->Line.dwLineID = MixerInfo->MixCaps.cDestinations + DESTINATION_LINE; DestinationLine->Line.dwSource = MAXULONG; - DestinationLine->Line.dwLineID = MixerInfo->MixCaps.cDestinations + DESTINATION_LINE; + DestinationLine->Line.dwUser = 0; DestinationLine->Line.fdwLine = MIXERLINE_LINEF_ACTIVE; - DestinationLine->Line.dwUser = 0; - DestinationLine->Line.dwDestination = MixerInfo->MixCaps.cDestinations; - DestinationLine->Line.dwComponentType = (bInputMixer == 0 ? MIXERLINE_COMPONENTTYPE_DST_SPEAKERS : MIXERLINE_COMPONENTTYPE_DST_WAVEIN); - DestinationLine->Line.cChannels = 2; /* FIXME */ + if (LineName) { @@ -1267,6 +1270,12 @@ DPRINT1("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); + /* sanity check */ + ASSERT(MixerData->MixerInfo == NULL || MixerData->MixerInfo == MixerInfo); + + /* associate with mixer */ + MixerData->MixerInfo = MixerInfo; + if (MixerData->Topology == NULL) { /* construct new topology */ @@ -1418,6 +1427,9 @@ /* initialize line list */ InitializeListHead(&MixerInfo->LineList); InitializeListHead(&MixerInfo->EventList); + + /* associate with mixer data */ + MixerData->MixerInfo = MixerInfo; } /* store mixer info */ @@ -1535,6 +1547,9 @@ IN PTOPOLOGY Topology) { ULONG Index, PinCount, Reserved; + MIXER_STATUS Status; + ULONG DestinationLineID, LineTerminator; + LPMIXERLINE_EXT DstLine; DPRINT1("DeviceName %S\n", MixerData->DeviceName); @@ -1546,10 +1561,54 @@ MMixerIsTopologyPinReserved(Topology, Index, &Reserved); /* check if it has already been reserved */ - if (Reserved == FALSE) - { - DPRINT1("MixerName %S Available PinID %lu\n", MixerData->DeviceName, Index); - } + if (Reserved == TRUE) + { + /* pin has already been reserved */ + continue; + } + + DPRINT("MixerName %S Available PinID %lu\n", MixerData->DeviceName, Index); + + /* sanity check */ + ASSERT(MixerData->MixerInfo); + + if (!MixerData->MixerInfo) + { + DPRINT1("Expected mixer info\n"); + continue; + } + + /* build the destination line */ + Status = MMixerBuildMixerDestinationLine(MixerContext, MixerData->MixerInfo, MixerData->hDevice, Index, TRUE); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to build destination line */ + continue; + } + + /* calculate destination line id */ + DestinationLineID = (DESTINATION_LINE + MixerData->MixerInfo->MixCaps.cDestinations-1); + + /* add mixer controls to destination line */ + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerData->MixerInfo, MixerData->hDevice, MixerData->Topology, Index, TRUE, DestinationLineID, &LineTerminator); + if (Status == MM_STATUS_SUCCESS) + { + /* now add the rest of the source lines */ + Status = MMixerAddMixerSourceLines(MixerContext, MixerData->MixerInfo, MixerData->hDevice, MixerData->Topology, DestinationLineID, LineTerminator); + } + + /* mark pin as consumed */ + MMixerSetTopologyPinReserved(Topology, Index); + + /* now grab destination line */ + DstLine = MMixerGetSourceMixerLineByLineId(MixerData->MixerInfo, DestinationLineID); + + /* set type and target as undefined */ + DstLine->Line.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_UNDEFINED; + DstLine->Line.Target.dwType = MIXERLINE_TARGETTYPE_UNDEFINED; + DstLine->Line.Target.vDriverVersion = 0; + DstLine->Line.Target.wMid = 0; + DstLine->Line.Target.wPid = 0; } } @@ -1625,7 +1684,7 @@ /* TODO: apply hacks for Wave source line */ /* activate midi devices */ - MMixerInitializeMidiForFilter(MixerContext, MixerList, MixerData, Topology); + //MMixerInitializeMidiForFilter(MixerContext, MixerList, MixerData, Topology); /* done */ return Status; Modified: branches/audio-bringup/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Tue Dec 7 15:19:22 2010 @@ -122,6 +122,7 @@ HANDLE hDeviceInterfaceKey; LPWSTR DeviceName; PTOPOLOGY Topology; + LPMIXER_INFO MixerInfo; }MIXER_DATA, *LPMIXER_DATA; typedef struct @@ -372,6 +373,11 @@ IN LPMIXER_DATA MixerData, IN PTOPOLOGY Topology); +MIXER_STATUS +MMixerGetMixerByName( + IN PMIXER_LIST MixerList, + IN LPWSTR MixerName, + OUT LPMIXER_INFO *MixerInfo); /* topology.c */ Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Tue Dec 7 15:19:22 2010 @@ -100,6 +100,33 @@ return NULL; } +MIXER_STATUS +MMixerGetMixerByName( + IN PMIXER_LIST MixerList, + IN LPWSTR MixerName, + OUT LPMIXER_INFO *OutMixerInfo) +{ + LPMIXER_INFO MixerInfo; + PLIST_ENTRY Entry; + + Entry = MixerList->MixerList.Flink; + while(Entry != &MixerList->MixerList) + { + MixerInfo = (LPMIXER_INFO)CONTAINING_RECORD(Entry, MIXER_INFO, Entry); + + DPRINT1("MixerName %S MixerName %S\n", MixerInfo->MixCaps.szPname, MixerName); + if (wcsicmp(MixerInfo->MixCaps.szPname, MixerName) == 0) + { + *OutMixerInfo = MixerInfo; + return MM_STATUS_SUCCESS; + } + /* move to next mixer entry */ + Entry = Entry->Flink; + } + + return MM_STATUS_UNSUCCESSFUL; +} + LPMIXERLINE_EXT MMixerGetSourceMixerLineByLineId( LPMIXER_INFO MixerInfo,

14 years, 1 month

[janderwald] 49969: [SHELL32] - Implement copy / paste for files when tree view is present - Don't add shortcuts / executables to recent file list

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Dec 7 14:35:54 2010 New Revision: 49969 URL: http://svn.reactos.org/svn/reactos?rev=49969&view=rev Log: [SHELL32] - Implement copy / paste for files when tree view is present - Don't add shortcuts / executables to recent file list Modified: trunk/reactos/dll/win32/shell32/shellord.c trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Tue Dec 7 14:35:54 2010 @@ -685,6 +685,7 @@ CHAR link_dir[MAX_PATH]; CHAR new_lnk_filepath[MAX_PATH]; CHAR new_lnk_name[MAX_PATH]; + CHAR * ext; IMalloc *ppM; LPITEMIDLIST pidl; HWND hwnd = 0; /* FIXME: get real window handle */ @@ -818,9 +819,28 @@ } TRACE("full document name %s\n", debugstr_a(doc_name)); + + /* check if file is a shortcut */ + ext = strrchr(doc_name, '.'); + if (!lstrcmpiA(ext, ".lnk")) + { + IShellLinkA * ShellLink; + + IShellLink_ConstructFromFile(NULL, &IID_IShellLinkA, (LPCITEMIDLIST)SHSimpleIDListFromPathA(doc_name), (LPVOID*)&ShellLink); + IShellLinkA_GetPath(ShellLink, doc_name, MAX_PATH, NULL, 0); + + IShellLinkA_Release(ShellLink); + } + + ext = strrchr(doc_name, '.'); + if (!lstrcmpiA(ext, ".exe")) + { + /* executables are not added */ + return; + } + PathStripPathA(doc_name); TRACE("stripped document name %s\n", debugstr_a(doc_name)); - /* *** JOB 1: Update registry for ...\Explorer\RecentDocs list *** */ Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Tue Dec 7 14:35:54 2010 @@ -1594,11 +1594,144 @@ } else if(plvKeyDown->wVKey == 'C' && ctrl) { - FIXME("Need to copy\n"); + if (ShellView_GetSelections(This)) + { + IDataObject * pda; + + if (SUCCEEDED(IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl, (LPCITEMIDLIST*)This->apidl, &IID_IDataObject,0,(LPVOID *)&pda))) + { + HRESULT hr = OleSetClipboard(pda); + if (FAILED(hr)) + { + WARN("OleSetClipboard failed"); + } + IDataObject_Release(pda); + } + } + break; } else if(plvKeyDown->wVKey == 'V' && ctrl) { - FIXME("Need to paste\n"); + IDataObject * pda; + STGMEDIUM medium; + FORMATETC formatetc; + LPITEMIDLIST * apidl; + LPITEMIDLIST pidl; + IShellFolder *psfFrom = NULL, *psfDesktop, *psfTarget = NULL; + LPIDA lpcida; + ISFHelper *psfhlpdst, *psfhlpsrc; + HRESULT hr; + + hr = OleGetClipboard(&pda); + if (hr != S_OK) + { + ERR("Failed to get clipboard with %lx\n", hr); + return E_FAIL; + } + + InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); + hr = IDataObject_GetData(pda,&formatetc,&medium); + + if (FAILED(hr)) + { + ERR("Failed to get clipboard data with %lx\n", hr); + IDataObject_Release(pda); + return E_FAIL; + } + + /* lock the handle */ + lpcida = GlobalLock(medium.u.hGlobal); + if (!lpcida) + { + ERR("failed to lock pidl\n"); + ReleaseStgMedium(&medium); + IDataObject_Release(pda); + return E_FAIL; + } + + /* convert the data into pidl */ + apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + + if (!apidl) + { + ERR("failed to copy pidl\n"); + return E_FAIL; + } + + if (FAILED(SHGetDesktopFolder(&psfDesktop))) + { + ERR("failed to get desktop folder\n"); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + IDataObject_Release(pda); + return E_FAIL; + } + + if (_ILIsDesktop(pidl)) + { + /* use desktop shellfolder */ + psfFrom = psfDesktop; + } + else if (FAILED(IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom))) + { + ERR("no IShellFolder\n"); + + IShellFolder_Release(psfDesktop); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + IDataObject_Release(pda); + + return E_FAIL; + } + + psfTarget = This->pSFParent; + + + /* get source and destination shellfolder */ + if (FAILED(IShellFolder_QueryInterface(psfTarget, &IID_ISFHelper, (LPVOID*)&psfhlpdst))) + { + ERR("no IID_ISFHelper for destination\n"); + + IShellFolder_Release(psfFrom); + IShellFolder_Release(psfTarget); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + IDataObject_Release(pda); + + return E_FAIL; + } + + if (FAILED(IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (LPVOID*)&psfhlpsrc))) + { + ERR("no IID_ISFHelper for source\n"); + + ISFHelper_Release(psfhlpdst); + IShellFolder_Release(psfFrom); + IShellFolder_Release(psfTarget); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + IDataObject_Release(pda); + return E_FAIL; + } + + /* FIXXME + * do we want to perform a copy or move ??? + */ + hr = ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); + + ISFHelper_Release(psfhlpdst); + ISFHelper_Release(psfhlpsrc); + IShellFolder_Release(psfFrom); + SHFree(pidl); + _ILFreeaPidl(apidl, lpcida->cidl); + ReleaseStgMedium(&medium); + IDataObject_Release(pda); + TRACE("paste end hr %x\n", hr); + break; } else FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey);

14 years, 1 month

[akhaldi] 49968: [CMAKE] - More work rostests cmake integration. Winetests are almost all done (two remain).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 7 11:40:10 2010 New Revision: 49968 URL: http://svn.reactos.org/svn/reactos?rev=49968&view=rev Log: [CMAKE] - More work rostests cmake integration. Winetests are almost all done (two remain). Added: trunk/rostests/winetests/mshtml/CMakeLists.txt (with props) trunk/rostests/winetests/msi/CMakeLists.txt (with props) trunk/rostests/winetests/mstask/CMakeLists.txt (with props) trunk/rostests/winetests/msvcrt/CMakeLists.txt (with props) trunk/rostests/winetests/msvcrtd/CMakeLists.txt (with props) trunk/rostests/winetests/msvfw32/CMakeLists.txt (with props) trunk/rostests/winetests/msxml3/CMakeLists.txt (with props) trunk/rostests/winetests/netapi32/CMakeLists.txt (with props) trunk/rostests/winetests/ntdll/CMakeLists.txt (with props) trunk/rostests/winetests/ntdsapi/CMakeLists.txt (with props) trunk/rostests/winetests/ntprint/CMakeLists.txt (with props) trunk/rostests/winetests/odbccp32/CMakeLists.txt (with props) trunk/rostests/winetests/ole32/CMakeLists.txt (with props) trunk/rostests/winetests/oleacc/CMakeLists.txt (with props) trunk/rostests/winetests/opengl32/CMakeLists.txt (with props) trunk/rostests/winetests/pdh/CMakeLists.txt (with props) trunk/rostests/winetests/powrprof/CMakeLists.txt (with props) trunk/rostests/winetests/psapi/CMakeLists.txt (with props) trunk/rostests/winetests/qmgr/CMakeLists.txt (with props) trunk/rostests/winetests/quartz/CMakeLists.txt (with props) trunk/rostests/winetests/rasapi32/CMakeLists.txt (with props) trunk/rostests/winetests/riched20/CMakeLists.txt (with props) trunk/rostests/winetests/riched32/CMakeLists.txt (with props) trunk/rostests/winetests/rsabase/CMakeLists.txt (with props) trunk/rostests/winetests/rsaenh/CMakeLists.txt (with props) trunk/rostests/winetests/schannel/CMakeLists.txt (with props) trunk/rostests/winetests/secur32/CMakeLists.txt (with props) trunk/rostests/winetests/serialui/CMakeLists.txt (with props) trunk/rostests/winetests/setupapi/CMakeLists.txt (with props) trunk/rostests/winetests/shdocvw/CMakeLists.txt (with props) trunk/rostests/winetests/shell32/CMakeLists.txt (with props) trunk/rostests/winetests/shlwapi/CMakeLists.txt (with props) trunk/rostests/winetests/snmpapi/CMakeLists.txt (with props) trunk/rostests/winetests/spoolss/CMakeLists.txt (with props) trunk/rostests/winetests/twain_32/CMakeLists.txt (with props) trunk/rostests/winetests/urlmon/CMakeLists.txt (with props) trunk/rostests/winetests/user32/CMakeLists.txt (with props) trunk/rostests/winetests/userenv/CMakeLists.txt (with props) trunk/rostests/winetests/usp10/CMakeLists.txt (with props) trunk/rostests/winetests/uxtheme/CMakeLists.txt (with props) trunk/rostests/winetests/version/CMakeLists.txt (with props) trunk/rostests/winetests/winhttp/CMakeLists.txt (with props) trunk/rostests/winetests/wininet/CMakeLists.txt (with props) trunk/rostests/winetests/winmm/CMakeLists.txt (with props) trunk/rostests/winetests/wintrust/CMakeLists.txt (with props) trunk/rostests/winetests/wlanapi/CMakeLists.txt (with props) trunk/rostests/winetests/wldap32/CMakeLists.txt (with props) trunk/rostests/winetests/ws2_32/CMakeLists.txt (with props) trunk/rostests/winetests/xmllite/CMakeLists.txt (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -35,54 +35,54 @@ add_subdirectory(msacm32) add_subdirectory(mscms) add_subdirectory(msctf) -#add_subdirectory(mshtml) -#add_subdirectory(msi) -#add_subdirectory(mstask) -#add_subdirectory(msvcrt) -#add_subdirectory(msvcrtd) -#add_subdirectory(msvfw32) -#add_subdirectory(msxml3) -#add_subdirectory(netapi32) -#add_subdirectory(ntdll) -#add_subdirectory(ntdsapi) -#add_subdirectory(ntprint) -#add_subdirectory(odbccp32) -#add_subdirectory(ole32) -#add_subdirectory(oleacc) +add_subdirectory(mshtml) +add_subdirectory(msi) +add_subdirectory(mstask) +add_subdirectory(msvcrt) +add_subdirectory(msvcrtd) +add_subdirectory(msvfw32) +add_subdirectory(msxml3) +add_subdirectory(netapi32) +add_subdirectory(ntdll) +add_subdirectory(ntdsapi) +add_subdirectory(ntprint) +add_subdirectory(odbccp32) +add_subdirectory(ole32) +add_subdirectory(oleacc) #add_subdirectory(oleaut32) -#add_subdirectory(opengl32) -#add_subdirectory(pdh) -#add_subdirectory(powrprof) -#add_subdirectory(psapi) -#add_subdirectory(qmgr) -#add_subdirectory(quartz) -#add_subdirectory(rasapi32) -#add_subdirectory(riched20) -#add_subdirectory(riched32) +add_subdirectory(opengl32) +add_subdirectory(pdh) +add_subdirectory(powrprof) +add_subdirectory(psapi) +add_subdirectory(qmgr) +add_subdirectory(quartz) +add_subdirectory(rasapi32) +add_subdirectory(riched20) +add_subdirectory(riched32) #add_subdirectory(rpcrt4) -#add_subdirectory(rsabase) -#add_subdirectory(rsaenh) -#add_subdirectory(schannel) -#add_subdirectory(secur32) -#add_subdirectory(serialui) -#add_subdirectory(setupapi) -#add_subdirectory(shdocvw) -#add_subdirectory(shell32) -#add_subdirectory(shlwapi) -#add_subdirectory(snmpapi) -#add_subdirectory(spoolss) -#add_subdirectory(twain_32) -#add_subdirectory(urlmon) -#add_subdirectory(user32) -#add_subdirectory(userenv) -#add_subdirectory(usp10) -#add_subdirectory(uxtheme) -#add_subdirectory(version) -#add_subdirectory(winhttp) -#add_subdirectory(wininet) -#add_subdirectory(winmm) -#add_subdirectory(wintrust) -#add_subdirectory(wlanapi) -#add_subdirectory(wldap32) -#add_subdirectory(ws2_32) -#add_subdirectory(xmllite) +add_subdirectory(rsabase) +add_subdirectory(rsaenh) +add_subdirectory(schannel) +add_subdirectory(secur32) +add_subdirectory(serialui) +add_subdirectory(setupapi) +add_subdirectory(shdocvw) +add_subdirectory(shell32) +add_subdirectory(shlwapi) +add_subdirectory(snmpapi) +add_subdirectory(spoolss) +add_subdirectory(twain_32) +add_subdirectory(urlmon) +add_subdirectory(user32) +add_subdirectory(userenv) +add_subdirectory(usp10) +add_subdirectory(uxtheme) +add_subdirectory(version) +add_subdirectory(winhttp) +add_subdirectory(wininet) +add_subdirectory(winmm) +add_subdirectory(wintrust) +add_subdirectory(wlanapi) +add_subdirectory(wldap32) +add_subdirectory(ws2_32) +add_subdirectory(xmllite) Added: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt (added) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,20 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + dom.c + events.c + htmldoc.c + htmllocation.c + misc.c + protocol.c + script.c + testlist.c + rsrc.rc) + +add_executable(mshtml_winetest ${SOURCE}) +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) Propchange: trunk/rostests/winetests/mshtml/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/msi/CMakeLists.txt (added) +++ trunk/rostests/winetests/msi/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,22 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + automation.c + db.c + format.c + install.c + msi.c + package.c + patch.c + record.c + source.c + suminfo.c + testlist.c) + +add_executable(msi_winetest ${SOURCE}) +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) Propchange: trunk/rostests/winetests/msi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mstask/CMakeLists.txt (added) +++ trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + task.c + task_scheduler.c + task_trigger.c + testlist.c) + +add_executable(mstask_winetest ${SOURCE}) +target_link_libraries(mstask_winetest wine) +set_module_type(mstask_winetest win32cui) +add_importlibs(mstask_winetest ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/mstask/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msvcrt/CMakeLists.txt (added) +++ trunk/rostests/winetests/msvcrt/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,26 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_CRT_NONSTDC_NO_DEPRECATE + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + cpp.c + data.c + dir.c + environ.c + file.c + headers.c + heap.c + locale.c + misc.c + printf.c + scanf.c + signal.c + string.c + testlist.c + time.c) + +add_executable(msvcrt_winetest ${SOURCE}) +set_module_type(msvcrt_winetest win32cui) +add_importlibs(msvcrt_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msvcrt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msvcrtd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrtd/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msvcrtd/CMakeLists.txt (added) +++ trunk/rostests/winetests/msvcrtd/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(msvcrtd_winetest debug.c testlist.c) +target_link_libraries(msvcrtd_winetest wine) +set_module_type(msvcrtd_winetest win32cui) +add_importlibs(msvcrtd_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msvcrtd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvfw32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msvfw32/CMakeLists.txt (added) +++ trunk/rostests/winetests/msvfw32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(msvfw32_winetest msvfw.c testlist.c) +target_link_libraries(msvfw32_winetest wine) +set_module_type(msvfw32_winetest win32cui) +add_importlibs(msvfw32_winetest msvfw32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msvfw32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/CMakeLis… ============================================================================== --- trunk/rostests/winetests/msxml3/CMakeLists.txt (added) +++ trunk/rostests/winetests/msxml3/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,17 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + domdoc.c + saxreader.c + schema.c + testlist.c + xmldoc.c + xmlelem.c) + +add_executable(msxml3_winetest ${SOURCE}) +target_link_libraries(msxml3_winetest wine) +set_module_type(msxml3_winetest win32cui) +add_importlibs(msxml3_winetest user32 ole32 oleaut32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msxml3/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/netapi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + access.c + apibuf.c + ds.c + wksta.c + testlist.c) + +add_executable(netapi32_winetest ${SOURCE}) +target_link_libraries(netapi32_winetest wine) +set_module_type(netapi32_winetest win32cui) +add_importlibs(netapi32_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/netapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt (added) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,30 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + atom.c + change.c + directory.c + env.c + error.c + exception.c + file.c + generated.c + info.c + large_int.c + om.c + path.c + port.c + reg.c + rtlbitmap.c + rtl.c + rtlstr.c + string.c + time.c + testlist.c) + +add_executable(ntdll_winetest ${SOURCE}) +set_module_type(ntdll_winetest win32cui) +add_importlibs(ntdll_winetest user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/ntdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdsapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/ntdsapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/ntdsapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(ntdsapi_winetest ntdsapi.c testlist.c) +target_link_libraries(ntdsapi_winetest wine) +set_module_type(ntdsapi_winetest win32cui) +add_importlibs(ntdsapi_winetest ntdsapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/ntdsapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntprint/CMakeLi… ============================================================================== --- trunk/rostests/winetests/ntprint/CMakeLists.txt (added) +++ trunk/rostests/winetests/ntprint/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(ntprint_winetest ntprint.c testlist.c) +target_link_libraries(ntprint_winetest wine) +set_module_type(ntprint_winetest win32cui) +add_importlibs(ntprint_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/ntprint/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/CMakeL… ============================================================================== --- trunk/rostests/winetests/odbccp32/CMakeLists.txt (added) +++ trunk/rostests/winetests/odbccp32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(odbccp32_winetest misc.c testlist.c) +target_link_libraries(odbccp32_winetest wine) +set_module_type(odbccp32_winetest win32cui) +add_importlibs(odbccp32_winetest odbccp32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/odbccp32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/CMakeList… ============================================================================== --- trunk/rostests/winetests/ole32/CMakeLists.txt (added) +++ trunk/rostests/winetests/ole32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,25 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + clipboard.c + compobj.c + defaulthandler.c + dragdrop.c + errorinfo.c + hglobalstream.c + marshal.c + moniker.c + ole2.c + propvariant.c + stg_prop.c + storage32.c + usrmarshal.c + testlist.c) + +add_executable(ole32_winetest ${SOURCE}) +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) Propchange: trunk/rostests/winetests/ole32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/CMakeLis… ============================================================================== --- trunk/rostests/winetests/oleacc/CMakeLists.txt (added) +++ trunk/rostests/winetests/oleacc/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(oleacc_winetest main.c testlist.c) +target_link_libraries(oleacc_winetest wine) +set_module_type(oleacc_winetest win32cui) +add_importlibs(oleacc_winetest oleacc msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/oleacc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/opengl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/opengl32/CMakeLists.txt (added) +++ trunk/rostests/winetests/opengl32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(opengl32_winetest opengl.c testlist.c) +target_link_libraries(opengl32_winetest wine) +set_module_type(opengl32_winetest win32cui) +add_importlibs(opengl32_winetest opengl32 gdi32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/opengl32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/pdh/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/pdh/CMakeLists.txt (added) +++ trunk/rostests/winetests/pdh/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(pdh_winetest pdh.c testlist.c) +target_link_libraries(pdh_winetest wine) +set_module_type(pdh_winetest win32cui) +add_importlibs(pdh_winetest pdh msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/pdh/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/CMakeL… ============================================================================== --- trunk/rostests/winetests/powrprof/CMakeLists.txt (added) +++ trunk/rostests/winetests/powrprof/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP + -D_UNICODE -DUNICODE) + +add_executable(powrprof_winetest pwrprof.c testlist.c) +set_module_type(powrprof_winetest win32cui) +add_importlibs(powrprof_winetest advapi32 pwrprof msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/powrprof/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/psapi/CMakeList… ============================================================================== --- trunk/rostests/winetests/psapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/psapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(psapi_winetest psapi_main.c testlist.c) +target_link_libraries(psapi_winetest wine) +set_module_type(psapi_winetest win32cui) +add_importlibs(psapi_winetest psapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/psapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/qmgr/CMakeLists… ============================================================================== --- trunk/rostests/winetests/qmgr/CMakeLists.txt (added) +++ trunk/rostests/winetests/qmgr/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,17 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + enum_files.c + enum_jobs.c + file.c + job.c + qmgr.c + testlist.c) + +add_executable(qmgr_winetest ${SOURCE}) +target_link_libraries(qmgr_winetest wine) +set_module_type(qmgr_winetest win32cui) +add_importlibs(qmgr_winetest ole32 shlwapi user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/qmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt (added) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,20 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + avisplitter.c + dsoundrender.c + filtergraph.c + filtermapper.c + memallocator.c + misc.c + referenceclock.c + videorenderer.c + testlist.c) + +add_executable(quartz_winetest ${SOURCE}) +target_link_libraries(quartz_winetest wine) +set_module_type(quartz_winetest win32cui) +add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/quartz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rasapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/rasapi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/rasapi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(rasapi32_winetest rasapi.c testlist.c) +target_link_libraries(rasapi32_winetest wine) +set_module_type(rasapi32_winetest win32cui) +add_importlibs(rasapi32_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/rasapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched20/CMakeL… ============================================================================== --- trunk/rostests/winetests/riched20/CMakeLists.txt (added) +++ trunk/rostests/winetests/riched20/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + editor.c + richole.c + testlist.c + txtsrv.c) + +add_executable(riched20_winetest ${SOURCE}) +target_link_libraries(riched20_winetest wine uuid) +set_module_type(riched20_winetest win32cui) +add_importlibs(riched20_winetest ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/riched20/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/riched32/CMakeL… ============================================================================== --- trunk/rostests/winetests/riched32/CMakeLists.txt (added) +++ trunk/rostests/winetests/riched32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(riched32_winetest editor.c testlist.c) +target_link_libraries(riched32_winetest wine) +set_module_type(riched32_winetest win32cui) +add_importlibs(riched32_winetest ole32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/riched32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/rsabase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsabase/CMakeLi… ============================================================================== --- trunk/rostests/winetests/rsabase/CMakeLists.txt (added) +++ trunk/rostests/winetests/rsabase/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(rsabase_winetest rsabase.c testlist.c) +target_link_libraries(rsabase_winetest wine) +set_module_type(rsabase_winetest win32cui) +add_importlibs(rsabase_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/rsabase/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rsaenh/CMakeLists.txt (added) +++ trunk/rostests/winetests/rsaenh/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(rsaenh_winetest rsaenh.c testlist.c) +target_link_libraries(rsaenh_winetest wine) +set_module_type(rsaenh_winetest win32cui) +add_importlibs(rsaenh_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/rsaenh/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/CMakeL… ============================================================================== --- trunk/rostests/winetests/schannel/CMakeLists.txt (added) +++ trunk/rostests/winetests/schannel/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(schannel_winetest main.c testlist.c) +target_link_libraries(schannel_winetest wine) +set_module_type(schannel_winetest win32cui) +add_importlibs(schannel_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/schannel/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/secur32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/secur32/CMakeLists.txt (added) +++ trunk/rostests/winetests/secur32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + main.c + ntlm.c + schannel.c + secur32.c + testlist.c) + +add_executable(secur32_winetest ${SOURCE}) +target_link_libraries(secur32_winetest wine) +set_module_type(secur32_winetest win32cui) +add_importlibs(secur32_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/secur32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/serialui/CMakeL… ============================================================================== --- trunk/rostests/winetests/serialui/CMakeLists.txt (added) +++ trunk/rostests/winetests/serialui/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(serialui_winetest confdlg.c testlist.c) +target_link_libraries(serialui_winetest wine) +set_module_type(serialui_winetest win32cui) +add_importlibs(serialui_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/serialui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/setupapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/setupapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,20 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + devclass.c + devinst.c + install.c + misc.c + parser.c + query.c + setupcab.c + stringtable.c + testlist.c) + +add_executable(setupapi_winetest ${SOURCE}) +target_link_libraries(setupapi_winetest wine) +set_module_type(setupapi_winetest win32cui) +add_importlibs(setupapi_winetest advapi32 setupapi user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/setupapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shdocvw/CMakeLists.txt (added) +++ trunk/rostests/winetests/shdocvw/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + intshcut.c + shdocvw.c + shortcut.c + webbrowser.c + testlist.c) + +add_executable(shdocvw_winetest ${SOURCE}) +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) Propchange: trunk/rostests/winetests/shdocvw/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt (added) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,29 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x501) + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + appbar.c + autocomplete.c + generated.c + progman_dde.c + shelllink.c + shellpath.c + shlexec.c + shlfileop.c + shlfolder.c + shlview.c + string.c + systray.c + testlist.c + shfldr_special.c + rsrc.rc) + +add_executable(shell32_winetest ${SOURCE}) +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) Propchange: trunk/rostests/winetests/shell32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shlwapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,23 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + assoc.c + clist.c + clsid.c + generated.c + istream.c + ordinal.c + path.c + shreg.c + string.c + url.c + testlist.c + thread.c) + +add_executable(shlwapi_winetest ${SOURCE}) +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) Propchange: trunk/rostests/winetests/shlwapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/snmpapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/snmpapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/snmpapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(snmpapi_winetest util.c testlist.c) +target_link_libraries(snmpapi_winetest wine) +set_module_type(snmpapi_winetest win32cui) +add_importlibs(snmpapi_winetest snmpapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/snmpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/spoolss/CMakeLi… ============================================================================== --- trunk/rostests/winetests/spoolss/CMakeLists.txt (added) +++ trunk/rostests/winetests/spoolss/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(spoolss_winetest spoolss.c testlist.c) +target_link_libraries(spoolss_winetest wine) +set_module_type(spoolss_winetest win32cui) +add_importlibs(spoolss_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/spoolss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/winetests/twain_32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(twain_32_winetest dsm.c testlist.c) +target_link_libraries(twain_32_winetest wine) +set_module_type(twain_32_winetest win32cui) +add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/twain_32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/CMakeLis… ============================================================================== --- trunk/rostests/winetests/urlmon/CMakeLists.txt (added) +++ trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,19 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + generated.c + misc.c + protocol.c + sec_mgr.c + stream.c + uri.c + url.c + testlist.c) + +add_executable(urlmon_winetest ${SOURCE}) +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) Propchange: trunk/rostests/winetests/urlmon/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt (added) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,37 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + broadcast.c + class.c + clipboard.c + combo.c + cursoricon.c + dce.c + dde.c + dialog.c + edit.c + generated.c + input.c + listbox.c + menu.c + monitor.c + msg.c + resource.c + scroll.c + static.c + sysparams.c + text.c + uitools.c + win.c + winstation.c + wsprintf.c + testlist.c + resource.rc) + +add_executable(user32_winetest ${SOURCE}) +target_link_libraries(user32_winetest wine) +set_module_type(user32_winetest win32cui) +add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/user32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/userenv/CMakeLi… ============================================================================== --- trunk/rostests/winetests/userenv/CMakeLists.txt (added) +++ trunk/rostests/winetests/userenv/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(userenv_winetest userenv.c testlist.c) +target_link_libraries(userenv_winetest wine) +set_module_type(userenv_winetest win32cui) +add_importlibs(userenv_winetest userenv advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/userenv/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/CMakeList… ============================================================================== --- trunk/rostests/winetests/usp10/CMakeLists.txt (added) +++ trunk/rostests/winetests/usp10/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(usp10_winetest usp10.c testlist.c) +target_link_libraries(usp10_winetest wine) +set_module_type(usp10_winetest win32cui) +add_importlibs(usp10_winetest usp10 user32 gdi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/usp10/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/uxtheme/CMakeLi… ============================================================================== --- trunk/rostests/winetests/uxtheme/CMakeLists.txt (added) +++ trunk/rostests/winetests/uxtheme/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(uxtheme_winetest system.c testlist.c) +target_link_libraries(uxtheme_winetest wine) +set_module_type(uxtheme_winetest win32cui) +add_importlibs(uxtheme_winetest user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/uxtheme/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/CMakeLi… ============================================================================== --- trunk/rostests/winetests/version/CMakeLists.txt (added) +++ trunk/rostests/winetests/version/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + info.c + install.c + version.rc + testlist.c) + +add_executable(version_winetest ${SOURCE}) +target_link_libraries(version_winetest wine) +set_module_type(version_winetest win32cui) +add_importlibs(version_winetest version msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/version/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/CMakeLi… ============================================================================== --- trunk/rostests/winetests/winhttp/CMakeLists.txt (added) +++ trunk/rostests/winetests/winhttp/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + notification.c + testlist.c + url.c + winhttp.c) + +add_executable(winhttp_winetest ${SOURCE}) +target_link_libraries(winhttp_winetest wine) +set_module_type(winhttp_winetest win32cui) +add_importlibs(winhttp_winetest winhttp crypt32 ws2_32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/winhttp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wininet/CMakeLists.txt (added) +++ trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,18 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + ftp.c + generated.c + http.c + internet.c + url.c + urlcache.c + testlist.c) + +add_executable(wininet_winetest ${SOURCE}) +target_link_libraries(wininet_winetest wine) +set_module_type(wininet_winetest win32cui) +add_importlibs(wininet_winetest wininet ws2_32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/wininet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/CMakeList… ============================================================================== --- trunk/rostests/winetests/winmm/CMakeLists.txt (added) +++ trunk/rostests/winetests/winmm/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,18 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + capture.c + mci.c + mixer.c + mmio.c + timer.c + testlist.c + wave.c) + +add_executable(winmm_winetest ${SOURCE}) +target_link_libraries(winmm_winetest wine dxguid) +set_module_type(winmm_winetest win32cui) +add_importlibs(winmm_winetest winmm user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/winmm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/CMakeL… ============================================================================== --- trunk/rostests/winetests/wintrust/CMakeLists.txt (added) +++ trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + asn.c + crypt.c + register.c + softpub.c + testlist.c) + +add_executable(wintrust_winetest ${SOURCE}) +target_link_libraries(wintrust_winetest wine) +set_module_type(wintrust_winetest win32cui) +add_importlibs(wintrust_winetest wintrust crypt32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/wintrust/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wlanapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wlanapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/wlanapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(wlanapi_winetest wlanapi.c testlist.c) +target_link_libraries(wlanapi_winetest wine) +set_module_type(wlanapi_winetest win32cui) +add_importlibs(wlanapi_winetest wlanapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/wlanapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wldap32/CMakeLists.txt (added) +++ trunk/rostests/winetests/wldap32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(wldap32_winetest parse.c testlist.c) +target_link_libraries(wldap32_winetest wine) +set_module_type(wldap32_winetest win32cui) +add_importlibs(wldap32_winetest wldap32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/wldap32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(ws2_32_winetest protocol.c sock.c testlist.c) +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) Propchange: trunk/rostests/winetests/ws2_32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/CMakeLi… ============================================================================== --- trunk/rostests/winetests/xmllite/CMakeLists.txt (added) +++ trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] Tue Dec 7 11:40:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(xmllite_winetest reader.c testlist.c) +target_link_libraries(xmllite_winetest wine) +set_module_type(xmllite_winetest win32cui) +add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/xmllite/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 1 month

← Newer
1
...
25
26
27
28
29
30
31
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010