Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[greatlrd] 18934: split up CreateSurface to hal and hel interface

by greatlrd＠svn.reactos.com

split up CreateSurface to hal and hel interface Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c Modified: trunk/reactos/lib/ddraw/main/surface_main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h Modified: trunk/reactos/lib/ddraw/soft/surface_hel.c _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 18:27:09 UTC (rev 18934) @@ -10,6 +10,112 @@ #include "rosdraw.h" +HRESULT Hal_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) +{ + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) + return DDERR_UNSUPPORTED; + + This->owner = (IDirectDrawImpl*)pDD; + + /************ fill the discription of our primary surface ***********************/ + memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); + This->ddsd.dwSize = sizeof(DDSURFACEDESC); + + RtlCopyMemory(&This->ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(Th is->ddsd.ddckCKDestBlt)); + RtlCopyMemory(&This->ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,s izeof(This->ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&This->ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(This ->ddsd.ddckCKSrcBlt)); + RtlCopyMemory(&This->ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,siz eof(This->ddsd.ddckCKSrcOverlay)); + RtlCopyMemory(&This->ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeo f(This->ddsd.ddpfPixelFormat)); + RtlCopyMemory(&This->ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(This->ddsd.dds Caps)); + + This->ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + This->ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + This->ddsd.dwFlags = pDDSD2->dwFlags; + This->ddsd.dwHeight = pDDSD2->dwHeight; + This->ddsd.dwLinearSize = pDDSD2->dwLinearSize; + This->ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + This->ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + This->ddsd.dwReserved = pDDSD2->dwReserved; + This->ddsd.dwWidth = pDDSD2->dwWidth; + This->ddsd.lPitch = pDDSD2->lPitch; + This->ddsd.lpSurface = pDDSD2->lpSurface; + + /************ Test see if we can Create Surface ***********************/ + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + /* can the driver create the surface */ + DDHAL_CANCREATESURFACEDATA CanCreateData; + memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); + CanCreateData.lpDD = &This->owner->DirectDrawGlobal; + CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; + + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + + if(CanCreateData.ddRVal != DD_OK) + return CanCreateData.ddRVal; + } + + /************ Create Surface ***********************/ + + /* FIXME we are skipping filling in some data, I do not care for now */ + + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; + This->ddsd.dwFlags = DDSD_CAPS; + This->ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + + /* surface global struct */ + memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + This->Global.lpDD = &This->owner->DirectDrawGlobal; + This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; + This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; + This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; + + + /* surface more struct */ + memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + /* surface local struct */ + + memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + This->Local.lpGbl = &This->Global; + This->Local.lpSurfMore = &This->More; + + /* FIXME do a memcopy */ + This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; + + /* for the double pointer below */ + DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; + pLocal[0] = &This->Local; + pLocal[1] = NULL; + + /* the parameter struct */ + DDHAL_CREATESURFACEDATA CreateData; + memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); + CreateData.lpDD = pDirectDrawGlobal; + CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; + CreateData.dwSCnt = 1; + CreateData.lplpSList = pLocal; + CreateData.ddRVal = DD_FALSE; + + /* this is the call we were waiting for */ + if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateD ata) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + + /* FIXME remove the if and debug string*/ + if(CreateData.ddRVal != DD_OK) + return CreateData.ddRVal; + + OutputDebugString(L"This does hit By Ati Readon but not for nvida :( "); + OutputDebugString(L"Yet ;)"); + + return DD_OK; +} + + HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 18:27:09 UTC (rev 18934) @@ -13,107 +13,16 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) - return DDERR_UNSUPPORTED; + /* Call the Hal CreateSurface */ + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + return Hal_DDrawSurface_Initialize (iface, pDD, pDDSD2); + } - This->owner = (IDirectDrawImpl*)pDD; - - /************ fill the discription of our primary surface ***********************/ - memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); - This->ddsd.dwSize = sizeof(DDSURFACEDESC); - - RtlCopyMemory(&This->ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(Th is->ddsd.ddckCKDestBlt)); - RtlCopyMemory(&This->ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,s izeof(This->ddsd.ddckCKDestOverlay)); - RtlCopyMemory(&This->ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(This ->ddsd.ddckCKSrcBlt)); - RtlCopyMemory(&This->ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,siz eof(This->ddsd.ddckCKSrcOverlay)); - RtlCopyMemory(&This->ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeo f(This->ddsd.ddpfPixelFormat)); - RtlCopyMemory(&This->ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(This->ddsd.dds Caps)); - - This->ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; - This->ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; - This->ddsd.dwFlags = pDDSD2->dwFlags; - This->ddsd.dwHeight = pDDSD2->dwHeight; - This->ddsd.dwLinearSize = pDDSD2->dwLinearSize; - This->ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; - This->ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; - This->ddsd.dwReserved = pDDSD2->dwReserved; - This->ddsd.dwWidth = pDDSD2->dwWidth; - This->ddsd.lPitch = pDDSD2->lPitch; - This->ddsd.lpSurface = pDDSD2->lpSurface; - - /************ Test see if we can Create Surface ***********************/ - if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - /* can the driver create the surface */ - DDHAL_CANCREATESURFACEDATA CanCreateData; - memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); - CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; - - if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - - if(CanCreateData.ddRVal != DD_OK) - return CanCreateData.ddRVal; - } - - /************ Create Surface ***********************/ - - /* FIXME we are skipping filling in some data, I do not care for now */ - - LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; - This->ddsd.dwFlags = DDSD_CAPS; - This->ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - - /* surface global struct */ - memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - This->Global.lpDD = &This->owner->DirectDrawGlobal; - This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; - This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; - This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; - - - /* surface more struct */ - memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - /* surface local struct */ - - memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - This->Local.lpGbl = &This->Global; - This->Local.lpSurfMore = &This->More; - - /* FIXME do a memcopy */ - This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; - - /* for the double pointer below */ - DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; - pLocal[0] = &This->Local; - pLocal[1] = NULL; - - /* the parameter struct */ - DDHAL_CREATESURFACEDATA CreateData; - memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); - CreateData.lpDD = pDirectDrawGlobal; - CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; - CreateData.dwSCnt = 1; - CreateData.lplpSList = pLocal; - CreateData.ddRVal = DD_FALSE; - - /* this is the call we were waiting for */ - if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateD ata) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - - /* FIXME remove the if and debug string*/ - if(CreateData.ddRVal != DD_OK) - return CreateData.ddRVal; - - OutputDebugString(L"This does hit By Ati Readon but not for nvida :( "); - OutputDebugString(L"Yet ;)"); - - return DD_OK; + /* Call Hel if Hal of CreateSurface is not supported */ + return Hel_DDrawSurface_Initialize (iface, pDD, pDDSD2); } ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 18:27:09 UTC (rev 18934) @@ -97,6 +97,7 @@ HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); +HRESULT Hal_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 , LPDIRECTDRAW , LPDDSURFACEDESC2 ); HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 ); @@ -108,6 +109,7 @@ HRESULT Hel_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); +HRESULT Hel_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 , LPDIRECTDRAW , LPDDSURFACEDESC2 ); /*********** Macros ***********/ _____ Modified: trunk/reactos/lib/ddraw/soft/surface_hel.c --- trunk/reactos/lib/ddraw/soft/surface_hel.c 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/soft/surface_hel.c 2005-11-01 18:27:09 UTC (rev 18934) @@ -10,6 +10,11 @@ #include "rosdraw.h" +HRESULT Hel_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) +{ + DX_STUB; +} + HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) {

18 years, 10 months

[turner] 18933: Small unicode safe changes by me. Small msvc build error fix by jvangael@wisc.edu.

by turner＠svn.reactos.com

Small unicode safe changes by me. Small msvc build error fix by jvangael(a)wisc.edu. Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-11-01 16:17:25 UTC (rev 18932) +++ trunk/reactos/subsys/system/cmd/console.c 2005-11-01 17:01:36 UTC (rev 18933) @@ -178,7 +178,7 @@ &dwWritten, NULL); WriteFile (GetStdHandle (nStdHandle), - "\n", + _T("\n"), 1, &dwWritten, NULL); @@ -294,7 +294,7 @@ for(i = 0; i < len; i++) { - if(pBuf[i] == '\n') + if(pBuf[i] == _T('\n')) { LineCount++; CharEL=0; @@ -306,7 +306,7 @@ { if (i+1<len) { - if(pBuf[i+1] != '\n') LineCount++; + if(pBuf[i+1] != _T('\n')) LineCount++; } CharEL=0; } @@ -316,8 +316,8 @@ WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(CHAR),&dwWritten,NULL); if(LineCount >= ScreenLines) { - if(strnicmp(&pBuf[i], "\n", 2)!=0) - WriteFile (GetStdHandle (nStdHandle),"\n",sizeof(CHAR),&dwWritten,NULL); + if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); if(PagePrompt() != PROMPT_YES) { _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-11-01 16:17:25 UTC (rev 18932) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-11-01 17:01:36 UTC (rev 18933) @@ -74,11 +74,11 @@ VOID GetPathCase( TCHAR * Path, TCHAR * OutPath) { INT i = 0; - _tcscpy(OutPath, _T("")); TCHAR TempPath[MAX_PATH]; WIN32_FIND_DATA FindFileData; HANDLE hFind; _tcscpy(TempPath, _T("")); + _tcscpy(OutPath, _T("")); for(i = 0; i < _tcslen(Path); i++) @@ -206,7 +206,7 @@ return FALSE; } memcpy(dirpart, pattern, pathend - pattern + 1); - dirpart[pathend - pattern + 1] = '\0'; + dirpart[pathend - pattern + 1] = _T('\0'); } else { @@ -427,7 +427,7 @@ ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead) { lpString[len++] = ch; - if ((ch == '\n') || (ch == '\r')) + if ((ch == _T('\n')) || (ch == _T('\r'))) { /* break at new line*/ break; @@ -437,7 +437,7 @@ if (!dwRead && !len) return FALSE; - lpString[len++] = '\0'; + lpString[len++] = _T('\0'); #ifdef _UNICODE MultiByteToWideChar(CP_ACP, 0, lpString, len, lpBuffer, len); free(lpString); @@ -466,7 +466,7 @@ ConInEnable (); if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || - ((ir.Event.KeyEvent.wVirtualKeyCode == 'C') && + ((ir.Event.KeyEvent.wVirtualKeyCode == _T('C')) && (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) return PROMPT_BREAK; @@ -606,7 +606,7 @@ ConInEnable (); if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || - ((ir.Event.KeyEvent.wVirtualKeyCode == 'C') && + ((ir.Event.KeyEvent.wVirtualKeyCode == _T('C')) && (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) return PROMPT_BREAK;

18 years, 10 months

[weiden] 18932: - if a file object is a named pipe don't allow the FILE_APPEND_DATA access right as it equals FILE_CREATE_PIPE_INSTANCE (NtFlushBuffersFile and NtWriteFile)

by weiden＠svn.reactos.com

- if a file object is a named pipe don't allow the FILE_APPEND_DATA access right as it equals FILE_CREATE_PIPE_INSTANCE (NtFlushBuffersFile and NtWriteFile) - add more parameters probing and capturing code Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-11-01 14:46:34 UTC (rev 18931) +++ trunk/reactos/ntoskrnl/io/file.c 2005-11-01 16:17:25 UTC (rev 18932) @@ -755,7 +755,6 @@ IO_SECURITY_CONTEXT SecurityContext; KPROCESSOR_MODE AccessMode; HANDLE LocalHandle; - IO_STATUS_BLOCK LocalIoStatusBlock; LARGE_INTEGER SafeAllocationSize; PVOID SystemEaBuffer = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -988,7 +987,7 @@ //trigger FileObject/Event dereferencing Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = AccessMode; - Irp->UserIosb = &LocalIoStatusBlock; + Irp->UserIosb = IoStatusBlock; Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; Irp->Tail.Overlay.AuxiliaryBuffer = NULL; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -1054,7 +1053,7 @@ AccessMode, FALSE, NULL); - Status = LocalIoStatusBlock.Status; + Status = IoStatusBlock->Status; } if (!NT_SUCCESS(Status)) { @@ -1069,7 +1068,6 @@ _SEH_TRY { *FileHandle = LocalHandle; - *IoStatusBlock = LocalIoStatusBlock; } _SEH_HANDLE { @@ -1380,20 +1378,41 @@ NtCancelIoFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock) { - NTSTATUS Status; PFILE_OBJECT FileObject; PETHREAD Thread; PIRP Irp; KIRQL OldIrql; BOOLEAN OurIrpsInList = FALSE; LARGE_INTEGER Interval; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; - if ((ULONG_PTR)IoStatusBlock >= (ULONG_PTR)MmUserProbeAddress && - KeGetPreviousMode() != KernelMode) - return STATUS_ACCESS_VIOLATION; + PAGED_CODE(); - Status = ObReferenceObjectByHandle(FileHandle, 0, IoFileObjectType, - KeGetPreviousMode(), (PVOID*)&FileObject, + PreviousMode = KeGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) return Status; @@ -1531,23 +1550,39 @@ MAILSLOT_CREATE_PARAMETERS Buffer; DPRINT("NtCreateMailslotFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); + "ObjectAttributes 0x%p)\n", + FileHandle,DesiredAccess,ObjectAttributes); + PAGED_CODE(); /* Check for Timeout */ - if (TimeOut) + if (TimeOut != NULL) { - /* Enable it */ + if (KeGetPreviousMode() != KernelMode) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + Buffer.ReadTimeout = ProbeForReadLargeInteger(TimeOut); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + else + { + Buffer.ReadTimeout = *TimeOut; + } + Buffer.TimeoutSpecified = TRUE; - - /* FIXME: Add SEH */ - Buffer.ReadTimeout = *TimeOut; } else { - /* No timeout */ Buffer.TimeoutSpecified = FALSE; } @@ -1592,25 +1627,39 @@ NAMED_PIPE_CREATE_PARAMETERS Buffer; DPRINT("NtCreateNamedPipeFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); + "ObjectAttributes 0x%p)\n", + FileHandle,DesiredAccess,ObjectAttributes); + PAGED_CODE(); /* Check for Timeout */ - if (DefaultTimeout) + if (DefaultTimeout != NULL) { - /* Enable it */ + if (KeGetPreviousMode() != KernelMode) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + Buffer.DefaultTimeout = ProbeForReadLargeInteger(DefaultTimeout); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + else + { + Buffer.DefaultTimeout = *DefaultTimeout; + } + Buffer.TimeoutSpecified = TRUE; - - /* FIXME: Add SEH */ - Buffer.DefaultTimeout = *DefaultTimeout; } else - { - /* No timeout */ Buffer.TimeoutSpecified = FALSE; - } /* Set Settings */ Buffer.NamedPipeType = NamedPipeType; @@ -1724,6 +1773,8 @@ STDCALL NtFlushWriteBuffer(VOID) { + PAGED_CODE(); + KeFlushWriteBuffer(); return STATUS_SUCCESS; } @@ -1746,21 +1797,57 @@ PFILE_OBJECT FileObject = NULL; PIRP Irp; PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT DeviceObject; KEVENT Event; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; + OBJECT_HANDLE_INFORMATION ObjectHandleInfo; + KPROCESSOR_MODE PreviousMode; + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + /* Get the File Object */ Status = ObReferenceObjectByHandle(FileHandle, - FILE_WRITE_DATA, - NULL, + 0, + IoFileObjectType, PreviousMode, (PVOID*)&FileObject, - NULL); - if (Status != STATUS_SUCCESS) return(Status); + &ObjectHandleInfo); + if (!NT_SUCCESS(Status)) return(Status); + /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + granted. However, if this is a named pipe, make sure we don't ask for + FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE + access right! */ + if (!(FileObject->Flags & FO_NAMED_PIPE)) + DesiredAccess |= FILE_APPEND_DATA; + if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, + DesiredAccess)) + { + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { @@ -1968,13 +2055,18 @@ PDEVICE_OBJECT DeviceObject; PKEVENT Event = NULL; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; + LARGE_INTEGER CapturedByteOffset, CapturedLength; NTSTATUS Status = STATUS_SUCCESS; OBJECT_HANDLE_INFORMATION HandleInformation; - - /* FIXME: instead of this, use SEH */ - if (!Length || !ByteOffset) return STATUS_INVALID_PARAMETER; + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + CapturedByteOffset.QuadPart = 0; + CapturedLength.QuadPart = 0; + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, 0, @@ -1984,13 +2076,42 @@ &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - /* Must have FILE_READ_DATA | FILE_WRITE_DATA access */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + if (PreviousMode != KernelMode) { - DPRINT1("Invalid access rights\n"); - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; + /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access unless + we're in KernelMode! */ + if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + { + DPRINT1("Invalid access rights\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + CapturedLength = ProbeForReadLargeInteger(Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return Status; + } } + else + { + CapturedByteOffset = *ByteOffset; + CapturedLength = *Length; + } /* Get Event Object */ if (EventHandle) @@ -2043,7 +2164,7 @@ ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - *LocalLength = *Length; + *LocalLength = CapturedLength; /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -2060,8 +2181,8 @@ /* Set Parameters */ StackPtr->Parameters.LockControl.Length = LocalLength; - StackPtr->Parameters.LockControl.ByteOffset = *ByteOffset; - StackPtr->Parameters.LockControl.Key = Key ? Key : 0; + StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; + StackPtr->Parameters.LockControl.Key = Key; /* Set Flags */ if (FailImmediately) StackPtr->Flags = SL_FAIL_IMMEDIATELY; @@ -2709,7 +2830,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID Buffer, IN ULONG Length, - IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ + IN PLARGE_INTEGER ByteOffset OPTIONAL, IN PULONG Key OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; @@ -2717,14 +2838,19 @@ PIRP Irp = NULL; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; BOOLEAN LocalEvent = FALSE; PKEVENT EventObject = NULL; + LARGE_INTEGER CapturedByteOffset; DPRINT("NtReadFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, IoStatusBlock); + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + CapturedByteOffset.QuadPart = 0; /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) @@ -2734,11 +2860,14 @@ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - #if 0 ProbeForWrite(Buffer, Length, - sizeof(ULONG)); - #endif + 1); + if (ByteOffset != NULL) + { + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + } + /* FIXME - probe other pointers and capture information */ } _SEH_HANDLE { @@ -2748,6 +2877,13 @@ if(!NT_SUCCESS(Status)) return Status; } + else + { + if (ByteOffset != NULL) + { + CapturedByteOffset = *ByteOffset; + } + } /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, @@ -2759,9 +2895,9 @@ if (!NT_SUCCESS(Status)) return Status; /* Check the Byte Offset */ - if (!ByteOffset || - (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && - ByteOffset->u.HighPart == -1)) + if (ByteOffset == NULL || + (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && + CapturedByteOffset.u.HighPart == -1)) { /* a valid ByteOffset is required if asynch. op. */ if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) @@ -2772,7 +2908,7 @@ } /* Use the Current Byte OFfset */ - ByteOffset = &FileObject->CurrentByteOffset; + CapturedByteOffset = FileObject->CurrentByteOffset; } /* Check for event */ @@ -2821,7 +2957,7 @@ DeviceObject, Buffer, Length, - ByteOffset, + &CapturedByteOffset, EventObject, IoStatusBlock); if (Irp == NULL) @@ -3276,7 +3412,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock, IN PLARGE_INTEGER ByteOffset, IN PLARGE_INTEGER Length, - OUT ULONG Key OPTIONAL) + IN ULONG Key OPTIONAL) { PFILE_OBJECT FileObject = NULL; PLARGE_INTEGER LocalLength = NULL; @@ -3285,13 +3421,18 @@ PDEVICE_OBJECT DeviceObject; KEVENT Event; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + LARGE_INTEGER CapturedByteOffset, CapturedLength; OBJECT_HANDLE_INFORMATION HandleInformation; - - /* FIXME: instead of this, use SEH */ - if (!Length || !ByteOffset) return STATUS_INVALID_PARAMETER; + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + CapturedByteOffset.QuadPart = 0; + CapturedLength.QuadPart = 0; + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, 0, @@ -3301,13 +3442,42 @@ &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - /* Must have FILE_READ_DATA | FILE_WRITE_DATA access */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + if (PreviousMode != KernelMode) { - DPRINT1("Invalid access rights\n"); - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; + /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access unless we're + in KernelMode! */ + if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + { + DPRINT1("Invalid access rights\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + CapturedLength = ProbeForReadLargeInteger(Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return Status; + } } + else + { + CapturedByteOffset = *ByteOffset; + CapturedLength = *Length; + } /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) @@ -3349,7 +3519,7 @@ ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - *LocalLength = *Length; + *LocalLength = CapturedLength; /* Set up the IRP */ Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; @@ -3367,8 +3537,8 @@ /* Set Parameters */ StackPtr->Parameters.LockControl.Length = LocalLength; - StackPtr->Parameters.LockControl.ByteOffset = *ByteOffset; - StackPtr->Parameters.LockControl.Key = Key ? Key : 0; + StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; + StackPtr->Parameters.LockControl.Key = Key; /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); @@ -3424,34 +3594,49 @@ IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ IN PULONG Key OPTIONAL) { - OBJECT_HANDLE_INFORMATION HandleInformation; + OBJECT_HANDLE_INFORMATION ObjectHandleInfo; NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject; PIRP Irp = NULL; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; BOOLEAN LocalEvent = FALSE; PKEVENT EventObject = NULL; + LARGE_INTEGER CapturedByteOffset; + ULONG CapturedKey = 0; + ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; DPRINT("NtWriteFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, IoStatusBlock); + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + CapturedByteOffset.QuadPart = 0; + /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) { _SEH_TRY { - #if 0 ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); ProbeForRead(Buffer, Length, - sizeof(ULONG)); - #endif + 1); + if (ByteOffset != NULL) + { + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + } + + if (Key != NULL) + { + CapturedKey = ProbeForReadUlong(Key); + } } _SEH_HANDLE { @@ -3461,6 +3646,17 @@ if(!NT_SUCCESS(Status)) return Status; } + else + { + if (ByteOffset != NULL) + { + CapturedByteOffset = *ByteOffset; + } + if (Key != NULL) + { + CapturedKey = *Key; + } + } /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, @@ -3468,24 +3664,29 @@ IoFileObjectType, PreviousMode, (PVOID*)&FileObject, - &HandleInformation); + &ObjectHandleInfo); if (!NT_SUCCESS(Status)) return Status; - /* Must have FILE_WRITE_DATA | FILE_APPEND_DATA access */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA))) + /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + granted. However, if this is a named pipe, make sure we don't ask for + FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE + access right! */ + if (!(FileObject->Flags & FO_NAMED_PIPE)) + DesiredAccess |= FILE_APPEND_DATA; + if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, + DesiredAccess)) { - DPRINT1("Invalid access rights\n"); ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } /* Check if we got write Access */ - if (HandleInformation.GrantedAccess & FILE_WRITE_DATA) + if (ObjectHandleInfo.GrantedAccess & FILE_WRITE_DATA) { /* Check the Byte Offset */ - if (!ByteOffset || - (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && - ByteOffset->u.HighPart == -1)) + if (ByteOffset == NULL || + (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && + CapturedByteOffset.u.HighPart == -1)) { /* a valid ByteOffset is required if asynch. op. */ if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) @@ -3496,10 +3697,11 @@ } /* Use the Current Byte OFfset */ - ByteOffset = &FileObject->CurrentByteOffset; + CapturedByteOffset = FileObject->CurrentByteOffset; } } - else if (HandleInformation.GrantedAccess & FILE_APPEND_DATA) + else if ((ObjectHandleInfo.GrantedAccess & FILE_APPEND_DATA) && + !(FileObject->Flags & FO_NAMED_PIPE)) { /* a valid ByteOffset is required if asynch. op. */ if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) @@ -3510,8 +3712,8 @@ } /* Give the drivers somethign to understand */ - ByteOffset->u.LowPart = FILE_WRITE_TO_END_OF_FILE; - ByteOffset->u.HighPart = 0xffffffff; + CapturedByteOffset.u.LowPart = FILE_WRITE_TO_END_OF_FILE; + CapturedByteOffset.u.HighPart = 0xffffffff; } /* Check if we got an event */ @@ -3560,7 +3762,7 @@ DeviceObject, Buffer, Length, - ByteOffset, + &CapturedByteOffset, EventObject, IoStatusBlock); if (Irp == NULL) @@ -3601,7 +3803,7 @@ /* Setup Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; - StackPtr->Parameters.Write.Key = Key ? *Key : 0; + StackPtr->Parameters.Write.Key = CapturedKey; if (FileObject->Flags & FO_WRITE_THROUGH) StackPtr->Flags = SL_WRITE_THROUGH; /* Call the Driver */

18 years, 10 months

[greatlrd] 18931: * Source cleanup.

by greatlrd＠svn.reactos.com

* Source cleanup. * SetMode adding a check see if it same reslution or not if it not same we change it. * SetMode adding correct check for hal or hel. choice hal if it the drv provide it. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 13:52:22 UTC (rev 18930) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 14:46:34 UTC (rev 18931) @@ -447,24 +447,19 @@ return FlipGdi.ddRVal; } -HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_STUB; -} -#if 0 + HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_SETMODEDATA mode; + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) { return DDERR_NODRIVERSUPPORT; } - - DDHAL_SETMODEDATA mode; + mode.lpDD = &This->DirectDrawGlobal; mode.ddRVal = DDERR_NODRIVERSUPPORT; @@ -476,11 +471,8 @@ { return DDERR_NODRIVERSUPPORT; } - - BOOL dummy; - DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); - + return mode.ddRVal; } -#endif + _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 13:52:22 UTC (rev 18930) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 14:46:34 UTC (rev 18931) @@ -83,20 +83,35 @@ DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + BOOL dummy = TRUE; + DWORD ret; + + /* FIXME check the refresrate if it same if it not same do the mode switch */ + if ((This->DirectDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && + (This->DirectDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && + (This->DirectDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) + { + + return DD_OK; + } - /* FIXME implement hal setMode */ - if(Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, - dwBPP, dwRefreshRate, dwFlags) == DD_OK) - { - return DD_OK; + /* Check use the Hal or Hel for SetMode */ + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE) + { + ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); } - - DWORD ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); - - BOOL dummy; - DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); - - return ret; + else + { + ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + } + + if (ret == DD_OK) + { + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); + /* FIXME fill the This->DirectDrawGlobal.vmiData right */ + } + + return ret; } ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface)

18 years, 10 months

[ekohl] 18930: - Mark service for delete in the registry.

by ekohl＠svn.reactos.com

- Mark service for delete in the registry. Modified: trunk/reactos/subsys/system/services/config.c Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/subsys/system/services/config.c --- trunk/reactos/subsys/system/services/config.c 2005-11-01 13:47:40 UTC (rev 18929) +++ trunk/reactos/subsys/system/services/config.c 2005-11-01 13:52:22 UTC (rev 18930) @@ -11,7 +11,38 @@ /* FUNCTIONS *****************************************************************/ + DWORD +ScmOpenServiceKey(LPWSTR lpServiceName, + REGSAM samDesired, + PHKEY phKey) +{ + HKEY hServicesKey = NULL; + DWORD dwError; + + *phKey = NULL; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegOpenKeyExW(hServicesKey, + lpServiceName, + 0, + samDesired, + phKey); + + RegCloseKey(hServicesKey); + + return dwError; +} + + +DWORD ScmWriteDependencies(HKEY hServiceKey, LPWSTR lpDependencies, DWORD dwDependenciesLength) _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-11-01 13:47:40 UTC (rev 18929) +++ trunk/reactos/subsys/system/services/database.c 2005-11-01 13:52:22 UTC (rev 18930) @@ -987,9 +987,28 @@ DWORD ScmMarkServiceForDelete(PSERVICE pService) { - DPRINT1("ScmMarkServiceForDelete() called\n"); + HKEY hServiceKey = NULL; + DWORD dwValue = 1; + DWORD dwError; - return ERROR_SUCCESS; + DPRINT("ScmMarkServiceForDelete() called\n"); + + dwError = ScmOpenServiceKey(pService->lpServiceName, + KEY_WRITE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegSetValueExW(hServiceKey, + L"DeleteFlag", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(DWORD)); + + RegCloseKey(hServiceKey); + + return dwError; } /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-11-01 13:47:40 UTC (rev 18929) +++ trunk/reactos/subsys/system/services/services.h 2005-11-01 13:52:22 UTC (rev 18930) @@ -43,6 +43,10 @@ /* config.c */ +DWORD ScmOpenServiceKey(LPWSTR lpServiceName, + REGSAM samDesired, + PHKEY phKey); + DWORD ScmWriteDependencies(HKEY hServiceKey, LPWSTR lpDependencies, DWORD dwDependenciesLength);

18 years, 10 months

[ekohl] 18929: Update the Indentation.

by ekohl＠svn.reactos.com

Update the Indentation. Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-01 12:17:25 UTC (rev 18928) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-01 13:47:40 UTC (rev 18929) @@ -25,37 +25,37 @@ static VOID HandleBind(VOID) { - LPWSTR pszStringBinding; - RPC_STATUS status; + LPWSTR pszStringBinding; + RPC_STATUS status; - if (BindingHandle != NULL) - return; + if (BindingHandle != NULL) + return; - status = RpcStringBindingComposeW(NULL, - L"ncacn_np", - NULL, - L"\\pipe\\ntsvcs", - NULL, - &pszStringBinding); - if (status) - { - DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); - return; - } + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\ntsvcs", + NULL, + &pszStringBinding); + if (status) + { + DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + return; + } - /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, - &BindingHandle); - if (status) - { - DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); - } + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &BindingHandle); + if (status) + { + DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + } - status = RpcStringFreeW(&pszStringBinding); - if (status) - { - DPRINT1("RpcStringFree returned 0x%x\n", status); - } + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + DPRINT1("RpcStringFree returned 0x%x\n", status); + } } @@ -63,16 +63,16 @@ static VOID HandleUnbind(VOID) { - RPC_STATUS status; + RPC_STATUS status; - if (BindingHandle == NULL) - return; + if (BindingHandle == NULL) + return; - status = RpcBindingFree(&BindingHandle); - if (status) - { - DPRINT1("RpcBindingFree returned 0x%x\n", status); - } + status = RpcBindingFree(&BindingHandle); + if (status) + { + DPRINT1("RpcBindingFree returned 0x%x\n", status); + } } #endif @@ -179,25 +179,25 @@ BOOL STDCALL CloseServiceHandle(SC_HANDLE hSCObject) { - DWORD dwError; + DWORD dwError; - DPRINT("CloseServiceHandle() called\n"); + DPRINT("CloseServiceHandle() called\n"); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrCloseServiceHandle(BindingHandle, - (unsigned int)hSCObject); - if (dwError) - { - DPRINT1("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrCloseServiceHandle(BindingHandle, + (unsigned int)hSCObject); + if (dwError) + { + DPRINT1("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - DPRINT("CloseServiceHandle() done\n"); + DPRINT("CloseServiceHandle() done\n"); - return TRUE; + return TRUE; } @@ -207,32 +207,32 @@ * @unimplemented */ BOOL STDCALL -ControlService(SC_HANDLE hService, - DWORD dwControl, +ControlService(SC_HANDLE hService, + DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) { - DWORD dwError; + DWORD dwError; - DPRINT("ControlService(%x, %x, %p)\n", - hService, dwControl, lpServiceStatus); + DPRINT("ControlService(%x, %x, %p)\n", + hService, dwControl, lpServiceStatus); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrControlService(BindingHandle, - (unsigned int)hService, - dwControl, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrControlService() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrControlService(BindingHandle, + (unsigned int)hService, + dwControl, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrControlService() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - DPRINT("ControlService() done\n"); + DPRINT("ControlService() done\n"); - return TRUE; + return TRUE; } @@ -364,23 +364,23 @@ BOOL STDCALL DeleteService(SC_HANDLE hService) { - DWORD dwError; + DWORD dwError; - DPRINT("DeleteService(%x)\n", hService); + DPRINT("DeleteService(%x)\n", hService); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrDeleteService(BindingHandle, - (unsigned int)hService); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrDeleteService() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrDeleteService(BindingHandle, + (unsigned int)hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrDeleteService() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - return TRUE; + return TRUE; } @@ -656,67 +656,67 @@ SC_LOCK STDCALL LockServiceDatabase(SC_HANDLE hSCManager) { - SC_LOCK hLock; - DWORD dwError; + SC_LOCK hLock; + DWORD dwError; - DPRINT("LockServiceDatabase(%x)\n", hSCManager); + DPRINT("LockServiceDatabase(%x)\n", hSCManager); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrLockServiceDatabase(BindingHandle, - (unsigned int)hSCManager, - (unsigned int *)&hLock); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrLockServiceDatabase(BindingHandle, + (unsigned int)hSCManager, + (unsigned int *)&hLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hLock = %p\n", hLock); + DPRINT("hLock = %p\n", hLock); - return hLock; + return hLock; } static VOID WaitForSCManager(VOID) { - HANDLE hEvent; + HANDLE hEvent; - DPRINT("WaitForSCManager() called\n"); + DPRINT("WaitForSCManager() called\n"); - /* Try to open the existing event */ - hEvent = OpenEventW(SYNCHRONIZE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); - if (hEvent == NULL) - { - if (GetLastError() != ERROR_FILE_NOT_FOUND) - return; - - /* Try to create a new event */ - hEvent = CreateEventW(NULL, - TRUE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); + /* Try to open the existing event */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); if (hEvent == NULL) { - /* Try to open the existing event again */ - hEvent = OpenEventW(SYNCHRONIZE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); - if (hEvent == NULL) - return; + if (GetLastError() != ERROR_FILE_NOT_FOUND) + return; + + /* Try to create a new event */ + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + { + /* Try to open the existing event again */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + return; + } } - } - /* Wait for 3 minutes */ - WaitForSingleObject(hEvent, 180000); - CloseHandle(hEvent); + /* Wait for 3 minutes */ + WaitForSingleObject(hEvent, 180000); + CloseHandle(hEvent); - DPRINT("ScmWaitForSCManager() done\n"); + DPRINT("ScmWaitForSCManager() done\n"); } @@ -730,32 +730,32 @@ LPCSTR lpDatabaseName, DWORD dwDesiredAccess) { - SC_HANDLE hScm = NULL; - DWORD dwError; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerA(%s, %s, %lx)\n", - lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT("OpenSCManagerA(%s, %s, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - WaitForSCManager(); + WaitForSCManager(); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenSCManagerA(BindingHandle, - (LPSTR)lpMachineName, - (LPSTR)lpDatabaseName, - dwDesiredAccess, - (unsigned int*)&hScm); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerA(BindingHandle, + (LPSTR)lpMachineName, + (LPSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hScm = %p\n", hScm); + DPRINT("hScm = %p\n", hScm); - return hScm; + return hScm; } @@ -769,32 +769,32 @@ LPCWSTR lpDatabaseName, DWORD dwDesiredAccess) { - SC_HANDLE hScm = NULL; - DWORD dwError; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerW(%S, %S, %lx)\n", - lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT("OpenSCManagerW(%S, %S, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - WaitForSCManager(); + WaitForSCManager(); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenSCManagerW(BindingHandle, - (LPWSTR)lpMachineName, - (LPWSTR)lpDatabaseName, - dwDesiredAccess, - (unsigned int*)&hScm); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerW(BindingHandle, + (LPWSTR)lpMachineName, + (LPWSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hScm = %p\n", hScm); + DPRINT("hScm = %p\n", hScm); - return hScm; + return hScm; } @@ -808,30 +808,30 @@ LPCSTR lpServiceName, DWORD dwDesiredAccess) { - SC_HANDLE hService = NULL; - DWORD dwError; + SC_HANDLE hService = NULL; + DWORD dwError; - DPRINT("OpenServiceA(%p, %s, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceA(%p, %s, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenServiceA(BindingHandle, - (unsigned int)hSCManager, - (LPSTR)lpServiceName, - dwDesiredAccess, - (unsigned int*)&hService); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceA(BindingHandle, + (unsigned int)hSCManager, + (LPSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); - return hService; + return hService; } @@ -845,30 +845,30 @@ LPCWSTR lpServiceName, DWORD dwDesiredAccess) { - SC_HANDLE hService = NULL; - DWORD dwError; + SC_HANDLE hService = NULL; + DWORD dwError; - DPRINT("OpenServiceW(%p, %S, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceW(%p, %S, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenServiceW(BindingHandle, - (unsigned int)hSCManager, - (LPWSTR)lpServiceName, - dwDesiredAccess, - (unsigned int*)&hService); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceW(BindingHandle, + (unsigned int)hSCManager, + (LPWSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); - return hService; + return hService; } @@ -977,25 +977,25 @@ QueryServiceStatus(SC_HANDLE hService, LPSERVICE_STATUS lpServiceStatus) { - DWORD dwError; + DWORD dwError; - DPRINT("QueryServiceStatus(%p, %p)\n", - hService, lpServiceStatus); + DPRINT("QueryServiceStatus(%p, %p)\n", + hService, lpServiceStatus); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceStatus(BindingHandle, - (unsigned int)hService, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceStatus(BindingHandle, + (unsigned int)hService, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - return TRUE; + return TRUE; } @@ -1062,23 +1062,23 @@ BOOL STDCALL UnlockServiceDatabase(SC_LOCK ScLock) { - DWORD dwError; + DWORD dwError; - DPRINT("UnlockServiceDatabase(%x)\n", ScLock); + DPRINT("UnlockServiceDatabase(%x)\n", ScLock); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrUnlockServiceDatabase(BindingHandle, - (unsigned int)ScLock); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrUnlockServiceDatabase(BindingHandle, + (unsigned int)ScLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - return TRUE; + return TRUE; } @@ -1112,13 +1112,13 @@ void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } void __RPC_USER midl_user_free(void __RPC_FAR * ptr) { - HeapFree(GetProcessHeap(), 0, ptr); + HeapFree(GetProcessHeap(), 0, ptr); } /* EOF */

18 years, 10 months

[mbosma] 18928: Another few cosmetic changes and also except DDSURFACEDESC as parameter for CreateSurface.

by mbosma＠svn.reactos.com

Another few cosmetic changes and also except DDSURFACEDESC as parameter for CreateSurface. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 12:02:12 UTC (rev 18927) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 12:17:25 UTC (rev 18928) @@ -287,7 +287,7 @@ HRESULT Hal_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; @@ -379,7 +379,6 @@ HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 12:02:12 UTC (rev 18927) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 12:17:25 UTC (rev 18928) @@ -161,7 +161,7 @@ if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; - if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize) + if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) return DDERR_UNSUPPORTED; // the nasty com stuff @@ -370,7 +370,7 @@ HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, @@ -395,13 +395,13 @@ HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) @@ -411,40 +411,40 @@ HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) { - DX_STUB; + DX_STUB; } IDirectDraw7Vtbl DirectDraw7_Vtable =

18 years, 10 months

[mbosma] 18927: Add call to DdReenableDirectDrawObject (GdiEntry10) where it is needed.

by mbosma＠svn.reactos.com

Add call to DdReenableDirectDrawObject (GdiEntry10) where it is needed. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 11:35:01 UTC (rev 18926) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 12:02:12 UTC (rev 18927) @@ -22,6 +22,8 @@ if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) return DDERR_INVALIDPARAMS; + BOOL dummy; + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); /* alloc all the space */ This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -226,7 +228,6 @@ DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the NTCallbacks */ /* Fill in wher DriverInfo.guidInfo = GUID_NTCallbacks; @@ -476,8 +477,11 @@ { return DDERR_NODRIVERSUPPORT; } + + BOOL dummy; + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); - return mode.ddRVal + return mode.ddRVal; } #endif _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:35:01 UTC (rev 18926) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 12:02:12 UTC (rev 18927) @@ -82,17 +82,20 @@ HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DWORD ret; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; /* FIXME implement hal setMode */ - if((ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, - dwBPP, dwRefreshRate, dwFlags)) == DD_OK) + if(Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, + dwBPP, dwRefreshRate, dwFlags) == DD_OK) { - return ret; + return DD_OK; } - ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + DWORD ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + BOOL dummy; + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); + return ret; }

18 years, 10 months

[mbosma] 18926: fix compiling again, sorry.

by mbosma＠svn.reactos.com

fix compiling again, sorry. Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:32:35 UTC (rev 18925) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:35:01 UTC (rev 18926) @@ -290,10 +290,11 @@ pDDSD->lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; pDDSD->dwRefreshRate = This->DirectDrawGlobal.dwMonitorFrequency; - /* have not check where I should get hold of this info yet */ - DWORD dwBackBufferCount; + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.dd pfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCO RECAPS)); /* have not check where I should get hold of this info yet + DWORD dwBackBufferCount; DWORD dwAlphaBitDepth; DWORD dwReserved; LPVOID lpSurface; @@ -304,17 +305,11 @@ } DDCOLORKEY ddckCKDestBlt; DDCOLORKEY ddckCKSrcOverlay; - DDCOLORKEY ddckCKSrcBlt; - */ - - RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.dd pfDisplay,sizeof(DDPIXELFORMAT)); - RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCO RECAPS)); - - /* have not check where I should get hold of this info yet + DDCOLORKEY ddckCKSrcBlt; DWORD dwTextureStage; */ - return DD_OK; + return DD_OK; } HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,

18 years, 10 months

[mbosma] 18925: Some cosmetic changes like replacing tabs with spaces and grouping all stubs together.

by mbosma＠svn.reactos.com

Some cosmetic changes like replacing tabs with spaces and grouping all stubs together. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 09:59:21 UTC (rev 18924) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 11:32:35 UTC (rev 18925) @@ -15,317 +15,296 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - /* point to it self */ - This->DirectDrawGlobal.lp16DD = &This->DirectDrawGlobal; + /* point to it self */ + This->DirectDrawGlobal.lp16DD = &This->DirectDrawGlobal; - /* get the object */ - if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) - return DDERR_INVALIDPARAMS; + /* get the object */ + if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) + return DDERR_INVALIDPARAMS; - - /* alloc all the space */ - This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDHAL_CALLBACKS)); + + /* alloc all the space */ + This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDHAL_CALLBACKS)); - This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - sizeof(D3DHAL_CALLBACKS)); + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + sizeof(D3DHAL_CALLBACKS)); - This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_GLOBALDRIVERDATA)); - - /* Fill in some info */ - This->HalInfo.lpD3DGlobalDriverData = This->DirectDrawGlobal.lpD3DGlobalDriverData; - This->HalInfo.lpD3DHALCallbacks = This->DirectDrawGlobal.lpD3DHALCallbacks; - This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDD; - This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf; - This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette; - This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface; - - /* query all kinds of infos from the driver */ - if(!DdQueryDirectDrawObject ( - &This->DirectDrawGlobal, - &This->HalInfo, - This->HalInfo.lpDDCallbacks, - This->HalInfo.lpDDSurfaceCallbacks, - This->HalInfo.lpDDPaletteCallbacks, - (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, - (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, - This->HalInfo.lpDDExeBufCallbacks, - NULL, - NULL, - NULL )) - { - return DD_FALSE; - } - - This->HalInfo.vmiData.pvmList = (LPVIDMEM) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); + This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_GLOBALDRIVERDATA)); + + /* Fill in some info */ + This->HalInfo.lpD3DGlobalDriverData = This->DirectDrawGlobal.lpD3DGlobalDriverData; + This->HalInfo.lpD3DHALCallbacks = This->DirectDrawGlobal.lpD3DHALCallbacks; + This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDD; + This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf; + This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette; + This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface; + + /* query all kinds of infos from the driver */ + if(!DdQueryDirectDrawObject ( + &This->DirectDrawGlobal, + &This->HalInfo, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, + NULL, + NULL, + NULL )) + { + return DD_FALSE; + } + + This->HalInfo.vmiData.pvmList = (LPVIDMEM) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); - This->DirectDrawGlobal.lpdwFourCC = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = - (LPDDSURFACEDESC) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); + This->DirectDrawGlobal.lpdwFourCC = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = + (LPDDSURFACEDESC) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); - if(!DdQueryDirectDrawObject ( - &This->DirectDrawGlobal, - &This->HalInfo, - This->HalInfo.lpDDCallbacks, - This->HalInfo.lpDDSurfaceCallbacks, - This->HalInfo.lpDDPaletteCallbacks, - (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, - (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, - This->HalInfo.lpDDExeBufCallbacks, - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats, - This->DirectDrawGlobal.lpdwFourCC, - This->HalInfo.vmiData.pvmList - )) - { - return DD_FALSE; - } - - /* Copy HalInfo to DirectDrawGlobal (Not complete)*/ - - RtlCopyMemory(&This->DirectDrawGlobal.vmiData,&This->HalInfo.vmiData,siz eof(VIDMEMINFO)); - RtlCopyMemory(&This->DirectDrawGlobal.ddCaps,&This->HalInfo.ddCaps,sizeo f(DDCORECAPS)); - This->DirectDrawGlobal.dwMonitorFrequency = This->HalInfo.dwMonitorFrequency; + if(!DdQueryDirectDrawObject ( + &This->DirectDrawGlobal, + &This->HalInfo, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats, + This->DirectDrawGlobal.lpdwFourCC, + This->HalInfo.vmiData.pvmList + )) + { + return DD_FALSE; + } + + /* Copy HalInfo to DirectDrawGlobal (Not complete)*/ + RtlCopyMemory(&This->DirectDrawGlobal.vmiData,&This->HalInfo.vmiData,siz eof(VIDMEMINFO)); + RtlCopyMemory(&This->DirectDrawGlobal.ddCaps,&This->HalInfo.ddCaps,sizeo f(DDCORECAPS)); + This->DirectDrawGlobal.dwMonitorFrequency = This->HalInfo.dwMonitorFrequency; This->DirectDrawGlobal.dwModeIndex = This->HalInfo.dwModeIndex; This->DirectDrawGlobal.dwNumModes = This->HalInfo.dwNumModes; This->DirectDrawGlobal.lpModeInfo = This->HalInfo.lpModeInfo; - - /* Unsure which of these two for lpPDevice + /* Unsure which of these two for lpPDevice This->DirectDrawGlobal.dwPDevice = This->HalInfo.lpPDevice; - This->lpDriverHandle = This->HalInfo.lpPDevice; - */ - + This->lpDriverHandle = This->HalInfo.lpPDevice; + */ This->DirectDrawGlobal.hInstance = This->HalInfo.hInstance; + RtlCopyMemory(&This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf, + &This->HalInfo.lpDDExeBufCallbacks,sizeof(DDHAL_DDEXEBUFCALLBACKS)); - RtlCopyMemory(&This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf,&This->HalI nfo.lpDDExeBufCallbacks,sizeof(DDHAL_DDEXEBUFCALLBACKS)); + /*********************************************************************** */ + /* Set up the rest of the callbacks all callbacks we get back from */ + /* gdi32.dll is user mode */ + /*********************************************************************** */ - - - /*********************************************************************** */ - /* Set up the rest of the callbacks all callbacks we get back from */ - /* gdi32.dll is user mode */ - /*********************************************************************** */ + /* Todo add a check see if HalInfo.GetDriverInfo is supported or not */ + /* Do not trust msdn what it say about dwContext it is not in use for + windows nt, it is in use for all os, and it always pont to + DirectDrawGlobal.hDD */ - /* Todo add a check see if HalInfo.GetDriverInfo is supported or not */ + /* FIXME add all callback that have been commect out to gpl */ + /* FIXME free the memmor that being alloc when ddraw.dll exists */ + /* FIXME add check for DriverInfo if the handle or not */ - /* Do not trust msdn what it say about dwContext it is not in use for - windows nt, it is in use for all os, and it always pont to - DirectDrawGlobal.hDD */ + DDHAL_GETDRIVERINFODATA DriverInfo; + memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); + DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); + DriverInfo.dwContext = This->DirectDrawGlobal.hDD; - /* FIXME add all callback that have been commect out to gpl */ - /* FIXME free the memmor that being alloc when ddraw.dll exists */ - /* FIXME add check for DriverInfo if the handle or not */ + /* Get ColorControlCallbacks */ + DriverInfo.guidInfo = GUID_ColorControlCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDColorControl; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDCOLORCONTROLCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the GUID_D3DCallbacks callback */ + /* Problem with include files + DDHAL_DDMISCELLANEOUSCALLBACKS misc; + DriverInfo.guidInfo = GUID_D3DCallbacks; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo);*/ + + /* Get the D3DCallbacks2 */ + This->DirectDrawGlobal.lpD3DHALCallbacks2 = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_CALLBACKS2)); + DriverInfo.guidInfo = GUID_D3DCallbacks2; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks2; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS2); + This->HalInfo.GetDriverInfo(&DriverInfo); - DDHAL_GETDRIVERINFODATA DriverInfo; - memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); - DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); - DriverInfo.dwContext = This->DirectDrawGlobal.hDD; - - - /* Get ColorControlCallbacks */ - DriverInfo.guidInfo = GUID_ColorControlCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDColorControl; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDCOLORCONTROLCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the GUID_D3DCallbacks callback */ - - /* Problem with include files - DDHAL_DDMISCELLANEOUSCALLBACKS misc; - DriverInfo.guidInfo = GUID_D3DCallbacks; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo);*/ - - /* Get the D3DCallbacks2 */ - This->DirectDrawGlobal.lpD3DHALCallbacks2 = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_CALLBACKS2)); - DriverInfo.guidInfo = GUID_D3DCallbacks2; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks2; - DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS2); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the D3DCallbacks3 */ + + /* Get the D3DCallbacks3 */ This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_CALLBACKS3)); - DriverInfo.guidInfo = GUID_D3DCallbacks3; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks; - DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS3); - This->HalInfo.GetDriverInfo( &DriverInfo); - + sizeof(D3DHAL_CALLBACKS3)); + DriverInfo.guidInfo = GUID_D3DCallbacks3; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS3); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the misc callback */ + /* Problem with include files + DriverInfo.guidInfo = GUID_D3DCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ - /* Get the misc callback */ - /* Problem with include files - DriverInfo.guidInfo = GUID_D3DCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the D3DExtendedCaps */ - - This->DirectDrawGlobal.lpD3DExtendedCaps = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_D3DEXTENDEDCAPS)); - DriverInfo.guidInfo = GUID_D3DExtendedCaps; - DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpD3DExtendedCaps; - DriverInfo.dwExpectedSize = sizeof(D3DHAL_D3DEXTENDEDCAPS); - This->HalInfo.GetDriverInfo( &DriverInfo); + /* Get the D3DExtendedCaps */ + This->DirectDrawGlobal.lpD3DExtendedCaps = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_D3DEXTENDEDCAPS)); + DriverInfo.guidInfo = GUID_D3DExtendedCaps; + DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpD3DExtendedCaps; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_D3DEXTENDEDCAPS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the D3DParseUnknownCommandCallback */ - /* D3dDrawPrimitives2 callback where should it be fill in - DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); + /* Get the D3DParseUnknownCommandCallback */ + /* D3dDrawPrimitives2 callback where should it be fill in + DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); */ - /* Get the GetHeapAlignment */ - /* where should it be fill in - DriverInfo.guidInfo = GUID_GetHeapAlignment; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - - /* Get the KernelCallbacks */ - DriverInfo.guidInfo = GUID_KernelCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the GetHeapAlignment */ + /* where should it be fill in + DriverInfo.guidInfo = GUID_GetHeapAlignment; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the KernelCallbacks */ + DriverInfo.guidInfo = GUID_KernelCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the KernelCaps */ - This->DirectDrawGlobal.lpDDKernelCaps = (LPDDKERNELCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDHAL_DDKERNELCALLBACKS)); - DriverInfo.guidInfo = GUID_KernelCaps; - DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpDDKernelCaps; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the KernelCaps */ + This->DirectDrawGlobal.lpDDKernelCaps = (LPDDKERNELCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDHAL_DDKERNELCALLBACKS)); + DriverInfo.guidInfo = GUID_KernelCaps; + DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpDDKernelCaps; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the MiscellaneousCallbacks */ - DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the MiscellaneousCallbacks */ + DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the Miscellaneous2Callbacks */ - /* Not in the DDRAWI_DIRECTDRAW_GBL we map it up as private - Contain CreatesurfaceEx and other nice callbacks */ - DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; - DriverInfo.lpvData = &This->Misc2Callback; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the Miscellaneous2Callbacks */ + /* Not in the DDRAWI_DIRECTDRAW_GBL we map it up as private + Contain CreatesurfaceEx and other nice callbacks */ + DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; + DriverInfo.lpvData = &This->Misc2Callback; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the MotionCompCallbacks */ - DriverInfo.guidInfo = GUID_MotionCompCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMotionComp; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMOTIONCOMPCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the MotionCompCallbacks */ + DriverInfo.guidInfo = GUID_MotionCompCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMotionComp; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMOTIONCOMPCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); /* Get the NonLocalVidMemCaps */ - This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDNONLOCALVIDMEMCAPS)); - DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpddNLVCaps; - DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDNONLOCALVIDMEMCAPS)); + DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpddNLVCaps; + DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); + This->HalInfo.GetDriverInfo(&DriverInfo); + /* Get the NTCallbacks */ - /* Fill in wher - DriverInfo.guidInfo = GUID_NTCallbacks; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the NTPrivateDriverCaps */ - /* Fill in wher - DriverInfo.guidInfo = GUID_NTPrivateDriverCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the UpdateNonLocalHeap */ - /* Fill in where - DriverInfo.guidInfo = GUID_UpdateNonLocalHeap; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the VideoPortCallbacks */ - DriverInfo.guidInfo = GUID_VideoPortCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDVIDEOPORTCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the VideoPortCaps */ - This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDVIDEOPORTCAPS)); - DriverInfo.guidInfo = GUID_VideoPortCaps; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpDDVideoPortCaps; - DriverInfo.dwExpectedSize = sizeof(DDVIDEOPORTCAPS); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the ZPixelFormats */ - This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); - DriverInfo.guidInfo = GUID_ZPixelFormats; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; - DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); - This->HalInfo.GetDriverInfo( &DriverInfo); - - /* Setup some info from the callbacks we got */ - DDHAL_GETAVAILDRIVERMEMORYDATA mem; - mem.lpDD = &This->DirectDrawGlobal; - - This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); - - This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; - This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; - - /* Now all setup for HAL is done */ - return DD_OK; + /* Fill in wher + DriverInfo.guidInfo = GUID_NTCallbacks; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the NTPrivateDriverCaps */ + /* Fill in wher + DriverInfo.guidInfo = GUID_NTPrivateDriverCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the UpdateNonLocalHeap */ + /* Fill in where + DriverInfo.guidInfo = GUID_UpdateNonLocalHeap; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the VideoPortCallbacks */ + DriverInfo.guidInfo = GUID_VideoPortCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDVIDEOPORTCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the VideoPortCaps */ + This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDVIDEOPORTCAPS)); + DriverInfo.guidInfo = GUID_VideoPortCaps; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpDDVideoPortCaps; + DriverInfo.dwExpectedSize = sizeof(DDVIDEOPORTCAPS); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the ZPixelFormats */ + This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); + DriverInfo.guidInfo = GUID_ZPixelFormats; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; + DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Setup some info from the callbacks we got */ + DDHAL_GETAVAILDRIVERMEMORYDATA mem; + mem.lpDD = &This->DirectDrawGlobal; + This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); + This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; + This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; + + /* Now all setup for HAL is done */ + return DD_OK; } HRESULT Hal_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) + { + return DDERR_NODRIVERSUPPORT; + } - SetExclusiveMode.lpDD = &This->DirectDrawGlobal; + SetExclusiveMode.lpDD = &This->DirectDrawGlobal; SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; - SetExclusiveMode.dwEnterExcl = This->cooperative_level; + SetExclusiveMode.dwEnterExcl = This->cooperative_level; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode(&SetExclusiveM ode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode(&SetExclusiveM ode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - return SetExclusiveMode.ddRVal; + return SetExclusiveMode.ddRVal; } @@ -333,166 +312,172 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DdDeleteDirectDrawObject (&This->DirectDrawGlobal); + DdDeleteDirectDrawObject (&This->DirectDrawGlobal); - if(This->DirectDrawGlobal.lpDDKernelCaps) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDKernelCaps); + if(This->DirectDrawGlobal.lpDDKernelCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDKernelCaps); - if(This->DirectDrawGlobal.lpddNLVCaps) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpddNLVCaps); + if(This->DirectDrawGlobal.lpddNLVCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpddNLVCaps); - if(This->DirectDrawGlobal.lpDDVideoPortCaps) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDVideoPortCaps); + if(This->DirectDrawGlobal.lpDDVideoPortCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDVideoPortCaps); - if(This->DirectDrawGlobal.lpdwFourCC) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC); + if(This->DirectDrawGlobal.lpdwFourCC) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC); - if(This->DirectDrawGlobal.lpZPixelFormats) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpZPixelFormats); + if(This->DirectDrawGlobal.lpZPixelFormats) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpZPixelFormats); - if(This->HalInfo.vmiData.pvmList) - HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); - - if(((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverD ata)->lpTextureFormats) - HeapFree(GetProcessHeap(), 0, ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats); - - if(This->DirectDrawGlobal.lpDDCBtmp) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDCBtmp); - - if(This->DirectDrawGlobal.lpD3DHALCallbacks) - HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks); - - if(This->DirectDrawGlobal.lpD3DGlobalDriverData) - HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); + if(This->HalInfo.vmiData.pvmList) + HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); + + if(((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverD ata)->lpTextureFormats) + HeapFree(GetProcessHeap(), 0, ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats); + + if(This->DirectDrawGlobal.lpDDCBtmp) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDCBtmp); + + if(This->DirectDrawGlobal.lpD3DHALCallbacks) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks); + + if(This->DirectDrawGlobal.lpD3DGlobalDriverData) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); } HRESULT Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) + LPDWORD total, LPDWORD free) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - DDHAL_GETAVAILDRIVERMEMORYDATA mem; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DDHAL_GETAVAILDRIVERMEMORYDATA mem; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) + { + return DDERR_NODRIVERSUPPORT; + } - mem.lpDD = &This->DirectDrawGlobal; - mem.ddRVal = DDERR_NOTPALETTIZED; + mem.lpDD = &This->DirectDrawGlobal; + mem.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemo ry(&mem) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemo ry(&mem) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - ddscaps->dwCaps = mem.DDSCaps.dwCaps; - ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; + ddscaps->dwCaps = mem.DDSCaps.dwCaps; + ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; - ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; - *total = mem.dwTotal; - *free = mem.dwFree; - - return mem.ddRVal; + ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; + *total = mem.dwTotal; + *free = mem.dwFree; + + return mem.ddRVal; } HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; + DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) - { - return DDERR_NODRIVERSUPPORT; - } - - WaitVectorData.lpDD = &This->DirectDrawGlobal; - WaitVectorData.dwFlags = dwFlags; - WaitVectorData.hEvent = (DWORD)h; - WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) + { + return DDERR_NODRIVERSUPPORT; + } + + WaitVectorData.lpDD = &This->DirectDrawGlobal; + WaitVectorData.dwFlags = dwFlags; + WaitVectorData.hEvent = (DWORD)h; + WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVecto rData) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVecto rData) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - return WaitVectorData.ddRVal; + return WaitVectorData.ddRVal; } HRESULT Hal_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_GETSCANLINEDATA GetScan; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE)) + { + return DDERR_NODRIVERSUPPORT; + } - GetScan.lpDD = &This->DirectDrawGlobal; + GetScan.lpDD = &This->DirectDrawGlobal; GetScan.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.GetScanLine(&GetScan) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.GetScanLine(&GetScan) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - *lpdwScanLine = GetScan.ddRVal; - return GetScan.ddRVal; + *lpdwScanLine = GetScan.ddRVal; + return GetScan.ddRVal; } HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_FLIPTOGDISURFACEDATA FlipGdi; + DDHAL_FLIPTOGDISURFACEDATA FlipGdi; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE)) + { + return DDERR_NODRIVERSUPPORT; + } - FlipGdi.lpDD = &This->DirectDrawGlobal; + FlipGdi.lpDD = &This->DirectDrawGlobal; FlipGdi.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.FlipToGDISurface(&FlipGdi) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - /* FIXME where should FlipGdi.dwToGDI be fill in */ - return FlipGdi.ddRVal; + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.FlipToGDISurface(&FlipGdi) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + /* FIXME where should FlipGdi.dwToGDI be fill in */ + return FlipGdi.ddRVal; } HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DDHAL_SETMODEDATA mode; + DX_STUB; +} - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; +#if 0 +HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) + { + return DDERR_NODRIVERSUPPORT; + } - mode.lpDD = &This->DirectDrawGlobal; - mode.ddRVal = DDERR_NODRIVERSUPPORT; + DDHAL_SETMODEDATA mode; + mode.lpDD = &This->DirectDrawGlobal; + mode.ddRVal = DDERR_NODRIVERSUPPORT; - /* FIXME : add search for which mode.ModeIndex we should use */ - /* FIXME : fill the mode.inexcl; */ - /* FIXME : fill the mode.useRefreshRate; */ + // FIXME : add search for which mode.ModeIndex we should use + // FIXME : fill the mode.inexcl; + // FIXME : fill the mode.useRefreshRate; - /* - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetMode(&mode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - */ - DX_STUB; - /* return mode.ddRVal */ + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetMode(&mode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return mode.ddRVal } +#endif + _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 09:59:21 UTC (rev 18924) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:32:35 UTC (rev 18925) @@ -14,90 +14,86 @@ HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - HRESULT ret; + HRESULT ret; - + // this if it is not called by DirectDrawCreate + if(FALSE) + return DDERR_ALREADYINITIALIZED; - // this if it is not called by DirectDrawCreate - if(FALSE) - return DDERR_ALREADYINITIALIZED; + // save the parameter + This->lpGUID = lpGUID; - // save the parameter - This->lpGUID = lpGUID; + // get the HDC + This->hdc = GetWindowDC(GetDesktopWindow()); + This->Height = GetDeviceCaps(This->hdc, VERTRES); + This->Width = GetDeviceCaps(This->hdc, HORZRES); + This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL); - // get the HDC - This->hdc = GetWindowDC(GetDesktopWindow()); - This->Height = GetDeviceCaps(This->hdc, VERTRES); - This->Width = GetDeviceCaps(This->hdc, HORZRES); - This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL); - - // call software first - if((ret = Hal_DirectDraw_Initialize (iface)) != DD_OK) - return ret; - - // ... then overwrite with hal - if((ret = Hel_DirectDraw_Initialize (iface)) != DD_OK) - return ret; - + // call software first + if((ret = Hal_DirectDraw_Initialize (iface)) != DD_OK) + return ret; + + // ... then overwrite with hal + if((ret = Hel_DirectDraw_Initialize (iface)) != DD_OK) + return ret; - return DD_OK; + return DD_OK; } HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) { - // TODO: - // - create a scaner that check which driver we should get the HDC from - // for now we always asume it is the active dirver that should be use. - // - allow more Flags + // TODO: + // - create a scaner that check which driver we should get the HDC from + // for now we always asume it is the active dirver that should be use. + // - allow more Flags IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - // check the parameters - if (This->cooperative_level == cooplevel && This->window == hwnd) - return DD_OK; + // check the parameters + if (This->cooperative_level == cooplevel && This->window == hwnd) + return DD_OK; - if (This->window) - return DDERR_HWNDALREADYSET; + if (This->window) + return DDERR_HWNDALREADYSET; - if (This->cooperative_level) - return DDERR_EXCLUSIVEMODEALREADYSET; + if (This->cooperative_level) + return DDERR_EXCLUSIVEMODEALREADYSET; - if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) - return DDERR_INVALIDPARAMS; + if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) + return DDERR_INVALIDPARAMS; - if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) - return DDERR_INVALIDPARAMS; + if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) + return DDERR_INVALIDPARAMS; - // set the data - This->window = hwnd; - This->hdc = GetDC(hwnd); - This->cooperative_level = cooplevel; + // set the data + This->window = hwnd; + This->hdc = GetDC(hwnd); + This->cooperative_level = cooplevel; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) - { - return Hal_DirectDraw_SetCooperativeLevel (iface); - } + { + return Hal_DirectDraw_SetCooperativeLevel (iface); + } - return Hel_DirectDraw_SetCooperativeLevel(iface); + return Hel_DirectDraw_SetCooperativeLevel(iface); } HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DWORD ret; + DWORD ret; /* FIXME implement hal setMode */ - if((ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, + if((ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags)) == DD_OK) - { - return ret; - } + { + return ret; + } - ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); - return ret; + return ret; } ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) @@ -105,7 +101,7 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; ULONG ref = InterlockedIncrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); - return ref; [truncated at 1000 lines; 533 more skipped]

18 years, 10 months

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 November 2005