wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Hans Leidekker : webservices: Insert an end element for self-closing tags in the writer.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: d8c8b9a9bd56883ab7d66759aa79f1bd5845545a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c8b9a9bd56883ab7d66759a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:41 2016 +0200 webservices: Insert an end element for self-closing tags in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 80 ++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ecbba37..fc7292f 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -119,15 +119,15 @@ static void write_insert_bof( struct writer *writer, struct node *bof ) writer->current = writer->root = bof; } -static void write_insert_node( struct writer *writer, struct node *node ) +static void write_insert_node( struct writer *writer, struct node *parent, struct node *node ) { - node->parent = writer->current; - if (writer->current == writer->root) + node->parent = parent; + if (node->parent == writer->root) { struct list *eof = list_tail( &writer->root->children ); list_add_before( eof, &node->entry ); } - else list_add_tail( &writer->current->children, &node->entry ); + else list_add_tail( &parent->children, &node->entry ); writer->current = node; } @@ -568,19 +568,9 @@ static HRESULT write_startelement( struct writer *writer ) return S_OK; } -static struct node *write_find_parent_element( struct writer *writer ) +static HRESULT write_endelement( struct writer *writer, struct node *parent ) { - struct node *node = writer->current; - - if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) return node; - if (node_type( node->parent ) == WS_XML_NODE_TYPE_ELEMENT) return node->parent; - return NULL; -} - -static HRESULT write_endelement( struct writer *writer ) -{ - struct node *node = write_find_parent_element( writer ); - WS_XML_ELEMENT_NODE *elem = &node->hdr; + WS_XML_ELEMENT_NODE *elem = &parent->hdr; ULONG size; HRESULT hr; @@ -697,41 +687,53 @@ HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) return S_OK; } +static struct node *write_find_start_element( struct writer *writer ) +{ + struct node *node = writer->current, *child; + struct list *ptr; + + for (node = writer->current; node; node = node->parent) + { + if (node_type( node ) != WS_XML_NODE_TYPE_ELEMENT) continue; + + if (!(ptr = list_tail( &node->children ))) return node; + child = LIST_ENTRY( ptr, struct node, entry ); + if (node_type( child ) != WS_XML_NODE_TYPE_END_ELEMENT) return node; + } + return NULL; +} + static HRESULT write_close_element( struct writer *writer ) { + struct node *node, *parent; HRESULT hr; + if (!(parent = write_find_start_element( writer ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + if (writer->state == WRITER_STATE_STARTELEMENT) { /* '/>' */ - if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; - if ((hr = write_startelement( writer )) != S_OK) return hr; - if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; + if ((hr = write_set_element_namespace( writer )) != S_OK) goto error; + if ((hr = write_startelement( writer )) != S_OK) goto error; + if ((hr = write_grow_buffer( writer, 2 )) != S_OK) goto error; write_char( writer, '/' ); write_char( writer, '>' ); - - writer->current = writer->current->parent; - writer->state = WRITER_STATE_STARTENDELEMENT; - return S_OK; + writer->state = WRITER_STATE_STARTENDELEMENT; } else { - struct node *node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ); - if (!node) return E_OUTOFMEMORY; - /* '</prefix:localname>' */ - if ((hr = write_endelement( writer )) != S_OK) - { - free_node( node ); - return hr; - } - - write_insert_node( writer, node ); - writer->current = node->parent; - writer->state = WRITER_STATE_ENDELEMENT; - return S_OK; + if ((hr = write_endelement( writer, parent )) != S_OK) goto error; + writer->state = WRITER_STATE_ENDELEMENT; } - return WS_E_INVALID_OPERATION; + + write_insert_node( writer, parent, node ); + return S_OK; + +error: + free_node( node ); + return hr; } /************************************************************************** @@ -905,7 +907,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN free_node( node ); return E_OUTOFMEMORY; } - write_insert_node( writer, node ); + write_insert_node( writer, writer->current, node ); writer->state = WRITER_STATE_STARTELEMENT; return S_OK; } @@ -1060,7 +1062,7 @@ static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value ) text = (WS_XML_TEXT_NODE *)node; text->text = value; - write_insert_node( writer, node ); + write_insert_node( writer, writer->current, node ); writer->state = WRITER_STATE_TEXT; return S_OK; }

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_thread_group opcode.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 0c83f4d5bec8b01e1e6dcbb0a9a9932b6c24570b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c83f4d5bec8b01e1e6dcbb0a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:10:02 2016 +0200 wined3d: Recognize SM5 dcl_thread_group opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 5 files changed, 29 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 62102b2..00cc495 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5250,6 +5250,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9223bf0..bb2beb4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8588,6 +8588,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 729a137..8f3e145 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -80,6 +80,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", + /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -2267,6 +2268,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_tessellator_partitioning(&buffer, ins.declaration.tessellator_partitioning); } + else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) + { + shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], + ins.declaration.thread_group_size.x, + ins.declaration.thread_group_size.y, + ins.declaration.thread_group_size.z); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f56f976..6e224f6 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -219,6 +219,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE = 0x97, WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, + WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, @@ -617,6 +618,15 @@ static void shader_sm5_read_dcl_hs_max_tessfactor(struct wined3d_shader_instruct ins->declaration.max_tessellation_factor = *(float *)tokens; } +static void shader_sm5_read_dcl_thread_group(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + ins->declaration.thread_group_size.x = *tokens++; + ins->declaration.thread_group_size.y = *tokens++; + ins->declaration.thread_group_size.z = *tokens++; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -773,6 +783,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_hs_max_tessfactor}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", "", shader_sm4_read_declaration_count}, + {WINED3D_SM5_OP_DCL_THREAD_GROUP, WINED3DSIH_DCL_THREAD_GROUP, "", "", + shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b44b2fa..78cbe24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -593,6 +593,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, + WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, @@ -911,6 +912,11 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_thread_group_size +{ + unsigned int x, y, z; +}; + struct wined3d_shader_texel_offset { signed char u, v, w; @@ -938,6 +944,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning;

1 0

Józef Kucia : wined3d: Recognize vThreadIDInGroup register.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: ddb4466d14b675794882bdffd9ef92cc0cd539a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb4466d14b675794882bdffd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:10:01 2016 +0200 wined3d: Recognize vThreadIDInGroup register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index eb87c94..729a137 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1755,6 +1755,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vThreadGroupID"); break; + case WINED3DSPR_LOCALTHREADID: + shader_addline(buffer, "vThreadIDInGroup"); + break; + case WINED3DSPR_LOCALTHREADINDEX: shader_addline(buffer, "vThreadIDInGroupFlattened"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4e7557d..f56f976 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -252,6 +252,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, + WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, }; @@ -822,7 +823,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3c3d2d..b44b2fa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -389,6 +389,7 @@ enum wined3d_shader_register_type WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, WINED3DSPR_THREADGROUPID, + WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX, };

1 0

Józef Kucia : wined3d: Recognize vThreadGroupID register.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 1c6d168742e74fd0e6bfb40134c591b901832138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c6d168742e74fd0e6bfb4013… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:10:00 2016 +0200 wined3d: Recognize vThreadGroupID register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a4177bc..eb87c94 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1751,6 +1751,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_THREADGROUPID: + shader_addline(buffer, "vThreadGroupID"); + break; + case WINED3DSPR_LOCALTHREADINDEX: shader_addline(buffer, "vThreadIDInGroupFlattened"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ada369b..4e7557d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, + WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, }; @@ -820,7 +821,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7c626d..e3c3d2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,6 +388,7 @@ enum wined3d_shader_register_type WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, + WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADINDEX, };

1 0

Józef Kucia : wined3d: Recognize vThreadIDInGroupFlattened register.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 8dcdc8205fa261314a8d9e65d2870a3d97f1c4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcdc8205fa261314a8d9e65d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:59 2016 +0200 wined3d: Recognize vThreadIDInGroupFlattened register. 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/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f7ecda3..a4177bc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1751,6 +1751,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "g"); break; + case WINED3DSPR_LOCALTHREADINDEX: + shader_addline(buffer, "vThreadIDInGroupFlattened"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 893c331..ada369b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -251,6 +251,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, + WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, }; enum wined3d_sm4_output_primitive_type @@ -818,6 +819,11 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d573cfc..e7c626d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,6 +388,7 @@ enum wined3d_shader_register_type WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, WINED3DSPR_GROUPSHAREDMEM, + WINED3DSPR_LOCALTHREADINDEX, }; enum wined3d_data_type

1 0

Józef Kucia : d3d11: Implement ID3D11ComputeShader interface.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: e1a44a96b7bd135ecc3ccf2cab935e3c3711433e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a44a96b7bd135ecc3ccf2ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:58 2016 +0200 d3d11: Implement ID3D11ComputeShader interface. 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/d3d11/d3d11_private.h | 14 ++++ dlls/d3d11/device.c | 16 +++- dlls/d3d11/shader.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 77079bd..bd43aa6 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -317,6 +317,20 @@ HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code struct d3d_pixel_shader *unsafe_impl_from_ID3D11PixelShader(ID3D11PixelShader *iface) DECLSPEC_HIDDEN; struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; +/* ID3D11ComputeShader */ +struct d3d11_compute_shader +{ + ID3D11ComputeShader ID3D11ComputeShader_iface; + LONG refcount; + + struct wined3d_private_store private_store; + struct wined3d_shader *wined3d_shader; + ID3D11Device *device; +}; + +HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_compute_shader **shader) DECLSPEC_HIDDEN; + HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 843639a..0fc8eb5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2235,10 +2235,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_compute_shader *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d11_compute_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11ComputeShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index b1c4f28..9f618e4 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1500,6 +1500,190 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i return impl_from_ID3D10PixelShader(iface); } +/* ID3D11ComputeShader methods */ + +static inline struct d3d11_compute_shader *impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_compute_shader, ID3D11ComputeShader_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_QueryInterface(ID3D11ComputeShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11ComputeShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11ComputeShader_AddRef(*object = iface); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader *iface) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader *iface) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + ID3D11Device *device = shader->device; + + wined3d_mutex_lock(); + wined3d_shader_decref(shader->wined3d_shader); + wined3d_mutex_unlock(); + + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D11Device_Release(device); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_compute_shader_GetDevice(ID3D11ComputeShader *iface, + ID3D11Device **device) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_AddRef(*device = shader->device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_GetPrivateData(ID3D11ComputeShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_SetPrivateData(ID3D11ComputeShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_SetPrivateDataInterface(ID3D11ComputeShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&shader->private_store, guid, data); +} + +static const struct ID3D11ComputeShaderVtbl d3d11_compute_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_compute_shader_QueryInterface, + d3d11_compute_shader_AddRef, + d3d11_compute_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_compute_shader_GetDevice, + d3d11_compute_shader_GetPrivateData, + d3d11_compute_shader_SetPrivateData, + d3d11_compute_shader_SetPrivateDataInterface, +}; + +static void STDMETHODCALLTYPE d3d11_compute_shader_wined3d_object_destroyed(void *parent) +{ + struct d3d11_compute_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d11_compute_shader_wined3d_parent_ops = +{ + d3d11_compute_shader_wined3d_object_destroyed, +}; + +static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, struct d3d_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct wined3d_shader_desc desc; + HRESULT hr; + + shader->ID3D11ComputeShader_iface.lpVtbl = &d3d11_compute_shader_vtbl; + shader->refcount = 1; + wined3d_mutex_lock(); + wined3d_private_store_init(&shader->private_store); + + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + { + WARN("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return hr; + } + desc.max_version = d3d_sm_from_feature_level(device->feature_level); + + hr = wined3d_shader_create_cs(device->wined3d_device, &desc, shader, + &d3d11_compute_shader_wined3d_parent_ops, &shader->wined3d_shader); + shader_free_signature(&desc.input_signature); + shader_free_signature(&desc.output_signature); + if (FAILED(hr)) + { + WARN("Failed to create wined3d compute shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return E_INVALIDARG; + } + wined3d_mutex_unlock(); + + ID3D11Device_AddRef(shader->device = &device->ID3D11Device_iface); + + return S_OK; +} + +HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_compute_shader **shader) +{ + struct d3d11_compute_shader *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d11_compute_shader_init(object, device, byte_code, byte_code_length))) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created compute shader %p.\n", object); + *shader = object; + + return S_OK; +} + /* ID3D11ClassLinkage methods */ static inline struct d3d11_class_linkage *impl_from_ID3D11ClassLinkage(ID3D11ClassLinkage *iface)

1 0

Józef Kucia : wined3d: Introduce wined3d_shader_create_cs().
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 061aa115b0bd34a65dfd10e03404b30d23545d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061aa115b0bd34a65dfd10e03… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:57 2016 +0200 wined3d: Introduce wined3d_shader_create_cs(). 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/shader.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 4 ++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 ++ 5 files changed, 47 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d0f6eeb..f7ecda3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -353,6 +353,7 @@ static const struct wined3d_shader_frontend *shader_select_frontend(DWORD versio case WINED3D_SM4_GS: case WINED3D_SM5_HS: case WINED3D_SM5_DS: + case WINED3D_SM5_CS: return &sm4_shader_frontend; default: @@ -3263,6 +3264,44 @@ void pixelshader_update_resource_types(struct wined3d_shader *shader, WORD tex_t } } +static HRESULT compute_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, + const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + HRESULT hr; + + if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops))) + return hr; + + shader->load_local_constsF = shader->lconst_inf_or_nan; + + return WINED3D_OK; +} + +HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) +{ + struct wined3d_shader *object; + HRESULT hr; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", + device, desc, parent, parent_ops, shader); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = compute_shader_init(object, device, desc, parent, parent_ops))) + { + WARN("Failed to initialize compute shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created compute shader %p.\n", object); + *shader = object; + + return WINED3D_OK; +} + HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 18d345b..893c331 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -980,6 +980,10 @@ static void shader_sm4_read_header(void *data, const DWORD **ptr, struct wined3d priv->shader_version.type = WINED3D_SHADER_TYPE_DOMAIN; break; + case WINED3D_SM5_CS: + priv->shader_version.type = WINED3D_SHADER_TYPE_COMPUTE; + break; + default: FIXME("Unrecognized shader type %#x.\n", version_token >> 16); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0a00290..8d1d8dc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -200,6 +200,7 @@ @ cdecl wined3d_sampler_get_parent(ptr) @ cdecl wined3d_sampler_incref(ptr) +@ cdecl wined3d_shader_create_cs(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_ds(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_hs(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b1d911..d573cfc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -513,6 +513,7 @@ enum wined3d_shader_conditional_op #define WINED3D_SM4_GS 0x0002u #define WINED3D_SM5_HS 0x0003u #define WINED3D_SM5_DS 0x0004u +#define WINED3D_SM5_CS 0x0005u /* Shader version tokens, and shader end tokens */ #define WINED3DPS_VERSION(major, minor) ((WINED3D_SM1_PS << 16) | ((major) << 8) | (minor)) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5ca03d7..9becd6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2426,6 +2426,8 @@ ULONG __cdecl wined3d_sampler_decref(struct wined3d_sampler *sampler); void * __cdecl wined3d_sampler_get_parent(const struct wined3d_sampler *sampler); ULONG __cdecl wined3d_sampler_incref(struct wined3d_sampler *sampler); +HRESULT __cdecl wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader); HRESULT __cdecl wined3d_shader_create_ds(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader); HRESULT __cdecl wined3d_shader_create_gs(struct wined3d_device *device, const struct wined3d_shader_desc *desc,

1 0

Józef Kucia : wined3d: Add compute shader type.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: b30f59c56725441f23e8a13083b38d37a73d3c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30f59c56725441f23e8a1308… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:56 2016 +0200 wined3d: Add compute shader type. 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/arb_program_shader.c | 4 +++- dlls/wined3d/context.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/glsl_shader.c | 8 +++++++- dlls/wined3d/shader.c | 21 +++++++++++++++++++-- dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 5 ++++- 8 files changed, 40 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b30f59c56725441f23e8a…

1 0

Jacek Caban : mshtml: Return success in IHTMLWindow2::moveBy and resizeBy.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 03ed7f483dde46bf4720da02cd2e93e8d426f76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ed7f483dde46bf4720da02c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 15:12:34 2016 +0200 mshtml: Return success in IHTMLWindow2::moveBy and resizeBy. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e7f6144..d9f1346 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1461,7 +1461,7 @@ static HRESULT WINAPI HTMLWindow2_moveBy(IHTMLWindow2 *iface, LONG x, LONG y) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); FIXME("(%p)->(%d %d)\n", This, x, y); - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI HTMLWindow2_resizeTo(IHTMLWindow2 *iface, LONG x, LONG y) @@ -1475,7 +1475,7 @@ static HRESULT WINAPI HTMLWindow2_resizeBy(IHTMLWindow2 *iface, LONG x, LONG y) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); FIXME("(%p)->(%d %d)\n", This, x, y); - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI HTMLWindow2_get_external(IHTMLWindow2 *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e5275e8..dce65d5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6646,6 +6646,12 @@ static void test_window(IHTMLDocument2 *doc) set_window_status(window, "Test!"); test_history(window); + hres = IHTMLWindow2_moveBy(window, 0, 0); + ok(hres == S_FALSE, "moveBy failed: %08x\n", hres); + + hres = IHTMLWindow2_resizeBy(window, 0, 0); + ok(hres == S_FALSE, "resizeBy failed: %08x\n", hres); + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow5, (void**)&window5); if(SUCCEEDED(hres)) { ok(window5 != NULL, "window5 == NULL\n");

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_domain implementation.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 22eab07811225e19357ab91505187bbf20b3ba0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eab07811225e19357ab9150… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 15:12:25 2016 +0200 mshtml: Added IHTMLDocument2::put_domain implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 38 ++++++++++++++++++++++++++++++-------- dlls/mshtml/tests/htmldoc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eadb90b..352b757 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -795,24 +795,46 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_put_domain(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_SetDomain(This->doc_node->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetDomain failed: %08x\n", nsres); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - HRESULT hres; + nsAString nsstr; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->window || !This->window->uri) { - FIXME("No current URI\n"); - return E_FAIL; + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetDomain(This->doc_node->nsdoc, &nsstr); + if(NS_SUCCEEDED(nsres) && This->window && This->window->uri) { + const PRUnichar *str; + HRESULT hres; + + nsAString_GetData(&nsstr, &str); + if(!*str) { + TRACE("Gecko returned emptry string, fallback to loaded URL.\n"); + nsAString_Finish(&nsstr); + hres = IUri_GetHost(This->window->uri, p); + return FAILED(hres) ? hres : S_OK; + } } - hres = IUri_GetHost(This->window->uri, p); - return FAILED(hres) ? hres : S_OK; + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5079dc9..90d5b41 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -971,6 +971,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 1014: CHECK_EXPECT2(OnChanged_1014); return S_OK; + case 1029: case 1030: case 3000022: case 3000023: @@ -7681,6 +7682,37 @@ static void test_cookies(IHTMLDocument2 *doc) SysFreeString(str2); } +static void test_doc_domain(IHTMLDocument2 *doc) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "test.winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("winehq.org"); + hres = IHTMLDocument2_put_domain(doc, str); + ok(hres == S_OK, "put_domain failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("winehq.com"); + hres = IHTMLDocument2_put_domain(doc, str); + ok(hres == E_INVALIDARG, "put_domain failed: %08x, expected E_INVALIDARG\n", hres); + SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_HTMLDocument_http(BOOL with_wbapp) { IMoniker *http_mon; @@ -7718,6 +7750,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_GetCurMoniker((IUnknown*)doc, http_mon, NULL, FALSE); test_travellog(doc); test_binding_ui((IUnknown*)doc); + test_doc_domain(doc); nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) {

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016