Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[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

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);

18 years, 5 months

[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

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))

18 years, 5 months

[greatlrd] 23258: Forget remove ref in rosdraw.h

by greatlrd＠svn.reactos.org

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;

18 years, 5 months

[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

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; }

18 years, 5 months

[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

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);

18 years, 5 months

[greatlrd] 23255: Forget commit some changes

by greatlrd＠svn.reactos.org

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 ********/

18 years, 5 months

[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

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)

18 years, 5 months

[greatlrd] 23253: Patch from w3seek

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 23 23:14:19 2006 New Revision: 23253 URL: http://svn.reactos.org/svn/reactos?rev=23253&view=rev Log: Patch from w3seek Modified: trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/ps/thread.c 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:14:19 2006 @@ -27,7 +27,7 @@ IN PVOID ProcessOrThread, IN PCHAR ImageName) { - UCHAR Action[2]; + CHAR Action[2]; BOOLEAN Handled = FALSE; PAGED_CODE(); @@ -121,7 +121,7 @@ PEPROCESS Process = NULL; /* Loop every process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); while (Process) { /* Make sure this isn't the idle or initial process */ @@ -132,7 +132,7 @@ } /* Get the next process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); } } 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:14:19 2006 @@ -190,7 +190,7 @@ NTAPI PspComputeQuantumAndPriority(IN PEPROCESS Process, IN PSPROCESSPRIORITYMODE Mode, - OUT PCHAR Quantum) + OUT PUCHAR Quantum) { ULONG i; UCHAR LocalQuantum, MemoryPriority; @@ -303,7 +303,7 @@ if (Immediate) { /* We are...loop every process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); while (Process) { /* @@ -339,7 +339,7 @@ KeSetQuantumProcess(&Process->Pcb, Quantum); /* Get the next process */ - Process == PsGetNextProcess(Process); + Process = PsGetNextProcess(Process); } } } 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:14:19 2006 @@ -483,7 +483,7 @@ NTSTATUS Status; HANDLE PortHandle = NULL; HANDLE TokenHandle = NULL; - PROCESS_SESSION_INFORMATION SessionInfo; + PROCESS_SESSION_INFORMATION SessionInfo = {0}; PEPORT ExceptionPort; PAGED_CODE(); 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 Sun Jul 23 23:14:19 2006 @@ -51,7 +51,7 @@ { /* Free it */ ExFreePool(Thread->ImpersonationInfo); - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); Thread->ImpersonationInfo = NULL; } @@ -537,7 +537,7 @@ if (Thread->ActiveImpersonationInfo) { /* Disable impersonation */ - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); /* Get the token */ @@ -584,7 +584,7 @@ if (Thread->ActiveImpersonationInfo) { /* Disable impersonation */ - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); /* Get the token */ @@ -632,7 +632,7 @@ else { /* Otherwise, enable impersonation */ - InterlockedOr(&Thread->CrossThreadFlags, + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_ACTIVE_IMPERSONATION_INFO_BIT); } @@ -811,7 +811,7 @@ { /* Attempt to change the flag */ NewValue = - InterlockedCompareExchange(&Thread->CrossThreadFlags, + InterlockedCompareExchange((PLONG)&Thread->CrossThreadFlags, OldValue &~ CT_ACTIVE_IMPERSONATION_INFO_BIT, OldValue); @@ -880,13 +880,13 @@ Impersonation->Token = ImpersonationState->Token; /* Enable impersonation */ - InterlockedOr(&Thread->CrossThreadFlags, + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_ACTIVE_IMPERSONATION_INFO_BIT); } else { /* Disable impersonation */ - InterlockedAnd(&Thread->CrossThreadFlags, + InterlockedAnd((PLONG)&Thread->CrossThreadFlags, ~CT_ACTIVE_IMPERSONATION_INFO_BIT); } 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:14:19 2006 @@ -366,7 +366,7 @@ if (!NT_SUCCESS(Status)) { /* Access state failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -407,7 +407,7 @@ Status = _SEH_GetExceptionCode(); /* Thread insertion failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -429,7 +429,7 @@ else { /* Thread insertion failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb); @@ -449,7 +449,7 @@ if (!NT_SUCCESS(Status)) { /* Thread insertion failed, thread is dead */ - InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); /* If we were suspended, wake it up */ if (CreateSuspended) KeResumeThread(&Thread->Tcb);

18 years, 5 months

[greatlrd] 23252: 1. Implement check for DDCREATE_HARDWAREONLY and DDCREATE_EMULATIONONLY in CreateDraw and CreateDrawEx 2. Implement activate of DDCREATE_HARDWAREONLY and DDCREATE_EMULATIONONLY in StartupDirectDraw 3. Fix correct return value when pUnkOuter is not NULL in CreateDraw and CreateDrawEx Now we can activate deactive HAL or HEL and use one of thuse interface.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 23 23:03:41 2006 New Revision: 23252 URL: http://svn.reactos.org/svn/reactos?rev=23252&view=rev Log: 1. Implement check for DDCREATE_HARDWAREONLY and DDCREATE_EMULATIONONLY in CreateDraw and CreateDrawEx 2. Implement activate of DDCREATE_HARDWAREONLY and DDCREATE_EMULATIONONLY in StartupDirectDraw 3. Fix correct return value when pUnkOuter is not NULL in CreateDraw and CreateDrawEx Now we can activate deactive HAL or HEL and use one of thuse interface. Modified: trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Sun Jul 23 23:03:41 2006 @@ -28,8 +28,8 @@ /* check see if pUnkOuter is null or not */ if (pUnkOuter) { - /* we do not use same error code as MS, ms use 0x8004110 */ - return DDERR_INVALIDPARAMS; + /* we do not use same error code as MS, ms use CLASS_E_NOAGGREGATION */ + return CLASS_E_NOAGGREGATION; } return Create_DirectDraw (lpGUID, lplpDD, &IID_IDirectDraw, FALSE); @@ -50,8 +50,8 @@ /* check see if pUnkOuter is null or not */ if (pUnkOuter) { - /* we do not use same error code as MS, ms use 0x8004110 */ - return DDERR_INVALIDPARAMS; + /* we do not use same error code as MS, ms use CLASS_E_NOAGGREGATION */ + return CLASS_E_NOAGGREGATION; } /* Is it a DirectDraw 7 Request or not */ 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 Jul 23 23:03:41 2006 @@ -133,68 +133,74 @@ This->mDdSetMode.lpDD = &This->mDDrawGlobal; This->mDdWaitForVerticalBlank.lpDD = &This->mDDrawGlobal; This->mDdSetColorKey.lpDD = &This->mDDrawGlobal; - - This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; - This->mDdCreatePalette.CreatePalette = This->mCallbacks.HELDD.CreatePalette; - This->mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; - This->mDdDestroyDriver.DestroyDriver = This->mCallbacks.HELDD.DestroyDriver; - This->mDdFlipToGDISurface.FlipToGDISurface = This->mCallbacks.HELDD.FlipToGDISurface; - This->mDdGetScanLine.GetScanLine = This->mCallbacks.HELDD.GetScanLine; - This->mDdSetExclusiveMode.SetExclusiveMode = This->mCallbacks.HELDD.SetExclusiveMode; - This->mDdSetMode.SetMode = This->mCallbacks.HELDD.SetMode; - This->mDdWaitForVerticalBlank.WaitForVerticalBlank = This->mCallbacks.HELDD.WaitForVerticalBlank; - // This->mDdSetColorKey.SetColorKey = This->mCallbacks.HELDD.SetColorKey; - - Flags = This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags; - - if (Flags & DDHAL_CB32_CANCREATESURFACE) - { - This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - } - - if (Flags & DDHAL_CB32_CREATEPALETTE) - { - This->mDdCreatePalette.CreatePalette = This->mCallbacks.HALDD.CreatePalette; - } - - if (Flags & DDHAL_CB32_CREATESURFACE) - { - This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - } - - if (Flags & DDHAL_CB32_DESTROYDRIVER) - { - This->mDdDestroyDriver.DestroyDriver = This->mCallbacks.HALDD.DestroyDriver; - } - - if (Flags & DDHAL_CB32_FLIPTOGDISURFACE) - { - This->mDdFlipToGDISurface.FlipToGDISurface = This->mCallbacks.HALDD.FlipToGDISurface; - } - - if (Flags & DDHAL_CB32_GETSCANLINE) - { - This->mDdGetScanLine.GetScanLine = This->mCallbacks.HALDD.GetScanLine; - } - - if (Flags & DDHAL_CB32_SETEXCLUSIVEMODE) - { - This->mDdSetExclusiveMode.SetExclusiveMode = This->mCallbacks.HALDD.SetExclusiveMode; - } - - if (Flags & DDHAL_CB32_SETMODE) - { - This->mDdSetMode.SetMode = This->mCallbacks.HALDD.SetMode; - } - - if (Flags & DDHAL_CB32_WAITFORVERTICALBLANK) - { - This->mDdWaitForVerticalBlank.WaitForVerticalBlank = This->mCallbacks.HALDD.WaitForVerticalBlank; - } - - if (Flags & DDHAL_CB32_SETCOLORKEY) - { - // This->mDdSetColorKey.SetColorKey = This->mCallbacks.HALDD.SetColorKey; + + if (This->devicetype!=1) + { + /* both or only hel */ + This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; + This->mDdCreatePalette.CreatePalette = This->mCallbacks.HELDD.CreatePalette; + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; + This->mDdDestroyDriver.DestroyDriver = This->mCallbacks.HELDD.DestroyDriver; + This->mDdFlipToGDISurface.FlipToGDISurface = This->mCallbacks.HELDD.FlipToGDISurface; + This->mDdGetScanLine.GetScanLine = This->mCallbacks.HELDD.GetScanLine; + This->mDdSetExclusiveMode.SetExclusiveMode = This->mCallbacks.HELDD.SetExclusiveMode; + This->mDdSetMode.SetMode = This->mCallbacks.HELDD.SetMode; + This->mDdWaitForVerticalBlank.WaitForVerticalBlank = This->mCallbacks.HELDD.WaitForVerticalBlank; + // This->mDdSetColorKey.SetColorKey = This->mCallbacks.HELDD.SetColorKey; + } + + if (This->devicetype!=2) + { + Flags = This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags; + if (Flags & DDHAL_CB32_CANCREATESURFACE) + { + This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + } + + if (Flags & DDHAL_CB32_CREATEPALETTE) + { + This->mDdCreatePalette.CreatePalette = This->mCallbacks.HALDD.CreatePalette; + } + + if (Flags & DDHAL_CB32_CREATESURFACE) + { + This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + } + + if (Flags & DDHAL_CB32_DESTROYDRIVER) + { + This->mDdDestroyDriver.DestroyDriver = This->mCallbacks.HALDD.DestroyDriver; + } + + if (Flags & DDHAL_CB32_FLIPTOGDISURFACE) + { + This->mDdFlipToGDISurface.FlipToGDISurface = This->mCallbacks.HALDD.FlipToGDISurface; + } + + if (Flags & DDHAL_CB32_GETSCANLINE) + { + This->mDdGetScanLine.GetScanLine = This->mCallbacks.HALDD.GetScanLine; + } + + if (Flags & DDHAL_CB32_SETEXCLUSIVEMODE) + { + This->mDdSetExclusiveMode.SetExclusiveMode = This->mCallbacks.HALDD.SetExclusiveMode; + } + + if (Flags & DDHAL_CB32_SETMODE) + { + This->mDdSetMode.SetMode = This->mCallbacks.HALDD.SetMode; + } + + if (Flags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + This->mDdWaitForVerticalBlank.WaitForVerticalBlank = This->mCallbacks.HALDD.WaitForVerticalBlank; + } + + if (Flags & DDHAL_CB32_SETCOLORKEY) + { + // This->mDdSetColorKey.SetColorKey = This->mCallbacks.HALDD.SetColorKey; + } } /* @@ -413,7 +419,9 @@ DX_WINDBG_trace(); if (This == NULL) + { return E_OUTOFMEMORY; + } ZeroMemory(This,sizeof(IDirectDrawImpl)); @@ -424,6 +432,18 @@ *pIface = (LPDIRECTDRAW)This; + This->devicetype = 0; + + if (pGUID == (LPGUID) DDCREATE_HARDWAREONLY) + { + This->devicetype = 1; /* hal only */ + } + + if (pGUID == (LPGUID) DDCREATE_EMULATIONONLY) + { + This->devicetype = 2; /* hel only */ + } + if(This->lpVtbl->QueryInterface ((LPDIRECTDRAW7)This, id, (void**)&pIface) != S_OK) { return DDERR_INVALIDPARAMS;

18 years, 5 months

[janderwald] 23251: * use supplied parent window handle when class is of type system * this is temp hack for getting edit controls with notification windows going * reduces user32_winetest.exe from 43 to 2 total faults

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jul 23 22:12:19 2006 New Revision: 23251 URL: http://svn.reactos.org/svn/reactos?rev=23251&view=rev Log: * use supplied parent window handle when class is of type system * this is temp hack for getting edit controls with notification windows going * reduces user32_winetest.exe from 43 to 2 total faults 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 Sun Jul 23 22:12:19 2006 @@ -1506,6 +1506,17 @@ { 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;

18 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006