Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23253: Patch from w3seek
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

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

1 0

[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 23 Jul '06

23 Jul '06

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;

1 0

[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 23 Jul '06

23 Jul '06

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;

1 0

[ion] 23250: - Add ObGetObjectSecurity calls like in PspCreateProcess to check the thread's level of access towards itself. - Add code to handle two more failure (the last, afaics) cases. - Get rid of 2 kernel fun entries.
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Sun Jul 23 21:56:57 2006 New Revision: 23250 URL: http://svn.reactos.org/svn/reactos?rev=23250&view=rev Log: - Add ObGetObjectSecurity calls like in PspCreateProcess to check the thread's level of access towards itself. - Add code to handle two more failure (the last, afaics) cases. - Get rid of 2 kernel fun entries. Modified: trunk/reactos/ntoskrnl/KrnlFun.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 21:56:57 2006 @@ -27,9 +27,7 @@ // Ps: // - Figure out why processes don't die. // - Generate process cookie for user-more thread. -// - Add security calls where necessary for thread creation. // - Add tracing. -// - Add failure/race checks for thread creation. // // Ob: // - Possible bug in deferred deletion under Cc Rewrite branch. 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 21:56:57 2006 @@ -144,11 +144,14 @@ PTEB TebBase = NULL; KIRQL OldIrql; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status; + NTSTATUS Status, AccessStatus; HANDLE_TABLE_ENTRY CidEntry; ACCESS_STATE LocalAccessState; PACCESS_STATE AccessState = &LocalAccessState; AUX_DATA AuxData; + BOOLEAN Result, SdAllocated; + PSECURITY_DESCRIPTOR SecurityDescriptor; + SECURITY_SUBJECT_CONTEXT SubjectContext; PAGED_CODE(); /* If we were called from PsCreateSystemThread, then we're kernel mode */ @@ -402,8 +405,26 @@ { /* Get the exception code */ Status = _SEH_GetExceptionCode(); + + /* Thread insertion failed, thread is dead */ + InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + + /* If we were suspended, wake it up */ + if (CreateSuspended) KeResumeThread(&Thread->Tcb); + + /* Dispatch thread */ + OldIrql = KeAcquireDispatcherDatabaseLock (); + KiReadyThread(&Thread->Tcb); + KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Dereference it, leaving only the keep-alive */ + ObDereferenceObject(Thread); + + /* Close its handle, killing it */ + ObCloseHandle(ThreadHandle, PreviousMode); } _SEH_END; + if (!NT_SUCCESS(Status)) return Status; } else { @@ -418,8 +439,70 @@ KeQuerySystemTime(&Thread->CreateTime); ASSERT(!(Thread->CreateTime.HighPart & 0xF0000000)); - /* Set the thread access mask */ - Thread->GrantedAccess = THREAD_ALL_ACCESS; + /* Make sure the thread isn't dead */ + if (!Thread->DeadThread) + { + /* Get the thread's SD */ + Status = ObGetObjectSecurity(Thread, + &SecurityDescriptor, + &SdAllocated); + if (!NT_SUCCESS(Status)) + { + /* Thread insertion failed, thread is dead */ + InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + + /* If we were suspended, wake it up */ + if (CreateSuspended) KeResumeThread(&Thread->Tcb); + + /* Dispatch thread */ + OldIrql = KeAcquireDispatcherDatabaseLock (); + KiReadyThread(&Thread->Tcb); + KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Dereference it, leaving only the keep-alive */ + ObDereferenceObject(Thread); + + /* Close its handle, killing it */ + ObCloseHandle(ThreadHandle, PreviousMode); + return Status; + } + + /* Create the subject context */ + SubjectContext.ProcessAuditId = Process; + SubjectContext.PrimaryToken = PsReferencePrimaryToken(Process); + SubjectContext.ClientToken = NULL; + + /* Do the access check */ + if (!SecurityDescriptor) DPRINT1("FIX PS SDs!!\n"); + Result = SeAccessCheck(SecurityDescriptor, + &SubjectContext, + FALSE, + MAXIMUM_ALLOWED, + 0, + NULL, + &PsThreadType->TypeInfo.GenericMapping, + PreviousMode, + &Thread->GrantedAccess, + &AccessStatus); + + /* Dereference the token and let go the SD */ + ObFastDereferenceObject(&Process->Token, + SubjectContext.PrimaryToken); + ObReleaseObjectSecurity(SecurityDescriptor, SdAllocated); + + /* Remove access if it failed */ + if (!Result) Process->GrantedAccess = 0; + + /* Set least some minimum access */ + Thread->GrantedAccess |= (THREAD_TERMINATE | + THREAD_SET_INFORMATION | + THREAD_QUERY_INFORMATION); + } + else + { + /* Set the thread access mask to maximum */ + Thread->GrantedAccess = THREAD_ALL_ACCESS; + } /* Dispatch thread */ OldIrql = KeAcquireDispatcherDatabaseLock ();

1 0

[ion] 23249: - Acquire Process lock when touching the thread list entry and incrementing the process' active threads. - Set the Thread Create Time on creation, I had forgotten this! - Handle failures for thread-safety/race conditions. If the process was deleted or the thread terminated behind our back, then go through a manual un-initalization code path. - Just like previous process patch, add code to now create an access state with SeCreateAccessStateEx. - Handle failure of ObInsertObject.
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Sun Jul 23 21:45:30 2006 New Revision: 23249 URL: http://svn.reactos.org/svn/reactos?rev=23249&view=rev Log: - Acquire Process lock when touching the thread list entry and incrementing the process' active threads. - Set the Thread Create Time on creation, I had forgotten this! - Handle failures for thread-safety/race conditions. If the process was deleted or the thread terminated behind our back, then go through a manual un-initalization code path. - Just like previous process patch, add code to now create an access state with SeCreateAccessStateEx. - Handle failure of ObInsertObject. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Sun Jul 23 21:45:30 2006 @@ -291,6 +291,12 @@ IN PVOID KernelStack ); +VOID +NTAPI +KeUninitThread( + IN PKTHREAD Thread +); + NTSTATUS NTAPI KeInitThread( Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Sun Jul 23 21:45:30 2006 @@ -195,6 +195,13 @@ LONG FASTCALL +ObDereferenceObjectEx( + IN PVOID Object, + IN ULONG Count +); + +LONG +FASTCALL ObReferenceObjectEx( IN PVOID Object, IN ULONG Count Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Sun Jul 23 21:45:30 2006 @@ -726,6 +726,15 @@ IN PVOID ThreadState) { UNIMPLEMENTED; +} + +VOID +NTAPI +KeUninitThread(IN PKTHREAD Thread) +{ + /* Delete the stack */ + MmDeleteKernelStack(Thread->StackBase, FALSE); + Thread->InitialStack = NULL; } NTSTATUS 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 21:45:30 2006 @@ -146,6 +146,9 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; HANDLE_TABLE_ENTRY CidEntry; + ACCESS_STATE LocalAccessState; + PACCESS_STATE AccessState = &LocalAccessState; + AUX_DATA AuxData; PAGED_CODE(); /* If we were called from PsCreateSystemThread, then we're kernel mode */ @@ -299,7 +302,21 @@ return Status; } - /* FIXME: Acquire exclusive pushlock */ + /* Lock the process */ + KeEnterCriticalRegion(); + ExAcquirePushLockExclusive(&Process->ProcessLock); + + /* Make sure the proces didn't just die on us */ + if (Process->ProcessDelete) goto Quickie; + + /* Check if the thread was ours, terminated and it was user mode */ + if ((Thread->Terminated) && + (ThreadContext) && + (Thread->ThreadsProcess == Process)) + { + /* Cleanup, we don't want to start it up and context switch */ + goto Quickie; + } /* * Insert the Thread into the Process's Thread List @@ -312,7 +329,9 @@ /* Start the thread */ KeStartThread(&Thread->Tcb); - /* FIXME: Wake pushlock */ + /* Release the process lock */ + ExReleasePushLockExclusive(&Process->ProcessLock); + KeLeaveCriticalRegion(); /* Release rundown */ ExReleaseRundownProtection(&Process->RundownProtect); @@ -333,13 +352,43 @@ /* Check if we were already terminated */ if (Thread->Terminated) KeForceResumeThread(&Thread->Tcb); + /* Create an access state */ + Status = SeCreateAccessStateEx(NULL, + ThreadContext ? + PsGetCurrentProcess() : Process, + &LocalAccessState, + &AuxData, + DesiredAccess, + &PsThreadType->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* Access state failed, thread is dead */ + InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + + /* If we were suspended, wake it up */ + if (CreateSuspended) KeResumeThread(&Thread->Tcb); + + /* Dispatch thread */ + OldIrql = KeAcquireDispatcherDatabaseLock (); + KiReadyThread(&Thread->Tcb); + KeReleaseDispatcherDatabaseLock(OldIrql); + + /* Dereference completely to kill it */ + ObDereferenceObjectEx(Thread, 2); + } + /* Insert the Thread into the Object Manager */ Status = ObInsertObject(Thread, - NULL, + AccessState, DesiredAccess, 0, NULL, &hThread); + + /* Delete the access state if we had one */ + if (AccessState) SeDeleteAccessState(AccessState); + + /* Check for success */ if (NT_SUCCESS(Status)) { /* Wrap in SEH to protect against bad user-mode pointers */ @@ -356,6 +405,18 @@ } _SEH_END; } + else + { + /* Thread insertion failed, thread is dead */ + InterlockedOr(&Thread->CrossThreadFlags, CT_DEAD_THREAD_BIT); + + /* If we were suspended, wake it up */ + if (CreateSuspended) KeResumeThread(&Thread->Tcb); + } + + /* Get the create time */ + KeQuerySystemTime(&Thread->CreateTime); + ASSERT(!(Thread->CreateTime.HighPart & 0xF0000000)); /* Set the thread access mask */ Thread->GrantedAccess = THREAD_ALL_ACCESS; @@ -370,6 +431,24 @@ /* Return */ return Status; + + /* Most annoying failure case ever, where we undo almost all manually */ +Quickie: + /* When we get here, the process is locked, unlock it */ + ExReleasePushLockExclusive(&Process->ProcessLock); + + /* Uninitailize it */ + KeUninitThread(&Thread->Tcb); + + /* If we had a TEB, delete it */ + if (TebBase) MmDeleteTeb(Process, TebBase); + + /* Release rundown protection, which we also hold */ + ExReleaseRundownProtection(&Process->RundownProtect); + + /* Dereference the thread and return failure */ + ObDereferenceObject(Thread); + return STATUS_PROCESS_IS_TERMINATING; } /* PUBLIC FUNCTIONS **********************************************************/

1 0

[ion] 23248: - Make use of PsChangeQuantumTable on system startup to setup the raw priority separation. - Call PspComputeQuantumAndPriority in PspCreateProcess to calculate process base priority and quantum for child threads. - Add security code to calculate process's access rights to itself, as documented in WI II.
by ion＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: ion Date: Sun Jul 23 21:01:43 2006 New Revision: 23248 URL: http://svn.reactos.org/svn/reactos?rev=23248&view=rev Log: - Make use of PsChangeQuantumTable on system startup to setup the raw priority separation. - Call PspComputeQuantumAndPriority in PspCreateProcess to calculate process base priority and quantum for child threads. - Add security code to calculate process's access rights to itself, as documented in WI II. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.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 21:01:43 2006 @@ -27,7 +27,7 @@ // Ps: // - Figure out why processes don't die. // - Generate process cookie for user-more thread. -// - Add security calls where necessary. +// - Add security calls where necessary for thread creation. // - Add tracing. // - Add failure/race checks for thread creation. // 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 21:01:43 2006 @@ -149,6 +149,13 @@ NTAPI PspGetSystemDllEntryPoints( VOID +); + +VOID +NTAPI +PsChangeQuantumTable( + IN BOOLEAN Immediate, + IN ULONG PrioritySeparation ); // @@ -343,6 +350,7 @@ extern PVOID PspSystemDllBase; extern BOOLEAN PspUseJobSchedulingClasses; extern CHAR PspJobSchedulingClasses[PSP_JOB_SCHEDULING_CLASSES]; +extern ULONG PsRawPrioritySeparation; // // Inlined Functions 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 21:01:43 2006 @@ -27,6 +27,7 @@ LARGE_INTEGER ShortPsLockDelay; +ULONG PsRawPrioritySeparation = 0; ULONG PsPrioritySeparation; CHAR PspForegroundQuantum[3]; @@ -360,7 +361,7 @@ PEPORT ExceptionPortObject; PDBGK_DEBUG_OBJECT DebugObject; PSECTION_OBJECT SectionObject; - NTSTATUS Status; + NTSTATUS Status, AccessStatus; KPROCESSOR_MODE PreviousMode; PHYSICAL_ADDRESS DirectoryTableBase; KAFFINITY Affinity; @@ -371,6 +372,10 @@ ACCESS_STATE LocalAccessState; PACCESS_STATE AccessState = &LocalAccessState; AUX_DATA AuxData; + UCHAR Quantum; + BOOLEAN Result, SdAllocated; + PSECURITY_DESCRIPTOR SecurityDescriptor; + SECURITY_SUBJECT_CONTEXT SubjectContext; PAGED_CODE(); DirectoryTableBase.QuadPart = 0; @@ -687,21 +692,74 @@ /* Cleanup on failure */ if (!NT_SUCCESS(Status)) goto Cleanup; - /* FIXME: Compute Quantum and Priority */ - - /* - * FIXME: ObGetObjectSecurity(Process, &SecurityDescriptor) - * SeAccessCheck - */ + /* Compute Quantum and Priority */ + Process->Pcb.BasePriority = PspComputeQuantumAndPriority(Process, + 0, + &Quantum); + Process->Pcb.QuantumReset = Quantum; + + /* Check if we have a parent other then the initial system process */ + if ((Parent) && (Parent != PsInitialSystemProcess)) + { + /* Get the process's SD */ + Status = ObGetObjectSecurity(Process, + &SecurityDescriptor, + &SdAllocated); + if (!NT_SUCCESS(Status)) + { + /* We failed, close the handle and clean up */ + ObCloseHandle(hProcess, PreviousMode); + goto CleanupWithRef; + } + + /* Create the subject context */ + SubjectContext.ProcessAuditId = Process; + SubjectContext.PrimaryToken = PsReferencePrimaryToken(Process); + SubjectContext.ClientToken = NULL; + + /* Do the access check */ + if (!SecurityDescriptor) DPRINT1("FIX PS SDs!!\n"); + Result = SeAccessCheck(SecurityDescriptor, + &SubjectContext, + FALSE, + MAXIMUM_ALLOWED, + 0, + NULL, + &PsProcessType->TypeInfo.GenericMapping, + PreviousMode, + &Process->GrantedAccess, + &AccessStatus); + + /* Dereference the token and let go the SD */ + ObFastDereferenceObject(&Process->Token, + SubjectContext.PrimaryToken); + ObReleaseObjectSecurity(SecurityDescriptor, SdAllocated); + + /* Remove access if it failed */ + if (!Result) Process->GrantedAccess = 0; + + /* Give the process some basic access */ + Process->GrantedAccess |= (PROCESS_VM_OPERATION | + PROCESS_VM_READ | + PROCESS_VM_WRITE | + PROCESS_QUERY_INFORMATION | + PROCESS_TERMINATE | + PROCESS_CREATE_THREAD | + PROCESS_DUP_HANDLE | + PROCESS_CREATE_PROCESS | + PROCESS_SET_INFORMATION); + } + else + { + /* Set full granted access */ + Process->GrantedAccess = PROCESS_ALL_ACCESS; + } /* Sanity check */ ASSERT(IsListEmpty(&Process->ThreadListHead)); /* Set the Creation Time */ KeQuerySystemTime(&Process->CreateTime); - - /* Set the granted access */ - Process->GrantedAccess = PROCESS_ALL_ACCESS; /* Protect against bad user-mode pointer */ _SEH_TRY Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Sun Jul 23 21:01:43 2006 @@ -158,6 +158,9 @@ InitializeListHead(&PsActiveProcessHead); KeInitializeGuardedMutex(&PspActiveProcessMutex); + + /* Setup the quantum table */ + PsChangeQuantumTable(FALSE, PsRawPrioritySeparation); /* * Initialize the default quota block.

1 0

[greatlrd] 23247: 1. Remove more dead code after all commit 2. Move Cleanup code to own file.
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: greatlrd Date: Sun Jul 23 19:37:57 2006 New Revision: 23247 URL: http://svn.reactos.org/svn/reactos?rev=23247&view=rev Log: 1. Remove more dead code after all commit 2. Move Cleanup code to own file. Added: trunk/reactos/dll/directx/ddraw/cleanup.c (with props) Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Added: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c (added) +++ trunk/reactos/dll/directx/ddraw/cleanup.c Sun Jul 23 19:37:57 2006 @@ -1,0 +1,51 @@ +/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ddraw/ddraw.c + * PURPOSE: DirectDraw Library + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#include <windows.h> +#include "rosdraw.h" +#include "d3dhal.h" + +VOID +Cleanup(LPDIRECTDRAW7 iface) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (This->mDDrawGlobal.hDD != 0) + { + DdDeleteDirectDrawObject (&This->mDDrawGlobal); + } + + if (This->mpTextures != NULL) + { + DxHeapMemFree(This->mpTextures); + } + + if (This->mpFourCC != NULL) + { + DxHeapMemFree(This->mpFourCC); + } + + if (This->mpvmList != NULL) + { + DxHeapMemFree(This->mpvmList); + } + + if (This->mpModeInfos != NULL) + { + DxHeapMemFree(This->mpModeInfos); + } + + if (This->hdc != NULL) + { + DeleteDC(This->hdc); + } + +} + Propchange: trunk/reactos/dll/directx/ddraw/cleanup.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sun Jul 23 19:37:57 2006 @@ -18,6 +18,7 @@ <file>main.c</file> <file>regsvr.c</file> <file>startup.c</file> + <file>cleanup.c</file> <file>clipper.c</file> <file>color.c</file> Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c Sun Jul 23 19:37:57 2006 @@ -9,43 +9,6 @@ */ #include "rosdraw.h" - -VOID -Hal_DirectDraw_Release (LPDIRECTDRAW7 iface) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (This->mDDrawGlobal.hDD != 0) - { - DdDeleteDirectDrawObject (&This->mDDrawGlobal); - } - - if (This->mpTextures != NULL) - { - DxHeapMemFree(This->mpTextures); - } - - if (This->mpFourCC != NULL) - { - DxHeapMemFree(This->mpFourCC); - } - - if (This->mpvmList != NULL) - { - DxHeapMemFree(This->mpvmList); - } - - if (This->mpModeInfos != NULL) - { - DxHeapMemFree(This->mpModeInfos); - } - - if (This->hdc != NULL) - { - DeleteDC(This->hdc); - } - -} HRESULT Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Jul 23 19:37:57 2006 @@ -138,8 +138,7 @@ ChangeDisplaySettings(NULL, 0); } - Hal_DirectDraw_Release(iface); - //Hel_DirectDraw_Release(iface); + Cleanup(iface); if (This!=NULL) { HeapFree(GetProcessHeap(), 0, This); 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 19:37:57 2006 @@ -15,6 +15,10 @@ HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface); HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface); HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); + +/* DirectDraw Cleanup code only internal use */ +VOID Cleanup(LPDIRECTDRAW7 iface); + /* own macro to alloc memmory */ #define DxHeapMemAlloc(m) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, m) Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Sun Jul 23 19:37:57 2006 @@ -11,13 +11,6 @@ #include "rosdraw.h" - - -VOID Hel_DirectDraw_Release (LPDIRECTDRAW7 iface) -{ -} - - HRESULT Hel_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) { @@ -26,12 +19,6 @@ *total = HEL_GRAPHIC_MEMORY_MAX; *free = This->HELMemoryAvilable; return DD_OK; -} - - -HRESULT Hel_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) -{ - DX_STUB; } HRESULT Hel_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) @@ -43,55 +30,3 @@ { DX_STUB; } - -HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - // this only for exclusive mode - if(!(This->cooperative_level & DDSCL_EXCLUSIVE)) - return DDERR_NOEXCLUSIVEMODE; - - // change the resolution using normal WinAPI function - DEVMODE mode; - mode.dmSize = sizeof(mode); - mode.dmPelsWidth = dwWidth; - mode.dmPelsHeight = dwHeight; - mode.dmBitsPerPel = dwBPP; - - //mode.dmDisplayFrequency = dwRefreshRate; - mode.dmFields = 0; - - DX_STUB_str("in hel"); - - if(dwWidth) - mode.dmFields |= DM_PELSWIDTH; - if(dwHeight) - mode.dmFields |= DM_PELSHEIGHT; - if(dwBPP) - mode.dmFields |= DM_BITSPERPEL; - /* - if(dwRefreshRate) - mode.dmFields |= DM_DISPLAYFREQUENCY; - */ - if (ChangeDisplaySettings(&mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - return DDERR_UNSUPPORTEDMODE; - - - // TODO: reactivate ddraw object, maximize window, set it in foreground - // and set excluive mode (if implemented by the driver) - - /* FIXME fill the DirectDrawGlobal right the modeindex old and new */ - - //if(dwWidth) - // This->Height = dwWidth; - //if(dwHeight) - // This->Width = dwHeight; - //if(dwBPP) - // This->Bpp = dwBPP; - - return DD_OK; -} - -

1 0

[greatlrd] 23246: Implement HELDdSetmode 1. it is hacked, this small hack need be rewriten later. But lest we got back same compatible we had with our ddraw.dll in windows.
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: greatlrd Date: Sun Jul 23 19:09:06 2006 New Revision: 23246 URL: http://svn.reactos.org/svn/reactos?rev=23246&view=rev Log: Implement HELDdSetmode 1. it is hacked, this small hack need be rewriten later. But lest we got back same compatible we had with our ddraw.dll in windows. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Jul 23 19:09:06 2006 @@ -218,9 +218,9 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - BOOL dummy = TRUE; - //DDHAL_SETMODEDATA mode; - + //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) && @@ -238,22 +238,127 @@ This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; - // FIXME : add search for which mode.ModeIndex we should use // FIXME : fill the mode.inexcl; // FIXME : fill the mode.useRefreshRate; - - if (This->mDdSetMode.SetMode(&This->mDdSetMode)!=DDHAL_DRIVER_HANDLED); - { - This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; - } - - if (This->mDdSetMode.ddRVal == DD_OK) - { - DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - /* FIXME fill the This->DirectDrawGlobal.vmiData right */ - } - - return This->mDdSetMode.ddRVal; + + /* 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/soft/surface_callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Sun Jul 23 19:09:06 2006 @@ -28,16 +28,187 @@ DX_STUB; } -/* + DWORD CALLBACK HelDdSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKey) { DX_STUB; } -*/ + DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode) -{ - DX_STUB; +{ + // change the resolution using normal WinAPI function + DEVMODE mode; + mode.dmSize = sizeof(DEVMODE); + mode.dmPelsWidth = 0; + mode.dmPelsHeight = 0; + mode.dmBitsPerPel = 0; + + /* FIXME use emuate display to get the res */ + + /* 320x200 15, 16, 32 */ + if (SetMode->dwModeIndex == 0x10d) + { + mode.dmPelsWidth = 320; + mode.dmPelsHeight = 200; + mode.dmBitsPerPel = 15; + } + + if (SetMode->dwModeIndex == 0x10e) + { + mode.dmPelsWidth = 320; + mode.dmPelsHeight = 200; + mode.dmBitsPerPel = 16; + } + + if (SetMode->dwModeIndex == 0x10f) + { + mode.dmPelsWidth = 320; + mode.dmPelsHeight = 200; + mode.dmBitsPerPel = 32; + } + + /* 640x400 8 */ + if (SetMode->dwModeIndex == 0x100) + { + mode.dmPelsWidth = 640; + mode.dmPelsHeight = 400; + mode.dmBitsPerPel = 8; + } + + /* 640x480 8, 15, 16 , 32*/ + if (SetMode->dwModeIndex == 0x101) + { + mode.dmPelsWidth = 640; + mode.dmPelsHeight = 480; + mode.dmBitsPerPel = 8; + } + + if (SetMode->dwModeIndex == 0x110) + { + mode.dmPelsWidth = 640; + mode.dmPelsHeight = 480; + mode.dmBitsPerPel = 15; + } + + if (SetMode->dwModeIndex == 0x111) + { + mode.dmPelsWidth = 640; + mode.dmPelsHeight = 480; + mode.dmBitsPerPel = 16; + } + + if (SetMode->dwModeIndex == 0x112) + { + mode.dmPelsWidth = 640; + mode.dmPelsHeight = 480; + mode.dmBitsPerPel = 32; + } + + /* 800x600 4, 8, 15, 16 , 32*/ + if (SetMode->dwModeIndex == 0x102) + { + mode.dmPelsWidth = 800; + mode.dmPelsHeight = 600; + mode.dmBitsPerPel = 4; + } + + if (SetMode->dwModeIndex == 0x103) + { + mode.dmPelsWidth = 800; + mode.dmPelsHeight = 600; + mode.dmBitsPerPel = 8; + } + + if (SetMode->dwModeIndex == 0x113) + { + mode.dmPelsWidth = 800; + mode.dmPelsHeight = 600; + mode.dmBitsPerPel = 15; + } + + + if (SetMode->dwModeIndex == 0x114) + { + mode.dmPelsWidth = 800; + mode.dmPelsHeight = 600; + mode.dmBitsPerPel = 16; + } + + if (SetMode->dwModeIndex == 0x115) + { + mode.dmPelsWidth = 800; + mode.dmPelsHeight = 600; + mode.dmBitsPerPel = 32; + } + + /* 1024x768 8, 15, 16 , 32*/ + + if (SetMode->dwModeIndex == 0x104) + { + mode.dmPelsWidth = 1024; + mode.dmPelsHeight = 768; + mode.dmBitsPerPel = 4; + } + + if (SetMode->dwModeIndex == 0x105) + { + mode.dmPelsWidth = 1024; + mode.dmPelsHeight = 768; + mode.dmBitsPerPel = 8; + } + + if (SetMode->dwModeIndex == 0x116) + { + mode.dmPelsWidth = 1024; + mode.dmPelsHeight = 768; + mode.dmBitsPerPel = 15; + } + + if (SetMode->dwModeIndex == 0x117) + { + mode.dmPelsWidth = 1024; + mode.dmPelsHeight = 768; + mode.dmBitsPerPel = 16; + } + + if (SetMode->dwModeIndex == 0x118) + { + mode.dmPelsWidth = 1024; + mode.dmPelsHeight = 768; + mode.dmBitsPerPel = 32; + } + + //mode.dmDisplayFrequency = dwRefreshRate; + mode.dmFields = 0; + + DX_STUB_str("in hel"); + + if(mode.dmPelsWidth != 0) + mode.dmFields |= DM_PELSWIDTH; + if(mode.dmPelsHeight != 0) + mode.dmFields |= DM_PELSHEIGHT; + if( mode.dmBitsPerPel != 0) + mode.dmFields |= DM_BITSPERPEL; + /* + if(dwRefreshRate) + mode.dmFields |= DM_DISPLAYFREQUENCY; + */ + + DX_WINDBG_trace_res((int)mode.dmPelsWidth, (int)mode.dmPelsHeight, (int)mode.dmBitsPerPel ); + + if (ChangeDisplaySettings(&mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) + { + DX_STUB_str("FAIL"); + SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; + } + else + { + DX_STUB_str("OK"); + SetMode->ddRVal = DD_OK; + } + + return DDHAL_DRIVER_HANDLED; } DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank)

1 0

[greatlrd] 23245: Remove alot HAL and HEL split and make the split into startup.c instead. it will save us the time to write same code twice. and it is extream easy to adding HEL api. U can look at ddk and sdk how Dd* api works and write then proper HEL for it. 1. I have break the HEL version of set display for we need it follow DdSetMode and no code have been rewriten for it yet.
by greatlrd＠svn.reactos.org 23 Jul '06

23 Jul '06

Author: greatlrd Date: Sun Jul 23 17:13:07 2006 New Revision: 23245 URL: http://svn.reactos.org/svn/reactos?rev=23245&view=rev Log: Remove alot HAL and HEL split and make the split into startup.c instead. it will save us the time to write same code twice. and it is extream easy to adding HEL api. U can look at ddk and sdk how Dd* api works and write then proper HEL for it. 1. I have break the HEL version of set display for we need it follow DdSetMode and no code have been rewriten for it yet. Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c 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/hal/ddraw_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c Sun Jul 23 17:13:07 2006 @@ -79,29 +79,7 @@ return mem.ddRVal; } -HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; - - if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) - { - return DDERR_NODRIVERSUPPORT; - } - - WaitVectorData.lpDD = &This->mDDrawGlobal; - WaitVectorData.dwFlags = dwFlags; - WaitVectorData.hEvent = (DWORD)h; - WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVectorData) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return WaitVectorData.ddRVal; -} HRESULT Hal_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { @@ -151,32 +129,6 @@ -HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETMODEDATA mode; - - if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) - { - return DDERR_NODRIVERSUPPORT; - } - - mode.lpDD = &This->mDDrawGlobal; - mode.ddRVal = DDERR_NODRIVERSUPPORT; - - - - // FIXME : add search for which mode.ModeIndex we should use - // FIXME : fill the mode.inexcl; - // FIXME : fill the mode.useRefreshRate; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.SetMode(&mode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return mode.ddRVal; -} + Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Jul 23 17:13:07 2006 @@ -218,8 +218,8 @@ DX_WINDBG_trace(); IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - BOOL dummy = TRUE; - DWORD ret; + BOOL dummy = TRUE; + //DDHAL_SETMODEDATA mode; /* FIXME check the refresrate if it same if it not same do the mode switch */ if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && @@ -230,29 +230,30 @@ return DD_OK; } - /* Check use the Hal or Hel for SetMode */ - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE) + if (This->mDdSetMode.SetMode == NULL ) { - ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); - - } - else - { - ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + return DDERR_NODRIVERSUPPORT; } - - if (ret == DD_OK) + + + This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; + + // FIXME : add search for which mode.ModeIndex we should use + // FIXME : fill the mode.inexcl; + // FIXME : fill the mode.useRefreshRate; + + if (This->mDdSetMode.SetMode(&This->mDdSetMode)!=DDHAL_DRIVER_HANDLED); + { + This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; + } + + if (This->mDdSetMode.ddRVal == DD_OK) { DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); /* FIXME fill the This->DirectDrawGlobal.vmiData right */ } - //This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC( (HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd); - - - - - return ret; + return This->mDdSetMode.ddRVal; } @@ -751,12 +752,21 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) - { - return Hal_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h); - } - - return Hel_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h); + if (This->mDdWaitForVerticalBlank.WaitForVerticalBlank == NULL) + { + return DDERR_NODRIVERSUPPORT; + } + + This->mDdWaitForVerticalBlank.dwFlags = dwFlags; + This->mDdWaitForVerticalBlank.hEvent = (DWORD)h; + This->mDdWaitForVerticalBlank.ddRVal = DDERR_NOTPALETTIZED; + + if (This->mDdWaitForVerticalBlank.WaitForVerticalBlank(&This->mDdWaitForVerticalBlank) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return This->mDdWaitForVerticalBlank.ddRVal; } HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, 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 17:13:07 2006 @@ -68,9 +68,17 @@ /* internal counter */ ULONG ref; - /* Callbacks info */ + /* DD Callbacks info */ + DDHAL_DESTROYDRIVERDATA mDdDestroyDriver; DDHAL_CREATESURFACEDATA mDdCreateSurface; - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + DDHAL_SETCOLORKEYDATA mDdSetColorKey; + DDHAL_SETMODEDATA mDdSetMode; + DDHAL_WAITFORVERTICALBLANKDATA mDdWaitForVerticalBlank; + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + DDHAL_CREATEPALETTEDATA mDdCreatePalette; + DDHAL_GETSCANLINEDATA mDdGetScanLine; + DDHAL_SETEXCLUSIVEMODEDATA mDdSetExclusiveMode; + DDHAL_FLIPTOGDISURFACEDATA mDdFlipToGDISurface; /* Primarey surface we must reach it from every where */ DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; 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 17:13:07 2006 @@ -25,6 +25,7 @@ UCHAR *pbmiData; BITMAPINFO *pbmi; DWORD *pMasks; + DWORD Flags; DX_WINDBG_trace(); @@ -119,29 +120,88 @@ } /* - Try figout which api we shall use, first we try see if HAL exits - if it does not we select HEL instead + Setup HEL or HAL for DD_CALLBACKS */ - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - } - else - { - This->mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HELDD.CanCreateSurface; - } - - This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) - { - This->mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - } - else - { - This->mDdCreateSurface.CreateSurface = This->mCallbacks.HELDD.CreateSurface; - } + This->mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + This->mDdCreatePalette.lpDD = &This->mDDrawGlobal; + This->mDdCreateSurface.lpDD = &This->mDDrawGlobal; + This->mDdFlipToGDISurface.lpDD = &This->mDDrawGlobal; + This->mDdDestroyDriver.lpDD = &This->mDDrawGlobal; + This->mDdGetScanLine.lpDD = &This->mDDrawGlobal; + This->mDdSetExclusiveMode.lpDD = &This->mDDrawGlobal; + 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; + } + + /* + Setup HEL or HAL for SURFACE CALLBACK + */ + + // FIXME /* Setup calback struct so we do not need refill same info again */ This->mDdCreateSurface.lpDD = &This->mDDrawGlobal;

1 0

[mwirth] 23244: Bugzilla 2.22
by mwirth＠svn.reactos.org 23 Jul '06

23 Jul '06

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