September 2014 - Wine-commits

Jacek Caban : mshtml: Removed no longer needed assert.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 9550189b4f6ee6835cd666ad502e3c403408bd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9550189b4f6ee6835cd666ad5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 10:14:14 2014 +0200 mshtml: Removed no longer needed assert. --- dlls/mshtml/htmlframebase.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 92421b5..9808379 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -709,7 +709,6 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&This->nsiframe); assert(nsres == NS_OK); }else { - assert((nsIDOMNode*)This->nsframe == This->element.node.nsnode); This->nsiframe = NULL; } }

1 0

Jacek Caban : jscript: Move parser related declarations to separated header.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 615f6a6e8b13f33226263131e358ee7b1aad1ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615f6a6e8b13f33226263131e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:14 2014 +0200 jscript: Move parser related declarations to separated header. --- dlls/jscript/compile.c | 1 + dlls/jscript/engine.c | 15 +++ dlls/jscript/engine.h | 355 +------------------------------------------------ dlls/jscript/lex.c | 1 + dlls/jscript/parser.h | 354 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 1 + 6 files changed, 374 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=615f6a6e8b13f33226263…

1 0

Jacek Caban : jscript: Return double from parse_numeric_literal and parse_double_literal.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 166c97d549acca63494c9e8ebf6c6c7d2eb296d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166c97d549acca63494c9e8eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:24 2014 +0200 jscript: Return double from parse_numeric_literal and parse_double_literal. --- dlls/jscript/lex.c | 58 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 7318838..1796aed 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -388,7 +388,7 @@ literal_t *new_boolean_literal(parser_ctx_t *ctx, BOOL bval) return ret; } -static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **literal) +static BOOL parse_double_literal(parser_ctx_t *ctx, LONG int_part, double *ret) { LONGLONG d, hlp; int exp = 0; @@ -435,13 +435,15 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li ctx->ptr++; }else if(!isdigitW(*ctx->ptr)) { WARN("Expected exponent part\n"); - return lex_error(ctx, E_FAIL); + lex_error(ctx, E_FAIL); + return FALSE; } } if(ctx->ptr == ctx->end) { WARN("unexpected end of file\n"); - return lex_error(ctx, E_FAIL); + lex_error(ctx, E_FAIL); + return FALSE; } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { @@ -457,14 +459,15 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); - return tNumericLiteral; + *ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); + return TRUE; } -static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) +static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) { LONG l, d; @@ -473,7 +476,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(*ctx->ptr == 'x' || *ctx->ptr == 'X') { if(++ctx->ptr == ctx->end) { ERR("unexpected end of file\n"); - return 0; + return FALSE; } while(ctx->ptr < ctx->end && (d = hex_to_int(*ctx->ptr)) != -1) { @@ -483,11 +486,12 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(ctx->ptr < ctx->end && is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, l); - return tNumericLiteral; + *ret = l; + return TRUE; } if(isdigitW(*ctx->ptr)) { @@ -509,20 +513,22 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) /* FIXME: Do we need it here? */ if(ctx->ptr < ctx->end && (is_identifier_char(*ctx->ptr) || *ctx->ptr == '.')) { WARN("wrong char after octal literal: '%c'\n", *ctx->ptr); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, val); - return tNumericLiteral; + *ret = val; + return TRUE; } if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } } - return parse_double_literal(ctx, l, literal); + return parse_double_literal(ctx, l, ret); } static int next_token(parser_ctx_t *ctx, void *lval) @@ -550,8 +556,15 @@ static int next_token(parser_ctx_t *ctx, void *lval) return parse_identifier(ctx, lval); } - if(isdigitW(*ctx->ptr)) - return parse_numeric_literal(ctx, lval); + if(isdigitW(*ctx->ptr)) { + double n; + + if(!parse_numeric_literal(ctx, &n)) + return -1; + + *(literal_t**)lval = new_double_literal(ctx, n); + return tNumericLiteral; + } switch(*ctx->ptr) { case '{': @@ -571,8 +584,13 @@ static int next_token(parser_ctx_t *ctx, void *lval) return '}'; case '.': - if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - return parse_double_literal(ctx, 0, lval); + if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + double n; + if(!parse_double_literal(ctx, 0, &n)) + return -1; + *(literal_t**)lval = new_double_literal(ctx, n); + return tNumericLiteral; + } return '.'; case '<':

1 0

Jacek Caban : jscript: Added new ccval_t type for CC variable values.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 79dc3bc72e362ce85d08e05be83c75b99a6cb38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dc3bc72e362ce85d08e05be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:36 2014 +0200 jscript: Added new ccval_t type for CC variable values. --- dlls/jscript/lex.c | 43 +++++++++++++------------------------------ dlls/jscript/parser.h | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 1796aed..8d8e2d9 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -789,11 +789,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) } struct _cc_var_t { - BOOL is_num; - union { - BOOL b; - DOUBLE n; - } u; + ccval_t val; struct _cc_var_t *next; unsigned name_len; WCHAR name[0]; @@ -811,18 +807,18 @@ void release_cc(cc_ctx_t *cc) heap_free(cc); } -static BOOL add_cc_var(cc_ctx_t *cc, const WCHAR *name, cc_var_t *v) +static BOOL new_cc_var(cc_ctx_t *cc, const WCHAR *name, int len, ccval_t v) { cc_var_t *new_v; - unsigned len; - len = strlenW(name); + if(len == -1) + len = strlenW(name); new_v = heap_alloc(sizeof(cc_var_t) + (len+1)*sizeof(WCHAR)); if(!new_v) return FALSE; - memcpy(new_v, v, sizeof(*v)); + new_v->val = v; memcpy(new_v->name, name, (len+1)*sizeof(WCHAR)); new_v->name_len = len; new_v->next = cc->vars; @@ -845,7 +841,6 @@ static cc_var_t *find_cc_var(cc_ctx_t *cc, const WCHAR *name, unsigned name_len) static int init_cc(parser_ctx_t *ctx) { cc_ctx_t *cc; - cc_var_t v; static const WCHAR _win32W[] = {'_','w','i','n','3','2',0}; static const WCHAR _win64W[] = {'_','w','i','n','6','4',0}; @@ -863,24 +858,12 @@ static int init_cc(parser_ctx_t *ctx) return lex_error(ctx, E_OUTOFMEMORY); cc->vars = NULL; - v.is_num = FALSE; - v.u.b = TRUE; - if(!add_cc_var(cc, _jscriptW, &v) - || !add_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, &v) - || !add_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, &v)) { - release_cc(cc); - return lex_error(ctx, E_OUTOFMEMORY); - } - - v.is_num = TRUE; - v.u.n = JSCRIPT_BUILD_VERSION; - if(!add_cc_var(cc, _jscript_buildW, &v)) { - release_cc(cc); - return lex_error(ctx, E_OUTOFMEMORY); - } - v.u.n = JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0; - if(!add_cc_var(cc, _jscript_versionW, &v)) { + if(!new_cc_var(cc, _jscriptW, -1, ccval_bool(TRUE)) + || !new_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, -1, ccval_bool(TRUE)) + || !new_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, -1, ccval_bool(TRUE)) + || !new_cc_var(cc, _jscript_versionW, -1, ccval_num(JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0)) + || !new_cc_var(cc, _jscript_buildW, -1, ccval_num(JSCRIPT_BUILD_VERSION))) { release_cc(cc); return lex_error(ctx, E_OUTOFMEMORY); } @@ -941,12 +924,12 @@ static int cc_token(parser_ctx_t *ctx, void *lval) var = find_cc_var(ctx->script->cc, ctx->ptr, id_len); ctx->ptr += id_len; - if(!var || var->is_num) { - *(literal_t**)lval = new_double_literal(ctx, var ? var->u.n : NAN); + if(!var || var->val.is_num) { + *(literal_t**)lval = new_double_literal(ctx, var ? var->val.u.n : NAN); return tNumericLiteral; } - *(literal_t**)lval = new_boolean_literal(ctx, var->u.b); + *(literal_t**)lval = new_boolean_literal(ctx, var->val.u.b); return tBooleanLiteral; } diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index ff50cb1..5d15bc3 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -20,6 +20,14 @@ typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; +typedef struct { + BOOL is_num; + union { + BOOL b; + double n; + } u; +} ccval_t; + typedef struct _parser_ctx_t { const WCHAR *begin; const WCHAR *end; @@ -352,3 +360,19 @@ typedef struct { expression_t expr; prop_val_t *property_list; } property_value_expression_t; + +static inline ccval_t ccval_num(double n) +{ + ccval_t r; + r.is_num = TRUE; + r.u.n = n; + return r; +} + +static inline ccval_t ccval_bool(BOOL b) +{ + ccval_t r; + r.is_num = FALSE; + r.u.b = b; + return r; +}

1 0

Jacek Caban : jscript: Moved skipping spaces to separated function.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 77d0c2a44c72cef6fe23351cbe7b473cd3e9b9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d0c2a44c72cef6fe23351cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:44 2014 +0200 jscript: Moved skipping spaces to separated function. --- dlls/jscript/lex.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 8d8e2d9..5e0226a 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -231,6 +231,16 @@ static BOOL skip_comment(parser_ctx_t *ctx) return TRUE; } +static BOOL skip_spaces(parser_ctx_t *ctx) +{ + while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { + if(is_endline(*ctx->ptr++)) + ctx->nl = TRUE; + } + + return ctx->ptr != ctx->end; +} + static BOOL unescape(WCHAR *str) { WCHAR *pd, *p, c; @@ -534,11 +544,7 @@ static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) static int next_token(parser_ctx_t *ctx, void *lval) { do { - while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { - if(is_endline(*ctx->ptr++)) - ctx->nl = TRUE; - } - if(ctx->ptr == ctx->end) + if(!skip_spaces(ctx)) return tEOF; }while(skip_comment(ctx) || skip_html_comment(ctx));

1 0

Henri Verbeet : wined3d: Use wined3d_texture_set_color_key() to manipulate the color-key in surface_blt_special().
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: a8ab56941577a01e17b947cddd374ba52ffd8245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ab56941577a01e17b947cdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 30 07:59:18 2014 +0200 wined3d: Use wined3d_texture_set_color_key() to manipulate the color-key in surface_blt_special(). --- dlls/wined3d/surface.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 955c1b6..f8ea858 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4116,13 +4116,12 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE else if (flags & WINEDDBLT_KEYSRCOVERRIDE) { /* Use color key from DDBltFx */ - src_surface->container->color_key_flags |= WINEDDSD_CKSRCBLT; - src_surface->container->src_blt_color_key = DDBltFx->ddckSrcColorkey; + wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, &DDBltFx->ddckSrcColorkey); } else { /* Do not use color key */ - src_surface->container->color_key_flags &= ~WINEDDSD_CKSRCBLT; + wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, NULL); } surface_blt_to_drawable(device, filter, @@ -4130,8 +4129,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE src_surface, src_rect, dst_surface, dst_rect); /* Restore the color key parameters */ - src_surface->container->color_key_flags = old_color_key_flags; - src_surface->container->src_blt_color_key = old_blt_key; + wined3d_texture_set_color_key(src_surface->container, WINEDDSD_CKSRCBLT, + (old_color_key_flags & WINEDDSD_CKSRCBLT) ? &old_blt_key : NULL); surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);

1 0

Francois Gouget : dpnet/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: d83f2ac0eca3569c73fcdd13b546c36a55692225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83f2ac0eca3569c73fcdd13b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:52:03 2014 +0200 dpnet/tests: Add a trailing '\n' to some ok() calls. --- dlls/dpnet/tests/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 4d825bb..0f0b8ce 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -189,14 +189,14 @@ static void address_setsp(void) hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 0, "components=%d", components); + ok(components == 0, "components=%d\n", components); hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 1, "components=%d", components); + ok(components == 1, "components=%d\n", components); hr = IDirectPlay8Address_GetComponentByIndex(localaddr, 0, NULL, &namelen, NULL, &bufflen, &type); todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr);

1 0

Francois Gouget : d2d1: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 9f9743364144a90631b71c7aaf5d54531524c2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9743364144a90631b71c7aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:51:59 2014 +0200 d2d1: Add a trailing '\n' to a FIXME(). --- dlls/d2d1/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 10c4296..43c4881 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -123,7 +123,7 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *iface, const D2D1_POINT_2U *dst_point, ID2D1RenderTarget *render_target, const D2D1_RECT_U *src_rect) { - FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!", iface, dst_point, render_target, src_rect); + FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!\n", iface, dst_point, render_target, src_rect); return E_NOTIMPL; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 0dd5cb1cef2d50653377e304ac76693792e48aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd5cb1cef2d50653377e304a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 23:53:46 2014 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/button.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 2 +- dlls/d3d8/tests/device.c | 2 +- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/dpvoice/tests/voice.c | 12 ++++++------ dlls/dwrite/analyzer.c | 2 +- dlls/kernel32/tests/pipe.c | 4 ++-- dlls/mshtml/tests/dom.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/qcap/avimux.c | 2 +- dlls/rsaenh/tests/rsaenh.c | 2 +- dlls/shell32/tests/shlfileop.c | 2 +- dlls/wined3d/directx.c | 4 ++-- dlls/wmp/oleobj.c | 2 +- dlls/wmp/tests/oleobj.c | 2 +- dlls/xmllite/writer.c | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dd5cb1cef2d50653377e…

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Address Duplicate.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 7dcfb9d3e55bab5a3422c85e85221e5279689d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dcfb9d3e55bab5a3422c85e8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 13 12:57:47 2014 +1000 dpnet: Implement IDirectPlay8Address Duplicate. --- dlls/dpnet/address.c | 33 ++++++++++++++++++++++++++++++--- dlls/dpnet/dpnet_private.h | 1 + dlls/dpnet/tests/address.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 2cea1ea..7df7ad6 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -179,9 +179,35 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLA(IDirectPlay8Address static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *iface, IDirectPlay8Address **ppdpaNewAddress) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p, %p): stub\n", This, ppdpaNewAddress); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + IDirectPlay8Address *dup; + HRESULT hr; + + TRACE("(%p, %p)\n", This, ppdpaNewAddress); + + if(!ppdpaNewAddress) + return E_POINTER; + + hr = DPNET_CreateDirectPlay8Address(NULL, NULL, &IID_IDirectPlay8Address, (LPVOID*)&dup); + if(hr == S_OK) + { + IDirectPlay8AddressImpl *DupThis = impl_from_IDirectPlay8Address(dup); + struct component *entry; + + DupThis->SP_guid = This->SP_guid; + DupThis->init = This->init; + + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + { + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data, entry->size, entry->type); + if(hr != S_OK) + ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr); + } + + *ppdpaNewAddress = dup; + } + + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_SetEqual(IDirectPlay8Address *iface, @@ -338,6 +364,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * list_add_tail(&This->components, &entry->entry); } + entry->size = dwDataSize; switch (dwDataType) { case DPNA_DATATYPE_DWORD: diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 61e2200..1ed4f25 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -68,6 +68,7 @@ struct component WCHAR *name; DWORD type; + DWORD size; union { diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 0f0b8ce..ad35954 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -214,6 +214,44 @@ static void address_setsp(void) } } +static void address_duplicate(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + IDirectPlay8Address *duplicate = NULL; + DWORD components, dupcomps; + GUID guid = IID_Random; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == 1, "components=%d\n", components); + + hr = IDirectPlay8Address_Duplicate(localaddr, &duplicate); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirectPlay8Address_GetSP(duplicate, &guid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); + + hr = IDirectPlay8Address_GetNumComponents(duplicate, &dupcomps); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(components == dupcomps, "expected %d got %d\n", components, dupcomps); + + IDirectPlay8Address_Release(duplicate); + } + + IDirectPlay8Address_Release(localaddr); + } +} + START_TEST(address) { HRESULT hr; @@ -226,6 +264,7 @@ START_TEST(address) create_directplay_address(); address_addcomponents(); address_setsp(); + address_duplicate(); CoUninitialize(); }

1 0