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

Jacek Caban : ieframe: Improved debug traces.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 3009244d9cabfc5a72df043957ccddf48c2b8d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3009244d9cabfc5a72df04395… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 15:19:04 2015 +0200 ieframe: Improved debug traces. --- dlls/ieframe/oleobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index d02562d..fb9e12f 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -841,7 +841,7 @@ static HRESULT WINAPI OleInPlaceObject_SetObjectRects(IOleInPlaceObject *iface, { WebBrowser *This = impl_from_IOleInPlaceObject(iface); - TRACE("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); + TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_rect(lprcPosRect), wine_dbgstr_rect(lprcClipRect)); This->pos_rect = *lprcPosRect;

1 0

Jacek Caban : ieframe: Release client site interface before destroying embedding window.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 8c7a90775589511529513118d9ac620dac8dbc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7a90775589511529513118d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 15:18:18 2015 +0200 ieframe: Release client site interface before destroying embedding window. --- dlls/ieframe/oleobject.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 53c0e36..462cf74 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -264,6 +264,11 @@ static void release_client_site(WebBrowser *This) { release_dochost_client(&This->doc_host); + if(This->client) { + IOleClientSite_Release(This->client); + This->client = NULL; + } + if(This->shell_embedding_hwnd) { DestroyWindow(This->shell_embedding_hwnd); This->shell_embedding_hwnd = NULL; @@ -284,11 +289,6 @@ static void release_client_site(WebBrowser *This) This->uiwindow = NULL; } - if(This->client) { - IOleClientSite_Release(This->client); - This->client = NULL; - } - if(This->sink) { IAdviseSink_Release(This->sink); This->sink = NULL;

1 0

Matteo Bruni : wined3d: Allow to apply extension emulation wrappers independently.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 930d3e62692fb717079968f32a831975ff3107f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=930d3e62692fb717079968f32… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:55 2015 +0200 wined3d: Allow to apply extension emulation wrappers independently. --- dlls/wined3d/directx.c | 3 +- dlls/wined3d/gl_compat.c | 238 +++++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 76 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=930d3e62692fb71707996…

1 0

Matteo Bruni : wined3d: Avoid glBegin() / glEnd() in check_fbo_compat() when possible.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 53d152794574ce19d835340dda626845b2e85dc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d152794574ce19d835340dd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:53 2015 +0200 wined3d: Avoid glBegin() / glEnd() in check_fbo_compat() when possible. --- dlls/wined3d/directx.c | 27 +++---- dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/utils.c | 156 ++++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 19 ++++- 4 files changed, 164 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d152794574ce19d8353…

1 0

Nikolay Sivov : dwrite: Implement GetRecommendedRenderingMode().
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: e877cfbcfa4759b57048f029c14e12acbb6acafb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e877cfbcfa4759b57048f029c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 27 11:10:32 2015 +0300 dwrite: Implement GetRecommendedRenderingMode(). --- dlls/dwrite/dwrite_private.h | 9 +++ dlls/dwrite/font.c | 134 +++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/opentype.c | 30 +++++++++- dlls/dwrite/tests/font.c | 28 +++++---- 4 files changed, 174 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e877cfbcfa4759b57048f…

1 0

Sebastian Lackner : vcomp: Implement atomic double functions.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 36fe1f8a82c0dca06a749dda8f2239e643e37fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=36fe1f8a82c0dca06a749dda8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:38:52 2015 +0200 vcomp: Implement atomic double functions. --- dlls/vcomp/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp/vcomp.spec | 8 ++++---- dlls/vcomp100/vcomp100.spec | 8 ++++---- dlls/vcomp90/vcomp90.spec | 8 ++++---- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 92c8eaf..301370c 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -330,6 +330,50 @@ void CDECL _vcomp_atomic_sub_r4(float *dest, float val) while (interlocked_cmpxchg((int *)dest, new, old) != old); } +void CDECL _vcomp_atomic_add_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old + val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_div_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old / val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_mul_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old * val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + +void CDECL _vcomp_atomic_sub_r8(double *dest, double val) +{ + LONG64 old, new; + do + { + old = *(LONG64 *)dest; + *(double *)&new = *(double *)&old - val; + } + while (interlocked_cmpxchg64((LONG64 *)dest, new, old) != old); +} + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index bc963cb..3a709df 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -3,7 +3,7 @@ @ cdecl _vcomp_atomic_add_i4(ptr long) @ stub _vcomp_atomic_add_i8 @ cdecl _vcomp_atomic_add_r4(ptr float) -@ stub _vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_add_r8(ptr double) @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @ cdecl _vcomp_atomic_and_i4(ptr long) @@ -13,7 +13,7 @@ @ cdecl _vcomp_atomic_div_i4(ptr long) @ stub _vcomp_atomic_div_i8 @ cdecl _vcomp_atomic_div_r4(ptr float) -@ stub _vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_r8(ptr double) @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @ cdecl _vcomp_atomic_div_ui4(ptr long) @@ -23,7 +23,7 @@ @ cdecl _vcomp_atomic_mul_i4(ptr long) @ stub _vcomp_atomic_mul_i8 @ cdecl _vcomp_atomic_mul_r4(ptr float) -@ stub _vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_mul_r8(ptr double) @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @ cdecl _vcomp_atomic_or_i4(ptr long) @@ -45,7 +45,7 @@ @ cdecl _vcomp_atomic_sub_i4(ptr long) @ stub _vcomp_atomic_sub_i8 @ cdecl _vcomp_atomic_sub_r4(ptr float) -@ stub _vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_sub_r8(ptr double) @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 @ cdecl _vcomp_atomic_xor_i4(ptr long) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 2f4401e..eb6e568 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -3,7 +3,7 @@ @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 @ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 -@ stub _vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 @@ -13,7 +13,7 @@ @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 @ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 -@ stub _vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 @@ -23,7 +23,7 @@ @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 @ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 -@ stub _vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 @@ -45,7 +45,7 @@ @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 @ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 -@ stub _vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 @ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 2f4401e..eb6e568 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -3,7 +3,7 @@ @ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 @ stub _vcomp_atomic_add_i8 @ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 -@ stub _vcomp_atomic_add_r8 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 @ stub _vcomp_atomic_and_i1 @ stub _vcomp_atomic_and_i2 @ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 @@ -13,7 +13,7 @@ @ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 @ stub _vcomp_atomic_div_i8 @ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 -@ stub _vcomp_atomic_div_r8 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 @ stub _vcomp_atomic_div_ui1 @ stub _vcomp_atomic_div_ui2 @ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 @@ -23,7 +23,7 @@ @ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 @ stub _vcomp_atomic_mul_i8 @ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 -@ stub _vcomp_atomic_mul_r8 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 @ stub _vcomp_atomic_or_i1 @ stub _vcomp_atomic_or_i2 @ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 @@ -45,7 +45,7 @@ @ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 @ stub _vcomp_atomic_sub_i8 @ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 -@ stub _vcomp_atomic_sub_r8 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 @ stub _vcomp_atomic_xor_i1 @ stub _vcomp_atomic_xor_i2 @ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4

1 0

Sebastian Lackner : vcomp/tests: Add tests for 32-bit atomic integer functions.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: c68a63e474f319807df87f5ddc8133c56fd59e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68a63e474f319807df87f5dd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jul 27 01:37:44 2015 +0200 vcomp/tests: Add tests for 32-bit atomic integer functions. --- dlls/vcomp/tests/vcomp.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 17b37f2..4974831 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -31,6 +31,17 @@ static BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); static BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); +static void (CDECL *p_vcomp_atomic_add_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_and_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_div_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_div_ui4)(unsigned int *dest, unsigned int val); +static void (CDECL *p_vcomp_atomic_mul_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_or_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_shl_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_shr_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_shr_ui4)(unsigned int *dest, unsigned int val); +static void (CDECL *p_vcomp_atomic_sub_i4)(int *dest, int val); +static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); static void (CDECL *p_vcomp_for_static_end)(void); static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, int chunksize, unsigned int *loops, @@ -175,6 +186,17 @@ static BOOL init_vcomp(void) return FALSE; } + VCOMP_GET_PROC(_vcomp_atomic_add_i4); + VCOMP_GET_PROC(_vcomp_atomic_and_i4); + VCOMP_GET_PROC(_vcomp_atomic_div_i4); + VCOMP_GET_PROC(_vcomp_atomic_div_ui4); + VCOMP_GET_PROC(_vcomp_atomic_mul_i4); + VCOMP_GET_PROC(_vcomp_atomic_or_i4); + VCOMP_GET_PROC(_vcomp_atomic_shl_i4); + VCOMP_GET_PROC(_vcomp_atomic_shr_i4); + VCOMP_GET_PROC(_vcomp_atomic_shr_ui4); + VCOMP_GET_PROC(_vcomp_atomic_sub_i4); + VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_for_static_end); VCOMP_GET_PROC(_vcomp_for_static_init); @@ -849,6 +871,60 @@ static void test_vcomp_for_static_init(void) pomp_set_num_threads(max_threads); } +static void test_atomic_integer32(void) +{ + struct + { + void (CDECL *func)(int *, int); + int v1, v2, expected; + } + tests1[] = + { + { p_vcomp_atomic_add_i4, 0x11223344, 0x77665544, -0x77777778 }, + { p_vcomp_atomic_and_i4, 0x11223344, 0x77665544, 0x11221144 }, + { p_vcomp_atomic_div_i4, 0x77665544, 0x11223344, 6 }, + { p_vcomp_atomic_div_i4, 0x77665544, -0x11223344, -6 }, + { p_vcomp_atomic_mul_i4, 0x11223344, 0x77665544, -0xecccdf0 }, + { p_vcomp_atomic_mul_i4, 0x11223344, -0x77665544, 0xecccdf0 }, + { p_vcomp_atomic_or_i4, 0x11223344, 0x77665544, 0x77667744 }, + { p_vcomp_atomic_shl_i4, 0x11223344, 3, -0x76ee65e0 }, + { p_vcomp_atomic_shl_i4, 0x11223344, 35, -0x76ee65e0 }, + { p_vcomp_atomic_shl_i4, -0x11223344, 3, 0x76ee65e0 }, + { p_vcomp_atomic_shr_i4, 0x11223344, 3, 0x2244668 }, + { p_vcomp_atomic_shr_i4, 0x11223344, 35, 0x2244668 }, + { p_vcomp_atomic_shr_i4, -0x11223344, 3, -0x2244669 }, + { p_vcomp_atomic_sub_i4, 0x11223344, 0x77665544, -0x66442200 }, + { p_vcomp_atomic_xor_i4, 0x11223344, 0x77665544, 0x66446600 }, + }; + struct + { + void (CDECL *func)(unsigned int *, unsigned int); + unsigned int v1, v2, expected; + } + tests2[] = + { + { p_vcomp_atomic_div_ui4, 0x77665544, 0x11223344, 6 }, + { p_vcomp_atomic_div_ui4, 0x77665544, 0xeeddccbc, 0 }, + { p_vcomp_atomic_shr_ui4, 0x11223344, 3, 0x2244668 }, + { p_vcomp_atomic_shr_ui4, 0x11223344, 35, 0x2244668 }, + { p_vcomp_atomic_shr_ui4, 0xeeddccbc, 3, 0x1ddbb997 }, + }; + int i; + + for (i = 0; i < sizeof(tests1)/sizeof(tests1[0]); i++) + { + int val = tests1[i].v1; + tests1[i].func(&val, tests1[i].v2); + ok(val == tests1[i].expected, "test %d: expected val == %d, got %d\n", i, tests1[i].expected, val); + } + for (i = 0; i < sizeof(tests2)/sizeof(tests2[0]); i++) + { + unsigned int val = tests2[i].v1; + tests2[i].func(&val, tests2[i].v2); + ok(val == tests2[i].expected, "test %d: expected val == %u, got %u\n", i, tests2[i].expected, val); + } +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -860,6 +936,7 @@ START_TEST(vcomp) test_vcomp_sections_init(); test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); + test_atomic_integer32(); release_vcomp(); }

1 0

Matteo Bruni : wined3d: Don't crash when emulating GL_EXT_fogcoord.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 6244735f7ab863d912de7c3302ab02fad30bc823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6244735f7ab863d912de7c330… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:56 2015 +0200 wined3d: Don't crash when emulating GL_EXT_fogcoord. --- dlls/wined3d/gl_compat.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index c79a453..7e6b510 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -264,6 +264,14 @@ static void (WINE_GLAPI *old_fogcoord_glColor4f) (GLfloat r, GLfloat g, GLfloat static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { struct wined3d_context *ctx = context_get_current(); + + /* This can be called from draw_test_quad() and at that point there is no + * wined3d_context current. */ + if (!ctx) + { + old_fogcoord_glVertex4f(x, y, z, w); + return; + } if(ctx->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx->fog_enabled) { GLfloat c[4] = {ctx->color[0], ctx->color[1], ctx->color[2], ctx->color[3]}; GLfloat i; @@ -294,6 +302,14 @@ static void WINE_GLAPI wine_glVertex3fv(const GLfloat *pos) { static void WINE_GLAPI wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { struct wined3d_context *ctx = context_get_current(); + + /* This can be called from draw_test_quad() and at that point there is no + * wined3d_context current. */ + if (!ctx) + { + old_fogcoord_glColor4f(r, g, b, a); + return; + } ctx->color[0] = r; ctx->color[1] = g; ctx->color[2] = b;

1 0

Matteo Bruni : wined3d: Don't run check_filter() on core contexts.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 12ef1756d2550c29873b8aec1a7dfaf1d3f0bbae URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ef1756d2550c29873b8aec1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 27 14:29:54 2015 +0200 wined3d: Don't run check_filter() on core contexts. The code uses glBegin() / glEnd() and other APIs removed from core profile. --- dlls/wined3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6c871f1..e57db99 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2375,7 +2375,8 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 /* This was already handled by init_format_texture_info(). */ return; - if(wined3d_settings.offscreen_rendering_mode != ORM_FBO) + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { WARN("No FBO support, or no FBO ORM, guessing filter info from GL caps\n"); if (vendor == HW_VENDOR_NVIDIA && gl_info->supported[ARB_TEXTURE_FLOAT])

1 0

Jacek Caban : include: Added inspectable.idl file.
by Alexandre Julliard July 28, 2015

July 28, 2015

Module: wine Branch: master Commit: 5c000dca57f2bae082a729bfa667d429e0c4c836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c000dca57f2bae082a729bfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 27 13:41:16 2015 +0200 include: Added inspectable.idl file. --- include/Makefile.in | 1 + include/inspectable.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3b8d8d1..f829712 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -62,6 +62,7 @@ PUBLIC_IDL_H_SRCS = \ indexsrv.idl \ inputscope.idl \ inseng.idl \ + inspectable.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/include/inspectable.idl b/include/inspectable.idl new file mode 100644 index 0000000..847d21d --- /dev/null +++ b/include/inspectable.idl @@ -0,0 +1,41 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wtypes.idl"; +import "unknwn.idl"; +import "hstring.idl"; + +typedef [v1_enum] enum TrustLevel { + BaseTrust, + PartialTrust, + FullTrust +} TrustLevel; + +[ + object, + uuid(af86e2e0-b12d-4c6a-9c5a-d7aa65101e90), + pointer_default(unique) +] +interface IInspectable : IUnknown +{ + HRESULT GetIids([out] ULONG *iidCount, [out, size_is(,*iidCount)] IID **iids); + HRESULT GetRuntimeClassName([out] HSTRING *className); + HRESULT GetTrustLevel([out] TrustLevel *trustLevel); +} + +typedef [unique] IInspectable *LPINSPECTABLE;

1 0