wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Nikolay Sivov : xmllite/writer: Initial support for indented output.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: c52fa73a43f1159d1e643eff17f409d2c0352129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52fa73a43f1159d1e643eff1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 6 22:54:11 2016 +0300 xmllite/writer: Initial support for indented output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 43 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b4d7102..9318bda 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -1006,6 +1006,54 @@ static void test_writer_state(void) IXmlWriter_Release(writer); } +static void test_indentation(void) +{ + static const WCHAR commentW[] = {'c','o','m','m','e','n','t',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, commentW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, bW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " <b />\r\n" + "</a>"); + + IXmlWriter_Release(writer); + IStream_Release(stream); +} + START_TEST(writer) { test_writer_create(); @@ -1021,4 +1069,5 @@ START_TEST(writer) test_WriteComment(); test_WriteCData(); test_WriteRaw(); + test_indentation(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 65d0bcc..49e65cc 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -2,7 +2,7 @@ * IXmlWriter implementation * * Copyright 2011 Alistair Leslie-Hughes - * Copyright 2014 Nikolay Sivov for CodeWeavers + * Copyright 2014, 2016 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -90,6 +90,7 @@ typedef struct _xmlwriter LONG ref; IMalloc *imalloc; xmlwriteroutput *output; + unsigned int indent_level; BOOL indent; BOOL bom; BOOL omitxmldecl; @@ -417,6 +418,32 @@ static HRESULT writer_close_starttag(xmlwriter *writer) return hr; } +static void writer_inc_indent(xmlwriter *writer) +{ + writer->indent_level++; +} + +static void writer_dec_indent(xmlwriter *writer) +{ + if (writer->indent_level) + writer->indent_level--; +} + +static void write_node_indent(xmlwriter *writer) +{ + static const WCHAR dblspaceW[] = {' ',' '}; + static const WCHAR crlfW[] = {'\r','\n'}; + unsigned int indent_level = writer->indent_level; + + if (!writer->indent) + return; + + if (writer->output->buffer.written) + write_output_buffer(writer->output, crlfW, ARRAY_SIZE(crlfW)); + while (indent_level--) + write_output_buffer(writer->output, dblspaceW, ARRAY_SIZE(dblspaceW)); +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -483,6 +510,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; This->bomwritten = FALSE; + This->indent_level = 0; } /* just reset current output */ @@ -554,6 +582,9 @@ static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LO switch (property) { + case XmlWriterProperty_Indent: + This->indent = !!value; + break; case XmlWriterProperty_ByteOrderMark: This->bom = !!value; break; @@ -636,6 +667,7 @@ static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR data) len = data ? strlenW(data) : 0; + write_node_indent(This); if (!len) write_cdata_section(This->output, NULL, 0); else { @@ -696,6 +728,7 @@ static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, return E_NOTIMPL; } + static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) { static const WCHAR copenW[] = {'<','!','-','-'}; @@ -717,6 +750,7 @@ static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) ; } + write_node_indent(This); write_output_buffer(This->output, copenW, ARRAY_SIZE(copenW)); if (comment) { int len = strlenW(comment), i; @@ -841,6 +875,8 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) if (!element) return WR_E_INVALIDACTION; + writer_dec_indent(This); + if (This->starttagopen) { static WCHAR closetagW[] = {' ','/','>'}; write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); @@ -848,6 +884,7 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) } else { /* write full end tag */ + write_node_indent(This); write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); @@ -994,6 +1031,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP } write_encoding_bom(This); + write_node_indent(This); write_output_buffer(This->output, openpiW, ARRAY_SIZE(openpiW)); write_output_buffer(This->output, name, -1); write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); @@ -1130,8 +1168,10 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre push_element(This, element); + write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, local_name); + writer_inc_indent(This); return S_OK; } @@ -1302,6 +1342,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writer->output = NULL; + writer->indent_level = 0; writer->indent = FALSE; writer->bom = TRUE; writer->omitxmldecl = FALSE;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: fc1563591f1e201cd95330a8a1015d9401b8674a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1563591f1e201cd95330a8a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jul 6 23:01:01 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 55 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/po/fi.po b/po/fi.po index dd6a63b..752b050 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11900,50 +11900,59 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Käyttö:\n" +" regedit [valitsimet] [tiedosto] [rek. avain]\n" +"\n" +"Valitsimet:\n" +" [ei mitään] Käynnistä tämän ohjelman graafinen versio.\n" +" /L:system.dat Muokattavan system.dat-tiedoston sijainti.\n" +" Sopii yhteen muiden valitsinten kanssa. Ei huomioida.\n" +" /R:user.dat Muokattavan user.dat-tiedoston sijainti.\n" +" Sopii yhteen muiden valitsinten kanssa. Ei huomioida.\n" +" /C Tuo rekisteritiedoston sisältö.\n" +" /D Poista määritelty rekisteriavain.\n" +" /E Vie valitun rekisteriavaimen sisältö tiedostoon.\n" +" Jos avainta ei määritellä, koko rekisteri viedään.\n" +" /S Hiljainen tila. Mitään viestejä ei näytetä.\n" +" /V Käynnistä tämä ohjelma edistyneessä tilassa. Ei huomioida.\n" +" /? Näytä nämä tiedot ja lopeta.\n" +" [tiedosto] Sen tiedoston polku, josta rekisteritietoja tuodaan.\n" +" Valitsimen [/E] yhteydessä sen tiedoston polku, johon\n" +" rekisteritiedot viedään.\n" +" [rek. avain] Rekisteriavain, jota muokataan.\n" +"\n" +"Käyttöesimerkkejä:\n" +" regedit \"tuotava.reg\"\n" +" regedit /E \"vietävä.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: Virheellinen tai tuntematon valitsin [%1]\n" -"\n" +msgstr "regedit: Virheellinen tai tuntematon valitsin [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Komennolla \"REG /?\" saat apua.\n" +msgstr "Komennolla \"regedit /?\" saat apua.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Komentoa ei määritelty." +msgstr "regedit: Tiedostonimeä ei määritelty.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Poistettavaa rekisteriavainta ei määritelty.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: Ei löydy ohjelmaa, jonka GUID olisi '%1'\n" +msgstr "regedit: Tiedostoa '%1' ei löydy.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: Ei pääsyä etäkoneelle\n" +msgstr "regedit: Tiedostoa '%1' ei voida avata.\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Kahvaoperaatio ei kelpaa.\n" +msgstr "regedit: Käsittelemätön toiminto.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: 7bfefeacbc0d4c0431a7b5a3490d26d2045d4320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfefeacbc0d4c0431a7b5a34… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Jul 6 17:57:11 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 59 +++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index ff37757..9c167c3 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -11916,48 +11916,63 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Bruk:\n" +" regedit [alternativer] [filnavn] [reg_key]\n" +"\n" +"Alternativer:\n" +" [Ingen alt.] Kjør den grafiske versjonen av dette programmet.\n" +" /L:system.dat Plasseringen til system.dat filen som skal modifiseres.\n" +" Kompatibel med hvilken som helst annen bryter. Ignorert.\n" +" /R:user.dat Plasseringen til user.dat filen som skal modifiseres.\n" +" Kompatibel med hvilken som helst annen bryter. Ignorert.\n" +" /C Importér innholdet av en registerfil.\n" +" /D Slett en spesifikk registernøkkel.\n" +" /E Eksportér innholdet av en spesifikk registernøkkel til en " +"fil.\n" +" Hvis ingen nøkkel er spesifisert, er hele registeret " +"eksportert.\n" +" /S Stille modus. Ingen beskjeder vil bli vist.\n" +" /V Kjør GUI'et i avansert modus. Ignorert.\n" +" /? Vis denne informasjonen og avslutt.\n" +" [filnavn] Plasseringen til filen som inneholder registerinformasjonen " +"som\n" +" skal importeres. Når brukt med [/E], spesifiserer dette \n" +" alternativet plasseringen hvor registerinformasjonen vil \n" +" bli eksportert.\n" +" [reg_key] Registernøkkelen som skal modifiseres.\n" +"\n" +"Brukseksempler:\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 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regsvr32: Ugyldig eller ukjent bryter [%1]\n" +msgstr "regedit: Ugyldig eller ukjent bryter [%1]\n" #: regedit.rc:361 -#, fuzzy -#| msgid "Type \"REG /?\" for help.\n" msgid "Type \"regedit /?\" for help.\n" -msgstr "Skriv \"REG /?\" for hjelp.\n" +msgstr "Skriv \"regedit /?\" for hjelp.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Ingen kommando ble oppgitt." +msgstr "regedit: Intet filnavn ble oppgitt.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Ingen registernøkkel ble oppgitt for fjerning.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: Programmet med GUID %1 ble ikke funnet\n" +msgstr "regedit: Filen \"%1\" ble ikke funnet.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: Ingen tilgang til ekstern maskin\n" +msgstr "regedit: Kan ikke åpne filen \"%1\".\n" #: regedit.rc:366 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "Ugyldig operasjon på referanse.\n" +msgstr "regedit: Uhåndtert handling.\n" #: regedit.rc:163 msgid "Quits the registry editor" @@ -13005,7 +13020,7 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"ADVERSEL: Å feilsøke denne prosessen kan føre til tap av data.\n" +"ADVARSEL: Å feilsøke denne prosessen kan føre til tap av data.\n" "Er du sikker på at du vil koble til feilsøkeren?" #: taskmgr.rc:314

1 0

Francois Gouget : regedit: Make GetwideString() static.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: f099d0b19772c91829986a298d97f70ac3c1cd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f099d0b19772c91829986a298… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 6 17:05:17 2016 +0200 regedit: Make GetwideString() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/regproc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index fee4030..353d5f9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -68,7 +68,7 @@ if (!(p)) \ * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller */ -WCHAR* GetWideString(const char* strA) +static WCHAR* GetWideString(const char* strA) { if(strA) { diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 81223e0..2104e5f 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -25,5 +25,4 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format); BOOL import_registry_file(FILE *in); void delete_registry_key(WCHAR *reg_key_name); -WCHAR* GetWideString(const char* strA); CHAR* GetMultiByteString(const WCHAR* strW);

1 0

Michael Stefaniuc : wineps.drv: Use wine_dbgstr_rect() to print a RECT.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: b06b96595ba51e1dbf152c9d663b02f6346fa002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06b96595ba51e1dbf152c9d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:59:27 2016 +0200 wineps.drv: Use wine_dbgstr_rect() to print a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 00a4a6c..435376c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -129,14 +129,8 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, BANDINFOSTRUCT *ibi = (BANDINFOSTRUCT*)in_data; BANDINFOSTRUCT *obi = (BANDINFOSTRUCT*)out_data; - FIXME("BANDINFO(graphics %d, text %d, rect [%dx%d-%dx%d]), stub!\n", - ibi->GraphicsFlag, - ibi->TextFlag, - ibi->GraphicsRect.top, - ibi->GraphicsRect.bottom, - ibi->GraphicsRect.left, - ibi->GraphicsRect.right - ); + FIXME("BANDINFO(graphics %d, text %d, rect %s), stub!\n", ibi->GraphicsFlag, + ibi->TextFlag, wine_dbgstr_rect(&ibi->GraphicsRect)); *obi = *ibi; return 1; }

1 0

Michael Stefaniuc : riched20/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 07 Jul '16

07 Jul '16

Module: wine Branch: master Commit: f18f44c505bb4b36eeb690f95410dda484844aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18f44c505bb4b36eeb690f95… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 08:51:06 2016 +0200 riched20/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 72 +++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index fd5bcc4..76e2c97 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7050,9 +7050,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); for (n = -3; n <= 3; n++) { @@ -7066,19 +7065,16 @@ static void test_format_rect(void) expected.bottom = min(clientRect.bottom, rc.bottom); expected.right = min(clientRect.right, rc.right); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), - "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - n, rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "[n=%d] rect %s != %s\n", n, wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); } rc = clientRect; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Adding the selectionbar adds the selectionbar width to the left side. */ SendMessageA(hwnd, EM_SETOPTIONS, ECOOP_OR, ECO_SELECTIONBAR); @@ -7086,17 +7082,15 @@ static void test_format_rect(void) ok(options & ECO_SELECTIONBAR, "EM_SETOPTIONS failed to add selectionbar.\n"); expected.left += 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); rc = clientRect; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Removing the selectionbar subtracts the selectionbar width from the left side, * even if the left side is already 0. */ @@ -7105,19 +7099,16 @@ static void test_format_rect(void) ok(!(options & ECO_SELECTIONBAR), "EM_SETOPTIONS failed to remove selectionbar.\n"); expected.left -= 8; /* selection bar width */ SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Set the absolute value of the formatting rectangle. */ rc = clientRect; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); expected = clientRect; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), - "[n=%d] rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - n, rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "[n=%d] rect %s != %s\n", n, wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* MSDN documents the EM_SETRECT message as using the rectangle provided in * LPARAM as being a relative offset when the WPARAM value is 1, but these @@ -7129,9 +7120,8 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* For some reason it does not limit the values to the client rect with * a WPARAM value of 1. */ @@ -7142,9 +7132,8 @@ static void test_format_rect(void) expected = rc; SendMessageA(hwnd, EM_SETRECT, 1, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); /* Reset to default rect and check how the format rect adjusts to window * resize and how it copes with very small windows */ @@ -7157,9 +7146,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); MoveWindow(hwnd, 0, 0, 0, 30, FALSE); GetClientRect(hwnd, &clientRect); @@ -7168,9 +7156,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); MoveWindow(hwnd, 0, 0, 100, 0, FALSE); GetClientRect(hwnd, &clientRect); @@ -7179,9 +7166,8 @@ static void test_format_rect(void) expected.left += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); DestroyWindow(hwnd); @@ -7198,9 +7184,8 @@ static void test_format_rect(void) expected.top += 1; expected.right -= 1; SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); rc = clientRect; InflateRect(&rc, -5, -5); @@ -7210,9 +7195,8 @@ static void test_format_rect(void) expected.right += 1; SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)&rc); SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rc); - ok(EqualRect(&rc, &expected), "rect a(t=%d, l=%d, b=%d, r=%d) != e(t=%d, l=%d, b=%d, r=%d)\n", - rc.top, rc.left, rc.bottom, rc.right, - expected.top, expected.left, expected.bottom, expected.right); + ok(EqualRect(&rc, &expected), "rect %s != %s\n", wine_dbgstr_rect(&rc), + wine_dbgstr_rect(&expected)); DestroyWindow(hwnd); }

1 0

Jacek Caban : wininet: Added semi-stub INTERNET_OPTION_END_BROWSER_SESSION implementation.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 27ea3804ddc8077fedb7a0ea81ac96910f78a26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ea3804ddc8077fedb7a0ea8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:44:15 2016 +0200 wininet: Added semi-stub INTERNET_OPTION_END_BROWSER_SESSION implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 ++- dlls/wininet/tests/internet.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d3d6a38..19cf470 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2805,7 +2805,8 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, FIXME("Option INTERNET_OPTION_RESET_URLCACHE_SESSION: STUB\n"); break; case INTERNET_OPTION_END_BROWSER_SESSION: - FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: STUB\n"); + FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: semi-stub\n"); + free_cookie(); break; case INTERNET_OPTION_CONNECTED_STATE: FIXME("Option INTERNET_OPTION_CONNECTED_STATE: STUB\n"); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index ac8e9b3..5408af8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1173,6 +1173,28 @@ static void test_InternetSetOption(void) ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); } +static void test_end_browser_session(void) +{ + DWORD len; + BOOL ret; + + ret = InternetSetCookieA("http://www.example.com/test_end", NULL, "A=B"); + ok(ret == TRUE, "InternetSetCookie failed\n"); + + len = 1024; + ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len); + ok(ret == TRUE,"InternetGetCookie failed\n"); + ok(len != 0, "len = 0\n"); + + ret = InternetSetOptionA(NULL, INTERNET_OPTION_END_BROWSER_SESSION, NULL, 0); + ok(ret, "InternetSetOptio(INTERNET_OPTION_END_BROWSER_SESSION) failed: %u\n", GetLastError()); + + len = 1024; + ret = InternetGetCookieA("http://www.example.com/test_end", NULL, NULL, &len); + ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookie returned %x (%u)\n", ret, GetLastError()); + ok(!len, "len = %u\n", len); +} + #define verifyProxyEnable(e) r_verifyProxyEnable(__LINE__, e) static void r_verifyProxyEnable(LONG l, DWORD exp) { @@ -1805,4 +1827,5 @@ START_TEST(internet) win_skip("Privacy[SG]etZonePreferenceW are not available\n"); test_InternetSetOption(); + test_end_browser_session(); }

1 0

Jacek Caban : wininet: Always set returned size in InternetGetCookieExA.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: b53b717dadcaf5fb4e2af1985a42e5ca7f495062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53b717dadcaf5fb4e2af1985… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:44:01 2016 +0200 wininet: Always set returned size in InternetGetCookieExA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 4 ++-- dlls/wininet/tests/internet.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 3240633..5421fe1 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -808,7 +808,7 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, LPSTR lpCookieData, LPDWORD lpdwSize, DWORD flags, void *reserved) { WCHAR *url, *name; - DWORD len, size; + DWORD len, size = 0; BOOL r; TRACE("(%s %s %p %p(%u) %x %p)\n", debugstr_a(lpszUrl), debugstr_a(lpszCookieName), @@ -841,12 +841,12 @@ BOOL WINAPI InternetGetCookieExA(LPCSTR lpszUrl, LPCSTR lpszCookieName, r = FALSE; } } - *lpdwSize = size; } heap_free( szCookieData ); } } + *lpdwSize = size; heap_free( name ); heap_free( url ); return r; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9b0a2e7..ac8e9b3 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -360,11 +360,13 @@ static void test_get_cookie(void) DWORD len; BOOL ret; + len = 1024; SetLastError(0xdeadbeef); ret = InternetGetCookieA("http://www.example.com", NULL, NULL, &len); ok(!ret && GetLastError() == ERROR_NO_MORE_ITEMS, "InternetGetCookie should have failed with %s and error %d\n", ret ? "TRUE" : "FALSE", GetLastError()); + ok(!len, "len = %u\n", len); }

1 0

Jacek Caban : wininet: Free all cookie data in free_cookie.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 8332d8066574e98690101b4523e3afc00ae9f352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8332d8066574e98690101b452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 6 13:43:35 2016 +0200 wininet: Free all cookie data in free_cookie. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/cookie.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 38f69e0..3240633 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -684,6 +684,33 @@ DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) return res; } +static void free_cookie_domain_list(struct list *list) +{ + cookie_container_t *container; + cookie_domain_t *domain; + + while(!list_empty(list)) { + domain = LIST_ENTRY(list_next(list, list), cookie_domain_t, entry); + + free_cookie_domain_list(&domain->subdomain_list); + + while(!list_empty(&domain->path_list)) { + container = LIST_ENTRY(list_next(&domain->path_list, &domain->path_list), cookie_container_t, entry); + + while(!list_empty(&container->cookie_list)) + delete_cookie(LIST_ENTRY(list_next(&container->cookie_list, &container->cookie_list), cookie_t, entry)); + + heap_free(container->cookie_url); + list_remove(&container->entry); + heap_free(container); + } + + heap_free(domain->domain); + list_remove(&domain->entry); + heap_free(domain); + } +} + /*********************************************************************** * InternetGetCookieExW (WININET.@) * @@ -1239,5 +1266,9 @@ BOOL WINAPI InternetSetPerSiteCookieDecisionW( LPCWSTR pchHostName, DWORD dwDeci void free_cookie(void) { - DeleteCriticalSection(&cookie_cs); + EnterCriticalSection(&cookie_cs); + + free_cookie_domain_list(&domain_list); + + LeaveCriticalSection(&cookie_cs); }

1 0

Max Qian : secur32: Added support for a few more algids.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: cf9cd32df385f545d5c4933140135bd8f56dd212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9cd32df385f545d5c493314… Author: Max Qian <public(a)maxqia.com> Date: Wed Jul 6 16:06:53 2016 +0200 secur32: Added support for a few more algids. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 23 ++++++++++++++++------- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcadd47..7f2dbd6 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -315,11 +315,12 @@ static ALG_ID schannel_get_mac_algid(gnutls_mac_algorithm_t mac) { case GNUTLS_MAC_UNKNOWN: case GNUTLS_MAC_NULL: return 0; + case GNUTLS_MAC_MD2: return CALG_MD2; case GNUTLS_MAC_MD5: return CALG_MD5; - case GNUTLS_MAC_SHA1: - case GNUTLS_MAC_SHA256: - case GNUTLS_MAC_SHA384: - case GNUTLS_MAC_SHA512: return CALG_SHA; + case GNUTLS_MAC_SHA1: return CALG_SHA1; + case GNUTLS_MAC_SHA256: return CALG_SHA_256; + case GNUTLS_MAC_SHA384: return CALG_SHA_384; + case GNUTLS_MAC_SHA512: return CALG_SHA_512; default: FIXME("unknown algorithm %d\n", mac); return 0; @@ -330,9 +331,17 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) { switch (kx) { - case GNUTLS_KX_RSA: return CALG_RSA_KEYX; - case GNUTLS_KX_DHE_DSS: - case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; + case GNUTLS_KX_UNKNOWN: return 0; + case GNUTLS_KX_RSA: + case GNUTLS_KX_RSA_EXPORT: return CALG_RSA_KEYX; + case GNUTLS_KX_DHE_PSK: + case GNUTLS_KX_DHE_DSS: + case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; + case GNUTLS_KX_ANON_ECDH: return CALG_ECDH; + /* MSDN mentions CALG_ECDH_EPHEM, but doesn't appear in the Windows SDK. */ + case GNUTLS_KX_ECDHE_RSA: + case GNUTLS_KX_ECDHE_PSK: return CALG_ECDH; + case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA; default: FIXME("unknown algorithm %d\n", kx); return 0; diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index b940881..fdfa48e 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -500,7 +500,8 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_ECDHE_ECDSA: case schan_kx_ECDHE_RSA: return CALG_ECDH; case schan_kx_NULL: return 0; - case schan_kx_RSA: return CALG_RSA_KEYX; + case schan_kx_RSA: + case schan_kx_RSA_EXPORT: return CALG_RSA_KEYX; case schan_kx_DH_anon_EXPORT: case schan_kx_DH_anon: @@ -509,7 +510,6 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_DH_RSA_EXPORT: case schan_kx_DH_RSA: case schan_kx_FORTEZZA_DMS: - case schan_kx_RSA_EXPORT: FIXME("Don't know CALG for key exchange algorithm %d for cipher suite %#x, returning 0\n", c->kx_alg, (unsigned)c->suite); return 0;

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2016