May 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Introduce a stubbed SM4 shader frontend.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: ef074cdde13a1c467e22188dc33b1a517973679d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef074cdde13a1c467e22188dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Introduce a stubbed SM4 shader frontend. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/baseshader.c | 8 ++++ dlls/wined3d/shader_sm4.c | 72 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index c35e8b5..2fcb4ec 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -26,6 +26,7 @@ C_SRCS = \ query.c \ resource.c \ shader_sm1.c \ + shader_sm4.c \ state.c \ stateblock.c \ surface_base.c \ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e3f6311..9c466fc 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -121,6 +121,9 @@ static const char *shader_opcode_names[] = #define WINED3D_SM1_VS 0xfffe #define WINED3D_SM1_PS 0xffff +#define WINED3D_SM4_PS 0x0000 +#define WINED3D_SM4_VS 0x0001 +#define WINED3D_SM4_GS 0x0002 const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token) { @@ -130,6 +133,11 @@ const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token case WINED3D_SM1_PS: return &sm1_shader_frontend; + case WINED3D_SM4_PS: + case WINED3D_SM4_VS: + case WINED3D_SM4_GS: + return &sm4_shader_frontend; + default: FIXME("Unrecognised version token %#x\n", version_token); return NULL; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c new file mode 100644 index 0000000..ba66123 --- /dev/null +++ b/dlls/wined3d/shader_sm4.c @@ -0,0 +1,72 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); + +static void shader_sm4_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, + UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) +{ + FIXME("ptr %p, ins %p, param_size %p, opcode_table %p, shader_version %#x stub!\n", + ptr, ins, param_size, opcode_table, shader_version); +} + +static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param, + struct wined3d_shader_src_param *src_rel_addr, DWORD shader_version) +{ + FIXME("ptr %p, src_param %p, src_rel_addr %p, shader_version %#x stub!\n", + ptr, src_param, src_rel_addr, shader_version); +} + +static void shader_sm4_read_dst_param(const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, + struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version) +{ + FIXME("ptr %p, dst_param %p, dst_rel_addr %p, shader_version %#x stub!\n", + ptr, dst_param, dst_rel_addr, shader_version); +} + +static void shader_sm4_read_semantic(const DWORD **ptr, struct wined3d_shader_semantic *semantic) +{ + FIXME("ptr %p, semantic %p stub!\n", ptr, semantic); +} + +static void shader_sm4_read_comment(const DWORD **ptr, const char **comment) +{ + FIXME("ptr %p, comment %p stub!\n", ptr, comment); + *comment = NULL; +} + +static BOOL shader_sm4_is_end(const DWORD **ptr) +{ + FIXME("ptr %p stub!\n", ptr); + return TRUE; +} + +const struct wined3d_shader_frontend sm4_shader_frontend = +{ + shader_sm4_read_opcode, + shader_sm4_read_src_param, + shader_sm4_read_dst_param, + shader_sm4_read_semantic, + shader_sm4_read_comment, + shader_sm4_is_end, +}; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 09d8f9d..c08e4d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -686,6 +686,7 @@ struct wined3d_shader_frontend }; extern const struct wined3d_shader_frontend sm1_shader_frontend; +extern const struct wined3d_shader_frontend sm4_shader_frontend; typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *);

1 0

Henri Verbeet : wined3d: Handle reading the shader header in the frontend.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 868f5bfc7c21431fff41c0b4c1dc4d03f56e0109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868f5bfc7c21431fff41c0b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Handle reading the shader header in the frontend. In SM 1-3 this is just the version, in SM4 this also includes the token count. --- dlls/wined3d/baseshader.c | 26 ++++++-------------------- dlls/wined3d/shader_sm1.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9c466fc..75cf2d5 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -342,13 +342,8 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 shader_delete_constant_list(&This->baseShader.constantsB); shader_delete_constant_list(&This->baseShader.constantsI); - /* The version token is supposed to be the first token */ - if (!shader_is_version_token(*pToken)) - { - FIXME("First token is not a version token, invalid shader.\n"); - return WINED3DERR_INVALIDCALL; - } - reg_maps->shader_version = shader_version = *pToken++; + fe->shader_read_header(&pToken, &shader_version); + reg_maps->shader_version = shader_version; pshader = shader_is_pshader_version(shader_version); while (!fe->shader_is_end(&pToken)) @@ -868,7 +863,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ const SHADER_OPCODE *opcode_table = This->baseShader.shader_ins; const SHADER_HANDLER *handler_table = device->shader_backend->shader_instruction_handler_table; - DWORD shader_version = reg_maps->shader_version; struct wined3d_shader_src_param src_rel_addr[4]; struct wined3d_shader_src_param src_param[4]; struct wined3d_shader_src_param dst_rel_addr; @@ -877,6 +871,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, struct wined3d_shader_context ctx; const DWORD *pToken = pFunction; SHADER_HANDLER hw_fct; + DWORD shader_version; DWORD i; /* Initialize current parsing state */ @@ -889,11 +884,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, ins.src = src_param; This->baseShader.parse_state.current_row = 0; - if (!shader_is_version_token(*pToken++)) - { - ERR("First token is not a version token, invalid shader.\n"); - return; - } + fe->shader_read_header(&pToken, &shader_version); while (!fe->shader_is_end(&pToken)) { @@ -995,13 +986,8 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, TRACE("Parsing %p\n", pFunction); - /* The version token is supposed to be the first token */ - if (!shader_is_version_token(*pToken)) - { - FIXME("First token is not a version token, invalid shader.\n"); - return; - } - shader_version = *pToken++; + fe->shader_read_header(&pToken, &shader_version); + TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version) ? "ps": "vs", WINED3DSHADER_VERSION_MAJOR(shader_version), WINED3DSHADER_VERSION_MINOR(shader_version)); diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 225f632..7e2484d 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -221,6 +221,12 @@ static int shader_skip_unrecognized(const DWORD *ptr, DWORD shader_version) return tokens_read; } +static void shader_sm1_read_header(const DWORD **ptr, DWORD *shader_version) +{ + TRACE("version: 0x%08x\n", **ptr); + *shader_version = *(*ptr)++; +} + static void shader_sm1_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { @@ -318,6 +324,7 @@ static BOOL shader_sm1_is_end(const DWORD **ptr) const struct wined3d_shader_frontend sm1_shader_frontend = { + shader_sm1_read_header, shader_sm1_read_opcode, shader_sm1_read_src_param, shader_sm1_read_dst_param, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ba66123..c2d7729 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -23,6 +23,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) +{ + TRACE("version: 0x%08x\n", **ptr); + *shader_version = *(*ptr)++; + TRACE("token count: %u\n", **ptr); + ++(*ptr); +} + static void shader_sm4_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { @@ -63,6 +71,7 @@ static BOOL shader_sm4_is_end(const DWORD **ptr) const struct wined3d_shader_frontend sm4_shader_frontend = { + shader_sm4_read_header, shader_sm4_read_opcode, shader_sm4_read_src_param, shader_sm4_read_dst_param, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c08e4d7..db691d9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -674,6 +674,7 @@ struct wined3d_shader_semantic struct wined3d_shader_frontend { + void (*shader_read_header)(const DWORD **ptr, DWORD *shader_version); void (*shader_read_opcode)(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version); void (*shader_read_src_param)(const DWORD **ptr, struct wined3d_shader_src_param *src_param,

1 0

Henri Verbeet : wined3d: Add a minimal implementation of shader_sm4_read_opcode().
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 15a2a5eea690b18fe223d47691c2dc3d0b3684c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a2a5eea690b18fe223d4769… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Add a minimal implementation of shader_sm4_read_opcode(). --- dlls/wined3d/shader_sm4.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c2d7729..66fa960 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +#define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 +#define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0xf << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) + +#define WINED3D_SM4_OPCODE_MASK 0xff + static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) { TRACE("version: 0x%08x\n", **ptr); @@ -34,8 +39,18 @@ static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) static void shader_sm4_read_opcode(const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, const SHADER_OPCODE *opcode_table, DWORD shader_version) { - FIXME("ptr %p, ins %p, param_size %p, opcode_table %p, shader_version %#x stub!\n", - ptr, ins, param_size, opcode_table, shader_version); + DWORD token = *(*ptr)++; + DWORD opcode = token & WINED3D_SM4_OPCODE_MASK; + + FIXME("Unrecognized opcode %#x, token 0x%08x\n", opcode, token); + + ins->handler_idx = WINED3DSIH_TABLE_SIZE; + ins->flags = 0; + ins->coissue = 0; + ins->predicate = 0; + ins->dst_count = 0; + ins->src_count = 0; + *param_size = ((token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; } static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param,

1 0

Henri Verbeet : wined3d: Store the SM 1-3 opcode information tables in the SM 1-3 frontend.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 2a5a6a34390e255740828b7cb5147728ef13022d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5a6a34390e255740828b7cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Store the SM 1-3 opcode information tables in the SM 1-3 frontend. --- dlls/wined3d/arb_program_shader.c | 8 +- dlls/wined3d/baseshader.c | 36 +++--- dlls/wined3d/device.c | 4 +- dlls/wined3d/glsl_shader.c | 8 +- dlls/wined3d/pixelshader.c | 106 ++--------------- dlls/wined3d/shader_sm1.c | 234 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/shader_sm4.c | 28 ++++- dlls/wined3d/vertexshader.c | 87 ++------------ dlls/wined3d/wined3d_private.h | 44 +++---- 9 files changed, 314 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a5a6a34390e255740828…

1 0

Henri Verbeet : wined3d: Implement shader_sm4_is_end().
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 454dd2ed07453e6af23fe1e81ec5276839d86371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=454dd2ed07453e6af23fe1e81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 5 09:38:03 2009 +0200 wined3d: Implement shader_sm4_is_end(). --- dlls/wined3d/baseshader.c | 12 ++++++------ dlls/wined3d/shader_sm1.c | 4 ++-- dlls/wined3d/shader_sm4.c | 15 +++++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index b8918be..4c2905a 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -334,11 +334,11 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 shader_delete_constant_list(&This->baseShader.constantsB); shader_delete_constant_list(&This->baseShader.constantsI); - fe->shader_read_header(&pToken, &shader_version); + fe->shader_read_header(fe_data, &pToken, &shader_version); reg_maps->shader_version = shader_version; pshader = shader_is_pshader_version(shader_version); - while (!fe->shader_is_end(&pToken)) + while (!fe->shader_is_end(fe_data, &pToken)) { struct wined3d_shader_instruction ins; const char *comment; @@ -876,9 +876,9 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, ins.src = src_param; This->baseShader.parse_state.current_row = 0; - fe->shader_read_header(&pToken, &shader_version); + fe->shader_read_header(fe_data, &pToken, &shader_version); - while (!fe->shader_is_end(&pToken)) + while (!fe->shader_is_end(fe_data, &pToken)) { const char *comment; UINT param_size; @@ -977,12 +977,12 @@ void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, TRACE("Parsing %p\n", pFunction); - fe->shader_read_header(&pToken, &shader_version); + fe->shader_read_header(fe_data, &pToken, &shader_version); TRACE("%s_%u_%u\n", shader_is_pshader_version(shader_version) ? "ps": "vs", WINED3DSHADER_VERSION_MAJOR(shader_version), WINED3DSHADER_VERSION_MINOR(shader_version)); - while (!fe->shader_is_end(&pToken)) + while (!fe->shader_is_end(fe_data, &pToken)) { struct wined3d_shader_instruction ins; const char *comment; diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 3d678d7..a353f48 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -434,7 +434,7 @@ static void shader_sm1_free(void *data) HeapFree(GetProcessHeap(), 0, data); } -static void shader_sm1_read_header(const DWORD **ptr, DWORD *shader_version) +static void shader_sm1_read_header(void *data, const DWORD **ptr, DWORD *shader_version) { TRACE("version: 0x%08x\n", **ptr); *shader_version = *(*ptr)++; @@ -525,7 +525,7 @@ static void shader_sm1_read_comment(const DWORD **ptr, const char **comment) *ptr += (token & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; } -static BOOL shader_sm1_is_end(const DWORD **ptr) +static BOOL shader_sm1_is_end(void *data, const DWORD **ptr) { if (**ptr == WINED3DSP_END) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 33b8f9d..99b6523 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); struct wined3d_sm4_data { - /* We don't store a lot in here yet. */ + const DWORD *end; }; static void *shader_sm4_init(const DWORD *byte_code) @@ -50,12 +50,15 @@ static void shader_sm4_free(void *data) HeapFree(GetProcessHeap(), 0, data); } -static void shader_sm4_read_header(const DWORD **ptr, DWORD *shader_version) +static void shader_sm4_read_header(void *data, const DWORD **ptr, DWORD *shader_version) { + struct wined3d_sm4_data *priv = data; + priv->end = *ptr; + TRACE("version: 0x%08x\n", **ptr); *shader_version = *(*ptr)++; TRACE("token count: %u\n", **ptr); - ++(*ptr); + priv->end += *(*ptr)++; } static void shader_sm4_read_opcode(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins, @@ -100,10 +103,10 @@ static void shader_sm4_read_comment(const DWORD **ptr, const char **comment) *comment = NULL; } -static BOOL shader_sm4_is_end(const DWORD **ptr) +static BOOL shader_sm4_is_end(void *data, const DWORD **ptr) { - FIXME("ptr %p stub!\n", ptr); - return TRUE; + struct wined3d_sm4_data *priv = data; + return *ptr == priv->end; } const struct wined3d_shader_frontend sm4_shader_frontend = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1bee62e..f1efce8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -672,7 +672,7 @@ struct wined3d_shader_frontend { void *(*shader_init)(const DWORD *ptr); void (*shader_free)(void *data); - void (*shader_read_header)(const DWORD **ptr, DWORD *shader_version); + void (*shader_read_header)(void *data, const DWORD **ptr, DWORD *shader_version); void (*shader_read_opcode)(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, DWORD shader_version); void (*shader_read_src_param)(const DWORD **ptr, struct wined3d_shader_src_param *src_param, @@ -681,7 +681,7 @@ struct wined3d_shader_frontend struct wined3d_shader_src_param *dst_rel_addr, DWORD shader_version); void (*shader_read_semantic)(const DWORD **ptr, struct wined3d_shader_semantic *semantic); void (*shader_read_comment)(const DWORD **ptr, const char **comment); - BOOL (*shader_is_end)(const DWORD **ptr); + BOOL (*shader_is_end)(void *data, const DWORD **ptr); }; extern const struct wined3d_shader_frontend sm1_shader_frontend;

1 0

Nikolay Sivov : comctl32/listview: Additional test for LVS_EX_HEADERDRAGDROP.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 59b08cc1e3e0d6d3810a50e9cfb5cb1f44bb4e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b08cc1e3e0d6d3810a50e9c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 03:12:12 2009 +0400 comctl32/listview: Additional test for LVS_EX_HEADERDRAGDROP. --- dlls/comctl32/tests/listview.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ee5eb7f..6b575dc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1020,6 +1020,7 @@ static void test_create(void) /* setting LVS_EX_HEADERDRAGDROP creates header */ hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(!IsWindow(hHeader), "Header shouldn't be created\n"); ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); @@ -1028,6 +1029,13 @@ static void test_create(void) ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + /* not report style accepts LVS_EX_HEADERDRAGDROP too */ + hList = create_custom_listview_control(0); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); + r = SendMessage(hList, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + ok(r & LVS_EX_HEADERDRAGDROP, "Expected LVS_EX_HEADERDRAGDROP to be set\n"); + DestroyWindow(hList); + /* requesting header info with LVM_GETSUBITEMRECT doesn't create it */ hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0);

1 0

Nikolay Sivov : comctl32/listview: Test WM_ERASEBKGND forwarding to parent on CL_NONE background.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 1fac98d3c1f28346f1e4c273c4dacfb12cca12d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fac98d3c1f28346f1e4c273c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 03:12:50 2009 +0400 comctl32/listview: Test WM_ERASEBKGND forwarding to parent on CL_NONE background. --- dlls/comctl32/tests/listview.c | 47 +++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6b575dc..42bb189 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -26,9 +26,10 @@ #include "wine/test.h" #include "msg.h" -#define PARENT_SEQ_INDEX 0 -#define LISTVIEW_SEQ_INDEX 1 -#define NUM_MSG_SEQUENCES 2 +#define PARENT_SEQ_INDEX 0 +#define PARENT_FULL_SEQ_INDEX 1 +#define LISTVIEW_SEQ_INDEX 2 +#define NUM_MSG_SEQUENCES 3 #define LISTVIEW_ID 0 #define HEADER_ID 1 @@ -162,6 +163,11 @@ static const struct message empty_seq[] = { { 0 } }; +static const struct message forward_erasebkgnd_parent_seq[] = { + { WM_ERASEBKGND, sent }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -173,6 +179,12 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP LRESULT ret; struct message msg; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + /* log system messages, except for painting */ if (message < WM_USER && message != WM_PAINT && @@ -185,13 +197,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP { trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); - msg.message = message; - msg.flags = sent|wparam|lparam; - if (defwndproc_counter) msg.flags |= defwinproc; - msg.wParam = wParam; - msg.lParam = lParam; add_message(sequences, PARENT_SEQ_INDEX, &msg); } + add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); @@ -1058,6 +1066,8 @@ static void test_create(void) static void test_redraw(void) { HWND hwnd, hwndheader; + HDC hdc; + BOOL res; hwnd = create_listview_control(0); hwndheader = subclass_header(hwnd); @@ -1071,6 +1081,27 @@ static void test_redraw(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* forward WM_ERASEBKGND to parent on CLR_NONE background color */ + res = ListView_SetBkColor(hwnd, CLR_NONE); + expect(TRUE, res); + + hdc = GetWindowDC(hwndparent); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, forward_erasebkgnd_parent_seq, + "forward WM_ERASEBKGND on CLR_NONE", TRUE); + + res = ListView_SetBkColor(hwnd, CLR_DEFAULT); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, empty_seq, + "don't forward WM_ERASEBKGND on non-CLR_NONE", FALSE); + + ReleaseDC(hwndparent, hdc); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Forward WM_ERASEBKGND to parent on CLR_NONE.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 50c3b530f7e167cfe31579a5213ede6677bff110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c3b530f7e167cfe31579a52… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 03:14:44 2009 +0400 comctl32/listview: Forward WM_ERASEBKGND to parent on CLR_NONE. --- dlls/comctl32/listview.c | 5 +++-- dlls/comctl32/tests/listview.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 75556e6..0f163ef 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -36,8 +36,6 @@ * -- EN_KILLFOCUS should be handled in WM_COMMAND * -- WM_CREATE: create the icon and small icon image lists at this point only if * the LVS_SHAREIMAGELISTS style is not specified. - * -- WM_ERASEBKGND: forward this message to the parent window if the bkgnd - * color is CLR_NONE. * -- WM_WINDOWPOSCHANGED: arrange the list items if the current view is icon * or small icon and the LVS_AUTOARRANGE style is specified. * -- WM_TIMER @@ -8290,6 +8288,9 @@ static inline BOOL LISTVIEW_EraseBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc) if (!GetClipBox(hdc, &rc)) return FALSE; + if (infoPtr->clrBk == CLR_NONE) + return SendMessageW(infoPtr->hwndNotify, WM_ERASEBKGND, (WPARAM)hdc, 0); + /* for double buffered controls we need to do this during refresh */ if (infoPtr->dwLvExStyle & LVS_EX_DOUBLEBUFFER) return FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 42bb189..b6cbd47 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1068,6 +1068,7 @@ static void test_redraw(void) HWND hwnd, hwndheader; HDC hdc; BOOL res; + DWORD r; hwnd = create_listview_control(0); hwndheader = subclass_header(hwnd); @@ -1082,21 +1083,45 @@ static void test_redraw(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* forward WM_ERASEBKGND to parent on CLR_NONE background color */ + /* 1. Without backbuffer */ res = ListView_SetBkColor(hwnd, CLR_NONE); expect(TRUE, res); hdc = GetWindowDC(hwndparent); flush_sequences(sequences, NUM_MSG_SEQUENCES); - SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok(r != 0, "Expected not zero result\n"); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, forward_erasebkgnd_parent_seq, + "forward WM_ERASEBKGND on CLR_NONE", FALSE); + + res = ListView_SetBkColor(hwnd, CLR_DEFAULT); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok(r != 0, "Expected not zero result\n"); + ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, empty_seq, + "don't forward WM_ERASEBKGND on non-CLR_NONE", FALSE); + + /* 2. With backbuffer */ + SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_DOUBLEBUFFER, + LVS_EX_DOUBLEBUFFER); + res = ListView_SetBkColor(hwnd, CLR_NONE); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + ok(r != 0, "Expected not zero result\n"); ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, forward_erasebkgnd_parent_seq, - "forward WM_ERASEBKGND on CLR_NONE", TRUE); + "forward WM_ERASEBKGND on CLR_NONE", FALSE); res = ListView_SetBkColor(hwnd, CLR_DEFAULT); expect(TRUE, res); flush_sequences(sequences, NUM_MSG_SEQUENCES); - SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + r = SendMessageA(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + todo_wine ok(r != 0, "Expected not zero result\n"); ok_sequence(sequences, PARENT_FULL_SEQ_INDEX, empty_seq, "don't forward WM_ERASEBKGND on non-CLR_NONE", FALSE);

1 0

Rein Klazes : user32: Combine horizontal and vertical window scroll bar info in a single structure .
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 1b1e0027db96374cc55e4f5de9128246fc9e9704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1e0027db96374cc55e4f5de… Author: Rein Klazes <wijn(a)online.nl> Date: Sun May 3 19:39:30 2009 +0200 user32: Combine horizontal and vertical window scroll bar info in a single structure. --- dlls/user32/defwnd.c | 5 +-- dlls/user32/scroll.c | 44 ++++++++++++++++++++++++--------- dlls/user32/tests/scroll.c | 57 ++++++++++++++++++++++++++++++++++++------- dlls/user32/win.c | 3 +- dlls/user32/win.h | 3 +- 5 files changed, 83 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1e0027db96374cc55e4…

1 0

Nikolay Sivov : gdi32: Check header pointer in CreateDIBitmap.
by Alexandre Julliard 04 May '09

04 May '09

Module: wine Branch: master Commit: 0f9bc1d3b7d3529a8162eb8ef5537d314d691121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9bc1d3b7d3529a8162eb8ef… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 3 12:42:00 2009 +0400 gdi32: Check header pointer in CreateDIBitmap. --- dlls/gdi32/dib.c | 2 ++ dlls/gdi32/tests/bitmap.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 0dceaa8..086eaae 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1097,6 +1097,8 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, DWORD compr, size; DC *dc; + if (!header) return 0; + if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &size ) == -1) return 0; if (width < 0) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index bfbeee0..a0d4531 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -144,7 +144,12 @@ static void test_createdibitmap(void) bmih.biPlanes = 1; bmih.biBitCount = 32; bmih.biCompression = BI_RGB; - + + hbm = CreateDIBitmap(hdc, NULL, CBM_INIT, NULL, NULL, 0); + ok(hbm == NULL, "CreateDIBitmap should fail\n"); + hbm = CreateDIBitmap(hdc, NULL, 0, NULL, NULL, 0); + ok(hbm == NULL, "CreateDIBitmap should fail\n"); + /* First create an un-initialised bitmap. The depth of the bitmap should match that of the hdc and not that supplied in bmih. */

1 0