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

Akihiro Sagawa : Use CP 1200 (Unicode) for Win32/Win64 version info.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: b027a7db5079f4405eca4610ff2d095e53022d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b027a7db5079f4405eca4610f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 6 23:49:43 2017 +0900 Use CP 1200 (Unicode) for Win32/Win64 version info. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/npmshtml/rsrc.rc | 1 + dlls/version/tests/info.c | 2 -- include/wine/wine_common_ver.rc | 24 ++++++++++++++++++++++-- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/npmshtml/rsrc.rc b/dlls/npmshtml/rsrc.rc index d57e09c..0762266 100644 --- a/dlls/npmshtml/rsrc.rc +++ b/dlls/npmshtml/rsrc.rc @@ -18,6 +18,7 @@ #define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin" #define WINE_FILENAME_STR "npmshtml.dll" +#define WINE_CODEPAGE 04E4 /* need to set "Windows Multilingual" */ #define WINE_EXTRAVALUES \ VALUE "OLESelfRegister", "" \ VALUE "MIMEType", "application/x-oleobject" diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index d3420bc..c033aa9 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -664,7 +664,6 @@ static void test_GetFileVersionInfoEx(void) todo_wine_if(lang != english) ok(LOWORD(translation) == lang, "got %u, expected lang is %u\n", LOWORD(translation), lang); - todo_wine ok(HIWORD(translation) == unicode, "got %u, expected codepage is %u\n", HIWORD(translation), unicode); @@ -706,7 +705,6 @@ static void test_GetFileVersionInfoEx(void) else ok(LOWORD(translation) == english, "[%u] got %u, expected lang is %u\n", i, LOWORD(translation), english); - todo_wine ok(HIWORD(translation) == unicode, "[%u] got %u, expected codepage is %u\n", i, HIWORD(translation), unicode); diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 76ddabf..50ba1cf 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -48,6 +48,8 @@ never complain. #define WINE_VER_STRINGIZE2(x) #x #define WINE_VER_STRINGIZE(x) WINE_VER_STRINGIZE2(x) +#define WINE_VER_HEXPREFIX2(x) 0x ## x +#define WINE_VER_HEXPREFIX(x) WINE_VER_HEXPREFIX2(x) #ifndef WINE_FILEVERSION_STR #define WINE_FILEVERSION_STR WINE_VER_STRINGIZE(WINE_FILEVERSION_MAJOR.WINE_FILEVERSION_MINOR.WINE_FILEVERSION_BUILD.WINE_FILEVERSION_PLATFORMID) @@ -93,6 +95,22 @@ never complain. #define WINE_EXTRAVALUES #endif +#ifndef WINE_CODEPAGE +#ifdef _WIN32 +#define WINE_CODEPAGE 04B0 /* CP1200 (Unicode) */ +#else +#define WINE_CODEPAGE 04E4 /* CP1252 for Win16 */ +#endif +#endif + +#ifndef WINE_CODEPAGE_STR +#define WINE_CODEPAGE_STR WINE_VER_STRINGIZE(WINE_CODEPAGE) +#endif + +#ifndef WINE_CODEPAGE_HEX +#define WINE_CODEPAGE_HEX WINE_VER_HEXPREFIX(WINE_CODEPAGE) +#endif + VS_VERSION_INFO VERSIONINFO FILEVERSION WINE_FILEVERSION PRODUCTVERSION WINE_PRODUCTVERSION @@ -104,7 +122,8 @@ FILESUBTYPE WINE_FILESUBTYPE { BLOCK "StringFileInfo" { - BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */ + /* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */ + BLOCK "0409" WINE_CODEPAGE_STR { VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */ VALUE "FileDescription", WINE_FILEDESCRIPTION_STR @@ -119,6 +138,7 @@ FILESUBTYPE WINE_FILESUBTYPE } BLOCK "VarFileInfo" { - VALUE "Translation", 0x0409, 0x04E4 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */ + /* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */ + VALUE "Translation", 0x0409, WINE_CODEPAGE_HEX } }

1 0

Józef Kucia : d3d11: Print FIXME() about ignoring initial UAV count values only when necessary.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: b768560e498468c343e32d11b6a54414ba8c151f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b768560e498468c343e32d11b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 3 01:30:37 2017 +0100 d3d11: Print FIXME() about ignoring initial UAV count values only when necessary. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6269c68..958dcfe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -654,9 +654,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord if (unordered_access_view_count != D3D11_KEEP_UNORDERED_ACCESS_VIEWS) { - if (initial_counts) - FIXME("Ignoring initial counts.\n"); - wined3d_mutex_lock(); for (i = 0; i < unordered_access_view_start_slot; ++i) { @@ -667,6 +664,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_views[i]); + if (initial_counts && view && view->desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER + && (view->desc.u.Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER)) + && initial_counts[i] != ~(UINT)0) + FIXME("Ignoring initial count %u for slot %u.\n", + initial_counts[i], unordered_access_view_start_slot + i); + wined3d_device_set_unordered_access_view(device->wined3d_device, unordered_access_view_start_slot + i, view ? view->wined3d_view : NULL); @@ -1226,14 +1229,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews( TRACE("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p.\n", iface, start_slot, view_count, views, initial_counts); - if (initial_counts) - FIXME("Ignoring initial counts.\n"); - wined3d_mutex_lock(); for (i = 0; i < view_count; ++i) { struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(views[i]); + if (initial_counts && view && view->desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER + && (view->desc.u.Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER)) + && initial_counts[i] != ~(UINT)0) + FIXME("Ignoring initial count %u for slot %u.\n", initial_counts[i], start_slot + i); + wined3d_device_set_cs_uav(device->wined3d_device, start_slot + i, view ? view->wined3d_view : NULL); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 856805b2269aa497820971d213f683bc4d716681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=856805b2269aa497820971d21… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Mar 6 16:05:25 2017 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 82 ++++++++++++++++++++++------------------------------------------ 1 file changed, 28 insertions(+), 54 deletions(-) diff --git a/po/de.po b/po/de.po index ff7265c..e9c89f2 100644 --- a/po/de.po +++ b/po/de.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: 2016-11-22 12:35+0100\n" +"PO-Revision-Date: 2017-03-06 16:05+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -8376,10 +8376,8 @@ msgid "Wine Control Panel" msgstr "Wine-Systemsteuerung" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Konnte Ausführen-Dialog nicht anzeigen (interner Fehler)" +msgstr "Ausführen-Dialog konnte nicht angezeigt werden (interner Fehler)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)" @@ -9398,10 +9396,8 @@ msgid "Confidentiality Required" msgstr "Vertraulichkeit erforderlich" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Herunterfahren im Gange.\n" +msgstr "SASL-Bindung im Gange" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11980,67 +11976,57 @@ msgid "(unknown %d)" msgstr "(unbekannt %d)" #: regedit.rc:214 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to modify the selected registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Wert konnte nicht geändert werden." #: regedit.rc:215 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Es konnte kein neuer Schlüssel angelegt werden." #: regedit.rc:216 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to create a new registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Es konnte kein neuer Wert angelegt werden." #: regedit.rc:217 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"Der Schlüssel '%1' konnte nicht umbenannt werden.\n" +"Der angegebene Schlüsselname ist bereits vorhanden." #: regedit.rc:218 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"Der Wert '%1' konnte nicht umbenannt werden.\n" +"Der angegebene Name ist bereits vorhanden." #: regedit.rc:219 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to delete the selected registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Schlüssel konnte nicht gelöscht werden." #: regedit.rc:220 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry key." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Schlüssel konnte nicht umbenannt werden." #: regedit.rc:221 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to rename the selected registry value." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der ausgewählte Wert konnte nicht umbenannt werden." #: regedit.rc:222 msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"Die in %1 enthaltenen Schlüssel und Werte wurden erfolgreich zur " +"Registrierung hinzugefügt." #: regedit.rc:223 -#, fuzzy -#| msgid "" -#| "regedit: Unable to export '%1'. The specified registry key was not " -#| "found.\n" msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"regedit: '%1' konnte nicht exportiert werden. Der angegebene Schlüssel wurde " -"nicht gefunden.\n" +"%1 konnte nicht importiert werden. Die angegebene Datei ist keine gültige " +"Registrierungsdatei." #: regedit.rc:375 msgid "" @@ -12274,32 +12260,24 @@ msgid "Displays program information, version number and copyright" msgstr "Zeigt Programminformationen, Version und Copyright an" #: regedit.rc:181 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry value '%1'." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der Wert '%1' konnte nicht abgefragt werden." #: regedit.rc:182 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "Schlüssel von diesem Typ (%u) können nicht geändert werden" +msgstr "Schlüssel von diesem Typ (%1!u!) können nicht bearbeitet werden." #: regedit.rc:183 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "Der Wert ist zu groß (%u)" +msgstr "Der Wert ist zu groß (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" -msgstr "Bitte bestätigen" +msgstr "Löschen des Wertes bestätigen" #: regedit.rc:191 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "Suchfolge '%s' wurde nicht gefunden" +msgstr "Suche abgeschlossen. Die Zeichenfolge '%1' wurde nicht gefunden." #: regedit.rc:186 msgid "Are you sure you want to delete these values?" @@ -12314,10 +12292,8 @@ msgid "New Value #%d" msgstr "Neuer Wert #%d" #: regedit.rc:180 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "Unable to query the registry key '%1'." -msgstr "regedit: Der Schlüssel '%1' konnte nicht geöffnet werden.\n" +msgstr "Der Schlüssel '%1' konnte nicht abgefragt werden." #: regedit.rc:152 msgid "Adds a new multi-string value" @@ -12325,20 +12301,18 @@ msgstr "Fügt eine neue mehrteilige Zeichenfolge hinzu" #: regedit.rc:174 msgid "Exports selected branch of the registry to a text file" -msgstr "Exportiert den ausgewählten Zweig der Registry in eine Textdatei" +msgstr "Exportiert den ausgewählten Zweig der Registrierung in eine Textdatei" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Bitte bestätigen" +msgstr "Löschen des Schlüssels bestätigen" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Sind Sie sicher, dass Sie den Schlüssel '%1' löschen möchten?" +msgstr "" +"Sind Sie sicher, dass Sie den Schlüssel '%1' und alle Unterschlüssel löschen " +"möchten?" #: regsvr32.rc:32 msgid ""

1 0

Henri Verbeet : wined3d: Check rectangle alignment in wined3d_surface_blt( ).
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: d11878891736a92ceb7c83fdbf96255c9d4c8124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11878891736a92ceb7c83fdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 6 10:45:25 2017 +0100 wined3d: Check rectangle alignment in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 51200d2..12ec0de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3183,22 +3183,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } - if (!wined3d_texture_check_block_align(src_texture, - src_sub_resource_idx % src_texture->level_count, src_box)) - { - WARN("Source rectangle not block-aligned.\n"); - hr = WINED3DERR_INVALIDCALL; - goto release; - } - - if (!wined3d_texture_check_block_align(dst_texture, - dst_sub_resource_idx % dst_texture->level_count, dst_box)) - { - WARN("Destination rectangle not block-aligned.\n"); - hr = WINED3DERR_INVALIDCALL; - goto release; - } - hr = surface_cpu_blt_compressed(sbase, dbuf, src_map.row_pitch, dst_map.row_pitch, dst_width, dst_height, src_format, flags, fx); @@ -3684,6 +3668,14 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINEDDERR_INVALIDRECT; } + if ((dst_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + && !wined3d_texture_check_block_align(dst_texture, + dst_sub_resource_idx % dst_texture->level_count, &dst_box)) + { + WARN("Destination rectangle not block-aligned.\n"); + return WINED3DERR_INVALIDCALL; + } + if (src_texture) { src_w = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); @@ -3696,6 +3688,14 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst WARN("The application gave us a bad source rectangle.\n"); return WINEDDERR_INVALIDRECT; } + + if ((src_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + && !wined3d_texture_check_block_align(src_texture, + src_sub_resource_idx % src_texture->level_count, &src_box)) + { + WARN("Source rectangle not block-aligned.\n"); + return WINED3DERR_INVALIDCALL; + } } if (!fx || !(fx->fx))

1 0

Nikolay Sivov : xmllite/reader: Improve the way nesting level returned by GetDepth() is updated.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 8f0c235f819ed77e0006ccee9f027cec97b2a489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0c235f819ed77e0006ccee9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:59 2017 +0300 xmllite/reader: Improve the way nesting level returned by GetDepth() is updated. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 69 +++++++++++++++++------------- dlls/xmllite/tests/reader.c | 100 +++++++++++++++++++++++++------------------- 2 files changed, 98 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f0c235f819ed77e0006c…

1 0

Nikolay Sivov : xmllite/reader: Always return node type from Read().
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 0cbd938af8e900a76abdc890b7a50668d4b3f045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbd938af8e900a76abdc890b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:56 2017 +0300 xmllite/reader: Always return node type from Read(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 10 ++++------ dlls/xmllite/tests/reader.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 699af4b..43dae30 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2786,12 +2786,10 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) hr = reader_parse_nextnode(This); if (oldtype == XmlNodeType_None && This->nodetype != oldtype) This->state = XmlReadState_Interactive; - if (hr == S_OK) - { - TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); - if (nodetype) - *nodetype = This->nodetype; - } + + TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); + if (nodetype) + *nodetype = This->nodetype; return hr; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fba73c9..4685bec 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -647,8 +647,9 @@ static void test_readerinput(void) static void test_reader_state(void) { - IXmlReader *reader; XmlNodeType nodetype; + IXmlReader *reader; + IStream *stream; HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -662,10 +663,33 @@ static void test_reader_state(void) test_read_state(reader, XmlReadState_Closed, -1, FALSE); if (0) { - /* newer versions crash here, probably cause no input was set */ + /* newer versions crash here, probably because no input was set */ 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); + + test_read_state(reader, XmlReadState_Initial, -1, FALSE); + + nodetype = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &nodetype); +todo_wine + ok(FAILED(hr), "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); + + test_read_state(reader, XmlReadState_Error, -1, TRUE); + + nodetype = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &nodetype); +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); } @@ -1118,9 +1142,8 @@ static void test_read_full(void) ok(hr == S_OK, "got %08x\n", hr); i = 0; - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - while (hr == S_OK) + type = ~0u; + while (IXmlReader_Read(reader, &type) == S_OK) { ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); if (test->types[i] == XmlNodeType_None) break; @@ -1134,7 +1157,6 @@ static void test_read_full(void) ok(hr == S_OK, "%d: GetValue failed 0x%08x\n", i, hr); ok(len > 0, "%d: wrong value length %d\n", i, len); } - hr = IXmlReader_Read(reader, &type); i++; } ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); @@ -2024,6 +2046,7 @@ static void test_namespaceuri(void) hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "got %08x\n", hr); + type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { const WCHAR *uri, *local; WCHAR *uriW; @@ -2042,6 +2065,8 @@ static void test_namespaceuri(void) j++; } + todo_wine + ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); IStream_Release(stream); }

1 0

Nikolay Sivov : xmllite/reader: Improve input stream encoding detection.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 80cf8838e38a8be16ca38a7655830a79bbe52da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cf8838e38a8be16ca38a765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:55 2017 +0300 xmllite/reader: Improve input stream encoding detection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 20 +++++++++----- dlls/xmllite/tests/reader.c | 67 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a880bee..699af4b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012-2013, 2016 Nikolay Sivov + * Copyright 2010, 2012-2013, 2016-2017 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -93,6 +93,8 @@ static const WCHAR gtW[] = {'>',0}; static const WCHAR commentW[] = {'<','!','-','-',0}; static const WCHAR piW[] = {'<','?',0}; +static BOOL is_namestartchar(WCHAR ch); + static const char *debugstr_nodetype(XmlNodeType nodetype) { static const char * const type_names[] = @@ -840,10 +842,9 @@ static inline BOOL readerinput_is_utf8(xmlreaderinput *readerinput) static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; - static const WCHAR startW[] = {'<','?'}; - static const WCHAR commentW[] = {'<','!'}; static const char utf8bom[] = {0xef,0xbb,0xbf}; static const char utf16lebom[] = {0xff,0xfe}; + WCHAR *ptrW; *enc = XmlEncoding_Unknown; @@ -854,13 +855,17 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod if (buffer->written <= 3) return MX_E_INPUTEND; } + ptrW = (WCHAR *)buffer->data; /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ if (readerinput_is_utf8(readerinput)) *enc = XmlEncoding_UTF8; - else if (!memcmp(buffer->data, startW, sizeof(startW)) || - !memcmp(buffer->data, commentW, sizeof(commentW))) - *enc = XmlEncoding_UTF16; + else if (*ptrW == '<') + { + ptrW++; + if (*ptrW == '?' || *ptrW == '!' || is_namestartchar(*ptrW)) + *enc = XmlEncoding_UTF16; + } /* try with BOM now */ else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) { @@ -2492,7 +2497,8 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(reader->input, &enc); - TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); + TRACE("detected encoding %s, 0x%08x\n", enc == XmlEncoding_Unknown ? "(unknown)" : + debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; /* always switch first time cause we have to put something in */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f7f738e..fba73c9 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -49,7 +49,7 @@ static void free_str(WCHAR *str) static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; static const char xmldecl_short[] = "<?xml version=\"1.0\"?><RegistrationInfo/>"; -static IStream *create_stream_on_data(const char *data, int size) +static IStream *create_stream_on_data(const void *data, unsigned int size) { IStream *stream = NULL; HGLOBAL hglobal; @@ -2086,6 +2086,70 @@ static void test_read_charref(void) IStream_Release(stream); } +static void test_encoding_detection(void) +{ + static const struct encoding_testW + { + WCHAR text[16]; + } + encoding_testsW[] = + { + { { '<','?','p','i',' ','?','>',0 } }, + { { '<','!','-','-',' ','c','-','-','>',0 } }, + { { 0xfeff,'<','a','/','>',0 } }, + { { '<','a','/','>',0 } }, + }; + static const char *encoding_testsA[] = + { + "<?pi ?>", + "", + "\xef\xbb\xbf<a/>", /* UTF-8 BOM */ + "<a/>", + }; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + /* there's no way to query detected encoding back, so just verify that document is browsable */ + + 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); + + 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++) + { + stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR)); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "%u: got %08x\n", i, hr); + ok(type != XmlNodeType_None, "%u: unexpected node type %d\n", i, type); + + IStream_Release(stream); + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -2108,4 +2172,5 @@ START_TEST(reader) test_prefix(); test_namespaceuri(); test_read_charref(); + test_encoding_detection(); }

1 0

Bruno Jesus : mciavi32: Implement MCI_BREAK.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: c59dcfa50215ebd93a34003c6d76932910587ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59dcfa50215ebd93a34003c6… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 01:24:27 2017 -0300 mciavi32: Implement MCI_BREAK. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mciavi.c | 58 +++++++++++++++++++++++++++++++++++++----- dlls/mciavi32/private_mciavi.h | 5 ++++ 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 843fe2c..b32accb 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -353,6 +353,7 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP DWORD numEvents = 1; HANDLE events[2]; double next_frame_us; + BOOL wait_audio = TRUE; EnterCriticalSection(&wma->cs); @@ -419,19 +420,37 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP else delta = 0; + /* check if the playback was cancelled */ + if ((wma->mci_break.flags & MCI_BREAK_KEY) && + (GetAsyncKeyState(wma->mci_break.parms.nVirtKey) & 0x8000)) + { + if (!(wma->mci_break.flags & MCI_BREAK_HWND) || + GetForegroundWindow() == wma->mci_break.parms.hwndBreak) + { + /* we queue audio blocks ahead so ignore them otherwise the audio + * will keep playing until the buffer is empty */ + wait_audio = FALSE; + + TRACE("playback cancelled using break key\n"); + break; + } + } + LeaveCriticalSection(&wma->cs); ret = WaitForMultipleObjects(numEvents, events, FALSE, delta / 1000); EnterCriticalSection(&wma->cs); if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; } - if (wma->lpWaveFormat) { - while (wma->dwEventCount != nHdr - 1) - { - LeaveCriticalSection(&wma->cs); - Sleep(100); - EnterCriticalSection(&wma->cs); - } + if (wma->lpWaveFormat) + { + if (wait_audio) + while (wma->dwEventCount != nHdr - 1) + { + LeaveCriticalSection(&wma->cs); + Sleep(100); + EnterCriticalSection(&wma->cs); + } /* just to get rid of some race conditions between play, stop and pause */ LeaveCriticalSection(&wma->cs); @@ -871,6 +890,30 @@ static DWORD MCIAVI_mciCue(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUE_PARMS lpPar } /****************************************************************************** + * MCIAVI_mciBreak [internal] + */ +static DWORD MCIAVI_mciBreak(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) +{ + WINE_MCIAVI *wma; + + TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIAVI_mciGetOpenDev(wDevID); + if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + + EnterCriticalSection(&wma->cs); + + wma->mci_break.flags = dwFlags; + wma->mci_break.parms = *lpParms; + + LeaveCriticalSection(&wma->cs); + + return 0; +} + +/****************************************************************************** * MCIAVI_mciSetAudio [internal] */ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_PARMSW lpParms) @@ -988,6 +1031,7 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_WHERE: return MCIAVI_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); case MCI_STEP: return MCIAVI_mciStep (dwDevID, dwParam1, (LPMCI_DGV_STEP_PARMS) dwParam2); case MCI_CUE: return MCIAVI_mciCue (dwDevID, dwParam1, (LPMCI_DGV_CUE_PARMS) dwParam2); + case MCI_BREAK: return MCIAVI_mciBreak (dwDevID, dwParam1, (LPMCI_BREAK_PARMS) dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: return MCIAVI_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); case MCI_SIGNAL: return MCIAVI_mciSignal (dwDevID, dwParam1, (LPMCI_DGV_SIGNAL_PARMS) dwParam2); diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 4dfcc09..1b53ab8 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -76,6 +76,11 @@ typedef struct { DWORD dwToVideoFrame; /* play to */ DWORD dwCurrAudioBlock; /* current audio block being played */ RECT source, dest; + struct + { + DWORD flags; + MCI_BREAK_PARMS parms; + } mci_break; /* data for the background mechanism */ CRITICAL_SECTION cs; HANDLE hStopEvent;

1 0

Bruno Jesus : mciavi32: Trace MCIAVI_CreateWindow.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: d3c25df82456032ac8f9faf16b3f5d549c6826f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c25df82456032ac8f9faf16… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 01:24:26 2017 -0300 mciavi32: Trace MCIAVI_CreateWindow. Also normalize the parms parameter name like other functions Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/wnd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index 66c7565..c9da9ec 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -109,7 +109,7 @@ BOOL MCIAVI_RegisterClass(void) return FALSE; } -BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms) +BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpParms) { static const WCHAR captionW[] = {'W','i','n','e',' ','M','C','I','-','A','V','I',' ','p','l','a','y','e','r',0}; HWND hParent = 0; @@ -119,8 +119,8 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM /* what should be done ? */ if (wma->hWnd) return TRUE; - if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpOpenParms->hWndParent; - if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpOpenParms->dwStyle; + if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpParms->hWndParent; + if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpParms->dwStyle; if (wma->hic) SetRect(&rc, 0, 0, wma->outbih->biWidth, wma->outbih->biHeight); @@ -141,6 +141,9 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM hParent, 0, MCIAVI_hInstance, ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd; + + TRACE("(%04x, %08X, %p, style %x, parent %p, dimensions %dx%d, hwnd %p)\n", wma->wDevID, + dwFlags, lpParms, dwStyle, hParent, rc.right - rc.left, rc.bottom - rc.top, wma->hWnd); return wma->hWnd != 0; }

1 0

Hugh McMaster : regedit/tests: Add some line concatenation tests.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: a3c9a2682cbec89ab41783f21985d59cb13db12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c9a2682cbec89ab41783f21… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 6 12:35:31 2017 +0000 regedit/tests: Add some line concatenation tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c82dfe3..eacb583 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -471,6 +471,31 @@ static void test_invalid_import(void) "\"Test11\"=\"Value\"\n"); verify_reg_nonexist(hkey, "Test11"); + /* Test multi-line import with incorrect comma placement */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg_nonexist(hkey, "Multi-Line1"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Multi-Line2"); + + exec_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=hex(7):4c,69,6e,65,20\\\n" + ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + + exec_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=hex(7):4c,69,6e,65,20\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Multi-Line4"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0