Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23263: Kill a ungly hack; I will rewrite it later
by greatlrd＠svn.reactos.org 24 Jul '06

24 Jul '06

Author: greatlrd Date: Mon Jul 24 12:34:18 2006 New Revision: 23263 URL: http://svn.reactos.org/svn/reactos?rev=23263&view=rev Log: Kill a ungly hack; I will rewrite it later 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 Mon Jul 24 12:34:18 2006 @@ -488,55 +488,7 @@ } -const DDPIXELFORMAT pixelformats[] = -{ - /* 8bpp paletted */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 15bpp 5/5/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, - { 0x1F } }, - /* 16bpp 5/6/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, - { 0x1F } }, - /* 24bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 32bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } } -}; - -const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); - -/* more surface format not adding it */ - /* 4 bit paletted 0 */ - // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 - - ///* 8bpp paletted 1 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, - - ///* 15bpp 5:5:5 RGB 2 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, - - ///* 15bpp 1:5:5:5 ARGB 3 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, - - ///* 16bpp 5:6:5 RGB 4 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} - - ///* 16bpp 4:4:4:4 ARGB 5 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, - - /* 24bpp 8/8/8 RGB 6 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, - - /* 32bpp 8:8:8 RGB 7 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, - - /* 32bpp 8:8:8:8 ARGB 8*/ - // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} - + @@ -993,108 +945,7 @@ LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDSURFACEDESC2 desc_callback; - DEVMODE DevMode; - int iMode=0; - - if (pDDSD!=NULL) - { - // FIXME fill in pDDSD - } - - RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); - desc_callback.dwSize = sizeof(DDSURFACEDESC2); - - desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_CAPS | DDSD_PITCH; - - if (dwFlags & DDEDM_REFRESHRATES) - { - desc_callback.dwFlags |= DDSD_REFRESHRATE; - desc_callback.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - } - - - /// FIXME check if the mode are suppretd before sending it back - - while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) - { - - if (pDDSD) - { - if ((pDDSD->dwFlags & DDSD_WIDTH) && (pDDSD->dwWidth != DevMode.dmPelsWidth)) - continue; - if ((pDDSD->dwFlags & DDSD_HEIGHT) && (pDDSD->dwHeight != DevMode.dmPelsHeight)) - continue; - if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) && - (pDDSD->ddpfPixelFormat.dwRGBBitCount != DevMode.dmBitsPerPel)) - continue; - } - - - desc_callback.dwHeight = DevMode.dmPelsHeight; - desc_callback.dwWidth = DevMode.dmPelsWidth; - - if (DevMode.dmFields & DM_DISPLAYFREQUENCY) - { - desc_callback.dwRefreshRate = DevMode.dmDisplayFrequency; - } - - switch(DevMode.dmBitsPerPel) - { - case 8: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[0],sizeof(DDPIXELFORMAT)); - break; - - case 15: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[1],sizeof(DDPIXELFORMAT)); - break; - - case 16: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[2],sizeof(DDPIXELFORMAT)); - break; - - - case 24: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[3],sizeof(DDPIXELFORMAT)); - break; - - case 32: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[4],sizeof(DDPIXELFORMAT)); - break; - - default: - break; - } - - if (desc_callback.ddpfPixelFormat.dwRGBBitCount==15) - { - desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; - } - else - { - desc_callback.lPitch = DevMode.dmPelsWidth * (desc_callback.ddpfPixelFormat.dwRGBBitCount / 8); - desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; - } - - desc_callback.ddsCaps.dwCaps = 0; - if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) - { - desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; - } - - - if (callback(&desc_callback, context) == DDENUMRET_CANCEL) - { - - return DD_OK; - } - - iMode++; - } - - return DD_OK; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags,

1 0

[greatlrd] 23262: 1. move some member from global DirectDraw struct to Surface struct. 2. Free some memory I forget 3. Move some surface code to startup.c for it is global info. 4. Cleaning up bit more in ddraw_main.c Regress to createsurface for some apps that did work. Can not be help at moment. only 1 ms dx sdk 6 directdraw apps work, and DrFred demo apps. will fix this regress later.
by greatlrd＠svn.reactos.org 24 Jul '06

24 Jul '06

Author: greatlrd Date: Mon Jul 24 12:31:22 2006 New Revision: 23262 URL: http://svn.reactos.org/svn/reactos?rev=23262&view=rev Log: 1. move some member from global DirectDraw struct to Surface struct. 2. Free some memory I forget 3. Move some surface code to startup.c for it is global info. 4. Cleaning up bit more in ddraw_main.c Regress to createsurface for some apps that did work. Can not be help at moment. only 1 ms dx sdk 6 directdraw apps work, and DrFred demo apps. will fix this regress later. Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Mon Jul 24 12:31:22 2006 @@ -35,9 +35,9 @@ return DDERR_NODRIVERSUPPORT; } - mDdBlt.lpDDDestSurface = This->Owner->mpPrimaryLocals[0]; - - if (!DdResetVisrgn(This->Owner->mpPrimaryLocals[0], NULL)) + mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->Surf->mpPrimaryLocals[0], NULL)) { return DDERR_NOGDI; } @@ -113,7 +113,7 @@ Lock.lpDD = &This->Owner->mDDrawGlobal; Lock.lpSurfData = NULL; - if (!DdResetVisrgn(&This->Owner->mPrimaryLocal, NULL)) + if (!DdResetVisrgn(&This->Surf->mPrimaryLocal, NULL)) { OutputDebugStringA("Here DdResetVisrgn lock"); return DDERR_UNSUPPORTED; @@ -138,13 +138,13 @@ { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); // FIXME the interanl mddsdPrimary shall be DDSURFACEDESC2 - memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); + memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC2)); pDDSD->dwSize = sizeof(DDSURFACEDESC2); } if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC)); - memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); + memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); pDDSD->dwSize = sizeof(DDSURFACEDESC); } 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 Mon Jul 24 12:31:22 2006 @@ -260,315 +260,6 @@ -const DDPIXELFORMAT pixelformats[] = -{ - /* 8bpp paletted */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 15bpp 5/5/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, - { 0x1F } }, - /* 16bpp 5/6/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, - { 0x1F } }, - /* 24bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 32bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } } -}; - -const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); - -/* more surface format not adding it */ - /* 4 bit paletted 0 */ - // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 - - ///* 8bpp paletted 1 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, - - ///* 15bpp 5:5:5 RGB 2 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, - - ///* 15bpp 1:5:5:5 ARGB 3 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, - - ///* 16bpp 5:6:5 RGB 4 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} - - ///* 16bpp 4:4:4:4 ARGB 5 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, - - /* 24bpp 8/8/8 RGB 6 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, - - /* 32bpp 8:8:8 RGB 7 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, - - /* 32bpp 8:8:8:8 ARGB 8*/ - // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} - - - - -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ -HRESULT -WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (iface==NULL) - { - return DDERR_NOTINITIALIZED; - } - - if (This->InitializeDraw == TRUE) - { - return DDERR_ALREADYINITIALIZED; - } - else - { - This->InitializeDraw = TRUE; - } - - return DD_OK; -} - - - - - - -/* - * IMPLEMENT - * Status - * not finish yet but is working fine - * it prevent memmory leaks at exit - */ - - - - - - -HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) -{ - // TODO: - // - create a scaner that check which driver we should get the HDC from - // for now we always asume it is the active dirver that should be use. - // - allow more Flags - - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; - - // check the parameters - if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) - return DD_OK; - - if (This->cooperative_level) - return DDERR_EXCLUSIVEMODEALREADYSET; - - if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) - return DDERR_INVALIDPARAMS; - - if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) - return DDERR_INVALIDPARAMS; - - // set the data - This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; - This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); - - - /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ - //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags - - This->cooperative_level = cooplevel; - - if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) - { - DX_STUB_str("HAL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; - } - else - { - DX_STUB_str("HEL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; - } - - SetExclusiveMode.lpDD = &This->mDDrawGlobal; - SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; - SetExclusiveMode.dwEnterExcl = This->cooperative_level; - - if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return SetExclusiveMode.ddRVal; -} - -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //BOOL dummy = TRUE; - - DX_WINDBG_trace_res((int)dwWidth, (int)dwHeight, (int)dwBPP ); - /* FIXME check the refresrate if it same if it not same do the mode switch */ - if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && - (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && - (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) - { - - return DD_OK; - } - - if (This->mDdSetMode.SetMode == NULL ) - { - return DDERR_NODRIVERSUPPORT; - } - - - This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; - - // FIXME : fill the mode.inexcl; - // FIXME : fill the mode.useRefreshRate; - - /* FIXME - we hardcoding modIndex list we should - try getting it from ReactOS instead and compare it - for now a small hack for do, using VBE 3.0 mode - index table todo it. - */ - - /* 320x200 15, 16, 32 */ - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x10d; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x10e; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x10f; - } - - - /* 640x400 8 */ - if ((dwHeight == 400) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x100; - } - - /* 640x480 8, 15, 16 , 32*/ - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x101; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x110; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x111; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x112; - } - - /* 800x600 4, 8, 15, 16 , 32*/ - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x102; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x103; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x113; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x114; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x115; - } - - /* 1024x768 8, 15, 16 , 32*/ - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x104; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x105; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x116; - } - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x117; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x118; - } - - /* not coding for 1280x1024 */ - - - if (This->mDdSetMode.SetMode(&This->mDdSetMode)==DDHAL_DRIVER_HANDLED); - { - - //if (This->mDdSetMode.ddRVal == DD_OK) - //{ - // // DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - // /* FIXME fill the This->DirectDrawGlobal.vmiData right */ - //} - - return This->mDdSetMode.ddRVal; - } - return DDERR_NODRIVERSUPPORT; -} - - - - - HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) @@ -577,113 +268,140 @@ DxSurf *surf; - if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; - - if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) - return DDERR_UNSUPPORTED; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + IDirectDrawSurfaceImpl* That; + + + if (pUnkOuter!=NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface CLASS_E_NOAGGREGATION"); + return CLASS_E_NOAGGREGATION; + } + + if( sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_UNSUPPORTED1"); + return DDERR_UNSUPPORTED; + } + + if( This == NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_UNSUPPORTED2"); + return DDERR_UNSUPPORTED; + } + + if (This->mDDrawGlobal.dsList == NULL) + { + /* Fail alloc memmory at startup */ + DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY1"); + return E_OUTOFMEMORY; + } + + if (pDDSD->ddsCaps.dwCaps == 0) + { + pDDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + } + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) + { + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + if ((pDDSD->dwFlags & DDSD_LPSURFACE) && (pDDSD->lpSurface == NULL)) + { + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + That = (IDirectDrawSurfaceImpl*)DxHeapMemAlloc(sizeof(IDirectDrawSurfaceImpl)); + if (That == NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY2"); + return E_OUTOFMEMORY; + } + + surf = (DxSurf*)DxHeapMemAlloc(sizeof(DxSurf)); + if (surf == NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY3"); + DxHeapMemFree(That); + return E_OUTOFMEMORY; + } // the nasty com stuff - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - IDirectDrawSurfaceImpl* That; - - That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); - - if (That == NULL) - { - return E_OUTOFMEMORY; - } - ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); - - surf = (DxSurf*)HeapAlloc(GetProcessHeap(), 0, sizeof(DxSurf)); - - if (surf == NULL) - { - // FIXME Free memmory at exit - return E_OUTOFMEMORY; - } - - That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; - *ppSurf = (LPDIRECTDRAWSURFACE7)That; - - // FIXME free This->mDDrawGlobal.dsList on release - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDRAWI_DDRAWSURFACE_INT)); + *ppSurf = (LPDIRECTDRAWSURFACE7)That; + + /* setup some stuff */ That->Owner = (IDirectDrawImpl *)This; That->Owner->mDDrawGlobal.dsList->dwIntRefCnt =1; + That->Surf = surf; /* 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; - - - - - + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Owner->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Owner->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED1"); + DxHeapMemFree(That); + DxHeapMemFree(surf); return DDERR_NOTINITIALIZED; } if (This->mDdCanCreateSurface.ddRVal != DD_OK) { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED2"); + DxHeapMemFree(That); + DxHeapMemFree(surf); 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->Owner->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Owner->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Owner->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Owner->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; - That->Owner->mPrimaryLocal.lpSurfMore = &That->Owner->mPrimaryMore; - That->Owner->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + 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->Owner->mPrimaryLocal.ddsCaps.dwCaps = That->Owner->mddsdPrimary.ddsCaps.dwCaps; - That->Owner->mpPrimaryLocals[0] = &That->Owner->mPrimaryLocal; - + + /* + FIXME we are now supproting DDSURFACEDESC2 in rosdraw.h we need make use of it it + */ + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; - - This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; - This->mDdCreateSurface.lplpSList = That->Owner->mpPrimaryLocals; + 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) { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED3"); + DxHeapMemFree(That); + DxHeapMemFree(surf); return DDERR_NOTINITIALIZED; } if (This->mDdCreateSurface.ddRVal != DD_OK) { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface ERROR"); + DxHeapMemFree(That); + DxHeapMemFree(surf); return This->mDdCreateSurface.ddRVal; } @@ -700,157 +418,51 @@ DDSD_ZBUFFERBITDEPTH */ - That->Owner->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Owner->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + 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->Owner->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Owner->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; + That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; } if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Owner->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; + That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; } if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Owner->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; + That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; } if ( This->mDDrawGlobal.dwMonitorFrequency != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Owner->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; + That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; } if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Owner->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; + That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; } - That->Surf->mpInUseSurfaceLocals[0] = &That->Owner->mPrimaryLocal; + That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; + + DX_STUB_str("Fail Main_DirectDraw_CreateSurface OK"); return DD_OK; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); - memcpy(&That->Surf->mddsdOverlay, pDDSD, sizeof(DDSURFACEDESC)); - That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - That->Surf->mddsdOverlay.dwWidth = pDDSD->dwWidth; //pels; - That->Surf->mddsdOverlay.dwHeight = pDDSD->dwHeight; // lines; - That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize = pDDSD->ddpfPixelFormat.dwSize; - That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = pDDSD->ddpfPixelFormat.dwFlags; - That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = pDDSD->ddpfPixelFormat.dwRGBBitCount; - - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - - memset(&That->Surf->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - That->Surf->mOverlayGlobal.dwGlobalFlags = 0; - That->Surf->mOverlayGlobal.lpDD = &This->mDDrawGlobal; - That->Surf->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; - That->Surf->mOverlayGlobal.wWidth = (WORD)That->Surf->mddsdOverlay.dwWidth; - That->Surf->mOverlayGlobal.wHeight = (WORD)That->Surf->mddsdOverlay.dwHeight; - That->Surf->mOverlayGlobal.lPitch = -1; - That->Surf->mOverlayGlobal.ddpfSurface = That->Surf->mddsdOverlay.ddpfPixelFormat; - - memset(&That->Surf->mOverlayMore[0], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Surf->mOverlayMore[0].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Surf->mOverlayLocal[0], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Surf->mOverlayLocal[0].lpGbl = &That->Surf->mOverlayGlobal; - That->Surf->mOverlayLocal[0].lpSurfMore = &That->Surf->mOverlayMore[0]; - That->Surf-> mOverlayLocal[0].dwProcessId = GetCurrentProcessId(); - That->Surf->mOverlayLocal[0].dwFlags = DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER; - - That->Surf->mOverlayLocal[0].dwFlags |= - DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| - DDRAWISURF_HASPIXELFORMAT| - DDRAWISURF_HASOVERLAYDATA; - - That->Surf->mOverlayLocal[0].ddsCaps.dwCaps = That->Surf->mddsdOverlay.ddsCaps.dwCaps; - That->Surf->mpOverlayLocals[0] = &That->Surf->mOverlayLocal[0]; - - - DDHAL_CREATESURFACEDATA mDdCreateSurface; - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = That->Surf->mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - -/* - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; - mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->mpPrimaryLocals[0]; - mDdUpdateOverlay.lpDDSrcSurface = That->Surf->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) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - return mDdUpdateOverlay.ddRVal; - } -*/ - - That->Surf->mpInUseSurfaceLocals[0] = That->Surf->mpOverlayLocals[0]; - return DD_OK; + DX_STUB_str( "Can not create overlay surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) { @@ -869,9 +481,324 @@ DX_STUB_str( "Can not create offscreenplain surface"); } + DxHeapMemFree(That); + DxHeapMemFree(surf); return DDERR_INVALIDSURFACETYPE; } + + +const DDPIXELFORMAT pixelformats[] = +{ + /* 8bpp paletted */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } }, + /* 15bpp 5/5/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, + { 0x1F } }, + /* 16bpp 5/6/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, + { 0x1F } }, + /* 24bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } }, + /* 32bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } } +}; + +const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); + +/* more surface format not adding it */ + /* 4 bit paletted 0 */ + // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 + + ///* 8bpp paletted 1 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, + + ///* 15bpp 5:5:5 RGB 2 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, + + ///* 15bpp 1:5:5:5 ARGB 3 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, + + ///* 16bpp 5:6:5 RGB 4 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} + + ///* 16bpp 4:4:4:4 ARGB 5 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, + + /* 24bpp 8/8/8 RGB 6 */ + // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, + + /* 32bpp 8:8:8 RGB 7 */ + // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, + + /* 32bpp 8:8:8:8 ARGB 8*/ + // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} + + + + +/* + * IMPLEMENT + * Status this api is finish and is 100% correct + */ +HRESULT +WINAPI +Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (iface==NULL) + { + return DDERR_NOTINITIALIZED; + } + + if (This->InitializeDraw == TRUE) + { + return DDERR_ALREADYINITIALIZED; + } + else + { + This->InitializeDraw = TRUE; + } + + return DD_OK; +} + + + + + + +/* + * IMPLEMENT + * Status + * not finish yet but is working fine + * it prevent memmory leaks at exit + */ + + + + + + +HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) +{ + // TODO: + // - create a scaner that check which driver we should get the HDC from + // for now we always asume it is the active dirver that should be use. + // - allow more Flags + + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + + // check the parameters + if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) + return DD_OK; + + if (This->cooperative_level) + return DDERR_EXCLUSIVEMODEALREADYSET; + + if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) + return DDERR_INVALIDPARAMS; + + if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) + return DDERR_INVALIDPARAMS; + + // set the data + This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; + This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); + + + /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ + //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags + + This->cooperative_level = cooplevel; + + if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) + { + DX_STUB_str("HAL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; + } + else + { + DX_STUB_str("HEL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; + } + + SetExclusiveMode.lpDD = &This->mDDrawGlobal; + SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; + SetExclusiveMode.dwEnterExcl = This->cooperative_level; + + if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return SetExclusiveMode.ddRVal; +} + +HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + //BOOL dummy = TRUE; + + DX_WINDBG_trace_res((int)dwWidth, (int)dwHeight, (int)dwBPP ); + /* FIXME check the refresrate if it same if it not same do the mode switch */ + if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && + (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && + (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) + { + + return DD_OK; + } + + if (This->mDdSetMode.SetMode == NULL ) + { + return DDERR_NODRIVERSUPPORT; + } + + + This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; + + // FIXME : fill the mode.inexcl; + // FIXME : fill the mode.useRefreshRate; + + /* FIXME + we hardcoding modIndex list we should + try getting it from ReactOS instead and compare it + for now a small hack for do, using VBE 3.0 mode + index table todo it. + */ + + /* 320x200 15, 16, 32 */ + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x10d; + } + + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x10e; + } + + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x10f; + } + + + /* 640x400 8 */ + if ((dwHeight == 400) && (dwWidth == 640) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x100; + } + + /* 640x480 8, 15, 16 , 32*/ + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x101; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x110; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x111; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x112; + } + + /* 800x600 4, 8, 15, 16 , 32*/ + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 4)) + { + This->mDdSetMode.dwModeIndex = 0x102; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x103; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x113; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x114; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x115; + } + + /* 1024x768 8, 15, 16 , 32*/ + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 4)) + { + This->mDdSetMode.dwModeIndex = 0x104; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x105; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x116; + } + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x117; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x118; + } + + /* not coding for 1280x1024 */ + + + if (This->mDdSetMode.SetMode(&This->mDdSetMode)==DDHAL_DRIVER_HANDLED); + { + + //if (This->mDdSetMode.ddRVal == DD_OK) + //{ + // // DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); + // /* FIXME fill the This->DirectDrawGlobal.vmiData right */ + //} + + return This->mDdSetMode.ddRVal; + } + return DDERR_NODRIVERSUPPORT; +} + + + + + + + Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Mon Jul 24 12:31:22 2006 @@ -125,7 +125,7 @@ That = (IDirectDrawSurfaceImpl*)pAttach; //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) - return DdAttachSurface( That->Owner->mpPrimaryLocals[0],This->Owner->mpPrimaryLocals[0]); + return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); } /* MSDN: "not currently implemented." */ @@ -274,7 +274,7 @@ This = (IDirectDrawSurfaceImpl*)iface; RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); - pCaps->dwCaps = This->Owner->mddsdPrimary.ddsCaps.dwCaps; + pCaps->dwCaps = This->Surf->mddsdPrimary.ddsCaps.dwCaps; return DD_OK; } @@ -321,14 +321,14 @@ for now we aussme the surface exits and create the hDC for it */ - if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) - { - This->Owner->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); - *phDC = (HDC)This->Owner->mPrimaryLocal.hDC; + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) + { + This->Surf->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); + *phDC = (HDC)This->Surf->mPrimaryLocal.hDC; } else { - *phDC = (HDC)This->Owner->mpPrimaryLocals[0]->hDC; + *phDC = (HDC)This->Surf->mpPrimaryLocals[0]->hDC; } return DD_OK; @@ -420,7 +420,7 @@ } RtlZeroMemory(pDDSD,dwSize); - memcpy(pDDSD, &This->Owner->mddsdPrimary, sizeof(DDSURFACEDESC)); + memcpy(pDDSD, &This->Surf->mddsdPrimary, sizeof(DDSURFACEDESC)); pDDSD->dwSize = dwSize; return DD_OK; @@ -482,7 +482,7 @@ /* FIXME check if surface exits or not */ - if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) { return DDERR_GENERIC; } 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 Mon Jul 24 12:31:22 2006 @@ -94,25 +94,27 @@ DDHAL_GETSCANLINEDATA mDdGetScanLine; DDHAL_SETEXCLUSIVEMODEDATA mDdSetExclusiveMode; DDHAL_FLIPTOGDISURFACEDATA mDdFlipToGDISurface; - - /* Primarey surface we must reach it from every where */ - DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + + /* adding a switch */ + DWORD devicetype; + + /* Primarey surface we must reach it from every where */ + DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; + +} IDirectDrawImpl; + +/******** Surface Object ********/ +typedef struct +{ + /* Primarey surface we must reach it from every where */ DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; - DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; - DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - - DDSURFACEDESC2 mddsdPrimary; - - /* adding a switch */ - DWORD devicetype; - -} IDirectDrawImpl; - -/******** Surface Object ********/ -typedef struct -{ + DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; + DDSURFACEDESC2 mddsdPrimary; + + DDRAWI_DDRAWSURFACE_LCL *mpInUseSurfaceLocals[1]; @@ -138,12 +140,6 @@ IDirectDrawSurface3Vtbl* lpVtbl_v3; IDirectDrawImpl* Owner; - - DDRAWI_DDRAWSURFACE_GBL Global; - DDRAWI_DDRAWSURFACE_MORE More; - DDRAWI_DDRAWSURFACE_LCL Local; - DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; - DDSURFACEDESC ddsd; DxSurf *Surf; 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 Mon Jul 24 12:31:22 2006 @@ -364,6 +364,17 @@ 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)); + return DD_OK; }

1 0

[greatlrd] 23261: Revert 23251 it causing regress and it is ungly hack
by greatlrd＠svn.reactos.org 24 Jul '06

24 Jul '06

Author: greatlrd Date: Mon Jul 24 10:28:30 2006 New Revision: 23261 URL: http://svn.reactos.org/svn/reactos?rev=23261&view=rev Log: Revert 23251 it causing regress and it is ungly hack Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Jul 24 10:28:30 2006 @@ -1506,17 +1506,6 @@ { DPRINT1("Failed to reference window class!\n"); RETURN(NULL); - } - - if (Class->System) - { - if (hWndParent) - { - /* HACK - * use supplied window handle for notifications - */ - ParentWindowHandle = hWndParent; - } } WinSta = PsGetCurrentThreadWin32Thread()->Desktop->WindowStation;

1 0

[ion] 23260: - Fix trace macro to print line number in decimal, not hex. - Implement PspSetCrossThreadFlag and PspClearCrossThreadFlag and use them. Thanks to Thomas for the idea. - Fix a bug in Fast Referencing, thanks to Thomas.
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Mon Jul 24 01:38:31 2006 New Revision: 23260 URL: http://svn.reactos.org/svn/reactos?rev=23260&view=rev Log: - Fix trace macro to print line number in decimal, not hex. - Implement PspSetCrossThreadFlag and PspClearCrossThreadFlag and use them. Thanks to Thomas for the idea. - Fix a bug in Fast Referencing, thanks to Thomas. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/ps_x.h trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Mon Jul 24 01:38:31 2006 @@ -49,7 +49,7 @@ #endif #define PSREFTRACE(x) \ PSTRACE(PS_REF_DEBUG, \ - "Pointer Count [%p] @%lx: %lx\n", \ + "Pointer Count [%p] @%d: %lx\n", \ x, \ __LINE__, \ OBJECT_TO_OBJECT_HEADER(x)->PointerCount); Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Mon Jul 24 01:38:31 2006 @@ -18,6 +18,14 @@ #define PspQuantumLengthFromMask(Mask) \ ((Mask) & 48) + +// +// Cross Thread Flag routines +// +#define PspSetCrossThreadFlag(Thread, Flag) \ + InterlockedOr((PLONG)&Thread->CrossThreadFlags, Flag) +#define PspClearCrossThreadFlag(Thread, Flag) \ + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~Flag) VOID FORCEINLINE Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jul 24 01:38:31 2006 @@ -150,7 +150,7 @@ { /* Get the current count */ Value = FastRef->Value; - if (!Value & MAX_FAST_REFS) break; + if (!(Value & MAX_FAST_REFS)) break; /* Increase the reference count */ NewValue = Value - 1; Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Mon Jul 24 01:38:31 2006 @@ -905,7 +905,7 @@ ASSERT_IRQL(PASSIVE_LEVEL); /* Mark it as terminated */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_TERMINATED_BIT); + PspSetCrossThreadFlag(Thread, CT_TERMINATED_BIT); /* Directly terminate the thread */ PspExitThread(ExitStatus); Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Mon Jul 24 01:38:31 2006 @@ -17,7 +17,7 @@ #include "internal/ps_i.h" /* Debugging Level */ -ULONG PspTraceLevel = 0; //PS_KILL_DEBUG | PS_REF_DEBUG; +ULONG PspTraceLevel = PS_KILL_DEBUG | PS_REF_DEBUG; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Mon Jul 24 01:38:31 2006 @@ -51,8 +51,7 @@ { /* Free it */ ExFreePool(Thread->ImpersonationInfo); - InterlockedAnd((PLONG)&Thread->CrossThreadFlags, - ~CT_ACTIVE_IMPERSONATION_INFO_BIT); + PspClearCrossThreadFlag(Thread, CT_ACTIVE_IMPERSONATION_INFO_BIT); Thread->ImpersonationInfo = NULL; } } @@ -537,8 +536,7 @@ if (Thread->ActiveImpersonationInfo) { /* Disable impersonation */ - InterlockedAnd((PLONG)&Thread->CrossThreadFlags, - ~CT_ACTIVE_IMPERSONATION_INFO_BIT); + PspClearCrossThreadFlag(Thread, CT_ACTIVE_IMPERSONATION_INFO_BIT); /* Get the token */ Token = Thread->ImpersonationInfo->Token; @@ -584,8 +582,8 @@ if (Thread->ActiveImpersonationInfo) { /* Disable impersonation */ - InterlockedAnd((PLONG)&Thread->CrossThreadFlags, - ~CT_ACTIVE_IMPERSONATION_INFO_BIT); + PspClearCrossThreadFlag(Thread, + CT_ACTIVE_IMPERSONATION_INFO_BIT); /* Get the token */ OldToken = Thread->ImpersonationInfo->Token; @@ -632,8 +630,7 @@ else { /* Otherwise, enable impersonation */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, - CT_ACTIVE_IMPERSONATION_INFO_BIT); + PspSetCrossThreadFlag(Thread, CT_ACTIVE_IMPERSONATION_INFO_BIT); } /* Now fill it out */ @@ -880,14 +877,12 @@ Impersonation->Token = ImpersonationState->Token; /* Enable impersonation */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, - CT_ACTIVE_IMPERSONATION_INFO_BIT); + PspSetCrossThreadFlag(Thread, CT_ACTIVE_IMPERSONATION_INFO_BIT); } else { /* Disable impersonation */ - InterlockedAnd((PLONG)&Thread->CrossThreadFlags, - ~CT_ACTIVE_IMPERSONATION_INFO_BIT); + PspClearCrossThreadFlag(Thread, CT_ACTIVE_IMPERSONATION_INFO_BIT); } /* Unlock the thread */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Mon Jul 24 01:38:31 2006 @@ -293,7 +293,7 @@ { /* System Thread */ Thread->StartAddress = StartRoutine; - InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_SYSTEM_THREAD_BIT); + PspSetCrossThreadFlag(Thread, CT_SYSTEM_THREAD_BIT); /* Let the kernel intialize the Thread */ Status = KeInitThread(&Thread->Tcb, @@ -380,7 +380,7 @@ if (!NT_SUCCESS(Status)) { /* Access state failed, thread is dead */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + PspSetCrossThreadFlag(Thread, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -422,7 +422,7 @@ Status = _SEH_GetExceptionCode(); /* Thread insertion failed, thread is dead */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + PspSetCrossThreadFlag(Thread, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -444,7 +444,7 @@ else { /* Thread insertion failed, thread is dead */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + PspSetCrossThreadFlag(Thread, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -465,7 +465,7 @@ if (!NT_SUCCESS(Status)) { /* Thread insertion failed, thread is dead */ - InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + PspSetCrossThreadFlag(Thread, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb);

1 0

[greatlrd] 23259: really small change using DDSURFACEDESC2 instead of DDSURFACEDESC, for these struct basic same but DDSURFACEDESC2 have few more member at end. and it is type casted around DDSURFACEDESC when it pass down. u can found that info in msdn, ddk, sdk
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: greatlrd Date: Mon Jul 24 00:54:53 2006 New Revision: 23259 URL: http://svn.reactos.org/svn/reactos?rev=23259&view=rev Log: really small change using DDSURFACEDESC2 instead of DDSURFACEDESC, for these struct basic same but DDSURFACEDESC2 have few more member at end. and it is type casted around DDSURFACEDESC when it pass down. u can found that info in msdn, ddk, sdk 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 Mon Jul 24 00:54:53 2006 @@ -634,7 +634,7 @@ memcpy(&That->Owner->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); That->Owner->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = &That->Owner->mddsdPrimary; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { @@ -672,7 +672,7 @@ - This->mDdCreateSurface.lpDDSurfaceDesc = &That->Owner->mddsdPrimary; + This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; This->mDdCreateSurface.lplpSList = That->Owner->mpPrimaryLocals; This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; 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 Mon Jul 24 00:54:53 2006 @@ -71,10 +71,7 @@ DWORD *mpFourCC; UINT mcTextures; - DDSURFACEDESC *mpTextures; - - - + DDSURFACEDESC2 *mpTextures; /* ExclusiveOwner */ @@ -106,7 +103,7 @@ DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - DDSURFACEDESC mddsdPrimary; + DDSURFACEDESC2 mddsdPrimary; /* adding a switch */ DWORD devicetype; 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 Mon Jul 24 00:54:53 2006 @@ -291,7 +291,7 @@ } This->mcTextures = This->mD3dDriverData.dwNumTextureFormats; - This->mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * This->mcTextures); + This->mpTextures = (DDSURFACEDESC2*) DxHeapMemAlloc(sizeof(DDSURFACEDESC2) * This->mcTextures); if (This->mpTextures == NULL) { DxHeapMemFree( This->mpFourCC); @@ -304,7 +304,7 @@ This->mHALInfo.vmiData.pvmList = This->mpvmList; This->mHALInfo.lpdwFourCC = This->mpFourCC; - This->mD3dDriverData.lpTextureFormats = This->mpTextures; + This->mD3dDriverData.lpTextureFormats = (DDSURFACEDESC*) This->mpTextures; if (!DdQueryDirectDrawObject( &This->mDDrawGlobal, @@ -315,7 +315,7 @@ &This->mD3dCallbacks, &This->mD3dDriverData, &This->mCallbacks.HALDDExeBuf, - This->mpTextures, + (DDSURFACEDESC*)This->mpTextures, This->mpFourCC, This->mpvmList))

1 0

[greatlrd] 23258: Forget remove ref in rosdraw.h
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: greatlrd Date: Mon Jul 24 00:39:46 2006 New Revision: 23258 URL: http://svn.reactos.org/svn/reactos?rev=23258&view=rev Log: Forget remove ref in rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h 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 Mon Jul 24 00:39:46 2006 @@ -172,8 +172,7 @@ typedef struct { IDirectDrawPaletteVtbl* lpVtbl; - LONG ref; - + IDirectDrawImpl* owner; DDRAWI_DDRAWPALETTE_GBL DDPalette; } IDirectDrawPaletteImpl;

1 0

[greatlrd] 23257: 1. start Cleaning up ddraw_main.c 2. Implement (not tested) CreatePalette it can use HAL or HEL 3. change DirectDraw_Addref and DirectDraw_Release using document dwRefCnt in DDRAWI_DIRECTDRAW_LCL 4. change Palette_Addref and Palette_Release using document dwRefCnt in DDRAWI_DDRAWPALETTE_GBL more cleanup will follow
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: greatlrd Date: Mon Jul 24 00:38:28 2006 New Revision: 23257 URL: http://svn.reactos.org/svn/reactos?rev=23257&view=rev Log: 1. start Cleaning up ddraw_main.c 2. Implement (not tested) CreatePalette it can use HAL or HEL 3. change DirectDraw_Addref and DirectDraw_Release using document dwRefCnt in DDRAWI_DIRECTDRAW_LCL 4. change Palette_Addref and Palette_Release using document dwRefCnt in DDRAWI_DDRAWPALETTE_GBL more cleanup will follow Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/palette.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 Mon Jul 24 00:38:28 2006 @@ -9,6 +9,256 @@ */ #include "rosdraw.h" + +/* + * IMPLEMENT + * Status ok + */ +HRESULT +WINAPI +Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, + REFIID id, + LPVOID *obj) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (IsEqualGUID(&IID_IDirectDraw7, id)) + { + *obj = &This->lpVtbl; + } + else if (IsEqualGUID(&IID_IDirectDraw, id)) + { + *obj = &This->lpVtbl_v1; + } + else if (IsEqualGUID(&IID_IDirectDraw2, id)) + { + *obj = &This->lpVtbl_v2; + } + else if (IsEqualGUID(&IID_IDirectDraw4, id)) + { + *obj = &This->lpVtbl_v4; + } + else + { + *obj = NULL; + return E_NOINTERFACE; + } + + Main_DirectDraw_AddRef(iface); + return S_OK; +} + +/* + * IMPLEMENT + * Status ok + */ +ULONG +WINAPI +Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedIncrement( (PLONG) &This->mDDrawLocal.dwLocalRefCnt); + } + return ref; +} + +/* + * IMPLEMENT + * Status ok + */ +ULONG +WINAPI +Main_DirectDraw_Release (LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + ULONG ref=0; + + if (iface!=NULL) + { + ref = InterlockedDecrement( (PLONG) &This->mDDrawLocal.dwLocalRefCnt); + + if (ref == 0) + { + // set resoltion back to the one in registry + if(This->cooperative_level & DDSCL_EXCLUSIVE) + { + ChangeDisplaySettings(NULL, 0); + } + + Cleanup(iface); + if (This!=NULL) + { + HeapFree(GetProcessHeap(), 0, This); + } + } + } + return ref; +} +/* + * IMPLEMENT + * Status ok + */ +HRESULT +WINAPI +Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) +{ + /* MSDN say not implement but my question what does it return then */ + DX_WINDBG_trace(); + return DD_OK; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT +WINAPI +Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter) +{ + DX_WINDBG_trace(); + + if (pUnkOuter!=NULL) + return DDERR_INVALIDPARAMS; + + IDirectDrawClipperImpl* That; + That = (IDirectDrawClipperImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawClipperImpl)); + + if (That == NULL) + return E_OUTOFMEMORY; + + ZeroMemory(That, sizeof(IDirectDrawClipperImpl)); + + That->lpVtbl = &DirectDrawClipper_Vtable; + That->ref = 1; + *ppClipper = (LPDIRECTDRAWCLIPPER)That; + + return That->lpVtbl->Initialize (*ppClipper, (LPDIRECTDRAW)iface, dwFlags); +} + + +HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawPaletteImpl* That; + DX_WINDBG_trace(); + + if (pUnkOuter!=NULL) + { + return CLASS_E_NOAGGREGATION; + } + + if(!This->cooperative_level) + { + return DDERR_NOCOOPERATIVELEVELSET; + } + + if (This->mDdCreatePalette.CreatePalette == NULL) + { + return DDERR_NODRIVERSUPPORT; + } + + That = (IDirectDrawPaletteImpl*)DxHeapMemAlloc(sizeof(IDirectDrawPaletteImpl)); + if (That == NULL) + { + return E_OUTOFMEMORY; + } + + That->lpVtbl = &DirectDrawPalette_Vtable; + *ppPalette = (LPDIRECTDRAWPALETTE)That; + + That->DDPalette.dwRefCnt = 1; + That->DDPalette.lpDD_lcl = &This->mDDrawLocal; + That->DDPalette.dwProcessId = GetCurrentProcessId(); + That->DDPalette.lpColorTable = palent; + + if (dwFlags & DDPCAPS_1BIT) + { + That->DDPalette.dwFlags |= DDRAWIPAL_2 ; + } + if (dwFlags & DDPCAPS_2BIT) + { + That->DDPalette.dwFlags |= DDRAWIPAL_4 ; + } + if (dwFlags & DDPCAPS_4BIT) + { + That->DDPalette.dwFlags |= DDRAWIPAL_16 ; + } + if (dwFlags & DDPCAPS_8BIT) + { + That->DDPalette.dwFlags |= DDRAWIPAL_256 ; + } + + if (dwFlags & DDPCAPS_ALPHA) + { + That->DDPalette.dwFlags |= DDRAWIPAL_ALPHA; + } + if (dwFlags & DDPCAPS_ALLOW256) + { + That->DDPalette.dwFlags |= DDRAWIPAL_ALLOW256 ; + } + /* FIXME see + http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wceddk5/ht… + + if (dwFlags & DDPCAPS_8BITENTRIES) + { + That->DDPalette.dwFlags |= 0; + } + + if (dwFlags & DDPCAPS_INITIALIZE) + { + That->DDPalette.dwFlags |= 0; + } + if (dwFlags & DDPCAPS_PRIMARYSURFACE) + { + That->DDPalette.dwFlags |= 0; + } + if (dwFlags & DDPCAPS_PRIMARYSURFACELEFT) + { + That->DDPalette.dwFlags |= 0; + } + if (dwFlags & DDPCAPS_VSYNC) + { + That->DDPalette.dwFlags |= 0; + } + */ + + + /* We need fill in this right + That->DDPalette.hHELGDIPalette/dwReserved1 + That->DDPalette.dwContentsStamp + That->DDPalette.dwSaveStamp + */ + + This->mDdCreatePalette.lpDDPalette = &That->DDPalette; + This->mDdCreatePalette.lpColorTable = palent; + + if (This->mDdCreatePalette.CreatePalette(&This->mDdCreatePalette) == DDHAL_DRIVER_HANDLED); + { + if (This->mDdSetMode.ddRVal == DD_OK) + { + Main_DirectDraw_AddRef(iface); + return That->lpVtbl->Initialize (*ppPalette, (LPDIRECTDRAW)iface, dwFlags, palent); + } + } + + return DDERR_NODRIVERSUPPORT; +} + + const DDPIXELFORMAT pixelformats[] = { @@ -91,25 +341,10 @@ return DD_OK; } -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ -ULONG -WINAPI -Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref=0; - - if (iface!=NULL) - { - ref = InterlockedIncrement( (PLONG) &This->ref); - } - return ref; -} + + + + /* * IMPLEMENT @@ -117,36 +352,6 @@ * not finish yet but is working fine * it prevent memmory leaks at exit */ -ULONG -WINAPI -Main_DirectDraw_Release (LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - ULONG ref=0; - - if (iface!=NULL) - { - ref = InterlockedDecrement( (PLONG) &This->ref); - - if (ref == 0) - { - // set resoltion back to the one in registry - if(This->cooperative_level & DDSCL_EXCLUSIVE) - { - ChangeDisplaySettings(NULL, 0); - } - - Cleanup(iface); - if (This!=NULL) - { - HeapFree(GetProcessHeap(), 0, This); - } - } - } - return ref; -} @@ -363,45 +568,7 @@ -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ -HRESULT -WINAPI -Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, - REFIID id, - LPVOID *obj) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (IsEqualGUID(&IID_IDirectDraw7, id)) - { - *obj = &This->lpVtbl; - } - else if (IsEqualGUID(&IID_IDirectDraw, id)) - { - *obj = &This->lpVtbl_v1; - } - else if (IsEqualGUID(&IID_IDirectDraw2, id)) - { - *obj = &This->lpVtbl_v2; - } - else if (IsEqualGUID(&IID_IDirectDraw4, id)) - { - *obj = &This->lpVtbl_v4; - } - else - { - *obj = NULL; - return E_NOINTERFACE; - } - - Main_DirectDraw_AddRef(iface); - return S_OK; -} + HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) @@ -706,28 +873,7 @@ } -HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) -{ - DX_WINDBG_trace(); - - if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; - - IDirectDrawClipperImpl* That; - That = (IDirectDrawClipperImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawClipperImpl)); - - if (That == NULL) - return E_OUTOFMEMORY; - - ZeroMemory(That, sizeof(IDirectDrawClipperImpl)); - - That->lpVtbl = &DirectDrawClipper_Vtable; - That->ref = 1; - *ppClipper = (LPDIRECTDRAWCLIPPER)That; - - return That->lpVtbl->Initialize (*ppClipper, (LPDIRECTDRAW)iface, dwFlags); -} + // This function is exported by the dll HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, @@ -738,28 +884,7 @@ return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); } -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) -{ - DX_WINDBG_trace(); - - if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; - - IDirectDrawPaletteImpl* That; - That = (IDirectDrawPaletteImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawPaletteImpl)); - - if (That == NULL) - return E_OUTOFMEMORY; - - ZeroMemory(That, sizeof(IDirectDrawPaletteImpl)); - - That->lpVtbl = &DirectDrawPalette_Vtable; - That->ref = 1; - *ppPalette = (LPDIRECTDRAWPALETTE)That; - - return That->lpVtbl->Initialize (*ppPalette, (LPDIRECTDRAW)iface, dwFlags, palent); -} + HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) { @@ -928,11 +1053,7 @@ /********************************** Stubs **********************************/ -HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} + HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) Modified: trunk/reactos/dll/directx/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/palette.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/palette.c (original) +++ trunk/reactos/dll/directx/ddraw/palette.c Mon Jul 24 00:38:28 2006 @@ -20,7 +20,7 @@ if (iface!=NULL) { - ref = InterlockedDecrement( (PLONG) &This->ref); + ref = InterlockedDecrement( (PLONG) &This->DDPalette.dwRefCnt); if (ref == 0) { @@ -30,7 +30,7 @@ if (This!=NULL) { - HeapFree(GetProcessHeap(), 0, This); + DxHeapMemFree(This); } } } @@ -48,7 +48,7 @@ if (iface!=NULL) { - ref = InterlockedIncrement( (PLONG) &This->ref); + ref = InterlockedIncrement( (PLONG) &This->DDPalette.dwRefCnt); } return ref; }

1 0

[ion] 23256: - Temporarly disable screensaver code. Sorry greatlord but you're creating 150 realtime threads per minute and killing the system with the code. Please fix it. - Fix some incorrect tracing macro usage and make it add the current line. - Re-organize I/O bugs per priority.
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Mon Jul 24 00:12:45 2006 New Revision: 23256 URL: http://svn.reactos.org/svn/reactos?rev=23256&view=rev Log: - Temporarly disable screensaver code. Sorry greatlord but you're creating 150 realtime threads per minute and killing the system with the code. Please fix it. - Fix some incorrect tracing macro usage and make it add the current line. - Re-organize I/O bugs per priority. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Mon Jul 24 00:12:45 2006 @@ -9,20 +9,19 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Io: -// - Add support for Fast Dispatch I/O. -// - Verify ShareAccess APIs, XP added some new semantics. +// - Fix double-reference in IopCreateFile. +// - Add SEH to some places where it's missing (MDLs, etc) (iofunc). +// - Add a generic Cleanup/Exception Routine (iofunc). +// - See why queueing IRPs and cancelling them causes crashes +// - Add another parameter to IopCleanupFailedIrp. // - Add Access Checks in IopParseDevice. // - Add validation checks in IoCreateFile. -// - Fix double-reference in IopCreateFile. +// - Add probe/alignment checks for Query/Set routines. +// - Add tracing to iofunc.c // - Add tracing to file.c -// - See why queueing IRPs and cancelling them causes crashes -// - Add SEH to some places where it's missing (MDLs, etc) (iofunc). -// - Add a generic Cleanup/Exception Routine (iofunc). -// - Add probe/alignment checks for Query/Set routines. -// - Add another parameter to IopCleanupFailedIrp. +// - Add support for some fast-paths when querying/setting data. +// - Verify ShareAccess APIs, XP added some new semantics. // - Add support for Fast Dispatch I/O. -// - Add support for some fast-paths when querying/setting data. -// - Add tracing to iofunc.c // // Ps: // - Figure out why processes don't die. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Mon Jul 24 00:12:45 2006 @@ -49,7 +49,9 @@ #endif #define PSREFTRACE(x) \ PSTRACE(PS_REF_DEBUG, \ - "Pointer Count: %lx\n", \ + "Pointer Count [%p] @%lx: %lx\n", \ + x, \ + __LINE__, \ OBJECT_TO_OBJECT_HEADER(x)->PointerCount); #else #define PSTRACE(x, ...) DPRINT(__VA_ARGS__); Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Mon Jul 24 00:12:45 2006 @@ -400,7 +400,7 @@ (PVOID*)&Parent, NULL); if (!NT_SUCCESS(Status)) return Status; - PSREFTRACE(ParentProcess); + PSREFTRACE(Parent); /* If this process should be in a job but the parent isn't */ if ((InJob) && (!Parent->Job)) @@ -1426,7 +1426,7 @@ /* Dereference the Process */ ObDereferenceObject(Process); PSREFTRACE(Process); - PSREFTRACE(Thread); + if (Thread) PSREFTRACE(Thread); } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Mon Jul 24 00:12:45 2006 @@ -169,7 +169,7 @@ NTSTATUS Status; BOOL FirstTime = TRUE; - + return; KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3);

1 0

[greatlrd] 23255: Forget commit some changes
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: greatlrd Date: Sun Jul 23 23:57:36 2006 New Revision: 23255 URL: http://svn.reactos.org/svn/reactos?rev=23255&view=rev Log: Forget commit some changes Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h 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 Jul 23 23:57:36 2006 @@ -19,11 +19,28 @@ /* DirectDraw Cleanup code only internal use */ VOID Cleanup(LPDIRECTDRAW7 iface); - /* own macro to alloc memmory */ #define DxHeapMemAlloc(m) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m) #define DxHeapMemFree(p) HeapFree(GetProcessHeap(), 0, p); /******** Main Object ********/ + +/* Public interface */ +HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, REFIID id, LPVOID *obj); +ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface); +ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface); +HRESULT WINAPI Main_DirectDraw_Compact (LPDIRECTDRAW7 iface); + +HRESULT WINAPI Main_DirectDraw_CreateClipper (LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter); + +HRESULT WINAPI Main_DirectDraw_CreatePalette (LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPPALETTEENTRY palent, + LPDIRECTDRAWPALETTE* ppPalette, + LPUNKNOWN pUnkOuter); + typedef struct { @@ -68,10 +85,7 @@ /* HEL stuff */ DWORD HELMemoryAvilable; - - /* internal counter */ - ULONG ref; - + /* DD Callbacks info */ DDHAL_DESTROYDRIVERDATA mDdDestroyDriver; DDHAL_CREATESURFACEDATA mDdCreateSurface; @@ -94,6 +108,9 @@ DDSURFACEDESC mddsdPrimary; + /* adding a switch */ + DWORD devicetype; + } IDirectDrawImpl; /******** Surface Object ********/ @@ -158,7 +175,7 @@ LONG ref; IDirectDrawImpl* owner; - + DDRAWI_DDRAWPALETTE_GBL DDPalette; } IDirectDrawPaletteImpl; /******** Gamma Object ********/

1 0

[ion] 23254: - Add tracing in process/thread.c as well. - Add a new tracing class/macro for reference counts and add it in kill/process/thread.c. - Remove tracing TODO from kernel fun.
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Sun Jul 23 23:45:16 2006 New Revision: 23254 URL: http://svn.reactos.org/svn/reactos?rev=23254&view=rev Log: - Add tracing in process/thread.c as well. - Add a new tracing class/macro for reference counts and add it in kill/process/thread.c. - Remove tracing TODO from kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sun Jul 23 23:45:16 2006 @@ -27,7 +27,6 @@ // Ps: // - Figure out why processes don't die. // - Generate process cookie for user-more thread. -// - Add tracing. // // Ob: // - Possible bug in deferred deletion under Cc Rewrite branch. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Sun Jul 23 23:45:16 2006 @@ -23,6 +23,7 @@ #define PS_STATE_DEBUG 0x40 #define PS_QUOTA_DEBUG 0x80 #define PS_KILL_DEBUG 0x100 +#define PS_REF_DEBUG 0x200 // // Debug/Tracing support @@ -46,8 +47,13 @@ DbgPrint(__VA_ARGS__); \ } #endif +#define PSREFTRACE(x) \ + PSTRACE(PS_REF_DEBUG, \ + "Pointer Count: %lx\n", \ + OBJECT_TO_OBJECT_HEADER(x)->PointerCount); #else #define PSTRACE(x, ...) DPRINT(__VA_ARGS__); +#define PSREFTRACE(x) #endif // Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=232… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Sun Jul 23 23:45:16 2006 @@ -85,6 +85,7 @@ PAGED_CODE(); PSTRACE(PS_KILL_DEBUG, "Process: %p ExitStatus: %p\n", Process, ExitStatus); + PSREFTRACE(Process); /* Check if this is a Critical Process */ if (Process->BreakOnTermination) @@ -103,7 +104,9 @@ while (Thread) { /* Kill it */ + PSREFTRACE(Thread); PspTerminateThreadByPointer(Thread, ExitStatus, FALSE); + PSREFTRACE(Thread); Thread = PsGetNextProcessThread(Process, Thread); } @@ -111,6 +114,7 @@ if (Process->ObjectTable) ObClearProcessHandleTable(Process); /* Return success*/ + PSREFTRACE(Process); return STATUS_SUCCESS; } @@ -181,6 +185,7 @@ /* Dereference this thread */ ObDereferenceObject(Thread); + PSREFTRACE(Thread); } while ((NextEntry != NULL) && (NextEntry != (PVOID)1)); /* Remove magic value, keep looping if it got changed */ @@ -195,6 +200,7 @@ KAPC_STATE ApcState; PAGED_CODE(); PSTRACE(PS_KILL_DEBUG, "ObjectBody: %p\n", ObjectBody); + PSREFTRACE(Process); /* Check if it has an Active Process Link */ if (Process->ActiveProcessLinks.Flink) @@ -316,6 +322,7 @@ /* Destroy the Quota Block */ PspDestroyQuotaBlock(Process); + PSREFTRACE(Process); } VOID @@ -326,6 +333,7 @@ PEPROCESS Process = Thread->ThreadsProcess; PAGED_CODE(); PSTRACE(PS_KILL_DEBUG, "ObjectBody: %p\n", ObjectBody); + PSREFTRACE(Thread); ASSERT(Thread->Tcb.Win32Thread == NULL); /* Check if we have a stack */ @@ -351,6 +359,7 @@ PspDeleteThreadSecurity(Thread); /* Make sure the thread was inserted, before continuing */ + PSREFTRACE(Thread); if (!Process) return; /* Check if the thread list is valid */ @@ -370,6 +379,8 @@ /* Dereference the Process */ ObDereferenceObject(Process); + PSREFTRACE(Thread); + PSREFTRACE(Process); } /* @@ -401,6 +412,8 @@ ASSERT((Thread) == PsGetCurrentThread()); /* Can't terminate a thread if it attached another process */ + PSREFTRACE(Thread); + PSREFTRACE(CurrentProcess); if (KeIsAttachedProcess()) { /* Bugcheck */ @@ -624,6 +637,7 @@ PsW32ThreadCalloutExit); /* If we are the last thread and have a W32 Process */ + PSREFTRACE(Thread); if ((Last) && (CurrentProcess->Win32Process)) { /* Run it down too */ @@ -687,6 +701,8 @@ ASSERT(Thread->Tcb.CombinedApcDisable == 0); /* Check if this is the final thread or not */ + PSREFTRACE(Thread); + PSREFTRACE(CurrentProcess); if (Last) { /* Set the process exit time */ @@ -711,6 +727,7 @@ /* Kill the process in the Object Manager */ ObKillProcess(CurrentProcess); + PSREFTRACE(CurrentProcess); /* Check if we have a section object */ if (CurrentProcess->SectionObject) @@ -788,6 +805,8 @@ if (Last) KeSetProcess(&CurrentProcess->Pcb, 0, FALSE); /* Terminate the Thread from the Scheduler */ + PSREFTRACE(Thread); + PSREFTRACE(CurrentProcess); KeTerminateThread(0); } @@ -868,6 +887,7 @@ ULONG Flags; PAGED_CODE(); PSTRACE(PS_KILL_DEBUG, "Thread: %p ExitStatus: %p\n", Thread, ExitStatus); + PSREFTRACE(Thread); /* Check if this is a Critical Thread, and Bugcheck */ if (Thread->BreakOnTermination) @@ -932,6 +952,7 @@ ExFreePool(Apc); /* Return Status */ + PSREFTRACE(Thread); return Status; } @@ -944,6 +965,7 @@ PAGED_CODE(); PSTRACE(PS_KILL_DEBUG, "LastThread: %p Process: %p\n", LastThread, Process); + PSREFTRACE(Process); /* Set Process Exit flag */ InterlockedOr((PLONG)&Process->Flags, PSF_PROCESS_EXITING_BIT); @@ -975,6 +997,7 @@ } /* Check if we are the last thread */ + PSREFTRACE(Process); if (LastThread) { /* Check if we have to set the Timer Resolution */ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Sun Jul 23 23:45:16 2006 @@ -97,6 +97,8 @@ PETHREAD FoundThread = NULL; PLIST_ENTRY ListHead, Entry; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, + "Process: %p Thread: %p\n", Process, Thread); /* Lock the process */ KeEnterCriticalRegion(); @@ -147,6 +149,7 @@ PLIST_ENTRY Entry, ListHead; PEPROCESS FoundProcess = NULL; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, "Process: %p\n", OldProcess); /* Acquire the Active Process Lock */ KeAcquireGuardedMutex(&PspActiveProcessMutex); @@ -195,6 +198,7 @@ ULONG i; UCHAR LocalQuantum, MemoryPriority; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, "Process: %p Mode: %lx\n", Process, Mode); /* Check if this is a foreground process */ if (Mode == PsProcessPriorityForeground) @@ -256,6 +260,8 @@ UCHAR Quantum; PCHAR QuantumTable; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, + "%lx PrioritySeparation: %lx\n", Immediate, PrioritySeparation); /* Write the current priority separation */ PsPrioritySeparation = PspPrioritySeparationFromMask(PrioritySeparation); @@ -362,12 +368,12 @@ PDBGK_DEBUG_OBJECT DebugObject; PSECTION_OBJECT SectionObject; NTSTATUS Status, AccessStatus; - KPROCESSOR_MODE PreviousMode; - PHYSICAL_ADDRESS DirectoryTableBase; + PHYSICAL_ADDRESS DirectoryTableBase = {{0}}; KAFFINITY Affinity; HANDLE_TABLE_ENTRY CidEntry; - PETHREAD CurrentThread; - PEPROCESS CurrentProcess; + PETHREAD CurrentThread = PsGetCurrentThread(); + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PEPROCESS CurrentProcess = PsGetCurrentProcess(); ULONG MinWs, MaxWs; ACCESS_STATE LocalAccessState; PACCESS_STATE AccessState = &LocalAccessState; @@ -377,14 +383,8 @@ PSECURITY_DESCRIPTOR SecurityDescriptor; SECURITY_SUBJECT_CONTEXT SubjectContext; PAGED_CODE(); - DirectoryTableBase.QuadPart = 0; - - /* Get the current thread, process and cpu ring mode */ - CurrentThread = PsGetCurrentThread(); - ASSERT(&CurrentThread->Tcb == KeGetCurrentThread()); - PreviousMode = ExGetPreviousMode(); - ASSERT((CurrentThread) == PsGetCurrentThread()); - CurrentProcess = (PEPROCESS)CurrentThread->Tcb.ApcState.Process; + PSTRACE(PS_PROCESS_DEBUG, + "ProcessHandle: %p Parent: %p\n", ProcessHandle, Parent); /* Validate flags */ if (Flags & ~PS_ALL_FLAGS) return STATUS_INVALID_PARAMETER; @@ -400,6 +400,7 @@ (PVOID*)&Parent, NULL); if (!NT_SUCCESS(Status)) return Status; + PSREFTRACE(ParentProcess); /* If this process should be in a job but the parent isn't */ if ((InJob) && (!Parent->Job)) @@ -418,7 +419,7 @@ Parent = NULL; #ifdef CONFIG_SMP /* - * FIXME: Only the boot cpu is initialized in the early boot phase. + * FIXME: Only the boot cpu is initialized in the early boot phase. */ Affinity = 0xffffffff; #else @@ -443,6 +444,7 @@ if (!NT_SUCCESS(Status)) goto Cleanup; /* Clean up the Object */ + PSREFTRACE(Process); RtlZeroMemory(Process, sizeof(EPROCESS)); /* Initialize pushlock and rundown protection */ @@ -590,7 +592,8 @@ Process->PriorityClass = PROCESS_PRIORITY_CLASS_NORMAL; /* Create the Process' Address Space */ - Status = MmCreateProcessAddressSpace(Process, (PROS_SECTION_OBJECT)SectionObject); + Status = MmCreateProcessAddressSpace(Process, + (PROS_SECTION_OBJECT)SectionObject); if (!NT_SUCCESS(Status)) goto CleanupWithRef; /* Check for parent again */ @@ -690,6 +693,7 @@ if (AccessState) SeDeleteAccessState(AccessState); /* Cleanup on failure */ + PSREFTRACE(Process); if (!NT_SUCCESS(Status)) goto Cleanup; /* Compute Quantum and Priority */ @@ -762,6 +766,7 @@ KeQuerySystemTime(&Process->CreateTime); /* Protect against bad user-mode pointer */ + PSREFTRACE(Process); _SEH_TRY { /* Save the process handle */ @@ -787,10 +792,12 @@ if (Parent) ObDereferenceObject(Parent); /* Return status to caller */ + PSREFTRACE(Process); + if (Parent) PSREFTRACE(Parent); return Status; } -/* PUBLIC FUNCTIONS *****************************************************************/ +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented @@ -825,6 +832,7 @@ PEPROCESS FoundProcess; NTSTATUS Status = STATUS_INVALID_PARAMETER; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, "ProcessId: %p\n", ProcessId); KeEnterCriticalRegion(); /* Get the CID Handle Entry */ @@ -867,6 +875,7 @@ PETHREAD FoundThread; NTSTATUS Status = STATUS_INVALID_CID; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, "Cid: %p\n", Cid); KeEnterCriticalRegion(); /* Get the CID Handle Entry */ @@ -1158,6 +1167,7 @@ { UCHAR Quantum; ULONG Priority; + PSTRACE(PS_PROCESS_DEBUG, "Process: %p Type: %lx\n", Process, Type); /* Compute quantum and priority */ Priority = PspComputeQuantumAndPriority(Process, Type, &Quantum); @@ -1173,7 +1183,7 @@ NTAPI NtCreateProcessEx(OUT PHANDLE ProcessHandle, IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN HANDLE ParentProcess, IN ULONG Flags, IN HANDLE SectionHandle OPTIONAL, @@ -1184,6 +1194,8 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, + "ParentProcess: %p Flags: %lx\n", ParentProcess, Flags); /* Check if we came from user mode */ if(PreviousMode != KernelMode) @@ -1241,6 +1253,8 @@ IN HANDLE ExceptionPort OPTIONAL) { ULONG Flags = 0; + PSTRACE(PS_PROCESS_DEBUG, + "Parent: %p Attributes: %p\n", ParentProcess, ObjectAttributes); /* Set new-style flags */ if ((ULONG)SectionHandle & 1) Flags = PS_REQUEST_BREAKAWAY; @@ -1280,6 +1294,8 @@ ACCESS_STATE AccessState; AUX_DATA AuxData; PAGED_CODE(); + PSTRACE(PS_PROCESS_DEBUG, + "ClientId: %p Attributes: %p\n", ClientId, ObjectAttributes); /* Check if we were called from user mode */ if (PreviousMode != KernelMode) @@ -1409,6 +1425,8 @@ /* Dereference the Process */ ObDereferenceObject(Process); + PSREFTRACE(Process); + PSREFTRACE(Thread); } else { Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sun Jul 23 23:45:16 2006 @@ -17,7 +17,7 @@ #include "internal/ps_i.h" /* Debugging Level */ -ULONG PspTraceLevel = 0; //PS_KILL_DEBUG | PS_SECURITY_DEBUG; +ULONG PspTraceLevel = 0; //PS_KILL_DEBUG | PS_REF_DEBUG; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Sun Jul 23 23:45:16 2006 @@ -30,6 +30,8 @@ PTEB Teb; BOOLEAN DeadThread = FALSE; PAGED_CODE(); + PSTRACE(PS_THREAD_DEBUG, + "StartRoutine: %p StartContext: %p\n", StartRoutine, StartContext); /* Go to Passive Level */ KeLowerIrql(PASSIVE_LEVEL); @@ -50,6 +52,7 @@ } /* Check if this is a system thread, or if we're hiding */ + PSREFTRACE(Thread); if (!(Thread->SystemThread) && !(Thread->HideFromDebugger)) { /* We're not, so notify the debugger */ @@ -108,12 +111,15 @@ IN PVOID StartContext) { PETHREAD Thread; + PSTRACE(PS_THREAD_DEBUG, + "StartRoutine: %p StartContext: %p\n", StartRoutine, StartContext); /* Unlock the dispatcher Database */ KeLowerIrql(PASSIVE_LEVEL); Thread = PsGetCurrentThread(); /* Make sure the thread isn't gone */ + PSREFTRACE(Thread); if (!(Thread->Terminated) && !(Thread->DeadThread)) { /* Call it the Start Routine */ @@ -128,7 +134,7 @@ NTAPI PspCreateThread(OUT PHANDLE ThreadHandle, IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN HANDLE ProcessHandle, IN PEPROCESS TargetProcess, OUT PCLIENT_ID ClientId, @@ -153,6 +159,9 @@ PSECURITY_DESCRIPTOR SecurityDescriptor; SECURITY_SUBJECT_CONTEXT SubjectContext; PAGED_CODE(); + PSTRACE(PS_THREAD_DEBUG, + "ThreadContext: %p TargetProcess: %p ProcessHandle: %p\n", + ThreadContext, TargetProcess, ProcessHandle); /* If we were called from PsCreateSystemThread, then we're kernel mode */ if (StartRoutine) PreviousMode = KernelMode; @@ -167,6 +176,7 @@ PreviousMode, (PVOID*)&Process, NULL); + PSREFTRACE(Process); } else { @@ -175,6 +185,7 @@ { /* Reference the Process by Pointer */ ObReferenceObject(TargetProcess); + PSREFTRACE(TargetProcess); Process = TargetProcess; Status = STATUS_SUCCESS; } @@ -191,6 +202,7 @@ /* Also make sure that User-Mode isn't trying to create a system thread */ if ((PreviousMode != KernelMode) && (Process == PsInitialSystemProcess)) { + /* Fail */ ObDereferenceObject(Process); return STATUS_INVALID_HANDLE; } @@ -213,6 +225,7 @@ } /* Zero the Object entirely */ + PSREFTRACE(Thread); RtlZeroMemory(Thread, sizeof(ETHREAD)); /* Initialize rundown protection */ @@ -294,6 +307,7 @@ } /* Check if we failed */ + PSREFTRACE(Thread); if (!NT_SUCCESS(Status)) { /* Delete the TEB if we had done */ @@ -389,6 +403,7 @@ &hThread); /* Delete the access state if we had one */ + PSREFTRACE(Thread); if (AccessState) SeDeleteAccessState(AccessState); /* Check for success */ @@ -440,6 +455,7 @@ ASSERT(!(Thread->CreateTime.HighPart & 0xF0000000)); /* Make sure the thread isn't dead */ + PSREFTRACE(Thread); if (!Thread->DeadThread) { /* Get the thread's SD */ @@ -505,6 +521,7 @@ } /* Dispatch thread */ + PSREFTRACE(Thread); OldIrql = KeAcquireDispatcherDatabaseLock (); KiReadyThread(&Thread->Tcb); KeReleaseDispatcherDatabaseLock(OldIrql); @@ -513,6 +530,7 @@ ObDereferenceObject(Thread); /* Return */ + PSREFTRACE(Thread); return Status; /* Most annoying failure case ever, where we undo almost all manually */ @@ -521,6 +539,7 @@ ExReleasePushLockExclusive(&Process->ProcessLock); /* Uninitailize it */ + PSREFTRACE(Thread); KeUninitThread(&Thread->Tcb); /* If we had a TEB, delete it */ @@ -531,6 +550,7 @@ /* Dereference the thread and return failure */ ObDereferenceObject(Thread); + PSREFTRACE(Thread); return STATUS_PROCESS_IS_TERMINATING; } @@ -552,6 +572,9 @@ PEPROCESS TargetProcess = NULL; HANDLE Handle = ProcessHandle; PAGED_CODE(); + PSTRACE(PS_THREAD_DEBUG, + "ProcessHandle: %p StartRoutine: %p StartContext: %p\n", + ProcessHandle, StartRoutine, StartContext); /* Check if we have a handle. If not, use the System Process */ if (!ProcessHandle) @@ -586,6 +609,7 @@ PETHREAD FoundThread; NTSTATUS Status = STATUS_INVALID_PARAMETER; PAGED_CODE(); + PSTRACE(PS_THREAD_DEBUG, "ThreadId: %p\n", ThreadId); KeEnterCriticalRegion(); /* Get the CID Handle Entry */ @@ -811,6 +835,8 @@ INITIAL_TEB SafeInitialTeb; NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + PSTRACE(PS_THREAD_DEBUG, + "ProcessHandle: %p Context: %p\n", ProcessHandle, ThreadContext); /* Check if this was from user-mode */ if(KeGetPreviousMode() != KernelMode) @@ -887,6 +913,8 @@ ACCESS_STATE AccessState; AUX_DATA AuxData; PAGED_CODE(); + PSTRACE(PS_THREAD_DEBUG, + "ClientId: %p ObjectAttributes: %p\n", ClientId, ObjectAttributes); /* Check if we were called from user mode */ if (PreviousMode != KernelMode)

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