Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[khornicek] 37733: - create wined3d device in GdiEntry2

by khornicek＠svn.reactos.org

Author: khornicek Date: Sat Nov 29 10:27:59 2008 New Revision: 37733 URL: http://svn.reactos.org/svn/reactos?rev=37733&view=rev Log: - create wined3d device in GdiEntry2 Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 10:27:59 2008 @@ -1659,6 +1659,39 @@ BOOL WINAPI +CreateWineD3DDevice(LPDDRAWI_DIRECTDRAW_GBL hDirectDraw) +{ + IWineD3D *This = (IWineD3D*)hDirectDraw; + IWineD3DDevice *WineD3DDevice; + HRESULT hr; + + if( !This ) + return FALSE; + + WineD3DDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DDevice)); + + if (!WineD3DDevice) + { + hDirectDraw->dwUnused3 = 0; + return FALSE; + } + + hr = IWineD3D_CreateDevice(This, 0, WINED3DDEVTYPE_HAL, NULL, 0, &WineD3DDevice, NULL); + + if ( hr != DD_OK ) + { + HeapFree(GetProcessHeap(), 0, WineD3DDevice); + hDirectDraw->dwUnused3 = 0; + return FALSE; + } + + hDirectDraw->dwUnused3 = (DWORD) WineD3DDevice; + + return TRUE; +} + +BOOL +WINAPI bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, BOOL bComplete) { @@ -1749,7 +1782,7 @@ /* Create the DDraw Object */ //ghDirectDraw = NtGdiDdCreateDirectDrawObject(hdc); ghDirectDraw = (HANDLE) pWineDirect3DCreate(D3D_SDK_VERSION, 9, NULL); - + CreateWineD3DDevice((LPDDRAWI_DIRECTDRAW_GBL) ghDirectDraw); /* Delete our DC */ DeleteDC(hdc); } @@ -1771,7 +1804,7 @@ /* Using the per-process object, so create it */ //pDirectDrawGlobal->hDD = (ULONG_PTR)NtGdiDdCreateDirectDrawObject(hdc); pDirectDrawGlobal->hDD = (ULONG_PTR) pWineDirect3DCreate(D3D_SDK_VERSION, 9, NULL); - + CreateWineD3DDevice((LPDDRAWI_DIRECTDRAW_GBL) pDirectDrawGlobal->hDD); /* Set the return value */ Return = pDirectDrawGlobal->hDD ? TRUE : FALSE; @@ -1841,7 +1874,7 @@ } /* Do the query */ - if ( GetDdHandle(pDirectDrawGlobal->hDD) == NULL || pHalInfo == NULL) + if ( GetDdHandle(pDirectDrawGlobal->hDD) == NULL) { /* We failed, free the memory and return */ retVal = FALSE;

15 years, 9 months

[fireball] 37732: - Implement ScsiPortCompleteRequest based on OSR description. See issue #3025 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 29 10:24:29 2008 New Revision: 37732 URL: http://svn.reactos.org/svn/reactos?rev=37732&view=rev Log: - Implement ScsiPortCompleteRequest based on OSR description. See issue #3025 for more details. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sat Nov 29 10:24:29 2008 @@ -294,19 +294,114 @@ DbgPrint(Buffer); } +/* An internal helper function for ScsiPortCompleteRequest */ +VOID +NTAPI +SpiCompleteRequest(IN PVOID HwDeviceExtension, + IN PSCSI_REQUEST_BLOCK_INFO SrbInfo, + IN UCHAR SrbStatus) +{ + PSCSI_REQUEST_BLOCK Srb; + + /* Get current SRB */ + Srb = SrbInfo->Srb; + + /* Return if there is no SRB or it is not active */ + if (!Srb || !(Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE)) return; + + /* Set status */ + Srb->SrbStatus = SrbStatus; + + /* Set data transfered to 0 */ + Srb->DataTransferLength = 0; + + /* Notify */ + ScsiPortNotification(RequestComplete, + HwDeviceExtension, + Srb); +} /* * @unimplemented */ VOID NTAPI ScsiPortCompleteRequest(IN PVOID HwDeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun, - IN UCHAR SrbStatus) + IN UCHAR PathId, + IN UCHAR TargetId, + IN UCHAR Lun, + IN UCHAR SrbStatus) { - DPRINT("ScsiPortCompleteRequest()\n"); - UNIMPLEMENTED; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + PSCSI_PORT_LUN_EXTENSION LunExtension; + PSCSI_REQUEST_BLOCK_INFO SrbInfo; + PLIST_ENTRY ListEntry; + ULONG BusNumber; + ULONG Target; + + DPRINT("ScsiPortCompleteRequest() called\n"); + + DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, + SCSI_PORT_DEVICE_EXTENSION, + MiniPortDeviceExtension); + + /* Go through all buses */ + for (BusNumber = 0; BusNumber < 8; BusNumber++) + { + /* Go through all targets */ + for (Target = 0; Target < DeviceExtension->MaxTargedIds; Target++) + { + /* Get logical unit list head */ + LunExtension = DeviceExtension->LunExtensionList[Target % 8]; + + /* Go through all logical units */ + while (LunExtension) + { + /* Now match what caller asked with what we are at now */ + if ((PathId == SP_UNTAGGED || PathId == LunExtension->PathId) && + (TargetId == SP_UNTAGGED || TargetId == LunExtension->TargetId) && + (Lun == SP_UNTAGGED || Lun == LunExtension->Lun)) + { + /* Yes, that's what caller asked for. Complete abort requests */ + if (LunExtension->CompletedAbortRequests) + { + /* TODO: Save SrbStatus in this request */ + DPRINT1("Completing abort request without setting SrbStatus!\n"); + + /* Issue a notification request */ + ScsiPortNotification(RequestComplete, + HwDeviceExtension, + LunExtension->CompletedAbortRequests); + } + + /* Complete the request using our helper */ + SpiCompleteRequest(HwDeviceExtension, + &LunExtension->SrbInfo, + SrbStatus); + + /* Go through the queue and complete everything there too */ + ListEntry = LunExtension->SrbInfo.Requests.Flink; + while (ListEntry != &LunExtension->SrbInfo.Requests) + { + /* Get the actual SRB info entry */ + SrbInfo = CONTAINING_RECORD(ListEntry, + SCSI_REQUEST_BLOCK_INFO, + Requests); + + /* Complete it */ + SpiCompleteRequest(HwDeviceExtension, + SrbInfo, + SrbStatus); + + /* Advance to the next request in queue */ + ListEntry = SrbInfo->Requests.Flink; + } + } + + /* Advance to the next one */ + LunExtension = LunExtension->Next; + } + } + } } /*

15 years, 9 months

[greatlrd] 37731: Implement DdCanCreateSurface for wined3d

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 10:09:06 2008 New Revision: 37731 URL: http://svn.reactos.org/svn/reactos?rev=37731&view=rev Log: Implement DdCanCreateSurface for wined3d Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 10:09:06 2008 @@ -332,21 +332,58 @@ WINAPI DdCanCreateSurface(LPDDHAL_CANCREATESURFACEDATA CanCreateSurface) { - /* Fixme for opengl hel emulations */ - HEL_OGL_STUB; - -#if 0 - /* - * Note : This functions are basic same, in win32k - * NtGdiDdCanCreateD3DBuffer and NtGdiDdCanCreateSurface are mergs - * toghter in win32k at end and retrurn same data, it is still sepreated - * at user mode but in kmode it is not. - */ - - /* Call win32k */ - return NtGdiDdCanCreateSurface(GetDdHandle(CanCreateSurface->lpDD->hDD), - (PDD_CANCREATESURFACEDATA)CanCreateSurface); -#endif + DWORD i = 0; + if (CanCreateSurface->lpDDSurfaceDesc) + { + + CanCreateSurface->ddRVal = DDERR_INVALIDPIXELFORMAT; + + if ((CanCreateSurface->lpDDSurfaceDesc->dwSize == sizeof(DDSURFACEDESC) || + CanCreateSurface->lpDDSurfaceDesc->dwSize == sizeof(DDSURFACEDESC2))) + { + if (CanCreateSurface->bIsDifferentPixelFormat == FALSE) + { + // Maybe more check before we return DD_OK + CanCreateSurface->ddRVal = DD_OK; + } + else + { + if (CanCreateSurface->lpDDSurfaceDesc->dwFlags & DDPF_FOURCC) + { + + for (i=0;i<CanCreateSurface->lpDD->dwNumFourCC;i++) + { + if (CanCreateSurface->lpDD->lpdwFourCC[i] == CanCreateSurface->lpDDSurfaceDesc->ddpfPixelFormat.dwFourCC) + { + // calc yuvBitCount + switch ( CanCreateSurface->lpDDSurfaceDesc->ddpfPixelFormat.dwFourCC ) + { + case MAKEFOURCC('Y','U','Y','2') : + CanCreateSurface->lpDDSurfaceDesc->ddpfPixelFormat.dwYUVBitCount = 16; + break; + + case MAKEFOURCC('U','Y','V','Y') : + CanCreateSurface->lpDDSurfaceDesc->ddpfPixelFormat.dwYUVBitCount = 16; + break; + + case MAKEFOURCC('Y','V','1','2') : + CanCreateSurface->lpDDSurfaceDesc->ddpfPixelFormat.dwYUVBitCount = 12; + break; + + default: + break; + } + + // Maybe more check before we return DD_OK + CanCreateSurface->ddRVal = DD_OK; + break; + } + } + } + } + } + } + return DDHAL_DRIVER_HANDLED; } /*

15 years, 9 months

[greatlrd] 37730: update comment in config.template what REACTX_EMU does and how it works

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 09:16:54 2008 New Revision: 37730 URL: http://svn.reactos.org/svn/reactos?rev=37730&view=rev Log: update comment in config.template what REACTX_EMU does and how it works Modified: branches/reactx/reactos/config.template.rbuild Modified: branches/reactx/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/config.template.… ============================================================================== --- branches/reactx/reactos/config.template.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/config.template.rbuild [iso-8859-1] Sat Nov 29 09:16:54 2008 @@ -86,9 +86,25 @@ <property name="_ELF_" value="0" />  -<property name="REACTX_EMU" value="0" /> +<property name="REACTX_EMU" value="1" /> </group>

15 years, 9 months

[greatlrd] 37729: Make Gdientry2 return a fourcc list

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 08:34:58 2008 New Revision: 37729 URL: http://svn.reactos.org/svn/reactos?rev=37729&view=rev Log: Make Gdientry2 return a fourcc list Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 08:34:58 2008 @@ -1778,6 +1778,22 @@ IWineD3D* pWineD3d; WINED3DCAPS WineCaps; + DWORD wined3dFourCCList[] = + { + MAKEFOURCC('Y','U','Y','2'), + MAKEFOURCC('U','Y','V','Y'), + MAKEFOURCC('Y','V','1','2'), + // MAKEFOURCC('N','V','1','2'), // WINED3DFMT_NVHU ? + // MAKEFOURCC('N','V','2','1'), // WINED3DFMT_NVHUS ? + MAKEFOURCC('D','X','T','1'), + MAKEFOURCC('D','X','T','2'), + MAKEFOURCC('D','X','T','3'), + MAKEFOURCC('D','X','T','4'), + MAKEFOURCC('D','X','T','5') + }; + + + /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ @@ -1974,7 +1990,7 @@ DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_VIDEOMEMORY | - DDSCAPS_VISIBLE | + DDSCAPS_VISIBLE | DDSCAPS_3DDEVICE | DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | @@ -2007,10 +2023,13 @@ pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; - /* FIXME - pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + pHalInfo->ddCaps.dwNumFourCCCodes = sizeof(wined3dFourCCList) / sizeof(DWORD); pHalInfo->lpdwFourCC = pdwFourCC; - */ + + if (pdwFourCC) + { + RtlCopyMemory( pdwFourCC, &wined3dFourCCList, sizeof(wined3dFourCCList)); + } } /* Now check if we got any DD callbacks */

15 years, 9 months

[greatlrd] 37728: BugFix GdiEntry 2 : Do not fill in pHalInfo when it is NULL

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Nov 29 07:33:49 2008 New Revision: 37728 URL: http://svn.reactos.org/svn/reactos?rev=37728&view=rev Log: BugFix GdiEntry 2 : Do not fill in pHalInfo when it is NULL Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 07:33:49 2008 @@ -1842,176 +1842,176 @@ DeleteDC(hdc); /* End dectect RGB bit mask */ - /* Clear the incoming pointer */ - RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); - - /* Convert all the data */ - pHalInfo->dwSize = sizeof(DDHALINFO); - - pHalInfo->vmiData.fpPrimary = 0; - pHalInfo->vmiData.dwFlags = 0; // MSDN Currently unused and should be set to zero. - - pHalInfo->vmiData.dwDisplayWidth = DevMode.dmPelsHeight; - pHalInfo->vmiData.dwDisplayHeight = DevMode.dmPelsWidth; - - /* ToDo align it right, we skip align it, it must be algin like the graphice card delta for the screen - * the graphice card delta is same as pHalInfo->vmiData.lDisplayPitch - */ - pHalInfo->vmiData.lDisplayPitch = (DevMode.dmPelsWidth * DevMode.dmBitsPerPel) / 8; - - /* Setup DDPIXELFORMAT for pHalInfo->vmiData.ddpfDisplay */ - pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); - switch(DevMode.dmBitsPerPel) - { - case 1: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED1; - break; - - case 2: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED2; - break; - - case 4: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED4; - break; - - case 8: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED8; - break; - - case 16: - case 24: - case 32: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; - break; - default: - break; - } - - pHalInfo->vmiData.ddpfDisplay.dwFourCC = 0; - pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = DevMode.dmBitsPerPel; - pHalInfo->vmiData.ddpfDisplay.dwRBitMask = pMasks[0]; - pHalInfo->vmiData.ddpfDisplay.dwGBitMask = pMasks[1]; - pHalInfo->vmiData.ddpfDisplay.dwBBitMask = pMasks[2]; - pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask = pMasks[3]; - - /* ToDo ? align setting for wined3d */ - pHalInfo->vmiData.dwOffscreenAlign = 0; - pHalInfo->vmiData.dwOverlayAlign = 0; - pHalInfo->vmiData.dwTextureAlign = 0; - pHalInfo->vmiData.dwZBufferAlign = 0; - pHalInfo->vmiData.dwAlphaAlign = 0; - - pHalInfo->vmiData.dwNumHeaps = 0; - pHalInfo->vmiData.pvmList = NULL; - - // FIXME pHalInfo->ddCaps DDCORECAPS - - RtlZeroMemory(&pHalInfo->ddCaps, sizeof(DDCORECAPS)); - pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS); - - // FIXME fill in with wined3d caps here */ - - /* Note wined3d seam not support in pHalInfo->ddCaps.dwCaps - DDCAPS_ALIGNBOUNDARYDEST, DDCAPS_ALIGNSIZEDEST, DDCAPS_ALIGNSTRIDE - DDCAPS_ALPHA - DDCAPS_BLTFOURCC, DDCAPS_BLTQUEUE - DDCAPS_OVERLAY, DDCAPS_OVERLAYCANTCLIP, DDCAPS_OVERLAYFOURCC, DDCAPS_OVERLAYSTRETCH - DDCAPS_PALETTE, DDCAPS_PALETTEVSYNC - DDCAPS_READSCANLINE - DDCAPS_STEREOVIEW - DDCAPS_VBI - DDCAPS_ZBLTS - DDCAPS_ZOVERLAYS - */ - pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | - DDCAPS_BLTCOLORFILL | - DDCAPS_BLTDEPTHFILL | - DDCAPS_BLTSTRETCH | - DDCAPS_CANBLTSYSMEM | - DDCAPS_CANCLIP | - DDCAPS_CANCLIPSTRETCHED | - DDCAPS_COLORKEY | - DDCAPS_COLORKEYHWASSIST | - DDCAPS_ALIGNBOUNDARYSRC | - DDCAPS_GDI | - DDCAPS_PALETTE | - DDCAPS_3D; - - /* See msdn what pHalInfo->ddCaps.dwCaps2 does not support */ - pHalInfo->ddCaps.dwCaps2 = DDCAPS2_CERTIFIED | - DDCAPS2_NOPAGELOCKREQUIRED | - DDCAPS2_PRIMARYGAMMA | - DDCAPS2_WIDESURFACES | - DDCAPS2_CANRENDERWINDOWED; - - /* See msdn what pHalInfo->ddCaps.dwCKeyCaps does not support */ - pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_DESTBLT | DDCKEYCAPS_SRCBLT; - - /* See msdn what pHalInfo->ddCaps.dwFXCaps does not support */ - pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTALPHA | - DDFXCAPS_BLTMIRRORLEFTRIGHT | - DDFXCAPS_BLTMIRRORUPDOWN | - DDFXCAPS_BLTROTATION90 | - DDFXCAPS_BLTSHRINKX | - DDFXCAPS_BLTSHRINKXN | - DDFXCAPS_BLTSHRINKY | - DDFXCAPS_BLTSHRINKXN | - DDFXCAPS_BLTSTRETCHX | - DDFXCAPS_BLTSTRETCHXN | - DDFXCAPS_BLTSTRETCHY | - DDFXCAPS_BLTSTRETCHYN; - - /* See msdn what pHalInfo->ddCaps.dwSVBCaps does not support */ - pHalInfo->ddCaps.dwSVBCaps = pHalInfo->ddCaps.dwCaps; - - /* See msdn what pHalInfo->ddCaps.dwCaps does not support */ - pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_ALPHA | - DDSCAPS_BACKBUFFER | - DDSCAPS_FLIP | - DDSCAPS_FRONTBUFFER | - DDSCAPS_OFFSCREENPLAIN | - DDSCAPS_PALETTE | - DDSCAPS_PRIMARYSURFACE | - DDSCAPS_SYSTEMMEMORY | - DDSCAPS_VIDEOMEMORY | - DDSCAPS_VISIBLE | - DDSCAPS_3DDEVICE | - DDSCAPS_MIPMAP | - DDSCAPS_TEXTURE | - DDSCAPS_ZBUFFER; - - /* always force rope 0x1000 for hal it mean only source copy is supported */ - pHalInfo->ddCaps.dwRops[6] = 0x1000; - - pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; - - pHalInfo->dwFlags = DDHALINFO_ISPRIMARYDISPLAY; // we assume the current drv is the primary driver - /* DDHALINFO_ISPRIMARYDISPLAY - * Driver is the primary display driver. - * - * DDHALINFO_MODEXILLEGAL - * Hardware does not support ModeX modes - * - * DDHALINFO_GETDRIVERINFOSET - * The GetDriverInfo member is set, gdi32 does always set it - * - * DDHALINFO_GETDRIVERINFO2 - * Driver supports GetDriverInfo2 variant of GetDriverInfo - */ - - /* Setup callbacks */ - pHalInfo->lpDDCallbacks = pDDCallbacks; - pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; - pHalInfo->lpDDPaletteCallbacks =pDDPaletteCallbacks; - pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; - pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; - pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; - - /* FIXME - pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; - pHalInfo->lpdwFourCC = pdwFourCC; - */ + if (pHalInfo) + { + /* Clear the incoming pointer */ + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); + + /* Convert all the data */ + pHalInfo->dwSize = sizeof(DDHALINFO); + + pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.dwFlags = 0; // MSDN Currently unused and should be set to zero. + + pHalInfo->vmiData.dwDisplayWidth = DevMode.dmPelsHeight; + pHalInfo->vmiData.dwDisplayHeight = DevMode.dmPelsWidth; + + /* ToDo align it right, we skip align it, it must be algin like the graphice card delta for the screen + * the graphice card delta is same as pHalInfo->vmiData.lDisplayPitch + */ + pHalInfo->vmiData.lDisplayPitch = (DevMode.dmPelsWidth * DevMode.dmBitsPerPel) / 8; + + /* Setup DDPIXELFORMAT for pHalInfo->vmiData.ddpfDisplay */ + pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); + switch(DevMode.dmBitsPerPel) + { + case 1: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED1; + break; + + case 2: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED2; + break; + + case 4: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED4; + break; + + case 8: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED8; + break; + + case 16: + case 24: + case 32: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; + break; + + default: + break; + } + + pHalInfo->vmiData.ddpfDisplay.dwFourCC = 0; + pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = DevMode.dmBitsPerPel; + pHalInfo->vmiData.ddpfDisplay.dwRBitMask = pMasks[0]; + pHalInfo->vmiData.ddpfDisplay.dwGBitMask = pMasks[1]; + pHalInfo->vmiData.ddpfDisplay.dwBBitMask = pMasks[2]; + pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask = pMasks[3]; + + /* ToDo ? align setting for wined3d */ + pHalInfo->vmiData.dwOffscreenAlign = 0; + pHalInfo->vmiData.dwOverlayAlign = 0; + pHalInfo->vmiData.dwTextureAlign = 0; + pHalInfo->vmiData.dwZBufferAlign = 0; + pHalInfo->vmiData.dwAlphaAlign = 0; + + pHalInfo->vmiData.dwNumHeaps = 0; + pHalInfo->vmiData.pvmList = NULL; + + RtlZeroMemory(&pHalInfo->ddCaps, sizeof(DDCORECAPS)); + pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS); + + /* Note wined3d seam not support in pHalInfo->ddCaps.dwCaps + DDCAPS_ALIGNBOUNDARYDEST, DDCAPS_ALIGNSIZEDEST, DDCAPS_ALIGNSTRIDE + DDCAPS_ALPHA + DDCAPS_BLTFOURCC, DDCAPS_BLTQUEUE + DDCAPS_OVERLAY, DDCAPS_OVERLAYCANTCLIP, DDCAPS_OVERLAYFOURCC, DDCAPS_OVERLAYSTRETCH + DDCAPS_PALETTE, DDCAPS_PALETTEVSYNC + DDCAPS_READSCANLINE + DDCAPS_STEREOVIEW + DDCAPS_VBI + DDCAPS_ZBLTS + DDCAPS_ZOVERLAYS + */ + pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | + DDCAPS_BLTCOLORFILL | + DDCAPS_BLTDEPTHFILL | + DDCAPS_BLTSTRETCH | + DDCAPS_CANBLTSYSMEM | + DDCAPS_CANCLIP | + DDCAPS_CANCLIPSTRETCHED | + DDCAPS_COLORKEY | + DDCAPS_COLORKEYHWASSIST | + DDCAPS_ALIGNBOUNDARYSRC | + DDCAPS_GDI | + DDCAPS_PALETTE | + DDCAPS_3D; + + /* See msdn what pHalInfo->ddCaps.dwCaps2 does not support */ + pHalInfo->ddCaps.dwCaps2 = DDCAPS2_CERTIFIED | + DDCAPS2_NOPAGELOCKREQUIRED | + DDCAPS2_PRIMARYGAMMA | + DDCAPS2_WIDESURFACES | + DDCAPS2_CANRENDERWINDOWED; + + /* See msdn what pHalInfo->ddCaps.dwCKeyCaps does not support */ + pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_DESTBLT | DDCKEYCAPS_SRCBLT; + + /* See msdn what pHalInfo->ddCaps.dwFXCaps does not support */ + pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTALPHA | + DDFXCAPS_BLTMIRRORLEFTRIGHT | + DDFXCAPS_BLTMIRRORUPDOWN | + DDFXCAPS_BLTROTATION90 | + DDFXCAPS_BLTSHRINKX | + DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTSHRINKY | + DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTSTRETCHX | + DDFXCAPS_BLTSTRETCHXN | + DDFXCAPS_BLTSTRETCHY | + DDFXCAPS_BLTSTRETCHYN; + + /* See msdn what pHalInfo->ddCaps.dwSVBCaps does not support */ + pHalInfo->ddCaps.dwSVBCaps = pHalInfo->ddCaps.dwCaps; + + /* See msdn what pHalInfo->ddCaps.dwCaps does not support */ + pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_ALPHA | + DDSCAPS_BACKBUFFER | + DDSCAPS_FLIP | + DDSCAPS_FRONTBUFFER | + DDSCAPS_OFFSCREENPLAIN | + DDSCAPS_PALETTE | + DDSCAPS_PRIMARYSURFACE | + DDSCAPS_SYSTEMMEMORY | + DDSCAPS_VIDEOMEMORY | + DDSCAPS_VISIBLE | + DDSCAPS_3DDEVICE | + DDSCAPS_MIPMAP | + DDSCAPS_TEXTURE | + DDSCAPS_ZBUFFER; + + /* always force rope 0x1000 for hal it mean only source copy is supported */ + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; + + pHalInfo->dwFlags = DDHALINFO_ISPRIMARYDISPLAY; // we assume the current drv is the primary driver + /* DDHALINFO_ISPRIMARYDISPLAY + * Driver is the primary display driver. + * + * DDHALINFO_MODEXILLEGAL + * Hardware does not support ModeX modes + * + * DDHALINFO_GETDRIVERINFOSET + * The GetDriverInfo member is set, gdi32 does always set it + * + * DDHALINFO_GETDRIVERINFO2 + * Driver supports GetDriverInfo2 variant of GetDriverInfo + */ + + /* Setup callbacks */ + pHalInfo->lpDDCallbacks = pDDCallbacks; + pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; + pHalInfo->lpDDPaletteCallbacks =pDDPaletteCallbacks; + pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; + pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; + pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; + + /* FIXME + pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + pHalInfo->lpdwFourCC = pdwFourCC; + */ + } /* Now check if we got any DD callbacks */ if (pDDCallbacks)

15 years, 9 months

[khornicek] 37727: - reshuffle the code a bit, fix formatting, no actual code change

by khornicek＠svn.reactos.org

Author: khornicek Date: Sat Nov 29 06:58:12 2008 New Revision: 37727 URL: http://svn.reactos.org/svn/reactos?rev=37727&view=rev Log: - reshuffle the code a bit, fix formatting, no actual code change Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sat Nov 29 06:58:12 2008 @@ -29,55 +29,15 @@ #include "wine/config.h" #include "wine/wined3d_interface.h" + + +/* DATA **********************************************************************/ + typedef IWineD3D* WINAPI (*WINED3DCREATE) (UINT, UINT, PVOID); - -static WINED3DCREATE pWineDirect3DCreate = NULL; - -HINSTANCE hWineD3D = NULL; - -static BOOL InitWineD3DFunction(PCSTR name, - FARPROC *funcptr) -{ - PVOID func; - - func = (PVOID)GetProcAddress(hWineD3D, name); - if (func != NULL) - { - (void)InterlockedCompareExchangePointer((PVOID*)funcptr, - func, - NULL); - return TRUE; - } - - return FALSE; -} - -static BOOL InitWineD3D(void) -{ - HMODULE hModWineD3D; - BOOL Ret = TRUE; - - hModWineD3D = LoadLibraryW(L"WINED3D.DLL"); - if (hModWineD3D == NULL) - return FALSE; - - if (InterlockedCompareExchangePointer((PVOID*)&hWineD3D, - (PVOID)hModWineD3D, - NULL) != NULL) - { - FreeLibrary(hModWineD3D); - } - - if (!InitWineD3DFunction("WineDirect3DCreate", (FARPROC*)&pWineDirect3DCreate)) - Ret = FALSE; - - return Ret; -} - -/* DATA **********************************************************************/ - -HANDLE ghDirectDraw; -ULONG gcDirectDraw; +static WINED3DCREATE pWineDirect3DCreate = NULL; +HINSTANCE hWineD3D = NULL; +HANDLE ghDirectDraw; +ULONG gcDirectDraw; #define GetDdHandle(Handle) ((HANDLE)Handle ? (HANDLE)Handle : ghDirectDraw) #define HEL_OGL_STUB DPRINT1("HEL OGL STUB: %s\n", __FUNCTION__);\ @@ -1621,6 +1581,45 @@ /* PRIVATE FUNCTIONS *********************************************************/ +static BOOL InitWineD3DFunction(PCSTR name, + FARPROC *funcptr) +{ + PVOID func; + + func = (PVOID)GetProcAddress(hWineD3D, name); + if (func != NULL) + { + (void)InterlockedCompareExchangePointer((PVOID*)funcptr, + func, + NULL); + return TRUE; + } + + return FALSE; +} + +static BOOL InitWineD3D(void) +{ + HMODULE hModWineD3D; + BOOL Ret = TRUE; + + hModWineD3D = LoadLibraryW(L"WINED3D.DLL"); + if (hModWineD3D == NULL) + return FALSE; + + if (InterlockedCompareExchangePointer((PVOID*)&hWineD3D, + (PVOID)hModWineD3D, + NULL) != NULL) + { + FreeLibrary(hModWineD3D); + } + + if (!InitWineD3DFunction("WineDirect3DCreate", (FARPROC*)&pWineDirect3DCreate)) + Ret = FALSE; + + return Ret; +} + BOOL WINAPI bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, @@ -1843,178 +1842,176 @@ DeleteDC(hdc); /* End dectect RGB bit mask */ - /* Clear the incoming pointer */ - RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); - - /* Convert all the data */ - pHalInfo->dwSize = sizeof(DDHALINFO); - - pHalInfo->vmiData.fpPrimary = 0; - pHalInfo->vmiData.dwFlags = 0; // MSDN Currently unused and should be set to zero. - - pHalInfo->vmiData.dwDisplayWidth = DevMode.dmPelsHeight; - pHalInfo->vmiData.dwDisplayHeight = DevMode.dmPelsWidth; - - /* ToDo align it right, we skip align it, it must be algin like the graphice card delta for the screen - * the graphice card delta is same as pHalInfo->vmiData.lDisplayPitch - */ - pHalInfo->vmiData.lDisplayPitch = (DevMode.dmPelsWidth * DevMode.dmBitsPerPel) / 8; - - /* Setup DDPIXELFORMAT for pHalInfo->vmiData.ddpfDisplay */ - pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); - switch(DevMode.dmBitsPerPel) - { - case 1: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED1; - break; - - case 2: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED2; - break; - - case 4: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED4; - break; - - case 8: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED8; - break; - - case 16: - case 24: - case 32: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; - break; - default: - break; - } - - pHalInfo->vmiData.ddpfDisplay.dwFourCC = 0; - pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = DevMode.dmBitsPerPel; - pHalInfo->vmiData.ddpfDisplay.dwRBitMask = pMasks[0]; - pHalInfo->vmiData.ddpfDisplay.dwGBitMask = pMasks[1]; - pHalInfo->vmiData.ddpfDisplay.dwBBitMask = pMasks[2]; - pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask = pMasks[3]; - - /* ToDo ? align setting for wined3d */ - pHalInfo->vmiData.dwOffscreenAlign = 0; - pHalInfo->vmiData.dwOverlayAlign = 0; - pHalInfo->vmiData.dwTextureAlign = 0; - pHalInfo->vmiData.dwZBufferAlign = 0; - pHalInfo->vmiData.dwAlphaAlign = 0; - - pHalInfo->vmiData.dwNumHeaps = 0; - pHalInfo->vmiData.pvmList = NULL; - - // FIXME pHalInfo->ddCaps DDCORECAPS - - RtlZeroMemory(&pHalInfo->ddCaps, sizeof(DDCORECAPS)); - pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS); - - // FIXME fill in with wined3d caps here */ - - /* Note wined3d seam not support in pHalInfo->ddCaps.dwCaps - DDCAPS_ALIGNBOUNDARYDEST, DDCAPS_ALIGNSIZEDEST, DDCAPS_ALIGNSTRIDE - DDCAPS_ALPHA - DDCAPS_BLTFOURCC, DDCAPS_BLTQUEUE - DDCAPS_OVERLAY, DDCAPS_OVERLAYCANTCLIP, DDCAPS_OVERLAYFOURCC, DDCAPS_OVERLAYSTRETCH - DDCAPS_PALETTE, DDCAPS_PALETTEVSYNC - DDCAPS_READSCANLINE - DDCAPS_STEREOVIEW - DDCAPS_VBI - DDCAPS_ZBLTS - DDCAPS_ZOVERLAYS - */ - pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | - DDCAPS_BLTCOLORFILL | - DDCAPS_BLTDEPTHFILL | - DDCAPS_BLTSTRETCH | - DDCAPS_CANBLTSYSMEM | - DDCAPS_CANCLIP | - DDCAPS_CANCLIPSTRETCHED | - DDCAPS_COLORKEY | - DDCAPS_COLORKEYHWASSIST | - DDCAPS_ALIGNBOUNDARYSRC | - DDCAPS_GDI | - DDCAPS_PALETTE | - DDCAPS_3D; - - /* See msdn what pHalInfo->ddCaps.dwCaps2 does not support */ - pHalInfo->ddCaps.dwCaps2 = DDCAPS2_CERTIFIED | - DDCAPS2_NOPAGELOCKREQUIRED | - DDCAPS2_PRIMARYGAMMA | - DDCAPS2_WIDESURFACES | - DDCAPS2_CANRENDERWINDOWED; - - /* See msdn what pHalInfo->ddCaps.dwCKeyCaps does not support */ - pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_DESTBLT | - DDCKEYCAPS_SRCBLT; - - /* See msdn what pHalInfo->ddCaps.dwFXCaps does not support */ - pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTALPHA | - DDFXCAPS_BLTMIRRORLEFTRIGHT | - DDFXCAPS_BLTMIRRORUPDOWN | - DDFXCAPS_BLTROTATION90 | - DDFXCAPS_BLTSHRINKX | - DDFXCAPS_BLTSHRINKXN | - DDFXCAPS_BLTSHRINKY | - DDFXCAPS_BLTSHRINKXN | - DDFXCAPS_BLTSTRETCHX | - DDFXCAPS_BLTSTRETCHXN | - DDFXCAPS_BLTSTRETCHY | - DDFXCAPS_BLTSTRETCHYN; - - /* See msdn what pHalInfo->ddCaps.dwSVBCaps does not support */ - pHalInfo->ddCaps.dwSVBCaps = pHalInfo->ddCaps.dwCaps; - - /* See msdn what pHalInfo->ddCaps.dwCaps does not support */ - pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_ALPHA | - DDSCAPS_BACKBUFFER | - DDSCAPS_FLIP | - DDSCAPS_FRONTBUFFER | - DDSCAPS_OFFSCREENPLAIN | - DDSCAPS_PALETTE | - DDSCAPS_PRIMARYSURFACE | - DDSCAPS_SYSTEMMEMORY | - DDSCAPS_VIDEOMEMORY | - DDSCAPS_VISIBLE | - DDSCAPS_3DDEVICE | - DDSCAPS_MIPMAP | - DDSCAPS_TEXTURE | - DDSCAPS_ZBUFFER; - - /* always force rope 0x1000 for hal it mean only source copy is supported */ - pHalInfo->ddCaps.dwRops[6] = 0x1000; - - - pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; - - pHalInfo->dwFlags = DDHALINFO_ISPRIMARYDISPLAY; // we assume the current drv is the primary driver - /* DDHALINFO_ISPRIMARYDISPLAY - * Driver is the primary display driver. - * - * DDHALINFO_MODEXILLEGAL - * Hardware does not support ModeX modes - * - * DDHALINFO_GETDRIVERINFOSET - * The GetDriverInfo member is set, gdi32 does always set it - * - * DDHALINFO_GETDRIVERINFO2 - * Driver supports GetDriverInfo2 variant of GetDriverInfo - */ - - /* Setup callbacks */ - pHalInfo->lpDDCallbacks = pDDCallbacks; - pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; - pHalInfo->lpDDPaletteCallbacks =pDDPaletteCallbacks; - pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; - pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; - pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; - - /* FIXME - pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; - pHalInfo->lpdwFourCC = pdwFourCC; - */ + /* Clear the incoming pointer */ + RtlZeroMemory(pHalInfo, sizeof(DDHALINFO)); + + /* Convert all the data */ + pHalInfo->dwSize = sizeof(DDHALINFO); + + pHalInfo->vmiData.fpPrimary = 0; + pHalInfo->vmiData.dwFlags = 0; // MSDN Currently unused and should be set to zero. + + pHalInfo->vmiData.dwDisplayWidth = DevMode.dmPelsHeight; + pHalInfo->vmiData.dwDisplayHeight = DevMode.dmPelsWidth; + + /* ToDo align it right, we skip align it, it must be algin like the graphice card delta for the screen + * the graphice card delta is same as pHalInfo->vmiData.lDisplayPitch + */ + pHalInfo->vmiData.lDisplayPitch = (DevMode.dmPelsWidth * DevMode.dmBitsPerPel) / 8; + + /* Setup DDPIXELFORMAT for pHalInfo->vmiData.ddpfDisplay */ + pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); + switch(DevMode.dmBitsPerPel) + { + case 1: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED1; + break; + + case 2: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED2; + break; + + case 4: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED4; + break; + + case 8: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED8; + break; + + case 16: + case 24: + case 32: + pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; + break; + default: + break; + } + + pHalInfo->vmiData.ddpfDisplay.dwFourCC = 0; + pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = DevMode.dmBitsPerPel; + pHalInfo->vmiData.ddpfDisplay.dwRBitMask = pMasks[0]; + pHalInfo->vmiData.ddpfDisplay.dwGBitMask = pMasks[1]; + pHalInfo->vmiData.ddpfDisplay.dwBBitMask = pMasks[2]; + pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask = pMasks[3]; + + /* ToDo ? align setting for wined3d */ + pHalInfo->vmiData.dwOffscreenAlign = 0; + pHalInfo->vmiData.dwOverlayAlign = 0; + pHalInfo->vmiData.dwTextureAlign = 0; + pHalInfo->vmiData.dwZBufferAlign = 0; + pHalInfo->vmiData.dwAlphaAlign = 0; + + pHalInfo->vmiData.dwNumHeaps = 0; + pHalInfo->vmiData.pvmList = NULL; + + // FIXME pHalInfo->ddCaps DDCORECAPS + + RtlZeroMemory(&pHalInfo->ddCaps, sizeof(DDCORECAPS)); + pHalInfo->ddCaps.dwSize = sizeof(DDCORECAPS); + + // FIXME fill in with wined3d caps here */ + + /* Note wined3d seam not support in pHalInfo->ddCaps.dwCaps + DDCAPS_ALIGNBOUNDARYDEST, DDCAPS_ALIGNSIZEDEST, DDCAPS_ALIGNSTRIDE + DDCAPS_ALPHA + DDCAPS_BLTFOURCC, DDCAPS_BLTQUEUE + DDCAPS_OVERLAY, DDCAPS_OVERLAYCANTCLIP, DDCAPS_OVERLAYFOURCC, DDCAPS_OVERLAYSTRETCH + DDCAPS_PALETTE, DDCAPS_PALETTEVSYNC + DDCAPS_READSCANLINE + DDCAPS_STEREOVIEW + DDCAPS_VBI + DDCAPS_ZBLTS + DDCAPS_ZOVERLAYS + */ + pHalInfo->ddCaps.dwCaps = DDCAPS_BLT | + DDCAPS_BLTCOLORFILL | + DDCAPS_BLTDEPTHFILL | + DDCAPS_BLTSTRETCH | + DDCAPS_CANBLTSYSMEM | + DDCAPS_CANCLIP | + DDCAPS_CANCLIPSTRETCHED | + DDCAPS_COLORKEY | + DDCAPS_COLORKEYHWASSIST | + DDCAPS_ALIGNBOUNDARYSRC | + DDCAPS_GDI | + DDCAPS_PALETTE | + DDCAPS_3D; + + /* See msdn what pHalInfo->ddCaps.dwCaps2 does not support */ + pHalInfo->ddCaps.dwCaps2 = DDCAPS2_CERTIFIED | + DDCAPS2_NOPAGELOCKREQUIRED | + DDCAPS2_PRIMARYGAMMA | + DDCAPS2_WIDESURFACES | + DDCAPS2_CANRENDERWINDOWED; + + /* See msdn what pHalInfo->ddCaps.dwCKeyCaps does not support */ + pHalInfo->ddCaps.dwCKeyCaps = DDCKEYCAPS_DESTBLT | DDCKEYCAPS_SRCBLT; + + /* See msdn what pHalInfo->ddCaps.dwFXCaps does not support */ + pHalInfo->ddCaps.dwFXCaps = DDFXCAPS_BLTALPHA | + DDFXCAPS_BLTMIRRORLEFTRIGHT | + DDFXCAPS_BLTMIRRORUPDOWN | + DDFXCAPS_BLTROTATION90 | + DDFXCAPS_BLTSHRINKX | + DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTSHRINKY | + DDFXCAPS_BLTSHRINKXN | + DDFXCAPS_BLTSTRETCHX | + DDFXCAPS_BLTSTRETCHXN | + DDFXCAPS_BLTSTRETCHY | + DDFXCAPS_BLTSTRETCHYN; + + /* See msdn what pHalInfo->ddCaps.dwSVBCaps does not support */ + pHalInfo->ddCaps.dwSVBCaps = pHalInfo->ddCaps.dwCaps; + + /* See msdn what pHalInfo->ddCaps.dwCaps does not support */ + pHalInfo->ddCaps.ddsCaps.dwCaps = DDSCAPS_ALPHA | + DDSCAPS_BACKBUFFER | + DDSCAPS_FLIP | + DDSCAPS_FRONTBUFFER | + DDSCAPS_OFFSCREENPLAIN | + DDSCAPS_PALETTE | + DDSCAPS_PRIMARYSURFACE | + DDSCAPS_SYSTEMMEMORY | + DDSCAPS_VIDEOMEMORY | + DDSCAPS_VISIBLE | + DDSCAPS_3DDEVICE | + DDSCAPS_MIPMAP | + DDSCAPS_TEXTURE | + DDSCAPS_ZBUFFER; + + /* always force rope 0x1000 for hal it mean only source copy is supported */ + pHalInfo->ddCaps.dwRops[6] = 0x1000; + + pHalInfo->GetDriverInfo = (LPDDHAL_GETDRIVERINFO) DdGetDriverInfo; + + pHalInfo->dwFlags = DDHALINFO_ISPRIMARYDISPLAY; // we assume the current drv is the primary driver + /* DDHALINFO_ISPRIMARYDISPLAY + * Driver is the primary display driver. + * + * DDHALINFO_MODEXILLEGAL + * Hardware does not support ModeX modes + * + * DDHALINFO_GETDRIVERINFOSET + * The GetDriverInfo member is set, gdi32 does always set it + * + * DDHALINFO_GETDRIVERINFO2 + * Driver supports GetDriverInfo2 variant of GetDriverInfo + */ + + /* Setup callbacks */ + pHalInfo->lpDDCallbacks = pDDCallbacks; + pHalInfo->lpDDSurfaceCallbacks = pDDSurfaceCallbacks; + pHalInfo->lpDDPaletteCallbacks =pDDPaletteCallbacks; + pHalInfo->lpD3DGlobalDriverData = (ULONG_PTR)pD3dDriverData; + pHalInfo->lpD3DHALCallbacks = (ULONG_PTR)pD3dCallbacks; + pHalInfo->lpDDExeBufCallbacks = pD3dBufferCallbacks; + + /* FIXME + pHalInfo->ddCaps.dwNumFourCCCodes = FourCCs; + pHalInfo->lpdwFourCC = pdwFourCC; + */ /* Now check if we got any DD callbacks */ if (pDDCallbacks)

15 years, 9 months

[dchapyshev] 37726: - Fix build

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Nov 29 06:57:50 2008 New Revision: 37726 URL: http://svn.reactos.org/svn/reactos?rev=37726&view=rev Log: - Fix build Modified: trunk/reactos/dll/win32/secur32/lsa.c Modified: trunk/reactos/dll/win32/secur32/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsa.c?re… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/lsa.c [iso-8859-1] Sat Nov 29 06:57:50 2008 @@ -11,6 +11,9 @@ /* INCLUDES ******************************************************************/ #include <precomp.h> + +#define NDEBUG +#include <debug.h> /* GLOBALS *******************************************************************/

15 years, 9 months

[dchapyshev] 37725: - DPRINT1(...); -> UNIMPLEMENTED;

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Nov 29 06:49:08 2008 New Revision: 37725 URL: http://svn.reactos.org/svn/reactos?rev=37725&view=rev Log: - DPRINT1(...); -> UNIMPLEMENTED; Modified: trunk/reactos/dll/win32/secur32/lsa.c trunk/reactos/dll/win32/secur32/secext.c trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsa.c?re… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/lsa.c [iso-8859-1] Sat Nov 29 06:49:08 2008 @@ -53,7 +53,8 @@ NTSTATUS STDCALL LsaConnectUntrusted(PHANDLE LsaHandle) { - return(STATUS_UNSUCCESSFUL); + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; } /* @@ -339,7 +340,8 @@ PLUID * LogonSessionList ) { - return(FALSE); + UNIMPLEMENTED; + return FALSE; } /* @@ -352,7 +354,8 @@ PSECURITY_LOGON_SESSION_DATA * ppLogonSessionData ) { - return(FALSE); + UNIMPLEMENTED; + return FALSE; } /* @@ -365,7 +368,8 @@ HANDLE NotificationEventHandle ) { - return(FALSE); + UNIMPLEMENTED; + return FALSE; } /* @@ -378,5 +382,6 @@ HANDLE NotificationEventHandle ) { - return(FALSE); -} + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/dll/win32/secur32/secext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secext.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/secext.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secext.c [iso-8859-1] Sat Nov 29 06:49:08 2008 @@ -12,7 +12,7 @@ PULONG pulong ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -24,7 +24,7 @@ PULONG pulong ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -37,7 +37,7 @@ PULONG pulong ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -50,6 +50,6 @@ PULONG pulong ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Sat Nov 29 06:49:08 2008 @@ -11,7 +11,7 @@ PSecPkgInfoW* psecpkginfow ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -22,7 +22,7 @@ PSecPkgInfoA* psecpkginfoa ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -32,7 +32,7 @@ PVOID pvoid ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -40,7 +40,7 @@ WINAPI FreeCredentialsHandle(PCredHandle Handle) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -48,7 +48,7 @@ WINAPI DeleteSecurityContext(PCtxtHandle Handle) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -56,7 +56,7 @@ WINAPI InitSecurityInterfaceW(VOID) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return NULL; } @@ -67,7 +67,7 @@ PSecBufferDesc Buffer, ULONG Bar) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -78,7 +78,7 @@ ULONG Foo, PULONG Bar) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -87,7 +87,7 @@ ApplyControlTokenW(PCtxtHandle Handle, PSecBufferDesc Buffer) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -96,7 +96,7 @@ ApplyControlTokenA(PCtxtHandle Handle, PSecBufferDesc Buffer) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -105,7 +105,7 @@ CompleteAuthToken(PCtxtHandle Handle, PSecBufferDesc Buffer) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -115,7 +115,7 @@ ULONG Foo, PVOID Bar) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -125,7 +125,7 @@ ULONG Foo, PVOID Bar) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -143,7 +143,7 @@ PTimeStamp pExpires ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -161,7 +161,7 @@ PTimeStamp pExpires ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -182,7 +182,7 @@ PTimeStamp pExpires ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -203,7 +203,7 @@ PTimeStamp pExpires ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -217,7 +217,7 @@ ULONG MessageSeqNo ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -231,7 +231,7 @@ PULONG pfQOP ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -242,7 +242,7 @@ PSecPkgInfoA* ppPackageInfo ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -253,7 +253,7 @@ PSecPkgInfoW* ppPackageInfo ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -271,7 +271,7 @@ PTimeStamp ptsExpiry ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -288,7 +288,7 @@ PTimeStamp ptsExpiry ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -305,7 +305,7 @@ PTimeStamp ptsExpiry ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -318,7 +318,7 @@ LPVOID *pToken ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -328,7 +328,7 @@ PCtxtHandle phContext ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -341,7 +341,7 @@ PCtxtHandle phContext ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -354,7 +354,7 @@ PCtxtHandle phContext ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -366,7 +366,7 @@ LPVOID pBuffer ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -378,7 +378,7 @@ LPVOID pBuffer ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -389,7 +389,7 @@ PHANDLE phToken ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -399,7 +399,7 @@ PCtxtHandle phContext ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; } @@ -407,7 +407,7 @@ WINAPI InitSecurityInterfaceA(VOID) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return NULL; } @@ -421,7 +421,7 @@ PULONG nSize ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return FALSE; } @@ -435,6 +435,6 @@ PULONG nSize ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + UNIMPLEMENTED; return FALSE; }

15 years, 9 months

[dreimer] 37724: Byebye wget.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Nov 29 06:42:24 2008 New Revision: 37724 URL: http://svn.reactos.org/svn/reactos?rev=37724&view=rev Log: Byebye wget. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat Nov 29 06:42:24 2008 @@ -35,6 +35,17 @@ $global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" $global:_ROSBE_OBJPATH = $null $global:_ROSBE_OUTPATH = $null + +function global:Get-WebFile { + param( + $url = $null, + $file = $null + ) + $local:ErrorActionPreference = "SilentlyContinue" + $clnt = new-object System.Net.WebClient + $clnt.DownloadFile($url,$file) + $local:ErrorActionPreference = "Continue" +} # # Display the banner and set up the environment for the GCC 4.x.x build Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Sat Nov 29 06:42:24 2008 @@ -27,7 +27,7 @@ return } if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null + get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { get-Content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" @@ -36,7 +36,7 @@ $YESNO = Read-Host "(yes), (no)" if ($YESNO -eq "yes") { if (!(Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z")) { - &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z 2>&1> $null + get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt } if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.7z") { remove-item "$_ROSBE_VERSION-$_ROSBE_STATCOUNT\*.*" -force -EA SilentlyContinue @@ -76,7 +76,7 @@ if (!(Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe")) { set-location "$_ROSBE_BASEDIR\Tools" - &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/7z.exe 2>&1> $null + get-webfile $_ROSBE_URL/7z.exe $PWD\7z.exe set-location $_ROSBE_OPATH } @@ -86,7 +86,7 @@ # First check for a new Updater. # rename-item update.ps1 update2.ps1 -&"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/update.ps1 2>&1> $null +get-webfile $_ROSBE_URL/update.ps1 $PWD\update.ps1 if ((gi .\update.ps1).LastWriteTime -gt (gi .\update2.ps1).LastWriteTime) { clear-host "Updater got updated and needs to be restarted." @@ -136,7 +136,7 @@ $_ROSBE_STATCOUNT = $arg2 set-location tmp if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null + get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { get-content "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt" } else { @@ -156,7 +156,7 @@ set-location tmp while($_ROSBE_STATCOUNT -lt 10) { if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { - &"$_ROSBE_BASEDIR\Tools\wget.exe" -N --ignore-length --no-verbose $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt 2>&1> $null + get-webfile $_ROSBE_URL/$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt $PWD\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt if (Test-Path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt") { $_ROSBE_UPDATES += "$_ROSBE_STATCOUNT " }

15 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008