November 2016 - Wine-Commits

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

Nov. 22, 2016

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

Julian Rüger : po: Update German translation.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

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

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

Nov. 22, 2016

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

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

Nov. 22, 2016

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

Hadrien Boizard : comctl32: Use wine_dbgstr_point in TRACES.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 891540436ff8d2a099e5dbe04d4e57ade9d1b905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891540436ff8d2a099e5dbe04… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Tue Nov 22 00:38:39 2016 +0100 comctl32: Use wine_dbgstr_point in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tooltips.c | 2 +- dlls/comctl32/trackbar.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 86435ca..80b800e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -816,7 +816,7 @@ DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt) { int i; - TRACE ("%d, %d\n", pt.x, pt.y); + TRACE ("%s\n", wine_dbgstr_point(&pt)); if (PtInRect (&infoPtr->calbutton, pt)) return DTHT_MCPOPUP; if (PtInRect (&infoPtr->checkbox, pt)) return DTHT_CHECKBOX; diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0fef638..6a10860 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2170,7 +2170,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) hit = MONTHCAL_HitTest(infoPtr, &ht); - TRACE("%x at (%d, %d)\n", hit, ht.pt.x, ht.pt.y); + TRACE("%x at %s\n", hit, wine_dbgstr_point(&ht.pt)); switch(hit) { diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 752f870..ca6f50d 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3321,7 +3321,7 @@ REBAR_NCHitTest (const REBAR_INFO *infoPtr, LPARAM lParam) ret, i); ret = (LRESULT) i; } - TRACE("returning %ld, client point (%d,%d)\n", ret, clpt.x, clpt.y); + TRACE("returning %ld, client point %s\n", ret, wine_dbgstr_point(&clpt)); return ret; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 4944e3b..56dc743 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1523,7 +1523,7 @@ TOOLTIPS_RelayEvent (TOOLTIPS_INFO *infoPtr, LPMSG lpMsg) &pt); TRACE("tool (%p) %d %d %d\n", infoPtr->hwndSelf, nOldTool, infoPtr->nTool, infoPtr->nCurrentTool); - TRACE("WM_MOUSEMOVE (%p %d %d)\n", infoPtr->hwndSelf, pt.x, pt.y); + TRACE("WM_MOUSEMOVE (%p %s)\n", infoPtr->hwndSelf, wine_dbgstr_point(&pt)); if (infoPtr->nTool != nOldTool) { if(infoPtr->nTool == -1) { /* Moved out of all tools */ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 26f5cdc..5ce32e4 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -450,7 +450,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) LONG dir = TRACKBAR_GetAutoPageDirection(infoPtr, clickPoint); LONG prevPos = infoPtr->lPos; - TRACE("x=%d, y=%d, dir=%d\n", clickPoint.x, clickPoint.y, dir); + TRACE("clickPoint=%s, dir=%d\n", wine_dbgstr_point(&clickPoint), dir); if (dir > 0 && (infoPtr->flags & TB_AUTO_PAGE_RIGHT)) TRACKBAR_PageDown(infoPtr);

1 0

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

Nov. 22, 2016

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

Nikolay Sivov : d2d1: Store stroke style properties, implement methods returning them.
by Alexandre Julliard Nov. 22, 2016

Nov. 22, 2016

Module: wine Branch: master Commit: 786633e311703fe471e00b49c1fcbdf39d12bc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786633e311703fe471e00b49c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 16:38:36 2016 +0300 d2d1: Store stroke style properties, implement methods returning them. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/stroke.c | 43 +++++++++++++++++++++++------------ dlls/d2d1/tests/d2d1.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index a6bc4f3..bfe60ee 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -223,6 +223,7 @@ struct d2d_stroke_style LONG refcount; ID2D1Factory *factory; + D2D1_STROKE_STYLE_PROPERTIES desc; }; void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 167db67..3b5dbfd 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -84,51 +84,65 @@ static void STDMETHODCALLTYPE d2d_stroke_style_GetFactory(ID2D1StrokeStyle *ifac static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetStartCap(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_CAP_STYLE_FLAT; + return style->desc.startCap; } static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetEndCap(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_CAP_STYLE_FLAT; + return style->desc.endCap; } static D2D1_CAP_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashCap(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_CAP_STYLE_FLAT; + return style->desc.dashCap; } static float STDMETHODCALLTYPE d2d_stroke_style_GetMiterLimit(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return style->desc.miterLimit; } static D2D1_LINE_JOIN STDMETHODCALLTYPE d2d_stroke_style_GetLineJoin(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); - return D2D1_LINE_JOIN_MITER; + TRACE("iface %p.\n", iface); + + return style->desc.lineJoin; } static float STDMETHODCALLTYPE d2d_stroke_style_GetDashOffset(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return 0.0f; + return style->desc.dashOffset; } static D2D1_DASH_STYLE STDMETHODCALLTYPE d2d_stroke_style_GetDashStyle(ID2D1StrokeStyle *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_stroke_style *style = impl_from_ID2D1StrokeStyle(iface); + + TRACE("iface %p.\n", iface); - return D2D1_DASH_STYLE_SOLID; + return style->desc.dashStyle; } static UINT32 STDMETHODCALLTYPE d2d_stroke_style_GetDashesCount(ID2D1StrokeStyle *iface) @@ -168,4 +182,5 @@ void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory style->ID2D1StrokeStyle_iface.lpVtbl = &d2d_stroke_style_vtbl; style->refcount = 1; ID2D1Factory_AddRef(style->factory = factory); + style->desc = *desc; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 04ce2b5..857cba2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3333,6 +3333,63 @@ static void test_desktop_dpi(void) ID2D1Factory_Release(factory); } +static void test_stroke_style(void) +{ + D2D1_STROKE_STYLE_PROPERTIES desc; + ID2D1StrokeStyle *style; + ID2D1Factory *factory; + UINT32 count; + HRESULT hr; + D2D1_CAP_STYLE cap_style; + D2D1_LINE_JOIN line_join; + float miter_limit, dash_offset; + D2D1_DASH_STYLE dash_style; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + desc.startCap = D2D1_CAP_STYLE_SQUARE; + desc.endCap = D2D1_CAP_STYLE_ROUND; + desc.dashCap = D2D1_CAP_STYLE_TRIANGLE; + desc.lineJoin = D2D1_LINE_JOIN_BEVEL; + desc.miterLimit = 1.5f; + desc.dashStyle = D2D1_DASH_STYLE_DOT; + desc.dashOffset = -1.0f; + + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 0, &style); + ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr); + + cap_style = ID2D1StrokeStyle_GetStartCap(style); + ok(cap_style == D2D1_CAP_STYLE_SQUARE, "Unexpected cap style %d.\n", cap_style); + cap_style = ID2D1StrokeStyle_GetEndCap(style); + ok(cap_style == D2D1_CAP_STYLE_ROUND, "Unexpected cap style %d.\n", cap_style); + cap_style = ID2D1StrokeStyle_GetDashCap(style); + ok(cap_style == D2D1_CAP_STYLE_TRIANGLE, "Unexpected cap style %d.\n", cap_style); + line_join = ID2D1StrokeStyle_GetLineJoin(style); + ok(line_join == D2D1_LINE_JOIN_BEVEL, "Unexpected line joind %d.\n", line_join); + miter_limit = ID2D1StrokeStyle_GetMiterLimit(style); + ok(miter_limit == 1.5f, "Unexpected miter limit %f.\n", miter_limit); + dash_style = ID2D1StrokeStyle_GetDashStyle(style); + ok(dash_style == D2D1_DASH_STYLE_DOT, "Unexpected dash style %d.\n", dash_style); + dash_offset = ID2D1StrokeStyle_GetDashOffset(style); + ok(dash_offset == -1.0f, "Unexpected dash offset %f.\n", dash_offset); + + + ID2D1StrokeStyle_Release(style); + + /* NULL dashes array, non-zero length. */ + memset(&desc, 0, sizeof(desc)); + hr = ID2D1Factory_CreateStrokeStyle(factory, &desc, NULL, 1, &style); + ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr); + + count = ID2D1StrokeStyle_GetDashesCount(style); + ok(count == 0, "Unexpected dashes count %u.\n", count); + + ID2D1StrokeStyle_Release(style); + + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { test_clip(); @@ -3353,4 +3410,5 @@ START_TEST(d2d1) test_hwnd_target(); test_bitmap_target(); test_desktop_dpi(); + test_stroke_style(); }

1 0

Jeremy Newman : fix typo
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: 37d412dc1e8c0188e1cb21e1f1a523d0f4f2b5d1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=37d412dc1e8c0188e1cb21e1… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 14:55:19 2016 -0600 fix typo --- include/objectManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/objectManager.php b/include/objectManager.php index eaf0503..182a8b9 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -187,7 +187,7 @@ class ObjectManager { header("HTTP/1.1 404 Not Found"); echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; - echo "<p>We are unable to find the page your are trying to access. Please check your URL and try again.</p>\n"; + echo "<p>We are unable to find the page you are trying to access. Please check your URL and try again.</p>\n"; } else {

1 0

Jeremy Newman : improve item not found handling with 404 code
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: be04b155ec663365febc3fc2459d73f7f28f9c20 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=be04b155ec663365febc3fc2… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 14:48:37 2016 -0600 improve item not found handling with 404 code --- include/objectManager.php | 21 +++++++++++++++++---- objectManager.php | 15 ++++++--------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 126dfac..eaf0503 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -181,9 +181,22 @@ class ObjectManager return $bAllowed; } - public static function error_exit($shMessage) + public static function error_exit($shMessage, $b404 = false) { - echo '<div align="center"><p><font color="red"><b>'.$shMessage.'</b></font></p></div'; + if ($b404) + { + header("HTTP/1.1 404 Not Found"); + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; + echo "<p>We are unable to find the page your are trying to access. Please check your URL and try again.</p>\n"; + } + else + { + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> Error!</h1>\n"; + echo "<p>We have encountered an error. More details in message below.</p>\n"; + } + echo "<p>If you feel this is an error on our end, please report it to our <a href=\"https://forum.winehq.org/viewforum.php?f=11\">forums</a>.\n"; + echo "<hr>\n"; + echo "<p><b>Error Message:</b> {$shMessage}</p>\n"; echo apidb_footer(); exit; } @@ -1287,11 +1300,11 @@ class ObjectManager /* Check that the entry exists */ if(!$oObject->objectGetId() && !$this->isNullIdAllowed('view')) - $this->error_exit("Entry not found (class: {$this->sClass}, id: {$this->iId})"); + $this->error_exit("Entry not found (class: {$this->sClass}, id: {$this->iId})", true); /* Check if the entry has been deleted */ if($oObject->objectGetState() == 'deleted') - $this->error_exit("This entry has been deleted (class: {$this->sClass}, id: {$this->iId})<br>\nIts content may have been moved to another entry"); + $this->error_exit("This entry has been deleted (class: {$this->sClass}, id: {$this->iId})<br>\nIts content may have been moved to another entry", true); /* Show a note if the entry is queued or rejected */ if($oObject->objectGetState() != 'accepted') diff --git a/objectManager.php b/objectManager.php index 37f61a9..1d3d66f 100644 --- a/objectManager.php +++ b/objectManager.php @@ -31,16 +31,13 @@ require_once(BASE.'include/tag_CommonReply.php'); require_once(BASE.'include/commonReply.php'); /* if we have no valid class name we should abort */ -if(!isset($aClean['sClass'])) +if(empty($aClean['sClass']) or !class_exists($aClean['sClass'])) { - echo "No class defined.\n"; - exit; -} - -/* make sure the class is defined */ -if(!class_exists($aClean['sClass'])) -{ - echo "Class ".$aClean['sClass']." doesn't exist"; + header("HTTP/1.1 404 Not Found"); + apidb_header("404 - Not Found!"); + echo "<h1 class=\"whq-app-title\"><i class=\"fa fa-exclamation-circle\"></i> 404 - Not Found!</h1>\n"; + echo "<p>We were unable to load this page due to a missing or invalid class parameter.</p>\n"; + apidb_footer(); exit; }

1 0

Jeremy Newman : add google captcha check to the account creation form
by Jeremy Newman Nov. 22, 2016

Nov. 22, 2016

Module: appdb Branch: master Commit: 159c60543f698264c3b2c31c800938548582552e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=159c60543f698264c3b2c31c… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 11:27:37 2016 -0600 add google captcha check to the account creation form --- account.php | 20 +++++++++++++++++++- include/config.php.sample | 4 ++++ include/filter.php | 4 ++-- include/form_login_new.php | 6 ++++++ include/reCaptcha.php | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/account.php b/account.php index 6a6e3cd..f001d15 100644 --- a/account.php +++ b/account.php @@ -38,7 +38,7 @@ function do_account($sCmd = null) switch($sCmd) { case "new": - apidb_header("New Account"); + apidb_header("New Account", "<script src='https://www.google.com/recaptcha/api.js'></script>"); include(BASE."include/"."form_login_new.php"); apidb_footer(); exit; @@ -102,6 +102,24 @@ function cmd_do_new() return; } + if (!empty($aClean['g-recaptcha-response'])) + { + // validate captcha + require(BASE."include/reCaptcha.php"); + $reCaptcha = new reCaptcha(RECAPTCHA_SECRET); + if (!$reCaptcha->validate($aClean['g-recaptcha-response'], $_SERVER['REMOTE_ADDR'])) + { + // reCAPTCHA failed + retry("new", "reCAPTCHA check failed!"); + return; + } + } + else + { + retry("new", "reCAPTCHA check failed!"); + return; + } + $oUser = new User(); $sPassword = substr(base_convert(rand(0, PHP_INT_MAX),10, 36), 0, 9); $iResult = $oUser->create($aClean['sUserEmail'], $sPassword, diff --git a/include/config.php.sample b/include/config.php.sample index 53cba20..57f2652 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -20,6 +20,10 @@ define("APPDB_OWNER_EMAIL","appdb(a)winehq.org"); // e-mail of this product/compan define("APPDB_SENDER_EMAIL","appdb-noreply(a)winehq.org"); // The e-mail address which appears as the sender in mails sent by the AppDB define("BUGZILLA_ROOT","https://bugs.winehq.org/"); // path to bugzilla +// Google reCaptcha Secret Key - required on account creations +define("RECAPTCHA_KEY",""); +define("RECAPTCHA_SECRET",""); + // AppDB developers: Use this define to disable email from being sent from the appdb during testing //if(!defined("DISABLE_EMAIL")) // define("DISABLE_EMAIL", true); // disable email, see mail_appdb() in include/mail.php diff --git a/include/filter.php b/include/filter.php index 404e3a1..aa3fa6d 100644 --- a/include/filter.php +++ b/include/filter.php @@ -40,8 +40,8 @@ function filter_gpc() (strpos($aKeys[$i], "XinhaColorPicker") === 0) || // Xinha variables ($aKeys[$i] == "cx") || // google custom search variable ($aKeys[$i] == "cof") || // google custom search variable - ($aKeys[$i] == "q")) // google custom search variable - + ($aKeys[$i] == "q") || // google custom search variable + ($aKeys[$i] == "g-recaptcha-response")) // google reCaptcha variable { // copy the key over to the clean array // NOTE: we do not strip html tags or trim any Xinha variables diff --git a/include/form_login_new.php b/include/form_login_new.php index c063e71..00d14d7 100644 --- a/include/form_login_new.php +++ b/include/form_login_new.php @@ -34,6 +34,12 @@ $sReturnTo = (!empty($aClean['sReturnTo']) ? $aClean['sReturnTo'] : ''); </div> </div> <div class="form-group"> + <label class="col-sm-2 control-label"></label> + <div class="col-sm-10"> + <div class="g-recaptcha" data-sitekey="<?php echo RECAPTCHA_KEY; ?>"></div> + </div> +</div> +<div class="form-group"> <div class="col-sm-offset-2 col-sm-10"> <button type="submit" name="sCreate" class="btn btn-default"><i class="fa fa-sign-in"></i> Create Account</button> </div> diff --git a/include/reCaptcha.php b/include/reCaptcha.php new file mode 100644 index 0000000..09446d3 --- /dev/null +++ b/include/reCaptcha.php @@ -0,0 +1,34 @@ +<?php + +/* + Google Re-Captcha Class + by Jeremy Newman <jnewman(a)codeweavers.com> +*/ + +class reCaptcha +{ + private $reCaptchaSecret = ''; + public $res = false; + public function __construct ($secret = '') + { + $this->reCaptchaSecret = $secret; + return true; + } + public function validate ($resp, $ip) + { + if (empty($resp) or empty($ip)) + return false; + $post = array('secret' => $this->reCaptchaSecret, 'response' => $resp, 'remoteip' => $ip); + $ch = curl_init('https://www.google.com/recaptcha/api/siteverify'); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $post); + $res = json_decode(curl_exec($ch)); + $this->res = $res; + curl_close($ch); + if (!empty($res->success) and $res->success) + return true; + return false; + } +} + +?> \ No newline at end of file

1 0