Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 30830: hopply this will make wined3d more happy, implement all need it flags for wglGetPixelFormatAttribfvARB and wglGetPixelFormatAttribivARB that wined3d using
by greatlrd＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: greatlrd Date: Wed Nov 28 03:10:13 2007 New Revision: 30830 URL: http://svn.reactos.org/svn/reactos?rev=30830&view=rev Log: hopply this will make wined3d more happy, implement all need it flags for wglGetPixelFormatAttribfvARB and wglGetPixelFormatAttribivARB that wined3d using Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Wed Nov 28 03:10:13 2007 @@ -773,6 +773,24 @@ /* WGL_ARB_pixel_format */ #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 #define WGL_SUPPORT_OPENGL_ARB 0x2010 +#define WGL_STEREO_ARB 0x2012 +#define WGL_PIXEL_TYPE_ARB 0x2013 +#define WGL_COLOR_BITS_ARB 0x2014 +#define WGL_RED_BITS_ARB 0x2015 +#define WGL_RED_SHIFT_ARB 0x2016 +#define WGL_GREEN_BITS_ARB 0x2017 +#define WGL_GREEN_SHIFT_ARB 0x2018 +#define WGL_BLUE_BITS_ARB 0x2019 +#define WGL_BLUE_SHIFT_ARB 0x201A +#define WGL_ALPHA_BITS_ARB 0x201B +#define WGL_ALPHA_SHIFT_ARB 0x201C +#define WGL_ACCUM_BITS_ARB 0x201D +#define WGL_ACCUM_RED_BITS_ARB 0x201E +#define WGL_ACCUM_GREEN_BITS_ARB 0x201F +#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 +#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 +#define WGL_DEPTH_BITS_ARB 0x2022 +#define WGL_STENCIL_BITS_ARB 0x2023 GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, @@ -792,11 +810,35 @@ case WGL_NUMBER_PIXEL_FORMATS_ARB : piValues[i] = (int)npfd; retVal = TRUE; - break; - - case WGL_SUPPORT_OPENGL_ARB: - piValues[i] = (int)TRUE; + + case WGL_SUPPORT_OPENGL_ARB: + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_SUPPORT_OPENGL; retVal = TRUE; + break; + + case WGL_RED_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cRedBits; + break; + + case WGL_GREEN_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cGreenBits; + break; + + case WGL_BLUE_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cBlueBits; + break; + + case WGL_ALPHA_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAlphaBits; + break; + + case WGL_DEPTH_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cDepthBits; + break; + + case WGL_STENCIL_BITS_ARB : + piValues[i] = (int)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + break; default : SetLastError(0); @@ -825,11 +867,35 @@ case WGL_NUMBER_PIXEL_FORMATS_ARB : pfValues[i] = (FLOAT)npfd; retVal = TRUE; - break; - - case WGL_SUPPORT_OPENGL_ARB: - pfValues[i] = (FLOAT)TRUE; + + case WGL_SUPPORT_OPENGL_ARB: + pfValues[i] = (FLOAT) (pfd[iPixelFormat - 1].pfd.dwFlags & ~PFD_SUPPORT_OPENGL); retVal = TRUE; + break; + + case WGL_RED_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cRedBits; + break; + + case WGL_GREEN_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cGreenBits; + break; + + case WGL_BLUE_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cBlueBits; + break; + + case WGL_ALPHA_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cAlphaBits; + break; + + case WGL_DEPTH_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cDepthBits; + break; + + case WGL_STENCIL_BITS_ARB : + pfValues[i] = (FLOAT)pfd[iPixelFormat - 1].pfd.cAuxBuffers; + break; default : SetLastError(0);

1 0

[cwittich] 30829: translated some DPRINTs from GreatLordish into a human readable format
by cwittich＠svn.reactos.org 28 Nov '07

28 Nov '07

Author: cwittich Date: Wed Nov 28 03:09:52 2007 New Revision: 30829 URL: http://svn.reactos.org/svn/reactos?rev=30829&view=rev Log: translated some DPRINTs from GreatLordish into a human readable format Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Wed Nov 28 03:09:52 2007 @@ -53,7 +53,7 @@ ghDxGraphics = EngLoadImage(L"drivers\\dxg.sys"); if (!ghDxGraphics) { - DPRINT1("Warring no dxg.sys in ReactOS"); + DPRINT1("Warning: dxg.sys not found\n"); Status = STATUS_DLL_NOT_FOUND; } else @@ -85,7 +85,7 @@ gpfnCleanupDxGraphics = NULL; EngUnloadImage( ghDxGraphics); ghDxGraphics = NULL; - DPRINT1("Warring no init of DirectX graphic interface"); + DPRINT1("Warning: DirectX graphics interface can not be initialized\n"); } else { @@ -100,7 +100,7 @@ gpDxFuncs[lstDrvFN[t].iFunc].iFunc =lstDrvFN[t].iFunc; gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; } - DPRINT1("DirectX interface is Activated"); + DPRINT1("DirectX interface is activated\n"); } /* return the status */ } @@ -132,7 +132,7 @@ Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); if (!NT_SUCCESS(Status)) { - DPRINT1("Warring : Fail to statup the directx interface"); + DPRINT1("Warning : Failed to create the directx interface\n"); return 0; } @@ -141,11 +141,11 @@ if (pfnDdCreateDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdCreateDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdCreateDirectDrawObject"); + DPRINT1("Warning: no pfnDdCreateDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdCreateDirectDrawObject\n"); return pfnDdCreateDirectDrawObject(hdc); } @@ -196,11 +196,11 @@ if (pfnDxgGenericThunk == NULL) { - DPRINT1("Warring no pfnDxgGenericThunk"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDxgGenericThunk"); + DPRINT1("Warning: no pfnDxgGenericThunk\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDxgGenericThunk\n"); return pfnDxgGenericThunk(ulIndex, ulHandle, pdwSizeOfPtr1, pvPtr1, pdwSizeOfPtr2, pvPtr2); } @@ -218,11 +218,11 @@ if (pfnDdGetDriverState == NULL) { - DPRINT1("Warring no pfnDdGetDriverState"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdGetDriverState"); + DPRINT1("Warning: no pfnDdGetDriverState\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdGetDriverState\n"); return pfnDdGetDriverState(pdata); } @@ -241,11 +241,11 @@ if (pfnDdColorControl == NULL) { - DPRINT1("Warring no pfnDdColorControl"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdColorControl"); + DPRINT1("Warning: no pfnDdColorControl\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdColorControl\n"); return pfnDdColorControl(hSurface,puColorControlData); } @@ -269,11 +269,11 @@ if (pfnDdCreateSurfaceObject == NULL) { - DPRINT1("Warring no pfnDdCreateSurfaceObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceObject"); + DPRINT1("Warning: no pfnDdCreateSurfaceObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdCreateSurfaceObject\n"); return pfnDdCreateSurfaceObject(hDirectDrawLocal, hSurface, puSurfaceLocal, puSurfaceMore, puSurfaceGlobal, bComplete); } @@ -291,11 +291,11 @@ if (pfnDdDeleteDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdDeleteDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdDeleteDirectDrawObject"); + DPRINT1("Warning: no pfnDdDeleteDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); } @@ -313,11 +313,11 @@ if (pfnDdDeleteSurfaceObject == NULL) { - DPRINT1("Warring no pfnDdDeleteSurfaceObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys DdDeleteSurfaceObject"); + DPRINT1("Warning: no pfnDdDeleteSurfaceObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n"); return pfnDdDeleteSurfaceObject(hSurface); } @@ -345,11 +345,11 @@ if (pfnDdQueryDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdQueryDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdQueryDirectDrawObject"); + DPRINT1("Warning: no pfnDdQueryDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); } @@ -370,11 +370,11 @@ if (pfnDdReenableDirectDrawObject == NULL) { - DPRINT1("Warring no pfnDdReenableDirectDrawObject"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdReenableDirectDrawObject"); + DPRINT1("Warning: no pfnDdReenableDirectDrawObject\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); } @@ -395,11 +395,11 @@ if (pfnDdGetDriverInfo == NULL) { - DPRINT1("Warring no pfnDdGetDriverInfo"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetDriverInfo"); + DPRINT1("Warning: no pfnDdGetDriverInfo\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetDriverInfo\n"); return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData); } @@ -419,11 +419,11 @@ if (pfnDdGetAvailDriverMemory == NULL) { - DPRINT1("Warring no pfnDdGetAvailDriverMemory"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetAvailDriverMemory"); + DPRINT1("Warning: no pfnDdGetAvailDriverMemory\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetAvailDriverMemory\n"); return pfnDdGetAvailDriverMemory(hDirectDrawLocal, puGetAvailDriverMemoryData); } @@ -444,11 +444,11 @@ if (pfnDdSetExclusiveMode == NULL) { - DPRINT1("Warring no pfnDdSetExclusiveMode"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode"); + DPRINT1("Warning: no pfnDdSetExclusiveMode\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdSetExclusiveMode\n"); return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData); } @@ -469,11 +469,11 @@ if (pfnDdFlipToGDISurface == NULL) { - DPRINT1("Warring no pfnDdFlipToGDISurface"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface"); + DPRINT1("Warning: no pfnDdFlipToGDISurface\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdFlipToGDISurface\n"); return pfnDdFlipToGDISurface(hDirectDraw, puFlipToGDISurfaceData); } @@ -493,11 +493,11 @@ if (pfnDdGetDC == NULL) { - DPRINT1("Warring no pfnDdGetDC"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetDC"); + DPRINT1("Warning: no pfnDdGetDC\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetDC\n"); return pfnDdGetDC(hSurface, puColorTable); } @@ -518,11 +518,11 @@ if (pfnDdGetDxHandle == NULL) { - DPRINT1("Warring no pfnDdGetDxHandle"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdGetDxHandle"); + DPRINT1("Warning: no pfnDdGetDxHandle\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdGetDxHandle\n"); return pfnDdGetDxHandle(hDirectDraw, hSurface, bRelease); } @@ -541,11 +541,11 @@ if (pfnDdReleaseDC == NULL) { - DPRINT1("Warring no pfnDdReleaseDC"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdReleaseDC"); + DPRINT1("Warning: no pfnDdReleaseDC\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdReleaseDC\n"); return pfnDdReleaseDC(hSurface); } @@ -565,11 +565,11 @@ if (pfnDdResetVisrgn == NULL) { - DPRINT1("Warring no pfnDdResetVisrgn"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdResetVisrgn"); + DPRINT1("Warning: no pfnDdResetVisrgn\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdResetVisrgn\n"); return pfnDdResetVisrgn(hSurface, hwnd); } @@ -589,11 +589,11 @@ if (pfnDdSetGammaRamp == NULL) { - DPRINT1("Warring no pfnDdSetGammaRamp"); - return DDHAL_DRIVER_NOTHANDLED; - } - - DPRINT1("Calling on dxg.sys pfnDdSetGammaRamp"); + DPRINT1("Warning: no pfnDdSetGammaRamp\n"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling dxg.sys pfnDdSetGammaRamp\n"); return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp); }

1 0

[greatlrd] 30828: start implement wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfARB
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Wed Nov 28 02:41:57 2007 New Revision: 30828 URL: http://svn.reactos.org/svn/reactos?rev=30828&view=rev Log: start implement wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfARB Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h (original) +++ trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h Wed Nov 28 02:41:57 2007 @@ -114,8 +114,8 @@ GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Wed Nov 28 02:41:57 2007 @@ -771,16 +771,40 @@ } /* WGL_ARB_pixel_format */ +#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 +#define WGL_SUPPORT_OPENGL_ARB 0x2010 + GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, - const int *piAttributes, + int *piAttributes, int *piValues) { - SetLastError(0); - return FALSE; + BOOL retVal = FALSE; + int i; + + for (i=0;i<nAttributes;i++) + { + switch (piAttributes[i]) + { + case WGL_NUMBER_PIXEL_FORMATS_ARB : + piValues[i] = (int)npfd; + retVal = TRUE; + break; + + case WGL_SUPPORT_OPENGL_ARB: + piValues[i] = (int)TRUE; + retVal = TRUE; + + default : + SetLastError(0); + break; + } + } + + return retVal; } GLAPI BOOL GLAPIENTRY @@ -788,11 +812,32 @@ int iPixelFormat, int iLayerPlane, UINT nAttributes, - const int *piAttributes, + int *piAttributes, FLOAT *pfValues) { - SetLastError(0); - return FALSE; + BOOL retVal = FALSE; + int i; + + for (i=0;i<nAttributes;i++) + { + switch (piAttributes[i]) + { + case WGL_NUMBER_PIXEL_FORMATS_ARB : + pfValues[i] = (FLOAT)npfd; + retVal = TRUE; + break; + + case WGL_SUPPORT_OPENGL_ARB: + pfValues[i] = (FLOAT)TRUE; + retVal = TRUE; + + default : + SetLastError(0); + break; + } + } + + return retVal; } GLAPI BOOL GLAPIENTRY Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Wed Nov 28 02:41:57 2007 @@ -55,8 +55,8 @@ GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);

1 0

[cwittich] 30827: use ExAllocatePoolWithTag instead of ExAllocatePool
by cwittich＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: cwittich Date: Wed Nov 28 02:25:56 2007 New Revision: 30827 URL: http://svn.reactos.org/svn/reactos?rev=30827&view=rev Log: use ExAllocatePoolWithTag instead of ExAllocatePool Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c Modified: trunk/reactos/drivers/filesystems/vfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fcb.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fcb.c Wed Nov 28 02:25:56 2007 @@ -76,7 +76,7 @@ else PathNameBufferLength = 0; - Fcb->PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameBufferLength); + Fcb->PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameBufferLength, TAG_FCB); if (!Fcb->PathNameBuffer) { /* FIXME: what to do if no more memory? */ @@ -454,7 +454,7 @@ { return STATUS_OBJECT_NAME_INVALID; } - PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameLength + sizeof(WCHAR)); + PathNameBuffer = ExAllocatePoolWithTag(NonPagedPool, PathNameLength + sizeof(WCHAR), TAG_FCB); if (!PathNameBuffer) { return STATUS_INSUFFICIENT_RESOURCES;

1 0

[greatlrd] 30826: Fix ddraw start in windows again and activate the debug msg again.
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Wed Nov 28 00:32:59 2007 New Revision: 30826 URL: http://svn.reactos.org/svn/reactos?rev=30826&view=rev Log: Fix ddraw start in windows again and activate the debug msg again. Added: trunk/reactos/dll/directx/ddraw/resource.h (with props) Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rc… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rc (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rc Wed Nov 28 00:32:59 2007 @@ -1,4 +1,6 @@ /* $Id$ */ + +#include "resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 - DDraw\0" @@ -11,3 +13,9 @@ #define REACTOS_STR_PRODUCT_VERSION "5.3.2600.2180" #include <reactos/version.rc> + +STRINGTABLE DISCARDABLE +{ +STR_PRIMARY_DISPLAY, "Primary Display Driver" +} + Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Wed Nov 28 00:32:59 2007 @@ -11,7 +11,7 @@ #include "rosdraw.h" - +HMODULE hDllModule = 0; /* PSEH for SEH Support */ #include <pseh/pseh.h> @@ -220,28 +220,51 @@ LONG rc; BOOL EnumerateAttachedSecondaries = FALSE; DWORD privateDWFlags = 0; - - DX_WINDBG_trace(); - - rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, REGSTR_PATH_DDHW, &hKey); - if (rc == ERROR_SUCCESS) - { - /* Enumerate Attached Secondaries */ - cbData = sizeof(DWORD); - rc = RegQueryValueExA(hKey, "EnumerateAttachedSecondaries", NULL, NULL, (LPBYTE)&Value, &cbData); + CHAR strMsg[RC_STRING_MAX_SIZE]; + HRESULT retVal = DDERR_INVALIDPARAMS; + + DX_WINDBG_trace(); + + if ((IsBadCodePtr((LPVOID)lpCallback) == 0) && + ((dwFlags & ~(DDENUM_NONDISPLAYDEVICES | + DDENUM_DETACHEDSECONDARYDEVICES | + DDENUM_ATTACHEDSECONDARYDEVICES)) == 0)) + { + LoadStringA(hDllModule, STR_PRIMARY_DISPLAY, (LPSTR)&strMsg, RC_STRING_MAX_SIZE); + + rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, REGSTR_PATH_DDHW, &hKey); if (rc == ERROR_SUCCESS) { - if (Value != 0) - { - EnumerateAttachedSecondaries = TRUE; - privateDWFlags = DDENUM_ATTACHEDSECONDARYDEVICES; - } - } - RegCloseKey(hKey); - } - - // not finish - return DDERR_UNSUPPORTED; + /* Enumerate Attached Secondaries */ + cbData = sizeof(DWORD); + rc = RegQueryValueExA(hKey, "EnumerateAttachedSecondaries", NULL, NULL, (LPBYTE)&Value, &cbData); + if (rc == ERROR_SUCCESS) + { + if (Value != 0) + { + EnumerateAttachedSecondaries = TRUE; + privateDWFlags = DDENUM_ATTACHEDSECONDARYDEVICES; + } + } + RegCloseKey(hKey); + } + + /* Call the user supplyed callback function */ + rc = lpCallback(NULL, strMsg, "display", lpContext, NULL); + + /* If the callback function returns DDENUMRET_CANCEL, we will stop enumerating devices now */ + if(rc == DDENUMRET_CANCEL) + { + retVal = DD_OK; + } + else + { + // not finish + retVal = DDERR_UNSUPPORTED; + } + } + + return retVal; } HRESULT @@ -249,6 +272,8 @@ DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, LPVOID lpContext) { + DX_WINDBG_trace(); + return DDERR_UNSUPPORTED; } @@ -258,6 +283,8 @@ LPVOID lpContext, DWORD dwFlags) { + DX_WINDBG_trace(); + return DDERR_UNSUPPORTED; } @@ -339,6 +366,8 @@ DWORD retCode = DD_OK; LPD3DHAL_DP2COMMAND dp2command = lpCmd; + DX_WINDBG_trace(); + /* prevent it crash if null pointer are being sent */ if ( (lpCmd == NULL) || (lpRetCmd == NULL) ) { @@ -388,39 +417,46 @@ WINAPI AcquireDDThreadLock() { - EnterCriticalSection(&ddcs); + DX_WINDBG_trace(); + + EnterCriticalSection(&ddcs); } VOID WINAPI ReleaseDDThreadLock() { - LeaveCriticalSection(&ddcs); -} + DX_WINDBG_trace(); + + LeaveCriticalSection(&ddcs); +} + BOOL APIENTRY DllMain( HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved ) { - BOOL retStatus; + + hDllModule = hModule; + + DX_WINDBG_trace(); + + switch(ul_reason_for_call) { case DLL_PROCESS_DETACH: - //DeleteCriticalSection( &ddcs ); - retStatus = TRUE; + DeleteCriticalSection( &ddcs ); break; case DLL_PROCESS_ATTACH: - //DisableThreadLibraryCalls( hModule ); - //InitializeCriticalSection( &ddcs ); - //EnterCriticalSection( &ddcs ); - //LeaveCriticalSection( &ddcs ); - retStatus = FALSE; + DisableThreadLibraryCalls( hModule ); + InitializeCriticalSection( &ddcs ); + EnterCriticalSection( &ddcs ); + LeaveCriticalSection( &ddcs ); break; default: - retStatus = TRUE; break; } - return retStatus; - -} + + return TRUE; +} Added: trunk/reactos/dll/directx/ddraw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/resource… ============================================================================== --- trunk/reactos/dll/directx/ddraw/resource.h (added) +++ trunk/reactos/dll/directx/ddraw/resource.h Wed Nov 28 00:32:59 2007 @@ -1,0 +1,8 @@ + + +#define RC_STRING_MAX_SIZE 512 + +#define STR_PRIMARY_DISPLAY 100 + + +/* EOF */ Propchange: trunk/reactos/dll/directx/ddraw/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Wed Nov 28 00:32:59 2007 @@ -12,6 +12,8 @@ #include "Ddraw/ddraw.h" #include "Surface/surface.h" #include "Clipper/clipper.h" + +#include "resource.h" /* DirectDraw startup code only internal use */ extern DDRAWI_DIRECTDRAW_GBL ddgbl; @@ -234,7 +236,7 @@ return DD_OK; -#if 0 +#if 1 #define DX_STUB_str(x) \ { \ char buffer[1024]; \

1 0

[jimtabor] 30825: Fix typo!
by jimtabor＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: jimtabor Date: Wed Nov 28 00:04:25 2007 New Revision: 30825 URL: http://svn.reactos.org/svn/reactos?rev=30825&view=rev Log: Fix typo! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Wed Nov 28 00:04:25 2007 @@ -1992,7 +1992,7 @@ } Rect.left += XMove; - Rect.Top += YMove; + Rect.top += YMove; Rect.right += XMove; Rect.bottom += YMove;

1 0

[jimtabor] 30824: Correct the offset in NtUserGetMenuItemRect. It was unfinished.
by jimtabor＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: jimtabor Date: Tue Nov 27 23:56:18 2007 New Revision: 30824 URL: http://svn.reactos.org/svn/reactos?rev=30824&view=rev Log: Correct the offset in NtUserGetMenuItemRect. It was unfinished. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Tue Nov 27 23:56:18 2007 @@ -1947,7 +1947,8 @@ LPRECT lprcItem) { ROSMENUINFO mi; - HWND referenceHwnd; + PWINDOW_OBJECT ReferenceWnd; + LONG XMove, YMove; RECT Rect; NTSTATUS Status; PMENU_OBJECT Menu; @@ -1967,20 +1968,34 @@ else RETURN(FALSE); - referenceHwnd = hWnd; - if(!hWnd) { if(!UserMenuInfo(Menu, &mi, FALSE)) RETURN( FALSE); if(mi.Wnd == 0) RETURN( FALSE); - referenceHwnd = mi.Wnd; /* Okay we found it, so now what do we do? */ - } - - if (lprcItem == NULL) - RETURN( FALSE); - + } + + if (lprcItem == NULL) RETURN( FALSE); + + if (!(ReferenceWnd = UserGetWindowObject(mi.Wnd))) RETURN( FALSE); + + if(MenuItem->fType & MF_POPUP) + { + XMove = ReferenceWnd->Wnd->ClientRect.left; + YMove = ReferenceWnd->Wnd->ClientRect.top; + } + else + { + XMove = ReferenceWnd->Wnd->WindowRect.left; + YMove = ReferenceWnd->Wnd->WindowRect.top; + } + + Rect.left += XMove; + Rect.Top += YMove; + Rect.right += XMove; + Rect.bottom += YMove; + Status = MmCopyToCaller(lprcItem, &Rect, sizeof(RECT)); if (! NT_SUCCESS(Status)) {

1 0

[greatlrd] 30823: Last stubbing we need for mesa icd interface was done by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) ----------------------------------------------------------------------------------------------------------------------
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Tue Nov 27 22:55:19 2007 New Revision: 30823 URL: http://svn.reactos.org/svn/reactos?rev=30823&view=rev Log: Last stubbing we need for mesa icd interface was done by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) ---------------------------------------------------------------------------------------------------------------------- Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/includ… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h (original) +++ trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h Tue Nov 27 22:55:19 2007 @@ -101,18 +101,41 @@ WGLAPI int GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT); #ifndef __MINGW32__ + +typedef void *HPBUFFERARB; + WGLAPI int GLAPIENTRY SwapBuffers(HDC); WGLAPI int GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *); WGLAPI int GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR); WGLAPI int GLAPIENTRY GetPixelFormat(HDC); WGLAPI int GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *); + +GLAPI const char * GLAPIENTRY wglGetExtensionsStringEXT (void); +GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); +GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); +GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); +GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); +GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +GLAPI HDC GLAPIENTRY wglGetPbufferDCARB (HPBUFFERARB hPbuffer); +GLAPI int GLAPIENTRY wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); +GLAPI BOOL GLAPIENTRY wglDestroyPbufferARB (HPBUFFERARB hPbuffer); +GLAPI BOOL GLAPIENTRY wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +GLAPI HANDLE GLAPIENTRY wglCreateBufferRegionARB(HDC hDC, int iLayerPlane, UINT uType); +GLAPI VOID GLAPIENTRY wglDeleteBufferRegionARB(HANDLE hRegion); +GLAPI BOOL GLAPIENTRY wglSaveBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height); +GLAPI BOOL GLAPIENTRY wglRestoreBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +GLAPI BOOL GLAPIENTRY wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); +GLAPI BOOL GLAPIENTRY wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +GLAPI BOOL GLAPIENTRY wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); #endif #ifndef WGL_ARB_extensions_string #define WGL_ARB_extensions_string 1 WGLAPI const char * GLAPIENTRY wglGetExtensionsStringARB(HDC hdc); - #endif /* WGL_ARB_extensions_string */ Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Tue Nov 27 22:55:19 2007 @@ -795,3 +795,126 @@ return FALSE; } +GLAPI BOOL GLAPIENTRY +wglMakeContextCurrentARB(HDC hDrawDC, + HDC hReadDC, + HGLRC hglrc) +{ + SetLastError(0); + return FALSE; +} + +GLAPI HANDLE GLAPIENTRY +wglGetCurrentReadDCARB(void) +{ + SetLastError(0); + return NULL; +} + +typedef void *HPBUFFERARB; + +/* WGL_ARB_pbuffer */ +GLAPI HPBUFFERARB GLAPIENTRY +wglCreatePbufferARB (HDC hDC, + int iPixelFormat, + int iWidth, + int iHeight, + const int *piAttribList) +{ + SetLastError(0); + return NULL; +} + +GLAPI HDC GLAPIENTRY +wglGetPbufferDCARB (HPBUFFERARB hPbuffer) +{ + SetLastError(0); + return NULL; +} + +GLAPI int GLAPIENTRY +wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC) +{ + SetLastError(0); + return -1; +} + +GLAPI BOOL GLAPIENTRY +wglDestroyPbufferARB (HPBUFFERARB hPbuffer) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglQueryPbufferARB (HPBUFFERARB hPbuffer, + int iAttribute, + int *piValue) +{ + SetLastError(0); + return FALSE; +} + +GLAPI HANDLE GLAPIENTRY +wglCreateBufferRegionARB(HDC hDC, + int iLayerPlane, + UINT uType) +{ + SetLastError(0); + return NULL; +} + +GLAPI VOID GLAPIENTRY +wglDeleteBufferRegionARB(HANDLE hRegion) +{ + SetLastError(0); + return; +} + +GLAPI BOOL GLAPIENTRY +wglSaveBufferRegionARB(HANDLE hRegion, + int x, + int y, + int width, + int height) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglRestoreBufferRegionARB(HANDLE hRegion, + int x, + int y, + int width, + int height, + int xSrc, + int ySrc) +{ + SetLastError(0); + return FALSE; +} + +/* WGL_ARB_render_texture */ +GLAPI BOOL GLAPIENTRY +wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, + const int *piAttribList) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer) +{ + SetLastError(0); + return FALSE; +} + Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Tue Nov 27 22:55:19 2007 @@ -49,12 +49,28 @@ #include "mtypes.h" #include "glapi.h" +typedef void *HPBUFFERARB; + GLAPI const char * GLAPIENTRY wglGetExtensionsStringEXT (void); GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval); GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void); GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); +GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); +GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +GLAPI HDC GLAPIENTRY wglGetPbufferDCARB (HPBUFFERARB hPbuffer); +GLAPI int GLAPIENTRY wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); +GLAPI BOOL GLAPIENTRY wglDestroyPbufferARB (HPBUFFERARB hPbuffer); +GLAPI BOOL GLAPIENTRY wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +GLAPI HANDLE GLAPIENTRY wglCreateBufferRegionARB(HDC hDC, int iLayerPlane, UINT uType); +GLAPI VOID GLAPIENTRY wglDeleteBufferRegionARB(HANDLE hRegion); +GLAPI BOOL GLAPIENTRY wglSaveBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height); +GLAPI BOOL GLAPIENTRY wglRestoreBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +GLAPI BOOL GLAPIENTRY wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); +GLAPI BOOL GLAPIENTRY wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +GLAPI BOOL GLAPIENTRY wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); #define MAX_MESA_ATTRS 20 @@ -325,20 +341,20 @@ {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB}, {"wglGetPixelFormatAttribfvARB", (PROC)wglGetPixelFormatAttribfvARB}, {"wglChoosePixelFormatARB", (PROC)wglChoosePixelFormatARB}, -// {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, -// {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, -// {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, -// {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, -// {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, -// {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, -// {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, -// {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, -// {"wglCreateBufferRegionARB", (PROC)wglCreateBufferRegionARB}, -// {"wglDeleteBufferRegionARB", (PROC)wglDeleteBufferRegionARB}, -// {"wglSaveBufferRegionARB", (PROC)wglSaveBufferRegionARB}, -// {"wglRestoreBufferRegionARB", (PROC)wglRestoreBufferRegionARB}, -// {"wglMakeContextCurrentARB", (PROC)wglMakeContextCurrentARB}, -// {"wglGetCurrentReadDCARB", (PROC)wglGetCurrentReadDCARB}, + {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, + {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, + {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, + {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, + {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, + {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, + {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, + {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, + {"wglCreateBufferRegionARB", (PROC)wglCreateBufferRegionARB}, + {"wglDeleteBufferRegionARB", (PROC)wglDeleteBufferRegionARB}, + {"wglSaveBufferRegionARB", (PROC)wglSaveBufferRegionARB}, + {"wglRestoreBufferRegionARB", (PROC)wglRestoreBufferRegionARB}, + {"wglMakeContextCurrentARB", (PROC)wglMakeContextCurrentARB}, + {"wglGetCurrentReadDCARB", (PROC)wglGetCurrentReadDCARB}, {NULL, NULL} };

1 0

[greatlrd] 30822: adding the last hack we need for wined3d. This bug is wine, not our or windows fault And I also wrote down all three change we have done in wined3d. -------------------------------------------------------------------------------------- Thx Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) for the last hack
by greatlrd＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: greatlrd Date: Tue Nov 27 22:49:49 2007 New Revision: 30822 URL: http://svn.reactos.org/svn/reactos?rev=30822&view=rev Log: adding the last hack we need for wined3d. This bug is wine, not our or windows fault And I also wrote down all three change we have done in wined3d. -------------------------------------------------------------------------------------- Thx Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) for the last hack Added: trunk/reactos/dll/directx/wine/wined3d/roshacks.txt (with props) Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c Tue Nov 27 22:49:49 2007 @@ -183,7 +183,8 @@ if(!wined3d_fake_gl_context_foreign && glCtx) { TRACE_(d3d_caps)("destroying fake GL context\n"); pwglMakeCurrent(NULL, NULL); - pwglDeleteContext(glCtx); + //ros hack, this line does destire the real icd interface in windows and reactos + // pwglDeleteContext(glCtx); } if(wined3d_fake_gl_context_hdc) ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); Added: trunk/reactos/dll/directx/wine/wined3d/roshacks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/roshacks.txt (added) +++ trunk/reactos/dll/directx/wine/wined3d/roshacks.txt Tue Nov 27 22:49:49 2007 @@ -1,0 +1,13 @@ +Note +directx.c +----------- +gdi32.dll to opengl32.dll +comment out line 186 as well in function +WineD3D_ReleaseFakeGLContext +row pwglDeleteContext(glCtx); + + + +wined3d_private.h +------------------ +add #define ceilf(x) (float)ceil((double)x) Propchange: trunk/reactos/dll/directx/wine/wined3d/roshacks.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 30821: - fix typo
by janderwald＠svn.reactos.org 27 Nov '07

27 Nov '07

Author: janderwald Date: Tue Nov 27 21:42:44 2007 New Revision: 30821 URL: http://svn.reactos.org/svn/reactos?rev=30821&view=rev Log: - fix typo Modified: trunk/reactos/dll/win32/shell32/shell32.spec Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Tue Nov 27 21:42:44 2007 @@ -205,7 +205,7 @@ 213 stdcall Printers_RegisterWindowW(wstr long ptr ptr) 214 stdcall Printers_UnregisterWindow(long long) 215 stdcall -noname SHStartNetConnectionDialog(long str long) - 255 stdcall Options_RunDLL(ptr ptr str long) + 238 stdcall Options_RunDLL(ptr ptr str long) 243 stdcall @(long long) shell32_243 244 stdcall -noname SHInitRestricted(ptr ptr) 249 stdcall -noname PathParseIconLocation(ptr) PathParseIconLocationAW

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs