Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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, 11 months

[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, 11 months

[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, 11 months

[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, 11 months

[janderwald] 49967: [AUDIO-BRINGUP] - Fix error message when mmixer library has failed to initialize - Remove device handle from MIXER_INFO as a mixer can span over more than one device (i.e. mixer...

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Dec 7 10:29:57 2010 New Revision: 49967 URL: http://svn.reactos.org/svn/reactos?rev=49967&view=rev Log: [AUDIO-BRINGUP] - Fix error message when mmixer library has failed to initialize - Remove device handle from MIXER_INFO as a mixer can span over more than one device (i.e. mixer, wave) - Add device handle to mixer control struct - Store mixer controls in list than in array. Will later be used to add hacks (i.e wave line must have volume controls etc) - Add reserved member to topology pin struct and mark used pins as reserved. It is then used to add alternative mixers destination lines Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.c branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h branches/audio-bringup/lib/drivers/sound/mmixer/controls.c branches/audio-bringup/lib/drivers/sound/mmixer/mixer.c branches/audio-bringup/lib/drivers/sound/mmixer/priv.h branches/audio-bringup/lib/drivers/sound/mmixer/sup.c branches/audio-bringup/lib/drivers/sound/mmixer/topology.c 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 10:29:57 2010 @@ -111,7 +111,6 @@ { case DRV_LOAD : { - HANDLE Handle; MMRESULT Result; SND_TRACE(L"DRV_LOAD\n"); @@ -120,11 +119,11 @@ if ( ! MMSUCCESS(Result) ) return 0L; - Result = WdmAudOpenSoundDeviceByMMixer(NULL, &Handle); + Result = WdmAudOpenSoundDeviceByMMixer(); if ( Result != MMSYSERR_NOERROR ) { - SND_ERR(L"Failed to open \\\\.\\wdmaud\n"); + SND_ERR(L"Failed to initialize MMixer Library"); //UnlistAllSoundDevices(); return 0L; Modified: branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ branches/audio-bringup/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Tue Dec 7 10:29:57 2010 @@ -57,9 +57,7 @@ IN DWORD CapabilitiesSize); MMRESULT -WdmAudOpenSoundDeviceByMMixer( - IN struct _SOUND_DEVICE* SoundDevice, - OUT PVOID* Handle); +WdmAudOpenSoundDeviceByMMixer(); MMRESULT WdmAudCloseSoundDeviceByMMixer( 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 10:29:57 2010 @@ -32,28 +32,42 @@ MMixerAddMixerControl( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG NodeIndex, - IN LPMIXERLINE_EXT MixerLine, - OUT LPMIXERCONTROLW MixerControl) + IN LPMIXERLINE_EXT MixerLine) { LPGUID NodeType; KSP_NODE Node; ULONG BytesReturned; MIXER_STATUS Status; LPWSTR Name; + LPMIXERCONTROL_EXT MixerControl; + + /* allocate mixer control */ + MixerControl = MixerContext->Alloc(sizeof(MIXERCONTROL_EXT)); + if (!MixerControl) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + /* initialize mixer control */ - MixerControl->cbStruct = sizeof(MIXERCONTROLW); - MixerControl->dwControlID = MixerInfo->ControlId; + MixerControl->hDevice = hMixer; + MixerControl->NodeID = NodeIndex; + MixerControl->ExtraData = NULL; + + MixerControl->Control.cbStruct = sizeof(MIXERCONTROLW); + MixerControl->Control.dwControlID = MixerInfo->ControlId; /* get node type */ NodeType = MMixerGetNodeTypeFromTopology(Topology, NodeIndex); /* store control type */ - MixerControl->dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); - - MixerControl->fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ - MixerControl->cMultipleItems = 0; + MixerControl->Control.dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); + + MixerControl->Control.fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ + MixerControl->Control.cMultipleItems = 0; /* setup request to retrieve name */ Node.NodeId = NodeIndex; @@ -63,7 +77,7 @@ Node.Reserved = 0; /* get node name size */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), NULL, 0, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), NULL, 0, &BytesReturned); if (Status == MM_STATUS_MORE_ENTRIES) { @@ -76,24 +90,28 @@ } /* get node name */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), (LPVOID)Name, BytesReturned, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Node, sizeof(KSP_NODE), (LPVOID)Name, BytesReturned, &BytesReturned); if (Status == MM_STATUS_SUCCESS) { - MixerContext->Copy(MixerControl->szShortName, Name, (min(MIXER_SHORT_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); - MixerControl->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; - - MixerContext->Copy(MixerControl->szName, Name, (min(MIXER_LONG_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); - MixerControl->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; + MixerContext->Copy(MixerControl->Control.szShortName, Name, (min(MIXER_SHORT_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); + MixerControl->Control.szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; + + MixerContext->Copy(MixerControl->Control.szName, Name, (min(MIXER_LONG_NAME_CHARS, wcslen(Name)+1)) * sizeof(WCHAR)); + MixerControl->Control.szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; } /* free name buffer */ MixerContext->Free(Name); } + /* increment control count */ MixerInfo->ControlId++; - if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUX) + /* insert control */ + InsertTailList(&MixerLine->ControlsList, &MixerControl->Entry); + + if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_MUX) { ULONG NodesCount; PULONG Nodes; @@ -114,24 +132,24 @@ MixerContext->Free(Nodes); /* setup mux bounds */ - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = NodesCount - 1; - MixerControl->Metrics.dwReserved[0] = NodesCount; - MixerControl->cMultipleItems = NodesCount; - MixerControl->fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) - { - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 1; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_ONOFF) + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = NodesCount - 1; + MixerControl->Control.Metrics.dwReserved[0] = NodesCount; + MixerControl->Control.cMultipleItems = NodesCount; + MixerControl->Control.fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; + } + else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = 1; + } + else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_ONOFF) { /* only needs to set bounds */ - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 1; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = 1; + } + else if (MixerControl->Control.dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { KSNODEPROPERTY_AUDIO_CHANNEL Property; ULONG Length; @@ -139,9 +157,9 @@ PKSPROPERTY_MEMBERSHEADER Members; PKSPROPERTY_STEPPING_LONG Range; - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 0xFFFF; - MixerControl->Metrics.cSteps = 0xC0; /* FIXME */ + MixerControl->Control.Bounds.dwMinimum = 0; + MixerControl->Control.Bounds.dwMaximum = 0xFFFF; + MixerControl->Control.Metrics.cSteps = 0xC0; /* FIXME */ Length = sizeof(KSPROPERTY_DESCRIPTION) + sizeof(KSPROPERTY_MEMBERSHEADER) + sizeof(KSPROPERTY_STEPPING_LONG); Desc = (PKSPROPERTY_DESCRIPTION)MixerContext->Alloc(Length); @@ -156,7 +174,7 @@ Property.NodeProperty.Property.Set = KSPROPSETID_Audio; /* get node volume level info */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), Desc, Length, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), Desc, Length, &BytesReturned); if (Status == MM_STATUS_SUCCESS) { @@ -181,7 +199,7 @@ Steps = MaxRange / Range->SteppingDelta + 1; /* store mixer control info there */ - VolumeData->Header.dwControlID = MixerControl->dwControlID; + VolumeData->Header.dwControlID = MixerControl->Control.dwControlID; VolumeData->SignedMaximum = Range->Bounds.SignedMaximum; VolumeData->SignedMinimum = Range->Bounds.SignedMinimum; VolumeData->SteppingDelta = Range->SteppingDelta; @@ -202,13 +220,13 @@ VolumeData->Values[Index] = Value; Value += Range->SteppingDelta; } - InsertTailList(&MixerLine->LineControlsExtraData, &VolumeData->Header.Entry); + MixerControl->ExtraData = VolumeData; } } MixerContext->Free(Desc); } - DPRINT("Status %x Name %S\n", Status, MixerControl->szName); + DPRINT("Status %x Name %S\n", Status, MixerControl->Control.szName); return MM_STATUS_SUCCESS; } @@ -259,7 +277,7 @@ wcscpy(DestinationLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); /* initialize extra line */ - InitializeListHead(&DestinationLine->LineControlsExtraData); + InitializeListHead(&DestinationLine->ControlsList); /* insert into mixer info */ InsertTailList(&MixerInfo->LineList, &DestinationLine->Entry); @@ -275,6 +293,7 @@ MMixerGetPinName( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG PinId, IN OUT LPWSTR * OutBuffer) { @@ -291,7 +310,7 @@ Pin.Property.Id = KSPROPERTY_PIN_NAME; /* try get pin name size */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), NULL, 0, &BytesReturned); /* check if buffer overflowed */ if (Status == MM_STATUS_MORE_ENTRIES) @@ -305,7 +324,7 @@ } /* try get pin name */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Buffer, BytesReturned, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Pin, sizeof(KSP_PIN), (PVOID)Buffer, BytesReturned, &BytesReturned); if (Status != MM_STATUS_SUCCESS) { /* failed to get pin name */ @@ -326,6 +345,7 @@ MMixerBuildMixerDestinationLine( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG PinId, IN ULONG bInput) { @@ -333,7 +353,7 @@ MIXER_STATUS Status; /* try get pin name */ - Status = MMixerGetPinName(MixerContext, MixerInfo, PinId, &PinName); + Status = MMixerGetPinName(MixerContext, MixerInfo, hMixer, PinId, &PinName); if (Status == MM_STATUS_SUCCESS) { /* create mixer destination line */ @@ -503,6 +523,7 @@ MMixerGetChannelCountEnhanced( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG NodeId, OUT PULONG MaxChannels) { @@ -522,7 +543,7 @@ /* get description */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)&Description, sizeof(KSPROPERTY_DESCRIPTION), &BytesReturned); if (Status == MM_STATUS_SUCCESS) { if (Description.DescriptionSize >= sizeof(KSPROPERTY_DESCRIPTION) + sizeof(KSPROPERTY_MEMBERSHEADER) && (Description.MembersListCount > 0)) @@ -537,7 +558,7 @@ } /* get description */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)NewDescription, Description.DescriptionSize, &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_NODE), (PVOID)NewDescription, Description.DescriptionSize, &BytesReturned); if (Status == MM_STATUS_SUCCESS) { /* get header */ @@ -572,6 +593,7 @@ MMixerGetChannelCountLegacy( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG NodeId, OUT PULONG MaxChannels) { @@ -592,7 +614,7 @@ do { /* get channel volume */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Channel, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Volume, sizeof(LONG), &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Channel, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Volume, sizeof(LONG), &BytesReturned); if (Status != MM_STATUS_SUCCESS) break; @@ -610,18 +632,19 @@ MMixerGetMaxChannelsForNode( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG NodeId, OUT PULONG MaxChannels) { MIXER_STATUS Status; /* try to get it enhanced */ - Status = MMixerGetChannelCountEnhanced(MixerContext, MixerInfo, NodeId, MaxChannels); + Status = MMixerGetChannelCountEnhanced(MixerContext, MixerInfo, hMixer, NodeId, MaxChannels); if (Status != MM_STATUS_SUCCESS) { /* get it old-fashioned way */ - MMixerGetChannelCountLegacy(MixerContext, MixerInfo, NodeId, MaxChannels); + MMixerGetChannelCountLegacy(MixerContext, MixerInfo, hMixer, NodeId, MaxChannels); } } @@ -629,6 +652,7 @@ MMixerAddMixerControlsToMixerLineByNodeIndexArray( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN OUT LPMIXERLINE_EXT DstLine, IN ULONG NodesCount, @@ -639,18 +663,6 @@ LPGUID NodeType; ULONG MaxChannels; - /* store nodes array */ - DstLine->NodeIds = Nodes; - - /* allocate MIXERCONTROLSW array */ - DstLine->LineControls = MixerContext->Alloc(NodesCount * sizeof(MIXERCONTROLW)); - - if (!DstLine->LineControls) - { - /* out of memory */ - return MM_STATUS_NO_MEMORY; - } - /* initialize control count */ Count = 0; @@ -674,16 +686,15 @@ if (IsEqualGUIDAligned(NodeType, &KSNODETYPE_VOLUME)) { /* calculate maximum channel count for node */ - MMixerGetMaxChannelsForNode(MixerContext, MixerInfo, Nodes[Index], &MaxChannels); + MMixerGetMaxChannelsForNode(MixerContext, MixerInfo, hMixer, Nodes[Index], &MaxChannels); DPRINT("NodeId %lu MaxChannels %lu Line %S Id %lu\n", Nodes[Index], MaxChannels, DstLine->Line.szName, DstLine->Line.dwLineID); /* calculate maximum channels */ DstLine->Line.cChannels = min(DstLine->Line.cChannels, MaxChannels); } - /* now add the mixer control */ - Status = MMixerAddMixerControl(MixerContext, MixerInfo, Topology, Nodes[Index], DstLine, &DstLine->LineControls[Count]); + Status = MMixerAddMixerControl(MixerContext, MixerInfo, hMixer, Topology, Nodes[Index], DstLine); if (Status == MM_STATUS_SUCCESS) { @@ -703,6 +714,7 @@ MMixerGetComponentAndTargetType( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN ULONG PinId, OUT PULONG ComponentType, OUT PULONG TargetType) @@ -717,7 +729,7 @@ PKSPIN_PHYSICALCONNECTION Connection; /* first dataflow type */ - Status = MMixerGetPinDataFlowAndCommunication(MixerContext, MixerInfo->hMixer, PinId, &DataFlow, &Communication); + Status = MMixerGetPinDataFlowAndCommunication(MixerContext, hMixer, PinId, &DataFlow, &Communication); if (Status != MM_STATUS_SUCCESS) { @@ -734,7 +746,7 @@ /* get pin category */ - Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned); + Status = MixerContext->Control(hMixer, IOCTL_KS_PROPERTY, (PVOID)&Request, sizeof(KSP_PIN), &Guid, sizeof(GUID), &BytesReturned); if (Status != MM_STATUS_SUCCESS) { /* failed to get dataflow */ @@ -742,7 +754,7 @@ } /* check if it has a physical connection */ - Status = MMixerGetPhysicalConnection(MixerContext, MixerInfo->hMixer, PinId, &Connection); + Status = MMixerGetPhysicalConnection(MixerContext, hMixer, PinId, &Connection); if (Status == MM_STATUS_SUCCESS) { /* pin is a brige pin */ @@ -901,6 +913,7 @@ MMixerBuildMixerSourceLine( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG PinId, IN ULONG NodesCount, @@ -914,7 +927,7 @@ ULONG ComponentType, TargetType; /* get component and target type */ - Status = MMixerGetComponentAndTargetType(MixerContext, MixerInfo, PinId, &ComponentType, &TargetType); + Status = MMixerGetComponentAndTargetType(MixerContext, MixerInfo, hMixer, PinId, &ComponentType, &TargetType); if (Status != MM_STATUS_SUCCESS) { /* failed to get component status */ @@ -936,9 +949,7 @@ ASSERT(DstLine); /* initialize mixer src line */ - SrcLine->hDevice = MixerInfo->hMixer; SrcLine->PinId = PinId; - SrcLine->NodeIds = Nodes; /* initialize mixer line */ SrcLine->Line.cbStruct = sizeof(MIXERLINEW); @@ -955,14 +966,14 @@ SrcLine->Line.Target.wMid = MixerInfo->MixCaps.wMid; SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; - InitializeListHead(&SrcLine->LineControlsExtraData); + InitializeListHead(&SrcLine->ControlsList); /* copy name */ ASSERT(MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] == L'\0'); wcscpy(SrcLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); /* get pin name */ - Status = MMixerGetPinName(MixerContext, MixerInfo, PinId, &PinName); + Status = MMixerGetPinName(MixerContext, MixerInfo, hMixer, PinId, &PinName); if (Status == MM_STATUS_SUCCESS) { @@ -978,7 +989,7 @@ } /* add the controls to mixer line */ - Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, Topology, SrcLine, NodesCount, Nodes); + Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, hMixer, Topology, SrcLine, NodesCount, Nodes); if (Status != MM_STATUS_SUCCESS) { /* failed */ @@ -995,6 +1006,7 @@ MMixerAddMixerSourceLines( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG DestinationLineID, IN ULONG LineTerminator) @@ -1091,7 +1103,7 @@ ULONG TempIndex; #endif /* now build the mixer source line */ - Status = MMixerBuildMixerSourceLine(MixerContext, MixerInfo, Topology, PinId, AllPinNodesCount, AllPinNodes, DestinationLineID, &SrcLine); + Status = MMixerBuildMixerSourceLine(MixerContext, MixerInfo, hMixer, Topology, PinId, AllPinNodesCount, AllPinNodes, DestinationLineID, &SrcLine); if (Status == MM_STATUS_SUCCESS) { @@ -1100,6 +1112,10 @@ /* increment destination line count */ DstLine->Line.cConnections++; + + /* mark pin as reserved */ + MMixerSetTopologyPinReserved(Topology, PinId); + #ifdef MMIXER_DEBUG DPRINT1("Adding PinId %lu AllPinNodesCount %lu to DestinationLine %lu\n", PinId, AllPinNodesCount, DestinationLineID); for(TempIndex = 0; TempIndex < AllPinNodesCount; TempIndex++) @@ -1124,6 +1140,7 @@ MMixerAddMixerControlsToDestinationLine( IN PMIXER_CONTEXT MixerContext, IN OUT LPMIXER_INFO MixerInfo, + IN HANDLE hMixer, IN PTOPOLOGY Topology, IN ULONG PinId, IN ULONG bInput, @@ -1165,7 +1182,7 @@ if (NodesCount > 0) { /* add all nodes as mixer controls to the destination line */ - Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, Topology, DstLine, NodesCount, Nodes); + Status = MMixerAddMixerControlsToMixerLineByNodeIndexArray(MixerContext, MixerInfo, hMixer, Topology, DstLine, NodesCount, Nodes); if (Status != MM_STATUS_SUCCESS) { /* failed to add controls */ @@ -1185,6 +1202,7 @@ MMixerApplyOutputFilterHack( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_DATA MixerData, + IN HANDLE hMixer, IN OUT PULONG PinsCount, IN OUT PULONG Pins) { @@ -1195,7 +1213,7 @@ for(Index = 0; Index < *PinsCount; Index++) { /* check if it has a physical connection */ - Status = MMixerGetPhysicalConnection(MixerContext, MixerData->hDevice, Pins[Index], &Connection); + Status = MMixerGetPhysicalConnection(MixerContext, hMixer, Pins[Index], &Connection); if (Status == MM_STATUS_SUCCESS) { @@ -1249,16 +1267,6 @@ DPRINT1("Name %S, Pin %lu bInput %lu\n", OutConnection->SymbolicLinkName, OutConnection->Pin, bInput); - if (MixerInfo->hMixer != NULL) - { - /* dont replace mixer destination handles */ - DPRINT1("MixerInfo hDevice %p MixerData hDevice %p\n", MixerInfo->hMixer, MixerData->hDevice); - ASSERT(MixerInfo->hMixer == MixerData->hDevice); - } - - /* store connected mixer handle */ - MixerInfo->hMixer = MixerData->hDevice; - if (MixerData->Topology == NULL) { /* construct new topology */ @@ -1278,12 +1286,19 @@ Topology = MixerData->Topology; } - /* allocate pin index array which will hold all referenced pins */ - Status = MMixerAllocateTopologyPinArray(MixerContext, Topology, &Pins); - ASSERT(Status == MM_STATUS_SUCCESS); + /* mark pin as consumed */ + MMixerSetTopologyPinReserved(Topology, OutConnection->Pin); if (!bInput) { + /* allocate pin index array which will hold all referenced pins */ + Status = MMixerAllocateTopologyPinArray(MixerContext, Topology, &Pins); + if (Status != MM_STATUS_SUCCESS) + { + /* failed to create topology */ + return Status; + } + /* the mixer is an output mixer * find end pin of the node path */ @@ -1305,14 +1320,14 @@ * WorkArround: remove all pin ids which have a physical connection * because bridge pins may belong to different render paths */ - MMixerApplyOutputFilterHack(MixerContext, MixerData, &PinsCount, Pins); + MMixerApplyOutputFilterHack(MixerContext, MixerData, MixerData->hDevice, &PinsCount, Pins); /* sanity checks */ ASSERT(PinsCount != 0); ASSERT(PinsCount == 1); /* create destination line */ - Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, Pins[0], bInput); + Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Pins[0], bInput); /* calculate destination line id */ DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations-1); @@ -1327,13 +1342,19 @@ } /* add mixer controls to destination line */ - Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, Pins[0], bInput, DestinationLineID, &LineTerminator); + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Topology, Pins[0], bInput, DestinationLineID, &LineTerminator); if (Status == MM_STATUS_SUCCESS) { /* now add the rest of the source lines */ - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, DestinationLineID, LineTerminator); - } + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, MixerData->hDevice, Topology, DestinationLineID, LineTerminator); + } + + /* mark pin as consumed */ + MMixerSetTopologyPinReserved(Topology, Pins[0]); + + /* free topology pin array */ + MixerContext->Free(Pins); } else { @@ -1341,12 +1362,12 @@ DestinationLineID = (DESTINATION_LINE + MixerInfo->MixCaps.cDestinations-1); /* add mixer controls */ - Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, Topology, OutConnection->Pin, bInput, DestinationLineID, &LineTerminator); + Status = MMixerAddMixerControlsToDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Topology, OutConnection->Pin, bInput, DestinationLineID, &LineTerminator); if (Status == MM_STATUS_SUCCESS) { /* now add the rest of the source lines */ - Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, Topology, DestinationLineID, LineTerminator); + Status = MMixerAddMixerSourceLines(MixerContext, MixerInfo, MixerData->hDevice, Topology, DestinationLineID, LineTerminator); } } @@ -1364,7 +1385,7 @@ IN ULONG bInputMixer, IN OUT LPMIXER_INFO * OutMixerInfo) { - + ULONG Index; MIXER_STATUS Status; PKSPIN_PHYSICALCONNECTION OutConnection; ULONG * Pins; @@ -1431,10 +1452,16 @@ return Status; } + /* mark all found pins as reserved */ + for(Index = 0; Index < PinsFound; Index++) + { + MMixerSetTopologyPinReserved(Topology, Pins[Index]); + } + if (bInputMixer) { /* pre create the mixer destination line for input mixers */ - Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, Pins[0], bInputMixer); + Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Pins[0], bInputMixer); if (Status != MM_STATUS_SUCCESS) { @@ -1468,6 +1495,9 @@ if (Status == MM_STATUS_SUCCESS) { + /* mark pin as reserved */ + MMixerSetTopologyPinReserved(Topology, Pins[0]); + /* topology on the topoloy filter */ Status = MMixerHandlePhysicalConnection(MixerContext, MixerList, MixerData, MixerInfo, bInputMixer, OutConnection); @@ -1480,7 +1510,6 @@ * handle drivers which expose their topology on the same filter */ ASSERT(0); - MixerInfo->hMixer = MixerData->hDevice; } /* free pins */ @@ -1498,6 +1527,32 @@ return Status; } +VOID +MMixerHandleAlternativeMixers( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN PTOPOLOGY Topology) +{ + ULONG Index, PinCount, Reserved; + + DPRINT1("DeviceName %S\n", MixerData->DeviceName); + + /* get topology pin count */ + MMixerGetTopologyPinCount(Topology, &PinCount); + + for(Index = 0; Index < PinCount; Index++) + { + MMixerIsTopologyPinReserved(Topology, Index, &Reserved); + + /* check if it has already been reserved */ + if (Reserved == FALSE) + { + DPRINT1("MixerName %S Available PinID %lu\n", MixerData->DeviceName, Index); + } + } +} + MIXER_STATUS MMixerSetupFilter( IN PMIXER_CONTEXT MixerContext, @@ -1567,7 +1622,7 @@ } - /* TODO: handle alternative mixer types + apply hacks for Wave source line */ + /* TODO: apply hacks for Wave source line */ /* activate midi devices */ MMixerInitializeMidiForFilter(MixerContext, MixerList, MixerData, Topology); 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 10:29:57 2010 @@ -306,8 +306,9 @@ { LPMIXER_INFO MixerInfo; LPMIXERLINE_EXT MixerLineSrc; - LPMIXERCONTROLW MixerControl; + LPMIXERCONTROL_EXT MixerControl; MIXER_STATUS Status; + PLIST_ENTRY Entry; ULONG Index; /* verify mixer context */ @@ -319,6 +320,20 @@ return Status; } + if (MixerLineControls->cbStruct != sizeof(MIXERLINECONTROLSW)) + { + DPRINT1("Invalid MixerLineControls cbStruct passed %lu expected %lu\n", MixerLineControls->cbStruct, sizeof(MIXERLINECONTROLSW)); + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } + + if (MixerLineControls->cbmxctrl != sizeof(MIXERCONTROLW)) + { + DPRINT1("Invalid MixerLineControls cbmxctrl passed %lu expected %lu\n", MixerLineControls->cbStruct, sizeof(MIXERLINECONTROLSW)); + /* invalid parameter */ + return MM_STATUS_INVALID_PARAMETER; + } + if ((Flags & (MIXER_OBJECTF_MIXER | MIXER_OBJECTF_HMIXER)) == MIXER_OBJECTF_MIXER) { /* caller passed mixer id */ @@ -335,12 +350,12 @@ DPRINT("MMixerGetLineControls MixerId %lu Flags %lu\n", MixerId, Flags); - if (Flags == MIXER_GETLINECONTROLSF_ALL) { /* cast to mixer info */ MixerInfo = (LPMIXER_INFO)MixerHandle; + /* get mixer line */ MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLineControls->dwLineID); if (!MixerLineSrc) @@ -349,9 +364,31 @@ DPRINT("MMixerGetLineControls Line not found %lx\n", MixerLineControls->dwLineID); return MM_STATUS_INVALID_PARAMETER; } + + if (MixerLineSrc->Line.cControls != MixerLineControls->cControls) + { + /* invalid parameter */ + DPRINT1("Invalid control count %lu expected %lu\n", MixerLineControls->cControls, MixerLineSrc->Line.cControls); + return MM_STATUS_INVALID_PARAMETER; + } + /* copy line control(s) */ - MixerContext->Copy(MixerLineControls->pamxctrl, MixerLineSrc->LineControls, min(MixerLineSrc->Line.cControls, MixerLineControls->cControls) * sizeof(MIXERCONTROLW)); - + Entry = MixerLineSrc->ControlsList.Flink; + Index = 0; + while(Entry != &MixerLineSrc->ControlsList) + { + /* get mixer control */ + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(Entry, MIXERCONTROL_EXT, Entry); + + /* copy mixer control */ + MixerContext->Copy(&MixerLineControls->pamxctrl[Index], &MixerControl->Control, sizeof(MIXERCONTROLW)); + + /* move to next */ + Entry = Entry->Flink; + + /* increment mixer control offset */ + Index++; + } return MM_STATUS_SUCCESS; } else if (Flags == MIXER_GETLINECONTROLSF_ONEBYTYPE) @@ -374,19 +411,23 @@ ASSERT(MixerLineControls->cbmxctrl == sizeof(MIXERCONTROLW)); ASSERT(MixerLineControls->pamxctrl != NULL); - Index = 0; - for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) - { - DPRINT1("dwControlType %x\n", MixerLineSrc->LineControls[Index].dwControlType); - if (MixerLineControls->dwControlType == MixerLineSrc->LineControls[Index].dwControlType) + Entry = MixerLineSrc->ControlsList.Flink; + while(Entry != &MixerLineSrc->ControlsList) + { + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(Entry, MIXERCONTROL_EXT, Entry); + if (MixerLineControls->dwControlType == MixerControl->Control.dwControlType) { /* found a control with that type */ - MixerContext->Copy(MixerLineControls->pamxctrl, &MixerLineSrc->LineControls[Index], sizeof(MIXERCONTROLW)); + MixerContext->Copy(MixerLineControls->pamxctrl, &MixerControl->Control, sizeof(MIXERCONTROLW)); return MM_STATUS_SUCCESS; } - } - DPRINT("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", MixerLineControls->dwControlType, MixerLineControls->dwLineID, MixerLineSrc->Line.cControls); - return MM_STATUS_UNSUCCESSFUL; + + /* move to next entry */ + Entry = Entry->Flink; + } + + DPRINT("DeviceInfo->u.MixControls.dwControlType %x not found in Line %x cControls %u \n", MixerLineControls->dwControlType, MixerLineControls->dwLineID, MixerLineSrc->Line.cControls); + return MM_STATUS_UNSUCCESSFUL; } else if (Flags == MIXER_GETLINECONTROLSF_ONEBYID) { @@ -406,10 +447,10 @@ ASSERT(MixerLineControls->cbmxctrl == sizeof(MIXERCONTROLW)); ASSERT(MixerLineControls->pamxctrl != NULL); - DPRINT("MMixerGetLineControls ControlID %lx ControlType %lx Name %S\n", MixerControl->dwControlID, MixerControl->dwControlType, MixerControl->szName); + DPRINT("MMixerGetLineControls ControlID %lx ControlType %lx Name %S\n", MixerControl->Control.dwControlID, MixerControl->Control.dwControlType, MixerControl->Control.szName); /* copy the controls */ - MixerContext->Copy(MixerLineControls->pamxctrl, MixerControl, sizeof(MIXERCONTROLW)); + MixerContext->Copy(MixerLineControls->pamxctrl, &MixerControl->Control, sizeof(MIXERCONTROLW)); MixerLineControls->pamxctrl->szName[MIXER_LONG_NAME_CHARS-1] = L'\0'; MixerLineControls->pamxctrl->szShortName[MIXER_SHORT_NAME_CHARS-1] = L'\0'; @@ -431,7 +472,7 @@ ULONG NodeId; LPMIXER_INFO MixerInfo; LPMIXERLINE_EXT MixerLine; - LPMIXERCONTROLW MixerControl; + LPMIXERCONTROL_EXT MixerControl; /* verify mixer context */ Status = MMixerVerifyContext(MixerContext); @@ -439,6 +480,7 @@ if (Status != MM_STATUS_SUCCESS) { /* invalid context passed */ + DPRINT1("invalid context\n"); return Status; } @@ -450,6 +492,7 @@ if (!MixerHandle) { /* invalid parameter */ + DPRINT1("invalid handle\n"); return MM_STATUS_INVALID_PARAMETER; } } @@ -464,18 +507,21 @@ if (Status != MM_STATUS_SUCCESS) { /* failed to find control id */ + DPRINT1("invalid control id %lu\n", MixerControlDetails->dwControlID); return MM_STATUS_INVALID_PARAMETER; } - switch(MixerControl->dwControlType) + DPRINT1("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: - Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo->hMixer, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, TRUE); + Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo, MixerControl, MixerLine->Line.dwLineID, MixerControlDetails, TRUE); break; case MIXERCONTROL_CONTROLTYPE_VOLUME: - Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo->hMixer, NodeId, TRUE, MixerControl, MixerControlDetails, MixerLine); + Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo, NodeId, TRUE, MixerControl, MixerControlDetails, MixerLine); break; default: + ASSERT(0); Status = MM_STATUS_NOT_IMPLEMENTED; } @@ -494,7 +540,7 @@ ULONG NodeId; LPMIXER_INFO MixerInfo; LPMIXERLINE_EXT MixerLine; - LPMIXERCONTROLW MixerControl; + LPMIXERCONTROL_EXT MixerControl; /* verify mixer context */ Status = MMixerVerifyContext(MixerContext); @@ -530,19 +576,58 @@ return MM_STATUS_INVALID_PARAMETER; } - switch(MixerControl->dwControlType) + switch(MixerControl->Control.dwControlType) { case MIXERCONTROL_CONTROLTYPE_MUTE: - Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo, NodeId, MixerLine->Line.dwLineID, MixerControlDetails, FALSE); + Status = MMixerSetGetMuteControlDetails(MixerContext, MixerInfo, MixerControl, MixerLine->Line.dwLineID, MixerControlDetails, FALSE); break; case MIXERCONTROL_CONTROLTYPE_VOLUME: Status = MMixerSetGetVolumeControlDetails(MixerContext, MixerInfo, NodeId, FALSE, MixerControl, MixerControlDetails, MixerLine); break; default: Status = MM_STATUS_NOT_IMPLEMENTED; + DPRINT1("ControlType %lu not implemented\n", MixerControl->Control.dwControlType); } return Status; +} + +VOID +MMixerPrintMixerLineControls( + IN LPMIXERLINE_EXT MixerLine) +{ + PLIST_ENTRY Entry; + LPMIXERCONTROL_EXT MixerControl; + ULONG Index = 0; + + Entry = MixerLine->ControlsList.Flink; + while(Entry != &MixerLine->ControlsList) + { + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(Entry, MIXERCONTROL_EXT, Entry); + + DPRINT1("\n"); + DPRINT1("Control Index: %lu\n", Index); + DPRINT("\n"); + DPRINT1("cbStruct %u\n", MixerControl->Control.cbStruct); + DPRINT1("dwControlID %lu\n", MixerControl->Control.dwControlID); + DPRINT1("dwControlType %lx\n", MixerControl->Control.dwControlType); + DPRINT1("fdwControl %lu\n", MixerControl->Control.fdwControl); + DPRINT1("cMultipleItems %lu\n", MixerControl->Control.cMultipleItems); + DPRINT1("szShortName %S\n", MixerControl->Control.szShortName); + DPRINT1("szName %S\n", MixerControl->Control.szName); + DPRINT1("Bounds.dwMinimum %lu\n", MixerControl->Control.Bounds.dwMinimum); + DPRINT1("Bounds.dwMaximum %lu\n", MixerControl->Control.Bounds.dwMaximum); + + DPRINT1("Metrics.Reserved[0] %lu\n", MixerControl->Control.Metrics.dwReserved[0]); + DPRINT1("Metrics.Reserved[1] %lu\n", MixerControl->Control.Metrics.dwReserved[1]); + DPRINT1("Metrics.Reserved[2] %lu\n", MixerControl->Control.Metrics.dwReserved[2]); + DPRINT1("Metrics.Reserved[3] %lu\n", MixerControl->Control.Metrics.dwReserved[3]); + DPRINT1("Metrics.Reserved[4] %lu\n", MixerControl->Control.Metrics.dwReserved[4]); + DPRINT1("Metrics.Reserved[5] %lu\n", MixerControl->Control.Metrics.dwReserved[5]); + + Entry = Entry->Flink; + Index++; + } } VOID @@ -583,6 +668,9 @@ /* get destination line */ DstMixerLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + DPRINT1("//----------------------------------------------------------------------------------------------\n"); + DPRINT1("\n"); + DPRINT1("Destination Index %lu\n", SubIndex); DPRINT1("\n"); DPRINT1("cChannels %lu\n", DstMixerLine->Line.cChannels); DPRINT1("cConnections %lu\n", DstMixerLine->Line.cConnections); @@ -601,7 +689,7 @@ DPRINT1("Target.vDriverVersion %lx\n", DstMixerLine->Line.Target.vDriverVersion); DPRINT1("Target.wMid %lx\n", DstMixerLine->Line.Target.wMid ); DPRINT1("Target.wPid %lx\n", DstMixerLine->Line.Target.wPid); - + MMixerPrintMixerLineControls(DstMixerLine); for(SrcIndex = 0; SrcIndex < DstMixerLine->Line.cConnections; SrcIndex++) { @@ -610,8 +698,9 @@ /* get source line */ SrcMixerLine = MMixerGetSourceMixerLineByLineId(MixerInfo, DestinationLineID); + DPRINT1("//==============================================================================================\n"); DPRINT1("\n"); - DPRINT1("SourceIndex: %lu\n", SrcIndex); + DPRINT1("SrcLineIndex : %lu\n", SrcIndex); DPRINT1("\n"); DPRINT1("cChannels %lu\n", SrcMixerLine->Line.cChannels); DPRINT1("cConnections %lu\n", SrcMixerLine->Line.cConnections); @@ -630,6 +719,7 @@ DPRINT1("Target.vDriverVersion %lx\n", SrcMixerLine->Line.Target.vDriverVersion); DPRINT1("Target.wMid %lx\n", SrcMixerLine->Line.Target.wMid ); DPRINT1("Target.wPid %lx\n", SrcMixerLine->Line.Target.wPid); + MMixerPrintMixerLineControls(SrcMixerLine); } } } @@ -736,7 +826,17 @@ Entry = Entry->Flink; } - MMixerPrintMixers(MixerContext, MixerList); + Entry = MixerList->MixerData.Flink; + while(Entry != &MixerList->MixerData) + { + MixerData = (LPMIXER_DATA)CONTAINING_RECORD(Entry, MIXER_DATA, Entry); + + /* now handle alternative mixer types */ + MMixerHandleAlternativeMixers(MixerContext, MixerList, MixerData, MixerData->Topology); + Entry = Entry->Flink; + } + + //MMixerPrintMixers(MixerContext, MixerList); /* done */ return MM_STATUS_SUCCESS; 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 10:29:57 2010 @@ -55,8 +55,8 @@ ULONG PinConnectedToCount; PULONG PinConnectedTo; - ULONG Visited; + ULONG Reserved; }PIN, *PPIN; @@ -74,7 +74,6 @@ { LIST_ENTRY Entry; MIXERCAPSW MixCaps; - HANDLE hMixer; LIST_ENTRY LineList; ULONG ControlId; LIST_ENTRY EventList; @@ -83,12 +82,19 @@ typedef struct { LIST_ENTRY Entry; + MIXERCONTROLW Control; + ULONG NodeID; + HANDLE hDevice; + PVOID ExtraData; +}MIXERCONTROL_EXT, *LPMIXERCONTROL_EXT; + +typedef struct +{ + LIST_ENTRY Entry; ULONG PinId; - HANDLE hDevice; MIXERLINEW Line; - LPMIXERCONTROLW LineControls; - PULONG NodeIds; - LIST_ENTRY LineControlsExtraData; + LIST_ENTRY ControlsList; + }MIXERLINE_EXT, *LPMIXERLINE_EXT; typedef struct @@ -272,14 +278,14 @@ LPMIXER_INFO MixerInfo, DWORD dwControlID, LPMIXERLINE_EXT *MixerLine, - LPMIXERCONTROLW *MixerControl, + LPMIXERCONTROL_EXT *MixerControl, PULONG NodeId); MIXER_STATUS MMixerSetGetMuteControlDetails( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, - IN ULONG NodeId, + IN LPMIXERCONTROL_EXT MixerControl, IN ULONG dwLineID, IN LPMIXERCONTROLDETAILS MixerControlDetails, IN ULONG bSet); @@ -290,7 +296,7 @@ IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG bSet, - LPMIXERCONTROLW MixerControl, + LPMIXERCONTROL_EXT MixerControl, IN LPMIXERCONTROLDETAILS MixerControlDetails, LPMIXERLINE_EXT MixerLine); @@ -359,6 +365,13 @@ OUT PKSPIN_DATAFLOW DataFlow, OUT PKSPIN_COMMUNICATION Communication); +VOID +MMixerHandleAlternativeMixers( + IN PMIXER_CONTEXT MixerContext, + IN PMIXER_LIST MixerList, + IN LPMIXER_DATA MixerData, + IN PTOPOLOGY Topology); + /* topology.c */ @@ -473,6 +486,17 @@ OUT PULONG bReserved); VOID +MMixerSetTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId); + +VOID +MMixerIsTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId, + OUT PULONG bReserved); + +VOID MMixerGetTopologyPinCount( IN PTOPOLOGY Topology, OUT PULONG PinCount); 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 10:29:57 2010 @@ -100,29 +100,6 @@ return NULL; } -LPMIXERCONTROL_DATA -MMixerGetMixerControlDataById( - PLIST_ENTRY ListHead, - DWORD dwControlId) -{ - PLIST_ENTRY Entry; - LPMIXERCONTROL_DATA Control; - - /* get first entry */ - Entry = ListHead->Flink; - - while(Entry != ListHead) - { - Control = (LPMIXERCONTROL_DATA)CONTAINING_RECORD(Entry, MIXERCONTROL_DATA, Entry); - DPRINT("dwSource %x dwSource %x\n", Control->dwControlID, dwControlId); - if (Control->dwControlID == dwControlId) - return Control; - - Entry = Entry->Flink; - } - return NULL; -} - LPMIXERLINE_EXT MMixerGetSourceMixerLineByLineId( LPMIXER_INFO MixerInfo, @@ -187,13 +164,13 @@ MMixerGetMixerControlById( LPMIXER_INFO MixerInfo, DWORD dwControlID, - LPMIXERLINE_EXT *MixerLine, - LPMIXERCONTROLW *MixerControl, + LPMIXERLINE_EXT *OutMixerLine, + LPMIXERCONTROL_EXT *OutMixerControl, PULONG NodeId) { - PLIST_ENTRY Entry; + PLIST_ENTRY Entry, ControlEntry; LPMIXERLINE_EXT MixerLineSrc; - ULONG Index; + LPMIXERCONTROL_EXT MixerControl; /* get first entry */ Entry = MixerInfo->LineList.Flink; @@ -202,18 +179,21 @@ { MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); - for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++) - { - if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) + ControlEntry = MixerLineSrc->ControlsList.Flink; + while(ControlEntry != &MixerLineSrc->ControlsList) + { + MixerControl = (LPMIXERCONTROL_EXT)CONTAINING_RECORD(ControlEntry, MIXERCONTROL_EXT, Entry); + if (MixerControl->Control.dwControlID == dwControlID) { - if (MixerLine) - *MixerLine = MixerLineSrc; - if (MixerControl) - *MixerControl = &MixerLineSrc->LineControls[Index]; + if (OutMixerLine) + *OutMixerLine = MixerLineSrc; + if (OutMixerControl) + *OutMixerControl = MixerControl; if (NodeId) - *NodeId = MixerLineSrc->NodeIds[Index]; + *NodeId = MixerControl->NodeID; return MM_STATUS_SUCCESS; } + ControlEntry = ControlEntry->Flink; } Entry = Entry->Flink; } @@ -270,7 +250,7 @@ MMixerSetGetMuteControlDetails( IN PMIXER_CONTEXT MixerContext, IN LPMIXER_INFO MixerInfo, - IN ULONG NodeId, + IN LPMIXERCONTROL_EXT MixerControl, IN ULONG dwLineID, IN LPMIXERCONTROLDETAILS MixerControlDetails, IN ULONG bSet) @@ -290,7 +270,7 @@ Value = Input->fValue; /* set control details */ - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, MixerControl->NodeID, bSet, KSPROPERTY_AUDIO_MUTE, 0, &Value); if (Status != MM_STATUS_SUCCESS) return Status; @@ -316,7 +296,7 @@ IN LPMIXER_INFO MixerInfo, IN ULONG NodeId, IN ULONG bSet, - LPMIXERCONTROLW MixerControl, + LPMIXERCONTROL_EXT MixerControl, IN LPMIXERCONTROLDETAILS MixerControlDetails, LPMIXERLINE_EXT MixerLine) { @@ -329,7 +309,7 @@ if (MixerControlDetails->cbDetails != sizeof(MIXERCONTROLDETAILS_SIGNED)) return MM_STATUS_INVALID_PARAMETER; - VolumeData = (LPMIXERVOLUME_DATA)MMixerGetMixerControlDataById(&MixerLine->LineControlsExtraData, MixerControl->dwControlID); + VolumeData = (LPMIXERVOLUME_DATA)MixerControl->ExtraData; if (!VolumeData) return MM_STATUS_UNSUCCESSFUL; @@ -355,12 +335,12 @@ if (bSet) { /* TODO */ - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 0, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, 1, &Value); } else { - Status = MMixerSetGetControlDetails(MixerContext, MixerInfo->hMixer, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); + Status = MMixerSetGetControlDetails(MixerContext, MixerControl->hDevice, NodeId, bSet, KSPROPERTY_AUDIO_VOLUMELEVEL, Channel, &Value); } if (!bSet) @@ -372,7 +352,7 @@ else { /* notify clients of a line change MM_MIXM_CONTROL_CHANGE with MixerControl->dwControlID */ - MMixerNotifyControlChange(MixerContext, MixerInfo, MM_MIXM_CONTROL_CHANGE, MixerControl->dwControlID); + MMixerNotifyControlChange(MixerContext, MixerInfo, MM_MIXM_CONTROL_CHANGE, MixerControl->Control.dwControlID); } return Status; } Modified: branches/audio-bringup/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Tue Dec 7 10:29:57 2010 @@ -1174,6 +1174,31 @@ } VOID +MMixerSetTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId) +{ + /* sanity check */ + ASSERT(PinId < Topology->TopologyPinsCount); + + /* set reserved */ + Topology->TopologyPins[PinId].Reserved = TRUE; +} + +VOID +MMixerIsTopologyPinReserved( + IN PTOPOLOGY Topology, + IN ULONG PinId, + OUT PULONG bReserved) +{ + /* sanity check */ + ASSERT(PinId < Topology->TopologyPinsCount); + + /* get reserved status */ + *bReserved = Topology->TopologyPins[PinId].Reserved; +} + +VOID MMixerSetTopologyNodeReserved( IN PTOPOLOGY Topology, IN ULONG NodeIndex)

14 years, 11 months

[akhaldi] 49966: [CMAKE] - Start working on rostests cmake integration.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 7 09:27:10 2010 New Revision: 49966 URL: http://svn.reactos.org/svn/reactos?rev=49966&view=rev Log: [CMAKE] - Start working on rostests cmake integration. Added: trunk/rostests/CMakeLists.txt (with props) trunk/rostests/winetests/CMakeLists.txt (with props) trunk/rostests/winetests/advapi32/CMakeLists.txt (with props) trunk/rostests/winetests/advpack/CMakeLists.txt (with props) trunk/rostests/winetests/amstream/CMakeLists.txt (with props) trunk/rostests/winetests/atl/CMakeLists.txt (with props) trunk/rostests/winetests/avifil32/CMakeLists.txt (with props) trunk/rostests/winetests/browseui/CMakeLists.txt (with props) trunk/rostests/winetests/cabinet/CMakeLists.txt (with props) trunk/rostests/winetests/comcat/CMakeLists.txt (with props) trunk/rostests/winetests/comctl32/CMakeLists.txt (with props) trunk/rostests/winetests/comdlg32/CMakeLists.txt (with props) trunk/rostests/winetests/credui/CMakeLists.txt (with props) trunk/rostests/winetests/crypt32/CMakeLists.txt (with props) trunk/rostests/winetests/cryptnet/CMakeLists.txt (with props) trunk/rostests/winetests/cryptui/CMakeLists.txt (with props) trunk/rostests/winetests/dnsapi/CMakeLists.txt (with props) trunk/rostests/winetests/dsound/CMakeLists.txt (with props) trunk/rostests/winetests/fusion/CMakeLists.txt (with props) trunk/rostests/winetests/gdi32/CMakeLists.txt (with props) trunk/rostests/winetests/gdiplus/CMakeLists.txt (with props) trunk/rostests/winetests/hlink/CMakeLists.txt (with props) trunk/rostests/winetests/icmp/CMakeLists.txt (with props) trunk/rostests/winetests/imm32/CMakeLists.txt (with props) trunk/rostests/winetests/inetcomm/CMakeLists.txt (with props) trunk/rostests/winetests/inetmib1/CMakeLists.txt (with props) trunk/rostests/winetests/iphlpapi/CMakeLists.txt (with props) trunk/rostests/winetests/itss/CMakeLists.txt (with props) trunk/rostests/winetests/jscript/CMakeLists.txt (with props) trunk/rostests/winetests/kernel32/CMakeLists.txt (with props) trunk/rostests/winetests/localspl/CMakeLists.txt (with props) trunk/rostests/winetests/localui/CMakeLists.txt (with props) trunk/rostests/winetests/lz32/CMakeLists.txt (with props) trunk/rostests/winetests/mapi32/CMakeLists.txt (with props) trunk/rostests/winetests/mlang/CMakeLists.txt (with props) trunk/rostests/winetests/msacm32/CMakeLists.txt (with props) trunk/rostests/winetests/mscms/CMakeLists.txt (with props) trunk/rostests/winetests/msctf/CMakeLists.txt (with props) Added: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=49966&… ============================================================================== --- trunk/rostests/CMakeLists.txt (added) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +#add_subdirectory(apitests) +#add_subdirectory(dibtests) +#add_subdirectory(dxtest) +#add_subdirectory(regtests) +#add_subdirectory(rosautotest) +#add_subdirectory(tests) +#add_subdirectory(win32) +add_subdirectory(winetests) Propchange: trunk/rostests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt (added) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,88 @@ + +add_subdirectory(advapi32) +add_subdirectory(advpack) +add_subdirectory(amstream) +add_subdirectory(atl) +add_subdirectory(avifil32) +add_subdirectory(browseui) +add_subdirectory(cabinet) +add_subdirectory(comcat) +add_subdirectory(comctl32) +add_subdirectory(comdlg32) +add_subdirectory(credui) +add_subdirectory(crypt32) +add_subdirectory(cryptnet) +add_subdirectory(cryptui) +add_subdirectory(dnsapi) +add_subdirectory(dsound) +add_subdirectory(fusion) +add_subdirectory(gdi32) +add_subdirectory(gdiplus) +add_subdirectory(hlink) +add_subdirectory(icmp) +add_subdirectory(imm32) +add_subdirectory(inetcomm) +add_subdirectory(inetmib1) +add_subdirectory(iphlpapi) +add_subdirectory(itss) +add_subdirectory(jscript) +add_subdirectory(kernel32) +add_subdirectory(localspl) +add_subdirectory(localui) +add_subdirectory(lz32) +add_subdirectory(mapi32) +add_subdirectory(mlang) +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(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(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) Propchange: trunk/rostests/winetests/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/advapi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,25 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + cred.c + crypt.c + crypt_lmhash.c + crypt_md4.c + crypt_md5.c + crypt_sha.c + eventlog.c + lsa.c + registry.c + security.c + service.c + testlist.c) + +add_executable(advapi32_winetest ${SOURCE}) + +target_link_libraries(advapi32_winetest uuid) + +set_module_type(advapi32_winetest win32cui) +add_importlibs(advapi32_winetest advapi32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/advapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advpack/CMakeLi… ============================================================================== --- trunk/rostests/winetests/advpack/CMakeLists.txt (added) +++ trunk/rostests/winetests/advpack/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,17 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + advpack.c + files.c + install.c + testlist.c) + +add_executable(advpack_winetest ${SOURCE}) + +target_link_libraries(advpack_winetest wine) + +set_module_type(advpack_winetest win32cui) +add_importlibs(advpack_winetest cabinet advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/advpack/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/CMakeL… ============================================================================== --- trunk/rostests/winetests/amstream/CMakeLists.txt (added) +++ trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,6 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_executable(amstream_winetest amstream.c testlist.c) +target_link_libraries(amstream_winetest wine uuid) +set_module_type(amstream_winetest win32cui) +add_importlibs(amstream_winetest ole32 user32 ddraw msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/amstream/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl/CMakeLists.… ============================================================================== --- trunk/rostests/winetests/atl/CMakeLists.txt (added) +++ trunk/rostests/winetests/atl/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,14 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + atl_ax.c + module.c + testlist.c) + +add_executable(atl_winetest ${SOURCE}) + +target_link_libraries(atl_winetest wine uuid) + +set_module_type(atl_winetest win32cui) +add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/atl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/CMakeL… ============================================================================== --- trunk/rostests/winetests/avifil32/CMakeLists.txt (added) +++ trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,6 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_executable(avifil32_winetest api.c testlist.c) +target_link_libraries(avifil32_winetest wine) +set_module_type(avifil32_winetest win32cui) +add_importlibs(avifil32_winetest avifil32 msvcrt kernel32) Propchange: trunk/rostests/winetests/avifil32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/CMakeL… ============================================================================== --- trunk/rostests/winetests/browseui/CMakeLists.txt (added) +++ trunk/rostests/winetests/browseui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(browseui_winetest autocomplete.c testlist.c) +target_link_libraries(browseui_winetest wine uuid) +set_module_type(browseui_winetest win32cui) +add_importlibs(browseui_winetest user32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/browseui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cabinet/CMakeLists.txt (added) +++ trunk/rostests/winetests/cabinet/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(cabinet_winetest extract.c fdi.c testlist.c) +target_link_libraries(cabinet_winetest wine) +set_module_type(cabinet_winetest win32cui) +add_importlibs(cabinet_winetest cabinet msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/cabinet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/comcat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comcat/CMakeLis… ============================================================================== --- trunk/rostests/winetests/comcat/CMakeLists.txt (added) +++ trunk/rostests/winetests/comcat/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(comcat_winetest comcat.c testlist.c) +target_link_libraries(comcat_winetest wine uuid) +set_module_type(comcat_winetest win32cui) +add_importlibs(comcat_winetest ole32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/comcat/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt (added) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,40 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +remove_definitions(-D_WIN32_IE=0x600) +add_definitions(-D_WIN32_IE=0x500) + +list(APPEND SOURCE + comboex.c + datetime.c + dpa.c + header.c + imagelist.c + ipaddress.c + listview.c + misc.c + monthcal.c + mru.c + progress.c + propsheet.c + rebar.c + status.c + subclass.c + tab.c + toolbar.c + tooltips.c + trackbar.c + treeview.c + updown.c + testlist.c + rsrc.rc) + +add_executable(comctl32_winetest ${SOURCE}) +target_link_libraries(comctl32_winetest wine) +set_module_type(comctl32_winetest win32cui) +add_importlibs(comctl32_winetest comctl32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/comctl32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comdlg32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comdlg32/CMakeLists.txt (added) +++ trunk/rostests/winetests/comdlg32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + filedlg.c + fontdlg.c + printdlg.c + testlist.c + rsrc.rc) + +add_executable(comdlg32_winetest ${SOURCE}) +target_link_libraries(comdlg32_winetest wine) +set_module_type(comdlg32_winetest win32cui) +add_importlibs(comdlg32_winetest comdlg32 winspool user32 gdi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/comdlg32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/credui/CMakeLis… ============================================================================== --- trunk/rostests/winetests/credui/CMakeLists.txt (added) +++ trunk/rostests/winetests/credui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(credui_winetest credui.c testlist.c) +target_link_libraries(credui_winetest wine) +set_module_type(credui_winetest win32cui) +add_importlibs(credui_winetest credui msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/credui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/crypt32/CMakeLists.txt (added) +++ trunk/rostests/winetests/crypt32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,27 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + base64.c + cert.c + chain.c + crl.c + ctl.c + encode.c + main.c + message.c + msg.c + object.c + oid.c + protectdata.c + sip.c + store.c + str.c + testlist.c) + +add_executable(crypt32_winetest ${SOURCE}) +target_link_libraries(crypt32_winetest wine) +set_module_type(crypt32_winetest win32cui) +add_importlibs(crypt32_winetest crypt32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/crypt32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/CMakeL… ============================================================================== --- trunk/rostests/winetests/cryptnet/CMakeLists.txt (added) +++ trunk/rostests/winetests/cryptnet/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(cryptnet_winetest cryptnet.c testlist.c) +target_link_libraries(cryptnet_winetest wine) +set_module_type(cryptnet_winetest win32cui) +add_importlibs(cryptnet_winetest cryptnet crypt32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/cryptnet/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptui/CMakeLi… ============================================================================== --- trunk/rostests/winetests/cryptui/CMakeLists.txt (added) +++ trunk/rostests/winetests/cryptui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(cryptui_winetest cryptui.c testlist.c) +target_link_libraries(cryptui_winetest wine) +set_module_type(cryptui_winetest win32cui) +add_importlibs(cryptui_winetest cryptui crypt32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/cryptui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dnsapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/dnsapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(dnsapi_winetest name.c record.c testlist.c) +target_link_libraries(dnsapi_winetest wine) +set_module_type(dnsapi_winetest win32cui) +add_importlibs(dnsapi_winetest dnsapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/dnsapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dsound/CMakeLists.txt (added) +++ trunk/rostests/winetests/dsound/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,19 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + capture.c + ds3d8.c + ds3d.c + dsound8.c + dsound.c + duplex.c + propset.c + testlist.c) + +add_executable(dsound_winetest ${SOURCE}) +target_link_libraries(dsound_winetest wine uuid dxguid) +set_module_type(dsound_winetest win32cui) +add_importlibs(dsound_winetest dsound ole32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/dsound/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/CMakeLis… ============================================================================== --- trunk/rostests/winetests/fusion/CMakeLists.txt (added) +++ trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + asmcache.c + asmenum.c + asmname.c + fusion.c + testlist.c) + +add_executable(fusion_winetest ${SOURCE}) +target_link_libraries(fusion_winetest wine) +set_module_type(fusion_winetest win32cui) +add_importlibs(fusion_winetest user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/fusion/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,24 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + bitmap.c + brush.c + clipping.c + dc.c + gdiobj.c + generated.c + icm.c + font.c + mapping.c + metafile.c + palette.c + path.c + pen.c + testlist.c) + +add_executable(gdi32_winetest ${SOURCE}) +set_module_type(gdi32_winetest win32cui) +add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/gdi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/CMakeLi… ============================================================================== --- trunk/rostests/winetests/gdiplus/CMakeLists.txt (added) +++ trunk/rostests/winetests/gdiplus/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,23 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + brush.c + customlinecap.c + font.c + graphics.c + graphicspath.c + image.c + matrix.c + pathiterator.c + pen.c + region.c + stringformat.c + testlist.c) + +add_executable(gdiplus_winetest ${SOURCE}) +target_link_libraries(gdiplus_winetest wine) +set_module_type(gdiplus_winetest win32cui) +add_importlibs(gdiplus_winetest gdiplus user32 gdi32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/gdiplus/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/CMakeList… ============================================================================== --- trunk/rostests/winetests/hlink/CMakeLists.txt (added) +++ trunk/rostests/winetests/hlink/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,14 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + browse_ctx.c + hlink.c + testlist.c) + +add_executable(hlink_winetest ${SOURCE}) +target_link_libraries(hlink_winetest wine uuid) +set_module_type(hlink_winetest win32cui) +add_importlibs(hlink_winetest hlink ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/hlink/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/icmp/CMakeLists… ============================================================================== --- trunk/rostests/winetests/icmp/CMakeLists.txt (added) +++ trunk/rostests/winetests/icmp/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(icmp_winetest icmp.c testlist.c) +target_link_libraries(icmp_winetest wine uuid) +set_module_type(icmp_winetest win32cui) +add_importlibs(icmp_winetest icmp msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/icmp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/CMakeList… ============================================================================== --- trunk/rostests/winetests/imm32/CMakeLists.txt (added) +++ trunk/rostests/winetests/imm32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(imm32_winetest imm32.c testlist.c) +target_link_libraries(imm32_winetest wine) +set_module_type(imm32_winetest win32cui) +add_importlibs(imm32_winetest imm32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/imm32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetcomm/CMakeLists.txt (added) +++ trunk/rostests/winetests/inetcomm/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,14 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + mimeintl.c + mimeole.c + testlist.c) + +add_executable(inetcomm_winetest ${SOURCE}) +target_link_libraries(inetcomm_winetest wine) +set_module_type(inetcomm_winetest win32cui) +add_importlibs(inetcomm_winetest inetcomm oleaut32 ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/inetcomm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/CMakeL… ============================================================================== --- trunk/rostests/winetests/inetmib1/CMakeLists.txt (added) +++ trunk/rostests/winetests/inetmib1/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(inetmib1_winetest main.c testlist.c) +target_link_libraries(inetmib1_winetest wine) +set_module_type(inetmib1_winetest win32cui) +add_importlibs(inetmib1_winetest snmpapi msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/inetmib1/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/CMakeL… ============================================================================== --- trunk/rostests/winetests/iphlpapi/CMakeLists.txt (added) +++ trunk/rostests/winetests/iphlpapi/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(iphlpapi_winetest iphlpapi.c testlist.c) +target_link_libraries(iphlpapi_winetest wine) +set_module_type(iphlpapi_winetest win32cui) +add_importlibs(iphlpapi_winetest msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/iphlpapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists… ============================================================================== --- trunk/rostests/winetests/itss/CMakeLists.txt (added) +++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(itss_winetest protocol.c testlist.c rsrc.rc) +target_link_libraries(itss_winetest wine) +set_module_type(itss_winetest win32cui) +add_importlibs(itss_winetest ole32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/itss/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi… ============================================================================== --- trunk/rostests/winetests/jscript/CMakeLists.txt (added) +++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,16 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + activex.c + jscript.c + run.c + testlist.c + rsrc.rc) + +add_executable(jscript_winetest ${SOURCE}) +target_link_libraries(jscript_winetest wine) +set_module_type(jscript_winetest win32cui) +add_importlibs(jscript_winetest ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/jscript/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt (added) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,47 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + actctx.c + alloc.c + atom.c + change.c + codepage.c + comm.c + console.c + debugger.c + directory.c + drive.c + environ.c + fiber.c + file.c + format_msg.c + #generated.c + heap.c + interlck.c + loader.c + locale.c + mailslot.c + module.c + path.c + pipe.c + process.c + profile.c + resource.c + sync.c + thread.c + time.c + timer.c + toolhelp.c + version.c + virtual.c + volume.c + testlist.c + resource.rc) + +add_executable(kernel32_winetest ${SOURCE}) +target_link_libraries(kernel32_winetest wine) +set_module_type(kernel32_winetest win32cui) +add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/kernel32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localspl/CMakeL… ============================================================================== --- trunk/rostests/winetests/localspl/CMakeLists.txt (added) +++ trunk/rostests/winetests/localspl/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,10 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_executable(localspl_winetest localmon.c testlist.c) +target_link_libraries(localspl_winetest wine) +set_module_type(localspl_winetest win32cui) +add_importlibs(localspl_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/localspl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/CMakeLi… ============================================================================== --- trunk/rostests/winetests/localui/CMakeLists.txt (added) +++ trunk/rostests/winetests/localui/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,10 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_executable(localui_winetest localui.c testlist.c) +target_link_libraries(localui_winetest wine) +set_module_type(localui_winetest win32cui) +add_importlibs(localui_winetest winspool msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/localui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/lz32/CMakeLists… ============================================================================== --- trunk/rostests/winetests/lz32/CMakeLists.txt (added) +++ trunk/rostests/winetests/lz32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(lz32_winetest lzexpand_main.c testlist.c) +target_link_libraries(lz32_winetest wine) +set_module_type(lz32_winetest win32cui) +add_importlibs(lz32_winetest lz32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/lz32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mapi32/CMakeLists.txt (added) +++ trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,15 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + imalloc.c + prop.c + util.c + testlist.c) + +add_executable(mapi32_winetest ${SOURCE}) +target_link_libraries(mapi32_winetest wine uuid) +set_module_type(mapi32_winetest win32cui) +add_importlibs(mapi32_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/mapi32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/CMakeList… ============================================================================== --- trunk/rostests/winetests/mlang/CMakeLists.txt (added) +++ trunk/rostests/winetests/mlang/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(mlang_winetest mlang.c testlist.c) +target_link_libraries(mlang_winetest wine uuid) +set_module_type(mlang_winetest win32cui) +add_importlibs(mlang_winetest oleaut32 ole32 gdi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/mlang/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/msacm32/CMakeLists.txt (added) +++ trunk/rostests/winetests/msacm32/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(msacm32_winetest msacm.c testlist.c) +target_link_libraries(msacm32_winetest wine) +set_module_type(msacm32_winetest win32cui) +add_importlibs(msacm32_winetest msacm32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msacm32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/CMakeList… ============================================================================== --- trunk/rostests/winetests/mscms/CMakeLists.txt (added) +++ trunk/rostests/winetests/mscms/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(mscms_winetest profile.c testlist.c) +target_link_libraries(mscms_winetest wine) +set_module_type(mscms_winetest win32cui) +add_importlibs(mscms_winetest advapi32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/mscms/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeList… ============================================================================== --- trunk/rostests/winetests/msctf/CMakeLists.txt (added) +++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Tue Dec 7 09:27:10 2010 @@ -1,0 +1,9 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +add_executable(msctf_winetest inputprocessor.c testlist.c) +target_link_libraries(msctf_winetest wine) +set_module_type(msctf_winetest win32cui) +add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/msctf/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 11 months

[janderwald] 49965: [AUDIO-BRINGUP] - Implement support for retrieving mux mixer controls - Implement support for on/off controls - Store logical pins for nodes connecting to another nodes. Current...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Dec 6 16:00:06 2010 New Revision: 49965 URL: http://svn.reactos.org/svn/reactos?rev=49965&view=rev Log: [AUDIO-BRINGUP] - Implement support for retrieving mux mixer controls - Implement support for on/off controls - Store logical pins for nodes connecting to another nodes. Currently not yet used 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/topology.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] Mon Dec 6 16:00:06 2010 @@ -53,19 +53,7 @@ MixerControl->dwControlType = MMixerGetControlTypeFromTopologyNode(NodeType); MixerControl->fdwControl = MIXERCONTROL_CONTROLF_UNIFORM; /* FIXME */ - MixerControl->cMultipleItems = 0; /* FIXME */ - - if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) - { - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 1; - } - else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) - { - MixerControl->Bounds.dwMinimum = 0; - MixerControl->Bounds.dwMaximum = 0xFFFF; - MixerControl->Metrics.cSteps = 0xC0; /* FIXME */ - } + MixerControl->cMultipleItems = 0; /* setup request to retrieve name */ Node.NodeId = NodeIndex; @@ -104,28 +92,46 @@ } MixerInfo->ControlId++; -#if 0 + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUX) { - KSNODEPROPERTY Property; - ULONG PinId = 2; - - /* setup the request */ - RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY)); - - Property.NodeId = NodeIndex; - Property.Property.Id = KSPROPERTY_AUDIO_MUX_SOURCE; - Property.Property.Flags = KSPROPERTY_TYPE_SET; - Property.Property.Set = KSPROPSETID_Audio; - - /* get node volume level info */ - Status = MixerContext->Control(hDevice, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY), (PVOID)&PinId, sizeof(ULONG), &BytesReturned); - - DPRINT1("Status %x NodeIndex %u PinId %u\n", Status, NodeIndex, PinId); - //DbgBreakPoint(); - }else -#endif - if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) + ULONG NodesCount; + PULONG Nodes; + + /* allocate topology nodes array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, Topology, &Nodes); + + if (Status != MM_STATUS_SUCCESS) + { + /* out of memory */ + return STATUS_NO_MEMORY; + } + + /* get connected node count */ + MMixerGetNextNodesFromNodeIndex(MixerContext, Topology, NodeIndex, TRUE, &NodesCount, Nodes); + + /* TODO */ + MixerContext->Free(Nodes); + + /* setup mux bounds */ + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = NodesCount - 1; + MixerControl->Metrics.dwReserved[0] = NodesCount; + MixerControl->cMultipleItems = NodesCount; + MixerControl->fdwControl |= MIXERCONTROL_CONTROLF_MULTIPLE; + } + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = 1; + } + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_ONOFF) + { + /* only needs to set bounds */ + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = 1; + } + else if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { KSNODEPROPERTY_AUDIO_CHANNEL Property; ULONG Length; @@ -133,6 +139,10 @@ PKSPROPERTY_MEMBERSHEADER Members; PKSPROPERTY_STEPPING_LONG Range; + MixerControl->Bounds.dwMinimum = 0; + MixerControl->Bounds.dwMaximum = 0xFFFF; + MixerControl->Metrics.cSteps = 0xC0; /* FIXME */ + Length = sizeof(KSPROPERTY_DESCRIPTION) + sizeof(KSPROPERTY_MEMBERSHEADER) + sizeof(KSPROPERTY_STEPPING_LONG); Desc = (PKSPROPERTY_DESCRIPTION)MixerContext->Alloc(Length); ASSERT(Desc); @@ -142,7 +152,7 @@ Property.NodeProperty.NodeId = NodeIndex; Property.NodeProperty.Property.Id = KSPROPERTY_AUDIO_VOLUMELEVEL; - Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT; + Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_TOPOLOGY; Property.NodeProperty.Property.Set = KSPROPSETID_Audio; /* get node volume level info */ 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] Mon Dec 6 16:00:06 2010 @@ -27,6 +27,7 @@ ULONG NodeConnectedFromCount; struct __TOPOLOGY_NODE__ ** NodeConnectedFrom; + PULONG LogicalPinNodeConnectedFrom; ULONG PinConnectedFromCount; PULONG PinConnectedFrom; @@ -53,6 +54,7 @@ ULONG PinConnectedToCount; PULONG PinConnectedTo; + ULONG Visited; }PIN, *PPIN; Modified: branches/audio-bringup/lib/drivers/sound/mmixer/topology.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Mon Dec 6 16:00:06 2010 @@ -264,7 +264,9 @@ { PTOPOLOGY_NODE InNode, OutNode; PTOPOLOGY_NODE * NewNodes; + PULONG NewLogicalPinNodeConnectedFrom; ULONG Count; + ULONG LogicalPinId; /* sanity checks */ ASSERT(Topology->TopologyNodesCount > Connection->ToNode); @@ -274,6 +276,9 @@ InNode = &Topology->TopologyNodes[Connection->FromNode]; OutNode = &Topology->TopologyNodes[Connection->ToNode]; + /* get logical pin node id */ + LogicalPinId = Connection->ToNodePin; + /* get existing count */ Count = OutNode->NodeConnectedFromCount; @@ -286,20 +291,41 @@ return MM_STATUS_NO_MEMORY; } + /* allocate logical pin nodes array */ + NewLogicalPinNodeConnectedFrom = MixerContext->Alloc((Count + 1) * sizeof(ULONG)); + if (!NewLogicalPinNodeConnectedFrom) + { + /* out of memory */ + MixerContext->Free(NewNodes); + return MM_STATUS_NO_MEMORY; + } + if (Count) { /* copy existing nodes */ MixerContext->Copy(NewNodes, OutNode->NodeConnectedFrom, sizeof(PTOPOLOGY) * Count); + /* copy existing logical pin node array */ + MixerContext->Copy(NewLogicalPinNodeConnectedFrom, OutNode->LogicalPinNodeConnectedFrom, sizeof(ULONG) * Count); + /* release old nodes array */ MixerContext->Free(OutNode->NodeConnectedFrom); + + /* release old logical pin node array */ + MixerContext->Free(OutNode->LogicalPinNodeConnectedFrom); } /* add new topology node */ NewNodes[OutNode->NodeConnectedFromCount] = InNode; + /* add logical node id */ + NewLogicalPinNodeConnectedFrom[OutNode->NodeConnectedFromCount] = LogicalPinId; + /* replace old nodes array */ OutNode->NodeConnectedFrom = NewNodes; + + /* replace old logical pin node array */ + OutNode->LogicalPinNodeConnectedFrom = NewLogicalPinNodeConnectedFrom; /* increment nodes count */ OutNode->NodeConnectedFromCount++;

14 years, 11 months

[fireball] 49964: - Adjust SWM to actually behave like a window manager which user32/server expects. [2/2] Changes briefly: * A window is created as a hidden window by default . * When a window is ...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Dec 6 14:16:20 2010 New Revision: 49964 URL: http://svn.reactos.org/svn/reactos?rev=49964&view=rev Log: - Adjust SWM to actually behave like a window manager which user32/server expects. [2/2] Changes briefly: * A window is created as a hidden window by default . * When a window is being made visible zorder doesn't change (it's not moved to foreground automatically anymore). Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Mon Dec 6 14:16:20 2010 @@ -356,7 +356,8 @@ Win->Window.bottom = WindowRect->bottom; Win->Visible = create_empty_region(); - set_region_rect(Win->Visible, &Win->Window); + Win->Hidden = TRUE; + //set_region_rect(Win->Visible, &Win->Window); /* Set window's flags */ if (ex_style & WS_EX_TOPMOST) Win->Topmost = TRUE; @@ -375,9 +376,9 @@ } /* Now ensure it is visible on screen */ - SwmInvalidateRegion(Win, Win->Visible, &Win->Window); - - SwmClipAllWindows(); + //SwmInvalidateRegion(Win, Win->Visible, &Win->Window); + + //SwmClipAllWindows(); //SwmDumpWindows(); @@ -855,6 +856,7 @@ DPRINT("Unhiding %x, rect (%d,%d)-(%d,%d)\n", Win->hwnd, Win->Window.left, Win->Window.top, Win->Window.right, Win->Window.bottom); Win->Hidden = FALSE; +#if 0 /* Make it topmost window if needed */ if (!(SwpFlags & SWP_NOZORDER)) { @@ -864,6 +866,7 @@ /* Add it to the head of the list */ InsertHeadList(&SwmWindows, &Win->Entry); } +#endif /* Calculate visible regions for all windows */ SwmClipAllWindows();

14 years, 11 months

[fireball] 49963: - Move to a more formalized window manager interaction in winent. Based on code from winex11.drv. [1/2] - As a result, windows should appear and hide correctly, as expected by the...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Dec 6 14:13:08 2010 New Revision: 49963 URL: http://svn.reactos.org/svn/reactos?rev=49963&view=rev Log: - Move to a more formalized window manager interaction in winent. Based on code from winex11.drv. [1/2] - As a result, windows should appear and hide correctly, as expected by the core user32/server code. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/dll/win32/winent.drv/wnd.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Mon Dec 6 14:13:08 2010 @@ -583,11 +583,11 @@ if (hwnd) { /* Capturing */ - FIXME("Capture set for hwnd %x\n", hwnd); + TRACE("Capture set for hwnd %x\n", hwnd); } else { - FIXME("Capture released\n"); + TRACE("Capture released\n"); } } @@ -628,7 +628,27 @@ void CDECL RosDrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { - UNIMPLEMENTED; + struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); + + if (!data) return; + if (parent == old_parent) return; + + if (parent != GetDesktopWindow()) /* a child window */ + { + if (old_parent == GetDesktopWindow()) + { + /* destroy the old windows */ + //destroy_whole_window( data, FALSE ); + //destroy_icon_window( data ); + FIXME("Should destroy hwnd %x\n", data->hwnd); + } + } + else /* new top level window */ + { + /* FIXME: we ignore errors since we can't really recover anyway */ + //create_whole_window( data ); + FIXME("Should create a new whole window for hwnd %x\n", data->hwnd); + } } int CDECL RosDrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) @@ -658,6 +678,11 @@ /* Do some magic... */ TRACE("Window %x is being made visible1\n", hwnd); + + if (data->whole_window && is_window_rect_mapped( &data->window_rect )) + { + if (!data->mapped) map_window( data, style->styleNew ); + } } if (offset == GWL_STYLE && (changed & WS_DISABLED)) @@ -737,14 +762,16 @@ const RECT *window_rect, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { - RECT old_whole_rect, old_client_rect; + RECT old_whole_rect, old_client_rect, old_window_rect; struct ntdrv_win_data *data = NTDRV_get_win_data(hwnd); + DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); if (!data) return; TRACE( "win %x pos changed. new vis rect %s, old whole rect %s, swp_flags %x insert_after %x\n", hwnd, wine_dbgstr_rect(visible_rect), wine_dbgstr_rect(&data->whole_rect), swp_flags, insert_after ); + old_window_rect = data->window_rect; old_whole_rect = data->whole_rect; old_client_rect = data->client_rect; data->window_rect = *window_rect; @@ -778,18 +805,38 @@ if (!data->whole_window) return; - /* Sync position change */ - if (!(swp_flags & SWP_NOREDRAW)) // HACK: When removing this, explorer's start menu starts to appear partially. Investigate! - { - /* SWM: Change windows position */ - SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect, insert_after, swp_flags); + /* Sync window position with the SWM */ + sync_window_position( data, swp_flags, + &old_window_rect, &old_whole_rect, &old_client_rect ); + + if (data->mapped) + { + if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || + (!is_window_rect_mapped( window_rect ) && is_window_rect_mapped( &old_window_rect ))) + unmap_window( data ); } /* Pass show/hide information to the window manager */ - if (swp_flags & SWP_SHOWWINDOW) - SwmShowWindow(hwnd, TRUE, swp_flags); - else if (swp_flags & SWP_HIDEWINDOW) - SwmShowWindow(hwnd, FALSE, swp_flags); + if ((new_style & WS_VISIBLE) && + ((new_style & WS_MINIMIZE) || is_window_rect_mapped( window_rect ))) + { + //if (!data->mapped || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) + //set_wm_hints( display, data ); + + if (!data->mapped) + { + map_window( data, new_style ); + } + else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE))) + { + data->iconic = (new_style & WS_MINIMIZE) != 0; + FIXME( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); + //if (data->iconic) + // XIconifyWindow( display, data->whole_window, DefaultScreen(display) ); + //else if (is_window_rect_mapped( rectWindow )) + // XMapWindow( display, data->whole_window ); + } + } } /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Mon Dec 6 14:13:08 2010 @@ -37,6 +37,9 @@ RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ HCURSOR cursor; /* current cursor */ + BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ + BOOL iconic : 1; /* is window in iconic state? */ + BOOL shaped : 1; /* is window using a custom region shape? */ }; /* clipboard.c */ @@ -84,3 +87,9 @@ struct ntdrv_win_data *NTDRV_create_desktop_win_data( HWND hwnd ); void NTDRV_destroy_win_data( HWND hwnd ); VOID CDECL RosDrv_UpdateZOrder(HWND hwnd, RECT *rect); +void map_window( struct ntdrv_win_data *data, DWORD new_style ); +void unmap_window( struct ntdrv_win_data *data ); +BOOL is_window_rect_mapped( const RECT *rect ); +void sync_window_position( struct ntdrv_win_data *data, + UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect, const RECT *old_client_rect ); Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Mon Dec 6 14:13:08 2010 @@ -194,5 +194,95 @@ SwmRemoveWindow( hwnd ); } +/*********************************************************************** + * map_window + */ +void map_window( struct ntdrv_win_data *data, DWORD new_style ) +{ + TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + + SwmShowWindow( data->hwnd, TRUE, 0); + + data->mapped = TRUE; + data->iconic = (new_style & WS_MINIMIZE) != 0; +} + + +/*********************************************************************** + * unmap_window + */ +void unmap_window( struct ntdrv_win_data *data ) +{ + TRACE( "win %p/%lx\n", data->hwnd, data->whole_window ); + + SwmShowWindow( data->hwnd, FALSE, 0); + + data->mapped = FALSE; + //data->net_wm_state = 0; +} + +/*********************************************************************** + * is_window_rect_mapped + * + * Check if the SWM whole window should be mapped based on its rectangle + */ +BOOL is_window_rect_mapped( const RECT *rect ) +{ + /* don't map if rect is off-screen */ + /*if (rect->left >= virtual_screen_rect.right || + rect->top >= virtual_screen_rect.bottom || + rect->right <= virtual_screen_rect.left || + rect->bottom <= virtual_screen_rect.top) + return FALSE;*/ + + return TRUE; +} + +/*********************************************************************** + * sync_window_position + * + * Synchronize the SWM window position with the Windows one + */ +void sync_window_position( struct ntdrv_win_data *data, + UINT swp_flags, const RECT *old_window_rect, + const RECT *old_whole_rect, const RECT *old_client_rect ) +{ + SwmPosChanged(data->hwnd, &data->whole_rect, old_whole_rect, NULL, swp_flags); + + if (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW)) + { + /* find window that this one must be after */ + HWND prev = GetWindow( data->hwnd, GW_HWNDPREV ); + while (prev && !(GetWindowLongW( prev, GWL_STYLE ) & WS_VISIBLE)) + prev = GetWindow( prev, GW_HWNDPREV ); + if (!prev) /* top child */ + { + /* Bring this window to foreground */ + SwmSetForeground(data->hwnd); + } + /* should use stack_mode Below but most window managers don't get it right */ + /* and Above with a sibling doesn't work so well either, so we ignore it */ + } + +#ifdef HAVE_LIBXSHAPE + if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) + sync_window_region( display, data, (HRGN)1 ); + if (data->shaped) + { + int old_x_offset = old_window_rect->left - old_whole_rect->left; + int old_y_offset = old_window_rect->top - old_whole_rect->top; + int new_x_offset = data->window_rect.left - data->whole_rect.left; + int new_y_offset = data->window_rect.top - data->whole_rect.top; + if (old_x_offset != new_x_offset || old_y_offset != new_y_offset) + XShapeOffsetShape( display, data->whole_window, ShapeBounding, + new_x_offset - old_x_offset, new_y_offset - old_y_offset ); + } +#endif + + TRACE( "win %p/%lx pos %d,%d,%dx%d\n", + data->hwnd, data->whole_window, data->whole_rect.left, data->whole_rect.top, + data->whole_rect.right - data->whole_rect.left, + data->whole_rect.bottom - data->whole_rect.top ); +} /* EOF */

14 years, 11 months

[gadamopoulos] 49962: [win32k] - In FNID_SENDMESSAGECALLBACK use SEH before accesing the user-mode buffer

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Dec 6 12:07:05 2010 New Revision: 49962 URL: http://svn.reactos.org/svn/reactos?rev=49962&view=rev Log: [win32k] - In FNID_SENDMESSAGECALLBACK use SEH before accesing the user-mode buffer Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Dec 6 12:07:05 2010 @@ -2175,14 +2175,23 @@ break; case FNID_SENDMESSAGECALLBACK: { - PCALL_BACK_INFO CallBackInfo = (PCALL_BACK_INFO)ResultInfo; + CALL_BACK_INFO CallBackInfo; ULONG_PTR uResult; - - if (!CallBackInfo) - break; + + _SEH2_TRY + { + ProbeForRead((PVOID)ResultInfo, sizeof(CALL_BACK_INFO), 1); + RtlCopyMemory(&CallBackInfo, (PVOID)ResultInfo, sizeof(CALL_BACK_INFO)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + _SEH2_YIELD(break); + } + _SEH2_END; if (!co_IntSendMessageWithCallBack(hWnd, Msg, wParam, lParam, - CallBackInfo->CallBack, CallBackInfo->Context, &uResult)) + CallBackInfo.CallBack, CallBackInfo.Context, &uResult)) { DPRINT1("Callback failure!\n"); }

14 years, 11 months

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