wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 70348: implement ARB_robustness with WGL r=bjacob

Browse Source 
WGL has its own ARB_robustness implementation which we support with this patch.
I was able to confirm that it was correctly being activated and was polling
status correctly (i.e. the framework is running), but WGL itself doesn't
actually seem to stop the DoS correctly when a robust context is created.
This commit is contained in:
Doug Sherk 2011-12-02 23:50:11 -08:00
parent 16a8e4e619
commit b32e4a0688
2 changed files with 117 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
gfx/gl/GLContextProviderWGL.cpp
View File

@ -122,6 +122,13 @@ CreateDummyWindow(HDC *aWindowDC = nsnull)
return win;
}
static inline bool
HasExtension(const char* aExtensions, const char* aRequiredExtension)
{
return GLContext::ListHasExtension(
reinterpret_cast<const GLubyte*>(aExtensions), aRequiredExtension);
}
bool
WGLLibrary::EnsureInitialized()
{
@ -205,9 +212,47 @@ WGLLibrary::EnsureInitialized()
fChoosePixelFormat = nsnull;
}
LibrarySymbolLoader::SymLoadStruct extensionsSymbols[] = {
{ (PRFuncPtr *) &fGetExtensionsString, { "wglGetExtensionsStringARB", NULL} },
{ NULL, { NULL } }
};
LibrarySymbolLoader::SymLoadStruct robustnessSymbols[] = {
{ (PRFuncPtr *) &fCreateContextAttribs, { "wglCreateContextAttribsARB", NULL} },
{ NULL, { NULL } }
};
if (LibrarySymbolLoader::LoadSymbols(mOGLLibrary, &extensionsSymbols[0],
(LibrarySymbolLoader::PlatformLookupFunction)fGetProcAddress)) {
const char *wglExts = fGetExtensionsString(gSharedWindowDC);
if (wglExts && HasExtension(wglExts, "WGL_ARB_create_context")) {
LibrarySymbolLoader::LoadSymbols(mOGLLibrary, &robustnessSymbols[0],
(LibrarySymbolLoader::PlatformLookupFunction)fGetProcAddress);
if (HasExtension(wglExts, "WGL_ARB_create_context_robustness")) {
mHasRobustness = true;
}
}
}
// reset back to the previous context, just in case
fMakeCurrent(curDC, curCtx);
if (mHasRobustness) {
fDeleteContext(gSharedWindowGLContext);
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
NULL
};
gSharedWindowGLContext = fCreateContextAttribs(gSharedWindowDC, NULL, attribs);
if (!gSharedWindowGLContext) {
mHasRobustness = false;
gSharedWindowGLContext = fCreateContext(gSharedWindowDC);
}
}
mInitialized = true;
// Call this to create the global GLContext instance,
@ -309,7 +354,7 @@ public:
bool SupportsRobustness()
{
return false;
return sWGLLibrary.HasRobustness();
}
virtual bool SwapBuffers() {
@ -502,16 +547,35 @@ GLContextProviderWGL::CreateForWindow(nsIWidget *aWidget)
HDC dc = (HDC)aWidget->GetNativeData(NS_NATIVE_GRAPHIC);
SetPixelFormat(dc, gSharedWindowPixelFormat, NULL);
HGLRC context = sWGLLibrary.fCreateContext(dc);
if (!context) {
return nsnull;
}
HGLRC context;
GLContextWGL *shareContext = GetGlobalContextWGL();
if (shareContext &&
!sWGLLibrary.fShareLists(shareContext->Context(), context))
{
shareContext = nsnull;
if (sWGLLibrary.HasRobustness()) {
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
NULL
};
context = sWGLLibrary.fCreateContextAttribs(dc,
shareContext ? shareContext->Context() : nsnull,
attribs);
if (!context && shareContext) {
context = sWGLLibrary.fCreateContextAttribs(dc, nsnull, attribs);
if (context) {
shareContext = nsnull;
}
} else {
context = sWGLLibrary.fCreateContext(dc);
if (context && shareContext && !sWGLLibrary.fShareLists(shareContext->Context(), context)) {
shareContext = nsnull;
}
}
}
if (!context) {
return nsnull;
}
nsRefPtr<GLContextWGL> glContext = new GLContextWGL(ContextFormat(ContextFormat::BasicRGB24),
@ -597,7 +661,19 @@ CreatePBufferOffscreenContext(const gfxIntSize& aSize,
HDC pbdc = sWGLLibrary.fGetPbufferDC(pbuffer);
NS_ASSERTION(pbdc, "expected a dc");
HGLRC context = sWGLLibrary.fCreateContext(pbdc);
HGLRC context;
if (sWGLLibrary.HasRobustness()) {
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
NULL
};
context = sWGLLibrary.fCreateContextAttribs(pbdc, nsnull, attribs);
} else {
context = sWGLLibrary.fCreateContext(pbdc);
}
if (!context) {
sWGLLibrary.fDestroyPbuffer(pbuffer);
return false;
@ -629,15 +705,28 @@ CreateWindowOffscreenContext(const ContextFormat& aFormat)
}
HGLRC context = sWGLLibrary.fCreateContext(dc);
if (!context) {
return nsnull;
if (sWGLLibrary.HasRobustness()) {
int attribs[] = {
LOCAL_WGL_CONTEXT_FLAGS_ARB, LOCAL_WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB,
LOCAL_WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB, LOCAL_WGL_LOSE_CONTEXT_ON_RESET_ARB,
NULL
};
context = sWGLLibrary.fCreateContextAttribs(dc, shareContext->Context(), attribs);
} else {
context = sWGLLibrary.fCreateContext(dc);
if (context && shareContext &&
!sWGLLibrary.fShareLists(shareContext->Context(), context))
{
NS_WARNING("wglShareLists failed!");
sWGLLibrary.fDeleteContext(context);
DestroyWindow(win);
return nsnull;
}
}
if (!sWGLLibrary.fShareLists(shareContext->Context(), context)) {
NS_WARNING("wglShareLists failed!");
sWGLLibrary.fDeleteContext(context);
DestroyWindow(win);
if (!context) {
return nsnull;
}

12
gfx/gl/WGLLibrary.h
View File

@ -42,7 +42,8 @@ namespace gl {
class WGLLibrary
{
public:
WGLLibrary() : mInitialized(false), mOGLLibrary(nsnull) {}
WGLLibrary() : mInitialized(false), mOGLLibrary(nsnull),
mHasRobustness(false) {}
typedef HGLRC (GLAPIENTRY * PFNWGLCREATECONTEXTPROC) (HDC);
PFNWGLCREATECONTEXTPROC fCreateContext;
@ -76,11 +77,20 @@ public:
typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues);
PFNWGLGETPIXELFORMATATTRIBIVPROC fGetPixelFormatAttribiv;
typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGPROC) (HDC hdc);
PFNWGLGETEXTENSIONSSTRINGPROC fGetExtensionsString;
typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSPROC) (HDC hdc, HGLRC hShareContext, const int *attribList);
PFNWGLCREATECONTEXTATTRIBSPROC fCreateContextAttribs;
bool EnsureInitialized();
bool HasRobustness() const { return mHasRobustness; }
private:
bool mInitialized;
PRLibrary *mOGLLibrary;
bool mHasRobustness;
};
// a global WGLLibrary instance