Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[mbosma] 26723: DirectDraw rearrangement. (part 1/2)
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 18:20:12 2007 New Revision: 26723 URL: http://svn.reactos.org/svn/reactos?rev=26723&view=rev Log: DirectDraw rearrangement. (part 1/2) Added: trunk/reactos/dll/directx/ddraw/Clipper/ trunk/reactos/dll/directx/ddraw/Clipper/iface_clipper.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_clipper.c trunk/reactos/dll/directx/ddraw/Color/ trunk/reactos/dll/directx/ddraw/Color/iface_color.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_color.c trunk/reactos/dll/directx/ddraw/Ddraw/ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_hel.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/callbacks_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/Gamma/ trunk/reactos/dll/directx/ddraw/Gamma/iface_gamma.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_gamma.c trunk/reactos/dll/directx/ddraw/Kernel/ trunk/reactos/dll/directx/ddraw/Kernel/iface_kernel.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_kernel.c trunk/reactos/dll/directx/ddraw/Palette/ trunk/reactos/dll/directx/ddraw/Palette/iface_palette.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_palette.c trunk/reactos/dll/directx/ddraw/Surface/ trunk/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/Videoport/ trunk/reactos/dll/directx/ddraw/Videoport/iface_videoport.c - copied unchanged from r26722, trunk/reactos/dll/directx/ddraw/iface_videoport.c Removed: trunk/reactos/dll/directx/ddraw/callbacks_hel.c trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c trunk/reactos/dll/directx/ddraw/createsurface.c trunk/reactos/dll/directx/ddraw/iface_clipper.c trunk/reactos/dll/directx/ddraw/iface_color.c trunk/reactos/dll/directx/ddraw/iface_gamma.c trunk/reactos/dll/directx/ddraw/iface_kernel.c trunk/reactos/dll/directx/ddraw/iface_palette.c trunk/reactos/dll/directx/ddraw/iface_videoport.c trunk/reactos/dll/directx/ddraw/main/ Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild Removed: trunk/reactos/dll/directx/ddraw/callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callback… ============================================================================== --- trunk/reactos/dll/directx/ddraw/callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/callbacks_hel.c (removed) @@ -1,101 +1,0 @@ -/* $Id: surface_hel.c 21519 2006-04-08 21:05:49Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/soft/surface.c - * PURPOSE: DirectDraw Software Implementation - * PROGRAMMER: Magnus Olsen - * - */ - -#include "rosdraw.h" - - -extern DDPIXELFORMAT pixelformats[]; -extern DWORD pixelformatsCount; - -/* - * Direct Draw Callbacks - */ - -DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCreateSurface(LPDDHAL_CREATESURFACEDATA lpCreateSurface) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSetColorKey(LPDDHAL_DRVSETCOLORKEYDATA lpDrvSetColorKey) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode) -{ - DEVMODE DevMode; - - DX_STUB_str("in hel"); - - DevMode.dmSize = (WORD)sizeof(DEVMODE); - DevMode.dmDriverExtra = 0; - - SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; - - if (EnumDisplaySettingsEx(NULL, SetMode->dwModeIndex, &DevMode, 0 ) != 0) - { - DX_WINDBG_trace_res((int)DevMode.dmPelsWidth, (int)DevMode.dmPelsHeight, (int)DevMode.dmBitsPerPel ); - - if (ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - { - DX_STUB_str("FAIL"); - SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; - } - else - { - DX_STUB_str("OK"); - SetMode->ddRVal = DD_OK; - } - } - - return DDHAL_DRIVER_HANDLED; -} - -DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA lpCanCreateSurface) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode) -{ - DX_WINDBG_trace(); - DX_STUB_str("Not implement yet, return DD_OK for not bsod\n"); - lpSetExclusiveMode->ddRVal = DD_OK; - - return DDHAL_DRIVER_HANDLED; -} - -DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface) -{ - DX_STUB; -} - Removed: trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/callback… ============================================================================== --- trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/callbacks_surf_hel.c (removed) @@ -1,92 +1,0 @@ -/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ddraw/ddraw.c - * PURPOSE: DirectDraw Library - * PROGRAMMER: Magnus Olsen (greatlrd) - * - */ - -#include <windows.h> -#include "rosdraw.h" -#include "d3dhal.h" -#include "ddrawgdi.h" - - -DWORD CALLBACK HelDdSurfAddAttachedSurface(LPDDHAL_ADDATTACHEDSURFACEDATA lpDestroySurface) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfFlip(LPDDHAL_FLIPDATA lpFlipData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfGetBltStatus(LPDDHAL_GETBLTSTATUSDATA lpGetBltStatusData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfGetFlipStatus(LPDDHAL_GETFLIPSTATUSDATA lpGetFlipStatusData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData) -{ - DX_STUB; -} - - -DWORD CALLBACK HelDdSurfreserved4(DWORD *lpPtr) -{ - /* - This api is not doucment by MS So I leave it - as stub. - */ - - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetClipList(LPDDHAL_SETCLIPLISTDATA lpSetClipListData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfSetPalette(LPDDHAL_SETPALETTEDATA lpSetPaletteData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData) -{ - DX_STUB; -} - -DWORD CALLBACK HelDdSurfUpdateOverlay(LPDDHAL_UPDATEOVERLAYDATA lpUpDateOveryLayData) -{ - DX_STUB; -} - Removed: trunk/reactos/dll/directx/ddraw/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/createsu… ============================================================================== --- trunk/reactos/dll/directx/ddraw/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/createsurface.c (removed) @@ -1,348 +1,0 @@ - -#include "rosdraw.h" - - -HRESULT -CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - - - That[0]->lpLcl->lpSurfMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[0]->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - That[0]->lpLcl->lpSurfMore->slist = lpLcl; - - That[0]->lpVtbl = &DirectDrawSurface7_Vtable; - That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[0]->lpLcl->lpSurfMore->lpDD_int = This; - That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[0]->lpLcl->lpSurfMore->slist[0] = That[0]->lpLcl; - That[0]->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That[0]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[0]->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; - - That[0]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That[0]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That[0]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[0]; - - return DD_OK; -} - -HRESULT -CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, - LPDDSURFACEDESC2 pDDSD) -{ - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - DWORD t; - - - /* we are building the backbuffersurface pointer list - * and create the backbuffer surface and set it up - */ - - That[0]->lpLcl->dwBackBufferCount = pDDSD->dwBackBufferCount; - - for (t=0;t<pDDSD->dwBackBufferCount+1;t++) - { - - - That[t]->lpLcl->lpSurfMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[t]->lpLcl->lpSurfMore == NULL) - { - DxHeapMemFree(That); - return DDERR_OUTOFMEMORY; - } - - That[t]->lpLcl->lpSurfMore->slist = lpLcl; - - That[t]->lpVtbl = &DirectDrawSurface7_Vtable; - That[t]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[t]->lpLcl->lpSurfMore->lpDD_int = This; - That[t]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[t]->lpLcl->lpSurfMore->slist[0] = That[t]->lpLcl; - That[t]->lpLcl->dwProcessId = GetCurrentProcessId(); - - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - if (pDDSD->dwFlags & DDSD_PIXELFORMAT) - { - That[t]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - } - else - { - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - } - mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.ddRVal = DDERR_GENERIC; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[t]->dwIntRefCnt + 1; // is this correct - mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - That[t]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - mDdCreateSurface.lplpSList = That[t]->lpLcl->lpSurfMore->slist; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - - That[t]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - /* Build the linking buffer */ - That[t]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[t]; -DX_STUB_str( "ok"); - } - return DD_OK; -} - - - -HRESULT -CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDSURFACEDESC2 pDDSD) -{ - - DDSURFACEDESC mddsdOverlay; - DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; - DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; - DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; - DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - INT i; - INT j; - INT cSurfaces; - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - - /* create overlay surface now */ - ZeroMemory(&mddsdOverlay, sizeof(DDSURFACEDESC)); - mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - - mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - mddsdOverlay.dwWidth = 100; //pels; - mddsdOverlay.dwHeight = 100; // lines; - mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; - mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; - - - //DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdOverlay; // pDDSD; - - - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create primary [%08x]", this, rv); - // printf("Fail to mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED \n"); - DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCanCreateSurface fail"); -// printf("Fail to mDdCanCreateSurface mDdCanCreateSurface.ddRVal = %d:%s\n",(int)mDdCanCreateSurface.ddRVal,DDErrorString(mDdCanCreateSurface.ddRVal)); - return DDERR_NOTINITIALIZED; - } - - - ZeroMemory(&mOverlayGlobal, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - mOverlayGlobal.dwGlobalFlags = 0; - mOverlayGlobal.lpDD = This->lpLcl->lpGbl; - mOverlayGlobal.lpDDHandle = This->lpLcl->lpGbl; - mOverlayGlobal.wWidth = (WORD)mddsdOverlay.dwWidth; - mOverlayGlobal.wHeight = (WORD)mddsdOverlay.dwHeight; - mOverlayGlobal.lPitch = -1; - mOverlayGlobal.ddpfSurface = mddsdOverlay.ddpfPixelFormat; - - // setup front- and backbuffer surfaces - cSurfaces = mddsdOverlay.dwBackBufferCount + 1; - for ( i = 0; i < cSurfaces; i++) - { - ZeroMemory(&mOverlayMore[i], sizeof(DDRAWI_DDRAWSURFACE_MORE)); - mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - ZeroMemory(&mOverlayLocal[i], sizeof(DDRAWI_DDRAWSURFACE_LCL)); - mOverlayLocal[i].lpGbl = &mOverlayGlobal; - mOverlayLocal[i].lpSurfMore = &mOverlayMore[i]; - mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); - mOverlayLocal[i].dwFlags = (i == 0) ? - (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): - (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); - - mOverlayLocal[i].dwFlags |= - DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| - DDRAWISURF_HASPIXELFORMAT| - DDRAWISURF_HASOVERLAYDATA; - - mOverlayLocal[i].ddsCaps.dwCaps = mddsdOverlay.ddsCaps.dwCaps; - mpOverlayLocals[i] = &mOverlayLocal[i]; - } - - for ( i = 0; i < cSurfaces; i++) - { - j = (i + 1) % cSurfaces; - - - /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); - return DD_FALSE; - }*/ - - if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) - { - // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); -//printf("Fail to DdAttachSurface (%d:%d)\n", i, j); - DX_STUB_str("DdAttachSurface fail"); - return DD_FALSE; - } - - } - - // DDHAL_CREATESURFACEDATA mDdCreateSurface; - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("mDdCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str("mDdCreateSurface fail"); - return mDdCreateSurface.ddRVal; - } - - mDdUpdateOverlay.lpDD = This->lpLcl->lpGbl; - mDdUpdateOverlay.UpdateOverlay = This->lpLcl->lpDDCB->HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->lpLcl->lpPrimary->lpLcl->lpSurfMore->slist[0]; - mDdUpdateOverlay.lpDDSrcSurface = mpOverlayLocals[0];//pDDSurface; - mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - - mDdUpdateOverlay.rDest.top = 0; - mDdUpdateOverlay.rDest.left = 0; - mDdUpdateOverlay.rDest.right = 50; - mDdUpdateOverlay.rDest.bottom = 50; - - mDdUpdateOverlay.rSrc.top = 0; - mDdUpdateOverlay.rSrc.left = 0; - mDdUpdateOverlay.rSrc.right = 50; - mDdUpdateOverlay.rSrc.bottom = 50; - - - - - if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("UpdateOverlay fail"); - return DDERR_NOTINITIALIZED; - } - - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - DX_STUB_str("mDdUpdateOverlay fail"); - //printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); - return mDdUpdateOverlay.ddRVal; - } - - DX_STUB_str("OK"); - return DD_OK; -} Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sat May 12 18:20:12 2007 @@ -1,3 +1,4 @@ + Removed: trunk/reactos/dll/directx/ddraw/iface_clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_cl… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_clipper.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_clipper.c (removed) @@ -1,105 +1,0 @@ -/* $Id: clipper.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/clipper.c - * PURPOSE: IDirectDrawClipper Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -ULONG WINAPI -DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawClipper_AddRef (LPDIRECTDRAWCLIPPER iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, - LPDIRECTDRAW lpDD, - DWORD dwFlags) -{ - /* FIXME not implment */ - DX_WINDBG_trace(); - DX_STUB_DD_OK; -} - -HRESULT WINAPI -DirectDrawClipper_SetHwnd( LPDIRECTDRAWCLIPPER iface, - DWORD dwFlags, - HWND hWnd) -{ - /* FIXME not implment */ - DX_WINDBG_trace(); - DX_STUB_DD_OK; -} - -HRESULT WINAPI -DirectDrawClipper_GetClipList( LPDIRECTDRAWCLIPPER iface, - LPRECT lpRect, - LPRGNDATA lpClipList, - LPDWORD lpdwSize) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_SetClipList( LPDIRECTDRAWCLIPPER iface, - LPRGNDATA lprgn, - DWORD dwFlag) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_QueryInterface( LPDIRECTDRAWCLIPPER iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_GetHWnd( LPDIRECTDRAWCLIPPER iface, - HWND* hWndPtr) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawClipper_IsClipListChanged( LPDIRECTDRAWCLIPPER iface, - BOOL* lpbChanged) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawClipperVtbl DirectDrawClipper_Vtable = -{ - DirectDrawClipper_QueryInterface, - DirectDrawClipper_AddRef, - DirectDrawClipper_Release, - DirectDrawClipper_GetClipList, - DirectDrawClipper_GetHWnd, - DirectDrawClipper_Initialize, - DirectDrawClipper_IsClipListChanged, - DirectDrawClipper_SetClipList, - DirectDrawClipper_SetHwnd -}; Removed: trunk/reactos/dll/directx/ddraw/iface_color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_co… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_color.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_color.c (removed) @@ -1,66 +1,0 @@ -/* $Id: color.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/color.c - * PURPOSE: IDirectDrawColorControl Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawColorControl_AddRef( LPDIRECTDRAWCOLORCONTROL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawColorControl_Release( LPDIRECTDRAWCOLORCONTROL iface) -{ - LPDDRAWI_DDCOLORCONTROL_INT This = (LPDDRAWI_DDCOLORCONTROL_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DirectDrawColorControl_QueryInterface( LPDIRECTDRAWCOLORCONTROL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_GetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawColorControl_SetColorControls( LPDIRECTDRAWCOLORCONTROL iface, - LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable = -{ - DirectDrawColorControl_QueryInterface, - DirectDrawColorControl_AddRef, - DirectDrawColorControl_Release, - DirectDrawColorControl_GetColorControls, - DirectDrawColorControl_SetColorControls -}; Removed: trunk/reactos/dll/directx/ddraw/iface_gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_ga… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_gamma.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_gamma.c (removed) @@ -1,68 +1,0 @@ -/* $Id: gamma.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/gamma.c - * PURPOSE: IDirectDrawGamma Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawGammaControl_AddRef( LPDIRECTDRAWGAMMACONTROL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawGammaControl_Release( LPDIRECTDRAWGAMMACONTROL iface) -{ - LPDDRAWI_DDGAMMACONTROL_INT This = (LPDDRAWI_DDGAMMACONTROL_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DirectDrawGammaControl_QueryInterface( LPDIRECTDRAWGAMMACONTROL iface, - REFIID riid, - LPVOID *ppObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawGammaControl_GetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, - DWORD dwFlags, - LPDDGAMMARAMP lpGammaRamp) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawGammaControl_SetGammaRamp( LPDIRECTDRAWGAMMACONTROL iface, - DWORD dwFlags, - LPDDGAMMARAMP lpGammaRamp) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable = -{ - DirectDrawGammaControl_QueryInterface, - DirectDrawGammaControl_AddRef, - DirectDrawGammaControl_Release, - DirectDrawGammaControl_GetGammaRamp, - DirectDrawGammaControl_SetGammaRamp -}; Removed: trunk/reactos/dll/directx/ddraw/iface_kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_ke… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_kernel.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_kernel.c (removed) @@ -1,131 +1,0 @@ -/* $Id: kernel.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/kernel.c - * PURPOSE: IDirectDrawKernel and IDirectDrawSurfaceKernel Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/***** IDirectDrawKernel ****/ - -ULONG WINAPI -DirectDrawKernel_AddRef ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawKernel_Release ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_QueryInterface ( LPDIRECTDRAWKERNEL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_GetKernelHandle ( LPDIRECTDRAWKERNEL iface, - ULONG* handle) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawKernel_ReleaseKernelHandle ( LPDIRECTDRAWKERNEL iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - - -ULONG WINAPI -DDSurfaceKernel_AddRef ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - - DX_WINDBG_trace(); - - if (iface!=NULL) - { - This->dwIntRefCnt++; - //This->lpLcl->dwLocalRefCnt++; - - //if (This->lpLcl->lpGbl != NULL) - //{ - // This->lpLcl->lpGbl->dwRefCnt++; - //} - } - return This->dwIntRefCnt; -} - -ULONG WINAPI -DDSurfaceKernel_Release ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - LPDDRAWI_DDKERNELSURFACE_INT This = (LPDDRAWI_DDKERNELSURFACE_INT)iface; - - DX_WINDBG_trace(); - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - -HRESULT WINAPI -DDSurfaceKernel_QueryInterface ( LPDIRECTDRAWSURFACEKERNEL iface, - REFIID riid, - LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DDSurfaceKernel_GetKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface, - ULONG* handle) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DDSurfaceKernel_ReleaseKernelHandle ( LPDIRECTDRAWSURFACEKERNEL iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - - -IDirectDrawKernelVtbl DirectDrawKernel_Vtable = -{ - DirectDrawKernel_QueryInterface, - DirectDrawKernel_AddRef, - DirectDrawKernel_Release, - DirectDrawKernel_GetKernelHandle, - DirectDrawKernel_ReleaseKernelHandle -}; - -IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable = -{ - DDSurfaceKernel_QueryInterface, - DDSurfaceKernel_AddRef, - DDSurfaceKernel_Release, - DDSurfaceKernel_GetKernelHandle, - DDSurfaceKernel_ReleaseKernelHandle -}; Removed: trunk/reactos/dll/directx/ddraw/iface_palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_pa… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_palette.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_palette.c (removed) @@ -1,85 +1,0 @@ -/* $Id: palette.c 24690 2006-11-05 21:19:53Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/palette.c - * PURPOSE: IDirectDrawPalette Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - -ULONG WINAPI -DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, - LPDIRECTDRAW ddraw, - DWORD dwFlags, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, - DWORD dwFlags, - DWORD dwStart, DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, - DWORD dwFlags, - DWORD dwStart, - DWORD dwCount, - LPPALETTEENTRY palent) -{ - DX_WINDBG_trace(); - DX_STUB; -} -HRESULT WINAPI -DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, - LPDWORD lpdwCaps) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -DirectDrawPalette_QueryInterface( LPDIRECTDRAWPALETTE iface, - REFIID refiid, - LPVOID *obj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = -{ - DirectDrawPalette_QueryInterface, - DirectDrawPalette_AddRef, - DirectDrawPalette_Release, - DirectDrawPalette_GetCaps, - DirectDrawPalette_GetEntries, - DirectDrawPalette_Initialize, - DirectDrawPalette_SetEntries -}; Removed: trunk/reactos/dll/directx/ddraw/iface_videoport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/iface_vi… ============================================================================== --- trunk/reactos/dll/directx/ddraw/iface_videoport.c (original) +++ trunk/reactos/dll/directx/ddraw/iface_videoport.c (removed) @@ -1,264 +1,0 @@ -/* $Id: videoport.c 22739 2006-07-01 12:08:35Z greatlrd $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS - * FILE: lib/ddraw/main/videoport.c - * PURPOSE: IDirectDrawVideoPort, DDVideoPortContainer and IDirectDrawVideoPortNotify Implementation - * PROGRAMMER: Maarten Bosma - * - */ - -#include "rosdraw.h" - - -/************* IDirectDrawVideoPort *************/ - -HRESULT WINAPI -Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_Flip (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetBandwidthInfo (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpddpfFormat, DWORD dwWidth, - DWORD dwHeight, DWORD dwFlags, LPDDVIDEOPORTBANDWIDTH lpBandwidth) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDrawVideoPort_GetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetInputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpNumFormats, - LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetOutputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpInputFormat, - LPDWORD lpNumFormats, LPDDPIXELFORMAT lpFormats, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetFieldPolarity (LPDIRECTDRAWVIDEOPORT iface, LPBOOL lpbFieldPolarity) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoLine (LPDIRECTDRAWVIDEOPORT This, LPDWORD lpdwLine) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoSignalStatus (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpdwStatus) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_SetTargetSurface (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, - DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StartVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_StopVideo (LPDIRECTDRAWVIDEOPORT iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_UpdateVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface, DWORD dwFlags, DWORD dwLine, - DWORD dwTimeout) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/************* IDDVideoPortContainer *************/ - -HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, - LPDIRECTDRAWVIDEOPORT* DDVideoPort, IUnknown* pUnkOuter) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_EnumVideoPorts (LPDDVIDEOPORTCONTAINER iface, - DWORD dwFlags, - LPDDVIDEOPORTCAPS pCaps, - LPVOID pContext, - LPDDENUMVIDEOCALLBACK pEnumVideoCallback) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_GetVideoPortConnectInfo (LPDDVIDEOPORTCONTAINER iface, - DWORD PortId, DWORD* pNumEntries, - LPDDVIDEOPORTCONNECT pConnectInfo) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONTAINER iface, - DWORD PortId, - LPDDVIDEOPORTSTATUS pStatus) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/************* IDirectDrawVideoPortNotify *************/ - -HRESULT WINAPI -Main_DDVideoPortNotify_QueryInterface (LPDIRECTDRAWVIDEOPORTNOTIFY iface, REFIID - riid, LPVOID* ppvObj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI -Main_DDVideoPortNotify_AddRef (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -ULONG WINAPI -Main_DDVideoPortNotify_Release (LPDIRECTDRAWVIDEOPORTNOTIFY iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortNotify_AcquireNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE* h, LPDDVIDEOPORTNOTIFY pVideoPortNotify) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DDVideoPortNotify_ReleaseNotification (LPDIRECTDRAWVIDEOPORTNOTIFY iface, HANDLE h) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable = -{ - Main_DirectDrawVideoPort_QueryInterface, - Main_DirectDrawVideoPort_AddRef, - Main_DirectDrawVideoPort_Release, - Main_DirectDrawVideoPort_Flip, - Main_DirectDrawVideoPort_GetBandwidthInfo, - Main_DirectDrawVideoPort_GetColorControls, - Main_DirectDrawVideoPort_GetInputFormats, - Main_DirectDrawVideoPort_GetOutputFormats, - Main_DirectDrawVideoPort_GetFieldPolarity, - Main_DirectDrawVideoPort_GetVideoLine, - Main_DirectDrawVideoPort_GetVideoSignalStatus, - Main_DirectDrawVideoPort_SetColorControls, - Main_DirectDrawVideoPort_SetTargetSurface, - Main_DirectDrawVideoPort_StartVideo, - Main_DirectDrawVideoPort_StopVideo, - Main_DirectDrawVideoPort_UpdateVideo, - Main_DirectDrawVideoPort_WaitForSync -}; - -IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable = -{ - Main_DDVideoPortContainer_QueryInterface, - Main_DDVideoPortContainer_AddRef, - Main_DDVideoPortContainer_Release, - Main_DDVideoPortContainer_CreateVideoPort, - Main_DDVideoPortContainer_EnumVideoPorts, - Main_DDVideoPortContainer_GetVideoPortConnectInfo, - Main_DDVideoPortContainer_QueryVideoPortStatus -}; - -IDirectDrawVideoPortNotifyVtbl DDVideoPortNotify_Vtable = -{ - Main_DDVideoPortNotify_QueryInterface, - Main_DDVideoPortNotify_AddRef, - Main_DDVideoPortNotify_Release, - Main_DDVideoPortNotify_AcquireNotification, - Main_DDVideoPortNotify_ReleaseNotification -};

1 0

[greatlrd] 26722: sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix.
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat May 12 17:58:27 2007 New Revision: 26722 URL: http://svn.reactos.org/svn/reactos?rev=26722&view=rev Log: sorry did use some private headers that are not commited yet, here is win32kdxtest comping fix. Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c trunk/rostests/dxtest/win32kdxtest/dump.c Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c Sat May 12 17:58:27 2007 @@ -6,6 +6,7 @@ #include <winddi.h> #include <d3dnthal.h> #include <dll/directx/d3d8thk.h> +#include <ddrawi.h> #include "test.h" /* Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdDeleteDirectDrawObject.c Sat May 12 17:58:27 2007 @@ -25,4 +25,5 @@ testing_eq(retValue,TRUE,fails,"NtGdiDdDeleteDirectDrawObject(NULL);\0"); show_status(fails, "NtGdiDdDeleteDirectDrawObject\0"); -} +} + Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c Sat May 12 17:58:27 2007 @@ -5,6 +5,8 @@ #include <winddi.h> #include <d3dnthal.h> #include <dll/directx/d3d8thk.h> + +#include <ddrawi.h> #include "test.h" /* Modified: trunk/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/dump.c (original) +++ trunk/rostests/dxtest/win32kdxtest/dump.c Sat May 12 17:58:27 2007 @@ -16,18 +16,18 @@ { \ printf("| "); \ } \ - dwflag = dwflag - dwvalue; \ + dwflag = (ULONG)dwflag - (ULONG)dwvalue; \ printf("%s ",text); \ count++; \ } #define endcheckflag(dwflag,text) \ if (count==0) \ - printf("0x%08lx\n",dwflag);\ + printf("0x%08lx\n", (ULONG) dwflag);\ else \ printf("\n");\ if (flag != 0) \ - printf("undoc value in %s flags value %04lx\n",text,dwflag); + printf("undoc value in %s flags value %08lx\n",text, (ULONG) dwflag); @@ -191,7 +191,7 @@ int t; UINT flag; INT count=0; - LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData; + // LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData; printf("DD_HALINFO Version NT 2000/XP/2003 found \n"); printf(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize); @@ -438,8 +438,9 @@ flag = pHalInfo->dwFlags; count = 0; - checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY"); - checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL"); + // FIXME missing DDHALINFO_ISPRIMARYDISPLAY and DDHALINFO_MODEXILLEGAL in currrent headers + // checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY"); + // checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL"); checkflag(flag,DDHALINFO_GETDRIVERINFOSET,"DDHALINFO_GETDRIVERINFOSET"); checkflag(flag,DDHALINFO_GETDRIVERINFO2,"DDHALINFO_GETDRIVERINFO2"); endcheckflag(flag,"pHalInfo->dwFlags"); @@ -456,7 +457,7 @@ } else { - printf("none pHalInfo from the driver\n",pHalInfo->dwSize); + printf("none pHalInfo from the driver 0x%08lx\n",pHalInfo->dwSize); } } }

1 0

[mbosma] 26721: Deactivate a check.
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sat May 12 17:17:01 2007 New Revision: 26721 URL: http://svn.reactos.org/svn/reactos?rev=26721&view=rev Log: Deactivate a check. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sat May 12 17:17:01 2007 @@ -333,13 +333,14 @@ HWND window; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - +#if 0 // this check is totally invalid if you ask me - mbosma /* Get the old window */ window = (HWND) This->lpLcl->hWnd; if(!window) { return DDERR_NOHWND; } +#endif /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW |

1 0

[ekohl] 26720: - Attach clock specific data to the window instead of storing them in global variables. - Stop the clock and show the system time when the user changes the system time. See issue #2241 for more details.
by ekohl＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: ekohl Date: Sat May 12 16:37:23 2007 New Revision: 26720 URL: http://svn.reactos.org/svn/reactos?rev=26720&view=rev Log: - Attach clock specific data to the window instead of storing them in global variables. - Stop the clock and show the system time when the user changes the system time. See issue #2241 for more details. Modified: trunk/reactos/dll/cpl/timedate/clock.c trunk/reactos/dll/cpl/timedate/dateandtime.c trunk/reactos/dll/cpl/timedate/timedate.h Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/clock.c (original) +++ trunk/reactos/dll/cpl/timedate/clock.c Sat May 12 16:37:23 2007 @@ -1,31 +1,42 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/clock.c + * FILE: dll/cpl/timedate/clock.c * PURPOSE: Draws the analog clock * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * Copyright 2007 Eric Kohl */ /* Code based on clock.c from Programming Windows, Charles Petzold */ #include <timedate.h> +typedef struct _CLOCKDATA +{ + HBRUSH hGreyBrush; + HPEN hGreyPen; + INT cxClient; + INT cyClient; + SYSTEMTIME stCurrent; + SYSTEMTIME stPrevious; + BOOL bTimer; +} CLOCKDATA, *PCLOCKDATA; + + #define TWOPI (2 * 3.14159) static const TCHAR szClockWndClass[] = TEXT("ClockWndClass"); -static HBRUSH hGreyBrush = NULL; -static HPEN hGreyPen = NULL; - -static VOID -SetIsotropic(HDC hdc, INT cxClient, INT cyClient) + +static VOID +SetIsotropic(HDC hdc, PCLOCKDATA pClockData) { /* set isotropic mode */ SetMapMode(hdc, MM_ISOTROPIC); /* position axis in centre of window */ - SetViewportOrgEx(hdc, cxClient / 2, cyClient / 2, NULL); -} + SetViewportOrgEx(hdc, pClockData->cxClient / 2, pClockData->cyClient / 2, NULL); +} + static VOID RotatePoint(POINT pt[], INT iNum, INT iAngle) @@ -45,20 +56,21 @@ } } -static VOID -DrawClock(HDC hdc) -{ - INT iAngle; + +static VOID +DrawClock(HDC hdc, PCLOCKDATA pClockData) +{ + INT iAngle; POINT pt[3]; HBRUSH hBrushOld; HPEN hPenOld = NULL; /* grey brush to fill the dots */ - hBrushOld = SelectObject(hdc, hGreyBrush); + hBrushOld = SelectObject(hdc, pClockData->hGreyBrush); hPenOld = GetCurrentObject(hdc, OBJ_PEN); - for(iAngle = 0; iAngle < 360; iAngle += 6) + for (iAngle = 0; iAngle < 360; iAngle += 6) { /* starting coords */ pt[0].x = 0; @@ -72,7 +84,7 @@ if (iAngle % 5) { pt[2].x = pt[2].y = 7; - SelectObject(hdc, hGreyPen); + SelectObject(hdc, pClockData->hGreyPen); } else { @@ -87,12 +99,12 @@ pt[1].y = pt[0].y + pt[2].y; Ellipse(hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); - } SelectObject(hdc, hBrushOld); SelectObject(hdc, hPenOld); } + static VOID DrawHands(HDC hdc, SYSTEMTIME * pst, BOOL fChange) @@ -108,12 +120,12 @@ SelectObject(hdc, GetStockObject(WHITE_BRUSH)); iAngle[0] = (pst->wHour * 30) % 360 + pst->wMinute / 2; - iAngle[1] = pst->wMinute * 6; - iAngle[2] = pst->wSecond * 6; + iAngle[1] = pst->wMinute * 6; + iAngle[2] = pst->wSecond * 6; CopyMemory(ptTemp, pt, sizeof(pt)); - for(i = fChange ? 0 : 2; i < 3; i++) + for (i = fChange ? 0 : 2; i < 3; i++) { RotatePoint(ptTemp[i], 5, iAngle[i]); @@ -128,62 +140,70 @@ WPARAM wParam, LPARAM lParam) { - - static INT cxClient, cyClient; - static SYSTEMTIME stPrevious; + PCLOCKDATA pClockData; HDC hdc; PAINTSTRUCT ps; - SYSTEMTIME st; + + pClockData = (PCLOCKDATA)GetWindowLongPtr(hwnd, GWLP_USERDATA); switch (uMsg) { case WM_CREATE: - { - hGreyPen = CreatePen(PS_SOLID, 1, RGB(128, 128, 128)); - hGreyBrush = CreateSolidBrush(RGB(128, 128, 128)); + pClockData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLOCKDATA)); + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pClockData); + + pClockData->hGreyPen = CreatePen(PS_SOLID, 1, RGB(128, 128, 128)); + pClockData->hGreyBrush = CreateSolidBrush(RGB(128, 128, 128)); + SetTimer(hwnd, ID_TIMER, 1000, NULL); - GetLocalTime(&st); - stPrevious = st; - } - break; + pClockData->bTimer = TRUE; + GetLocalTime(&pClockData->stCurrent); + pClockData->stPrevious = pClockData->stCurrent; + break; case WM_SIZE: - { - cxClient = LOWORD(lParam); - cyClient = HIWORD(lParam); - } - break; + pClockData->cxClient = LOWORD(lParam); + pClockData->cyClient = HIWORD(lParam); + break; case WM_TIMER: - { - GetLocalTime(&st); - + GetLocalTime(&pClockData->stCurrent); InvalidateRect(hwnd, NULL, TRUE); - - stPrevious = st; - } - break; + pClockData->stPrevious = pClockData->stCurrent; + break; case WM_PAINT: - { hdc = BeginPaint(hwnd, &ps); - - SetIsotropic(hdc, cxClient, cyClient); - - DrawClock(hdc); - DrawHands(hdc, &stPrevious, TRUE); - + SetIsotropic(hdc, pClockData); + DrawClock(hdc, pClockData); + DrawHands(hdc, &pClockData->stPrevious, TRUE); EndPaint(hwnd, &ps); - } - break; + break; case WM_DESTROY: - { - DeleteObject(hGreyPen); - DeleteObject(hGreyBrush); - KillTimer(hwnd, ID_TIMER); - } - break; + DeleteObject(pClockData->hGreyPen); + DeleteObject(pClockData->hGreyBrush); + + if (pClockData->bTimer) + KillTimer(hwnd, ID_TIMER); + + HeapFree(GetProcessHeap(), 0, pClockData); + break; + + case CLM_SETTIME: + /* Stop the timer if it is still running */ + if (pClockData->bTimer) + { + KillTimer(hwnd, ID_TIMER); + pClockData->bTimer = FALSE; + } + + /* Set the current time */ + CopyMemory(&pClockData->stPrevious, (LPSYSTEMTIME)lParam, sizeof(SYSTEMTIME)); + + /* Redraw the clock */ + InvalidateRect(hwnd, NULL, TRUE); + break; default: DefWindowProc(hwnd, Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandti… ============================================================================== --- trunk/reactos/dll/cpl/timedate/dateandtime.c (original) +++ trunk/reactos/dll/cpl/timedate/dateandtime.c Sat May 12 16:37:23 2007 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/dateandtime.c + * FILE: dll/cpl/timedate/dateandtime.c * PURPOSE: Date & Time property page - * COPYRIGHT: Copyright 2004-2005 Eric Kohl + * COPYRIGHT: Copyright 2004-2007 Eric Kohl * Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> * Copyright 2006 Thomas Weidenmueller <w3seek(a)reactos.com> * @@ -361,8 +361,14 @@ { case DTN_DATETIMECHANGE: { + /* Stop the timer */ + KillTimer(hwndDlg, ID_TIMER); + + /* Tell the clock to stop ticking */ + SendDlgItemMessage(hwndDlg, IDC_CLOCKWND, CLM_SETTIME, + 0, (LPARAM)&((LPNMDATETIMECHANGE)lpnm)->st); + /* Enable the 'Apply' button */ - KillTimer(hwndDlg, ID_TIMER); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; Modified: trunk/reactos/dll/cpl/timedate/timedate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.h (original) +++ trunk/reactos/dll/cpl/timedate/timedate.h Sat May 12 16:37:23 2007 @@ -52,6 +52,8 @@ /* clock.c */ +#define CLM_SETTIME (WM_USER + 1) + BOOL RegisterClockControl(VOID); VOID UnregisterClockControl(VOID);

1 0

[gedmurphy] 26719: - Add winhelp based on Wine. - Not fully complete and has some bugs. - go to help -> help on help for a preview
by gedmurphy＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: gedmurphy Date: Sat May 12 14:14:45 2007 New Revision: 26719 URL: http://svn.reactos.org/svn/reactos?rev=26719&view=rev Log: - Add winhelp based on Wine. - Not fully complete and has some bugs. - go to help -> help on help for a preview Added: trunk/reactos/base/applications/winhelp/ trunk/reactos/base/applications/winhelp/Bg.rc trunk/reactos/base/applications/winhelp/Cs.rc trunk/reactos/base/applications/winhelp/Da.rc trunk/reactos/base/applications/winhelp/De.rc trunk/reactos/base/applications/winhelp/En.rc trunk/reactos/base/applications/winhelp/Eo.rc trunk/reactos/base/applications/winhelp/Es.rc trunk/reactos/base/applications/winhelp/Fi.rc trunk/reactos/base/applications/winhelp/Fr.rc trunk/reactos/base/applications/winhelp/Hu.rc trunk/reactos/base/applications/winhelp/It.rc trunk/reactos/base/applications/winhelp/Ko.rc trunk/reactos/base/applications/winhelp/Nl.rc trunk/reactos/base/applications/winhelp/No.rc trunk/reactos/base/applications/winhelp/Pl.rc trunk/reactos/base/applications/winhelp/Pt.rc trunk/reactos/base/applications/winhelp/Ru.rc trunk/reactos/base/applications/winhelp/Si.rc trunk/reactos/base/applications/winhelp/Sk.rc trunk/reactos/base/applications/winhelp/Sw.rc trunk/reactos/base/applications/winhelp/Tr.rc trunk/reactos/base/applications/winhelp/Va.rc trunk/reactos/base/applications/winhelp/Wa.rc trunk/reactos/base/applications/winhelp/Zh.rc trunk/reactos/base/applications/winhelp/callback.c trunk/reactos/base/applications/winhelp/hlpfile.c trunk/reactos/base/applications/winhelp/hlpfile.h trunk/reactos/base/applications/winhelp/lex.yy.c trunk/reactos/base/applications/winhelp/macro.c trunk/reactos/base/applications/winhelp/macro.h trunk/reactos/base/applications/winhelp/macro.lex.l trunk/reactos/base/applications/winhelp/rsrc.rc trunk/reactos/base/applications/winhelp/string.c trunk/reactos/base/applications/winhelp/winhelp.c trunk/reactos/base/applications/winhelp/winhelp.h trunk/reactos/base/applications/winhelp/winhelp.rbuild trunk/reactos/base/applications/winhelp/winhelp_res.h Modified: trunk/reactos/base/applications/applications.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… Added: trunk/reactos/base/applications/winhelp/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Sw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Va.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/hlpfile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/macro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/macro.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/macro.lex.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/winhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/winhelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Added: trunk/reactos/base/applications/winhelp/winhelp_res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/…

1 0

[greatlrd] 26718: update dxhaltest with some new test, Thuse test are not 100% correct in all case. some error should be supress when it been run in vmware with windows or reactos
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat May 12 14:14:22 2007 New Revision: 26718 URL: http://svn.reactos.org/svn/reactos?rev=26718&view=rev Log: update dxhaltest with some new test, Thuse test are not 100% correct in all case. some error should be supress when it been run in vmware with windows or reactos Added: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c trunk/rostests/dxtest/win32kdxtest/dump.c trunk/rostests/dxtest/win32kdxtest/main.c trunk/rostests/dxtest/win32kdxtest/test.h trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild Added: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c (added) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c Sat May 12 14:14:22 2007 @@ -1,0 +1,44 @@ + +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include "test.h" + +/* + * Test see if we can delete a DirectDrawObject from win32k + * + */ +void +test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + DDHAL_CANCREATESURFACEDATA pCanCreateSurface; + DDSURFACEDESC2 desc; + + RtlZeroMemory(&pCanCreateSurface,sizeof(DDHAL_CANCREATESURFACEDATA)); + RtlZeroMemory(&desc,sizeof(DDSURFACEDESC2)); + + /* crash in windows 2000 */ + retValue = OsThunkDdCanCreateSurface(NULL,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdCanCreateSurface(NULL,NULL);\0"); + + retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdCanCreateSurface(hDirectDrawLocal,NULL);\0"); + + retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0"); + + pCanCreateSurface.lpDDSurfaceDesc = &desc; + desc.dwSize = sizeof(DDSURFACEDESC2); + + retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"4. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0"); + +} + + Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCreateDirectDrawObject.c Sat May 12 14:14:22 2007 @@ -19,6 +19,23 @@ int fails=0; HDC hdc=CreateDCW(L"Display",NULL,NULL,NULL); + if (hdc == NULL) + { + printf("No hdc was created with Display, trying now with DISPLAY\n"); + hdc=CreateDCW(L"DISPLAY",NULL,NULL,NULL); + if (hdc == NULL) + { + printf("No hdc was created with DISPLAY, trying now with NULL\n"); + hdc=CreateDCW(NULL,NULL,NULL,NULL); + } + } + + if (hdc == NULL) + { + printf("No hdc was created at all perpare all test will fail\n"); + return NULL; + } + printf("Start testing of NtGdiDdCreateDirectDrawObject\n"); retValue = OsThunkDdCreateDirectDrawObject(NULL); Added: trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c (added) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c Sat May 12 14:14:22 2007 @@ -1,0 +1,40 @@ +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include "test.h" + +/* + * Test see if we can delete a DirectDrawObject from win32k + * + */ +void +test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + DD_GETSCANLINEDATA puGetScanLineData; + + printf("Start testing of NtGdiDdGetScanLine\n"); + RtlZeroMemory(&puGetScanLineData,sizeof(DD_GETSCANLINEDATA)); + + retValue = OsThunkDdGetScanLine(NULL,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdGetScanLine(NULL,NULL);\0"); + + retValue = OsThunkDdGetScanLine(hDirectDrawLocal,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdGetScanLine(hDirectDrawLocal,NULL);\0"); + + puGetScanLineData.ddRVal = DDERR_GENERIC; + retValue = OsThunkDdGetScanLine(hDirectDrawLocal,&puGetScanLineData); + testing_eq(retValue,DDHAL_DRIVER_NOTHANDLED,fails,"3. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); + testing_noteq(puGetScanLineData.ddRVal,DD_OK,fails,"4. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); + testing_eq(puGetScanLineData.dwScanLine,0,fails,"4. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); + + + /* FIXME DDERR_VERTICALBLANKINPROGRESS test */ + + show_status(fails, "NtGdiDdGetScanLine\0"); +} Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdQueryDirectDrawObject.c Sat May 12 14:14:22 2007 @@ -9,10 +9,28 @@ extern BOOL dumping_on; +/* my struct */ +struct +{ + DWORD pos; +} *mytest; + /* * Test see if we can setup DirectDrawObject * */ + +/* + * ToDO + * 1. add more testcase it is only some, but we do not test for all case + * that happen only some + * + * 2.Fixed the false alaret for drivers only support 2d dx interface + * + * 3. fixed the dumping of d3d struct. + * + */ + void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal) { @@ -36,10 +54,10 @@ D3DNTHAL_GLOBALDRIVERDATA D3dDriverData; DD_D3DBUFCALLBACKS D3dBufferCallbacks; DDSURFACEDESC2 D3dTextureFormats[100]; - // DWORD NumHeaps = 0; + DWORD NumHeaps = 0; VIDEOMEMORY vmList; - // DWORD NumFourCC = 0; - //DWORD FourCC = 0; + DWORD NumFourCC = 0; + DWORD FourCC = 0; /* clear data */ memset(&vmList,0,sizeof(VIDEOMEMORY)); @@ -202,7 +220,7 @@ /* FIXME dump puD3dCallbacks */ } - /* testing OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, .... */ + /* testing OsThunkDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, */ printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, NULL, ....)\n"); pHalInfo = &HalInfo; @@ -247,5 +265,131 @@ /* FIXME dump puD3dDriverData */ } +/* testing OsThunkDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, NULL, */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS)); + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0"); + testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0"); + + testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dBufferCallbacks, NULL, ...);\0"); + + testing_noteq(puD3dTextureFormats,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0"); + testing_noteq(puNumFourCC,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"8. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("9. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL, ...);\n"); + fails++; + } + + if (puD3dBufferCallbacks) + { + testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"11. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, NULL...);\0"); + } + + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + /* FIXME dump puD3dCallbacks */ + /* FIXME dump puD3dDriverData */ + /* FIXME dump D3dBufferCallbacks */ + + } + +/* testing OsThunkDdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL, */ + printf("testing DdQueryDirectDrawObject( hDD, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, D3dBufferCallbacks, puD3dTextureFormats, NULL, ....)\n"); + + pHalInfo = &HalInfo; + pCallBackFlags = CallBackFlags; + puD3dCallbacks = &D3dCallbacks; + puD3dDriverData = &D3dDriverData; + puD3dBufferCallbacks = &D3dBufferCallbacks; + + RtlZeroMemory(pHalInfo,sizeof(DD_HALINFO)); + RtlZeroMemory(pCallBackFlags,sizeof(DWORD)*3); + RtlZeroMemory(puD3dCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + //RtlZeroMemory(puD3dDriverData,sizeof(D3DNTHAL_CALLBACKS)); + RtlZeroMemory(&D3dBufferCallbacks,sizeof(D3DNTHAL_CALLBACKS)); + + if (puD3dDriverData) + { + puD3dTextureFormats = malloc (puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + if (!puD3dTextureFormats) + printf("Waring Out of memory\n"); + + RtlZeroMemory(puD3dTextureFormats, puD3dDriverData->dwNumTextureFormats * sizeof(DDSURFACEDESC2)); + } + + retValue = OsThunkDdQueryDirectDrawObject( hDirectDrawLocal, pHalInfo, + pCallBackFlags, puD3dCallbacks, + puD3dDriverData, puD3dBufferCallbacks, + puD3dTextureFormats, puNumHeaps, + puvmList, puNumFourCC, + puFourCC); + + testing_noteq(retValue,FALSE,fails,"1. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + testing_eq(pHalInfo,NULL,fails,"2. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + testing_eq(pCallBackFlags,NULL,fails,"3. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + testing_noteq(puD3dCallbacks->dwSize,sizeof(D3DNTHAL_CALLBACKS),fails,"4. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + + testing_noteq(puD3dDriverData->dwSize,sizeof(D3DNTHAL_GLOBALDRIVERDATA),fails,"5. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + + testing_noteq(puNumFourCC,NULL,fails,"6. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + testing_noteq(puFourCC,NULL,fails,"7. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\0"); + if ((pHalInfo->dwSize != sizeof(DD_HALINFO)) && + (pHalInfo->dwSize != sizeof(DD_HALINFO_V4))) + { + printf("8. if this show for NT 2000/XP/2003 ignore it, NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL, ...);\n"); + fails++; + } + + if (puD3dBufferCallbacks) + { + testing_noteq(puD3dBufferCallbacks->dwSize,sizeof(DD_D3DBUFCALLBACKS),fails,"9. NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, NULL...);\0"); + } + + if (puD3dTextureFormats) + { + /* fixme test case for it */ + } + + if (dumping_on == TRUE) + { + dump_halinfo(pHalInfo,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + dump_CallBackFlags(pCallBackFlags,"NtGdiDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, NULL, ...)"); + /* FIXME dump puD3dCallbacks */ + /* FIXME dump puD3dDriverData */ + /* FIXME dump D3dBufferCallbacks */ + /* FIXME dump puD3dTextureFormats */ + } + + + + + + if (puD3dTextureFormats) + free (puD3dTextureFormats); show_status(fails, "NtGdiDdQueryDirectDrawObject\0"); } Added: trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c (added) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c Sat May 12 14:14:22 2007 @@ -1,0 +1,44 @@ +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include "test.h" + +/* + * Test see if we can delete a DirectDrawObject from win32k + * + */ +void +test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + DDHAL_WAITFORVERTICALBLANKDATA pDdWaitForVerticalBlankData; + + RtlZeroMemory(&pDdWaitForVerticalBlankData,sizeof(DDHAL_WAITFORVERTICALBLANKDATA)); + + retValue = OsThunkDdWaitForVerticalBlank(NULL,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdWaitForVerticalBlank(NULL,NULL);\0"); + + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + testing_eq(pDdWaitForVerticalBlankData.ddRVal, DD_OK,fails,"4. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + + RtlZeroMemory(&pDdWaitForVerticalBlankData,sizeof(DDHAL_WAITFORVERTICALBLANKDATA)); + pDdWaitForVerticalBlankData.dwFlags = DDWAITVB_I_TESTVB; + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); + + testing_eq(retValue, DDHAL_DRIVER_NOTHANDLED,fails,"5. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + testing_noteq(pDdWaitForVerticalBlankData.ddRVal, DD_OK,fails,"6. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); + + show_status(fails, "NtGdiDdWaitForVerticalBlank\0"); +} + Modified: trunk/rostests/dxtest/win32kdxtest/dump.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/dump.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/dump.c (original) +++ trunk/rostests/dxtest/win32kdxtest/dump.c Sat May 12 14:14:22 2007 @@ -9,113 +9,77 @@ #include "test.h" +#define checkflag(dwflag,dwvalue,text) \ + if (dwflag & dwvalue) \ + { \ + if (count!=0) \ + { \ + printf("| "); \ + } \ + dwflag = dwflag - dwvalue; \ + printf("%s ",text); \ + count++; \ + } + +#define endcheckflag(dwflag,text) \ + if (count==0) \ + printf("0x%08lx\n",dwflag);\ + else \ + printf("\n");\ + if (flag != 0) \ + printf("undoc value in %s flags value %04lx\n",text,dwflag); + + void dump_CallBackFlags(DWORD *pCallBackFlags, char *text) { - UINT flag=pCallBackFlags[0]; - INT count=0; + UINT flag; + INT count; printf("dumping the CallBackFlags from %s\n",text); printf("pCallBackFlags[0] : "); - if (flag & DDHAL_CB32_CANCREATESURFACE) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_CANCREATESURFACE; - printf("DDHAL_CB32_CANCREATESURFACE "); - count++; - } - if (flag & DDHAL_CB32_CREATEPALETTE) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_CREATEPALETTE; - printf("DDHAL_CB32_CREATEPALETTE "); - count++; - } - if (flag & DDHAL_CB32_CREATESURFACE) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_CREATESURFACE; - printf("DDHAL_CB32_CREATESURFACE "); - count++; - } - if (flag & DDHAL_CB32_GETSCANLINE) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_GETSCANLINE; - printf("DDHAL_CB32_GETSCANLINE "); - count++; - } - if (flag & DDHAL_CB32_MAPMEMORY) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_MAPMEMORY; - printf("DDHAL_CB32_MAPMEMORY "); - count++; - } - if (flag & DDHAL_CB32_SETCOLORKEY) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_SETCOLORKEY; - printf("DDHAL_CB32_SETCOLORKEY "); - count++; - } - if (flag & DDHAL_CB32_SETMODE) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_SETMODE; - printf("DDHAL_CB32_SETMODE "); - count++; - } - if (flag & DDHAL_CB32_WAITFORVERTICALBLANK) - { - if (count!=0) - { - printf("| "); - } - flag = flag - DDHAL_CB32_WAITFORVERTICALBLANK; - printf("DDHAL_CB32_WAITFORVERTICALBLANK "); - count++; - } - - if (count==0) - { - printf("0x%04lx\n",pCallBackFlags[0]); - } - else - { - printf("\n"); - } - - - if (flag != 0) - { - printf("undoc value in DD_CALLBACKS flags value %04lx\n",flag); - } - - printf("pCallBackFlags[1] : 0x%04lx\n",pCallBackFlags[1]); - printf("pCallBackFlags[2] : 0x%04lx\n",pCallBackFlags[2]); + + flag=pCallBackFlags[0]; + count=0; + checkflag(flag,DDHAL_CB32_CANCREATESURFACE,"DDHAL_CB32_CANCREATESURFACE"); + checkflag(flag,DDHAL_CB32_CREATEPALETTE,"DDHAL_CB32_CREATEPALETTE"); + checkflag(flag,DDHAL_CB32_CREATESURFACE,"DDHAL_CB32_CREATESURFACE"); + checkflag(flag,DDHAL_CB32_GETSCANLINE,"DDHAL_CB32_GETSCANLINE"); + checkflag(flag,DDHAL_CB32_MAPMEMORY,"DDHAL_CB32_MAPMEMORY"); + checkflag(flag,DDHAL_CB32_SETCOLORKEY,"DDHAL_CB32_SETCOLORKEY"); + checkflag(flag,DDHAL_CB32_SETMODE,"DDHAL_CB32_SETMODE"); + checkflag(flag,DDHAL_CB32_WAITFORVERTICALBLANK,"DDHAL_CB32_WAITFORVERTICALBLANK"); + endcheckflag(flag,"pCallBackFlags[0]"); + + /* SURFACE callback */ + printf("pCallBackFlags[1] : "); + flag = pCallBackFlags[1]; + count = 0; + checkflag(flag,DDHAL_SURFCB32_ADDATTACHEDSURFACE,"DDHAL_SURFCB32_ADDATTACHEDSURFACE"); + checkflag(flag,DDHAL_SURFCB32_BLT,"DDHAL_SURFCB32_BLT"); + checkflag(flag,DDHAL_SURFCB32_DESTROYSURFACE,"DDHAL_SURFCB32_DESTROYSURFACE"); + checkflag(flag,DDHAL_SURFCB32_FLIP,"DDHAL_SURFCB32_FLIP"); + checkflag(flag,DDHAL_SURFCB32_GETBLTSTATUS,"DDHAL_SURFCB32_GETBLTSTATUS"); + checkflag(flag,DDHAL_SURFCB32_GETFLIPSTATUS,"DDHAL_SURFCB32_GETFLIPSTATUS"); + checkflag(flag,DDHAL_SURFCB32_LOCK,"DDHAL_SURFCB32_LOCK"); + checkflag(flag,DDHAL_SURFCB32_RESERVED4,"DDHAL_SURFCB32_RESERVED4"); + checkflag(flag,DDHAL_SURFCB32_SETCLIPLIST,"DDHAL_SURFCB32_SETCLIPLIST"); + checkflag(flag,DDHAL_SURFCB32_SETCOLORKEY,"DDHAL_SURFCB32_SETCOLORKEY"); + checkflag(flag,DDHAL_SURFCB32_SETOVERLAYPOSITION,"DDHAL_SURFCB32_SETOVERLAYPOSITION"); + checkflag(flag,DDHAL_SURFCB32_SETPALETTE,"DDHAL_SURFCB32_SETPALETTE"); + checkflag(flag,DDHAL_SURFCB32_UNLOCK,"DDHAL_SURFCB32_UNLOCK"); + checkflag(flag,DDHAL_SURFCB32_UPDATEOVERLAY,"DDHAL_SURFCB32_UPDATEOVERLAY"); + endcheckflag(flag,"pCallBackFlags[1]"); + + + /* palleted */ + printf("pCallBackFlags[2] : "); + flag = pCallBackFlags[2]; + count = 0; + checkflag(flag,DDHAL_PALCB32_DESTROYPALETTE,"DDHAL_PALCB32_DESTROYPALETTE"); + checkflag(flag,DDHAL_PALCB32_SETENTRIES,"DDHAL_PALCB32_SETENTRIES"); + endcheckflag(flag,"pCallBackFlags[2]"); } void @@ -225,6 +189,9 @@ else if (pHalInfo->dwSize == sizeof(DD_HALINFO)) { int t; + UINT flag; + INT count=0; + LPD3DNTHAL_GLOBALDRIVERDATA lpD3DGlobalDriverData = pHalInfo->lpD3DGlobalDriverData; printf("DD_HALINFO Version NT 2000/XP/2003 found \n"); printf(" pHalInfo->dwSize : 0x%08lx\n",(long)pHalInfo->dwSize); @@ -253,10 +220,129 @@ printf(" pHalInfo->vmiData->pvPrimary : 0x%08lx\n",(long)pHalInfo->vmiData.pvPrimary); printf(" pHalInfo->ddCaps.dwSize : 0x%08lx\n",pHalInfo->ddCaps.dwSize); - printf(" pHalInfo->ddCaps.dwCaps : 0x%08lx\n",pHalInfo->ddCaps.dwCaps); - printf(" pHalInfo->ddCaps.dwCaps2 : 0x%08lx\n",pHalInfo->ddCaps.dwCaps2); - printf(" pHalInfo->ddCaps.dwCKeyCaps : 0x%08lx\n",pHalInfo->ddCaps.dwCKeyCaps); - printf(" pHalInfo->ddCaps.dwFXCaps : 0x%08lx\n",pHalInfo->ddCaps.dwFXCaps); + printf(" pHalInfo->ddCaps.dwCaps : "); + flag = pHalInfo->ddCaps.dwCaps; + count = 0; + checkflag(flag,DDCAPS_3D,"DDCAPS_3D"); + checkflag(flag,DDCAPS_ALIGNBOUNDARYDEST,"DDCAPS_ALIGNBOUNDARYDEST"); + checkflag(flag,DDCAPS_ALIGNBOUNDARYSRC,"DDCAPS_ALIGNBOUNDARYSRC"); + checkflag(flag,DDCAPS_ALIGNSIZEDEST,"DDCAPS_ALIGNSIZEDEST"); + checkflag(flag,DDCAPS_ALIGNSIZESRC,"DDCAPS_ALIGNSIZESRC"); + checkflag(flag,DDCAPS_ALIGNSTRIDE,"DDCAPS_ALIGNSTRIDE"); + checkflag(flag,DDCAPS_ALPHA,"DDCAPS_ALPHA"); + checkflag(flag,DDCAPS_BANKSWITCHED,"DDCAPS_BANKSWITCHED"); + checkflag(flag,DDCAPS_BLT,"DDCAPS_BLT"); + checkflag(flag,DDCAPS_BLTCOLORFILL,"DDCAPS_BLTCOLORFILL"); + checkflag(flag,DDCAPS_BLTDEPTHFILL,"DDCAPS_BLTDEPTHFILL"); + checkflag(flag,DDCAPS_BLTFOURCC,"DDCAPS_BLTFOURCC"); + checkflag(flag,DDCAPS_BLTQUEUE,"DDCAPS_BLTQUEUE"); + checkflag(flag,DDCAPS_BLTSTRETCH,"DDCAPS_BLTSTRETCH"); + checkflag(flag,DDCAPS_CANBLTSYSMEM,"DDCAPS_CANBLTSYSMEM"); + checkflag(flag,DDCAPS_CANCLIP,"DDCAPS_CANCLIP"); + checkflag(flag,DDCAPS_CANCLIPSTRETCHED,"DDCAPS_CANCLIPSTRETCHED"); + checkflag(flag,DDCAPS_COLORKEY,"DDCAPS_COLORKEY"); + checkflag(flag,DDCAPS_COLORKEYHWASSIST,"DDCAPS_COLORKEYHWASSIST"); + checkflag(flag,DDCAPS_GDI,"DDCAPS_GDI"); + checkflag(flag,DDCAPS_NOHARDWARE,"DDCAPS_NOHARDWARE"); + checkflag(flag,DDCAPS_OVERLAY,"DDCAPS_OVERLAY"); + checkflag(flag,DDCAPS_OVERLAYCANTCLIP,"DDCAPS_OVERLAYCANTCLIP"); + checkflag(flag,DDCAPS_OVERLAYFOURCC,"DDCAPS_OVERLAYFOURCC"); + checkflag(flag,DDCAPS_OVERLAYSTRETCH,"DDCAPS_OVERLAYSTRETCH"); + checkflag(flag,DDCAPS_PALETTE,"DDCAPS_PALETTE"); + checkflag(flag,DDCAPS_PALETTEVSYNC,"DDCAPS_PALETTEVSYNC"); + checkflag(flag,DDCAPS_READSCANLINE,"DDCAPS_READSCANLINE"); +/* FIXME */ +// checkflag(flag,DDCAPS_STEREOVIEW,"DDCAPS_STEREOVIEW"); + checkflag(flag,DDCAPS_VBI,"DDCAPS_VBI"); + checkflag(flag,DDCAPS_ZBLTS,"DDCAPS_ZBLTS"); + checkflag(flag,DDCAPS_ZOVERLAYS,"DDCAPS_ZOVERLAYS"); + endcheckflag(flag,"pHalInfo->ddCaps.dwCaps"); + + printf(" pHalInfo->ddCaps.dwCaps2 : "); + flag = pHalInfo->ddCaps.dwCaps2; + count = 0; + checkflag(flag,DDCAPS2_AUTOFLIPOVERLAY,"DDCAPS2_AUTOFLIPOVERLAY"); + checkflag(flag,DDCAPS2_CANAUTOGENMIPMAP,"DDCAPS2_CANAUTOGENMIPMAP"); + checkflag(flag,DDCAPS2_CANBOBHARDWARE,"DDCAPS2_CANBOBHARDWARE"); + checkflag(flag,DDCAPS2_CANBOBINTERLEAVED,"DDCAPS2_CANBOBINTERLEAVED"); + checkflag(flag,DDCAPS2_CANBOBNONINTERLEAVED,"DDCAPS2_CANBOBNONINTERLEAVED"); + checkflag(flag,DDCAPS2_CANCALIBRATEGAMMA,"DDCAPS2_CANCALIBRATEGAMMA"); + checkflag(flag,DDCAPS2_CANDROPZ16BIT,"DDCAPS2_CANDROPZ16BIT"); + checkflag(flag,DDCAPS2_CANFLIPODDEVEN,"DDCAPS2_CANFLIPODDEVEN"); + checkflag(flag,DDCAPS2_CANMANAGERESOURCE,"DDCAPS2_CANMANAGERESOURCE"); + checkflag(flag,DDCAPS2_CANMANAGETEXTURE,"DDCAPS2_CANMANAGETEXTURE"); +/* FIXME */ +// checkflag(flagDDCAPS2_CANRENDERWINDOWED,"DDCAPS2_CANRENDERWINDOWED"); + checkflag(flag,DDCAPS2_CERTIFIED,"DDCAPS2_CERTIFIED"); + checkflag(flag,DDCAPS2_COLORCONTROLOVERLAY,"DDCAPS2_COLORCONTROLOVERLAY"); + checkflag(flag,DDCAPS2_COLORCONTROLPRIMARY,"DDCAPS2_COLORCONTROLPRIMARY"); + checkflag(flag,DDCAPS2_COPYFOURCC,"DDCAPS2_COPYFOURCC"); + checkflag(flag,DDCAPS2_FLIPINTERVAL,"DDCAPS2_FLIPINTERVAL"); + checkflag(flag,DDCAPS2_FLIPNOVSYNC,"DDCAPS2_FLIPNOVSYNC"); + checkflag(flag,DDCAPS2_NO2DDURING3DSCENE,"DDCAPS2_NO2DDURING3DSCENE"); + checkflag(flag,DDCAPS2_NONLOCALVIDMEM,"DDCAPS2_NONLOCALVIDMEM"); + checkflag(flag,DDCAPS2_NONLOCALVIDMEMCAPS,"DDCAPS2_NONLOCALVIDMEMCAPS"); + checkflag(flag,DDCAPS2_NOPAGELOCKREQUIRED,"DDCAPS2_NOPAGELOCKREQUIRED"); + checkflag(flag,DDCAPS2_PRIMARYGAMMA,"DDCAPS2_PRIMARYGAMMA"); + checkflag(flag,DDCAPS2_VIDEOPORT,"DDCAPS2_VIDEOPORT"); + checkflag(flag,DDCAPS2_WIDESURFACES,"DDCAPS2_WIDESURFACES"); + endcheckflag(flag,"pHalInfo->ddCaps.dwCaps2"); + + printf(" pHalInfo->ddCaps.dwCKeyCaps : "); + flag = pHalInfo->ddCaps.dwCKeyCaps; + count = 0; + checkflag(flag,DDCKEYCAPS_DESTBLT,"DDCKEYCAPS_DESTBLT"); + checkflag(flag,DDCKEYCAPS_DESTBLTCLRSPACE,"DDCKEYCAPS_DESTBLTCLRSPACE"); + checkflag(flag,DDCKEYCAPS_DESTBLTCLRSPACEYUV,"DDCKEYCAPS_DESTBLTCLRSPACEYUV"); + checkflag(flag,DDCKEYCAPS_DESTBLTYUV,"DDCKEYCAPS_DESTBLTYUV"); + checkflag(flag,DDCKEYCAPS_DESTOVERLAY,"DDCKEYCAPS_DESTOVERLAY"); + checkflag(flag,DDCKEYCAPS_DESTOVERLAYCLRSPACE,"DDCKEYCAPS_DESTOVERLAYCLRSPACE"); + checkflag(flag,DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV,"DDCKEYCAPS_DESTOVERLAYCLRSPACEYUV"); + checkflag(flag,DDCKEYCAPS_DESTOVERLAYONEACTIVE,"DDCKEYCAPS_DESTOVERLAYONEACTIVE"); + checkflag(flag,DDCKEYCAPS_DESTOVERLAYYUV,"DDCKEYCAPS_DESTOVERLAYYUV"); + checkflag(flag,DDCKEYCAPS_NOCOSTOVERLAY,"DDCKEYCAPS_NOCOSTOVERLAY"); + checkflag(flag,DDCKEYCAPS_SRCBLT,"DDCKEYCAPS_SRCBLT"); + checkflag(flag,DDCKEYCAPS_SRCBLTCLRSPACE,"DDCKEYCAPS_SRCBLTCLRSPACE"); + checkflag(flag,DDCKEYCAPS_SRCBLTCLRSPACEYUV,"DDCKEYCAPS_SRCBLTCLRSPACEYUV"); + checkflag(flag,DDCKEYCAPS_SRCBLTYUV,"DDCKEYCAPS_SRCBLTYUV"); + checkflag(flag,DDCKEYCAPS_SRCOVERLAY,"DDCKEYCAPS_SRCOVERLAY"); + checkflag(flag,DDCKEYCAPS_SRCOVERLAYCLRSPACE,"DDCKEYCAPS_SRCOVERLAYCLRSPACE"); + checkflag(flag,DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV,"DDCKEYCAPS_SRCOVERLAYCLRSPACEYUV"); + checkflag(flag,DDCKEYCAPS_SRCOVERLAYONEACTIVE,"DDCKEYCAPS_SRCOVERLAYONEACTIVE"); + checkflag(flag,DDCKEYCAPS_SRCOVERLAYYUV,"DDCKEYCAPS_SRCOVERLAYYUV"); + endcheckflag(flag,"pHalInfo->ddCaps.dwCKeyCaps"); + + printf(" pHalInfo->ddCaps.dwFXCaps : "); + flag = pHalInfo->ddCaps.dwFXCaps; + count = 0; + checkflag(flag,DDFXCAPS_BLTARITHSTRETCHY,"DDFXCAPS_BLTARITHSTRETCHY"); + checkflag(flag,DDFXCAPS_BLTARITHSTRETCHYN,"DDFXCAPS_BLTARITHSTRETCHYN"); + checkflag(flag,DDFXCAPS_BLTMIRRORLEFTRIGHT,"DDFXCAPS_BLTMIRRORLEFTRIGHT"); + checkflag(flag,DDFXCAPS_BLTMIRRORUPDOWN,"DDFXCAPS_BLTMIRRORUPDOWN"); + checkflag(flag,DDFXCAPS_BLTROTATION,"DDFXCAPS_BLTROTATION"); + checkflag(flag,DDFXCAPS_BLTROTATION90,"DDFXCAPS_BLTROTATION90"); + checkflag(flag,DDFXCAPS_BLTSHRINKX,"DDFXCAPS_BLTSHRINKX"); + checkflag(flag,DDFXCAPS_BLTSHRINKXN,"DDFXCAPS_BLTSHRINKXN"); + checkflag(flag,DDFXCAPS_BLTSHRINKY,"DDFXCAPS_BLTSHRINKY"); + checkflag(flag,DDFXCAPS_BLTSHRINKYN,"DDFXCAPS_BLTSHRINKYN"); + checkflag(flag,DDFXCAPS_BLTSTRETCHX,"DDFXCAPS_BLTSTRETCHX"); + checkflag(flag,DDFXCAPS_BLTSTRETCHXN,"DDFXCAPS_BLTSTRETCHXN"); + checkflag(flag,DDFXCAPS_BLTSTRETCHY,"DDFXCAPS_BLTSTRETCHY"); + checkflag(flag,DDFXCAPS_BLTSTRETCHYN,"DDFXCAPS_BLTSTRETCHYN"); + checkflag(flag,DDFXCAPS_OVERLAYARITHSTRETCHY,"DDFXCAPS_OVERLAYARITHSTRETCHY"); + checkflag(flag,DDFXCAPS_OVERLAYARITHSTRETCHYN,"DDFXCAPS_OVERLAYARITHSTRETCHYN"); + checkflag(flag,DDFXCAPS_OVERLAYMIRRORLEFTRIGHT,"DDFXCAPS_OVERLAYMIRRORLEFTRIGHT"); + checkflag(flag,DDFXCAPS_OVERLAYMIRRORUPDOWN,"DDFXCAPS_OVERLAYMIRRORUPDOWN"); + checkflag(flag,DDFXCAPS_OVERLAYSHRINKX,"DDFXCAPS_OVERLAYSHRINKX"); + checkflag(flag,DDFXCAPS_OVERLAYSHRINKXN,"DDFXCAPS_OVERLAYSHRINKXN"); + checkflag(flag,DDFXCAPS_OVERLAYSHRINKY,"DDFXCAPS_OVERLAYSHRINKY"); + checkflag(flag,DDFXCAPS_OVERLAYSHRINKYN,"DDFXCAPS_OVERLAYSHRINKYN"); + checkflag(flag,DDFXCAPS_OVERLAYSTRETCHX,"DDFXCAPS_OVERLAYSTRETCHX"); + checkflag(flag,DDFXCAPS_OVERLAYSTRETCHX,"DDFXCAPS_OVERLAYSTRETCHX"); + checkflag(flag,DDFXCAPS_OVERLAYSTRETCHY,"DDFXCAPS_OVERLAYSTRETCHY"); + checkflag(flag,DDFXCAPS_OVERLAYSTRETCHYN,"DDFXCAPS_OVERLAYSTRETCHYN"); + endcheckflag(flag,"pHalInfo->ddCaps.dwFXCaps"); + printf(" pHalInfo->ddCaps.dwFXAlphaCaps : 0x%08lx\n",pHalInfo->ddCaps.dwFXAlphaCaps); printf(" pHalInfo->ddCaps.dwPalCaps : 0x%08lx\n",pHalInfo->ddCaps.dwPalCaps); printf(" pHalInfo->ddCaps.dwSVCaps : 0x%08lx\n",pHalInfo->ddCaps.dwSVCaps); @@ -281,7 +367,41 @@ { printf(" pHalInfo->ddCaps.dwRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwRops[t]); } - printf(" pHalInfo->ddCaps.ddsCaps.dwCaps : 0x%08lx\n",pHalInfo->ddCaps.ddsCaps.dwCaps); + printf(" pHalInfo->ddCaps.ddsCaps.dwCaps : "); + flag = pHalInfo->ddCaps.ddsCaps.dwCaps; + count = 0; + checkflag(flag,DDSCAPS_3DDEVICE,"DDSCAPS_3DDEVICE"); + checkflag(flag,DDSCAPS_ALLOCONLOAD,"DDSCAPS_ALLOCONLOAD"); + checkflag(flag,DDSCAPS_ALPHA,"DDSCAPS_ALPHA"); + checkflag(flag,DDSCAPS_BACKBUFFER,"DDSCAPS_BACKBUFFER"); + checkflag(flag,DDSCAPS_COMPLEX,"DDSCAPS_COMPLEX"); + checkflag(flag,DDSCAPS_EXECUTEBUFFER,"DDSCAPS_EXECUTEBUFFER"); + checkflag(flag,DDSCAPS_FLIP,"DDSCAPS_FLIP"); + checkflag(flag,DDSCAPS_FRONTBUFFER,"DDSCAPS_FRONTBUFFER"); + checkflag(flag,DDSCAPS_HWCODEC,"DDSCAPS_HWCODEC"); + checkflag(flag,DDSCAPS_LIVEVIDEO,"DDSCAPS_LIVEVIDEO"); + checkflag(flag,DDSCAPS_LOCALVIDMEM,"DDSCAPS_LOCALVIDMEM"); + checkflag(flag,DDSCAPS_MIPMAP,"DDSCAPS_MIPMAP"); + checkflag(flag,DDSCAPS_MODEX,"DDSCAPS_MODEX"); + checkflag(flag,DDSCAPS_NONLOCALVIDMEM,"DDSCAPS_NONLOCALVIDMEM"); + checkflag(flag,DDSCAPS_OFFSCREENPLAIN,"DDSCAPS_OFFSCREENPLAIN"); + checkflag(flag,DDSCAPS_OVERLAY,"DDSCAPS_OVERLAY"); + checkflag(flag,DDSCAPS_OPTIMIZED,"DDSCAPS_OPTIMIZED"); + checkflag(flag,DDSCAPS_OWNDC,"DDSCAPS_OWNDC"); + checkflag(flag,DDSCAPS_PALETTE,"DDSCAPS_PALETTE"); + checkflag(flag,DDSCAPS_PRIMARYSURFACE,"DDSCAPS_PRIMARYSURFACE"); + checkflag(flag,DDSCAPS_PRIMARYSURFACELEFT,"DDSCAPS_PRIMARYSURFACELEFT"); + checkflag(flag,DDSCAPS_STANDARDVGAMODE,"DDSCAPS_STANDARDVGAMODE"); + checkflag(flag,DDSCAPS_SYSTEMMEMORY,"DDSCAPS_SYSTEMMEMORY"); + checkflag(flag,DDSCAPS_TEXTURE,"DDSCAPS_TEXTURE"); + checkflag(flag,DDSCAPS_VIDEOMEMORY,"DDSCAPS_VIDEOMEMORY"); + checkflag(flag,DDSCAPS_VIDEOPORT,"DDSCAPS_VIDEOPORT"); + checkflag(flag,DDSCAPS_VISIBLE,"DDSCAPS_VISIBLE"); + checkflag(flag,DDSCAPS_WRITEONLY,"DDSCAPS_WRITEONLY"); + checkflag(flag,DDSCAPS_ZBUFFER,"DDSCAPS_ZBUFFER"); + endcheckflag(flag,"pHalInfo->ddCaps.ddsCaps.dwCaps"); + + printf(" pHalInfo->ddCaps.dwMinOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinOverlayStretch); printf(" pHalInfo->ddCaps.dwMaxOverlayStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMaxOverlayStretch); printf(" pHalInfo->ddCaps.dwMinLiveVideoStretch : 0x%08lx\n",pHalInfo->ddCaps.dwMinLiveVideoStretch); @@ -313,10 +433,16 @@ printf(" pHalInfo->ddCaps.dwSSBRops[0x%04x] : 0x%08lx\n",t,pHalInfo->ddCaps.dwSSBRops[t]); } - - printf(" pHalInfo->GetDriverInfo : 0x%08lx\n",(long)pHalInfo->GetDriverInfo); - printf(" pHalInfo->dwFlags : 0x%08lx\n",(long)pHalInfo->dwFlags); + printf(" pHalInfo->dwFlags : "); + + flag = pHalInfo->dwFlags; + count = 0; + checkflag(flag,DDHALINFO_ISPRIMARYDISPLAY,"DDHALINFO_ISPRIMARYDISPLAY"); + checkflag(flag,DDHALINFO_MODEXILLEGAL,"DDHALINFO_MODEXILLEGAL"); + checkflag(flag,DDHALINFO_GETDRIVERINFOSET,"DDHALINFO_GETDRIVERINFOSET"); + checkflag(flag,DDHALINFO_GETDRIVERINFO2,"DDHALINFO_GETDRIVERINFO2"); + endcheckflag(flag,"pHalInfo->dwFlags"); printf(" pHalInfo->lpD3DGlobalDriverData : 0x%08lx\n",(long)pHalInfo->lpD3DGlobalDriverData); printf(" pHalInfo->lpD3DHALCallbacks : 0x%08lx\n",(long)pHalInfo->lpD3DHALCallbacks); @@ -335,3 +461,5 @@ } } + + Modified: trunk/rostests/dxtest/win32kdxtest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/main.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/main.c (original) +++ trunk/rostests/dxtest/win32kdxtest/main.c Sat May 12 14:14:22 2007 @@ -38,6 +38,12 @@ test_NtGdiDdQueryDirectDrawObject(hDirectDrawLocal); + test_NtGdiDdGetScanLine(hDirectDrawLocal); + + test_NtGdiDdWaitForVerticalBlank(hDirectDrawLocal); + + test_NtGdiDdCanCreateSurface(hDirectDrawLocal); + test_NtGdiDdDeleteDirectDrawObject(hDirectDrawLocal); return 0; } Modified: trunk/rostests/dxtest/win32kdxtest/test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/test.… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/test.h (original) +++ trunk/rostests/dxtest/win32kdxtest/test.h Sat May 12 14:14:22 2007 @@ -3,14 +3,13 @@ HANDLE test_NtGdiDdCreateDirectDrawObject(); void test_NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal); void test_NtGdiDdQueryDirectDrawObject( HANDLE hDirectDrawLocal); +void test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal); +void test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal); +void test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal); + void dump_halinfo(DD_HALINFO *pHalInfo, char *text); void dump_CallBackFlags(DWORD *pCallBackFlags, char *text); - - - - - Modified: trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/win32… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild (original) +++ trunk/rostests/dxtest/win32kdxtest/win32kdxtest.rbuild Sat May 12 14:14:22 2007 @@ -12,5 +12,8 @@ <file>NtGdiDdCreateDirectDrawObject.c</file> <file>NtGdiDdDeleteDirectDrawObject.c</file> <file>NtGdiDdQueryDirectDrawObject.c</file> + <file>NtGdiDdGetScanLine.c</file> + <file>NtGdiDdWaitForVerticalBlank.c</file> + <file>NtGdiDdCanCreateSurface.c</file> <file>dump.c</file> </module>

1 0

[fireball] 26717: Undo last change, since it's an index in an array of TCHARs, so "1" is correct.
by fireball＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: fireball Date: Sat May 12 12:44:49 2007 New Revision: 26717 URL: http://svn.reactos.org/svn/reactos?rev=26717&view=rev Log: Undo last change, since it's an index in an array of TCHARs, so "1" is correct. Modified: trunk/reactos/base/applications/regedit/security.c Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c (original) +++ trunk/reactos/base/applications/regedit/security.c Sat May 12 12:44:49 2007 @@ -763,7 +763,7 @@ obj = (PCRegKeySecurity)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(CRegKeySecurity, - szRegKey[_tcslen(lpRegKey) + sizeof(TCHAR)])); + szRegKey[_tcslen(lpRegKey) + 1])); if (obj != NULL) { obj->ref = 1;

1 0

[ion] 26716: - Rename CmiInitNonVolatileRegistryHive to CmiInitHiveFromFile. - Remove CmiCreateNewRegFile and the way new hives were created, saved, then re-reloded. Instead initialize a new hive only once. - Add support for calling either HINIT_FILE or HINIT_CREATE with a hive, and support log file hives now. - Make hacks/oldcm differences smoother, and copy routine to cmsysini.c, since it's now compatible with the rewrite. This is probably the last function that was easily convertible/modifiab
by ion＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: ion Date: Sat May 12 12:27:28 2007 New Revision: 26716 URL: http://svn.reactos.org/svn/reactos?rev=26716&view=rev Log: - Rename CmiInitNonVolatileRegistryHive to CmiInitHiveFromFile. - Remove CmiCreateNewRegFile and the way new hives were created, saved, then re-reloded. Instead initialize a new hive only once. - Add support for calling either HINIT_FILE or HINIT_CREATE with a hive, and support log file hives now. - Make hacks/oldcm differences smoother, and copy routine to cmsysini.c, since it's now compatible with the rewrite. This is probably the last function that was easily convertible/modifiable. Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=26716… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Sat May 12 12:27:28 2007 @@ -445,6 +445,14 @@ IN BOOLEAN NoBuffering, OUT PULONG ClusterSize OPTIONAL); +NTSTATUS +NTAPI +CmpInitHiveFromFile(IN PUNICODE_STRING HiveName, + IN ULONG HiveFlags, + OUT PEREGISTRY_HIVE *Hive, + IN OUT PBOOLEAN New, + IN ULONG CheckFlags); + #if 0 static __inline PVOID xHvGetCell(char *file, int line, PHHIVE Hive, HCELL_INDEX Cell) { Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat May 12 12:27:28 2007 @@ -24,153 +24,44 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS -NTAPI -CmpInitializeHive(OUT PEREGISTRY_HIVE *RegistryHive, - IN ULONG OperationType, - IN ULONG HiveFlags, - IN ULONG FileType, - IN PVOID HiveData OPTIONAL, - IN HANDLE Primary, - IN HANDLE Log, - IN HANDLE External, - IN PUNICODE_STRING FileName OPTIONAL, - IN ULONG CheckFlags); - -static NTSTATUS -CmiCreateNewRegFile(HANDLE FileHandle) -{ - PEREGISTRY_HIVE CmHive; - PHHIVE Hive; - NTSTATUS Status; - - CmHive = CmpAllocate(sizeof(EREGISTRY_HIVE), TRUE); - CmHive->HiveHandle = FileHandle; - Status = HvInitialize(&CmHive->Hive, HV_OPERATION_CREATE_HIVE, 0, 0, 0, 0, - CmpAllocate, CmpFree, - CmpFileRead, CmpFileWrite, CmpFileSetSize, - CmpFileFlush, NULL); - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - /* Init root key cell */ - Hive = &CmHive->Hive; - if (!CmCreateRootNode(Hive, L"")) - { - HvFree (Hive); - return FALSE; - } - - Status = HvWriteHive(Hive) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - - HvFree (Hive); - - return(Status); -} - -static NTSTATUS -CmiInitNonVolatileRegistryHive (IN ULONG HiveFlags, - IN PUNICODE_STRING HiveName, - OUT PEREGISTRY_HIVE *Hive) -{ - ULONG CreateDisposition, LogDisposition; - HANDLE FileHandle, LogHandle; +CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, + IN PUNICODE_STRING FileName, + IN ULONG Flags) +{ + PEREGISTRY_HIVE Hive; NTSTATUS Status; - //ULONG Operation; - PEREGISTRY_HIVE NewHive; - - *Hive = NULL; - - Status = CmpOpenHiveFiles(HiveName, - NULL, //L".LOG", - &FileHandle, - &LogHandle, - &CreateDisposition, - &LogDisposition, - TRUE, - FALSE, - TRUE, - NULL); - if (CreateDisposition == FILE_CREATED) - { - Status = CmiCreateNewRegFile(FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); - ZwClose(FileHandle); - return(Status); - } - } - - Status = CmpInitializeHive(&NewHive, - HINIT_FILE, - HiveFlags, - HFILE_TYPE_PRIMARY, - NULL, - FileHandle, - NULL, - NULL, - HiveName, - 0); + BOOLEAN Allocate = TRUE; + + DPRINT ("CmiLoadHive(Filename %wZ)\n", FileName); + + if (Flags & ~REG_NO_LAZY_FLUSH) return STATUS_INVALID_PARAMETER; + + Status = CmpInitHiveFromFile(FileName, + (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, + &Hive, + &Allocate, + 0); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open hive\n"); - ZwClose(FileHandle); + DPRINT1("CmpInitHiveFromFile() failed (Status %lx)\n", Status); + ExFreePool(Hive); return Status; } - CmPrepareHive(&NewHive->Hive); - NewHive->Flags = HiveFlags; - - RtlCreateUnicodeString(&NewHive->HiveFileName, HiveName->Buffer); - - /* Close the hive file */ - ZwClose(FileHandle); - - *Hive = NewHive; + Status = CmiConnectHive(KeyObjectAttributes, Hive); + if (!NT_SUCCESS(Status)) + { + DPRINT1 ("CmiConnectHive() failed (Status %lx)\n", Status); + // CmiRemoveRegistryHive (Hive); + } + + DPRINT ("CmiLoadHive() done\n"); return Status; } -NTSTATUS -CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN PUNICODE_STRING FileName, - IN ULONG Flags) -{ - PEREGISTRY_HIVE Hive; - NTSTATUS Status; - - DPRINT ("CmiLoadHive(Filename %wZ)\n", FileName); - - if (Flags & ~REG_NO_LAZY_FLUSH) - return STATUS_INVALID_PARAMETER; - - Status = CmiInitNonVolatileRegistryHive ((Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, - FileName, - &Hive); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("CmiInitNonVolatileRegistryHive() failed (Status %lx)\n", Status); - ExFreePool (Hive); - return Status; - } - - Status = CmiConnectHive (KeyObjectAttributes, - Hive); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("CmiConnectHive() failed (Status %lx)\n", Status); -// CmiRemoveRegistryHive (Hive); - } - - DPRINT ("CmiLoadHive() done\n"); - - return Status; -} - - -NTSTATUS -CmiRemoveRegistryHive(PEREGISTRY_HIVE RegistryHive) + +NTSTATUS +CmiRemoveRegistaryHive(PEREGISTRY_HIVE RegistryHive) { /* Remove hive from hive list */ RemoveEntryList (&RegistryHive->HiveList); Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sat May 12 12:27:28 2007 @@ -846,6 +846,21 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor ); +NTSTATUS +NTAPI +CmpOpenHiveFiles( + IN PUNICODE_STRING BaseName, + IN PWCHAR Extension OPTIONAL, + IN PHANDLE Primary, + IN PHANDLE Log, + IN PULONG PrimaryDisposition, + IN PULONG LogDisposition, + IN BOOLEAN CreateAllowed, + IN BOOLEAN MarkAsSystemHive, + IN BOOLEAN NoBuffering, + OUT PULONG ClusterSize OPTIONAL +); + // // Registry Utility Functions // Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Sat May 12 12:27:28 2007 @@ -169,6 +169,7 @@ /* Set flags */ Hive->Flags = HiveFlags; Hive->HiveHandle = Primary; + Hive->LogHandle = Log; /* Check how large the file is */ ZwQueryInformationFile(Primary, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat May 12 12:27:28 2007 @@ -16,8 +16,127 @@ KGUARDED_MUTEX CmpSelfHealQueueLock; LIST_ENTRY CmpSelfHealQueueListHead; PEPROCESS CmpSystemProcess; +BOOLEAN HvShutdownComplete; /* FUNCTIONS *****************************************************************/ + +NTSTATUS +NTAPI +CmpInitHiveFromFile(IN PUNICODE_STRING HiveName, + IN ULONG HiveFlags, + OUT PCMHIVE *Hive, + IN OUT PBOOLEAN New, + IN ULONG CheckFlags) +{ + ULONG HiveDisposition, LogDisposition; + HANDLE FileHandle = NULL, LogHandle = NULL; + NTSTATUS Status; + ULONG Operation, FileType; + PEREGISTRY_HIVE NewHive; + PAGED_CODE(); + + /* Assume failure */ + *Hive = NULL; + + /* Open or create the hive files */ + Status = CmpOpenHiveFiles(HiveName, + L".LOG", + &FileHandle, + &LogHandle, + &HiveDisposition, + &LogDisposition, + *New, + FALSE, + TRUE, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if we have a log handle */ + FileType = (LogHandle) ? HFILE_TYPE_LOG : HFILE_TYPE_PRIMARY; + + /* Check if we created or opened the hive */ + if (HiveDisposition == FILE_CREATED) + { + /* Do a create operation */ + Operation = HINIT_CREATE; + *New = TRUE; + } + else + { + /* Open it as a file */ + Operation = HINIT_FILE; + *New = FALSE; + } + + /* Check if we're sharing hives */ + if (CmpShareSystemHives) + { + /* Then force using the primary hive */ + FileType = HFILE_TYPE_PRIMARY; + if (LogHandle) + { + /* Get rid of the log handle */ + ZwClose(LogHandle); + LogHandle = NULL; + } + } + + /* Check if we're too late */ + if (HvShutdownComplete) + { + /* Fail */ + ZwClose(FileHandle); + if (LogHandle) ZwClose(LogHandle); + return STATUS_TOO_LATE; + } + + /* Initialize the hive */ + Status = CmpInitializeHive((PCMHIVE*)&NewHive, + Operation, + HiveFlags, + FileType, + NULL, + FileHandle, + LogHandle, + NULL, + HiveName, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ZwClose(FileHandle); + if (LogHandle) ZwClose(LogHandle); + return Status; + } + + /* Success, return hive */ + *Hive = (PCMHIVE)NewHive; + + /* ROS: Init root key cell and prepare the hive */ + if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive, L""); + CmPrepareHive(&NewHive->Hive); + + /* Duplicate the hive name */ + NewHive->HiveFileName.Buffer = ExAllocatePoolWithTag(PagedPool, + HiveName->Length, + TAG_CM); + if (NewHive->HiveFileName.Buffer) + { + /* Copy the string */ + RtlCopyMemory(NewHive->HiveFileName.Buffer, + HiveName->Buffer, + HiveName->Length); + NewHive->HiveFileName.Length = HiveName->Length; + NewHive->HiveFileName.MaximumLength = HiveName->MaximumLength; + } + + /* ROS: Close the hive files */ + ZwClose(FileHandle); + if (LogHandle) ZwClose(LogHandle); + + /* Return success */ + return STATUS_SUCCESS; +} NTSTATUS NTAPI

1 0

[greatlrd] 26715: did see a small mistake use sizeof(TCHAR) for adding NULL termeting of string for u do not known if we switch compile regedit as unicode-16 or ANSI.
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat May 12 12:27:00 2007 New Revision: 26715 URL: http://svn.reactos.org/svn/reactos?rev=26715&view=rev Log: did see a small mistake use sizeof(TCHAR) for adding NULL termeting of string for u do not known if we switch compile regedit as unicode-16 or ANSI. Modified: trunk/reactos/base/applications/regedit/security.c Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c (original) +++ trunk/reactos/base/applications/regedit/security.c Sat May 12 12:27:00 2007 @@ -763,7 +763,7 @@ obj = (PCRegKeySecurity)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(CRegKeySecurity, - szRegKey[_tcslen(lpRegKey)+1])); + szRegKey[_tcslen(lpRegKey) + sizeof(TCHAR)])); if (obj != NULL) { obj->ref = 1;

1 0

[ion] 26714: - Change CmiInitNonVolatileRegistry hive to use CmpOpenHiveFiles and CmpInitializeHive. Required a lot of hacking to get to work right, but at least it does, and uses our new code paths. - Update CmpInitializeHive with the HINIT_FILE hack required for current cmlib functionality.
by ion＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: ion Date: Sat May 12 10:47:39 2007 New Revision: 26714 URL: http://svn.reactos.org/svn/reactos?rev=26714&view=rev Log: - Change CmiInitNonVolatileRegistry hive to use CmpOpenHiveFiles and CmpInitializeHive. Required a lot of hacking to get to work right, but at least it does, and uses our new code paths. - Update CmpInitializeHive with the HINIT_FILE hack required for current cmlib functionality. Modified: trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat May 12 10:47:39 2007 @@ -23,6 +23,19 @@ /* FUNCTIONS ****************************************************************/ +NTSTATUS +NTAPI +CmpInitializeHive(OUT PEREGISTRY_HIVE *RegistryHive, + IN ULONG OperationType, + IN ULONG HiveFlags, + IN ULONG FileType, + IN PVOID HiveData OPTIONAL, + IN HANDLE Primary, + IN HANDLE Log, + IN HANDLE External, + IN PUNICODE_STRING FileName OPTIONAL, + IN ULONG CheckFlags); + static NTSTATUS CmiCreateNewRegFile(HANDLE FileHandle) { @@ -57,95 +70,66 @@ } static NTSTATUS -CmiInitNonVolatileRegistryHive (PEREGISTRY_HIVE RegistryHive, - PWSTR Filename) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG CreateDisposition; - IO_STATUS_BLOCK IoSB; - HANDLE FileHandle; - NTSTATUS Status; - FILE_STANDARD_INFORMATION FileInformation; - - DPRINT("CmiInitNonVolatileRegistryHive(%p, %S) called\n", - RegistryHive, Filename); - - /* Duplicate Filename */ - Status = RtlCreateUnicodeString(&RegistryHive->HiveFileName, - Filename); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlCreateUnicodeString() failed (Status %lx)\n", Status); - return(Status); - } - - InitializeObjectAttributes(&ObjectAttributes, - &RegistryHive->HiveFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - - CreateDisposition = FILE_OPEN_IF; - Status = ZwCreateFile(&FileHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &IoSB, - NULL, - FILE_ATTRIBUTE_NORMAL, - 0, - CreateDisposition, - FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - DPRINT("ZwCreateFile() failed (Status %lx)\n", Status); - return(Status); - } - - if (IoSB.Information != FILE_OPENED) - { - Status = CmiCreateNewRegFile(FileHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); - ZwClose(FileHandle); - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - return(Status); - } - } - - RegistryHive->HiveHandle = FileHandle; - - /* Check how large the file is */ - ZwQueryInformationFile(FileHandle, - &IoSB, - &FileInformation, - sizeof(FileInformation), - FileStandardInformation); - Status = HvInitialize(&RegistryHive->Hive, HINIT_FILE, 0, 0, - 0, FileInformation.EndOfFile.LowPart, - CmpAllocate, CmpFree, - CmpFileRead, CmpFileWrite, CmpFileSetSize, - CmpFileFlush, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to open hive\n"); - RtlFreeUnicodeString(&RegistryHive->HiveFileName); - ZwClose(FileHandle); - return Status; - } - - CmPrepareHive(&RegistryHive->Hive); - - /* Close the hive file */ - ZwClose(FileHandle); - - DPRINT("CmiInitNonVolatileRegistryHive(%p, %S) - Finished.\n", - RegistryHive, Filename); - - return STATUS_SUCCESS; +CmiInitNonVolatileRegistryHive (IN ULONG HiveFlags, + IN PUNICODE_STRING HiveName, + OUT PEREGISTRY_HIVE *Hive) +{ + ULONG CreateDisposition, LogDisposition; + HANDLE FileHandle, LogHandle; + NTSTATUS Status; + //ULONG Operation; + PEREGISTRY_HIVE NewHive; + + *Hive = NULL; + + Status = CmpOpenHiveFiles(HiveName, + NULL, //L".LOG", + &FileHandle, + &LogHandle, + &CreateDisposition, + &LogDisposition, + TRUE, + FALSE, + TRUE, + NULL); + if (CreateDisposition == FILE_CREATED) + { + Status = CmiCreateNewRegFile(FileHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT("CmiCreateNewRegFile() failed (Status %lx)\n", Status); + ZwClose(FileHandle); + return(Status); + } + } + + Status = CmpInitializeHive(&NewHive, + HINIT_FILE, + HiveFlags, + HFILE_TYPE_PRIMARY, + NULL, + FileHandle, + NULL, + NULL, + HiveName, + 0); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open hive\n"); + ZwClose(FileHandle); + return Status; + } + + CmPrepareHive(&NewHive->Hive); + NewHive->Flags = HiveFlags; + + RtlCreateUnicodeString(&NewHive->HiveFileName, HiveName->Buffer); + + /* Close the hive file */ + ZwClose(FileHandle); + + *Hive = NewHive; + return Status; } NTSTATUS @@ -161,33 +145,15 @@ if (Flags & ~REG_NO_LAZY_FLUSH) return STATUS_INVALID_PARAMETER; - Hive = ExAllocatePool (NonPagedPool, - sizeof(EREGISTRY_HIVE)); - if (Hive == NULL) - { - DPRINT1 ("Failed to allocate hive header.\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - RtlZeroMemory (Hive, - sizeof(EREGISTRY_HIVE)); - - DPRINT ("Hive 0x%p\n", Hive); - Hive->Flags = (Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0; - - Status = CmiInitNonVolatileRegistryHive (Hive, - FileName->Buffer); + Status = CmiInitNonVolatileRegistryHive ((Flags & REG_NO_LAZY_FLUSH) ? HIVE_NO_SYNCH : 0, + FileName, + &Hive); if (!NT_SUCCESS (Status)) { DPRINT1 ("CmiInitNonVolatileRegistryHive() failed (Status %lx)\n", Status); ExFreePool (Hive); return Status; } - - /* Add the new hive to the hive list */ - InsertTailList (&CmpHiveListHead, - &Hive->HiveList); - - VERIFY_REGISTRY_HIVE(Hive); Status = CmiConnectHive (KeyObjectAttributes, Hive); Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Sat May 12 10:47:39 2007 @@ -32,6 +32,7 @@ PCMHIVE Hive; #else PEREGISTRY_HIVE Hive; + FILE_STANDARD_INFORMATION FileInformation; #endif IO_STATUS_BLOCK IoStatusBlock; FILE_FS_SIZE_INFORMATION FileSizeInformation; @@ -167,6 +168,15 @@ /* Set flags */ Hive->Flags = HiveFlags; + Hive->HiveHandle = Primary; + + /* Check how large the file is */ + ZwQueryInformationFile(Primary, + &IoStatusBlock, + &FileInformation, + sizeof(FileInformation), + FileStandardInformation); + Cluster = FileInformation.EndOfFile.LowPart; #endif /* Initialize it */

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007