September 2017 - Wine-Commits

Hans Leidekker : webservices: Also use the dictionary for writing UTF-8 text values.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 18a77c327e3f661fd45c923a97e100a16a052c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a77c327e3f661fd45c923a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:10 2017 +0200 webservices: Also use the dictionary for writing UTF-8 text values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 75 +++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4eba2db..c3de82d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -653,7 +653,7 @@ static HRESULT write_dict_string( struct writer *writer, ULONG id ) return S_OK; } -static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) +static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text, BOOL use_dict ) { if (!text) return RECORD_CHARS8_TEXT; switch (text->textType) @@ -661,6 +661,7 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) case WS_XML_TEXT_TYPE_UTF8: { const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + if (use_dict) return RECORD_DICTIONARY_TEXT; if (text_utf8->value.length <= MAX_UINT8) return RECORD_CHARS8_TEXT; if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT; return RECORD_CHARS32_TEXT; @@ -765,10 +766,36 @@ static INT64 get_text_value_int( const WS_XML_TEXT *text ) } } +static BOOL get_string_id( struct writer *writer, const WS_XML_STRING *str, ULONG *id ) +{ + if (writer->dict && str->dictionary == writer->dict) + { + *id = str->id << 1; + return TRUE; + } + if (writer->dict_cb) + { + BOOL found = FALSE; + writer->dict_cb( writer->dict_cb_state, str, &found, id, NULL ); + if (found) *id = (*id << 1) | 1; + return found; + } + return FALSE; +} + static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TEXT *text ) { - enum record_type type = get_attr_text_record_type( text ); + enum record_type type; + BOOL use_dict = FALSE; HRESULT hr; + ULONG id; + + if (text && text->textType == WS_XML_TEXT_TYPE_UTF8) + { + const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; + use_dict = get_string_id( writer, &utf8->value, &id ); + } + type = get_attr_text_record_type( text, use_dict ); if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; write_char( writer, type ); @@ -896,23 +923,6 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE } } -static BOOL lookup_string_id( struct writer *writer, const WS_XML_STRING *str, ULONG *id ) -{ - if (writer->dict && str->dictionary == writer->dict) - { - *id = str->id << 1; - return TRUE; - } - if (writer->dict_cb) - { - BOOL found = FALSE; - writer->dict_cb( writer->dict_cb_state, str, &found, id, NULL ); - if (found) *id = (*id << 1) | 1; - return found; - } - return FALSE; -} - static enum record_type get_attr_record_type( const WS_XML_ATTRIBUTE *attr, BOOL use_dict ) { if (!attr->prefix || !attr->prefix->length) @@ -932,7 +942,7 @@ static enum record_type get_attr_record_type( const WS_XML_ATTRIBUTE *attr, BOOL static HRESULT write_attribute_bin( struct writer *writer, const WS_XML_ATTRIBUTE *attr ) { ULONG id; - enum record_type type = get_attr_record_type( attr, lookup_string_id(writer, attr->localName, &id) ); + enum record_type type = get_attr_record_type( attr, get_string_id(writer, attr->localName, &id) ); HRESULT hr; if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; @@ -1080,7 +1090,7 @@ static enum record_type get_xmlns_record_type( const WS_XML_ATTRIBUTE *attr, BOO static HRESULT write_namespace_attribute_bin( struct writer *writer, const WS_XML_ATTRIBUTE *attr ) { ULONG id; - enum record_type type = get_xmlns_record_type( attr, lookup_string_id(writer, attr->ns, &id) ); + enum record_type type = get_xmlns_record_type( attr, get_string_id(writer, attr->ns, &id) ); HRESULT hr; if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; @@ -1299,7 +1309,7 @@ static HRESULT write_startelement_bin( struct writer *writer ) { const WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; ULONG id; - enum record_type type = get_elem_record_type( elem, lookup_string_id(writer, elem->localName, &id) ); + enum record_type type = get_elem_record_type( elem, get_string_id(writer, elem->localName, &id) ); HRESULT hr; if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; @@ -2454,13 +2464,14 @@ static HRESULT write_text_text( struct writer *writer, const WS_XML_TEXT *text, return WS_E_INVALID_FORMAT; } -static enum record_type get_text_record_type( const WS_XML_TEXT *text ) +static enum record_type get_text_record_type( const WS_XML_TEXT *text, BOOL use_dict ) { switch (text->textType) { case WS_XML_TEXT_TYPE_UTF8: { const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + if (use_dict) return RECORD_DICTIONARY_TEXT_WITH_ENDELEMENT; if (text_utf8->value.length <= MAX_UINT8) return RECORD_CHARS8_TEXT_WITH_ENDELEMENT; if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT_WITH_ENDELEMENT; return RECORD_CHARS32_TEXT_WITH_ENDELEMENT; @@ -2537,8 +2548,10 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text ) static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, ULONG offset ) { - enum record_type type = get_text_record_type( text ); + enum record_type type; + BOOL use_dict = FALSE; HRESULT hr; + ULONG id; if (offset) { @@ -2546,7 +2559,13 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U return E_NOTIMPL; } - switch (type) + if (text->textType == WS_XML_TEXT_TYPE_UTF8) + { + const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; + use_dict = get_string_id( writer, &utf8->value, &id ); + } + + switch ((type = get_text_record_type( text, use_dict ))) { case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: { @@ -2699,6 +2718,12 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U write_bytes( writer, (const BYTE *)&val, sizeof(val) ); return S_OK; } + case RECORD_DICTIONARY_TEXT_WITH_ENDELEMENT: + { + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, type ); + return write_dict_string( writer, id ); + } default: FIXME( "unhandled record type %02x\n", type ); return E_NOTIMPL;

1 0

Hans Leidekker : webservices: Add a mechanism to use the builtin static dictionary in the writer.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 7b0a05c15159e4e9412eb9af5be7bb00a164dfbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b0a05c15159e4e9412eb9af5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 6 15:56:09 2017 +0200 webservices: Add a mechanism to use the builtin static dictionary in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- dlls/webservices/reader.c | 20 +++++++++--------- dlls/webservices/string.c | 7 ++++++- dlls/webservices/webservices_private.h | 3 ++- dlls/webservices/writer.c | 38 ++++++++++++++++++++++++++-------- 5 files changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 37ce3a3..7b7b526 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1833,7 +1833,7 @@ HRESULT message_set_action( WS_MESSAGE *handle, const WS_XML_STRING *action ) else { WS_XML_STRING *str; - if (!(str = dup_xml_string( action ))) hr = E_OUTOFMEMORY; + if (!(str = dup_xml_string( action, FALSE ))) hr = E_OUTOFMEMORY; else { free_xml_string( msg->action ); diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 50431bf..798e5f7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -156,9 +156,9 @@ static WS_XML_ATTRIBUTE *dup_attribute( const WS_XML_ATTRIBUTE *src ) dst->isXmlNs = src->isXmlNs; if (!prefix) dst->prefix = NULL; - else if (!(dst->prefix = dup_xml_string( prefix ))) goto error; - if (!(dst->localName = dup_xml_string( localname ))) goto error; - if (!(dst->ns = dup_xml_string( ns ))) goto error; + else if (!(dst->prefix = dup_xml_string( prefix, FALSE ))) goto error; + if (!(dst->localName = dup_xml_string( localname, FALSE ))) goto error; + if (!(dst->ns = dup_xml_string( ns, FALSE ))) goto error; if (text) { @@ -209,9 +209,9 @@ static struct node *dup_element_node( const WS_XML_ELEMENT_NODE *src ) if (count && !(dst->attributes = dup_attributes( attrs, count ))) goto error; dst->attributeCount = count; - if (prefix && !(dst->prefix = dup_xml_string( prefix ))) goto error; - if (localname && !(dst->localName = dup_xml_string( localname ))) goto error; - if (ns && !(dst->ns = dup_xml_string( ns ))) goto error; + if (prefix && !(dst->prefix = dup_xml_string( prefix, FALSE ))) goto error; + if (localname && !(dst->localName = dup_xml_string( localname, FALSE ))) goto error; + if (ns && !(dst->ns = dup_xml_string( ns, FALSE ))) goto error; return node; error: @@ -420,10 +420,10 @@ static HRESULT set_prefix( struct prefix *prefix, const WS_XML_STRING *str, cons if (str) { free_xml_string( prefix->str ); - if (!(prefix->str = dup_xml_string( str ))) return E_OUTOFMEMORY; + if (!(prefix->str = dup_xml_string( str, FALSE ))) return E_OUTOFMEMORY; } if (prefix->ns) free_xml_string( prefix->ns ); - if (!(prefix->ns = dup_xml_string( ns ))) return E_OUTOFMEMORY; + if (!(prefix->ns = dup_xml_string( ns, FALSE ))) return E_OUTOFMEMORY; return S_OK; } @@ -1113,7 +1113,7 @@ static HRESULT parse_qname( const BYTE *str, ULONG len, WS_XML_STRING **prefix_r if ((hr = split_qname( str, len, &prefix, &localname )) != S_OK) return hr; if (!(*prefix_ret = alloc_xml_string( NULL, prefix.length ))) return E_OUTOFMEMORY; - if (!(*localname_ret = dup_xml_string( &localname ))) + if (!(*localname_ret = dup_xml_string( &localname, FALSE ))) { free_xml_string( *prefix_ret ); return E_OUTOFMEMORY; @@ -1821,7 +1821,7 @@ static HRESULT set_namespaces( struct reader *reader, WS_XML_ELEMENT_NODE *elem ULONG i; if (!(ns = get_namespace( reader, elem->prefix ))) return WS_E_INVALID_FORMAT; - if (!(elem->ns = dup_xml_string( ns ))) return E_OUTOFMEMORY; + if (!(elem->ns = dup_xml_string( ns, FALSE ))) return E_OUTOFMEMORY; for (i = 0; i < elem->attributeCount; i++) { diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index e53a364..75e8b75 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -210,7 +210,7 @@ void free_xml_string( WS_XML_STRING *str ) heap_free( str ); } -WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src ) +WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src, BOOL use_static_dict ) { WS_XML_STRING *ret; unsigned char *data; @@ -224,6 +224,11 @@ WS_XML_STRING *dup_xml_string( const WS_XML_STRING *src ) *ret = *src; return ret; } + if (use_static_dict && (index = find_string( &dict_builtin_static, src->bytes, src->length, &id )) == -1) + { + *ret = dict_builtin_static.dict.strings[id]; + return ret; + } EnterCriticalSection( &dict_cs ); if ((index = find_string( &dict_builtin, src->bytes, src->length, &id )) == -1) { diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 958733c..da03213 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -51,10 +51,11 @@ int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; HRESULT CALLBACK insert_string_cb( void *, const WS_XML_STRING *, BOOL *, ULONG *, WS_ERROR * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; +HRESULT writer_enable_lookup( WS_XML_WRITER * ) DECLSPEC_HIDDEN; const char *debugstr_xmlstr( const WS_XML_STRING * ) DECLSPEC_HIDDEN; WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; -WS_XML_STRING *dup_xml_string( const WS_XML_STRING * ) DECLSPEC_HIDDEN; +WS_XML_STRING *dup_xml_string( const WS_XML_STRING *, BOOL ) DECLSPEC_HIDDEN; HRESULT add_xml_string( WS_XML_STRING * ) DECLSPEC_HIDDEN; void free_xml_string( WS_XML_STRING * ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 7216fc1..4eba2db 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -86,6 +86,7 @@ struct writer struct xmlbuf *output_buf; WS_HEAP *output_heap; const WS_XML_DICTIONARY *dict; + BOOL dict_do_lookup; WS_DYNAMIC_STRING_CALLBACK dict_cb; void *dict_cb_state; ULONG prop_count; @@ -171,6 +172,7 @@ static HRESULT init_writer( struct writer *writer ) writer->output_enc = WS_XML_WRITER_ENCODING_TYPE_TEXT; writer->output_charset = WS_CHARSET_UTF8; writer->dict = NULL; + writer->dict_do_lookup = FALSE; writer->dict_cb = NULL; writer->dict_cb_state = NULL; return S_OK; @@ -1131,12 +1133,12 @@ static HRESULT add_namespace_attribute( struct writer *writer, const WS_XML_STRI attr->singleQuote = !!single; attr->isXmlNs = 1; - if (prefix && !(attr->prefix = dup_xml_string( prefix ))) + if (prefix && !(attr->prefix = dup_xml_string( prefix, writer->dict_do_lookup ))) { free_attribute( attr ); return E_OUTOFMEMORY; } - if (!(attr->ns = dup_xml_string( ns ))) + if (!(attr->ns = dup_xml_string( ns, writer->dict_do_lookup ))) { free_attribute( attr ); return E_OUTOFMEMORY; @@ -1179,7 +1181,7 @@ static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_ST static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) { WS_XML_STRING *str; - if (!(str = dup_xml_string( ns ))) return E_OUTOFMEMORY; + if (!(str = dup_xml_string( ns, writer->dict_do_lookup ))) return E_OUTOFMEMORY; free_xml_string( writer->current_ns ); writer->current_ns = str; return S_OK; @@ -1545,17 +1547,17 @@ static HRESULT write_add_attribute( struct writer *writer, const WS_XML_STRING * if (!prefix && ns->length) prefix = elem->prefix; attr->singleQuote = !!single; - if (prefix && !(attr->prefix = dup_xml_string( prefix ))) + if (prefix && !(attr->prefix = dup_xml_string( prefix, writer->dict_do_lookup ))) { free_attribute( attr ); return E_OUTOFMEMORY; } - if (!(attr->localName = dup_xml_string( localname ))) + if (!(attr->localName = dup_xml_string( localname, writer->dict_do_lookup ))) { free_attribute( attr ); return E_OUTOFMEMORY; } - if (!(attr->ns = dup_xml_string( ns ))) + if (!(attr->ns = dup_xml_string( ns, writer->dict_do_lookup ))) { free_attribute( attr ); return E_OUTOFMEMORY; @@ -1750,17 +1752,17 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; elem = &node->hdr; - if (prefix && !(elem->prefix = dup_xml_string( prefix ))) + if (prefix && !(elem->prefix = dup_xml_string( prefix, writer->dict_do_lookup ))) { free_node( node ); return E_OUTOFMEMORY; } - if (!(elem->localName = dup_xml_string( localname ))) + if (!(elem->localName = dup_xml_string( localname, writer->dict_do_lookup ))) { free_node( node ); return E_OUTOFMEMORY; } - if (!(elem->ns = dup_xml_string( ns ))) + if (!(elem->ns = dup_xml_string( ns, writer->dict_do_lookup ))) { free_node( node ); return E_OUTOFMEMORY; @@ -4730,3 +4732,21 @@ done: LeaveCriticalSection( &writer->cs ); return hr; } + +HRESULT writer_enable_lookup( WS_XML_WRITER *handle ) +{ + struct writer *writer = (struct writer *)handle; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + writer->dict_do_lookup = TRUE; + + LeaveCriticalSection( &writer->cs ); + return S_OK; +}

1 0

Alistair Leslie-Hughes : include: Add interfaces IMFMediaTypeHandler, IMFStreamDescriptor.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: a0989060190a6e875483b249586a3c0840757c88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0989060190a6e875483b2495… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 6 07:38:49 2017 +0000 include: Add interfaces IMFMediaTypeHandler, IMFStreamDescriptor. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfidl.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 3c33806..b0fadba 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -164,6 +164,54 @@ interface IMFSourceResolver : IUnknown [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } +[ + object, + uuid(e93dcf6c-4b07-4e1e-8123-aa16ed6eadf5) +] +interface IMFMediaTypeHandler : IUnknown +{ + [local] + HRESULT IsMediaTypeSupported([in] IMFMediaType *in_type, [out] IMFMediaType **out_type); + + [call_as(IsMediaTypeSupported)] + HRESULT RemoteIsMediaTypeSupported([in, size_is(size)] BYTE *data, [in] DWORD size, + [out, size_is(, *match_count)] BYTE **match, [out] DWORD *match_count); + + HRESULT GetMediaTypeCount([out] DWORD *count); + + [local] + HRESULT GetMediaTypeByIndex([in] DWORD index, [out] IMFMediaType **type); + + [call_as(GetMediaTypeByIndex)] + HRESULT RemoteGetMediaTypeByIndex([in] DWORD index, [out, size_is(, *count)] BYTE **data, + [out] DWORD *count); + + [local] + HRESULT SetCurrentMediaType([in] IMFMediaType *type); + + [call_as(SetCurrentMediaType)] + HRESULT RemoteSetCurrentMediaType([in, size_is(count)] BYTE *data, [in] DWORD count); + + [local] + HRESULT GetCurrentMediaType([out] IMFMediaType **type); + + [call_as(GetCurrentMediaType)] + HRESULT RemoteGetCurrentMediaType([out, size_is(, *count)] BYTE **data, [out] DWORD *count); + + HRESULT GetMajorType([out] GUID *type); +} + +[ + object, + uuid(56c03d9c-9dbb-45f5-ab4b-d80f47c05938) +] +interface IMFStreamDescriptor : IMFAttributes +{ + HRESULT GetStreamIdentifier([out] DWORD *identifier); + + HRESULT GetMediaTypeHandler([out] IMFMediaTypeHandler **handler); +} + cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

Hugh McMaster : reg/tests: Add basic tests for the export operation.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 41236123bbcf0c3065fb528ebe82831357023fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=41236123bbcf0c3065fb528eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 6 12:31:41 2017 +0000 reg/tests: Add basic tests for the export operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 8d103df..9d5eee9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4223,6 +4223,48 @@ static void test_import_31(void) ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } +static void test_export(void) +{ + LONG err; + DWORD r; + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + + run_reg_exe("reg export", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg export \\remote-pc\\HKLM\\Wine file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_DYN_DATA file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKDD file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export file.reg HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -4240,4 +4282,5 @@ START_TEST(reg) test_import_with_whitespace(); test_unicode_import_with_whitespace(); test_import_31(); + test_export(); }

1 0

Nikolay Sivov : dbgeng: Added DebugCreateEx() stub.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: 0d078dbc82208caef06273c51e46faabc5452828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d078dbc82208caef06273c51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 6 12:19:30 2017 +0300 dbgeng: Added DebugCreateEx() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 18 ++++++++++++++---- dlls/dbgeng/dbgeng.spec | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index b08be75..6ac9360 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -58,8 +58,8 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) * Creating Debug Engine client object * * PARAMS -* InterfaceId [I] Interface Id of debugger client -* pInterface [O] Pointer to interface as requested via InterfaceId +* riid [I] Interface Id of debugger client +* obj [O] Pointer to interface as requested via riid * * RETURNS * Success: S_OK @@ -68,9 +68,9 @@ HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) * BUGS * Unimplemented */ -HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) +HRESULT WINAPI DebugCreate(REFIID riid, void **obj) { - FIXME("(%p,%p): stub\n", InterfaceId, pInterface); + FIXME("(%s, %p): stub\n", debugstr_guid(riid), obj); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -78,6 +78,16 @@ HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) } /************************************************************ +* DebugCreateEx (DBGENG.@) +*/ +HRESULT WINAPI DebugCreateEx(REFIID riid, DWORD flags, void **obj) +{ + FIXME("(%s, %#x, %p): stub\n", debugstr_guid(riid), flags, obj); + + return E_NOTIMPL; +} + +/************************************************************ * DebugConnect (DBGENG.@) * * Creating Debug Engine client object and connecting it to remote host diff --git a/dlls/dbgeng/dbgeng.spec b/dlls/dbgeng/dbgeng.spec index f2f735c..14dbc33 100644 --- a/dlls/dbgeng/dbgeng.spec +++ b/dlls/dbgeng/dbgeng.spec @@ -2,5 +2,5 @@ @ stdcall DebugConnect(str ptr ptr) @ stub DebugConnectWide @ stdcall DebugCreate(ptr ptr) -@ stub DebugCreateEx +@ stdcall DebugCreateEx(ptr long ptr) @ stdcall DebugExtensionInitialize(ptr ptr)

1 0

Dmitry Timoshkov : windowscodecs: Fix IWICBitmapEncoder:: SetPalette for a not initialized case in PNG encoder.
by Alexandre Julliard Sept. 6, 2017

Sept. 6, 2017

Module: wine Branch: master Commit: eb3eff90be46aada7faa1af36eb68b25f3087a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3eff90be46aada7faa1af36… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 5 13:57:32 2017 -0500 windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in PNG encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 821e2c3..b4fd346 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1952,10 +1952,20 @@ static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, return E_NOTIMPL; } -static HRESULT WINAPI PngEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +static HRESULT WINAPI PngEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *palette) { - TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + + TRACE("(%p,%p)\n", iface, palette); + + EnterCriticalSection(&This->lock); + + hr = This->stream ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI PngEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail)

1 0

Vincent Povirk : gdiplus: Account for gdi32 transforms in text functions.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: 9e1c110585e0b9df28c0d41b47f42ba50a6d23d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1c110585e0b9df28c0d41b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 5 13:43:32 2017 -0500 gdiplus: Account for gdi32 transforms in text functions. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index da70899..3b01505 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -302,13 +302,6 @@ static void round_points(POINT *pti, GpPointF *ptf, INT count) } } -static void transform_and_round_points(GpGraphics *graphics, POINT *pti, - GpPointF *ptf, INT count) -{ - gdip_transform_points(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, count); - round_points(pti, ptf, count); -} - static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_width, INT dst_height, HDC hdc, INT src_x, INT src_y, INT src_width, INT src_height) { @@ -2226,7 +2219,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GdipTransformMatrixPoints(&xform, pt, 3); } - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); @@ -5263,7 +5256,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -5292,9 +5285,13 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; + gdi_transform_acquire(graphics); + stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args); + gdi_transform_release(graphics); + SelectObject(hdc, oldfont); DeleteObject(gdifont); @@ -5382,7 +5379,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -5417,9 +5414,13 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.linesfilled = &lines; lines = glyphs = 0; + gdi_transform_acquire(graphics); + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, measure_string_callback, &args); + gdi_transform_release(graphics); + if (linesfilled) *linesfilled = lines; if (codepointsfitted) *codepointsfitted = glyphs; @@ -5549,7 +5550,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -5559,7 +5560,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string rectcpy[1].Y = rectcpy[0].Y = rect->Y; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; - transform_and_round_points(graphics, corners, rectcpy, 4); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, rectcpy, 4); + round_points(corners, rectcpy, 4); margin_x = (format && format->generic_typographic) ? 0.0 : font->emSize / 6.0; margin_x *= units_scale(font->unit, graphics->unit, graphics->xres); @@ -5598,12 +5600,16 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string args.rel_width = rel_width; args.rel_height = rel_height; + gdi_transform_acquire(graphics); + GetTextMetricsW(hdc, &textmetric); args.ascent = textmetric.tmAscent / rel_height; gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, draw_string_callback, &args); + gdi_transform_release(graphics); + DeleteObject(rgn); DeleteObject(gdifont); @@ -6907,7 +6913,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT GpMatrix xform = *matrix; GdipTransformMatrixPoints(&xform, pt, 3); } - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ @@ -7001,15 +7007,19 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 } pt = positions[0]; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &pt, 1); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &pt, 1); get_font_hfont(graphics, font, format, &hfont, matrix); SelectObject(graphics->hdc, hfont); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); + gdi_transform_acquire(graphics); + ExtTextOutW(graphics->hdc, gdip_round(pt.X), gdip_round(pt.Y), eto_flags, NULL, text, length, NULL); + gdi_transform_release(graphics); + RestoreDC(graphics->hdc, save_state); DeleteObject(hfont); @@ -7057,7 +7067,8 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI { real_position = positions[0]; - transform_and_round_points(graphics, pti, &real_position, 1); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &real_position, 1); + round_points(pti, &real_position, 1); } else { @@ -7070,7 +7081,8 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI memcpy(real_positions, positions, sizeof(PointF) * length); - transform_and_round_points(graphics, pti, real_positions, length); + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, real_positions, length); + round_points(pti, real_positions, length); heap_free(real_positions); } @@ -7210,10 +7222,14 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI heap_free(text_mask); + gdi_transform_acquire(graphics); + /* draw the result */ stat = alpha_blend_pixels(graphics, min_x, min_y, pixel_data, pixel_area.Width, pixel_area.Height, pixel_data_stride, PixelFormat32bppARGB); + gdi_transform_release(graphics); + heap_free(pixel_data); return stat;

1 0

Vincent Povirk : gdiplus: Account for gdi32 transform in SOFTWARE_GdipDrawPath.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: ac51280b1f9ab818a136f7b6987a590ea78ea66f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac51280b1f9ab818a136f7b69… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 5 13:43:31 2017 -0500 gdiplus: Account for gdi32 transform in SOFTWARE_GdipDrawPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4413e75..da70899 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3799,7 +3799,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * points[1].X = pen->width; points[2].Y = pen->width; - stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, + stat = gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, points, 3); if (stat != Ok) @@ -3823,7 +3823,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * stat = GdipCreateMatrix(&transform); if (stat == Ok) - stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, transform); } else @@ -3831,7 +3831,7 @@ static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath * /* Set flatness based on the final coordinate space */ GpMatrix t; - stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &t); if (stat != Ok)

1 0

Vincent Povirk : gdiplus: Account for gdi32 transform in GdipSetClipHrgn.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: b32c3243782477f7cc6dc5a189a3e4a5dacce1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32c3243782477f7cc6dc5a18… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 5 13:43:33 2017 -0500 gdiplus: Account for gdi32 transform in GdipSetClipHrgn. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 18 ++++++++++++----- dlls/gdiplus/tests/graphics.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3b01505..ea02c6b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6209,6 +6209,7 @@ GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics *graphics, HRGN hrgn, CombineMode { GpRegion *region; GpStatus status; + GpMatrix transform; TRACE("(%p, %p, %d)\n", graphics, hrgn, mode); @@ -6218,14 +6219,21 @@ GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics *graphics, HRGN hrgn, CombineMode if(graphics->busy) return ObjectBusy; - /* hrgn is already in device units */ + /* hrgn is in gdi32 device units */ status = GdipCreateRegionHrgn(hrgn, &region); - if(status != Ok) - return status; - status = GdipCombineRegionRegion(graphics->clip, region, mode); + if (status == Ok) + { + status = get_graphics_transform(graphics, CoordinateSpaceDevice, WineCoordinateSpaceGdiDevice, &transform); + + if (status == Ok) + status = GdipTransformRegion(region, &transform); + + if (status == Ok) + status = GdipCombineRegionRegion(graphics->clip, region, mode); - GdipDeleteRegion(region); + GdipDeleteRegion(region); + } return status; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5416ebc..651ba53 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6529,6 +6529,51 @@ static void test_GdipDrawImagePointsRectOnMemoryDC(void) ReleaseDC(hwnd, dc); } +static void test_cliphrgn_transform(void) +{ + HDC hdc; + GpStatus status; + GpGraphics *graphics; + HRGN rgn; + RectF rectf; + BOOL res; + + hdc = GetDC(hwnd); + + SetViewportOrgEx(hdc, 10, 10, NULL); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + rgn = CreateRectRgn(0, 0, 100, 100); + + status = GdipSetClipHrgn(graphics, rgn, CombineModeReplace); + expect(Ok, status); + + status = GdipGetVisibleClipBounds(graphics, &rectf); + expect(Ok, status); + expectf(-10.0, rectf.X); + expectf(-10.0, rectf.Y); + expectf(100.0, rectf.Width); + expectf(100.0, rectf.Height); + + status = GdipIsVisiblePoint(graphics, 95, 95, &res); + expect(Ok, status); + expect(FALSE, res); + + status = GdipIsVisiblePoint(graphics, -5, -5, &res); + expect(Ok, status); + expect(TRUE, res); + + DeleteObject(rgn); + + GdipDeleteGraphics(graphics); + + SetViewportOrgEx(hdc, 0, 0, NULL); + + ReleaseDC(hwnd, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6618,6 +6663,7 @@ START_TEST(graphics) test_GdipDrawImagePointsRectOnMemoryDC(); test_container_rects(); test_GdipGraphicsSetAbort(); + test_cliphrgn_transform(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Hugh McMaster : reg/tests: Delete the test registry key before starting each test.
by Alexandre Julliard Sept. 5, 2017

Sept. 5, 2017

Module: wine Branch: master Commit: e3395d50a7394e61466ef46e4433e8464c58180f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3395d50a7394e61466ef46e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Sep 5 12:26:44 2017 +0000 reg/tests: Delete the test registry key before starting each test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ab65c38..8d103df 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -507,6 +507,9 @@ static void test_delete(void) DWORD r; const DWORD deadbeef = 0xdeadbeef; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg delete", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -564,6 +567,9 @@ static void test_query(void) const DWORD dword1 = 0x123; const DWORD dword2 = 0xabc; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg query", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -800,6 +806,9 @@ static void test_import(void) LONG err; BYTE hex[8]; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + run_reg_exe("reg import", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -2314,6 +2323,9 @@ static void test_unicode_import(void) char buffer[24]; BYTE hex[8]; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -3800,6 +3812,9 @@ static void test_import_with_whitespace(void) DWORD r, dword; LONG err; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); @@ -3947,6 +3962,9 @@ static void test_unicode_import_with_whitespace(void) DWORD r, dword; LONG err; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r);

1 0