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

Dmitry Timoshkov : gdiplus: GdipMeasureString operates internally in pixels but in/ out rectangles are in device units.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: b20a1f56b0c915b24f70b8be83fbf76ea7378123 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20a1f56b0c915b24f70b8be8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 16 14:58:33 2012 +0900 gdiplus: GdipMeasureString operates internally in pixels but in/out rectangles are in device units. --- dlls/gdiplus/graphics.c | 35 ++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/graphics.c | 6 ------ 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 59dd77b..5dcd30a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4908,6 +4908,30 @@ static GpStatus measure_ranges_callback(HDC hdc, return stat; } +static void rect_to_pixels(const RectF *in, const GpGraphics *graphics, RectF *out) +{ + REAL dpi; + + GdipGetDpiX((GpGraphics *)graphics, &dpi); + out->X = units_to_pixels(in->X, graphics->unit, dpi); + out->Width = units_to_pixels(in->Width, graphics->unit, dpi); + GdipGetDpiY((GpGraphics *)graphics, &dpi); + out->Y = units_to_pixels(in->Y, graphics->unit, dpi); + out->Height = units_to_pixels(in->Height, graphics->unit, dpi); +} + +static void rect_to_units(const RectF *in, const GpGraphics *graphics, RectF *out) +{ + REAL dpi; + + GdipGetDpiX((GpGraphics *)graphics, &dpi); + out->X = pixels_to_units(in->X, graphics->unit, dpi); + out->Width = pixels_to_units(in->Width, graphics->unit, dpi); + GdipGetDpiY((GpGraphics *)graphics, &dpi); + out->Y = pixels_to_units(in->Y, graphics->unit, dpi); + out->Height = pixels_to_units(in->Height, graphics->unit, dpi); +} + GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, @@ -5011,6 +5035,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, struct measure_string_args args; HDC temp_hdc=NULL, hdc; GpPointF pt[3]; + RectF rect_pixels; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -5048,8 +5073,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, get_font_hfont(graphics, font, &gdifont); oldfont = SelectObject(hdc, gdifont); - bounds->X = rect->X; - bounds->Y = rect->Y; + rect_to_pixels(rect, graphics, &rect_pixels); + + bounds->X = rect_pixels.X; + bounds->Y = rect_pixels.Y; bounds->Width = 0.0; bounds->Height = 0.0; @@ -5057,9 +5084,11 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(hdc, string, length, font, rect, format, + gdip_format_string(hdc, string, length, font, &rect_pixels, format, measure_string_callback, &args); + rect_to_units(bounds, graphics, bounds); + SelectObject(hdc, oldfont); DeleteObject(gdifont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b1d4616..7c53ced 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3350,9 +3350,7 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine expectf_(102.499985, bounds.Width, 11.5); -todo_wine expectf_(31.968744, bounds.Height, 3.1); } else @@ -3372,9 +3370,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine expectf_(76.875000, bounds.Width, 10.0); -todo_wine expectf_(23.976563, bounds.Height, 2.1); status = GdipSetPageUnit(graphics, UnitMillimeter); @@ -3391,9 +3387,7 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine expectf_(27.119789, bounds.Width, 2.7); -todo_wine expectf_(8.458398, bounds.Height, 0.8); GdipDeleteStringFormat(format);

1 0

Alexandre Julliard : user32/tests: Try to fix a test that frequently fails on Windows.
by Alexandre Julliard 18 Jul '12

18 Jul '12

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

André Hentschel : msvcrt: Add tmpfile_s implementation .
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: f09a40a215ef6994734aa0c66c9cb10969000df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09a40a215ef6994734aa0c66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 17 21:49:09 2012 +0200 msvcrt: Add tmpfile_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 15 +++++++++++++++ dlls/msvcrt/file.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 70bcbd0..090e82c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1609,7 +1609,7 @@ @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh @ cdecl tmpfile() msvcrt.tmpfile -@ stub tmpfile_s +@ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam @ stub tmpnam_s @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d758176..3644345 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1463,7 +1463,7 @@ @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh @ cdecl tmpfile() msvcrt.tmpfile -@ stub tmpfile_s +@ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam @ stub tmpnam_s @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5c27fca..d10c78e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1474,7 +1474,7 @@ @ cdecl tanh(double) msvcrt.tanh @ cdecl -arch=x86_64 tanhf(float) msvcrt.tanhf @ cdecl tmpfile() msvcrt.tmpfile -@ stub tmpfile_s +@ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam @ stub tmpnam_s @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 92945ae..c746400 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -75,6 +75,7 @@ static void (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, static void* (__cdecl *p_bsearch_s)(const void *, const void *, size_t, size_t, int (__cdecl *compare)(void *, const void *, const void *), void *); static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); +static int (__cdecl *p_tmpfile_s)(FILE**); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); @@ -255,6 +256,7 @@ static BOOL init(void) SET(p_qsort_s, "qsort_s"); SET(p_bsearch_s, "bsearch_s"); SET(p_controlfp_s, "_controlfp_s"); + SET(p_tmpfile_s, "tmpfile_s"); SET(p_atoflt, "_atoflt"); SET(p_set_abort_behavior, "_set_abort_behavior"); SET(p_sopen_s, "_sopen_s"); @@ -833,6 +835,18 @@ static void test_controlfp_s(void) ok( cur != 0xdeadbeef, "value not set\n" ); } +static void test_tmpfile_s( void ) +{ + int ret; + + errno = 0xdeadbeef; + SET_EXPECT(invalid_parameter_handler); + ret = p_tmpfile_s(NULL); + ok(ret == EINVAL, "Expected tmpfile_s to return EINVAL, got %i\n", ret); + CHECK_CALLED(invalid_parameter_handler); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); +} + typedef struct { const char *str; @@ -1211,6 +1225,7 @@ START_TEST(msvcr90) test_qsort_s(); test_bsearch_s(); test_controlfp_s(); + test_tmpfile_s(); test__atoflt(); test__set_abort_behavior(); test__sopen_s(); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index df2c7cd..fe8f8b6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3792,6 +3792,18 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) return file; } +/********************************************************************* + * tmpfile_s (MSVCRT.@) + */ +int CDECL MSVCRT_tmpfile_s(MSVCRT_FILE** file) +{ + if (!MSVCRT_CHECK_PMT(file != NULL)) + return MSVCRT_EINVAL; + + *file = MSVCRT_tmpfile(); + return 0; +} + static int puts_clbk_file_a(void *file, int len, const char *str) { return MSVCRT_fwrite(str, sizeof(char), len, file); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 934c247..c84ecba 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1422,7 +1422,7 @@ @ cdecl -arch=x86_64 tanhf(float) MSVCRT_tanhf @ cdecl time(ptr) MSVCRT_time @ cdecl tmpfile() MSVCRT_tmpfile -# stub tmpfile_s(ptr) +@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam # stub tmpnam_s(ptr long) @ cdecl tolower(long) MSVCRT_tolower

1 0

Alexandre Julliard : opengl32: Generate a header file containing function tables for all OpenGL functions .
by Alexandre Julliard 18 Jul '12

18 Jul '12

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: Generate a function table with null OpenGL entry points and store it in the TEB .
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: edb0044e502d494615f85129207c31da93f14ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb0044e502d494615f851292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 23:34:45 2012 +0200 opengl32: Generate a function table with null OpenGL entry points and store it in the TEB. --- dlls/opengl32/make_opengl | 43 ++++++ dlls/opengl32/opengl_norm.c | 344 +++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 9 + 3 files changed, 396 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edb0044e502d494615f85…

1 0

Alexandre Julliard : winex11: Fill a function table with the standard OpenGL functions and store it in the TEB .
by Alexandre Julliard 18 Jul '12

18 Jul '12

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: Call standard OpenGL functions through the TEB function table.
by Alexandre Julliard 18 Jul '12

18 Jul '12

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 : opengl32: Call OpenGL extension functions through the TEB function table.
by Alexandre Julliard 18 Jul '12

18 Jul '12

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 : opengl32: Redirect standard OpenGL functions through the TEB function table.
by Alexandre Julliard 18 Jul '12

18 Jul '12

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

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

18 Jul '12

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