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

Stefan Dösinger : wined3d: Try to detect the polygon offset scale value.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 34d8b987c493544f640bf5ca0a5a6cbb3d3f4e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d8b987c493544f640bf5ca0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 30 18:50:15 2015 +0200 wined3d: Try to detect the polygon offset scale value. FEAR draws the same geometry twice, the second time using zfunc=equal. In both cases it sets a huge depth bias of -0.5, presumably to get better precision for the fragile Z comparison. The GL polygon offset we set ends up being so large that it pulls the geometry into the negative Z range. It isn't clipped (or no longer, older NV drivers probably had a separate bug there), but the Z value gets clamped to 0.0 in the first draw and doesn't match the incoming Z in the second draw. --- dlls/wined3d/cs.c | 3 +- dlls/wined3d/directx.c | 4 ++ dlls/wined3d/state.c | 25 +++++++---- dlls/wined3d/utils.c | 94 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 39e78e1..459fd56 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -446,7 +446,8 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } - else if (prev && prev->format->depth_size != op->view->format->depth_size) + else if (prev && (prev->format_flags & WINED3DFMT_FLAG_FLOAT) + != (op->view->format_flags & WINED3DFMT_FLAG_FLOAT)) { device_invalidate_state(device, STATE_RENDER(WINED3D_RS_DEPTHBIAS)); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce23c47..8e4448d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5903,6 +5903,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) return FALSE; } + gl_info->fixed_polyoffset_scale = wined3d_adapter_find_polyoffset_scale(&caps_gl_ctx, GL_DEPTH_COMPONENT); + if (gl_info->supported[ARB_DEPTH_BUFFER_FLOAT]) + gl_info->float_polyoffset_scale = wined3d_adapter_find_polyoffset_scale(&caps_gl_ctx, GL_DEPTH32F_STENCIL8); + adapter->vram_bytes = adapter->driver_info.vram_bytes; adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e39b7b4..3225aa6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1632,11 +1632,17 @@ static void state_scissor(struct wined3d_context *context, const struct wined3d_ * OpenGL the bias is specified in units of "the smallest value that is * guaranteed to produce a resolvable offset for a given implementation". To * convert from D3D to GL we need to divide the D3D depth bias by that value. - * There's no practical way to retrieve that value from a given GL - * implementation, but the D3D application has essentially the same problem, - * which makes a guess of the depth buffer format's highest possible value a - * reasonable guess. Note that SLOPESCALEDEPTHBIAS is a scaling factor for the - * depth slope, and doesn't need to be scaled. */ + * We try to detect the value from GL with test draws. On most drivers (r300g, + * 600g, Nvidia, i965 on Mesa) the value is 2^23 for fixed point depth buffers, + * for r200 and i965 on OSX it is 2^24, for r500 on OSX it is 2^22. For floating + * point buffers it is 2^22, 2^23 or 2^24 depending on the GPU. The value does + * not depend on the depth buffer precision on any driver. + * + * Two games that are picky regarding depth bias are Mass Effect 2 (flickering + * decals) and F.E.A.R and F.E.A.R. 2 (semi-transparent guns). + * + * Note that SLOPESCALEDEPTHBIAS is a scaling factor for the depth slope, and + * doesn't need to be scaled to account for GL vs D3D differences. */ static void state_depthbias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1669,10 +1675,13 @@ static void state_depthbias(struct wined3d_context *context, const struct wined3 { if (depth) { - const struct wined3d_format *fmt = depth->format; - scale = powf(2, fmt->depth_size) - 1; + if (depth->format_flags & WINED3DFMT_FLAG_FLOAT) + scale = gl_info->float_polyoffset_scale; + else + scale = gl_info->fixed_polyoffset_scale; + TRACE("Depth format %s, using depthbias scale of %.8e.\n", - debug_d3dformat(fmt->id), scale); + debug_d3dformat(depth->format->id), scale); } else { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e57db99..30ad0e0 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2707,6 +2707,100 @@ fail: return FALSE; } +float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) +{ + const struct wined3d_gl_info *gl_info = ctx->gl_info; + static const struct wined3d_color blue = {0.0f, 0.0f, 1.0f, 1.0f}; + GLuint fbo, color, depth; + unsigned int low = 0, high = 32, cur; + DWORD readback[256]; + static const struct wined3d_vec3 geometry[] = + { + {-1.0f, -1.0f, -1.0f}, + { 1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, -1.0f}, + { 1.0f, 1.0f, 0.0f}, + }; + + /* Most drivers want 2^23 for fixed point depth buffers, including r300g, r600g, + * Nvidia. Use this as a fallback if the detection fails. */ + unsigned int fallback = 23; + + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + { + FIXME("No FBOs, assuming polyoffset scale of 2^%u.\n", fallback); + return (float)(1 << fallback); + } + + gl_info->gl_ops.gl.p_glGenTextures(1, &color); + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, color); + gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 256, 1, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); + + gl_info->fbo_ops.glGenRenderbuffers(1, &depth); + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, depth); + gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, format, 256, 1); + + gl_info->fbo_ops.glGenFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); + gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, color, 0); + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depth); + checkGLcall("Setup framebuffer"); + + gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 0.5f, 0.0f); + gl_info->gl_ops.gl.p_glClearDepth(0.5f); + gl_info->gl_ops.gl.p_glEnable(GL_DEPTH_TEST); + gl_info->gl_ops.gl.p_glEnable(GL_POLYGON_OFFSET_FILL); + gl_info->gl_ops.gl.p_glViewport(0, 0, 256, 1); + checkGLcall("Misc parameters"); + + for (;;) + { + if (high - low <= 1) + { + ERR("PolygonOffset scale factor detection failed, using fallback value 2^%u.\n", fallback); + cur = fallback; + break; + } + cur = (low + high) / 2; + + gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + /* The post viewport transform Z of the geometry runs from 0.0 to 0.5. We want to push it another + * 0.25 so that the Z buffer content (0.5) cuts the quad off at half the screen. */ + gl_info->gl_ops.gl.p_glPolygonOffset(0.0f, (float)(1 << cur) * 0.25f); + draw_test_quad(ctx, geometry, &blue); + checkGLcall("Test draw"); + + /* Rebinding texture to workaround a fglrx bug. */ + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, color); + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("readback"); + + TRACE("low %02u, high %02u, cur %2u, 0=0x%08x, 125=0x%08x, 131=0x%08x, 255=0x%08x\n", + low, high, cur, readback[0], readback[125], readback[131], readback[255]); + + if ((readback[125] & 0xff) < 0xa0) + high = cur; + else if ((readback[131] & 0xff) > 0xa0) + low = cur; + else + { + TRACE("Found scale factor 2^%u for format %x\n", cur, format); + break; + } + } + + gl_info->gl_ops.gl.p_glDeleteTextures(1, &color); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &depth); + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); + gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); + checkGLcall("Delete framebuffer"); + + gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_TEST); + gl_info->gl_ops.gl.p_glDisable(GL_POLYGON_OFFSET_FILL); + return (float)(1 << cur); +} + const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format_id) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1331d3..c22fe33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1723,6 +1723,7 @@ struct wined3d_gl_info DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; GLint wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP + 1]; + float fixed_polyoffset_scale, float_polyoffset_scale; HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; @@ -1812,6 +1813,7 @@ struct wined3d_caps_gl_ctx GLuint test_program_id; }; +float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *ctx, GLenum format) DECLSPEC_HIDDEN; BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN;

1 0

Piotr Caban : user32: Test GetIconInfo on other process cursor.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 888ffb1134846c67032c04ab7c91b8d2476a6e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888ffb1134846c67032c04ab7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 30 09:36:52 2015 +0200 user32: Test GetIconInfo on other process cursor. --- dlls/user32/tests/cursoricon.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 54d7963..4b6b792 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -308,21 +308,33 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL ret; - DWORD error; - switch (msg) { /* Destroy the cursor. */ case WM_USER+1: + { + HCURSOR cursor = (HCURSOR)lParam; + ICONINFO info; + BOOL ret; + DWORD error; + + memset(&info, 0, sizeof(info)); + ret = GetIconInfo(cursor, &info); + todo_wine ok(ret, "GetIconInfoEx failed with error %u\n", GetLastError()); + todo_wine ok(info.hbmColor != NULL, "info.hmbColor was not set\n"); + todo_wine ok(info.hbmMask != NULL, "info.hmbColor was not set\n"); + DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); + SetLastError(0xdeadbeef); - ret = DestroyCursor((HCURSOR) lParam); + ret = DestroyCursor(cursor); error = GetLastError(); ok(!ret || broken(ret) /* win9x */, "DestroyCursor on the active cursor succeeded.\n"); ok(error == ERROR_DESTROY_OBJECT_OF_OTHER_THREAD || error == 0xdeadbeef, /* vista */ "Last error: %u\n", error); return TRUE; + } case WM_DESTROY: PostQuitMessage(0); return 0;

1 0

Henri Verbeet : d2d1: Fix the TRACE in d2d_bitmap_Release().
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 4371946d949d547f01059d16b31e9e73e39637a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4371946d949d547f01059d16b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:57 2015 +0200 d2d1: Fix the TRACE in d2d_bitmap_Release(). --- dlls/d2d1/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index be03b66..080663c 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -62,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); ULONG refcount = InterlockedDecrement(&bitmap->refcount); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) {

1 0

Andrew Eikum : x3daudio1_7: Stub X3DAudioInitialize.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: f529a5aaae85329f3a148943191be8bcbba2c51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f529a5aaae85329f3a1489431… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jul 30 10:58:46 2015 -0500 x3daudio1_7: Stub X3DAudioInitialize. --- dlls/x3daudio1_7/main.c | 10 ++++++++++ dlls/x3daudio1_7/x3daudio1_7.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/x3daudio1_7/main.c b/dlls/x3daudio1_7/main.c index 672cb1c..2488e03 100644 --- a/dlls/x3daudio1_7/main.c +++ b/dlls/x3daudio1_7/main.c @@ -21,6 +21,10 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x3daudio); + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -34,3 +38,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, void *handle) +{ + FIXME("0x%x, %f, %p: Stub!\n", chanmask, speedofsound, handle); + return S_OK; +} diff --git a/dlls/x3daudio1_7/x3daudio1_7.spec b/dlls/x3daudio1_7/x3daudio1_7.spec index 9a51f1b..2b93838 100644 --- a/dlls/x3daudio1_7/x3daudio1_7.spec +++ b/dlls/x3daudio1_7/x3daudio1_7.spec @@ -1,2 +1,2 @@ @ stub X3DAudioCalculate -@ stub X3DAudioInitialize +@ cdecl X3DAudioInitialize(long float ptr)

1 0

Sebastian Lackner : vcomp/tests: Print the correct variable in ok() message.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 4bcdbe0982f11cf0ee74bf81ac49edceb87becaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bcdbe0982f11cf0ee74bf81a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 30 07:11:12 2015 +0200 vcomp/tests: Print the correct variable in ok() message. --- dlls/vcomp/tests/vcomp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index f021a72..6f9f75e 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -607,7 +607,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, FALSE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end); @@ -619,7 +619,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].first, tests[i].last, tests[i].step, TRUE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end); @@ -633,7 +633,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, FALSE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end); @@ -645,7 +645,7 @@ static void CDECL for_static_simple_cb(void) p_vcomp_for_static_simple_init(tests[i].last, tests[i].first, tests[i].step, TRUE, &begin, &end); ok(begin == my_begin, "test %d, thread %d/%d: expected begin == %u, got %u\n", - i, thread_num, num_threads, my_begin, end); + i, thread_num, num_threads, my_begin, begin); ok(end == my_end, "test %d, thread %d/%d: expected end == %u, got %u\n", i, thread_num, num_threads, my_end, end);

1 0

Henri Verbeet : d2d1: Don' t pass NULL resource data to ID3D10Device_CreateTexture2D().
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: e5c793e637784ac017f99b25bd4a53a98ea95116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c793e637784ac017f99b25b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:58 2015 +0200 d2d1: Don't pass NULL resource data to ID3D10Device_CreateTexture2D(). --- dlls/d2d1/bitmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 080663c..00359cb 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -228,7 +228,8 @@ HRESULT d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_d3d_render_target resource_data.pSysMem = src_data; resource_data.SysMemPitch = pitch; - if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc, &resource_data, &texture))) + if (FAILED(hr = ID3D10Device_CreateTexture2D(render_target->device, &texture_desc, + src_data ? &resource_data : NULL, &texture))) { ERR("Failed to create texture, hr %#x.\n", hr); return hr;

1 0

Henri Verbeet : d2d1: Implement d2d_stroke_style_GetFactory().
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 68ce000df7d7f4011d65d44cfdbc62a0a6c71e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ce000df7d7f4011d65d44cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 30 11:10:59 2015 +0200 d2d1: Implement d2d_stroke_style_GetFactory(). --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/stroke.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 96a0bb8..cf98ff8 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -164,6 +164,8 @@ struct d2d_stroke_style { ID2D1StrokeStyle ID2D1StrokeStyle_iface; LONG refcount; + + ID2D1Factory *factory; }; void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 81d3dde..167db67 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -65,16 +65,21 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(style->factory); HeapFree(GetProcessHeap(), 0, style); + } return refcount; } static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = style->factory); } static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface) @@ -162,4 +167,5 @@ void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; style->refcount = 1; + ID2D1Factory_AddRef(style->factory = factory); }

1 0

Piotr Caban : ole32: Don' t pump all messages in CoWaitForMultipleHandles in threads without apartment window.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: fbf7046ae86f03b839c414748af8c0259dcdff8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf7046ae86f03b839c414748… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 30 17:02:51 2015 +0200 ole32: Don't pump all messages in CoWaitForMultipleHandles in threads without apartment window. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/tests/compobj.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 762f011..6a30d7d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4388,7 +4388,7 @@ HRESULT WINAPI CoRevertToSelf(void) static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ - return PeekMessageW(msg, apt->win, 0, 0, PM_REMOVE|PM_NOYIELD) || + return (apt->win && PeekMessageW(msg, apt->win, 0, 0, PM_REMOVE|PM_NOYIELD)) || /* next retrieve other messages necessary for the app to remain responsive */ PeekMessageW(msg, NULL, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE|PM_NOYIELD) || PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_SENDMESSAGE|PM_REMOVE|PM_NOYIELD); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c96d63a..1dc3af0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2126,9 +2126,45 @@ static DWORD CALLBACK post_message_thread(LPVOID arg) return 0; } +static const char cls_name[] = "cowait_test_class"; +static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) +{ + HANDLE *handles = arg; + BOOL success; + DWORD index; + HRESULT hr; + HWND hWnd; + MSG msg; + + hr = pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); + + hWnd = CreateWindowExA(0, cls_name, "Test (thread)", WS_TILEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(hWnd != 0, "CreateWindowExA failed %u\n", GetLastError()); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); + ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); + + index = 0xdeadbeef; + PostMessageA(hWnd, WM_USER, 0, 0); + hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); + ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); + ok(index == 0, "expected index 0, got %u\n", index); + success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); + ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n"); + + DestroyWindow(hWnd); + CoUninitialize(); + return 0; +} + static void test_CoWaitForMultipleHandles(void) { - static const char cls_name[] = "cowait_test_class"; HANDLE handles[2], thread; DWORD index, tid; WNDCLASSEXA wc; @@ -2431,6 +2467,12 @@ static void test_CoWaitForMultipleHandles(void) CloseHandle(thread); } + /* test message pumping when CoWaitForMultipleHandles is called from non main apartment thread */ + thread = CreateThread(NULL, 0, test_CoWaitForMultipleHandles_thread, handles, 0, &tid); + index = WaitForSingleObject(thread, 500); + ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + CloseHandle(handles[0]); CloseHandle(handles[1]); DestroyWindow(hWnd);

1 0

Jacek Caban : widl: Renamed --rt option to --winrt for midl compatibility.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: fc761cb9352d185d1fe009c08a083aa63c5e814a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc761cb9352d185d1fe009c08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 30 14:14:57 2015 +0200 widl: Renamed --rt option to --winrt for midl compatibility. --- tools/widl/parser.l | 2 +- tools/widl/widl.c | 8 ++++---- tools/widl/widl.h | 2 +- tools/widl/widl.man.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index b911186..b4f2af5 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -419,7 +419,7 @@ static int kw_token(const char *kw) struct keyword key, *kwp; key.kw = kw; kwp = bsearch(&key, keywords, NKEYWORDS, sizeof(keywords[0]), kw_cmp_func); - if (kwp && (do_rt_extension || kwp->token != tNAMESPACE)) { + if (kwp && (winrt_mode || kwp->token != tNAMESPACE)) { parser_lval.str = xstrdup(kwp->kw); return kwp->token; } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index eace69f..788c45e 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -72,7 +72,7 @@ static const char usage[] = " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" -" --rt Enable WinRT's language extensions for IDL\n" +" --winrt Enable Windows Runtime mode\n" " -s Generate server stub\n" " -t Generate typelib\n" " -u Generate interface identifiers file\n" @@ -114,7 +114,7 @@ int do_win32 = 1; int do_win64 = 1; int win32_packing = 8; int win64_packing = 8; -int do_rt_extension = 0; +int winrt_mode = 0; static enum stub_mode stub_mode = MODE_Os; char *input_name; @@ -175,7 +175,7 @@ static const struct option long_options[] = { { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, - { "rt", 0, NULL, RT_OPTION }, + { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, @@ -578,7 +578,7 @@ int main(int argc,char *argv[]) fprintf(stderr, "%s", usage); return 0; case RT_OPTION: - do_rt_extension = 1; + winrt_mode = 1; break; case WIN32_OPTION: do_win32 = 1; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 9e09f76..d046f28 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -49,7 +49,7 @@ extern int do_win32; extern int do_win64; extern int win32_packing; extern int win64_packing; -extern int do_rt_extension; +extern int winrt_mode; extern char *input_name; extern char *input_idl_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 3ee5403..179ffba 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -83,8 +83,8 @@ Only generate 32-bit or 64-bit code respectively (the default is to generate both 32-bit and 64-bit versions into the same destination file). .PP -.IP "\fB--rt\fR" -Enable additional language extensions for IDL to support WinRT. +.IP "\fB--winrt\fR" +Enable Windows Runtime mode. .PP .B Registration script options: .IP "\fB-r\fR"

1 0

Aaryaman Vasishta : d3drm/tests: Add version specific tests for CreateDeviceFrom* methods.
by Alexandre Julliard July 30, 2015

July 30, 2015

Module: wine Branch: master Commit: 59e41ab912cd1492131f5484572d55dcb8a954d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e41ab912cd1492131f54845… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jul 30 17:04:33 2015 +0530 d3drm/tests: Add version specific tests for CreateDeviceFrom* methods. --- dlls/d3drm/tests/d3drm.c | 1452 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 1266 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59e41ab912cd1492131f5…

1 0