September 2012 - Wine-commits

Matteo Bruni : d3dcompiler: Support simple variable initializers.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 46e368934e5075c906e7eaea70739dd3fabc973b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e368934e5075c906e7eaea7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:14 2012 +0200 d3dcompiler: Support simple variable initializers. --- dlls/d3dcompiler_43/hlsl.y | 85 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 78 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e558f6f..e8f33af 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -256,6 +256,19 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } +static unsigned int initializer_size(struct list *initializer) +{ + unsigned int count = 0; + struct hlsl_ir_node *node; + + LIST_FOR_EACH_ENTRY(node, initializer, struct hlsl_ir_node, entry) + { + count += components_count_type(node->data_type); + } + TRACE("Initializer size = %u\n", count); + return count; +} + static unsigned int components_count_expr_list(struct list *list) { struct hlsl_ir_node *node; @@ -543,6 +556,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis %type <type> base_type %type <type> type %type <list> declaration_statement +%type <list> declaration %type <list> type_specs %type <variable_def> type_spec %type <list> complex_initializer @@ -857,8 +871,7 @@ base_type: KW_VOID declaration_statement: declaration { - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); + $$ = $1; } | typedef { @@ -902,19 +915,24 @@ type_spec: any_identifier array declaration: var_modifiers type variables_def ';' { + struct hlsl_type *type; struct parse_variable_def *v, *v_next; struct hlsl_ir_var *var; + struct hlsl_ir_node *assignment; BOOL ret, local = TRUE; + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $3, struct parse_variable_def, entry) { debug_dump_decl($2, $1, v->name, hlsl_ctx.line_no); var = d3dcompiler_alloc(sizeof(*var)); var->node.type = HLSL_IR_VAR; if (v->array_size) - var->node.data_type = new_array_type($2, v->array_size); + type = new_array_type($2, v->array_size); else - var->node.data_type = $2; + type = $2; + var->node.data_type = type; var->node.loc = v->loc; var->name = v->name; var->modifiers = $1; @@ -943,10 +961,63 @@ declaration: var_modifiers type variables_def ';' if (v->initializer) { - FIXME("Variable with an initializer.\n"); - free_instr_list(v->initializer); + unsigned int size = initializer_size(v->initializer); + struct hlsl_ir_node *node; + + TRACE("Variable with initializer\n"); + if (type->type <= HLSL_CLASS_LAST_NUMERIC + && type->dimx * type->dimy != size + && size != 1) + { + if (size < type->dimx * type->dimy) + { + hlsl_report_message(v->loc.file, + v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + } + + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && components_count_type(type) != size) + { + hlsl_report_message(v->loc.file, + v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + + if (type->type > HLSL_CLASS_LAST_NUMERIC) + { + FIXME("Initializers for non scalar/struct variables not supported yet\n"); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + if (v->array_size > 0) + { + FIXME("Initializing arrays is not supported yet\n"); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + + if (list_count(v->initializer) > 1) + { + FIXME("Complex initializers are not supported yet.\n"); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + node = LIST_ENTRY(list_head(v->initializer), struct hlsl_ir_node, entry); + assignment = make_assignment(&var->node, ASSIGN_OP_ASSIGN, + BWRITERSP_WRITEMASK_ALL, node); + list_add_tail($$, &assignment->entry); } - d3dcompiler_free(v); } d3dcompiler_free($3);

1 0

Matteo Bruni : d3dcompiler: Parse casts.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: ca701b7d69c97e667973449e22a8fb6d4c44790b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca701b7d69c97e667973449e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:15 2012 +0200 d3dcompiler: Parse casts. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 + dlls/d3dcompiler_43/hlsl.y | 29 ++++++++++++ dlls/d3dcompiler_43/utils.c | 68 +++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index b3a9586..22207c9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1080,8 +1080,11 @@ struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; +BOOL compatible_data_types(struct hlsl_type *s1, struct hlsl_type *s2) DECLSPEC_HIDDEN; struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_mul(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_div(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e8f33af..5670586 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1472,6 +1472,35 @@ unary_expr: postfix_expr $$ = &new_expr(ops[$1], operands, &loc)->node; } } + /* var_modifiers just to avoid shift/reduce conflicts */ + | '(' var_modifiers type array ')' unary_expr + { + struct hlsl_ir_expr *expr; + struct hlsl_type *src_type = $6->data_type; + struct hlsl_type *dst_type; + struct source_location loc; + + set_location(&loc, &@3); + if ($2) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "unexpected modifier in a cast"); + return 1; + } + + dst_type = $3; + + if (!compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "can't cast from %s to %s", + debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + return 1; + } + + expr = new_cast($6, dst_type, &loc); + $$ = expr ? &expr->node : NULL; + } unary_op: '+' { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 8aaa675..e0cac23 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1031,6 +1031,60 @@ static BOOL convertible_data_type(struct hlsl_type *type) return type->type != HLSL_CLASS_OBJECT; } +BOOL compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be cast to pretty much everything */ + if (t1->dimx == 1 && t1->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) + return t1->dimx >= t2->dimx; + } + + /* The other way around is true too i.e. whatever to scalar */ + if (t2->type <= HLSL_CLASS_LAST_NUMERIC && t2->dimx == 1 && t2->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_ARRAY) + { + if (compare_hlsl_types(t1->e.array.type, t2)) + /* e.g. float4[3] to float4 is allowed */ + return TRUE; + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + else + return components_count_type(t1) == components_count_type(t2); + } + + if (t1->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) == components_count_type(t2); + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (components_count_type(t1) >= components_count_type(t2)) + return TRUE; + return FALSE; +} + static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { if (!convertible_data_type(t1) || !convertible_data_type(t2)) @@ -1322,6 +1376,20 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope return expr; } +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) +{ + struct hlsl_ir_expr *cast; + struct hlsl_ir_node *operands[3]; + + operands[0] = node; + operands[1] = operands[2] = NULL; + cast = new_expr(HLSL_IR_UNOP_CAST, operands, loc); + if (cast) + cast->node.data_type = type; + return cast; +} + struct hlsl_ir_expr *hlsl_mul(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, struct source_location *loc) {

1 0

Henri Verbeet : d3d10core: Add a missing return to d3d10_device_CreateGeometryShader().
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 2f350a5a2d90f13596c3aafeff32e4f9fe43749c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f350a5a2d90f13596c3aafef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:19 2012 +0200 d3d10core: Add a missing return to d3d10_device_CreateGeometryShader(). --- dlls/d3d10core/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index b6c29f4..00a34a9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -947,6 +947,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device { WARN("Failed to initialize geometry shader, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + return hr; } TRACE("Created geometry shader %p.\n", object);

1 0

Henri Verbeet : d3d10: Get rid of the unused idx_offset field from struct d3d10_effect_object.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 5fe32c8bfd778e20daf055ace415929d94809df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe32c8bfd778e20daf055ace… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:20 2012 +0200 d3d10: Get rid of the unused idx_offset field from struct d3d10_effect_object. --- dlls/d3d10/d3d10_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 01068e0..51696ef 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -69,7 +69,6 @@ struct d3d10_effect_object { struct d3d10_effect_pass *pass; enum d3d10_effect_object_type type; - DWORD idx_offset; DWORD index; void *data; };

1 0

Henri Verbeet : wined3d: wined3d_device_set_scissor_rect() never fails.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 2de9fc640b17a8241b8d7ee2e2fd3b01daed7277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de9fc640b17a8241b8d7ee2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:21 2012 +0200 wined3d: wined3d_device_set_scissor_rect() never fails. --- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 8 +++----- include/wine/wined3d.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2662f4e..40bc169 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1865,15 +1865,14 @@ static HRESULT WINAPI d3d9_device_GetCurrentTexturePalette(IDirect3DDevice9Ex *i static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, const RECT *rect) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - hr = wined3d_device_set_scissor_rect(device->wined3d_device, rect); + wined3d_device_set_scissor_rect(device->wined3d_device, rect); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT *rect) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8439c13..6d85ff5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2382,7 +2382,7 @@ DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device return device->stateBlock->state.sampler_states[sampler_idx][state]; } -HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) +void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) { TRACE("device %p, rect %s.\n", device, wine_dbgstr_rect(rect)); @@ -2390,19 +2390,17 @@ HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, con if (EqualRect(&device->updateStateBlock->state.scissor_rect, rect)) { TRACE("App is setting the old scissor rectangle over, nothing to do.\n"); - return WINED3D_OK; + return; } CopyRect(&device->updateStateBlock->state.scissor_rect, rect); if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } device_invalidate_state(device, STATE_SCISSORRECT); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b44cc42..af88163 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2225,7 +2225,7 @@ HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport); void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); -HRESULT __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); +void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); HRESULT __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride);

1 0

Henri Verbeet : wined3d: wined3d_device_get_scissor_rect() never fails.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: de1ae1eb8a39b08944378bce89a567a34207776b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1ae1eb8a39b08944378bce8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:22 2012 +0200 wined3d: wined3d_device_get_scissor_rect() never fails. --- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 4 +--- include/wine/wined3d.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 40bc169..06988f7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1878,15 +1878,14 @@ static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, cons static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT *rect) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - hr = wined3d_device_get_scissor_rect(device->wined3d_device, rect); + wined3d_device_get_scissor_rect(device->wined3d_device, rect); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetSoftwareVertexProcessing(IDirect3DDevice9Ex *iface, BOOL software) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6d85ff5..9daeb60 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2403,14 +2403,12 @@ void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const device_invalidate_state(device, STATE_SCISSORRECT); } -HRESULT CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) +void CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) { TRACE("device %p, rect %p.\n", device, rect); *rect = device->updateStateBlock->state.scissor_rect; TRACE("Returning rect %s.\n", wine_dbgstr_rect(rect)); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index af88163..0d84adc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2147,7 +2147,7 @@ HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *de UINT render_target_idx, struct wined3d_surface **render_target); DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state); -HRESULT __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); +void __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride);

1 0

Henri Verbeet : wined3d: Merge the glsl_vshader_private and glsl_pshader_private structures.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 00cdf1aaf1cdd65673984c48198eb97284a95297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00cdf1aaf1cdd65673984c481… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:23 2012 +0200 wined3d: Merge the glsl_vshader_private and glsl_pshader_private structures. --- dlls/wined3d/glsl_shader.c | 155 ++++++++++++++++++++------------------------ 1 files changed, 70 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00cdf1aaf1cdd65673984…

1 0

Francois Gouget : msvcp71: Remove an unused debug channel.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 5e15a3031eedf994b6f8157f4b78a1078217ceca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e15a3031eedf994b6f8157f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:11:59 2012 +0200 msvcp71: Remove an unused debug channel. --- dlls/msvcp71/msvcp71.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c index 5bf76e4..cb36893 100644 --- a/dlls/msvcp71/msvcp71.c +++ b/dlls/msvcp71/msvcp71.c @@ -26,8 +26,6 @@ #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp); - #ifdef __i386__ #define DEFINE_VTBL_WRAPPER(off) \

1 0

Francois Gouget : kernel32/tests: Add more FormatMessage() line wrapping tests.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: a273cac7474a6da1eef199642e97dbbac2e5b0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a273cac7474a6da1eef199642… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:36:49 2012 +0200 kernel32/tests: Add more FormatMessage() line wrapping tests. --- dlls/kernel32/tests/format_msg.c | 73 +++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 50e13f4..cf711f6 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -1015,12 +1015,75 @@ static void test_message_wrap(void) todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); + /* Wrap the very last word */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 20, + "short long long line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 21, "Expected FormatMessageW to return 21, got %d\n", ret); + todo_wine ok(!strcmp("short long long\r\nline", out),"failed out=[%s]\n",out); + /* Strictly less than 10 characters per line! */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 10, "short long line", 0, 0, out, sizeof(out), NULL); todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); todo_wine ok(!strcmp("short\r\nlong line", out),"failed out=[%s]\n",out); + /* Handling of duplicate spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 16, + "short long line", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 16, + "short long wordlongerthanaline", 0, 0, out, sizeof(out), NULL); + ok(ret == 33, "Expected FormatMessageW to return 33, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\nwordlongerthanal\r\nine", out),"failed out=[%s]\n",out); + + /* Breaking in the middle of spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 12, + "short long line", 0, 0, out, sizeof(out), NULL); + ok(ret == 18, "Expected FormatMessageW to return 18, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\n line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 12, + "short long wordlongerthanaline", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 35, "Expected FormatMessageW to return 35, got %d\n", ret); + todo_wine ok(!strcmp("short long\r\n\r\nwordlongerth\r\nanaline", out),"failed out=[%s]\n",out); + + /* Handling of start-of-string spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 15, + " short line", 0, 0, out, sizeof(out), NULL); + ok(ret == 13, "Expected FormatMessageW to return 13, got %d\n", ret); + ok(!strcmp(" short line", out),"failed out=[%s]\n",out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + " shortlong line", 0, 0, out, sizeof(out), NULL); + ok(ret == 17, "Expected FormatMessageW to return 17, got %d\n", ret); + todo_wine ok(!strcmp("\r\nshortlong\r\nline", out),"failed out=[%s]\n",out); + + /* Handling of start-of-line spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, + "l1%n shortlong line", 0, 0, out, sizeof(out), NULL); + ok(ret == 21, "Expected FormatMessageW to return 21, got %d\n", ret); + todo_wine ok(!strcmp("l1\r\n\r\nshortlong\r\nline", out),"failed out=[%s]\n",out); + + /* Pure space wrapping */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 5, + " ", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 7, "Expected FormatMessageW to return 7, got %d\n", ret); + todo_wine ok(!strcmp("\r\n\r\n\r\n ", out),"failed out=[%s]\n",out); + + /* Handling of trailing spaces */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 5, + "l1 ", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 10, "Expected FormatMessageW to return 10, got %d\n", ret); + todo_wine ok(!strcmp("l1\r\n\r\n\r\n ", out),"failed out=[%s]\n",out); + + /* Word that just fills the line */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, + "shortlon", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 10, "Expected FormatMessageW to return 10, got %d\n", ret); + todo_wine ok(!strcmp("shortlon\r\n", out),"failed out=[%s]\n",out); + /* Word longer than the line */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, "shortlongline", 0, 0, out, sizeof(out), NULL); @@ -1039,11 +1102,11 @@ static void test_message_wrap(void) todo_wine ok(ret == 16, "Expected FormatMessageW to return 16, got %d\n", ret); todo_wine ok(!strcmp("short long\r\nline", out),"failed out=[%s]\n",out); - /* '%n's are converted into line feeds */ - ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 11, - "short%n%nlong line", 0, 0, out, sizeof(out), NULL); - ok(ret == 18, "Expected FormatMessageW to return 18, got %d\n", ret); - ok(!strcmp("short\r\n\r\nlong line", out),"failed out=[%s]\n",out); + /* Wrap even before a '%n' */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 8, + "shortlon%n", 0, 0, out, sizeof(out), NULL); + todo_wine ok(ret == 12, "Expected FormatMessageW to return 12, got %d\n", ret); + todo_wine ok(!strcmp("shortlon\r\n\r\n", out),"failed out=[%s]\n",out); /* '%n's count as starting a new line and combine with line wrapping */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | 10,

1 0

Francois Gouget : kernel32: Replace the format_message() helper macro with a static function.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: bca6e18d1ba4176c9e2d019a08549fc6e4da7ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca6e18d1ba4176c9e2d019a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:37:24 2012 +0200 kernel32: Replace the format_message() helper macro with a static function. --- dlls/kernel32/format_msg.c | 73 +++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index b9e471f..a3cbab9 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -261,30 +261,36 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, return format; } +struct _format_message_data +{ + LPWSTR formatted; + DWORD size; + LPWSTR t; +}; + +static void format_add_char(struct _format_message_data *fmd, WCHAR c) +{ + *fmd->t++ = c; + if ((DWORD)(fmd->t - fmd->formatted) == fmd->size) { + fmd->formatted = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, fmd->formatted, (fmd->size * 2) * sizeof(WCHAR)); + fmd->t = fmd->formatted + fmd->size; + fmd->size *= 2; + } +} + /********************************************************************** * format_message (internal) */ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr, struct format_args *format_args ) { - LPWSTR target,t; - DWORD talloced; + struct _format_message_data fmd; LPCWSTR f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; - WCHAR ch; - - target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); - talloced = 100; -#define ADD_TO_T(c) do {\ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ - t = target+talloced;\ - talloced*=2;\ - } \ -} while (0) + fmd.size = 100; + fmd.formatted = fmd.t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, fmd.size * sizeof(WCHAR) ); f = fmtstr; while (*f && !eos) { @@ -302,7 +308,7 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->list)) { SetLastError(ERROR_INVALID_PARAMETER); - HeapFree(GetProcessHeap(), 0, target); + HeapFree(GetProcessHeap(), 0, fmd.formatted); return NULL; } insertnr = *f-'0'; @@ -319,20 +325,20 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr break; } f = format_insert( unicode_caller, insertnr, f, dwFlags, format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); + for (x = str; *x; x++) format_add_char(&fmd, *x); HeapFree( GetProcessHeap(), 0, str ); break; case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); f++; break; case 'r': - ADD_TO_T('\r'); + format_add_char(&fmd, '\r'); f++; break; case 't': - ADD_TO_T('\t'); + format_add_char(&fmd, '\t'); f++; break; case '0': @@ -341,49 +347,48 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr break; case '\0': SetLastError(ERROR_INVALID_PARAMETER); - HeapFree(GetProcessHeap(), 0, target); + HeapFree(GetProcessHeap(), 0, fmd.formatted); return NULL; ignore_inserts: default: if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) - ADD_TO_T('%'); - ADD_TO_T(*f++); + format_add_char(&fmd, '%'); + format_add_char(&fmd, *f++); break; } } else { - ch = *f; + WCHAR ch = *f; f++; if (ch == '\r') { if (*f == '\n') f++; if(width) - ADD_TO_T(' '); + format_add_char(&fmd, ' '); else { - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); } } else { if (ch == '\n') { if(width) - ADD_TO_T(' '); + format_add_char(&fmd, ' '); else { - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); } } else - ADD_TO_T(ch); + format_add_char(&fmd, ch); } } } - *t = '\0'; + *fmd.t = '\0'; - return target; + return fmd.formatted; } -#undef ADD_TO_T /*********************************************************************** * FormatMessageA (KERNEL32.@)

1 0