July 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Fix cache entry use-after-free (Valgrind).
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: addd8e69ff09e8620aa3c9c2120d2161df478ac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addd8e69ff09e8620aa3c9c21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 20 19:47:33 2017 +0300 dwrite: Fix cache entry use-after-free (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 6 ++++++ dlls/dwrite/main.c | 1 + 3 files changed, 8 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9530399..57731a9 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -198,6 +198,7 @@ extern void factory_release_cached_fontface(struct fontfacecached*) DECLSPEC_HID extern void get_logfont_from_font(IDWriteFont*,LOGFONTW*) DECLSPEC_HIDDEN; extern void get_logfont_from_fontface(IDWriteFontFace*,LOGFONTW*) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1**) DECLSPEC_HIDDEN; +extern void fontface_detach_from_cache(IDWriteFontFace4*) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6862d7b..be0131a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -443,6 +443,12 @@ static void release_fontfamily_data(struct dwrite_fontfamily_data *data) heap_free(data); } +void fontface_detach_from_cache(IDWriteFontFace4 *iface) +{ + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace4(iface); + fontface->cached = NULL; +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace4 *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c822781..36d8613 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -566,6 +566,7 @@ static void release_fontface_cache(struct list *fontfaces) LIST_FOR_EACH_ENTRY_SAFE(fontface, fontface2, fontfaces, struct fontfacecached, entry) { list_remove(&fontface->entry); + fontface_detach_from_cache(fontface->fontface); heap_free(fontface); } }

1 0

Nikolay Sivov : dwrite: Print missing table message as a trace.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: d06443d659d1a86f0111859711203bc426ef7b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06443d659d1a86f011185971… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 20 19:47:32 2017 +0300 dwrite: Print missing table message as a trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5e72aea..6862d7b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -353,7 +353,7 @@ static void* get_fontface_table(IDWriteFontFace4 *fontface, UINT32 tag, struct d hr = IDWriteFontFace4_TryGetFontTable(fontface, tag, (const void**)&table->data, &table->size, &table->context, &table->exists); if (FAILED(hr) || !table->exists) { - WARN("Font does not have a %s table\n", debugstr_tag(tag)); + TRACE("Font does not have %s table\n", debugstr_tag(tag)); return NULL; } @@ -5118,7 +5118,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys break; } case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: - WARN("Downsampled mode is ignored.\n"); + WARN("NATURAL_SYMMETRIC_DOWNSAMPLED mode is ignored.\n"); /* fallthrough */ case DWRITE_RENDERING_MODE1_ALIASED: case DWRITE_RENDERING_MODE1_NATURAL:

1 0

Jacek Caban : mshtml: Support returning VT_NULL from return_nsstr_variant.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: fd44c7ac26ddb2c4d5567f224609884f478c1975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd44c7ac26ddb2c4d5567f224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 20 18:11:22 2017 +0200 mshtml: Support returning VT_NULL from return_nsstr_variant. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 7 +------ dlls/mshtml/nsembed.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9bdb0844..f95adc0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -926,12 +926,7 @@ UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; - -static inline HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) -{ - V_VT(p) = VT_BSTR; - return return_nsstr(nsres, nsstr, &V_BSTR(p)); -} +HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index aee00e6..a32f8f1 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -69,6 +69,7 @@ static nsresult (CDECL *NS_CStringSetData)(nsACString*,const char*,PRUint32); static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,cpp_bool,nsIFile**); static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,cpp_bool*); static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,cpp_bool*); +static cpp_bool (CDECL *NS_StringGetIsVoid)(const nsAString*); static void* (CDECL *NS_Alloc)(SIZE_T); static void (CDECL *NS_Free)(void*); @@ -518,6 +519,7 @@ static BOOL load_xul(const PRUnichar *gre_path) NS_DLSYM(NS_NewLocalFile); NS_DLSYM(NS_StringGetData); NS_DLSYM(NS_CStringGetData); + NS_DLSYM(NS_StringGetIsVoid); NS_DLSYM(NS_Alloc); NS_DLSYM(NS_Free); NS_DLSYM(ccref_incr); @@ -870,6 +872,38 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) return S_OK; } +HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) +{ + const PRUnichar *str; + + if(NS_FAILED(nsres)) { + ERR("failed: %08x\n", nsres); + nsAString_Finish(nsstr); + return E_FAIL; + } + + if(NS_StringGetIsVoid(nsstr)) { + TRACE("ret null\n"); + V_VT(p) = VT_NULL; + }else { + nsAString_GetData(nsstr, &str); + TRACE("ret %s\n", debugstr_w(str)); + if(*str) { + V_BSTR(p) = SysAllocString(str); + if(!V_BSTR(p)) { + nsAString_Finish(nsstr); + return E_OUTOFMEMORY; + } + }else { + V_BSTR(p) = NULL; + } + V_VT(p) = VT_BSTR; + } + + nsAString_Finish(nsstr); + return S_OK; +} + nsICommandParams *create_nscommand_params(void) { nsICommandParams *ret = NULL;

1 0

Hans Leidekker : webservices: Implement the Message Framing Protocol.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 887af1b3bbc9893d68e6452e8409133836fac916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887af1b3bbc9893d68e6452e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:56 2017 +0200 webservices: Implement the Message Framing Protocol. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 625 +++++++++++++++++++++++++++++++-- dlls/webservices/proxy.c | 7 + dlls/webservices/string.c | 47 ++- dlls/webservices/webservices_private.h | 6 +- 4 files changed, 641 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887af1b3bbc9893d68e64…

1 0

Hans Leidekker : webservices: Write Action and To headers unless the addressing version is WS_ADDRESSING_VERSION_TRANSPORT.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: bb2344b711e698c85c3417afeb5dbc887ee40fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2344b711e698c85c3417afe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 20 15:01:55 2017 +0200 webservices: Write Action and To headers unless the addressing version is WS_ADDRESSING_VERSION_TRANSPORT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 70 +++++++++++++++++++++++++++++++------------- dlls/webservices/tests/msg.c | 32 +++++++++++++++----- 2 files changed, 73 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb2344b711e698c85c341…

1 0

Alexandre Julliard : include: Undefine PARITY_NONE to avoid warnings.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 43f5cd4e2827d70f8600fd88db812ff71f1666fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f5cd4e2827d70f8600fd88d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 20 16:26:41 2017 +0200 include: Undefine PARITY_NONE to avoid warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index d634c86..a8ccb2c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1478,6 +1478,7 @@ typedef struct tagCOMMPROP { #define STOPBITS_15 ((DWORD)2) #define STOPBITS_20 ((DWORD)4) +#undef PARITY_NONE /* defined on Android */ #define PARITY_NONE ((DWORD)0x100) #define PARITY_ODD ((DWORD)0x200) #define PARITY_EVEN ((DWORD)0x400)

1 0

Nikolay Sivov : xmllite/tests: Use input stream helper in more tests.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: b1e0f7597233dd1828586087fe362a9d6d6d4e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e0f7597233dd1828586087f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 20 19:47:08 2017 +0300 xmllite/tests: Use input stream helper in more tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 65 +++++++-------------------------------------- 1 file changed, 10 insertions(+), 55 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9cdc7a7..673e6c4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -796,7 +796,6 @@ static void test_reader_state(void) { XmlNodeType nodetype; IXmlReader *reader; - IStream *stream; HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -815,12 +814,7 @@ if (0) hr = IXmlReader_Read(reader, &nodetype); ok(hr == S_FALSE, "got %08x\n", hr); } - - stream = create_stream_on_data("xml", sizeof("xml")); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - + set_input_string(reader, "xml"); TEST_READER_STATE(reader, XmlReadState_Initial); nodetype = XmlNodeType_Element; @@ -838,7 +832,6 @@ todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1282,7 +1275,6 @@ static void test_read_public_dtd(void) IXmlReader *reader; const WCHAR *str; XmlNodeType type; - IStream *stream; UINT len, count; HRESULT hr; @@ -1292,9 +1284,7 @@ static void test_read_public_dtd(void) hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); ok(hr == S_OK, "got 0x%8x\n", hr); - stream = create_stream_on_data(test_public_dtd, sizeof(test_public_dtd)); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test_public_dtd); read_node(reader, XmlNodeType_DocumentType); @@ -1335,7 +1325,6 @@ todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); } - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1349,7 +1338,6 @@ static void test_read_system_dtd(void) IXmlReader *reader; const WCHAR *str; XmlNodeType type; - IStream *stream; UINT len, count; HRESULT hr; @@ -1359,9 +1347,7 @@ static void test_read_system_dtd(void) hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); ok(hr == S_OK, "got 0x%8x\n", hr); - stream = create_stream_on_data(test_system_dtd, sizeof(test_system_dtd)); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test_system_dtd); read_node(reader, XmlNodeType_DocumentType); @@ -1395,7 +1381,6 @@ todo_wine { read_node(reader, XmlNodeType_Comment); - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1709,11 +1694,8 @@ static void test_read_cdata(void) while (test->xml) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1759,7 +1741,6 @@ static void test_read_cdata(void) reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -1786,11 +1767,8 @@ static void test_read_text(void) while (test->xml) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1832,7 +1810,6 @@ static void test_read_text(void) reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -1862,12 +1839,9 @@ static void test_isemptyelement(void) while (test->xml) { XmlNodeType type; - IStream *stream; BOOL ret; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1877,7 +1851,6 @@ static void test_isemptyelement(void) ret = IXmlReader_IsEmptyElement(reader); ok(ret == test->empty, "got %d, expected %d. xml=%s\n", ret, test->empty, test->xml); - IStream_Release(stream); test++; } @@ -1920,11 +1893,8 @@ static void test_read_attribute(void) while (test->xml) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); hr = IXmlReader_Read(reader, NULL); @@ -1962,7 +1932,6 @@ static void test_read_attribute(void) reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -2019,11 +1988,8 @@ static void test_prefix(void) for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, prefix_tests[i].xml); hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "Read() failed, %#x\n", hr); @@ -2051,8 +2017,6 @@ static void test_prefix(void) /* back to the element, check prefix */ move_to_element(reader); reader_prefix(reader, prefix_tests[i].prefix1); - - IStream_Release(stream); } IXmlReader_Release(reader); @@ -2098,11 +2062,9 @@ static void test_namespaceuri(void) ok(hr == S_OK, "S_OK, got %08x\n", hr); for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { - IStream *stream = create_stream_on_data(uri_tests[i].xml, strlen(uri_tests[i].xml) + 1); unsigned int j = 0; - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, uri_tests[i].xml); type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { @@ -2147,8 +2109,6 @@ static void test_namespaceuri(void) j++; } ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); - - IStream_Release(stream); } IXmlReader_Release(reader); @@ -2224,17 +2184,12 @@ static void test_encoding_detection(void) for (i = 0; i < sizeof(encoding_testsA)/sizeof(encoding_testsA[0]); i++) { - stream = create_stream_on_data(encoding_testsA[i], strlen(encoding_testsA[i])); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, encoding_testsA[i]); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); - - IStream_Release(stream); } for (i = 0; i < sizeof(encoding_testsW)/sizeof(encoding_testsW[0]); i++)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: 97b6b1e224faf948fe9d76ec6bf8d19aa028e8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b6b1e224faf948fe9d76ec6… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jul 20 17:38:45 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 72 ++++++++++++++-------------------------------------------------- 1 file changed, 15 insertions(+), 57 deletions(-) diff --git a/po/fi.po b/po/fi.po index 01e6de0..ef8fc7f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-03 17:32+0200\n" +"PO-Revision-Date: 2017-07-20 17:38+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -6882,27 +6882,23 @@ msgstr "valitse kansio, jossa on %s" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Peruuttamaton virhe: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Virhe [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Varoitus [1]." #: msi.rc:74 -#, fuzzy -#| msgid "Info [1]. " msgid "Info [1]." -msgstr "Tiedote [1]. " +msgstr "Tiedote [1]." #: msi.rc:75 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Levy täynnä.\n" +msgstr "{{Levy täynnä: }}" #: msi.rc:76 msgid "Action %s: [1]. [2]" @@ -6930,6 +6926,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Asennusohjelma kohtasi odottamattoman virheen tämän paketin asennuksessa. " +"Paketissa voi olla ongelma. Virhekoodi on [1]. {{Argumentit ovat: [2], [3], " +"[4]}}" #: msi.rc:92 msgid "Allocating registry space" @@ -12357,38 +12356,6 @@ msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "Tiedostoa %1 ei voi tuoda, koska se ei ole kelpo rekisteritiedosto." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12442,7 +12409,7 @@ msgstr "" "Käyttöesimerkkejä:\n" " regedit \"tuotava.reg\"\n" " regedit /E \"vietävä.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12513,21 +12480,18 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: Rekisterin tietotyypille [%1] kohteessa '%2' ei ole tukea.\n" +msgstr "" +"regedit: Rekisterin tietotyypille [0x%1!x!] kohteessa '%2' ei ole tukea.\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: Rekisteriarvo '%1' viedään binääridatana.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "regedit: Järjestelmäavain [%1] ei kelpaa\n" #: regedit.rc:428 msgid "" @@ -12535,10 +12499,8 @@ msgid "" msgstr "regedit: Ei voida viedä kohdetta '%1'. Rekisteriavainta ei löydy.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: Rekisteriluokkaa '%1' ei voida poistaa.\n" +msgstr "regedit: Rekisteriavainta '%1' ei voida poistaa.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12685,13 +12647,9 @@ msgid "Confirm Key Delete" msgstr "Vahvista avaimen tuhoaminen" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1' ja sen aliavaimet?" +msgstr "Haluatko varmasti tuhota tämän rekisteriavaimen ja sen aliavaimet?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

Hugh McMaster : reg: Avoid using RegQueryInfoKey() to enumerate subkeys and values in the query operation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: fb22f6c416c6a95715866ff92a5454e1bc27e3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb22f6c416c6a95715866ff92… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:33 2017 +0000 reg: Avoid using RegQueryInfoKey() to enumerate subkeys and values in the query operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 87 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 35 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0975acd..a6927d0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -627,11 +627,13 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, static unsigned int num_values_found = 0; +#define MAX_SUBKEY_LEN 257 + static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD max_data_bytes, data_size; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; @@ -639,14 +641,6 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) WCHAR *subkey_name, *subkey_path; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, - NULL, NULL, NULL, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - data = HeapAlloc(GetProcessHeap(), 0, max_data_bytes); if (!data) { @@ -654,8 +648,18 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 1; } - data_size = max_data_bytes; - rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + for (;;) + { + data_size = max_data_bytes; + rc = RegQueryValueExW(key, value_name, NULL, &type, data, &data_size); + if (rc == ERROR_MORE_DATA) + { + max_data_bytes = data_size; + data = HeapReAlloc(GetProcessHeap(), 0, data, max_data_bytes); + } + else break; + } + if (rc == ERROR_SUCCESS) { output_string(fmt, path); @@ -681,8 +685,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + subkey_name = HeapAlloc(GetProcessHeap(), 0, MAX_SUBKEY_LEN * sizeof(WCHAR)); if (!subkey_name) { ERR("Failed to allocate memory for subkey_name\n"); @@ -691,9 +694,10 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) + i = 0; + for (;;) { - subkey_len = max_subkey_len; + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -704,7 +708,9 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) RegCloseKey(subkey); } HeapFree(GetProcessHeap(), 0, subkey_path); + i++; } + else break; } HeapFree(GetProcessHeap(), 0, subkey_name); @@ -714,9 +720,9 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) static int query_all(HKEY key, WCHAR *path, BOOL recurse) { LONG rc; - DWORD num_subkeys, max_subkey_len, subkey_len; - DWORD num_values, max_value_len, value_len; - DWORD max_data_bytes, data_size; + DWORD max_value_len = 256, value_len; + DWORD max_data_bytes = 2048, data_size; + DWORD subkey_len; DWORD i, type, path_len; WCHAR fmt[] = {'%','1','\n',0}; WCHAR fmt_path[] = {'%','1','\\','%','2','\n',0}; @@ -725,17 +731,8 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) BYTE *data; HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, - &num_values, &max_value_len, &max_data_bytes, NULL, NULL); - if (rc) - { - ERR("RegQueryInfoKey failed: %d\n", rc); - return 1; - } - output_string(fmt, path); - max_value_len++; value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); if (!value_name) { @@ -751,23 +748,40 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 1; } - for (i = 0; i < num_values; i++) + i = 0; + for (;;) { value_len = max_value_len; data_size = max_data_bytes; rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) + { output_value(value_name, type, data, data_size); + i++; + } + else if (rc == ERROR_MORE_DATA) + { + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = HeapReAlloc(GetProcessHeap(), 0, data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = HeapReAlloc(GetProcessHeap(), 0, value_name, max_value_len); + } + } + else break; } HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); - if (num_values || recurse) + if (i || recurse) output_string(newlineW); - max_subkey_len++; - subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + subkey_name = HeapAlloc(GetProcessHeap(), 0, MAX_SUBKEY_LEN * sizeof(WCHAR)); if (!subkey_name) { ERR("Failed to allocate memory for subkey_name\n"); @@ -776,9 +790,10 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) path_len = strlenW(path); - for (i = 0; i < num_subkeys; i++) + i = 0; + for (;;) { - subkey_len = max_subkey_len; + subkey_len = MAX_SUBKEY_LEN; rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { @@ -793,12 +808,14 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) HeapFree(GetProcessHeap(), 0, subkey_path); } else output_string(fmt_path, path, subkey_name); + i++; } + else break; } HeapFree(GetProcessHeap(), 0, subkey_name); - if (num_subkeys && !recurse) + if (i && !recurse) output_string(newlineW); return 0;

1 0

Hugh McMaster : regedit: Re-size the data export buffer using the required size instead of doubling it.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: master Commit: d62fb298662cbf9dce2cdd5d8b62562b7f981803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62fb298662cbf9dce2cdd5d8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 20 11:33:24 2017 +0000 regedit: Re-size the data export buffer using the required size instead of doubling it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b726251..394023b 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1384,7 +1384,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) { if (data_size > max_data_bytes) { - max_data_bytes *= 2; + max_data_bytes = data_size; data = resize_buffer(data, max_data_bytes); } else

1 0