September 2012 - Wine-commits

Dmitry Timoshkov : gdiplus: Add some tests for GIF properties.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 058963282e0938bdff470f1b4bae8e7dbe56333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=058963282e0938bdff470f1b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 13 13:02:36 2012 +0900 gdiplus: Add some tests for GIF properties. --- dlls/gdiplus/tests/image.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusimaging.h | 3 + 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 95dd2cd..e373a8c 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3920,6 +3920,99 @@ static void test_DrawImage_scale(void) expect(Ok, status); } +static void test_gif_properties(void) +{ + static const struct test_data + { + ULONG type, id, length; + const BYTE value[12]; + } td[] = + { + { PropertyTagTypeLong, PropertyTagFrameDelay, 8, { 10,0,0,0,10,0,0,0 } }, + { PropertyTagTypeShort, PropertyTagLoopCount, 2, { 1 } }, + { PropertyTagTypeByte, PropertyTagGlobalPalette, 12, { 0,0,0,0xff,0xff,0xff,0,0,0,0,0 } }, + { PropertyTagTypeByte, PropertyTagIndexBackground, 1, { 0 } } + }; + GpStatus status; + GpImage *image; + GUID guid; + UINT dim_count, frame_count, prop_count, prop_size, i; + PROPID *prop_id; + PropertyItem *prop_item; + + image = load_image(gifanimation, sizeof(gifanimation)); + ok(image != 0, "Failed to load GIF image data\n"); + if (!image) return; + + status = GdipImageGetFrameDimensionsCount(image, &dim_count); + expect(Ok, status); + expect(1, dim_count); + + status = GdipImageGetFrameDimensionsList(image, &guid, 1); + expect(Ok, status); + expect_guid(&FrameDimensionTime, &guid, __LINE__, FALSE); + + status = GdipImageGetFrameCount(image, &guid, &frame_count); + expect(Ok, status); + expect(2, frame_count); + + status = GdipGetPropertyCount(image, &prop_count); + expect(Ok, status); +todo_wine + ok(prop_count == sizeof(td)/sizeof(td[0]) || broken(prop_count == 1) /* before win7 */, + "expected property count %u, got %u\n", (UINT)(sizeof(td)/sizeof(td[0])), prop_count); + + if (prop_count != sizeof(td)/sizeof(td[0])) + { + GdipDisposeImage(image); + return; + } + + prop_id = HeapAlloc(GetProcessHeap(), 0, prop_count * sizeof(*prop_id)); + + status = GdipGetPropertyIdList(image, prop_count, prop_id); + expect(Ok, status); + + for (i = 0; i < prop_count; i++) + { + status = GdipGetPropertyItemSize(image, prop_id[i], &prop_size); + expect(Ok, status); + if (status != Ok) break; + ok(prop_size > sizeof(*prop_item), "%u: too small item length %u\n", i, prop_size); + + prop_item = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, prop_size); + status = GdipGetPropertyItem(image, prop_id[i], prop_size, prop_item); + expect(Ok, status); + ok(prop_item->value == prop_item + 1, "expected item->value %p, got %p\n", prop_item + 1, prop_item->value); + ok(td[i].type == prop_item->type, + "%u: expected type %u, got %u\n", i, td[i].type, prop_item->type); + ok(td[i].id == prop_item->id, "%u: expected id %#x, got %#x\n", i, td[i].id, prop_item->id); + prop_size -= sizeof(*prop_item); + ok(prop_item->length == prop_size, "%u: expected length %u, got %u\n", i, prop_size, prop_item->length); + ok(td[i].length == prop_item->length, "%u: expected length %u, got %u\n", i, td[i].length, prop_item->length); + ok(td[i].length == prop_size, "%u: expected length %u, got %u\n", i, td[i].length, prop_size); + if (td[i].length == prop_item->length) + { + int match = memcmp(td[i].value, prop_item->value, td[i].length) == 0; + ok(match || broken(td[i].length <= 4 && !match), "%u: data mismatch\n", i); + if (!match) + { + UINT j; + BYTE *data = prop_item->value; + printf("id %#x:", prop_item->id); + for (j = 0; j < prop_item->length; j++) + printf(" %02x", data[j]); + printf("\n"); + } + } + HeapFree(GetProcessHeap(), 0, prop_item); + } + + HeapFree(GetProcessHeap(), 0, prop_id); + + GdipDisposeImage(image); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3940,6 +4033,7 @@ START_TEST(image) test_tiff_palette(); test_GdipGetAllPropertyItems(); test_tiff_properties(); + test_gif_properties(); test_image_properties(); test_Scan0(); test_FromGdiDib(); diff --git a/include/gdiplusimaging.h b/include/gdiplusimaging.h index 7c199c3..93114d9 100644 --- a/include/gdiplusimaging.h +++ b/include/gdiplusimaging.h @@ -364,6 +364,9 @@ typedef struct PropertyItem #define PropertyTagFrameDelay 0x5100 #define PropertyTagLoopCount 0x5101 +#define PropertyTagGlobalPalette 0x5102 +#define PropertyTagIndexBackground 0x5103 +#define PropertyTagIndexTransparent 0x5104 #define PropertyTagPixelUnit 0x5110 #define PropertyTagPixelPerUnitX 0x5111

1 0

Matteo Bruni : d3dcompiler: Declare predefined data types.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: e7a9218ef1d7cdc12f3de26b021f0425ed04ca2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a9218ef1d7cdc12f3de26b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:05 2012 +0200 d3dcompiler: Declare predefined data types. --- dlls/d3dcompiler_43/hlsl.y | 71 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 10 +++++- 2 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 7ed50b4..35c9a4c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -175,6 +175,76 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); +BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) +{ + if (get_type(scope, def->name, FALSE)) + return FALSE; + + list_add_tail(&scope->types, &def->scope_entry); + return TRUE; +} + +static void declare_predefined_types(struct hlsl_scope *scope) +{ + struct hlsl_type *type; + unsigned int x, y, bt; + static const char *names[] = + { + "float", + "half", + "double", + "int", + "uint", + "bool", + }; + char name[10]; + + for (bt = 0; bt <= HLSL_TYPE_LAST_SCALAR; ++bt) + { + for (y = 1; y <= 4; ++y) + { + for (x = 1; x <= 4; ++x) + { + sprintf(name, "%s%ux%u", names[bt], x, y); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); + add_type_to_scope(scope, type); + + if (y == 1) + { + sprintf(name, "%s%u", names[bt], x); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_VECTOR, bt, x, y); + add_type_to_scope(scope, type); + + if (x == 1) + { + sprintf(name, "%s", names[bt]); + type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_SCALAR, bt, x, y); + add_type_to_scope(scope, type); + } + } + } + } + } + + /* DX8 effects predefined types */ + type = new_hlsl_type(d3dcompiler_strdup("DWORD"), HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("FLOAT"), HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("VECTOR"), HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("MATRIX"), HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("STRING"), HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("TEXTURE"), HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("PIXELSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1); + add_type_to_scope(scope, type); + type = new_hlsl_type(d3dcompiler_strdup("VERTEXSHADER"), HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1); + add_type_to_scope(scope, type); +} + static unsigned int components_count_expr_list(struct list *list) { struct hlsl_ir_node *node; @@ -1486,6 +1556,7 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino push_scope(&hlsl_ctx); hlsl_ctx.globals = hlsl_ctx.cur_scope; + declare_predefined_types(hlsl_ctx.globals); hlsl_parse(); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ad7887a..f288efc 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -860,7 +860,15 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) { - FIXME("stub.\n"); + struct hlsl_type *type; + + LIST_FOR_EACH_ENTRY(type, &scope->types, struct hlsl_type, scope_entry) + { + if (strcmp(type->name, name) == 0) + return type; + } + if (recursive && scope->upper) + return get_type(scope->upper, name, recursive); return NULL; }

1 0

Matteo Bruni : d3dcompiler: Don' t write the shader version tag from the header backend function.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 4ccffd8fa97fab92c795d0de2b3a5ed3fbc0ebec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccffd8fa97fab92c795d0de2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:06 2012 +0200 d3dcompiler: Don't write the shader version tag from the header backend function. --- dlls/d3dcompiler_43/bytecodewriter.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index f24ac9d..d10f6bc 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -744,12 +744,8 @@ static void vs_1_x_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, FALSE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, FALSE); - return; } static HRESULT find_ps_builtin_semantics(struct bc_writer *This, @@ -826,8 +822,6 @@ static void ps_1_x_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_constF(shader, buffer, FALSE); } @@ -847,8 +841,6 @@ static void ps_1_4_header(struct bc_writer *This, const struct bwriter_shader *s return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_constF(shader, buffer, FALSE); } @@ -1595,14 +1587,10 @@ static void vs_2_header(struct bc_writer *This, return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); - return; } static void vs_2_srcreg(struct bc_writer *This, @@ -1875,8 +1863,6 @@ static void ps_2_header(struct bc_writer *This, const struct bwriter_shader *sha return; } - /* Declare the shader type and version */ - put_dword(buffer, This->version); write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_samplers(shader, buffer); write_constF(shader, buffer, TRUE); @@ -2112,16 +2098,12 @@ static const struct bytecode_backend ps_2_x_backend = { }; static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer) { - /* Declare the shader type and version */ - put_dword(buffer, This->version); - write_declarations(This, buffer, TRUE, shader->inputs, shader->num_inputs, BWRITERSPR_INPUT); write_declarations(This, buffer, TRUE, shader->outputs, shader->num_outputs, BWRITERSPR_OUTPUT); write_constF(shader, buffer, TRUE); write_constB(shader, buffer, TRUE); write_constI(shader, buffer, TRUE); write_samplers(shader, buffer); - return; } static void sm_3_srcreg(struct bc_writer *This, @@ -2571,6 +2553,9 @@ HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWOR goto error; } + /* Write shader type and version */ + put_dword(buffer, shader->version); + writer->funcs->header(writer, shader, buffer); if(FAILED(writer->state)) { hr = writer->state;

1 0

Matteo Bruni : d3dcompiler: Only a few modifiers are relevant in type comparison.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 47e931823cd227abc2122610734700665b414b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e931823cd227abc21226107… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:07 2012 +0200 d3dcompiler: Only a few modifiers are relevant in type comparison. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 ++ dlls/d3dcompiler_43/utils.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a191529..28e77d3 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -732,6 +732,8 @@ struct hlsl_ir_node #define HLSL_MODIFIER_IN 0x00000800 #define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_MODIFIERS_COMPARISON_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) + struct hlsl_ir_var { struct hlsl_ir_node node; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index f288efc..c403a98 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -921,7 +921,8 @@ static BOOL compare_hlsl_types(const struct hlsl_type *t1, const struct hlsl_typ return FALSE; if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) return FALSE; - if (t1->modifiers != t2->modifiers) + if ((t1->modifiers & HLSL_MODIFIERS_COMPARISON_MASK) + != (t2->modifiers & HLSL_MODIFIERS_COMPARISON_MASK)) return FALSE; if (t1->dimx != t2->dimx) return FALSE;

1 0

Matteo Bruni : d3dcompiler: Parse "return" statement.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: ae11ba0b2349bd5261b6c4e186233c1a349d2063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae11ba0b2349bd5261b6c4e18… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:08 2012 +0200 d3dcompiler: Parse "return" statement. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 22 +++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 31 ++++++++++++++++++----- dlls/d3dcompiler_43/utils.c | 37 +++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 28e77d3..eb75448 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -706,6 +706,7 @@ enum hlsl_ir_node_type HLSL_IR_DEREF, HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, + HLSL_IR_JUMP, HLSL_IR_SWIZZLE, }; @@ -837,6 +838,21 @@ struct hlsl_ir_expr struct list *subexpressions; }; +enum hlsl_ir_jump_type +{ + HLSL_IR_JUMP_BREAK, + HLSL_IR_JUMP_CONTINUE, + HLSL_IR_JUMP_DISCARD, + HLSL_IR_JUMP_RETURN, +}; + +struct hlsl_ir_jump +{ + struct hlsl_ir_node node; + enum hlsl_ir_jump_type type; + struct hlsl_ir_node *return_value; +}; + struct hlsl_ir_swizzle { struct hlsl_ir_node node; @@ -1003,6 +1019,12 @@ static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_n return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); } +static inline struct hlsl_ir_jump *jump_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_JUMP); + return CONTAINING_RECORD(node, struct hlsl_ir_jump, node); +} + static inline struct hlsl_ir_assignment *assignment_from_node(const struct hlsl_ir_node *node) { assert(node->type == HLSL_IR_ASSIGNMENT); diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 35c9a4c..75b5741 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -497,6 +497,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %type <list> statement %type <list> statement_list %type <list> compound_statement +%type <list> jump_statement %type <function> func_declaration %type <function> func_prototype %type <parameter> parameter @@ -990,16 +991,32 @@ statement_list: statement } statement: declaration_statement - { - $$ = $1; - } | expr_statement - { - $$ = $1; - } | compound_statement + | jump_statement + + /* FIXME: add rule for return with no value */ +jump_statement: KW_RETURN expr ';' { - $$ = $1; + struct hlsl_ir_jump *jump = d3dcompiler_alloc(sizeof(*jump)); + if (!jump) + { + ERR("Out of memory\n"); + return -1; + } + jump->node.type = HLSL_IR_JUMP; + set_location(&jump->node.loc, &@1); + jump->type = HLSL_IR_JUMP_RETURN; + jump->node.data_type = $2->data_type; + jump->return_value = $2; + + FIXME("Check for valued return on void function.\n"); + FIXME("Implicit conversion to the return type if needed, " + "error out if conversion not possible.\n"); + + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_tail($$, &jump->node.entry); } expr_statement: ';' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c403a98..e0d351c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1742,6 +1742,8 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_DEREF", "HLSL_IR_EXPR", "HLSL_IR_FUNCTION_DECL", + "HLSL_IR_JUMP", + "HLSL_IR_SWIZZLE", }; if (type >= sizeof(names) / sizeof(names[0])) @@ -1973,6 +1975,28 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } } +static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) +{ + switch (jump->type) + { + case HLSL_IR_JUMP_BREAK: + TRACE("break"); + break; + case HLSL_IR_JUMP_CONTINUE: + TRACE("continue"); + break; + case HLSL_IR_JUMP_DISCARD: + TRACE("discard"); + break; + case HLSL_IR_JUMP_RETURN: + TRACE("return "); + if (jump->return_value) + debug_dump_instr(jump->return_value); + TRACE(";"); + break; + } +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) @@ -1995,6 +2019,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_CONSTRUCTOR: debug_dump_ir_constructor(constructor_from_node(instr)); break; + case HLSL_IR_JUMP: + debug_dump_ir_jump(jump_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } @@ -2132,6 +2159,13 @@ static void free_ir_assignment(struct hlsl_ir_assignment *assignment) d3dcompiler_free(assignment); } +static void free_ir_jump(struct hlsl_ir_jump *jump) +{ + if (jump->type == HLSL_IR_JUMP_RETURN) + free_instr(jump->return_value); + d3dcompiler_free(jump); +} + void free_instr(struct hlsl_ir_node *node) { switch (node->type) @@ -2157,6 +2191,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_ASSIGNMENT: free_ir_assignment(assignment_from_node(node)); break; + case HLSL_IR_JUMP: + free_ir_jump(jump_from_node(node)); + break; default: FIXME("Unsupported node type %s\n", debug_node_type(node->type)); }

1 0

Matteo Bruni : d3dcompiler/tests: Use a reasonable adapter format in CheckDeviceFormat().
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 19f951e86a253a10bb908bc9c99fc6ab60ca9e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f951e86a253a10bb908bc9c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 18 18:18:09 2012 +0200 d3dcompiler/tests: Use a reasonable adapter format in CheckDeviceFormat(). --- dlls/d3dcompiler_43/tests/hlsl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 837a72e..a528e80 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -93,7 +93,7 @@ static IDirect3DDevice9 *init_d3d9(IDirect3DVertexDeclaration9 **vdeclaration, return NULL; } - hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_A32B32G32R32F, + hr = IDirect3D9_CheckDeviceFormat(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, D3DFMT_A32B32G32R32F); if (FAILED(hr)) {

1 0

Jacek Caban : vbscript: Added ScriptDisp_Invoke implementation.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 91b41eb4942758de835571aa307b79a1cf488444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b41eb4942758de835571aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:26:16 2012 +0200 vbscript: Added ScriptDisp_Invoke implementation. --- dlls/vbscript/tests/vbscript.c | 14 ++++++++++++++ dlls/vbscript/vbdisp.c | 12 +++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 3dd64dd..7cd6e2d 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -468,6 +468,20 @@ static void test_scriptdisp(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + + memset(&dp, 0, sizeof(dp)); + memset(&ei, 0, sizeof(ei)); + V_VT(&v) = VT_EMPTY; + hres = IDispatchEx_Invoke(script_disp, id, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 5, "V_I2(v) = %d\n", V_I2(&v)); + + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + get_disp_id(script_disp, "globalSub", DISP_E_UNKNOWNNAME, &id); parse_script(parser, "sub globalSub()\nend sub"); get_disp_id(script_disp, "globalSub", S_OK, &id); diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 8b0e4f2..a003bf1 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -700,14 +700,16 @@ static HRESULT WINAPI ScriptDisp_GetIDsOfNames(IDispatchEx *iface, REFIID riid, return S_OK; } -static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid)

1 0

Jacek Caban : vbscript: Return error for unsupported flags in ScriptDisp:: InvokeEx.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: b6515030c88ca67c4b73ad0d94a79fe9eb0637eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6515030c88ca67c4b73ad0d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 18 12:26:30 2012 +0200 vbscript: Return error for unsupported flags in ScriptDisp::InvokeEx. --- dlls/vbscript/vbdisp.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a003bf1..4721753 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -783,10 +783,17 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return invoke_variant_prop(&ident->u.var->v, wFlags, pdp, pvarRes); } - - IActiveScriptSite_OnEnterScript(This->ctx->site); - hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes); - IActiveScriptSite_OnLeaveScript(This->ctx->site); + switch(wFlags) { + case DISPATCH_METHOD: + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + IActiveScriptSite_OnEnterScript(This->ctx->site); + hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes); + IActiveScriptSite_OnLeaveScript(This->ctx->site); + break; + default: + FIXME("Unsupported flags %x\n", wFlags); + hres = E_NOTIMPL; + } return hres; }

1 0

Charles Davis : oleaut32/tests: Don't take the size of a pointer (Clang).
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 8cba35d5d2bd2d027ef1dd935538e4b5031caac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cba35d5d2bd2d027ef1dd935… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 18 05:02:03 2012 -0600 oleaut32/tests: Don't take the size of a pointer (Clang). --- dlls/oleaut32/tests/tmarshal.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index be8ef94..a4a2b6f 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -596,11 +596,11 @@ static HRESULT WINAPI Widget_VarArg( } -static BOOL mystruct_uint_ordered(UINT uarr[8]) +static BOOL mystruct_uint_ordered(MYSTRUCT *mystruct) { int i; - for (i = 0; i < sizeof(uarr) / sizeof(uarr[0]); i++) - if (uarr[i] != i) + for (i = 0; i < sizeof(mystruct->uarr)/sizeof(mystruct->uarr[0]); i++) + if (mystruct->uarr[i] != i) return 0; return 1; @@ -615,16 +615,16 @@ static HRESULT WINAPI Widget_StructArgs( int i, diff = 0; ok(byval.field1 == MYSTRUCT_BYVAL.field1 && byval.field2 == MYSTRUCT_BYVAL.field2 && - mystruct_uint_ordered(byval.uarr), + mystruct_uint_ordered(&byval), "Struct parameter passed by value corrupted\n"); ok(byptr->field1 == MYSTRUCT_BYPTR.field1 && byptr->field2 == MYSTRUCT_BYPTR.field2 && - mystruct_uint_ordered(byptr->uarr), + mystruct_uint_ordered(byptr), "Struct parameter passed by pointer corrupted\n"); for (i = 0; i < 5; i++) if (arr[i].field1 != MYSTRUCT_ARRAY[i].field1 || arr[i].field2 != MYSTRUCT_ARRAY[i].field2 || - ! mystruct_uint_ordered(arr[i].uarr)) + ! mystruct_uint_ordered(&arr[i])) diff++; ok(diff == 0, "Array of structs corrupted\n"); return S_OK;

1 0

Charles Davis : oleaut32/tests: Don't use a C99 keyword as a method name.
by Alexandre Julliard 18 Sep '12

18 Sep '12

Module: wine Branch: master Commit: 8e14c9413b33dc47673d48d7ffcf7e7ae5c51dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e14c9413b33dc47673d48d7f… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Sep 18 05:02:04 2012 -0600 oleaut32/tests: Don't use a C99 keyword as a method name. --- dlls/oleaut32/tests/tmarshal.c | 4 ++-- dlls/oleaut32/tests/tmarshal.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index a4a2b6f..2c1b8e8 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -706,7 +706,7 @@ static HRESULT WINAPI Widget_put_prop_req_arg( return S_OK; } -static HRESULT WINAPI Widget_restrict(IWidget* iface, INT *i) +static HRESULT WINAPI Widget__restrict(IWidget* iface, INT *i) { trace("restrict\n"); *i = DISPID_TM_RESTRICTED; @@ -756,7 +756,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_ByRefUInt, Widget_put_prop_opt_arg, Widget_put_prop_req_arg, - Widget_restrict, + Widget__restrict, Widget_neg_restrict }; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index c589574..8dca84c 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -161,7 +161,7 @@ library TestTypelib HRESULT prop_req_arg([in] INT req, [in] INT i); [id(DISPID_TM_RESTRICTED), restricted] - HRESULT restrict([out, retval] INT *i); + HRESULT _restrict([out, retval] INT *i); [id(DISPID_TM_NEG_RESTRICTED), restricted] HRESULT neg_restrict([out, retval] INT *i);

1 0