May 2016 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Clean up VS-PS interface matching in GLSL.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: 2c90b9aee068c74546139ce728c837cc5ebc5d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c90b9aee068c74546139ce72… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:53 2016 +0200 wined3d: Clean up VS-PS interface matching in GLSL. It makes easier to add similar handling for GS inputs and outputs. Functionally this should be a NOP. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 138 ++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c90b9aee068c74546139…

1 0

Henri Verbeet : wined3d: Use debug_color() in wined3d_format_convert_from_float().
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: a911bff8fda1b9d1d2f576823de74c7e6adae5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a911bff8fda1b9d1d2f576823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:11 2016 +0200 wined3d: Use debug_color() in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8769bd7..34d4626 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4594,8 +4594,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con }; unsigned int i; - TRACE("Converting color {%.8e %.8e %.8e %.8e} to format %s.\n", - color->r, color->g, color->b, color->a, debug_d3dformat(format->id)); + TRACE("Converting color %s to format %s.\n", debug_color(color), debug_d3dformat(format->id)); for (i = 0; i < sizeof(conv) / sizeof(*conv); ++i) {

1 0

Alexandre Julliard : user32: Completely free owned DCEs when the corresponding window/ class is destroyed.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: d341b0c3815a1b8872c8354dd0811e05a1ce7152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d341b0c3815a1b8872c8354dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:54:40 2016 +0900 user32: Completely free owned DCEs when the corresponding window/class is destroyed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 1 - dlls/user32/painting.c | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c9b7b31..a4088fd 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -812,7 +812,6 @@ static void test_DeleteDC(void) ok(ret, "UnregisterClassA failed\n"); ret = GetObjectType(hdc_test); -todo_wine ok(!ret, "GetObjectType should fail for a deleted DC\n"); /* CS_OWNDC */ diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index c0c92d8..ba1967c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -338,16 +338,17 @@ static struct dce *get_window_dce( HWND hwnd ) */ void free_dce( struct dce *dce, HWND hwnd ) { + struct dce *dce_to_free = NULL; + USER_Lock(); if (dce) { if (!--dce->count) { - /* turn it into a cache entry */ - SetHookFlags( dce->hdc, DCHF_RESETDC ); release_dce( dce ); - dce->flags |= DCX_CACHE; + list_remove( &dce->entry ); + dce_to_free = dce; } else if (dce->hwnd == hwnd) { @@ -362,7 +363,7 @@ void free_dce( struct dce *dce, HWND hwnd ) LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { if (dce->hwnd != hwnd) continue; - if (!(dce->flags & DCX_CACHE)) continue; + if (!(dce->flags & DCX_CACHE)) break; if (dce->count) WARN( "GetDC() without ReleaseDC() for window %p\n", hwnd ); dce->count = 0; @@ -371,6 +372,13 @@ void free_dce( struct dce *dce, HWND hwnd ) } USER_Unlock(); + + if (dce_to_free) + { + SetDCHook( dce_to_free->hdc, NULL, 0 ); + DeleteDC( dce_to_free->hdc ); + HeapFree( GetProcessHeap(), 0, dce_to_free ); + } }

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: 9511d09852d2a0187c34017889b1882f88e42d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9511d09852d2a0187c3401788… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:40 2016 +0530 d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/tests/d3drm.c | 123 ++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/texture.c | 40 +++++++++++++-- 3 files changed, 143 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9511d09852d2a0187c340…

1 0

Matteo Bruni : wined3d: Get rid of the "reorder shaders" for SM4+.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: 0f062f510829ef39b90a7e33464cc924dc9873f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f062f510829ef39b90a7e334… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:55 2016 +0200 wined3d: Get rid of the "reorder shaders" for SM4+. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 149 +++++++++++++++++++++++++---------------- dlls/wined3d/shader.c | 9 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 103 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f062f510829ef39b90a7…

1 0

Matteo Bruni : wined3d: Alpha test emulation for core profile contexts.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: f5aee34d98a73f0e3d683b0ec5d767202e16d14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5aee34d98a73f0e3d683b0ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:52 2016 +0200 wined3d: Alpha test emulation for core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 103 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader.c | 9 +++- dlls/wined3d/utils.c | 7 +++ dlls/wined3d/wined3d_private.h | 37 +++++++++------ 4 files changed, 123 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5aee34d98a73f0e3d683…

1 0

Józef Kucia : wined3d: Match position output register by sysval semantic value.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: e36a7e5da441be201ceb3b576999198998ad5b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36a7e5da441be201ceb3b576… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:30 2016 +0200 wined3d: Match position output register by sysval semantic value. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c345d67..8c22468 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5053,7 +5053,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (args->vp_mode == vertexshader) { - if (input->sysval_semantic == WINED3D_SV_POSITION) + if (input->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) @@ -5392,7 +5392,7 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, semantic_idx = output->semantic_idx; shader_glsl_write_mask_to_str(output->mask, reg_mask); - if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_POSITION) && !semantic_idx) + if (output->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) { shader_addline(buffer, "gl_Position%s = vs_out[%u]%s;\n", reg_mask, output->register_idx, reg_mask); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 01c5d50..bcaee1c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -256,7 +256,7 @@ static void shader_dump_src_param(struct wined3d_string_buffer *buffer, const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) { - if (handler_idx >= sizeof(shader_opcode_names) / sizeof(*shader_opcode_names)) + if (handler_idx >= ARRAY_SIZE(shader_opcode_names)) return wine_dbg_sprintf("UNRECOGNIZED(%#x)", handler_idx); return shader_opcode_names[handler_idx]; @@ -264,7 +264,7 @@ const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HA static const char *shader_semantic_name_from_usage(enum wined3d_decl_usage usage) { - if (usage >= sizeof(semantic_names) / sizeof(*semantic_names)) + if (usage >= ARRAY_SIZE(semantic_names)) { FIXME("Unrecognized usage %#x.\n", usage); return "UNRECOGNIZED"; @@ -277,14 +277,26 @@ static enum wined3d_decl_usage shader_usage_from_semantic_name(const char *name) { unsigned int i; - for (i = 0; i < sizeof(semantic_names) / sizeof(*semantic_names); ++i) + for (i = 0; i < ARRAY_SIZE(semantic_names); ++i) { - if (!strcmp(name, semantic_names[i])) return i; + if (!strcmp(name, semantic_names[i])) + return i; } return ~0U; } +static enum wined3d_sysval_semantic shader_sysval_semantic_from_usage(enum wined3d_decl_usage usage) +{ + switch (usage) + { + case WINED3D_DECL_USAGE_POSITION: + return WINED3D_SV_POSITION; + default: + return 0; + } +} + BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) { return !strcmp(semantic_name, shader_semantic_name_from_usage(usage)); @@ -295,7 +307,7 @@ static void shader_signature_from_semantic(struct wined3d_shader_signature_eleme { e->semantic_name = shader_semantic_name_from_usage(s->usage); e->semantic_idx = s->usage_idx; - e->sysval_semantic = 0; + e->sysval_semantic = shader_sysval_semantic_from_usage(s->usage); e->component_type = 0; e->register_idx = s->reg.reg.idx[0].offset; e->mask = s->reg.write_mask; @@ -306,7 +318,7 @@ static void shader_signature_from_usage(struct wined3d_shader_signature_element { e->semantic_name = shader_semantic_name_from_usage(usage); e->semantic_idx = usage_idx; - e->sysval_semantic = 0; + e->sysval_semantic = shader_sysval_semantic_from_usage(usage); e->component_type = 0; e->register_idx = reg_idx; e->mask = write_mask;

1 0

Józef Kucia : d3d10core/tests: Add create_buffer() helper.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 9eef3c90ca7bcee7ef2cdb4ae80a7f1e8616b6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eef3c90ca7bcee7ef2cdb4ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 20 11:47:29 2016 +0200 d3d10core/tests: Add create_buffer() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 252 ++++++++---------------------------------- 1 file changed, 48 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9eef3c90ca7bcee7ef2cd…

1 0

Vincent Povirk : user32: Don't regard the clipboard as changed if we don' t own it.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: b68e03f9c936708c9757e2e7c2be5011b50fe070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68e03f9c936708c9757e2e7c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 18 14:23:47 2016 -0500 user32: Don't regard the clipboard as changed if we don't own it. I ran into a situation where user32 will call EndClipboardUpdate even though the clipboard hasn't changed. It went something like this: * Program A acquires the clipboard and adds some delay-rendered data. * Program B requests data from the clipboard, causing program A to receive WM_RENDERFORMAT. * Program A calls SetClipboardData to fulfill the request, setting bCBHasChanged to TRUE. * Program C acquires the clipboard. * Program A opens the clipboard to enumerate the formats. When it closes the clipboard, EndClipboardUpdate is called. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index dec738a..4764784 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -178,6 +178,7 @@ INT WINAPI GetClipboardFormatNameA(UINT wFormat, LPSTR retStr, INT maxlen) BOOL WINAPI OpenClipboard( HWND hWnd ) { BOOL bRet; + UINT flags; TRACE("(%p)...\n", hWnd); @@ -185,10 +186,16 @@ BOOL WINAPI OpenClipboard( HWND hWnd ) { req->flags = SET_CB_OPEN; req->clipboard = wine_server_user_handle( hWnd ); - bRet = !wine_server_call( req ); + if ((bRet = !wine_server_call( req ))) + flags = reply->flags; } SERVER_END_REQ; + if (bRet && !(flags & CB_PROCESS)) + { + bCBHasChanged = FALSE; + } + TRACE(" returning %i\n", bRet); return bRet; @@ -201,6 +208,7 @@ BOOL WINAPI OpenClipboard( HWND hWnd ) BOOL WINAPI CloseClipboard(void) { HWND viewer = 0; + UINT flags; BOOL ret; TRACE("() Changed=%d\n", bCBHasChanged); @@ -210,18 +218,21 @@ BOOL WINAPI CloseClipboard(void) req->flags = SET_CB_CLOSE; if (bCBHasChanged) req->flags |= SET_CB_SEQNO; if ((ret = !wine_server_call_err( req ))) + { viewer = wine_server_ptr_handle( reply->old_viewer ); + flags = reply->flags; + } } SERVER_END_REQ; if (!ret) return FALSE; - if (bCBHasChanged) + if (bCBHasChanged && (flags & CB_PROCESS)) { USER_Driver->pEndClipboardUpdate(); - bCBHasChanged = FALSE; if (viewer) SendNotifyMessageW(viewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); } + bCBHasChanged = FALSE; return TRUE; }

1 0

Sebastian Lackner : wininet: Initialize user_len before GetUserNameW call.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: ff1fb7f51cc5555d0a30c0131a012d730600ecba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1fb7f51cc5555d0a30c0131… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu May 19 21:25:04 2016 +0200 wininet: Initialize user_len before GetUserNameW call. Fixes a regression introduced by 441347f084963ef9f9ae721e5731284443c40656. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 8e9ebfb..34c6c0b 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -151,6 +151,7 @@ static WCHAR *create_cookie_url(substr_t domain, substr_t path, substr_t *ret_pa static const WCHAR cookie_prefix[] = {'C','o','o','k','i','e',':'}; + user_len = sizeof(user)/sizeof(WCHAR); if(!GetUserNameW(user, &user_len)) return FALSE; user_len--;

1 0