April 2018 - Wine-Devel - list.winehq.org

[PATCH] include: Add more DXGI swapchain flags
by Nikolay Sivov April 23, 2018

April 23, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dxgi.idl | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index 0626315b52..ba283bc6c0 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -109,9 +109,19 @@ typedef struct DXGI_ADAPTER_DESC { } DXGI_ADAPTER_DESC; typedef enum DXGI_SWAP_CHAIN_FLAG { - DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1, - DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2, - DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4 + DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1, + DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2, + DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4, + DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTEXT = 8, + DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER = 16, + DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY = 32, + DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT = 64, + DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER = 128, + DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO = 256, + DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO = 512, + DXGI_SWAP_CHAIN_FLAG_HW_PROTECTED = 1024, + DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING = 2048, + DXGI_SWAP_CHAIN_FLAG_RESTRICTED_TO_ALL_HOLOGRAPHIC_DISPLAYS = 4096, } DXGI_SWAP_CHAIN_FLAG; typedef struct DXGI_SWAP_CHAIN_DESC { -- 2.17.0

1 0

[v2 PATCH] wined3d: Add support for setting multiple scissor rectangles.
by Nikolay Sivov April 23, 2018

April 23, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 4 +-- dlls/d3d9/device.c | 2 +- dlls/wined3d/context.c | 4 +++ dlls/wined3d/cs.c | 34 +++++++++++++++--------- dlls/wined3d/device.c | 40 ++++++++++++++++++++-------- dlls/wined3d/state.c | 48 ++++++++++++++++++++++++++-------- dlls/wined3d/stateblock.c | 17 ++++++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 +++-- include/wine/wined3d.h | 3 ++- 10 files changed, 113 insertions(+), 47 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7377952036..a8251aad27 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -998,7 +998,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); wined3d_mutex_unlock(); } @@ -4192,7 +4192,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device1 *ifac return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); wined3d_mutex_unlock(); } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0a77b3e316..b73d974860 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2564,7 +2564,7 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - wined3d_device_set_scissor_rect(device->wined3d_device, rect); + wined3d_device_set_scissor_rects(device->wined3d_device, 1, rect); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d5378e203e..c9325add7b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2244,6 +2244,10 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (device->dummy_textures.tex_2d) context_bind_dummy_textures(device, ret); + /* Initialize all rectangles to avoid resetting unused ones later. */ + gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); + checkGLcall("glScissor"); + TRACE("Created context %p.\n", ret); return ret; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 221e51eb94..517b599790 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -34,7 +34,7 @@ enum wined3d_cs_op WINED3D_CS_OP_FLUSH, WINED3D_CS_OP_SET_PREDICATION, WINED3D_CS_OP_SET_VIEWPORTS, - WINED3D_CS_OP_SET_SCISSOR_RECT, + WINED3D_CS_OP_SET_SCISSOR_RECTS, WINED3D_CS_OP_SET_RENDERTARGET_VIEW, WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW, WINED3D_CS_OP_SET_VERTEX_DECLARATION, @@ -145,10 +145,11 @@ struct wined3d_cs_set_viewports struct wined3d_viewport viewports[1]; }; -struct wined3d_cs_set_scissor_rect +struct wined3d_cs_set_scissor_rects { enum wined3d_cs_op opcode; - RECT rect; + unsigned int rect_count; + RECT rects[1]; }; struct wined3d_cs_set_rendertarget_view @@ -545,7 +546,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) - IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rect); + IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rects[0]); op->color = *color; op->depth = depth; op->stencil = stencil; @@ -989,21 +990,28 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_ cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_scissor_rects(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_scissor_rect *op = data; + const struct wined3d_cs_set_scissor_rects *op = data; - cs->state.scissor_rect = op->rect; + if (op->rect_count) + memcpy(cs->state.scissor_rects, op->rects, op->rect_count * sizeof(*op->rects)); + else + SetRectEmpty(cs->state.scissor_rects); + cs->state.scissor_rect_count = op->rect_count; device_invalidate_state(cs->device, STATE_SCISSORRECT); } -void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) +void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) { - struct wined3d_cs_set_scissor_rect *op; + struct wined3d_cs_set_scissor_rects *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; - op->rect = *rect; + op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]), + WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS; + if (rect_count) + memcpy(op->rects, rects, rect_count * sizeof(*rects)); + op->rect_count = rect_count; cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -2411,7 +2419,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_FLUSH */ wined3d_cs_exec_flush, /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, /* WINED3D_CS_OP_SET_VIEWPORTS */ wined3d_cs_exec_set_viewports, - /* WINED3D_CS_OP_SET_SCISSOR_RECT */ wined3d_cs_exec_set_scissor_rect, + /* WINED3D_CS_OP_SET_SCISSOR_RECTS */ wined3d_cs_exec_set_scissor_rects, /* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */ wined3d_cs_exec_set_rendertarget_view, /* WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW */ wined3d_cs_exec_set_depth_stencil_view, /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8d4f4cde0e..6352b3cc79 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -414,6 +414,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c draw_rect->right - draw_rect->left, draw_rect->bottom - draw_rect->top); } checkGLcall("glScissor"); + context->scissor_rect_count = WINED3D_MAX_VIEWPORTS; gl_info->gl_ops.gl.p_glClear(clear_mask); checkGLcall("glClear"); } @@ -451,6 +452,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c current_rect.right - current_rect.left, current_rect.bottom - current_rect.top); } checkGLcall("glScissor"); + context->scissor_rect_count = WINED3D_MAX_VIEWPORTS; gl_info->gl_ops.gl.p_glClear(clear_mask); checkGLcall("glClear"); @@ -2123,19 +2125,33 @@ DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device return device->state.sampler_states[sampler_idx][state]; } -void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) +void CDECL wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, + const RECT *rects) { - TRACE("device %p, rect %s.\n", device, wine_dbgstr_rect(rect)); + unsigned int i; + + TRACE("device %p, rect_count %u, rects %p.\n", device, rect_count, rects); + + for (i = 0; i < rect_count; ++i) + { + TRACE("%u: %s\n", i, wine_dbgstr_rect(&rects[i])); + } if (device->recording) device->recording->changed.scissorRect = TRUE; - if (EqualRect(&device->update_state->scissor_rect, rect)) + if (device->update_state->scissor_rect_count == rect_count + && !memcmp(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects))) { - TRACE("App is setting the old scissor rectangle over, nothing to do.\n"); + TRACE("App is setting the old scissor rectangles over, nothing to do.\n"); return; } - CopyRect(&device->update_state->scissor_rect, rect); + + if (rect_count) + memcpy(device->update_state->scissor_rects, rects, rect_count * sizeof(*rects)); + else + memset(device->update_state->scissor_rects, 0, sizeof(device->update_state->scissor_rects)); + device->update_state->scissor_rect_count = rect_count; if (device->recording) { @@ -2143,14 +2159,14 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const return; } - wined3d_cs_emit_set_scissor_rect(device->cs, rect); + wined3d_cs_emit_set_scissor_rects(device->cs, rect_count, rects); } void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) { TRACE("device %p, rect %p.\n", device, rect); - *rect = device->state.scissor_rect; + *rect = device->state.scissor_rects[0]; TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); } @@ -4476,8 +4492,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - SetRect(&state->scissor_rect, 0, 0, view->width, view->height); - wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); + SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); + state->scissor_rect_count = 1; + wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } prev = device->fb.render_targets[view_idx]; @@ -4986,8 +5003,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state->viewport_count = 1; wined3d_cs_emit_set_viewports(device->cs, 1, state->viewports); - SetRect(&state->scissor_rect, 0, 0, view->width, view->height); - wined3d_cs_emit_set_scissor_rect(device->cs, &state->scissor_rect); + SetRect(&state->scissor_rects[0], 0, 0, view->width, view->height); + state->scissor_rect_count = 1; + wined3d_cs_emit_set_scissor_rects(device->cs, 1, state->scissor_rects); } if (device->d3d_initialized) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3563b4b0fd..c869b63b11 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4252,27 +4252,53 @@ static void light(struct wined3d_context *context, const struct wined3d_state *s static void scissorrect(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - const RECT *r = &state->scissor_rect; + unsigned int height = 0; + const RECT *r; /* Warning: glScissor uses window coordinates, not viewport coordinates, * so our viewport correction does not apply. Warning2: Even in windowed * mode the coords are relative to the window, not the screen. */ - TRACE("Setting new scissor rect to %s.\n", wine_dbgstr_rect(r)); - if (context->render_offscreen) - { - gl_info->gl_ops.gl.p_glScissor(r->left, r->top, r->right - r->left, r->bottom - r->top); - } - else + if (!context->render_offscreen) { const struct wined3d_rendertarget_view *target = state->fb->render_targets[0]; - UINT height; - UINT width; + unsigned int width; wined3d_rendertarget_view_get_drawable_size(target, context, &width, &height); - gl_info->gl_ops.gl.p_glScissor(r->left, height - r->bottom, r->right - r->left, r->bottom - r->top); } - checkGLcall("glScissor"); + + if (gl_info->supported[ARB_VIEWPORT_ARRAY]) + { + GLint sr[4 * WINED3D_MAX_VIEWPORTS]; + unsigned int i, reset_count = 0; + + for (i = 0; i < state->scissor_rect_count; ++i) + { + r = &state->scissor_rects[i]; + + sr[i * 4] = r->left; + sr[i * 4 + 1] = height ? height - r->top : r->top; + sr[i * 4 + 2] = r->right - r->left; + sr[i * 4 + 3] = r->bottom - r->top; + } + + if (context->scissor_rect_count > state->scissor_rect_count) + reset_count = context->scissor_rect_count - state->scissor_rect_count; + + if (reset_count) + memset(&sr[state->scissor_rect_count * 4], 0, reset_count * 4 * sizeof(GLint)); + + GL_EXTCALL(glScissorArrayv(0, state->scissor_rect_count + reset_count, sr)); + checkGLcall("glScissorArrayv"); + context->scissor_rect_count = state->scissor_rect_count; + } + else + { + r = &state->scissor_rects[0]; + gl_info->gl_ops.gl.p_glScissor(r->left, height ? height - r->top : r->top, + r->right - r->left, r->bottom - r->top); + checkGLcall("glScissor"); + } } static void indexbuffer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4ad0331f94..b4d17517b4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -825,12 +825,18 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) memset(stateblock->state.viewports, 0, sizeof(*stateblock->state.viewports)); } - if (stateblock->changed.scissorRect && memcmp(&src_state->scissor_rect, - &stateblock->state.scissor_rect, sizeof(stateblock->state.scissor_rect))) + if (stateblock->changed.scissorRect + && (src_state->scissor_rect_count != stateblock->state.scissor_rect_count + || memcmp(src_state->scissor_rects, stateblock->state.scissor_rects, + src_state->scissor_rect_count * sizeof(*stateblock->state.scissor_rects)))) { - TRACE("Updating scissor rect.\n"); + TRACE("Updating scissor rects.\n"); - stateblock->state.scissor_rect = src_state->scissor_rect; + if ((stateblock->state.scissor_rect_count = src_state->scissor_rect_count)) + memcpy(stateblock->state.scissor_rects, src_state->scissor_rects, + src_state->scissor_rect_count * sizeof(*src_state->scissor_rects)); + else + SetRectEmpty(stateblock->state.scissor_rects); } map = stateblock->changed.streamSource; @@ -1065,7 +1071,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); if (stateblock->changed.scissorRect) - wined3d_device_set_scissor_rect(device, &stateblock->state.scissor_rect); + wined3d_device_set_scissor_rects(device, stateblock->state.scissor_rect_count, + stateblock->state.scissor_rects); map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1b59178296..21b2414bbe 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -176,7 +176,7 @@ @ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) @ cdecl wined3d_device_set_sampler_state(ptr long long long) -@ cdecl wined3d_device_set_scissor_rect(ptr ptr) +@ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) @ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8cdc3ef6f9..e9e3f86b91 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1995,6 +1995,7 @@ struct wined3d_context GLuint dummy_arbfp_prog; unsigned int viewport_count; + unsigned int scissor_rect_count; }; struct wined3d_fb_state @@ -2863,7 +2864,8 @@ struct wined3d_state struct wined3d_material material; struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; unsigned int viewport_count; - RECT scissor_rect; + RECT scissor_rects[WINED3D_MAX_VIEWPORTS]; + unsigned int scissor_rect_count; /* Light hashmap. Collisions are handled using linked lists. */ #define LIGHTMAP_SIZE 43 @@ -3599,7 +3601,7 @@ void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type UINT sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_count, const RECT *rects) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ccda987405..6223706f57 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2426,7 +2426,8 @@ HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *devi unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport); void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); -void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); +void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, + unsigned int rect_count, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset); -- 2.17.0

1 0

[PATCH] uxtheme/tests: Remove some trace messages.
by Nikolay Sivov April 23, 2018

April 23, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 6989f4435b..c71eaa2cb4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -77,7 +77,6 @@ static void test_GetWindowTheme(void) { HTHEME hTheme; HWND hWnd; - BOOL bDestroyed; SetLastError(0xdeadbeef); hTheme = GetWindowTheme(NULL); @@ -89,7 +88,7 @@ static void test_GetWindowTheme(void) /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); - if (!hWnd) return; + ok(hWnd != NULL, "Failed to create a test window.\n"); SetLastError(0xdeadbeef); hTheme = GetWindowTheme(hWnd); @@ -98,17 +97,13 @@ static void test_GetWindowTheme(void) "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_SetWindowTheme(void) { HRESULT hRes; HWND hWnd; - BOOL bDestroyed; hRes = SetWindowTheme(NULL, NULL, NULL); todo_wine @@ -116,15 +111,12 @@ todo_wine /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); - if (!hWnd) return; + ok(hWnd != NULL, "Failed to create a test window.\n"); hRes = SetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_OpenThemeData(void) @@ -133,7 +125,6 @@ static void test_OpenThemeData(void) HWND hWnd; BOOL bThemeActive; HRESULT hRes; - BOOL bDestroyed; BOOL bTPDefined; WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; @@ -274,10 +265,7 @@ static void test_OpenThemeData(void) GetLastError()); } - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_OpenThemeDataEx(void) @@ -285,7 +273,6 @@ static void test_OpenThemeDataEx(void) HTHEME hTheme; HWND hWnd; BOOL bThemeActive; - BOOL bDestroyed; WCHAR szInvalidClassList[] = {'D','E','A','D','B','E','E','F', 0 }; WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; @@ -419,10 +406,7 @@ static void test_OpenThemeDataEx(void) "Expected ERROR_SUCCESS, got 0x%08x\n", GetLastError()); - bDestroyed = DestroyWindow(hWnd); - if (!bDestroyed) - trace("Window %p couldn't be destroyed : 0x%08x\n", - hWnd, GetLastError()); + DestroyWindow(hWnd); } static void test_GetCurrentThemeName(void) -- 2.17.0

1 0

[PATCH 2/2] hnetcfg/tests: Add INetFwAuthorizedApplication tests
by Alistair Leslie-Hughes April 23, 2018

April 23, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/tests/Makefile.in | 2 +- dlls/hnetcfg/tests/policy.c | 49 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/tests/Makefile.in b/dlls/hnetcfg/tests/Makefile.in index aa4062a..8315b4b 100644 --- a/dlls/hnetcfg/tests/Makefile.in +++ b/dlls/hnetcfg/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = hnetcfg.dll -IMPORTS = ole32 uuid +IMPORTS = ole32 uuid oleaut32 advapi32 C_SRCS = \ policy.c diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 7b5bef0..4d70818 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -102,6 +102,53 @@ static void test_interfaces(void) INetFwMgr_Release(manager); } +static void test_NetFwAuthorizedApplication(void) +{ + INetFwAuthorizedApplication *app; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwAuthorizedApplication, (void**)&app); + ok(hr == S_OK, "got: %08x\n", hr); + if(hr == S_OK) + { + BSTR image = SysAllocStringLen( NULL, MAX_PATH ); + static WCHAR empty[] = {0}; + BSTR bstr; + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + ok(0, "Failed to get filename\n"); + SysFreeString( image ); + return; + } + + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, NULL); + ok(hr == E_POINTER, "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY), "got: %08x\n", hr); + ok(!bstr, "got: %s\n", wine_dbgstr_w(bstr)); + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, NULL); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, empty); + ok(hr == E_INVALIDARG || hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName(app, image); + ok(hr == S_OK, "got: %08x\n", hr); + + hr = INetFwAuthorizedApplication_get_ProcessImageFileName(app, &bstr); + ok(hr == S_OK, "got: %08x\n", hr); + ok(!lstrcmpW(bstr,image), "got: %s\n", wine_dbgstr_w(bstr)); + SysFreeString( bstr ); + + SysFreeString( image ); + INetFwAuthorizedApplication_Release(app); + } +} + START_TEST(policy) { INetFwMgr *manager; @@ -121,7 +168,7 @@ START_TEST(policy) INetFwMgr_Release(manager); test_interfaces(); - + test_NetFwAuthorizedApplication(); CoUninitialize(); } -- 1.9.1

1 0

[PATCH 1/2] hnetcfg: Improve INetFwAuthorizedApplication::get_ProcessImageFileName stub.
by Alistair Leslie-Hughes April 23, 2018

April 23, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/hnetcfg/apps.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 2b8d78c..fda714e 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -38,6 +38,7 @@ typedef struct fw_app { INetFwAuthorizedApplication INetFwAuthorizedApplication_iface; LONG refs; + BSTR filename; } fw_app; static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) @@ -60,6 +61,7 @@ static ULONG WINAPI fw_app_Release( if (!refs) { TRACE("destroying %p\n", fw_app); + SysFreeString( fw_app->filename ); HeapFree( GetProcessHeap(), 0, fw_app ); } return refs; @@ -252,7 +254,12 @@ static HRESULT WINAPI fw_app_get_ProcessImageFileName( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %p\n", This, imageFileName); - return E_NOTIMPL; + + if (!imageFileName) + return E_POINTER; + + *imageFileName = SysAllocString( This->filename ); + return *imageFileName || !This->filename ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI fw_app_put_ProcessImageFileName( @@ -262,7 +269,13 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %s\n", This, debugstr_w(imageFileName)); - return S_OK; + + if (!imageFileName || !imageFileName[0]) + return E_INVALIDARG; + + SysFreeString( This->filename ); + This->filename = SysAllocString( imageFileName ); + return This->filename ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI fw_app_get_IpVersion( @@ -385,6 +398,7 @@ HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; fa->refs = 1; + fa->filename = NULL; *ppObj = &fa->INetFwAuthorizedApplication_iface; -- 1.9.1

1 0

[PATCH] makedep: Remove an incorrect -b when creating cross import libraries
by Martin Storsjo April 22, 2018

April 22, 2018

When building import libraries for cross building, we already pass "-b $crosstarget" (two lines above this), and we shouldn't be passing target_flags (which contains the flags for the architecture of the wine build itself, not the mingw cross build. This seems like a regression since 1c31b75e. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/makedep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index c9ab24d..4fc8435 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3480,7 +3480,6 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output( "\t%s -b %s -w -o $@", tools_path( make, "winebuild" ), crosstarget ); output_filename( "--implib" ); - output_filenames( target_flags ); output_filename( "--export" ); output_filename( spec_file ); output( "\n" ); -- 2.7.4

1 0

[PATCH] wineconsole: When loading settings for an application, respect a 0 in FontSize
by Fabian Maurer April 22, 2018

April 22, 2018

Fixes bug 44976. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- programs/wineconsole/registry.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index 080431a5ff..92c53a7ca4 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -126,8 +126,17 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) count = sizeof(val); if (!RegQueryValueExW(hConKey, wszFontSize, 0, &type, (LPBYTE)&val, &count)) { - cfg->cell_height = HIWORD(val); - cfg->cell_width = LOWORD(val); + int height = HIWORD(val); + int width = LOWORD(val); + /* A value of zero reflects the default settings */ + if (height != 0) + { + cfg->cell_height = height; + } + if (width != 0) + { + cfg->cell_width = width; + } } count = sizeof(val); -- 2.17.0

1 0

[PATCH] ntdll: PartlyimplementRtlDosPathNameToRelativeNtPathName_U_WithStatus
by Stefan Leichter April 22, 2018

April 22, 2018

Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 6 ++++++ dlls/ntdll/path.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+)

1 0

[PATCH] testbot: Check $Item->{IsNew} before $Item->{IsModified}.
by Francois Gouget April 21, 2018

April 21, 2018

After creating a new item one normally modifies a number of fields. So check whether the item is new before assuming we simply need to update it just because IsModified is true. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 40bfe85f7..ec1b45037 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -515,26 +515,18 @@ sub SaveItem($$) { my ($self, $Item) = @_; - my $Query; - my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); - if ($Item->GetIsModified()) - { - $Query = $self->BuildUpdateStatement($Item->GetTableName(), - $Item->GetPropertyDescriptors(), - $MasterColNames); - } - elsif ($Item->GetIsNew()) + if ($Item->GetIsNew()) { die "Internal error: Need to save new items via collection"; } - else - { - return; - } + if (!$Item->GetIsModified()); + my ($MasterColNames, $MasterColValues) = $Item->GetMasterCols(); + my $Query = $self->BuildUpdateStatement($Item->GetTableName(), + $Item->GetPropertyDescriptors(), + $MasterColNames); my $Statement = $self->GetDb()->prepare($Query); $Statement->execute(@{$self->GetUpdateData($MasterColValues, $Item)}); - $Statement->finish(); } -- 2.17.0

1 0

[PATCH] testbot: Import Utils in Log for DurationToString().
by Francois Gouget April 21, 2018

April 21, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Log.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 36efb48a2..2876b99cd 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -109,7 +109,8 @@ sub Elapsed($) sub PrettyElapsed($) { my ($Start) = @_; - return DurationToString(Time()-$Start); + require WineTestBot::Utils; + return WineTestBot::Utils::DurationToString(Time()-$Start); } 1; -- 2.17.0

1 0

[PATCH] Revert "testbot/web: Tweak ItemPage to save the Item directly."
by Francois Gouget April 21, 2018

April 21, 2018

Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the registration web page depends on that so we have no choice but to go through the collection. This reverts commit c18379abe004411ca779d4c42e26d7e7f3d72ba6. --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index c208aea31..9b9f2ff7e 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -134,16 +134,6 @@ sub SaveProperty($$$) return 1; } -sub Save($) -{ - my ($self) = @_; - - return !1 if (!$self->SaveProperties()); - - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); - return ! defined($self->{ErrMessage}); -} - sub OnAction($$) { my ($self, $Action) = @_; -- 2.17.0

1 0

[PATCH v2] shell32: handle writing an iconresource entry in SHGetSetFolderCustomSettings
by Louis Lenders April 21, 2018

April 21, 2018

v2: -fixed a misleading comment - only print fixme when needed This fixes bug https://bugs.winehq.org/show_bug.cgi?id=44959 I also tried to write a test, that test passes on the 32-bit testbots, but somehow the last test fails on 64-bit testbots and i don`t know why. Test is at https://testbot.winehq.org/GetFile.pl?JobKey=37794&StepKey=1 Also win2003 testbot gives strange errors in a test above this one that i don`t get. See for example https://testbot.winehq.org/JobDetails.pl?Key=37794. So this goes without submitted test for now Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/shlfolder.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 9143f1e..c94c90e 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -607,12 +607,38 @@ HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT ci /*********************************************************************** * SHGetSetFolderCustomSettings * - * Only Unicode above Server 2003 + * Only Unicode above Server 2003, writes/reads from a desktop.ini */ HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWSTR path, DWORD flag ) { - FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); - return E_NOTIMPL; + static const WCHAR iconresourceW[] = {'I','c','o','n','R','e','s','o','u','r','c','e',0}; + static const WCHAR desktop_iniW[] = {'D','e','s','k','t','o','p','.','i','n','i',0}; + WCHAR bufferW[MAX_PATH]= {0}; + HRESULT hr; + + hr = E_FAIL; + + if (flag & FCS_FORCEWRITE) + { + if (fcs->dwMask & FCSM_ICONFILE) + { + lstrcpyW(bufferW, path); + PathAddBackslashW(bufferW); + lstrcatW(bufferW, desktop_iniW); + + if (WritePrivateProfileStringW(wszDotShellClassInfo, iconresourceW, fcs->pszIconFile, bufferW)) + { + TRACE("Wrote an iconresource entry %s into %s\n", debugstr_w(fcs->pszIconFile), debugstr_w(bufferW)); + hr = S_OK; + } + else + ERR("Failed to write (to) Desktop.ini file\n"); + } + } + else + FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); + + return hr; } /*********************************************************************** -- 2.7.4

3 3

[PATCH] d3d10: Implement D3D10CompileEffectFromMemory().
by Valentin Gabriel Mitrea April 21, 2018

April 21, 2018

As MSDN documentation recommends, one should use D3DCompile() instead of D3D10CompileEffectFromMemory(). So, execution was forwarded to that function. This implementation is a possible fix for this bug: https://bugs.winehq.org/show_bug.cgi?id=36538 At the moment, there are no d3d10 tests written for shader and effect compilation functions. Signed-off-by: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> --- dlls/d3d10/d3d10_main.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index f2fbb41..0081e8f 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -253,17 +253,14 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," - " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); - if (effect) - *effect = NULL; - if (errors) - *errors = NULL; - - return E_NOTIMPL; + /* Forward to d3dcompiler */ + return D3DCompile(data, data_size, filename, defines, include, + NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, -- 2.7.4

3 2

[PATCH 2/2] jscript: Remove unused prop_put arguments.
by Jacek Caban April 20, 2018

April 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] jscript: Remove unused prop_get arguments.
by Jacek Caban April 20, 2018

April 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)

1 0

[PATCH] wineandroid: Allow an initial prefix to be shipped
by André Hentschel April 20, 2018

April 20, 2018

Useful to ship winestart.cmd and more (e.g. Hangover) Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wineandroid.drv/WineActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 3345e18..992dd9b 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -165,6 +165,7 @@ private void createProgressDialog( final int max, final String message ) private final boolean isFileWanted( String name ) { if (name.equals( "files.sum" )) return true; + if (name.startsWith( "prefix/" )) return true; if (name.startsWith( "share/" )) return true; if (name.startsWith( Build.CPU_ABI + "/system/" )) return false; if (name.startsWith( Build.CPU_ABI + "/" )) return true; -- 2.7.4

2 2

Re: [PATCH v2] Calc: Add a simple implementation.
by Alexandre Julliard April 20, 2018

April 20, 2018

Hua Meng <161220092(a)smail.nju.edu.cn> writes: > + /* create Buttons */ > + for(i = 0; i < ButtonNum; i++) > + { > + x = 15 + (i % 3) * 70; > + y = 120 + (i / 3) * 90; > + nWidth = 70; > + nHeight = 90; > + > + /* set token buttons */ > + if(i >= 12) > + { > + nHeight = 72; > + x = 225; > + y = 120 + (i % 12) * 72; > + } You can't hardcode values like this, it should depend on the font size. It would be a lot easier to start from a dialog template instead of creating everything by hand. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] mshtml: Make set_frame_doc() static.
by Francois Gouget April 20, 2018

April 20, 2018

It is only used in one C file now. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/mshtml_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index e4a7a612c20..17a78e55a5f 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -39,7 +39,7 @@ static const WCHAR yesW[] = {'y','e','s',0}; static const WCHAR noW[] = {'n','o',0}; static const WCHAR pxW[] = {'p','x',0}; -HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) +static HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) { mozIDOMWindowProxy *mozwindow; HTMLOuterWindow *window; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ff52dae5721..0a4dfba93dc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -922,8 +922,6 @@ void init_node_cc(void) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; - void call_property_onchanged(ConnectionPointContainer*,DISPID) DECLSPEC_HIDDEN; HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*) DECLSPEC_HIDDEN; -- 2.17.0

2 1

[PATCH] msvcp140: Add _Task_impl_base::_IsNonBlockingThread stub
by Piotr Caban April 20, 2018

April 20, 2018

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 8 ++++++++ dlls/msvcp90/misc.c | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH] d3d11.idl: Fixed a typo in CD3D11_BLEND_DESC constructor.
by Jacek Caban April 20, 2018

April 20, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/d3d11.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 1/5] d3drm: Add viewport to the device before setting viewport parameters.
by Matteo Bruni April 20, 2018

April 20, 2018

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3drm/viewport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 37c70c8db20..5c0e24bc429 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -339,6 +339,9 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 if (FAILED(hr = IDirect3D_CreateViewport(d3d1, &viewport->d3d_viewport, NULL))) goto cleanup; + if (FAILED(hr = IDirect3DDevice_AddViewport(d3d_device, viewport->d3d_viewport))) + goto cleanup; + vp.dwSize = sizeof(vp); vp.dwWidth = width; vp.dwHeight = height; @@ -355,9 +358,6 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 if (FAILED(hr = IDirect3DViewport_SetViewport(viewport->d3d_viewport, &vp))) goto cleanup; - if (FAILED(hr = IDirect3DDevice_AddViewport(d3d_device, viewport->d3d_viewport))) - goto cleanup; - if (FAILED(hr = IDirect3DRMFrame3_QueryInterface(camera, &IID_IDirect3DRMFrame, (void **)&viewport->camera))) goto cleanup; -- 2.13.6

3 9

[PATCH 1/6] msi: Make MsiViewClose() RPC-compatible.
by Zebediah Figura April 20, 2018

April 20, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/msiquery.c | 16 ++++++++++++++-- dlls/msi/tests/custom.c | 3 +++ dlls/msi/winemsi.idl | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 6eddf7a..682881e 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -440,8 +440,15 @@ UINT WINAPI MsiViewClose(MSIHANDLE hView) TRACE("%d\n", hView ); query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); - if( !query ) - return ERROR_INVALID_HANDLE; + if (!query) + { + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hView))) + return ERROR_INVALID_HANDLE; + + return remote_ViewClose(remote); + } ret = MSI_ViewClose( query ); msiobj_release( &query->hdr ); @@ -1055,6 +1062,11 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( return r; } +UINT __cdecl remote_ViewClose(MSIHANDLE view) +{ + return MsiViewClose(view); +} + UINT __cdecl remote_ViewExecute(MSIHANDLE view, struct wire_record *remote_rec) { MSIHANDLE rec = 0; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 479cb93..3d7ebb9 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -316,6 +316,9 @@ static void test_db(MSIHANDLE hinst) ok(hinst, r == ERROR_NO_MORE_ITEMS, "got %u\n", r); ok(hinst, !rec2, "got %u\n", rec2); + r = MsiViewClose(view); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(view); ok(hinst, !r, "got %u\n", r); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index b892f34..74b5923 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -56,6 +56,7 @@ struct wire_record { ] interface IWineMsiRemote { + UINT remote_ViewClose( [in] MSIHANDLE view ); UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); UINT remote_ViewFetch( [in] MSIHANDLE view, [out] struct wire_record **record ); -- 2.7.4

3 16

[PATCH 9/9] mstask: Implement IPersistFile::Save().
by Dmitry Timoshkov April 20, 2018

April 20, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 279 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 19bd919ec1..d64860a817 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -31,6 +31,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +typedef struct +{ + USHORT product_version; + USHORT file_version; + UUID uuid; + USHORT name_size_offset; + USHORT trigger_offset; + USHORT error_retry_count; + USHORT error_retry_interval; + USHORT idle_deadline; + USHORT idle_wait; + UINT priority; + UINT maximum_runtime; + UINT exit_code; + HRESULT status; + UINT flags; + SYSTEMTIME last_runtime; +} FIXDLEN_DATA; + typedef struct { ITask ITask_iface; @@ -731,17 +750,270 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_IPersistFile_Save( - IPersistFile* iface, - LPCOLESTR pszFileName, - BOOL fRemember) +static BOOL write_signature(HANDLE hfile) { - FIXME("(%p, %p, %d): stub\n", iface, pszFileName, fRemember); - WARN("Returning S_OK but not writing to disk: %s %d\n", - debugstr_w(pszFileName), fRemember); + struct + { + USHORT SignatureVersion; + USHORT ClientVersion; + BYTE md5[64]; + } signature; + DWORD size; + + signature.SignatureVersion = 0x0001; + signature.ClientVersion = 0x0001; + memset(&signature.md5, 0, sizeof(signature.md5)); + + return WriteFile(hfile, &signature, sizeof(signature), &size, NULL); +} + +static BOOL write_reserved_data(HANDLE hfile) +{ + static const struct + { + USHORT size; + BYTE data[8]; + } user = { 8, { 0xff,0x0f,0x1d,0,0,0,0,0 } }; + DWORD size; + + return WriteFile(hfile, &user, sizeof(user), &size, NULL); +} + +static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size) +{ + DWORD size; + + if (!WriteFile(hfile, &data_size, sizeof(data_size), &size, NULL)) + return FALSE; + + if (!data_size) return TRUE; + + return WriteFile(hfile, data, data_size, &size, NULL); +} + +static HRESULT write_triggers(ITask *task, HANDLE hfile) +{ + WORD count, i; + DWORD size; + HRESULT hr; + + hr = ITask_GetTriggerCount(task, &count); + if (hr != S_OK) return hr; + + if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) + return HRESULT_FROM_WIN32(GetLastError()); + + for (i = 0; i < count; i++) + { + ITaskTrigger *trigger; + TASK_TRIGGER task_trigger; + + hr = ITask_GetTrigger(task, i, &trigger); + if (hr != S_OK) return hr; + + hr = ITaskTrigger_GetTrigger(trigger, &task_trigger); + ITaskTrigger_Release(trigger); + if (hr != S_OK) return hr; + + if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL)) + return HRESULT_FROM_WIN32(GetLastError()); + } + return S_OK; } +static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str) +{ + USHORT count; + DWORD size; + + count = str ? (lstrlenW(str) + 1) : 0; + if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) + return FALSE; + + if (!str) return TRUE; + + count *= sizeof(WCHAR); + return WriteFile(hfile, str, count, &size, NULL); +} + +static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR name, BOOL remember) +{ + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; + static WCHAR authorW[] = { 'W','i','n','e',0 }; + static WCHAR commentW[] = { 'C','r','e','a','t','e','d',' ','b','y',' ','W','i','n','e',0 }; + FIXDLEN_DATA fixed; + WORD word, user_data_size = 0; + HANDLE hfile; + DWORD size, ver, disposition; + TaskImpl *This = impl_from_IPersistFile(iface); + ITask *task = &This->ITask_iface; + LPWSTR appname = NULL, params = NULL, workdir = NULL, creator = NULL, comment = NULL; + BYTE *user_data = NULL; + WCHAR task_name[MAX_PATH]; + HRESULT hr; + + TRACE("(%p, %s, %d)\n", iface, debugstr_w(name), remember); + + disposition = name ? CREATE_NEW : OPEN_ALWAYS; + + if (!name) + { + name = This->task_name; + remember = FALSE; + } + else if (strchrW(name, '.')) + return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); + + ITask_GetComment(task, &comment); + if (!comment) comment = commentW; + ITask_GetCreator(task, &creator); + if (!creator) creator = authorW; + ITask_GetApplicationName(task, &appname); + ITask_GetParameters(task, &params); + ITask_GetWorkingDirectory(task, &workdir); + ITask_GetWorkItemData(task, &user_data_size, &user_data); + + ver = GetVersion(); + fixed.product_version = MAKEWORD(ver >> 8, ver); + fixed.file_version = 0x0001; + CoCreateGuid(&fixed.uuid); + fixed.name_size_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ + fixed.trigger_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ + fixed.trigger_offset += sizeof(USHORT); /* Application Name */ + if (appname) + fixed.trigger_offset += (lstrlenW(appname) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Parameters */ + if (params) + fixed.trigger_offset += (lstrlenW(params) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Working Directory */ + if (workdir) + fixed.trigger_offset += (lstrlenW(workdir) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Author */ + if (creator) + fixed.trigger_offset += (lstrlenW(creator) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Comment */ + if (comment) + fixed.trigger_offset += (lstrlenW(comment) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT) + user_data_size; /* User Data */ + fixed.trigger_offset += 10; /* Reserved Data */ + + fixed.error_retry_count = 0; + fixed.error_retry_interval = 0; + fixed.idle_wait = This->idle_minutes; + fixed.idle_deadline = This->deadline_minutes; + fixed.priority = This->priority; + fixed.maximum_runtime = This->maxRunTime; + fixed.exit_code = 0; + fixed.status = SCHED_S_TASK_HAS_NOT_RUN; + fixed.flags = 0; + memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); + + hfile = CreateFileW(task_name, GENERIC_WRITE, 0, NULL, disposition, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Instance Count */ + word = 0; + if (!WriteFile(hfile, &word, sizeof(word), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Application Name */ + if (!write_unicode_string(hfile, appname)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Parameters */ + if (!write_unicode_string(hfile, params)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Working Directory */ + if (!write_unicode_string(hfile, workdir)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Author */ + if (!write_unicode_string(hfile, creator)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Comment */ + if (!write_unicode_string(hfile, comment)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* User Data */ + if (!write_user_data(hfile, user_data, user_data_size)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Reserved Data */ + if (!write_reserved_data(hfile)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Trigegrs */ + if (!write_triggers(hfile, task)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Signature */ + if (!write_signature(hfile)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + hr = S_OK; + +failed: + CoTaskMemFree(appname); + CoTaskMemFree(params); + CoTaskMemFree(workdir); + if (creator != authorW) + CoTaskMemFree(creator); + if (comment != commentW) + CoTaskMemFree(comment); + CoTaskMemFree(user_data); + + CloseHandle(hfile); + if (hr != S_OK) + DeleteFileW(name); + else if (remember) + { + HeapFree(GetProcessHeap(), 0, This->task_name); + This->task_name = heap_strdupW(name); + } + return hr; +} + static HRESULT WINAPI MSTASK_IPersistFile_SaveCompleted( IPersistFile* iface, LPCOLESTR pszFileName) @@ -758,7 +1030,6 @@ static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile( return E_NOTIMPL; } - static const ITaskVtbl MSTASK_ITaskVtbl = { MSTASK_ITask_QueryInterface, -- 2.16.3

2 3

[PATCH 8/9] mstask: Implement better stub for ITask::GetMostRecentRunTime().
by Dmitry Timoshkov April 20, 2018

April 20, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index ed0ef65625..19bd919ec1 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -225,12 +225,12 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime( - ITask* iface, - SYSTEMTIME *pstLastRun) +static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime(ITask *iface, SYSTEMTIME *st) { - FIXME("(%p, %p): stub\n", iface, pstLastRun); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, st); + + memset(st, 0, sizeof(*st)); + return SCHED_S_TASK_HAS_NOT_RUN; } static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6184604467..6e3c997c10 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -503,6 +503,7 @@ static void test_task_state(void) HRESULT hr, status; DWORD flags, val; WORD val1, val2; + SYSTEMTIME st; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -573,6 +574,19 @@ static void test_task_state(void) ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); ok(val == 0, "got %#x\n", val); + if (0) /* crashes under Windows */ + hr = ITask_GetMostRecentRunTime(test_task, NULL); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetMostRecentRunTime(test_task, &st); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); + ok(st.wYear == 0, "got %u\n", st.wYear); + ok(st.wMonth == 0, "got %u\n", st.wMonth); + ok(st.wDay == 0, "got %u\n", st.wDay); + ok(st.wHour == 0, "got %u\n", st.wHour); + ok(st.wMinute == 0, "got %u\n", st.wMinute); + ok(st.wSecond == 0, "got %u\n", st.wSecond); + cleanup_task(); } -- 2.16.3

1 0

[PATCH 7/9] mstask: Implement better stub for ITask::GetExitCode().
by Dmitry Timoshkov April 20, 2018

April 20, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task.c | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 27f476699b..ed0ef65625 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -243,12 +243,12 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) return S_OK; } -static HRESULT WINAPI MSTASK_ITask_GetExitCode( - ITask* iface, - DWORD *pdwExitCode) +static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) { - FIXME("(%p, %p): stub\n", iface, pdwExitCode); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, exit_code); + + *exit_code = 0; + return SCHED_S_TASK_HAS_NOT_RUN; } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 5952b53692..6184604467 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -565,6 +565,14 @@ static void test_task_state(void) ok(hr == S_OK, "got %#x\n", hr); ok(val == NORMAL_PRIORITY_CLASS, "got %#x\n", val); + if (0) /* crashes under Windows */ + hr = ITask_GetExitCode(test_task, NULL); + + val = 0xdeadbeef; + hr = ITask_GetExitCode(test_task, &val); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); + ok(val == 0, "got %#x\n", val); + cleanup_task(); } -- 2.16.3

1 0