Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23493: Bugfix DirectDraw_AddRef
by greatlrd＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: greatlrd Date: Sun Aug 6 13:56:21 2006 New Revision: 23493 URL: http://svn.reactos.org/svn/reactos?rev=23493&view=rev Log: Bugfix DirectDraw_AddRef Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.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 Sun Aug 6 13:56:21 2006 @@ -61,13 +61,18 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref=0; - + if (iface!=NULL) { - ref = InterlockedIncrement( (PLONG) &This->mDDrawLocal.dwLocalRefCnt); + This->mDDrawLocal.dwLocalRefCnt++; + This->Ref++; + + if (This->mDDrawLocal.lpGbl != NULL) + { + This->mDDrawLocal.lpGbl->dwRefCnt++; + } } - return ref; + return This->Ref; } /* @@ -81,13 +86,18 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref=0; - + if (iface!=NULL) { - ref = InterlockedDecrement( (PLONG) &This->mDDrawLocal.dwLocalRefCnt); + This->mDDrawLocal.dwLocalRefCnt--; + This->Ref--; + + if (This->mDDrawLocal.lpGbl != NULL) + { + This->mDDrawLocal.lpGbl->dwRefCnt--; + } - if (ref == 0) + if ( This->Ref == 0) { // set resoltion back to the one in registry if(This->cooperative_level & DDSCL_EXCLUSIVE) @@ -102,7 +112,7 @@ } } } - return ref; + return This->Ref; } /* Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Aug 6 13:56:21 2006 @@ -49,6 +49,8 @@ IDirectDraw4Vtbl* lpVtbl_v4; IDirectDraw2Vtbl* lpVtbl_v2; IDirectDrawVtbl* lpVtbl_v1; + + ULONG Ref; /* The main struct that contain all info from the HAL and HEL */ HDC hdc; Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Aug 6 13:56:21 2006 @@ -212,7 +212,8 @@ /* Setup calback struct so we do not need refill same info again */ This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - + + This->mDDrawLocal.lpGbl = &This->mDDrawGlobal; return DD_OK; }

1 0

[greatlrd] 23492: fixing ddraw regress instead bsod or fail create surface, now it fail on attach surface
by greatlrd＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: greatlrd Date: Sun Aug 6 12:47:18 2006 New Revision: 23492 URL: http://svn.reactos.org/svn/reactos?rev=23492&view=rev Log: fixing ddraw regress instead bsod or fail create surface, now it fail on attach surface Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.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 Sun Aug 6 12:47:18 2006 @@ -250,9 +250,8 @@ if (This->mDdCreatePalette.CreatePalette(&This->mDdCreatePalette) == DDHAL_DRIVER_HANDLED); { - if (This->mDdCreatePalette.ddRVal == DD_OK) + if (This->mDdSetMode.ddRVal == DD_OK) { - Main_DirectDraw_AddRef(iface); return That->lpVtbl->Initialize (*ppPalette, (LPDIRECTDRAW)iface, dwFlags, palent); } @@ -261,6 +260,7 @@ return DDERR_NODRIVERSUPPORT; } +HRESULT internal_CreateNewSurface(IDirectDrawImpl* This, IDirectDrawSurfaceImpl* That); /* * stub * Status not done @@ -271,53 +271,260 @@ DX_WINDBG_trace(); DxSurf *surf; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawSurfaceImpl* That; + DEVMODE DevMode; + LONG extra_surfaces = 0; if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; + { + return CLASS_E_NOAGGREGATION; + } if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) + { return DDERR_UNSUPPORTED; - - // the nasty com stuff - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - IDirectDrawSurfaceImpl* That; - - That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); + } + + That = (IDirectDrawSurfaceImpl*)DxHeapMemAlloc(sizeof(IDirectDrawSurfaceImpl)); if (That == NULL) { return E_OUTOFMEMORY; } - ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); - - surf = (DxSurf*)HeapAlloc(GetProcessHeap(), 0, sizeof(DxSurf)); + + surf = (DxSurf*)DxHeapMemAlloc(sizeof(DxSurf)); if (surf == NULL) { - // FIXME Free memmory at exit + DxHeapMemFree(That); return E_OUTOFMEMORY; } - ZeroMemory(surf, sizeof(DxSurf)); - - - + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; - - That->Owner = (IDirectDrawImpl *)This; + // FIXME free This->mDDrawGlobal.dsList on release + if (This->mDDrawGlobal.dsList == NULL) + { + This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); + if (This->mDDrawGlobal.dsList == NULL) + { + DxHeapMemFree(surf); + DxHeapMemFree(That); + return E_OUTOFMEMORY; + } + + That->Owner = (IDirectDrawImpl *)This; + That->Owner->mDDrawGlobal.dsList->dwIntRefCnt =1; + + /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ + That->Owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; + } + + That->Surf = surf; + + /* Code from wine cvs 24/7-2006 */ + + if (!(pDDSD->dwFlags & DDSD_CAPS)) + { + /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */ + pDDSD->dwFlags |= DDSD_CAPS; + } + if (pDDSD->ddsCaps.dwCaps == 0) + { + /* This has been checked on real Windows */ + pDDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + } + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) + { + /* If the surface is of the 'alloconload' type, ignore the LPSURFACE field */ + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + if ((pDDSD->dwFlags & DDSD_LPSURFACE) && (pDDSD->lpSurface == NULL)) + { + /* Frank Herbert's Dune specifies a null pointer for the surface, ignore the LPSURFACE field */ + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + + /* continue with my own code */ + memcpy(&That->Surf->mddsdPrimary,pDDSD,pDDSD->dwSize); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC2); + + memset(&DevMode,0,sizeof(DEVMODE)); + DevMode.dmSize = (WORD)sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; + + EnumDisplaySettingsEx(NULL, ENUM_CURRENT_SETTINGS, &DevMode, 0); + if(!(pDDSD->dwFlags & DDSD_PIXELFORMAT)) + { + That->Surf->mddsdPrimary.dwFlags |= DDSD_PIXELFORMAT; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); + + if(pDDSD->ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + /* FIXME */ + DX_STUB_str("DDSCAPS_ZBUFFER not implement"); + switch(pDDSD->dwMipMapCount) + { + case 15: + break; + case 16: + break; + case 24: + break; + case 32: + break; + default: + DX_STUB_str("nknown Z buffer bit depth"); + } + } + else + { + switch(DevMode.dmBitsPerPel) + { + case 8: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=8; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0; /* Blue bitmask */ + break; + + case 15: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=15; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0x7C00; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x3E0; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + break; + + case 16: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=16; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xF800; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x7E0; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + break; + + case 24: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=24; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + break; + + case 32: + That->Surf->mddsdPrimary.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFlags = DDPF_RGB; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwFourCC = 0; + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRGBBitCount=8; + /* FIXME right value */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + That->Surf->mddsdPrimary.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + break; + + default: + break; + } + } /* end else */ + } /* end if(!(pDDSD->dwFlags & DDSD_PIXELFORMAT)) */ + + /* Code from wine cvs 24/7-2006 */ + if(!(pDDSD->dwFlags & DDSD_WIDTH) || !(pDDSD->dwFlags & DDSD_HEIGHT) ) + { + HWND window = (HWND) This->mDDrawGlobal.lpExclusiveOwner->hWnd; + + /* Fallback: From WineD3D / original mode */ + That->Surf->mddsdPrimary.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + + That->Surf->mddsdPrimary.dwWidth =DevMode.dmPelsWidth; + That->Surf->mddsdPrimary.dwHeight = DevMode.dmPelsHeight; + + if( (window != 0) ) + { + RECT rect; + if(GetWindowRect(window, &rect) ) + { + /* This is a hack until I find a better solution */ + if( (rect.right - rect.left) <= 1 || + (rect.bottom - rect.top) <= 1 ) + { + /* + FIXME("Wanted to get surface dimensions from window %p, but it has only \ + a size of %ldx%ld. Using full screen dimensions\n", + window, rect.right - rect.left, rect.bottom - rect.top); + */ + } + else + { + /* Not sure if this is correct */ + That->Surf->mddsdPrimary.dwWidth = rect.right - rect.left; + That->Surf->mddsdPrimary.dwHeight = rect.bottom - rect.top; + /* TRACE("Using window %p's dimensions: %ldx%ld\n", window, desc2.dwWidth, desc2.dwHeight); */ + } + } + } + } + + /* Mipmap count fixes */ + if(That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + if(That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_COMPLEX) + { + if(!That->Surf->mddsdPrimary.dwFlags & DDSD_MIPMAPCOUNT) + { + /* Undocumented feature: Create sublevels until + * either the width or the height is 1 + */ + DWORD min = That->Surf->mddsdPrimary.dwWidth < That->Surf->mddsdPrimary.dwHeight ? + That->Surf->mddsdPrimary.dwWidth : That->Surf->mddsdPrimary.dwHeight; + + That->Surf->mddsdPrimary.dwMipMapCount = 0; + while( min ) + { + That->Surf->mddsdPrimary.dwMipMapCount += 1; + min >>= 1; + } + } + } + else + { + That->Surf->mddsdPrimary.dwMipMapCount = 1; + } + extra_surfaces = That->Surf->mddsdPrimary.dwMipMapCount - 1; + That->Surf->mddsdPrimary.dwFlags |= DDSD_MIPMAPCOUNT; + } + + if( (That->Surf->mddsdPrimary.dwFlags & DDSD_CAPS) && + (That->Surf->mddsdPrimary.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ) + { + That->Surf->mddsdPrimary.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; + } + - /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ - That->Owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; - - - That->Surf = surf; - - // UINT i; - //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //IDirectDrawSurfaceImpl* That = ppSurf; + + + + @@ -325,118 +532,14 @@ if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Surf->mddsdPrimary,pDDSD,pDDSD->dwSize); - That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC2); - This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; - - if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (This->mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - memset(&That->Owner->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - That->Owner->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - That->Owner->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - That->Owner->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - That->Owner->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - That->Owner->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - That->Owner->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Surf->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; - That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; - That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); - - /* - FIXME Check the flags if we shall create a primaresurface for overlay or something else - Examine windows which flags are being set for we assume this is right unsue I think - */ - //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; - That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; - - - - This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; - This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; - This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; - - - if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (This->mDdCreateSurface.ddRVal != DD_OK) - { - return This->mDdCreateSurface.ddRVal; - } - - - /* FIXME fill in this if they are avali - DDSD_BACKBUFFERCOUNT - DDSD_CKDESTBLT - DDSD_CKDESTOVERLAY - DDSD_CKSRCBLT - DDSD_CKSRCOVERLAY - DDSD_LINEARSIZE - DDSD_LPSURFACE - DDSD_MIPMAPCOUNT - DDSD_ZBUFFERBITDEPTH - */ - - That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); - //RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - - //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); - //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); - - if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; - } - - if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; - } - - if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; - } - - if ( This->mDDrawGlobal.dwMonitorFrequency != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - } - - if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) - { - That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; - } - - That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; - return DD_OK; - - } + + return internal_CreateNewSurface( This, That); + + } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) - { + { + return internal_CreateNewSurface( This, That); + memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); memcpy(&That->Surf->mddsdOverlay, pDDSD, sizeof(DDSURFACEDESC)); That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); @@ -567,6 +670,60 @@ } +HRESULT +internal_CreateNewSurface(IDirectDrawImpl* This, IDirectDrawSurfaceImpl* That) +{ + This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; + + if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (This->mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } + + memset(&That->Owner->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Owner->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->Owner->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + That->Owner->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Owner->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + That->Owner->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + That->Owner->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + + This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; + This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; + This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; + + + if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (This->mDdCreateSurface.ddRVal != DD_OK) + { + return This->mDdCreateSurface.ddRVal; + } + + That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; + return DD_OK; +} + /* * stub * Status not done @@ -605,6 +762,10 @@ /* FIXME check if the mode are suppretd before sending it back */ + + memset(&DevMode,0,sizeof(DEVMODE)); + DevMode.dmSize = (WORD)sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) { @@ -1047,7 +1208,7 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //BOOL dummy = TRUE; + BOOL dummy = TRUE; DEVMODE DevMode; int iMode=0; int Width=0; @@ -1099,17 +1260,9 @@ This->mDdSetMode.ddRVal = DDERR_NOTPALETTIZED; This->mDdSetMode.dwModeIndex = iMode; + This->mDdSetMode.SetMode(&This->mDdSetMode); - if (This->mDdSetMode.SetMode(&This->mDdSetMode) == DDHAL_DRIVER_HANDLED) - { - if (This->mDdSetMode.ddRVal == DD_OK) - ; - //DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - //} - } - - - + DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); /* FIXME fill the This->DirectDrawGlobal.vmiData right */ //This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC( (HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd); Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Aug 6 12:47:18 2006 @@ -212,19 +212,6 @@ /* Setup calback struct so we do not need refill same info again */ This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - - - /* Setup global surface */ - // FIXME free dsList when we exist - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); - This->mDDrawGlobal.dsList->dwIntRefCnt =1; - - This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; return DD_OK; } @@ -377,7 +364,13 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); - + /* Setup global surface */ + /*This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch;*/ /* FIXME free it in cleanup */ // This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT));

1 0

[fireball] 23491: [AUDIT] Configuration Manager Cm part of the kernel was developed from scratch for a long time ago, and based only on legally clean information sources. After going through the code, it doesn't have any signs of questionable origin. Authorship information will be added during formatting of the code.
by fireball＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: fireball Date: Sun Aug 6 01:39:29 2006 New Revision: 23491 URL: http://svn.reactos.org/svn/reactos?rev=23491&view=rev Log: [AUDIT] Configuration Manager Cm part of the kernel was developed from scratch for a long time ago, and based only on legally clean information sources. After going through the code, it doesn't have any signs of questionable origin. Authorship information will be added during formatting of the code. Modified: trunk/reactos/ntoskrnl/cm/cm.h (props changed) trunk/reactos/ntoskrnl/cm/import.c (props changed) trunk/reactos/ntoskrnl/cm/ntfunc.c (props changed) trunk/reactos/ntoskrnl/cm/regfile.c (props changed) trunk/reactos/ntoskrnl/cm/registry.c (props changed) trunk/reactos/ntoskrnl/cm/regobj.c (props changed) Propchange: trunk/reactos/ntoskrnl/cm/cm.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/import.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/ntfunc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/regfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/registry.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/cm/regobj.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 23490: Fix the last definition of DbgPrint
by fireball＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: fireball Date: Sun Aug 6 01:17:55 2006 New Revision: 23490 URL: http://svn.reactos.org/svn/reactos?rev=23490&view=rev Log: Fix the last definition of DbgPrint Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/framebased.h (original) +++ trunk/reactos/include/reactos/libs/pseh/framebased.h Sun Aug 6 01:17:55 2006 @@ -45,7 +45,7 @@ # define _SEHSetJmp setjmp # define _SEHJmpBuf_t jmp_buf #endif -unsigned long DbgPrint(const char * Format,...); +unsigned long DbgPrint(PCCHAR Format,...); typedef struct __SEHFrame { _SEHPortableFrame_t SEH_Header;

1 0

[fireball] 23489: Fix DbgPrint / DbgPrintEx definitions to use PCCHAR instead of PCCH (recent WDK uses PCCHAR). This change fixes compiling.
by fireball＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: fireball Date: Sun Aug 6 00:57:36 2006 New Revision: 23489 URL: http://svn.reactos.org/svn/reactos?rev=23489&view=rev Log: Fix DbgPrint / DbgPrintEx definitions to use PCCHAR instead of PCCH (recent WDK uses PCCHAR). This change fixes compiling. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sun Aug 6 00:57:36 2006 @@ -10450,7 +10450,7 @@ ULONG __cdecl DbgPrint( - IN PCCH Format, + IN PCCHAR Format, IN ...); ULONG @@ -10458,7 +10458,7 @@ DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, - IN PCCH Format, + IN PCCHAR Format, IN ...); NTOSAPI Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Sun Aug 6 00:57:36 2006 @@ -2454,7 +2454,7 @@ ULONG __cdecl DbgPrint( - IN PCCH Format, + IN PCCHAR Format, IN ... ); @@ -2464,7 +2464,7 @@ DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, - IN PCCH Format, + IN PCCHAR Format, IN ... ); Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Sun Aug 6 00:57:36 2006 @@ -29,7 +29,7 @@ ULONG __cdecl DbgPrint( - IN PCCH Format, + IN PCCHAR Format, IN ... );

1 0

[ion] 23488: - Fix another incorrect DbgPrint prototype.
by ion＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: ion Date: Sat Aug 5 20:50:36 2006 New Revision: 23488 URL: http://svn.reactos.org/svn/reactos?rev=23488&view=rev Log: - Fix another incorrect DbgPrint prototype. Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Sat Aug 5 20:50:36 2006 @@ -29,7 +29,7 @@ ULONG __cdecl DbgPrint( - IN PCH Format, + IN PCCH Format, IN ... );

1 0

[ion] 23487: - Fix how DDK is included.
by ion＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: ion Date: Sat Aug 5 20:50:23 2006 New Revision: 23487 URL: http://svn.reactos.org/svn/reactos?rev=23487&view=rev Log: - Fix how DDK is included. Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2348… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Sat Aug 5 20:50:23 2006 @@ -8,7 +8,7 @@ #ifndef CMLIB_H #define CMLIB_H -#include <ddk/ntddk.h> +#include <ntddk.h> #include "hivedata.h" #include "cmdata.h" @@ -83,8 +83,8 @@ * Public functions. */ -#define HV_OPERATION_CREATE_HIVE 1 -#define HV_OPERATION_MEMORY 2 +#define HV_OPERATION_CREATE_HIVE 0 +#define HV_OPERATION_MEMORY 1 #define HV_OPERATION_MEMORY_INPLACE 3 NTSTATUS CMAPI

1 0

[ion] 23486: - mangledDDK had no idea what a const char is, now it does. - mangledDDK had wrong prototypes of DbgPrint/Ex. - PSEH too. - Fixed ntoskrnl headers to build with Windows 2003 header definitions. Make handle.c force usage of Windows 2000 header definitions, because the handle code is Win2K. - mangledDDK had wrong KeNumberProcessors definition.
by ion＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: ion Date: Sat Aug 5 20:49:07 2006 New Revision: 23486 URL: http://svn.reactos.org/svn/reactos?rev=23486&view=rev Log: - mangledDDK had no idea what a const char is, now it does. - mangledDDK had wrong prototypes of DbgPrint/Ex. - PSEH too. - Fixed ntoskrnl headers to build with Windows 2003 header definitions. Make handle.c force usage of Windows 2000 header definitions, because the handle code is Win2K. - mangledDDK had wrong KeNumberProcessors definition. Modified: branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/reactos/libs/pseh/framebased.h Modified: branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c Sat Aug 5 20:49:07 2006 @@ -17,6 +17,8 @@ */ /* INCLUDES *****************************************************************/ + +#define NTDDI_VERSION NTDDI_WIN2K #include <ntoskrnl.h> Modified: branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h Sat Aug 5 20:49:07 2006 @@ -261,7 +261,10 @@ return ExSystemExceptionFilter(); } + /* RUNDOWN *******************************************************************/ + +#if (NTDDI_VERSION >= NTDDI_WINXP) #ifdef _WIN64 #define ExpChangeRundown(x, y, z) InterlockedCompareExchange64((PLONGLONG)x, y, z) @@ -436,6 +439,7 @@ /* Mark the counter as active */ ExpSetRundown(&RunRef->Count, EX_RUNDOWN_ACTIVE); } +#endif /* PUSHLOCKS *****************************************************************/ Modified: branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h Sat Aug 5 20:49:07 2006 @@ -7,6 +7,11 @@ */ /* INCLUDES ******************************************************************/ + +/* Temporary hack */ +#ifndef NTDDI_VERSION +#define NTDDI_VERSION NTDDI_WS03 +#endif /* We are the Kernel */ #define NTKERNELAPI Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sat Aug 5 20:49:07 2006 @@ -396,7 +396,15 @@ extern POBJECT_TYPE NTSYSAPI MmSectionObjectType; extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; -extern NTOSAPI CCHAR KeNumberProcessors; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +extern volatile CCHAR NTSYSAPI KeNumberProcessors; +#else +#if (NTDDI_VERSION >= NTDDI_WINXP) +extern CCHAR NTSYSAPI KeNumberProcessors; +#else +extern PCCHAR KeNumberProcessors; +#endif +#endif #define PROCESSOR_FEATURE_MAX 64 #define MAX_WOW64_SHARED_ENTRIES 16 @@ -10442,7 +10450,7 @@ ULONG __cdecl DbgPrint( - IN PCH Format, + IN PCCH Format, IN ...); ULONG @@ -10450,7 +10458,7 @@ DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, - IN PCH Format, + IN PCCH Format, IN ...); NTOSAPI Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h (original) +++ trunk/reactos/include/psdk/ntdef.h Sat Aug 5 20:49:07 2006 @@ -63,6 +63,7 @@ typedef STRING CANSI_STRING; typedef PSTRING PCANSI_STRING; typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; +typedef CONST CHAR *LPCCH, *PCCH; typedef enum _SECTION_INHERIT { ViewShare = 1, ViewUnmap = 2 Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/framebased.h (original) +++ trunk/reactos/include/reactos/libs/pseh/framebased.h Sat Aug 5 20:49:07 2006 @@ -45,7 +45,7 @@ # define _SEHSetJmp setjmp # define _SEHJmpBuf_t jmp_buf #endif -unsigned long DbgPrint(char * Format,...); +unsigned long DbgPrint(const char * Format,...); typedef struct __SEHFrame { _SEHPortableFrame_t SEH_Header;

1 0

[ion] 23485: - Add cmhive.c now that the code mostly makes sense. (requires changes in cmlib to compile).
by ion＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: ion Date: Sat Aug 5 20:29:40 2006 New Revision: 23485 URL: http://svn.reactos.org/svn/reactos?rev=23485&view=rev Log: - Add cmhive.c now that the code mostly makes sense. (requires changes in cmlib to compile). Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Sat Aug 5 20:29:40 2006 @@ -6,7 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -//#include "cmlib.h" +#include "cmlib.h" // // Define this if you want debugging support @@ -66,6 +66,13 @@ #define HFILE_TYPE_LOG 2 #define HFILE_TYPE_EXTERNAL 3 #define HFILE_TYPE_MAX 4 + +// +// Hive sizes +// +#define HBLOCK_SIZE 0x1000 +#define HSECTOR_SIZE 0x200 +#define HSECTOR_COUNT 8 // // CM_KEY_CONTROL_BLOCK Flags Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c (added) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmhive.c Sat Aug 5 20:29:40 2006 @@ -1,0 +1,325 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/cm/cmhive.c + * PURPOSE: Routines for managing Registry Hives in general + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +EX_PUSH_LOCK CmpHiveListHeadLock; +LIST_ENTRY CmpHiveListHead; + +/* FUNCTIONS *****************************************************************/ + +PVOID +NTAPI +CmpAllocate(IN ULONG Size, + IN BOOLEAN Paged) +{ + /* FIXME: TODO */ + DbgBreakPoint(); + return NULL; +} + +VOID +NTAPI +CmpFree(IN PVOID Block) +{ + /* FIXME: TODO */ + DbgBreakPoint(); +} + +BOOLEAN +NTAPI +CmpFileRead(IN PHHIVE Hive, + IN ULONG FileType, + IN ULONG FileOffset, + IN PVOID Buffer, + IN ULONG BufferLength) +{ + /* FIXME: TODO */ + DbgBreakPoint(); + return FALSE; +} + +BOOLEAN +NTAPI +CmpFileWrite(IN PHHIVE Hive, + IN ULONG FileType, + IN ULONG FileOffset, + IN PVOID Buffer, + IN ULONG BufferLength) +{ + /* FIXME: TODO */ + DbgBreakPoint(); + return FALSE; +} + +BOOLEAN +NTAPI +CmpFileSetSize(IN PHHIVE Hive, + IN ULONG FileType, + IN ULONG FileSize) +{ + /* FIXME: TODO */ + DbgBreakPoint(); + return FALSE; +} + +BOOLEAN +NTAPI +CmpFileFlush(IN PHHIVE Hive, + IN ULONG FileType) +{ + /* FIXME: TODO */ + DbgBreakPoint(); + return FALSE; +} + +VOID +NTAPI +CmpInitializeSecurityCache(IN PCMHIVE Hive) +{ + ULONG i; + PAGED_CODE(); + + /* Initialize defaults */ + Hive->SecurityCache = NULL; + Hive->SecurityCount = 0; + Hive->SecurityHitHint = -1; + Hive->SecurityCacheSize = 0; + + /* Loop the lists */ + for (i = 0; i < CMP_SECURITY_HASH_LISTS; i++) + { + /* Initialize this list */ + InitializeListHead(&Hive->SecurityHash[i]); + } +} + +VOID +NTAPI +CmpInitializeHiveViewList(IN PCMHIVE Hive) +{ + PAGED_CODE(); + + /* Initialize the lists */ + InitializeListHead(&Hive->PinViewListHead); + InitializeListHead(&Hive->LRUViewListHead); + + /* Setup defaults */ + Hive->MappedViews = 0; + Hive->PinnedViews = 0; + Hive->UseCount = 0; +} + +NTSTATUS +NTAPI +CmpInitializeHive(OUT PCMHIVE *CmHive, + IN ULONG Operation, + IN ULONG Flags, + IN ULONG FileType, + IN PVOID Context, + IN HANDLE Primary, + IN HANDLE Alternate, + IN HANDLE Log, + IN HANDLE External, + IN PUNICODE_STRING FileName) +{ + PCMHIVE Hive; + IO_STATUS_BLOCK IoStatusBlock; + FILE_FS_SIZE_INFORMATION FileSizeInformation; + NTSTATUS Status; + ULONG Cluster; + + /* + * The following are invalid: + * An alternate hive that's also a log file. + * An external hive that is also internal. + * An alternate hive or a log hive that's not a primary hive too. + * A volatile hive that's linked to permanent storage. + * An in-memory initailization without context data. + * A log hive or alternative hive that's not linked to a correct file type. + */ + if ((Alternate && Log) || + (External && (Primary || Alternate || Log)) || + (Alternate && !Primary) || + (Log && !Primary) || + ((Flags & HIVE_VOLATILE) && + (Alternate || Primary || External || Log)) || + ((Operation == HINIT_MEMORY) && (!Context)) || + (Log && (FileType != HFILE_TYPE_LOG)) || + (Alternate && (FileType != HFILE_TYPE_ALTERNATE))) + { + /* Fail the request */ + return STATUS_INVALID_PARAMETER; + } + + /* Check if this is a primary hive */ + if (Primary) + { + /* Get the cluster size */ + Status = ZwQueryVolumeInformationFile(Primary, + &IoStatusBlock, + &FileSizeInformation, + sizeof(FILE_FS_SIZE_INFORMATION), + FileFsSizeInformation); + if (!NT_SUCCESS(Status)) return Status; + + /* Make sure it's not larger then the block size */ + if (FileSizeInformation.BytesPerSector > HBLOCK_SIZE) + { + /* Fail */ + return STATUS_REGISTRY_IO_FAILED; + } + + /* Otherwise, calculate the cluster */ + Cluster = FileSizeInformation.BytesPerSector / HSECTOR_SIZE; + Cluster = max(1, Cluster); + } + else + { + /* Otherwise use cluster 1 */ + Cluster = 1; + } + + /* Allocate a hive */ + Hive = ExAllocatePoolWithTag(PagedPool, + sizeof(CMHIVE), + TAG_CM); + if (!Hive) return STATUS_INSUFFICIENT_RESOURCES; + + /* Setup null fields */ + Hive->UnloadEvent = NULL; + Hive->RootKcb = NULL; + Hive->Frozen = FALSE; + Hive->UnloadWorkItem = NULL; + Hive->GrowOnlyMode = FALSE; + Hive->GrowOffset = 0; + Hive->CellRemapArray = NULL; + Hive->UseCountLog.Next = 0; + Hive->LockHiveLog.Next = 0; + Hive->FileObject = NULL; + Hive->NotifyList.Flink = NULL; + Hive->NotifyList.Blink = NULL; + + /* Set loading flag */ + Hive->HiveIsLoading = TRUE; + + /* Set the current thread as creator */ + Hive->CreatorOwner = KeGetCurrentThread(); + + /* Initialize lists */ + InitializeListHead(&Hive->KcbConvertListHead); + InitializeListHead(&Hive->KnodeConvertListHead); + InitializeListHead(&Hive->TrustClassEntry); + + /* Allocate the view log */ + Hive->ViewLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KGUARDED_MUTEX), + TAG_CM); + if (!Hive->ViewLock) return STATUS_INSUFFICIENT_RESOURCES; + + /* Allocate the flush lock */ + Hive->FlusherLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ERESOURCE), + TAG_CM); + if (!Hive->FlusherLock) return STATUS_INSUFFICIENT_RESOURCES; + + /* Setup the handles */ + Hive->FileHandles[HFILE_TYPE_PRIMARY] = Primary; + Hive->FileHandles[HFILE_TYPE_ALTERNATE] = Alternate; + Hive->FileHandles[HFILE_TYPE_LOG] = Log; + Hive->FileHandles[HFILE_TYPE_EXTERNAL] = External; + + /* Initailize the guarded mutex */ + KeInitializeGuardedMutex(Hive->ViewLock); + Hive->ViewLockOwner = NULL; + + /* Initialize the flush lock */ + ExInitializeResourceLite(Hive->FlusherLock); + + /* Setup hive locks */ + ExInitializePushLock(&Hive->HiveLock); + Hive->HiveLockOwner = NULL; + ExInitializePushLock(&Hive->WriterLock); + Hive->WriterLockOwner = NULL; + ExInitializePushLock(&Hive->SecurityLock); + Hive->HiveSecurityLockOwner = NULL; + + /* Clear file names */ + RtlInitEmptyUnicodeString(&Hive->FileUserName, NULL, 0); + RtlInitEmptyUnicodeString(&Hive->FileFullPath, NULL, 0); + + /* Initialize the view list */ + CmpInitializeHiveViewList(Hive); + + /* Initailize the security cache */ + CmpInitializeSecurityCache(Hive); + + /* Setup flags */ + Hive->Flags = 0; + Hive->FlushCount = 0; + + /* Initialize the hive */ + Status = HvInitialize(&Hive->Hive, + Operation, + Flags, + FileType, + Context, + CmpAllocate, + CmpFree, + CmpFileRead, + CmpFileWrite, + CmpFileSetSize, + CmpFileFlush, + Cluster, + FileName); + if (NT_SUCCESS(Status)) + { + /* Free all alocations */ + ExFreePool(Hive->ViewLock); + ExFreePool(Hive->FlusherLock); + ExFreePool(Hive); + return Status; + } + + /* Check if we should verify the registry */ + if ((Operation == HINIT_FILE) || + (Operation == HINIT_MEMORY) || + (Operation == HINIT_MEMORY_INPLACE) || + (Operation == HINIT_MAPFILE)) + { + /* Verify integrity */ + if (CmCheckRegistry(Hive, TRUE)) + { + /* Free all alocations */ + ExFreePool(Hive->ViewLock); + ExFreePool(Hive->FlusherLock); + ExFreePool(Hive); + return STATUS_REGISTRY_CORRUPT; + } + } + + /* Lock the hive list */ + ExAcquirePushLockExclusive(&CmpHiveListHeadLock); + + /* Insert this hive */ + InsertHeadList(&CmpHiveListHead, &Hive->HiveList); + + /* Release the lock */ + ExReleasePushLock(&CmpHiveListHeadLock); + + /* Return the hive and success */ + *CmHive = Hive; + return STATUS_SUCCESS; +} +

1 0

[ion] 23484: - DDK Compatibility fixes.
by ion＠svn.reactos.org 05 Aug '06

05 Aug '06

Author: ion Date: Sat Aug 5 20:27:20 2006 New Revision: 23484 URL: http://svn.reactos.org/svn/reactos?rev=23484&view=rev Log: - DDK Compatibility fixes. Modified: trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Sat Aug 5 20:27:20 2006 @@ -959,7 +959,15 @@ // Exported Hardware Data // extern KAFFINITY NTSYSAPI KeActiveProcessors; -extern CHAR NTSYSAPI KeNumberProcessors; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +extern volatile CCHAR NTSYSAPI KeNumberProcessors; +#else +#if (NTDDI_VERSION >= NTDDI_WINXP) +extern CCHAR NTSYSAPI KeNumberProcessors; +#else +extern PCCHAR KeNumberProcessors; +#endif +#endif extern ULONG NTSYSAPI KiDmaIoCoherency; extern ULONG NTSYSAPI KeMaximumIncrement; extern ULONG NTSYSAPI KeMinimumIncrement; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Sat Aug 5 20:27:20 2006 @@ -503,13 +503,6 @@ ); NTSYSAPI -HANDLE -NTAPI -RtlDestroyHeap( - IN HANDLE Heap -); - -NTSYSAPI ULONG NTAPI RtlExtendHeap( @@ -1935,14 +1928,14 @@ // // Thread Pool Functions // - NTSYSAPI NTSTATUS NTAPI RtlQueueWorkItem( IN WORKERCALLBACKFUNC Function, - IN PVOID Context OPTIONAL, - IN ULONG Flags); + IN PVOID Context OPTIONAL, + IN ULONG Flags +); // // Environment/Path Functions @@ -2461,7 +2454,7 @@ ULONG __cdecl DbgPrint( - IN PCH Format, + IN PCCH Format, IN ... ); @@ -2471,7 +2464,7 @@ DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, - IN PCH Format, + IN PCCH Format, IN ... ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h (original) +++ trunk/reactos/include/ndk/rtltypes.h Sat Aug 5 20:27:20 2006 @@ -383,6 +383,14 @@ typedef LONG (NTAPI *PVECTORED_EXCEPTION_HANDLER)( PEXCEPTION_POINTERS ExceptionPointers +); + +// +// Worker Thread Callback for Rtl +// +typedef VOID +(NTAPI *WORKERCALLBACKFUNC)( + IN PVOID Context ); #else

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs