November 2016 - Wine-commits

Grant Paul : xmllite: Parse URLs in `DOCTYPE PUBLIC` DTDs.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 65cbc12ac6e79073e937e5da3ea3de996e220be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65cbc12ac6e79073e937e5da3… Author: Grant Paul <grant(a)grantpaul.com> Date: Tue Nov 22 17:57:20 2016 +0300 xmllite: Parse URLs in `DOCTYPE PUBLIC` DTDs. Signed-off-by: Grant Paul <git(a)grantpaul.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 51 +++++++++++--------- dlls/xmllite/tests/reader.c | 112 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 136 insertions(+), 27 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index deab301..9484173 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1601,8 +1601,9 @@ static HRESULT reader_parse_pub_literal(xmlreader *reader, strval *literal) reader_skipn(reader, 1); cur = reader_get_ptr(reader); } - reader_init_strvalue(start, reader_get_cur(reader)-start, literal); + if (*cur == quote) reader_skipn(reader, 1); + TRACE("%s\n", debug_strval(reader, literal)); return S_OK; } @@ -1612,34 +1613,38 @@ static HRESULT reader_parse_externalid(xmlreader *reader) { static WCHAR systemW[] = {'S','Y','S','T','E','M',0}; static WCHAR publicW[] = {'P','U','B','L','I','C',0}; - strval name; + strval name, sys; HRESULT hr; int cnt; - if (reader_cmp(reader, systemW)) - { - if (reader_cmp(reader, publicW)) - return S_FALSE; - else - { - strval pub; + if (!reader_cmp(reader, publicW)) { + strval pub; - /* public id */ - reader_skipn(reader, 6); - cnt = reader_skipspaces(reader); - if (!cnt) return WC_E_WHITESPACE; + /* public id */ + reader_skipn(reader, 6); + cnt = reader_skipspaces(reader); + if (!cnt) return WC_E_WHITESPACE; - hr = reader_parse_pub_literal(reader, &pub); - if (FAILED(hr)) return hr; + hr = reader_parse_pub_literal(reader, &pub); + if (FAILED(hr)) return hr; - reader_init_cstrvalue(publicW, strlenW(publicW), &name); - return reader_add_attr(reader, &name, &pub); - } - } - else - { - strval sys; + reader_init_cstrvalue(publicW, strlenW(publicW), &name); + hr = reader_add_attr(reader, &name, &pub); + if (FAILED(hr)) return hr; + cnt = reader_skipspaces(reader); + if (!cnt) return S_OK; + + /* optional system id */ + hr = reader_parse_sys_literal(reader, &sys); + if (FAILED(hr)) return S_OK; + + reader_init_cstrvalue(systemW, strlenW(systemW), &name); + hr = reader_add_attr(reader, &name, &sys); + if (FAILED(hr)) return hr; + + return S_OK; + } else if (!reader_cmp(reader, systemW)) { /* system id */ reader_skipn(reader, 6); cnt = reader_skipspaces(reader); @@ -1652,7 +1657,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) return reader_add_attr(reader, &name, &sys); } - return hr; + return S_FALSE; } /* [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' intSubset ']' S?)? '>' */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d0b6184..3658d52 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1136,11 +1136,114 @@ static void test_read_full(void) IXmlReader_Release(reader); } -static const char test_dtd[] = +static const char test_public_dtd[] = + "<!DOCTYPE testdtd PUBLIC \"pubid\" \"externalid uri\" >"; + +static void test_read_public_dtd(void) +{ + static const WCHAR sysvalW[] = {'e','x','t','e','r','n','a','l','i','d',' ','u','r','i',0}; + static const WCHAR pubvalW[] = {'p','u','b','i','d',0}; + static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; + static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; + static const WCHAR pubW[] = {'P','U','B','L','I','C',0}; + IXmlReader *reader; + const WCHAR *str; + XmlNodeType type; + IStream *stream; + UINT len, count; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + 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); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got 0x%8x\n", hr); + ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + + count = 0; + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 2, "got %d\n", count); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(pubW), "got %u\n", len); + ok(!lstrcmpW(str, pubW), "got %s\n", wine_dbgstr_w(str)); + + len = 0; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(pubvalW), "got %u\n", len); + ok(!lstrcmpW(str, pubvalW), "got %s\n", wine_dbgstr_w(str)); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(sysW), "got %u\n", len); + ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); + + len = 0; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == lstrlenW(sysvalW), "got %u\n", len); + ok(!lstrcmpW(str, sysvalW), "got %s\n", wine_dbgstr_w(str)); + + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = 0; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(len == lstrlenW(dtdnameW), "got %u\n", len); + ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); +} + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + 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); +} + +static const char test_system_dtd[] = "<!DOCTYPE testdtd SYSTEM \"externalid uri\" >" ""; -static void test_read_dtd(void) +static void test_read_system_dtd(void) { static const WCHAR sysvalW[] = {'e','x','t','e','r','n','a','l','i','d',' ','u','r','i',0}; static const WCHAR dtdnameW[] = {'t','e','s','t','d','t','d',0}; @@ -1158,7 +1261,7 @@ static void test_read_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_dtd, sizeof(test_dtd)); + 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); @@ -1811,7 +1914,8 @@ START_TEST(reader) test_read_cdata(); test_read_comment(); test_read_pi(); - test_read_dtd(); + test_read_system_dtd(); + test_read_public_dtd(); test_read_element(); test_isemptyelement(); test_read_text();

1 0

Huw Davies : kernel32/tests: Add some GetLastError() values for Windows 8 and 10.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: f1b5e98ad8bc51e6781a012d4aa29ff25c9fc5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b5e98ad8bc51e6781a012d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:08 2016 +0000 kernel32/tests: Add some GetLastError() values for Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index d8584c4..cdcfa15 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2616,27 +2616,35 @@ static void test_ReadConsole(void) SetLastError(0xdeadbeef); ret = GetFileSize(std_input, NULL); ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); - ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || + GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ + "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(!bytes, "expected 0, got %u\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ + "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); }

1 0

Huw Davies : kernel32/tests: On failure don' t test the returned count - it contains random data on Windows 8 and 10.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 542ba85ef88cc07b1dc178531bf900caec64c54d URL: http://source.winehq.org/git/wine.git/?a=commit;h=542ba85ef88cc07b1dc178531… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:09 2016 +0000 kernel32/tests: On failure don't test the returned count - it contains random data on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 179 +++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=542ba85ef88cc07b1dc17…

1 0

Huw Davies : kernel32/tests: VerifyConsoleIoHandle() always returns FALSE on Windows 8 and 10.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 5dd0c7fa7b3b5e4307fab31e1140c8502ea1ec1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd0c7fa7b3b5e4307fab31e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 22 12:00:10 2016 +0000 kernel32/tests: VerifyConsoleIoHandle() always returns FALSE on Windows 8 and 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 79e1772..a14bc45 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1319,7 +1319,9 @@ static void test_VerifyConsoleIoHandle( HANDLE handle ) SetLastError(0xdeadbeef); ret = pVerifyConsoleIoHandle(handle); error = GetLastError(); - ok(ret, "expected VerifyConsoleIoHandle to succeed\n"); + ok(ret || + broken(!ret), /* Windows 8 and 10 */ + "expected VerifyConsoleIoHandle to succeed\n"); ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 5fb1f63976d59afc9f8c068911c726044f4338c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb1f63976d59afc9f8c06891… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Nov 22 12:36:16 2016 +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 | 57 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/po/de.po b/po/de.po index a7da9ec..10b152c 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-07-21 10:58+0200\n" +"PO-Revision-Date: 2016-11-22 12:35+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -8049,10 +8049,8 @@ msgid "Wine was brought to you by:" msgstr "Wine wurde für Sie gekeltert von:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "&Ausführen..." +msgstr "Ausführen" #: shell32.rc:338 msgid "" @@ -10590,10 +10588,8 @@ msgid "IPv6 address" msgstr "IPv6-Adresse" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "Systemkonfiguration" +msgstr "Systeminformationen" #: net.rc:30 msgid "" @@ -12009,6 +12005,33 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Aufruf:\n" +" regedit [Optionen] [Dateiname] [Schlüssel]\n" +"\n" +"Optionen:\n" +" [keine Option] Die grafische Variante des Programms starten.\n" +" /L:system.dat Speicherort der zu modifizierenden system.dat.\n" +" Kompatibel mit jeder anderen Option. Wird ignoriert.\n" +" /R:user.dat Speicherort der zu modifizierenden user.dat.\n" +" Kompatibel mit jeder anderen Option. Wird ignoriert.\n" +" /C Inhalte einer Registrierungsdatei importieren.\n" +" /D Den spezifizierten Schlüssel löschen.\n" +" /E Inhalte des spezifizierten Schlüssels in Datei " +"exportieren.\n" +" Falls kein Schlüssel angegeben wurde, wird die gesamte\n" +" Registrierung exportiert.\n" +" /S Stiller Modus. Es werden keine Meldungen angezeigt.\n" +" /V Die GUI im erweiterten Modus starten. Wird ignoriert.\n" +" /? Diese Hilfe anzeigen und beenden.\n" +" [Dateiname] Speicherort der Datei mit Registrierungsinformationen,\n" +" die importiert, bzw. in welche (wenn [/E] angegeben wurde)\n" +" exportiert werden soll.\n" +" [Schlüssel] Der zu modifizierende Registrierungsschlüssel.\n" +"\n" +"Beispielaufrufe:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -14582,10 +14605,8 @@ msgid "Error: Invalid query\n" msgstr "Fehler: Ungültige Anfrage\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: Ungültige Syntax. " +msgstr "Fehler: Ungültige Syntax für PATH\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -14660,36 +14681,32 @@ msgid "F&ormat" msgstr "Forma&t" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "&Liste" +msgstr "&Listen" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "Auf&zählungszeichen" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL-Nummer" +msgstr "Zahlen" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "Kleinbuchstaben" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "Großbuchstaben" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "Römische Ziffern - Kleinbuchstaben" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "Römische Ziffern - Großbuchstaben" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Bruno Jesus : msvfw32/tests: Add tests for ICInfo().
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 90e4ad3b144b44805e21b8549129c29e75b797e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e4ad3b144b44805e21b8549… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:53 2016 -0200 msvfw32/tests: Add tests for ICInfo(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 125cac5..507d003 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -285,9 +285,47 @@ static void test_ICSeqCompress(void) ok(err == ICERR_BADHANDLE, "Expected -8, got %d\n", err); } +static void test_ICInfo(void) +{ + ICINFO info, info2; + DWORD i, found; + unsigned char *fcc; + + for (i = found = 0; ICInfo(0, i, &info); i++) + { + trace("Codec name: %s, fccHandler: 0x%08x\n", wine_dbgstr_w(info.szName), info.fccHandler); + + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); + + fcc = (unsigned char *)&info.fccHandler; + if (!isalpha(fcc[0])) continue; + + found++; + /* Test getting info with a different case - bug 41602 */ + if (fcc[0] & 0x20) + { + fcc[0] &= ~0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); + } + else + { + fcc[0] |= 0x20; +todo_wine + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); + } + } +todo_wine + ok(found != 0, "expected at least one codec\n"); +} + START_TEST(msvfw) { test_OpenCase(); test_Locate(); test_ICSeqCompress(); + test_ICInfo(); }

1 0

Bruno Jesus : msvfw32: Allow ICInfo to enumerate codecs when fccType is zero.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: ca2420c0ea4e7cc56520e07fd4c1e18e46de503e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2420c0ea4e7cc56520e07fd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 03:52:54 2016 -0200 msvfw32: Allow ICInfo to enumerate codecs when fccType is zero. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 4 ++-- dlls/msvfw32/tests/msvfw.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 0ae33ed..8ed6917 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -248,7 +248,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); if (lRet == ERROR_NO_MORE_ITEMS) break; if (lRet != ERROR_SUCCESS) continue; - if (name != 9 || strncasecmp(buf, fccTypeStr, 5)) continue; + if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; buf[name] = '='; if ((result = handler(buf, cnt++, param))) break; } @@ -262,7 +262,7 @@ static BOOL enum_drivers(DWORD fccType, enum_handler_t handler, void* param) for (s = buf; *s; s += strlen(s) + 1) { TRACE("got %s\n", s); - if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue; + if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; if ((result = handler(s, cnt++, param))) break; } } diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 507d003..d621da2 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -318,7 +318,6 @@ todo_wine "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); } } -todo_wine ok(found != 0, "expected at least one codec\n"); }

1 0

Michael Müller : msvfw32: Use case insensitive compare in ICInfo for fourcc codes.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 02fa1d4cc2f99909d62565e1760bc0158e36d700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02fa1d4cc2f99909d62565e17… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Nov 22 03:52:55 2016 -0200 msvfw32: Use case insensitive compare in ICInfo for fourcc codes. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 5 ++--- dlls/msvfw32/tests/msvfw.c | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 8ed6917..cc5c85d 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -299,9 +299,8 @@ static BOOL ICInfo_enum_handler(const char *drv, unsigned int nr, void *param) ICINFO *lpicinfo = param; DWORD fccHandler = mmioStringToFOURCCA(drv + 5, 0); - /* exact match of fccHandler or nth driver found */ - if ((lpicinfo->fccHandler != nr) && (lpicinfo->fccHandler != fccHandler)) - return FALSE; + if (lpicinfo->fccHandler != nr && compare_fourcc(lpicinfo->fccHandler, fccHandler)) + return FALSE; lpicinfo->fccHandler = fccHandler; lpicinfo->dwFlags = 0; diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index d621da2..3fe6702 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -306,14 +306,12 @@ static void test_ICInfo(void) if (fcc[0] & 0x20) { fcc[0] &= ~0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); } else { fcc[0] |= 0x20; -todo_wine ok(ICInfo(info.fccType, info.fccHandler, &info2), "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); }

1 0

Bruno Jesus : krnl386.exe16: Honour segment prefix override for outs[bwd] instruction.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 01ecb5834b3c27777ca40e4b977e4917b52e93ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ecb5834b3c27777ca40e4b9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 04:03:01 2016 -0200 krnl386.exe16: Honour segment prefix override for outs[bwd] instruction. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/instr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index b0de30f..f59ce90 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -645,14 +645,17 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) (long_addr ? context->Ecx : LOWORD(context->Ecx)) : 1; int opsize = (typ & 1) ? (long_op ? 4 : 2) : 1; int step = (context->EFlags & 0x400) ? -opsize : +opsize; - int seg = outp ? context->SegDs : context->SegEs; /* FIXME: is this right? */ + int seg; if (outp) { + /* Check if there is a segment prefix override and honour it */ + seg = segprefix == -1 ? context->SegDs : segprefix; /* FIXME: Check segment is readable. */ } else { + seg = context->SegEs; /* FIXME: Check segment is writable. */ }

1 0

Bruno Jesus : quartz: Take MP3 padding bit into account when calculating the block size.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 89d4e14c0a87cae4b2a92013db7f7890f075f30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d4e14c0a87cae4b2a92013d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 22 04:14:59 2016 -0200 quartz: Take MP3 padding bit into account when calculating the block size. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 8d42bd8..41221d4 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -367,6 +367,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade int freq_index; int mode_ext; int emphasis; + int padding; int lsf = 1; int mpeg1; int layer; @@ -391,6 +392,7 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade layer = 4-((header[1]>>1)&0x3); bitrate_index = ((header[2]>>4)&0xf); + padding = ((header[2]>>1)&0x1); freq_index = ((header[2]>>2)&0x3) + (mpeg1?(lsf*3):6); mode = ((header[3]>>6)&0x3); mode_ext = ((header[3]>>4)&0x3); @@ -419,12 +421,12 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade if (layer == 3) format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - (format->nSamplesPerSec<<lsf) + 1; + (format->nSamplesPerSec<<lsf) + padding; else if (layer == 2) format->nBlockAlign = format->nAvgBytesPerSec * 8 * 144 / - format->nSamplesPerSec + 1; + format->nSamplesPerSec + padding; else - format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + 1); + format->nBlockAlign = 4 * (format->nAvgBytesPerSec * 8 * 12 / format->nSamplesPerSec + padding); format->wBitsPerSample = 0;

1 0