June 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Move the wglUseFontBitmaps implementation to opengl32, it' s no longer driver-dependent.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 1bca4fb5aeff73740a3cb89b878d8f42bdc55719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bca4fb5aeff73740a3cb89b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 11:58:53 2012 +0200 winex11: Move the wglUseFontBitmaps implementation to opengl32, it's no longer driver-dependent. --- dlls/opengl32/wgl.c | 143 ++++++++++++++++++++++++++++++++++++++------ dlls/winex11.drv/opengl.c | 139 +------------------------------------------- 2 files changed, 125 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bca4fb5aeff73740a3cb…

1 0

Alexandre Julliard : winex11: Move wglShareLists to the internal OpenGL extension functions.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: beeba895d3ff2b92366a29aa332a846548ff5f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=beeba895d3ff2b92366a29aa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 12:12:40 2012 +0200 winex11: Move wglShareLists to the internal OpenGL extension functions. --- dlls/opengl32/wgl.c | 15 ++++++++++----- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 3 +-- dlls/winex11.drv/opengl.c | 7 ++++--- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 7953275..ca3fee2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -52,7 +52,6 @@ static struct BOOL (WINAPI *p_wglCopyContext)(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); BOOL (WINAPI *p_wglDeleteContext)(HGLRC hglrc); BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); - BOOL (WINAPI *p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); HDC (WINAPI *p_wglGetCurrentDC)(void); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); HGLRC (WINAPI *p_wglGetCurrentContext)(void); @@ -60,10 +59,11 @@ static struct INT (WINAPI *p_DescribePixelFormat)(HDC hdc, INT iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd); INT (WINAPI *p_GetPixelFormat)(HDC hdc); - /* Interal WGL function */ + /* internal WGL functions */ void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFlush)(void); + BOOL (WINAPI *p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); } wine_wgl; #ifdef SONAME_LIBGLU @@ -128,7 +128,12 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) */ BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { - return wine_wgl.p_wglShareLists(hglrc1, hglrc2); + if (!hglrc1 || !hglrc2) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + return wine_wgl.p_wglShareLists(hglrc1, hglrc2); } /*********************************************************************** @@ -919,7 +924,6 @@ static BOOL process_attach(void) wine_wgl.p_wglCopyContext = (void *)GetProcAddress(mod_gdi32, "wglCopyContext"); wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod_gdi32, "wglDeleteContext"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); - wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod_gdi32, "wglShareLists"); wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentDC"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentContext"); @@ -927,10 +931,11 @@ static BOOL process_attach(void) wine_wgl.p_DescribePixelFormat = (void *)GetProcAddress(mod_gdi32, "DescribePixelFormat"); wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); - /* Interal WGL function */ + /* internal WGL functions */ wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); wine_wgl.p_wglFlush = (void *)wine_wgl.p_wglGetProcAddress("wglFlush"); + wine_wgl.p_wglShareLists = (void *)wine_wgl.p_wglGetProcAddress("wglShareLists"); if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey)) { if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, NULL, &size)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c102508..3e178db7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5359,9 +5359,11 @@ static BOOL InitAdapters(struct wined3d *wined3d) #ifdef USE_WIN32_OPENGL wglFinish = (void*)GetProcAddress(mod_gl, "glFinish"); wglFlush = (void*)GetProcAddress(mod_gl, "glFlush"); + pwglShareLists = (void*)GetProcAddress(mod_gl, "wglShareLists"); #else wglFinish = (void*)pwglGetProcAddress("wglFinish"); wglFlush = (void*)pwglGetProcAddress("wglFlush"); + pwglShareLists = (void*)pwglGetProcAddress("wglShareLists"); #endif glEnableWINE = glEnable; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index d9a88db..ee4a133 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1717,8 +1717,7 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; USE_WGL_FUNC(wglGetCurrentContext) \ USE_WGL_FUNC(wglGetCurrentDC) \ USE_WGL_FUNC(wglGetProcAddress) \ - USE_WGL_FUNC(wglMakeCurrent) \ - USE_WGL_FUNC(wglShareLists) + USE_WGL_FUNC(wglMakeCurrent) /* OpenGL extensions. */ enum wined3d_gl_extension diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b475af0..61f1791 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1948,11 +1948,11 @@ static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, } /** - * glxdrv_wglShareLists + * X11DRV_wglShareLists * * For OpenGL32 wglShareLists. */ -static BOOL glxdrv_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) +static BOOL WINAPI X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { Wine_GLContext *org = (Wine_GLContext *) hglrc1; Wine_GLContext *dest = (Wine_GLContext *) hglrc2; @@ -3254,6 +3254,7 @@ static const WineGLExtension WGL_internal_functions = { "wglGetIntegerv", X11DRV_wglGetIntegerv }, { "wglFinish", X11DRV_wglFinish }, { "wglFlush", X11DRV_wglFlush }, + { "wglShareLists", X11DRV_wglShareLists }, } }; @@ -3762,7 +3763,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = glxdrv_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */ glxdrv_wglMakeCurrent, /* pwglMakeCurrent */ glxdrv_wglSetPixelFormatWINE, /* pwglSetPixelFormatWINE */ - glxdrv_wglShareLists, /* pwglShareLists */ + NULL, /* pwglShareLists */ NULL, /* pwglUseFontBitmapsA */ NULL, /* pwglUseFontBitmapsW */ GDI_PRIORITY_GRAPHICS_DRV + 20 /* priority */

1 0

Alexandre Julliard : winex11: Move wglCopyContext and wglDeleteContext to the internal OpenGL extension functions .
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 08efea0218b94578c1b2dfea359fe9f06cc8d7f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08efea0218b94578c1b2dfea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 12:21:18 2012 +0200 winex11: Move wglCopyContext and wglDeleteContext to the internal OpenGL extension functions. --- dlls/opengl32/wgl.c | 22 ++++++++++++++++------ dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 - dlls/winex11.drv/opengl.c | 16 ++++++++-------- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index ca3fee2..a3b5319 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -49,8 +49,6 @@ static struct { PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); BOOL (WINAPI *p_SetPixelFormat)(HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); - BOOL (WINAPI *p_wglCopyContext)(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); - BOOL (WINAPI *p_wglDeleteContext)(HGLRC hglrc); BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); HDC (WINAPI *p_wglGetCurrentDC)(void); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); @@ -60,6 +58,8 @@ static struct INT (WINAPI *p_GetPixelFormat)(HDC hdc); /* internal WGL functions */ + BOOL (WINAPI *p_wglCopyContext)(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); + BOOL (WINAPI *p_wglDeleteContext)(HGLRC hglrc); void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFlush)(void); @@ -104,7 +104,12 @@ BOOL WINAPI wglSetPixelFormat( HDC hdc, INT iPixelFormat, */ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { - return wine_wgl.p_wglCopyContext(hglrcSrc, hglrcDst, mask); + if (!hglrcSrc || !hglrcDst) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + return wine_wgl.p_wglCopyContext(hglrcSrc, hglrcDst, mask); } /*********************************************************************** @@ -112,7 +117,12 @@ BOOL WINAPI wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) */ BOOL WINAPI wglDeleteContext(HGLRC hglrc) { - return wine_wgl.p_wglDeleteContext(hglrc); + if (!hglrc) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + return wine_wgl.p_wglDeleteContext(hglrc); } /*********************************************************************** @@ -921,8 +931,6 @@ static BOOL process_attach(void) wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); wine_wgl.p_SetPixelFormat = (void *)GetProcAddress(mod_gdi32, "SetPixelFormat"); - wine_wgl.p_wglCopyContext = (void *)GetProcAddress(mod_gdi32, "wglCopyContext"); - wine_wgl.p_wglDeleteContext = (void *)GetProcAddress(mod_gdi32, "wglDeleteContext"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentDC"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); @@ -932,6 +940,8 @@ static BOOL process_attach(void) wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); /* internal WGL functions */ + wine_wgl.p_wglCopyContext = (void *)wine_wgl.p_wglGetProcAddress("wglCopyContext"); + wine_wgl.p_wglDeleteContext = (void *)wine_wgl.p_wglGetProcAddress("wglDeleteContext"); wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); wine_wgl.p_wglFlush = (void *)wine_wgl.p_wglGetProcAddress("wglFlush"); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3e178db7..0647ae3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5359,10 +5359,12 @@ static BOOL InitAdapters(struct wined3d *wined3d) #ifdef USE_WIN32_OPENGL wglFinish = (void*)GetProcAddress(mod_gl, "glFinish"); wglFlush = (void*)GetProcAddress(mod_gl, "glFlush"); + pwglDeleteContext = (void*)GetProcAddress(mod_gl, "wglDeleteContext"); pwglShareLists = (void*)GetProcAddress(mod_gl, "wglShareLists"); #else wglFinish = (void*)pwglGetProcAddress("wglFinish"); wglFlush = (void*)pwglGetProcAddress("wglFlush"); + pwglDeleteContext = (void*)pwglGetProcAddress("wglDeleteContext"); pwglShareLists = (void*)pwglGetProcAddress("wglShareLists"); #endif diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ee4a133..fa39de5 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1713,7 +1713,6 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ - USE_WGL_FUNC(wglDeleteContext) \ USE_WGL_FUNC(wglGetCurrentContext) \ USE_WGL_FUNC(wglGetCurrentDC) \ USE_WGL_FUNC(wglGetProcAddress) \ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 61f1791..62802b85 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1624,11 +1624,11 @@ static BOOL glxdrv_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORM } /** - * glxdrv_wglCopyContext + * X11DRV_wglCopyContext * * For OpenGL32 wglCopyContext. */ -static BOOL glxdrv_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) +static BOOL WINAPI X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { Wine_GLContext *src = (Wine_GLContext*)hglrcSrc; Wine_GLContext *dst = (Wine_GLContext*)hglrcDst; @@ -1688,18 +1688,16 @@ static HGLRC glxdrv_wglCreateContext(PHYSDEV dev) } /** - * glxdrv_wglDeleteContext + * X11DRV_wglDeleteContext * * For OpenGL32 wglDeleteContext. */ -static BOOL glxdrv_wglDeleteContext(HGLRC hglrc) +static BOOL WINAPI X11DRV_wglDeleteContext(HGLRC hglrc) { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; TRACE("(%p)\n", hglrc); - if (!has_opengl()) return 0; - if (!is_valid_context(ctx)) { WARN("Error deleting context !\n"); @@ -3251,6 +3249,8 @@ static const WineGLExtension WGL_internal_functions = { "", { + { "wglCopyContext", X11DRV_wglCopyContext }, + { "wglDeleteContext", X11DRV_wglDeleteContext }, { "wglGetIntegerv", X11DRV_wglGetIntegerv }, { "wglFinish", X11DRV_wglFinish }, { "wglFlush", X11DRV_wglFlush }, @@ -3755,10 +3755,10 @@ static const struct gdi_dc_funcs glxdrv_funcs = glxdrv_SwapBuffers, /* pSwapBuffers */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ - glxdrv_wglCopyContext, /* pwglCopyContext */ + NULL, /* pwglCopyContext */ glxdrv_wglCreateContext, /* pwglCreateContext */ glxdrv_wglCreateContextAttribsARB, /* pwglCreateContextAttribsARB */ - glxdrv_wglDeleteContext, /* pwglDeleteContext */ + NULL, /* pwglDeleteContext */ glxdrv_wglGetProcAddress, /* pwglGetProcAddress */ glxdrv_wglMakeContextCurrentARB, /* pwglMakeContextCurrentARB */ glxdrv_wglMakeCurrent, /* pwglMakeCurrent */

1 0

Alexandre Julliard : winex11: Move wglGetCurrentContext and wglGetCurrentDC to the internal OpenGL extension functions .
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 66a5995e119d9f91d33bf21cbe1a43e643c86c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a5995e119d9f91d33bf21cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 16:22:16 2012 +0200 winex11: Move wglGetCurrentContext and wglGetCurrentDC to the internal OpenGL extension functions. --- dlls/opengl32/wgl.c | 12 ++++++------ dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 2 -- dlls/winex11.drv/opengl.c | 24 +++++++++++++++++++++++- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index a3b5319..7a195be 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -50,9 +50,7 @@ static struct PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); BOOL (WINAPI *p_SetPixelFormat)(HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); - HDC (WINAPI *p_wglGetCurrentDC)(void); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); - HGLRC (WINAPI *p_wglGetCurrentContext)(void); INT (WINAPI *p_ChoosePixelFormat)(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd); INT (WINAPI *p_DescribePixelFormat)(HDC hdc, INT iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd); INT (WINAPI *p_GetPixelFormat)(HDC hdc); @@ -60,9 +58,11 @@ static struct /* internal WGL functions */ BOOL (WINAPI *p_wglCopyContext)(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); BOOL (WINAPI *p_wglDeleteContext)(HGLRC hglrc); - void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFlush)(void); + HGLRC (WINAPI *p_wglGetCurrentContext)(void); + HDC (WINAPI *p_wglGetCurrentDC)(void); + void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); BOOL (WINAPI *p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); } wine_wgl; @@ -932,9 +932,7 @@ static BOOL process_attach(void) wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); wine_wgl.p_SetPixelFormat = (void *)GetProcAddress(mod_gdi32, "SetPixelFormat"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); - wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentDC"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); - wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentContext"); wine_wgl.p_ChoosePixelFormat = (void *)GetProcAddress(mod_gdi32, "ChoosePixelFormat"); wine_wgl.p_DescribePixelFormat = (void *)GetProcAddress(mod_gdi32, "DescribePixelFormat"); wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); @@ -942,9 +940,11 @@ static BOOL process_attach(void) /* internal WGL functions */ wine_wgl.p_wglCopyContext = (void *)wine_wgl.p_wglGetProcAddress("wglCopyContext"); wine_wgl.p_wglDeleteContext = (void *)wine_wgl.p_wglGetProcAddress("wglDeleteContext"); - wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); wine_wgl.p_wglFlush = (void *)wine_wgl.p_wglGetProcAddress("wglFlush"); + wine_wgl.p_wglGetCurrentContext = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentContext"); + wine_wgl.p_wglGetCurrentDC = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentDC"); + wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); wine_wgl.p_wglShareLists = (void *)wine_wgl.p_wglGetProcAddress("wglShareLists"); if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0647ae3..1d0407d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5360,11 +5360,15 @@ static BOOL InitAdapters(struct wined3d *wined3d) wglFinish = (void*)GetProcAddress(mod_gl, "glFinish"); wglFlush = (void*)GetProcAddress(mod_gl, "glFlush"); pwglDeleteContext = (void*)GetProcAddress(mod_gl, "wglDeleteContext"); + pwglGetCurrentContext = (void*)GetProcAddress(mod_gl, "wglGetCurrentContext"); + pwglGetCurrentDC = (void*)GetProcAddress(mod_gl, "wglGetCurrentDC"); pwglShareLists = (void*)GetProcAddress(mod_gl, "wglShareLists"); #else wglFinish = (void*)pwglGetProcAddress("wglFinish"); wglFlush = (void*)pwglGetProcAddress("wglFlush"); pwglDeleteContext = (void*)pwglGetProcAddress("wglDeleteContext"); + pwglGetCurrentContext = (void*)pwglGetProcAddress("wglGetCurrentContext"); + pwglGetCurrentDC = (void*)pwglGetProcAddress("wglGetCurrentDC"); pwglShareLists = (void*)pwglGetProcAddress("wglShareLists"); #endif diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fa39de5..2ffb14b 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1713,8 +1713,6 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ - USE_WGL_FUNC(wglGetCurrentContext) \ - USE_WGL_FUNC(wglGetCurrentDC) \ USE_WGL_FUNC(wglGetProcAddress) \ USE_WGL_FUNC(wglMakeCurrent) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 62802b85..d3118c2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2005,6 +2005,26 @@ static BOOL WINAPI X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) return FALSE; } +/*********************************************************************** + * X11DRV_wglGetCurrentContext + */ +static HGLRC WINAPI X11DRV_wglGetCurrentContext(void) +{ + return NtCurrentTeb()->glContext; +} + +/*********************************************************************** + * X11DRV_wglGetCurrentDC + */ +static HDC WINAPI X11DRV_wglGetCurrentDC(void) +{ + Wine_GLContext *ctx = NtCurrentTeb()->glContext; + + if (!ctx) return NULL; + TRACE("hdc %p\n", ctx->hdc); + return ctx->hdc; +} + /* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) { @@ -3251,9 +3271,11 @@ static const WineGLExtension WGL_internal_functions = { { "wglCopyContext", X11DRV_wglCopyContext }, { "wglDeleteContext", X11DRV_wglDeleteContext }, - { "wglGetIntegerv", X11DRV_wglGetIntegerv }, { "wglFinish", X11DRV_wglFinish }, { "wglFlush", X11DRV_wglFlush }, + { "wglGetCurrentContext", X11DRV_wglGetCurrentContext }, + { "wglGetCurrentDC", X11DRV_wglGetCurrentDC }, + { "wglGetIntegerv", X11DRV_wglGetIntegerv }, { "wglShareLists", X11DRV_wglShareLists }, } };

1 0

Julian Rüger : winspool.drv/tests: Fix typos/grammar.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 0595619e0f0ff52ce2d22b5c0f98733824aa9a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0595619e0f0ff52ce2d22b5c0… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 24 19:40:56 2012 +0200 winspool.drv/tests: Fix typos/grammar. --- dlls/winspool.drv/tests/info.c | 54 ++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0595619e0f0ff52ce2d22…

1 0

André Hentschel : winebuild: Put the PE header into the text section on ARM.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: e7730053f3c859b53df277386105967044a7848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7730053f3c859b53df277386… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:20:50 2012 +0200 winebuild: Put the PE header into the text section on ARM. --- tools/winebuild/spec32.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7743acc..3dff304 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -403,22 +403,24 @@ static void output_asm_constructor( const char *constructor ) } else { - output( "\n\t.section \".init\",\"ax\"\n" ); switch(target_cpu) { case CPU_x86: case CPU_x86_64: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); break; case CPU_SPARC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); output( "\tnop\n" ); break; case CPU_ARM: + output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); - output( "\t.arm\n" ); break; case CPU_POWERPC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tbl %s\n", asm_name(constructor) ); break; } @@ -452,20 +454,20 @@ void output_module( DLLSPEC *spec ) output( "\t.skip %u\n", 65536 + page_size ); break; default: - output( "\n\t.section \".init\",\"ax\"\n" ); switch(target_cpu) { case CPU_x86: case CPU_x86_64: case CPU_SPARC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tjmp 1f\n" ); break; case CPU_ARM: - output( "\n\t.syntax unified\n" ); - output( "\n\t.thumb\n" ); - output( "\tb.w 1f\n" ); + output( "\n\t.section \".text\",\"ax\"\n" ); + output( "\tb 1f\n" ); break; case CPU_POWERPC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tb 1f\n" ); break; }

1 0

André Hentschel : configure: Downgrade the Thumb2 requirement to Thumb on ARM.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 74518c8d0472c6e494823d22291fc32cdc2a612d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74518c8d0472c6e494823d222… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:22:16 2012 +0200 configure: Downgrade the Thumb2 requirement to Thumb on ARM. --- configure | 8 ++++---- configure.ac | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 465bdc4..2a26441 100755 --- a/configure +++ b/configure @@ -4142,15 +4142,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ;; arm*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb2" >&5 -$as_echo_n "checking whether $CC supports Thumb2... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb" >&5 +$as_echo_n "checking whether $CC supports Thumb... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int ac_test(int i) { return i; } int main () { -asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1 +asm(".thumb\nblx ac_test\n.arm"); if (ac_test(1)) return 1 ; return 0; } @@ -4161,7 +4161,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need a target with Thumb2 support to build Wine for ARM." "$LINENO" 5 + as_fn_error $? "You need a target with Thumb support to build Wine for ARM." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 1753e14..70e7663 100644 --- a/configure.ac +++ b/configure.ac @@ -169,11 +169,11 @@ case $host in fi ;; arm*) - AC_MSG_CHECKING([whether $CC supports Thumb2]) - WINE_TRY_ASM_LINK([".syntax unified\n.thumb\nb.w ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], + AC_MSG_CHECKING([whether $CC supports Thumb]) + WINE_TRY_ASM_LINK([".thumb\nblx ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need a target with Thumb2 support to build Wine for ARM.])]) + AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])]) CFLAGS="$CFLAGS -marm" ;; *-mingw32*|*-cygwin*)

1 0

André Hentschel : ntdll: Check for ARMv7 architecture dynamically when loading a PE.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 567e44161c37be60a059f2f51acbda4a4ca12b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567e44161c37be60a059f2f51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:25:28 2012 +0200 ntdll: Check for ARMv7 architecture dynamically when loading a PE. --- dlls/ntdll/virtual.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d67f2d5..806b7a9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1061,11 +1061,15 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) } #elif defined(__arm__) && !defined(__ARMEB__) if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || -#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) - nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7 || -#endif nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) return STATUS_SUCCESS; + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7) + { + SYSTEM_CPU_INFORMATION sci; + if (SUCCEEDED(NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) && + sci.Architecture == PROCESSOR_ARCHITECTURE_ARM && sci.Level >= 7) + return STATUS_SUCCESS; + } #endif switch (nt->FileHeader.Machine)

1 0

Roderick Colenbrander : winex11.drv: Remove GLX_ATI_render_texture support.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c754f28f171c5cf90fecf20d9d536f476316f1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c754f28f171c5cf90fecf20d9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 24 22:42:10 2012 -0700 winex11.drv: Remove GLX_ATI_render_texture support. --- dlls/winex11.drv/opengl.c | 419 ++++++++++++++------------------------------- include/wine/wgl.h | 36 ---- 2 files changed, 127 insertions(+), 328 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c754f28f171c5cf90fecf…

1 0

Roderick Colenbrander : opengl32: Check for valid context in wglGetProcAddress.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c9962bbb581057b0f06473d3360631ed130b4bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9962bbb581057b0f06473d33… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 24 22:42:11 2012 -0700 opengl32: Check for valid context in wglGetProcAddress. --- dlls/opengl32/tests/opengl.c | 2 +- dlls/opengl32/wgl.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ffc676e..c18b0ad 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -797,7 +797,7 @@ static void test_getprocaddress(HDC hdc) /* Temporarily disable the context, so we can see that we can't retrieve functions now. */ wglMakeCurrent(hdc, NULL); func = wglGetProcAddress("glActiveTextureARB"); - todo_wine ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); + ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); wglMakeCurrent(hdc, ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 98b04d4..9200dd6 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -300,9 +300,18 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { TRACE("(%s)\n", lpszProc); - if(lpszProc == NULL) + if (lpszProc == NULL) return NULL; + /* Without an active context opengl32 doesn't know to what + * driver it has to dispatch wglGetProcAddress. + */ + if (wglGetCurrentContext() == NULL) + { + WARN("No active WGL context found\n"); + return NULL; + } + /* First, look if it's not already defined in the 'standard' OpenGL functions */ if ((local_func = GetProcAddress(opengl32_handle, lpszProc)) != NULL) { TRACE(" found function in 'standard' OpenGL functions (%p)\n", local_func);

1 0