July 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10: Add support for parsing stencil reference values to parse_fx10_object().
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: 2d5fdb168303b802ee610395c7758400419fb833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5fdb168303b802ee610395c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 15:52:33 2012 +0200 d3d10: Add support for parsing stencil reference values to parse_fx10_object(). --- dlls/d3d10/d3d10_private.h | 2 + dlls/d3d10/effect.c | 15 +++++++ dlls/d3d10/tests/effect.c | 101 +++++++++++++++++++++++-------------------- 3 files changed, 71 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d5fdb168303b802ee610…

1 0

Alexandre Julliard : opengl32: Call standard OpenGL functions through the TEB function table.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: 5bfd5f3d7b5d2cea2145eace6f9c23c131f9fa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bfd5f3d7b5d2cea2145eace6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 23:39:31 2012 +0200 opengl32: Call standard OpenGL functions through the TEB function table. --- dlls/opengl32/make_opengl | 17 +- dlls/opengl32/opengl_norm.c | 996 ++++++++++++++++++++++++++++-------------- dlls/opengl32/tests/opengl.c | 4 +- 3 files changed, 675 insertions(+), 342 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bfd5f3d7b5d2cea2145e…

1 0

Alexandre Julliard : winex11: Fill a function table with the standard OpenGL functions and store it in the TEB .
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: 33ca17e1e9bf670b950c3f4ee5d0036a0fbc54da URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ca17e1e9bf670b950c3f4ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 23:26:50 2012 +0200 winex11: Fill a function table with the standard OpenGL functions and store it in the TEB. --- dlls/winex11.drv/opengl.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b32fe95..aae4f4b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -48,6 +48,7 @@ #include "x11drv.h" #include "winternl.h" +#include "wine/wgl_driver.h" #include "wine/library.h" #include "wine/debug.h" @@ -210,6 +211,12 @@ static int use_render_texture_emulation = 1; static BOOL has_swap_control; static int swap_interval = 1; +static struct opengl_funcs opengl_funcs; + +#define USE_GL_FUNC(name) #name, +static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; +#undef USE_GL_FUNC + #define MAX_EXTENSIONS 16 static const WineGLExtension *WineGLExtensionList[MAX_EXTENSIONS]; static int WineGLExtensionListSize; @@ -482,6 +489,7 @@ static BOOL has_opengl(void) char buffer[200]; int error_base, event_base; + unsigned int i; if (init_done) return (opengl_handle != NULL); init_done = 1; @@ -496,6 +504,15 @@ static BOOL has_opengl(void) return FALSE; } + for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + { + if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( opengl_handle, opengl_func_names[i], NULL, 0 ))) + { + ERR( "%s not found in libGL, disabling OpenGL.\n", opengl_func_names[i] ); + goto failed; + } + } + pglXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0); if (pglXGetProcAddressARB == NULL) { ERR("Could not find glXGetProcAddressARB in libGL, disabling OpenGL.\n"); @@ -1627,6 +1644,7 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) if (ret) { + NtCurrentTeb()->glTable = &opengl_funcs; NtCurrentTeb()->glContext = ctx; ctx->has_been_current = TRUE; @@ -1698,6 +1716,7 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct ctx->drawables[0] = escape_draw.gl_drawable; ctx->drawables[1] = escape_read.gl_drawable; ctx->refresh_drawables = FALSE; + NtCurrentTeb()->glTable = &opengl_funcs; NtCurrentTeb()->glContext = ctx; } else

1 0

Alexandre Julliard : opengl32: Generate a header file containing function tables for all OpenGL functions .
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: bddea5b5f5b7b456a17bcad7fd886e92cb67c412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddea5b5f5b7b456a17bcad7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 23:21:53 2012 +0200 opengl32: Generate a header file containing function tables for all OpenGL functions. --- dlls/opengl32/make_opengl | 79 ++- include/wine/wgl_driver.h | 2761 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 2834 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bddea5b5f5b7b456a17bc…

1 0

Alexandre Julliard : opengl32: Call OpenGL extension functions through the TEB function table.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: d66fa61e097aa801c381d7b00972abb667aee220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66fa61e097aa801c381d7b00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 13:07:08 2012 +0200 opengl32: Call OpenGL extension functions through the TEB function table. --- dlls/opengl32/make_opengl | 42 +- dlls/opengl32/opengl_ext.c |10333 ++++++++++++++++++-------------------------- dlls/opengl32/opengl_ext.h | 1 - dlls/opengl32/wgl.c | 4 +- 4 files changed, 4147 insertions(+), 6233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d66fa61e097aa801c381d…

1 0

Alexandre Julliard : user32/tests: Try to fix a test that frequently fails on Windows.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: b3d91ea3b690b3fd385a6ea4bb2a8b2f0f459bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d91ea3b690b3fd385a6ea4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 11:48:43 2012 +0200 user32/tests: Try to fix a test that frequently fails on Windows. --- dlls/user32/tests/win.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index dd5069b..3b7f1a8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6688,7 +6688,7 @@ static void test_FlashWindowEx(void) { HWND hwnd; FLASHWINFO finfo; - BOOL ret; + BOOL prev, ret; if (!pFlashWindowEx) { @@ -6757,8 +6757,7 @@ static void test_FlashWindowEx(void) "FlashWindowEx returned with %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = pFlashWindowEx(&finfo); - ok(ret, "previous window state should be active\n"); + prev = pFlashWindowEx(&finfo); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); ok(finfo.hwnd == hwnd, "FlashWindowEx modified hwnd to %p\n", finfo.hwnd); @@ -6770,7 +6769,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); todo_wine - ok(!ret, "previous window state should not be active\n"); + ok(prev != ret, "previous window state should be different\n"); DestroyWindow( hwnd ); }

1 0

Henri Verbeet : include: Add some more SP_PROT_* flags.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: dde180fee38b3f3c33bd535e57497c4fdfd50a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde180fee38b3f3c33bd535e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 15:52:29 2012 +0200 include: Add some more SP_PROT_* flags. --- include/schannel.h | 58 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 12 deletions(-) diff --git a/include/schannel.h b/include/schannel.h index d522edf..2e1a9f6 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -104,19 +104,53 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SCHANNEL_ALERT 2 #define SCHANNEL_SESSION 3 -#define SP_PROT_TLS1_CLIENT 128 -#define SP_PROT_TLS1_SERVER 64 -#define SP_PROT_SSL3_CLIENT 32 -#define SP_PROT_SSL3_SERVER 16 -#define SP_PROT_SSL2_CLIENT 8 -#define SP_PROT_SSL2_SERVER 4 -#define SP_PROT_PCT1_CLIENT 2 -#define SP_PROT_PCT1_SERVER 1 - -#define SP_PROT_TLS1 (SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_SERVER) -#define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT | SP_PROT_SSL3_SERVER) -#define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT | SP_PROT_SSL2_SERVER) -#define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT | SP_PROT_PCT1_SERVER) +#define SP_PROT_ALL 0xffffffff +#define SP_PROT_UNI_CLIENT 0x80000000 +#define SP_PROT_UNI_SERVER 0x40000000 +#define SP_PROT_TLS1_2_CLIENT 0x00000800 +#define SP_PROT_TLS1_2_SERVER 0x00000400 +#define SP_PROT_TLS1_1_CLIENT 0x00000200 +#define SP_PROT_TLS1_1_SERVER 0x00000100 +#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT +#define SP_PROT_TLS1_0_SERVER SP_PROT_TLS1_SERVER +#define SP_PROT_TLS1_CLIENT 0x00000080 +#define SP_PROT_TLS1_SERVER 0x00000040 +#define SP_PROT_SSL3_CLIENT 0x00000020 +#define SP_PROT_SSL3_SERVER 0x00000010 +#define SP_PROT_SSL2_CLIENT 0x00000008 +#define SP_PROT_SSL2_SERVER 0x00000004 +#define SP_PROT_PCT1_CLIENT 0x00000002 +#define SP_PROT_PCT1_SERVER 0x00000001 +#define SP_PROT_NONE 0x00000000 + +#define SP_PROT_UNI (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER) +#define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) +#define SP_PROT_TLS1_0 (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_0_SERVER) +#define SP_PROT_TLS1 (SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_SERVER) +#define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT | SP_PROT_SSL3_SERVER) +#define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT | SP_PROT_SSL2_SERVER) +#define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT | SP_PROT_PCT1_SERVER) + +#define SP_PROT_SSL3TLS1_CLIENTS (SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_CLIENT) +#define SP_PROT_SSL3TLS1_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_SERVER) +#define SP_PROT_SSL3TLS1_X_CLIENTS (SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_X_CLIENT) +#define SP_PROT_SSL3TLS1_X_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_X_SERVER) +#define SP_PROT_TLS1_X_CLIENT (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) +#define SP_PROT_TLS1_X_SERVER (SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_TLS1_1PLUS_CLIENT (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) +#define SP_PROT_TLS1_1PLUS_SERVER (SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_CLIENTS (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \ + | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT) +#define SP_PROT_SERVERS (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \ + | SP_PROT_TLS1_SERVER | SP_PROT_UNI_SERVER) +#define SP_PROT_X_CLIENTS (SP_PROT_CLIENTS | SP_PROT_TLS1_X_CLIENT) +#define SP_PROT_X_SERVERS (SP_PROT_SERVERS | SP_PROT_TLS1_X_SERVER) + +#define SP_PROT_SSL3TLS1 (SP_PROT_SSL3 | SP_PROT_TLS1) +#define SP_PROT_SSL3TLS1_X (SP_PROT_SSL3 | SP_PROT_TLS1_X) +#define SP_PROT_TLS1_X (SP_PROT_TLS1_X_CLIENT | SP_PROT_TLS1_X_SERVER) +#define SP_PROT_TLS1_1PLUS (SP_PROT_TLS1_1PLUS_CLIENT | SP_PROT_TLS1_1PLUS_SERVER) #define SCH_CRED_NO_SYSTEM_MAPPER 2 #define SCH_CRED_NO_SERVERNAME_CHECK 4

1 0

Jacek Caban : vbscript: Fixed locale-related test failures.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: 2be12eacaf616907a79354265bbb0f51d974e70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be12eacaf616907a79354265… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 18 13:36:58 2012 +0200 vbscript: Fixed locale-related test failures. --- dlls/vbscript/tests/api.vbs | 8 ++++---- dlls/vbscript/tests/run.c | 28 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 4914e7a..fd339dd 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -154,8 +154,8 @@ TestUCase "test", "TEST" TestUCase "123aBC?", "123ABC?" TestUCase "", "" TestUCase 1, "1" -TestUCase true, "TRUE" -TestUCase 0.123, "0.123" +if isEnglishLang then TestUCase true, "TRUE" +TestUCase 0.123, doubleAsString(0.123) TestUCase Empty, "" Call ok(getVT(UCase(Null)) = "VT_NULL", "getVT(UCase(Null)) = " & getVT(UCase(Null))) @@ -168,8 +168,8 @@ TestLCase "test", "test" TestLCase "123aBC?", "123abc?" TestLCase "", "" TestLCase 1, "1" -TestLCase true, "true" -TestLCase 0.123, "0.123" +if isEnglishLang then TestLCase true, "true" +TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 91c45e6..8569d71 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -82,6 +82,7 @@ DEFINE_EXPECT(Next); #define DISPID_GLOBAL_PROPARGPUT 1011 #define DISPID_GLOBAL_PROPARGPUT1 1012 #define DISPID_GLOBAL_COLLOBJ 1013 +#define DISPID_GLOBAL_DOUBLEASSTRING 1014 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -90,7 +91,7 @@ DEFINE_EXPECT(Next); static const WCHAR testW[] = {'t','e','s','t',0}; -static BOOL strict_dispid_check; +static BOOL strict_dispid_check, is_english; static const char *test_name = "(null)"; static int test_counter; @@ -815,6 +816,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_COUNTER; return S_OK; } + if(!strcmp_wa(bstrName, "doubleAsString")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_DOUBLEASSTRING; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -905,12 +911,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(pei != NULL, "pei == NULL\n"); V_VT(pvarRes) = VT_BOOL; - if(is_lang_english()) { - V_BOOL(pvarRes) = VARIANT_TRUE; - }else { - skip("Skipping some tests in non-English UIs\n"); - V_BOOL(pvarRes) = VARIANT_FALSE; - } + V_BOOL(pvarRes) = is_english ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; case DISPID_GLOBAL_VBVAR: @@ -1069,6 +1070,15 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_I2; V_I2(pvarRes) = test_counter++; return S_OK; + + case DISPID_GLOBAL_DOUBLEASSTRING: + ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(V_VT(pdp->rgvarg) == VT_R8, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + + V_VT(pvarRes) = VT_BSTR; + return VarBstrFromR8(V_R8(pdp->rgvarg), 0, 0, &V_BSTR(pvarRes)); } ok(0, "unexpected call %d\n", id); @@ -1590,6 +1600,10 @@ START_TEST(run) int argc; char **argv; + is_english = is_lang_english(); + if(!is_english) + skip("Skipping some tests in non-English UIs\n"); + argc = winetest_get_mainargs(&argv); CoInitialize(NULL);

1 0

Alexandre Julliard : opengl32: Call all OpenGL functions through the current context table and don' t link against libGL.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: 93eff3e862abc5f60036dc48e7a0c92cc4ed5135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93eff3e862abc5f60036dc48e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 00:06:25 2012 +0200 opengl32: Call all OpenGL functions through the current context table and don't link against libGL. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/wgl.c | 39 +++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 07de178..ff26507 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -2,7 +2,6 @@ MODULE = opengl32.dll IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ C_SRCS = \ opengl_ext.c \ diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 7a1b1d2..54f2a43 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -617,6 +617,7 @@ static int compar(const void *elt_a, const void *elt_b) { /* Check if a GL extension is supported */ static BOOL is_extension_supported(const char* extension) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; const char *gl_ext_string = (const char*)wine_glGetString(GL_EXTENSIONS); TRACE("Checking for extension '%s'\n", extension); @@ -642,7 +643,7 @@ static BOOL is_extension_supported(const char* extension) * Check if we are searching for a core GL function */ if(strncmp(extension, "GL_VERSION_", 11) == 0) { - const GLubyte *gl_version = glGetString(GL_VERSION); + const GLubyte *gl_version = funcs->gl.p_glGetString(GL_VERSION); const char *version = extension + 11; /* Move past 'GL_VERSION_' */ if(!gl_version) { @@ -806,14 +807,15 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, */ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD listBase, BOOL unicode ) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; GLYPHMETRICS gm; unsigned int glyph, size = 0; void *bitmap = NULL, *gl_bitmap = NULL; int org_alignment; BOOL ret = TRUE; - glGetIntegerv(GL_UNPACK_ALIGNMENT, &org_alignment); - glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + funcs->gl.p_glGetIntegerv(GL_UNPACK_ALIGNMENT, &org_alignment); + funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 4); for (glyph = first; glyph < first + count; glyph++) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; @@ -883,20 +885,20 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l } } - glNewList(listBase++, GL_COMPILE); + funcs->gl.p_glNewList(listBase++, GL_COMPILE); if (needed_size != 0) { - glBitmap(gm.gmBlackBoxX, gm.gmBlackBoxY, + funcs->gl.p_glBitmap(gm.gmBlackBoxX, gm.gmBlackBoxY, 0 - gm.gmptGlyphOrigin.x, (int) gm.gmBlackBoxY - gm.gmptGlyphOrigin.y, gm.gmCellIncX, gm.gmCellIncY, gl_bitmap); } else { /* This is the case of 'empty' glyphs like the space character */ - glBitmap(0, 0, 0, 0, gm.gmCellIncX, gm.gmCellIncY, NULL); + funcs->gl.p_glBitmap(0, 0, 0, 0, gm.gmCellIncX, gm.gmCellIncY, NULL); } - glEndList(); + funcs->gl.p_glEndList(); } - glPixelStorei(GL_UNPACK_ALIGNMENT, org_alignment); + funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, org_alignment); HeapFree(GetProcessHeap(), 0, bitmap); HeapFree(GetProcessHeap(), 0, gl_bitmap); return ret; @@ -965,21 +967,24 @@ static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) static void tess_callback_vertex(GLvoid *vertex) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; GLdouble *dbl = vertex; TRACE("%f, %f, %f\n", dbl[0], dbl[1], dbl[2]); - glVertex3dv(vertex); + funcs->gl.p_glVertex3dv(vertex); } static void tess_callback_begin(GLenum which) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("%d\n", which); - glBegin(which); + funcs->gl.p_glBegin(which); } static void tess_callback_end(void) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("\n"); - glEnd(); + funcs->gl.p_glEnd(); } /*********************************************************************** @@ -995,6 +1000,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, LPGLYPHMETRICSFLOAT lpgmf, BOOL unicode) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; const MAT2 identity = {{0,1},{0,0},{0,0},{0,1}}; GLUtesselator *tess; @@ -1068,7 +1074,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, lpgmf++; } - glNewList(listBase++, GL_COMPILE); + funcs->gl.p_glNewList(listBase++, GL_COMPILE); pgluTessBeginPolygon(tess, NULL); pph = (TTPOLYGONHEADER*)buf; @@ -1128,8 +1134,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, error_in_list: pgluTessEndPolygon(tess); - glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); - glEndList(); + funcs->gl.p_glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); + funcs->gl.p_glEndList(); HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, vertices); } @@ -1248,6 +1254,7 @@ static char *build_gl_extensions( const char *extensions ) */ const GLubyte * WINAPI wine_glGetString( GLenum name ) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; static const GLubyte *gl_extensions; /* this is for buggy nvidia driver, crashing if called from a different @@ -1255,11 +1262,11 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) if(wglGetCurrentContext() == NULL) return NULL; - if (name != GL_EXTENSIONS) return glGetString(name); + if (name != GL_EXTENSIONS) return funcs->gl.p_glGetString(name); if (!gl_extensions) { - const char *orig_ext = (const char *)glGetString(GL_EXTENSIONS); + const char *orig_ext = (const char *)funcs->gl.p_glGetString(GL_EXTENSIONS); char *new_ext = build_gl_extensions( orig_ext ); if (InterlockedCompareExchangePointer( (void **)&gl_extensions, new_ext, NULL )) HeapFree( GetProcessHeap(), 0, new_ext );

1 0

Alexandre Julliard : opengl32: Redirect standard OpenGL functions through the TEB function table.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: df91c7bc833780169695221b564ee71b76ffe112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df91c7bc833780169695221b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 23:56:55 2012 +0200 opengl32: Redirect standard OpenGL functions through the TEB function table. --- dlls/opengl32/make_opengl | 3 -- dlls/opengl32/opengl_norm.c | 27 ++++++++++++++++++++++ dlls/opengl32/wgl.c | 53 +------------------------------------------ dlls/winex11.drv/opengl.c | 42 +++++++++++++++------------------ 4 files changed, 47 insertions(+), 78 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 9773a4a..af309ec 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -235,9 +235,6 @@ sub GenerateThunk($$$) return "" if $func_ref->[0] eq "glDebugEntry"; return "" if $func_ref->[0] eq "glGetString"; - return "" if $func_ref->[0] eq "glGetIntegerv"; - return "" if $func_ref->[0] eq "glFinish"; - return "" if $func_ref->[0] eq "glFlush"; # If for opengl_norm.c, generate a nice heading otherwise Patrik won't be happy :-) # Patrik says: Well I would be even happier if a (OPENGL32.@) was added as well. Done. :-) diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index 66efce7..6d9cf65 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -812,6 +812,24 @@ void WINAPI wine_glFeedbackBuffer( GLsizei size, GLenum type, GLfloat* buffer ) } /*********************************************************************** + * glFinish (OPENGL32.@) + */ +void WINAPI wine_glFinish( void ) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + TRACE("()\n"); + funcs->gl.p_glFinish( ); +} + +/*********************************************************************** + * glFlush (OPENGL32.@) + */ +void WINAPI wine_glFlush( void ) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + TRACE("()\n"); + funcs->gl.p_glFlush( ); +} + +/*********************************************************************** * glFogf (OPENGL32.@) */ void WINAPI wine_glFogf( GLenum pname, GLfloat param ) { @@ -929,6 +947,15 @@ void WINAPI wine_glGetFloatv( GLenum pname, GLfloat* params ) { } /*********************************************************************** + * glGetIntegerv (OPENGL32.@) + */ +void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + TRACE("(%d, %p)\n", pname, params ); + funcs->gl.p_glGetIntegerv( pname, params ); +} + +/*********************************************************************** * glGetLightfv (OPENGL32.@) */ void WINAPI wine_glGetLightfv( GLenum light, GLenum pname, GLfloat* params ) { diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 8acc173..7a1b1d2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -47,14 +47,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(opengl); -static struct -{ - /* internal WGL functions */ - void (WINAPI *p_wglFinish)(void); - void (WINAPI *p_wglFlush)(void); - void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); -} wine_wgl; - #ifdef SONAME_LIBGLU #define MAKE_FUNCPTR(f) static typeof(f) * p##f; MAKE_FUNCPTR(gluNewTess) @@ -1205,24 +1197,6 @@ GLint WINAPI wine_glDebugEntry( GLint unknown1, GLint unknown2 ) return 0; } -/*********************************************************************** - * glFinish (OPENGL32.@) - */ -void WINAPI wine_glFinish( void ) -{ - TRACE("()\n"); - wine_wgl.p_wglFinish(); -} - -/*********************************************************************** - * glFlush (OPENGL32.@) - */ -void WINAPI wine_glFlush( void ) -{ - TRACE("()\n"); - wine_wgl.p_wglFlush(); -} - /* build the extension string by filtering out the disabled extensions */ static char *build_gl_extensions( const char *extensions ) { @@ -1294,14 +1268,6 @@ const GLubyte * WINAPI wine_glGetString( GLenum name ) } /*********************************************************************** - * glGetIntegerv (OPENGL32.@) - */ -void WINAPI wine_glGetIntegerv( GLenum pname, GLint* params ) -{ - wine_wgl.p_wglGetIntegerv(pname, params); -} - -/*********************************************************************** * wglSwapBuffers (OPENGL32.@) */ BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) @@ -1309,23 +1275,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH wglSwapBuffers( HDC hdc ) return GdiSwapBuffers(hdc); } -/* This is for brain-dead applications that use OpenGL functions before even - creating a rendering context.... */ -static BOOL process_attach(void) -{ - HDC hdc = GetDC( 0 ); - const struct wgl_funcs *funcs = get_dc_funcs( hdc ); - - ReleaseDC( 0, hdc ); - - /* internal WGL functions */ - wine_wgl.p_wglFinish = (void *)funcs->p_wglGetProcAddress("wglFinish"); - wine_wgl.p_wglFlush = (void *)funcs->p_wglGetProcAddress("wglFlush"); - wine_wgl.p_wglGetIntegerv = (void *)funcs->p_wglGetProcAddress("wglGetIntegerv"); - return TRUE; -} - - /**********************************************************************/ static void process_detach(void) @@ -1344,7 +1293,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) opengl32_handle = hinst; DisableThreadLibraryCalls(hinst); NtCurrentTeb()->glTable = &null_opengl_funcs; - return process_attach(); + break; case DLL_THREAD_ATTACH: NtCurrentTeb()->glTable = &null_opengl_funcs; break; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aae4f4b..b36a29c 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -328,6 +328,10 @@ static void (*pglXFreeMemoryNV)(GLvoid *pointer); static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); /* Standard OpenGL */ +static void (*pglFinish)(void); +static void (*pglFlush)(void); +static void (*pglGetIntegerv)(GLenum,GLint*); + MAKE_FUNCPTR(glBindTexture) MAKE_FUNCPTR(glBitmap) MAKE_FUNCPTR(glCopyTexSubImage1D) @@ -336,16 +340,17 @@ MAKE_FUNCPTR(glCopyTexSubImage2D) MAKE_FUNCPTR(glDrawBuffer) MAKE_FUNCPTR(glEndList) MAKE_FUNCPTR(glGetError) -MAKE_FUNCPTR(glGetIntegerv) MAKE_FUNCPTR(glGetString) MAKE_FUNCPTR(glNewList) MAKE_FUNCPTR(glPixelStorei) MAKE_FUNCPTR(glReadPixels) MAKE_FUNCPTR(glTexImage2D) -MAKE_FUNCPTR(glFinish) -MAKE_FUNCPTR(glFlush) #undef MAKE_FUNCPTR +static void wglFinish(void); +static void wglFlush(void); +static void wglGetIntegerv(GLenum pname, GLint* params); + static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { /* In the future we might want to find the exact X or GLX error to report back to the app */ @@ -513,6 +518,14 @@ static BOOL has_opengl(void) } } + /* redirect some standard OpenGL functions */ +#define REDIRECT(func) \ + do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = w##func; } while(0) + REDIRECT( glFinish ); + REDIRECT( glFlush ); + REDIRECT( glGetIntegerv ); +#undef REDIRECT + pglXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0); if (pglXGetProcAddressARB == NULL) { ERR("Could not find glXGetProcAddressARB in libGL, disabling OpenGL.\n"); @@ -563,14 +576,11 @@ static BOOL has_opengl(void) LOAD_FUNCPTR(glDrawBuffer); LOAD_FUNCPTR(glEndList); LOAD_FUNCPTR(glGetError); - LOAD_FUNCPTR(glGetIntegerv); LOAD_FUNCPTR(glGetString); LOAD_FUNCPTR(glNewList); LOAD_FUNCPTR(glPixelStorei); LOAD_FUNCPTR(glReadPixels); LOAD_FUNCPTR(glTexImage2D); - LOAD_FUNCPTR(glFinish); - LOAD_FUNCPTR(glFlush); #undef LOAD_FUNCPTR /* It doesn't matter if these fail. They'll only be used if the driver reports @@ -1791,7 +1801,7 @@ static HDC glxdrv_wglGetCurrentDC( struct wgl_context *ctx ) } /* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ -static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) +static void wglGetIntegerv(GLenum pname, GLint* params) { wine_tsx11_lock(); switch(pname) @@ -1872,7 +1882,7 @@ static void flush_gl_drawable( struct glx_physdev *physdev ) } -static void WINAPI X11DRV_wglFinish(void) +static void wglFinish(void) { struct wgl_context *ctx = NtCurrentTeb()->glContext; enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; @@ -1888,7 +1898,7 @@ static void WINAPI X11DRV_wglFinish(void) } } -static void WINAPI X11DRV_wglFlush(void) +static void wglFlush(void) { struct wgl_context *ctx = NtCurrentTeb()->glContext; enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; @@ -3052,17 +3062,6 @@ static BOOL register_extension(const WineGLExtension * ext) return TRUE; } -static const WineGLExtension WGL_internal_functions = -{ - "", - { - { "wglFinish", X11DRV_wglFinish }, - { "wglFlush", X11DRV_wglFlush }, - { "wglGetIntegerv", X11DRV_wglGetIntegerv }, - } -}; - - static const WineGLExtension WGL_ARB_create_context_extension = { "WGL_ARB_create_context", @@ -3166,9 +3165,6 @@ static void X11DRV_WineGL_LoadExtensions(void) { WineGLInfo.wglExtensions[0] = 0; - /* Load Wine internal functions */ - register_extension(&WGL_internal_functions); - /* ARB Extensions */ if(glxRequireExtension("GLX_ARB_create_context"))

1 0