May 2014 - Wine-Commits - list.winehq.org

Henri Verbeet : d2d1: Add the ID2D1Layer interface.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 66cca10d568a1977f28bd944e296663f3fa016df URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cca10d568a1977f28bd944e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 16 09:59:20 2014 +0200 d2d1: Add the ID2D1Layer interface. --- include/d2d1.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index c96b67e..b8d8531 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -707,5 +707,15 @@ interface ID2D1RadialGradientBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd9069b-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Layer : ID2D1Resource +{ + D2D1_SIZE_F GetSize(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Alexandre Julliard : winemapi: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 78cf6059bc320aa983daa2fd02d7babb49081c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cf6059bc320aa983daa2fd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:34:04 2014 +0200 winemapi: Remove unnecessary DllMain implementation. --- dlls/winemapi/main.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index 0627aa2..8cd6b6d 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -31,14 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemapi); -/*********************************************************************** - * DllMain (MAPI32.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); - return TRUE; -} ULONG WINAPI MAPIAddress(LHANDLE session, ULONG_PTR uiparam, LPSTR caption, ULONG editfields, LPSTR labels, ULONG nRecips, lpMapiRecipDesc lpRecips,

1 0

Alexandre Julliard : d3d10core: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: a3ab118b1e3eeea214a8d9b8e9dd26781625d07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab118b1e3eeea214a8d9b8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 16 11:33:45 2014 +0200 d3d10core: Remove unnecessary DllMain implementation. --- dlls/d3d10core/d3d10core_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index abc8434..9006d95 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -25,18 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - static HRESULT WINAPI layer_init(enum dxgi_device_layer_id id, DWORD *count, DWORD *values) { TRACE("id %#x, count %p, values %p\n", id, count, values);

1 0

Nikolay Sivov : xmllite/writer: Fix Flush() behaviour on partial writes.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: 81d2516449f0c2df39d76b493230853e8afa7a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d2516449f0c2df39d76b493… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 12:42:52 2014 +0400 xmllite/writer: Fix Flush() behaviour on partial writes. --- dlls/xmllite/tests/writer.c | 78 +++++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 33 +++++++++--------- 2 files changed, 93 insertions(+), 18 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b6b8fe3..d7cfe44 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -67,6 +67,53 @@ static const IUnknownVtbl testoutputvtbl = { static IUnknown testoutput = { &testoutputvtbl }; +static HRESULT WINAPI teststream_QueryInterface(ISequentialStream *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ISequentialStream)) + { + *obj = iface; + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI teststream_AddRef(ISequentialStream *iface) +{ + return 2; +} + +static ULONG WINAPI teststream_Release(ISequentialStream *iface) +{ + return 1; +} + +static HRESULT WINAPI teststream_Read(ISequentialStream *iface, void *pv, ULONG cb, ULONG *pread) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ULONG g_write_len; +static HRESULT WINAPI teststream_Write(ISequentialStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + g_write_len = cb; + *written = cb; + return S_OK; +} + +static const ISequentialStreamVtbl teststreamvtbl = +{ + teststream_QueryInterface, + teststream_AddRef, + teststream_Release, + teststream_Read, + teststream_Write +}; + +static ISequentialStream teststream = { &teststreamvtbl }; + static void test_writer_create(void) { HRESULT hr; @@ -235,6 +282,36 @@ static void test_writestartdocument(void) IXmlWriter_Release(writer); } +static void test_flush(void) +{ + IXmlWriter *writer; + HRESULT hr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)&teststream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + g_write_len = 0; + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(g_write_len > 0, "got %d\n", g_write_len); + + g_write_len = 1; + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(g_write_len == 0, "got %d\n", g_write_len); + + /* Release() flushes too */ + g_write_len = 1; + IXmlWriter_Release(writer); + ok(g_write_len == 0, "got %d\n", g_write_len); +} + START_TEST(writer) { if (!init_pointers()) @@ -243,4 +320,5 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); test_writestartdocument(); + test_flush(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 0a1d361..de5f755 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -63,7 +63,6 @@ typedef struct IMalloc *imalloc; xml_encoding encoding; struct output_buffer buffer; - ULONG stream_written; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -225,11 +224,6 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } -static inline void reset_output_buffer(xmlwriteroutput *output) -{ - output->stream_written = 0; -} - static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -253,7 +247,7 @@ static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutpu static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) { struct output_buffer *buffer; - ULONG written = 0, len; + ULONG written, offset = 0; HRESULT hr; if (!output || !output->stream) @@ -261,17 +255,20 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) buffer = &output->buffer; - len = buffer->written - output->stream_written; - if (!len) - return S_OK; + /* It will loop forever until everything is written or an error occured. */ + do { + written = 0; + hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written); + if (FAILED(hr)) { + WARN("write to stream failed (0x%08x)\n", hr); + buffer->written = 0; + return hr; + } - hr = ISequentialStream_Write(output->stream, buffer->data + output->stream_written, len, &written); - if (FAILED(hr)) { - WARN("write to stream failed (0x%08x)\n", hr); - return hr; - } + offset += written; + buffer->written -= written; + } while (buffer->written > 0); - output->stream_written += written; return S_OK; } @@ -309,6 +306,8 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { IMalloc *imalloc = This->imalloc; + + IXmlWriter_Flush(iface); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); @@ -327,7 +326,6 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) TRACE("(%p)->(%p)\n", This, output); if (This->output) { - reset_output_buffer(This->output); writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; @@ -858,7 +856,6 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); writeroutput->stream = NULL; - writeroutput->stream_written = 0; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: wine Branch: master Commit: f54e8527b1cf8e5f641d6bf2f9d30a4642e4ea05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54e8527b1cf8e5f641d6bf2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 16 10:27:19 2014 +0400 po: Update Russian translation. --- po/ru.po | 106 +++++++++++++++++++------------------------------------------- 1 file changed, 32 insertions(+), 74 deletions(-) diff --git a/po/ru.po b/po/ru.po index 626c596..8b110eb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7125,206 +7125,164 @@ msgid "outline button" msgstr "кнопка структуры" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Обычный" +msgstr "обычный" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Недоступно" +msgstr "сведения отсутствуют" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "&Выбрать" +msgstr "выделенный" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Приостановлена" +msgstr "с фокусом ввода" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "С&жатый" +msgstr "нажато" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "отмечено" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Смешанный" +msgstr "оба типа" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Только для чтения" +msgstr "только чтение" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Ссылка, Подсветка" +msgstr "отслеженное" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "По умолчанию" +msgstr "по умолчанию" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "развернуто" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "свернуто" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "занято" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "перемещаемый" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "бегущая строка" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "анимация" +msgstr "анимировано" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "невидимо" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "за экраном" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&включить" +msgstr "изменяемого размера" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&включить" +msgstr "перемещаемое" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "говорящее" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Приостановлена" +msgstr "фокусируемое" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "таблица" +msgstr "выделяемое" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "ссылка" +msgstr "связанное" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "пройденное" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "таблица" +msgstr "со множественным выделением" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Выберите файл." +msgstr "с расширенным выделением" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "оповещение" +msgstr "низкий уровень оповещений" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "оповещение" +msgstr "средний уровень оповещений" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "оповещение" +msgstr "высокий уровень оповещений" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Защищено от записи.\n" +msgstr "защищенный режим" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "есть всплывающая подсказка" #: oleaut32.rc:30 oleview.rc:147 msgid "True"

1 0

Francois Gouget : testbot/web: Fix the Submit page RescheduleJobs() error reporting.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: 1ff23b8408a30138a2d979ff5befb7c20d36fa09 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ff23b8408a30138a2d979ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 11:07:06 2014 +0200 testbot/web: Fix the Submit page RescheduleJobs() error reporting. --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d381150..d50a3d9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -922,7 +922,7 @@ sub OnSubmit my $ErrMessage = RescheduleJobs(); if (defined $ErrMessage) { - LogMsg "$ErrMessage\n"; + $self->{ErrMessage} = $ErrMessage; $self->{Page} = 4; $self->{JobKey} = $JobKey; return !1;

1 0

Francois Gouget : testbot/testagentd: Add missing RPC names.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: ac7852d5930aad0ceae07796994fecf93c8cf49f URL: http://source.winehq.org/git/tools.git/?a=commit;h=ac7852d5930aad0ceae07796… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 15:50:15 2014 +0200 testbot/testagentd: Add missing RPC names. This is just cosmetic: it makes it possible to get RPC names instead of numbers in the debug traces. --- testbot/src/testagentd/testagentd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 3159f16..292b1c7 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -105,6 +105,9 @@ static const char* rpc_name(uint32_t id) "wait", "rm", "wait2", + "settime", + "getproperties", + "upgrade", }; if (id < sizeof(names) / sizeof(*names))

1 0

Francois Gouget : testbot: Make Steps use the real filename for staging files too.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: b14902e06b73d7f18adce0cd9d24852cd2ac3a8a URL: http://source.winehq.org/git/tools.git/?a=commit;h=b14902e06b73d7f18adce0cd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 15:49:58 2014 +0200 testbot: Make Steps use the real filename for staging files too. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/Steps.pm | 16 ++++++++-------- testbot/web/Submit.pl | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index fc24fb6..e9f07ac 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -70,7 +70,7 @@ sub AddJob my $NewStep = $Steps->Add(); my $BitsSuffix = ($Bits == 64 ? "64" : ""); $NewStep->Type("suite"); - $NewStep->FileName("${FileNameRandomPart} winetest${BitsSuffix}-latest.exe"); + $NewStep->FileName("${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe"); $NewStep->FileType($Bits == 64 ? "exe64" : "exe32"); $NewStep->InStaging(1); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index f54dc74..a4aed22 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -212,7 +212,7 @@ sub Submit $FileNameRandomPart = GenerateRandomString(32); } link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch.diff"; - $NewStep->FileName($FileNameRandomPart . " patch.diff"); + $NewStep->FileName($FileNameRandomPart . "_patch.diff"); my @Keys = keys %{$Targets{$BaseName}}; $NewStep->FileType($Targets{$BaseName}{$Keys[0]}); $NewStep->InStaging(1); diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 0acb3da..bd60ed1 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -67,23 +67,23 @@ sub HandleStaging } my $FileName = $self->FileName; - if (! ($FileName =~ m/^([\da-fA-F]+) (.*)$/)) + if ($FileName !~ m/^[0-9a-f]+_(.*)$/) { - return "Can't split staging file name"; + return "Can't split staging filename"; } - $FileName = $2; - my $StagingFileName = "$DataDir/staging/$1_$FileName"; + my $BaseName = $1; + my $StagingFileName = "$DataDir/staging/$FileName"; my $FinalFileName = "$DataDir/jobs/$JobKey/" . $self->GetKey() . - "/$FileName"; + "/$BaseName"; mkdir "$DataDir/jobs/$JobKey"; mkdir "$DataDir/jobs/$JobKey/" . $self->GetKey(); - if (! copy($StagingFileName, $FinalFileName)) + if (!copy($StagingFileName, $FinalFileName)) { - return "Can't copy file from staging area: $!"; + return "Can't move the staging file: $!"; } unlink($StagingFileName); - $self->FileName($FileName); + $self->FileName($BaseName); $self->InStaging(!1); my ($ErrProperty, $ErrMessage) = $self->Save(); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index d50a3d9..574c160 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -839,7 +839,7 @@ sub OnSubmit { # This is a patch so add a build step... my $BuildStep = $Steps->Add(); - $BuildStep->FileName($FileNameRandomPart . " " . $self->GetParam("FileName")); + $BuildStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); $BuildStep->FileType($FileType); $BuildStep->InStaging(1); $BuildStep->Type("build"); @@ -888,7 +888,7 @@ sub OnSubmit } else { - $TestStep->FileName($FileNameRandomPart . " " . $self->GetParam("FileName")); + $TestStep->FileName($FileNameRandomPart . "_" . $self->GetParam("FileName")); $TestStep->InStaging(1); } $TestStep->FileType("exe$Bits");

1 0

Francois Gouget : testbot/lib: Move staging files into place rather than copying them.
by Alexandre Julliard May 16, 2014

May 16, 2014

Module: tools Branch: master Commit: 71b945c8e59daf1139241ffaf1b1882a7b0573ae URL: http://source.winehq.org/git/tools.git/?a=commit;h=71b945c8e59daf1139241ffa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 16 15:50:09 2014 +0200 testbot/lib: Move staging files into place rather than copying them. --- testbot/lib/WineTestBot/Steps.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index bd60ed1..0431bc0 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -77,11 +77,10 @@ sub HandleStaging "/$BaseName"; mkdir "$DataDir/jobs/$JobKey"; mkdir "$DataDir/jobs/$JobKey/" . $self->GetKey(); - if (!copy($StagingFileName, $FinalFileName)) + if (!move($StagingFileName, $FinalFileName)) { - return "Can't move the staging file: $!"; + return "Could not move the staging file: $!"; } - unlink($StagingFileName); $self->FileName($BaseName); $self->InStaging(!1);

1 0

Jacek Caban : ieframe/tests: Fixed tests on IE11.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 5cc72a4522aa16a3f5713cf8fcafc58f840f0739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc72a4522aa16a3f5713cf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:12:58 2014 +0200 ieframe/tests: Fixed tests on IE11. --- dlls/ieframe/tests/webbrowser.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4bf7949..12b349f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -455,6 +455,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 140: /* TODO (Win7) */ case 144: /* TODO */ case 178: /* IE11 */ + case 179: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -699,15 +700,16 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const V_VT(flags)); ok(V_VARIANTREF(flags) != NULL, "V_VARIANTREF(flags) == NULL)\n"); if(V_VARIANTREF(flags)) { + int f; + ok(V_VT(V_VARIANTREF(flags)) == VT_I4, "V_VT(V_VARIANTREF(flags))=%d, expected VT_I4\n", V_VT(V_VARIANTREF(flags))); - if(is_first_load) { - ok(V_I4(V_VARIANTREF(flags)) == 0, "V_I4(V_VARIANTREF(flags)) = %x, expected 0\n", - V_I4(V_VARIANTREF(flags))); - }else { - ok((V_I4(V_VARIANTREF(flags)) & ~0x40) == 0, "V_I4(V_VARIANTREF(flags)) = %x, expected 0x40 or 0\n", - V_I4(V_VARIANTREF(flags))); - } + f = V_I4(V_VARIANTREF(flags)); + f &= ~0x100; /* IE11 sets this flag */ + if(is_first_load) + ok(!f, "flags = %x, expected 0\n", V_I4(V_VARIANTREF(flags))); + else + ok(!(f & ~0x40), "flags = %x, expected 0x40 or 0\n", V_I4(V_VARIANTREF(flags))); } ok(V_VT(frame) == (VT_BYREF|VT_VARIANT), "V_VT(frame)=%x, expected VT_BYREF|VT_VARIANT\n", @@ -2736,7 +2738,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)|DWL_FROM_GOFORWARD)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2780,6 +2782,8 @@ static void test_download(DWORD flags) if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); + else if(flags & DWL_FROM_GOFORWARD) + CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { CHECK_CALLED(Invoke_BEFORENAVIGATE2); @@ -2951,10 +2955,12 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url) SET_EXPECT(Invoke_BEFORENAVIGATE2); SET_EXPECT(Invoke_COMMANDSTATECHANGE); + SET_EXPECT(Invoke_PROPERTYCHANGE); hres = IWebBrowser2_GoBack(wb); ok(hres == S_OK, "GoBack failed: %08x\n", hres); CHECK_CALLED(Invoke_BEFORENAVIGATE2); todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); + CLEAR_CALLED(Invoke_PROPERTYCHANGE); /* called by IE11 */ } static void test_go_forward(IWebBrowser2 *wb, const char *forward_url)

1 0

Piotr Caban : oleacc: Add WindowFromAccessibleObject implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6bd87c6bdbd91fb16fc6db746544adbfe57aa896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd87c6bdbd91fb16fc6db746… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:43 2014 +0200 oleacc: Add WindowFromAccessibleObject implementation. --- dlls/oleacc/main.c | 34 ++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- dlls/oleacc/tests/main.c | 3 +++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 37d2269..9d5320e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -295,6 +295,40 @@ HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, return CreateStdAccessibleObject(hwnd, dwObjectID, riid, ppvObject); } +HRESULT WINAPI WindowFromAccessibleObject(IAccessible *acc, HWND *phwnd) +{ + IDispatch *parent; + IOleWindow *ow; + HRESULT hres; + + TRACE("%p %p\n", acc, phwnd); + + IAccessible_AddRef(acc); + while(1) { + hres = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + if(SUCCEEDED(hres)) { + hres = IOleWindow_GetWindow(ow, phwnd); + IOleWindow_Release(ow); + IAccessible_Release(acc); + return hres; + } + + hres = IAccessible_get_accParent(acc, &parent); + IAccessible_Release(acc); + if(FAILED(hres)) + return hres; + if(hres!=S_OK || !parent) { + *phwnd = NULL; + return hres; + } + + hres = IDispatch_QueryInterface(parent, &IID_IAccessible, (void**)&acc); + IDispatch_Release(parent); + if(FAILED(hres)) + return hres; + } +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 679ba1a..caeb6d3 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -19,4 +19,4 @@ @ stub LIBID_Accessibility @ stdcall LresultFromObject(ptr long ptr) @ stdcall ObjectFromLresult(long ptr long ptr) -@ stub WindowFromAccessibleObject +@ stdcall WindowFromAccessibleObject(ptr ptr) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index dde2786..dbe8706 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -410,6 +410,9 @@ static void test_default_client_accessible_object(void) hr = IOleWindow_GetWindow(ow, &hwnd2); ok(hr == S_OK, "got %x\n", hr); ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + hr = WindowFromAccessibleObject(acc, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Jacek Caban : urlmon: Avoid ProtocolHandler being destroyed in Terminate call.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 54bf34f1e7cd916cfee8b4c383d7552296ae9a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bf34f1e7cd916cfee8b4c38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:56:51 2014 +0200 urlmon: Avoid ProtocolHandler being destroyed in Terminate call. --- dlls/urlmon/bindprot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 7f2bea1..1efb74c 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -698,6 +698,9 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(!This->reported_result) return E_FAIL; + /* This may get released in Terminate call. */ + IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); + IInternetProtocol_Terminate(This->protocol, 0); set_binding_sink(This, NULL, NULL); @@ -707,6 +710,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD This->bind_info = NULL; } + IInternetProtocolEx_Release(&This->IInternetProtocolEx_iface); return S_OK; }

1 0

Jacek Caban : mshtml/tests: Fixed a few more IE11 test failures.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 810d8c71408686a2deabb9ac07a13a2790372c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=810d8c71408686a2deabb9ac0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 18:32:32 2014 +0200 mshtml/tests: Fixed a few more IE11 test failures. --- dlls/mshtml/tests/htmldoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 24c6cac..11015e7 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2983,6 +2983,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 143: /* TODO */ case 144: /* TODO */ case 178: + case 179: return E_NOTIMPL; default: @@ -3162,7 +3163,9 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF ok(puArgErr != NULL, "puArgErr == NULL\n"); ok(V_VT(pVarResult) == 0, "V_VT(pVarResult)=%d, expected 0\n", V_VT(pVarResult)); ok(wFlags == DISPATCH_PROPERTYGET, "wFlags=%08x, expected DISPATCH_PROPERTYGET\n", wFlags); - test_readyState(NULL); + + if(dispIdMember != DISPID_AMBIENT_SILENT && dispIdMember != DISPID_AMBIENT_OFFLINEIFNOTCONNECTED) + test_readyState(NULL); switch(dispIdMember) { case DISPID_AMBIENT_USERMODE:

1 0

Piotr Caban : oleacc: Add IOleWindow interface stub to default client accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8c808f3ee90966a86c0f9ca17e78b1fbe4662378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c808f3ee90966a86c0f9ca17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:13 2014 +0200 oleacc: Add IOleWindow interface stub to default client accessible object. --- dlls/oleacc/client.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/oleacc/tests/main.c | 5 ++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8a48b36..8c3f011 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; @@ -48,11 +49,16 @@ static HRESULT WINAPI Client_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Client_AddRef(IAccessible *iface) @@ -439,6 +445,51 @@ static const IAccessibleVtbl ClientVtbl = { Client_put_accValue }; +static inline Client* impl_from_Client_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Client, IOleWindow_iface); +} + +static HRESULT WINAPI Client_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_OleWindow_AddRef(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) +{ + Client *This = impl_from_Client_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Client *This = impl_from_Client_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl ClientOleWindowVtbl = { + Client_OleWindow_QueryInterface, + Client_OleWindow_AddRef, + Client_OleWindow_Release, + Client_OleWindow_GetWindow, + Client_OleWindow_ContextSensitiveHelp +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -452,6 +503,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; client->IAccessible_iface.lpVtbl = &ClientVtbl; + client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; client->ref = 1; client->hwnd = hwnd; diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index d76dc79..3783d36 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -383,6 +383,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; + IOleWindow *ow; HWND chld, hwnd; HRESULT hr; VARIANT vid, v; @@ -404,6 +405,10 @@ static void test_default_client_accessible_object(void) hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); + hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); + ok(hr == S_OK, "got %x\n", hr); + IOleWindow_Release(ow); + hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); ok(l == 1, "l = %d\n", l);

1 0

Piotr Caban : oleacc: Disable tests on old oleacc.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 94b721000a371668fcc12f80ebde01260155a943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b721000a371668fcc12f80e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:04 2014 +0200 oleacc: Disable tests on old oleacc. --- dlls/oleacc/tests/main.c | 71 ++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index be30da3..d76dc79 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -26,6 +26,21 @@ #include "initguid.h" #include <oleacc.h> +static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); + +static BOOL init(void) +{ + HMODULE oleacc = GetModuleHandleA("oleacc.dll"); + + pGetProcessHandleFromHwnd = (void*)GetProcAddress(oleacc, "GetProcessHandleFromHwnd"); + if(!pGetProcessHandleFromHwnd) { + win_skip("GetProcessHandleFromHwnd not available\n"); + return FALSE; + } + + return TRUE; +} + static void test_getroletext(void) { INT ret, role; @@ -38,9 +53,7 @@ static void test_getroletext(void) buf[0] = '*'; ret = GetRoleTextA(-1, buf, 2); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); - ok(buf[0] == 0 || - broken(buf[0] == '*'), /* Win98 and WinMe */ - "GetRoleTextA modified buffer on wrong role number\n"); + ok(buf[0] == 0, "GetRoleTextA doesn't return NULL char on wrong role number\n"); buf[0] = '*'; ret = GetRoleTextA(-1, buf, 0); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); @@ -51,9 +64,7 @@ static void test_getroletext(void) bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 2); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); - ok(bufW[0] == '\0' || - broken(bufW[0] == '*'), /* Win98 and WinMe */ - "GetRoleTextW doesn't return NULL char on wrong role number\n"); + ok(bufW[0] == '\0', "GetRoleTextW doesn't return NULL char on wrong role number\n"); bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 0); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); @@ -89,14 +100,9 @@ static void test_getroletext(void) ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); - ok(broken(ret == 1) || - ret == 0, /* Vista and W2K8 */ - "GetRoleTextA returned wrong length, got %d, expected 0 or 1\n", ret); - if (ret == 0) { - ok(!buf[0] || - broken(buf[0]!='*') /* WinXP */, - "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); - } + ok(!ret, "GetRoleTextA returned wrong length, got %d, expected 0\n", ret); + ok(!buf[0] || broken(buf[0]!='*') /* WinXP */, + "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); bufW[0] = '*'; ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1); @@ -131,11 +137,7 @@ static void test_getroletext(void) memset(buff2, 0, sizeof(buff2)); ret = GetRoleTextA(role, NULL, 0); - /* Win98 up to W2K miss some of the roles */ - if (role >= ROLE_SYSTEM_SPLITBUTTON) - ok(ret > 0 || broken(ret == 0), "Expected the role %d to be present\n", role); - else - ok(ret > 0, "Expected the role to be present\n"); + ok(ret > 0, "Expected the role to be present\n"); GetRoleTextA(role, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2), @@ -176,12 +178,10 @@ static void test_GetStateText(void) ok(!ret, "got %d, expected 0\n", ret); ok(!buf[0], "buf[0] = '%c'\n", buf[0]); - for(i=0; i<30; i++) { + for(i=0; i<31; i++) { ret = GetStateTextW(1<<i, buf, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextW(1<<30, buf, 1024); - ok(ret || broken(!ret), "30) GetStateText failed\n"); ret = GetStateTextW(1<<31, buf, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); @@ -211,12 +211,10 @@ static void test_GetStateText(void) ok(!ret, "got %d, expected 0\n", ret); ok(!bufa[0], "bufa[0] = '%c'\n", bufa[0]); - for(i=0; i<30; i++) { + for(i=0; i<31; i++) { ret = GetStateTextA(1<<i, bufa, 1024); ok(ret, "%d) GetStateText failed\n", i); } - ret = GetStateTextA(1<<30, bufa, 1024); - ok(ret || broken(!ret), "30) GetStateText failed\n"); ret = GetStateTextA(1<<31, bufa, 1024); ok(!ret, "31) GetStateText succeeded: %d\n", ret); } @@ -263,11 +261,9 @@ static void test_LresultFromObject(const char *name) ok(lres == E_INVALIDARG, "got %lx\n", lres); hres = ObjectFromLresult(0, &IID_IUnknown, 0, (void**)&unk); - ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) - || hres==E_FAIL, "got %x\n", hres); + ok(hres == E_FAIL, "got %x\n", hres); hres = ObjectFromLresult(0x10000, &IID_IUnknown, 0, (void**)&unk); - ok(hres==MAKE_HRESULT(SEVERITY_ERROR,FACILITY_WIN32,ERROR_INVALID_ADDRESS) - || hres==E_FAIL, "got %x\n", hres); + ok(hres == E_FAIL, "got %x\n", hres); ok(Object_ref == 1, "Object_ref = %d\n", Object_ref); lres = LresultFromObject(&IID_IUnknown, 0, &Object); @@ -301,7 +297,7 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA return 0; } - ok(wparam==0xffffffff || broken(wparam==0x8000), "wparam = %lx\n", wparam); + ok(wparam==0xffffffff, "wparam = %lx\n", wparam); if(lparam == (DWORD)OBJID_CURSOR) return E_UNEXPECTED; if(lparam == (DWORD)OBJID_CLIENT) @@ -364,17 +360,9 @@ static void test_AccessibleObjectFromWindow(void) static void test_GetProcessHandleFromHwnd(void) { - HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); HANDLE proc; HWND hwnd; - pGetProcessHandleFromHwnd = (void*)GetProcAddress( - GetModuleHandleA("oleacc.dll"), "GetProcessHandleFromHwnd"); - if(!pGetProcessHandleFromHwnd) { - win_skip("GetProcessHandleFromHwnd not available\n"); - return; - } - proc = pGetProcessHandleFromHwnd(NULL); ok(!proc, "proc = %p\n", proc); @@ -456,8 +444,8 @@ static void test_default_client_accessible_object(void) hr = IAccessible_get_accState(acc, vid, &v); ok(hr == S_OK, "got %x\n", hr); ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); - ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE) || - broken(V_I4(&v) == STATE_SYSTEM_INVISIBLE), "V_I4(&v) = %x\n", V_I4(&v)); + ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE), + "V_I4(&v) = %x\n", V_I4(&v)); str = (void*)0xdeadbeef; hr = IAccessible_get_accHelp(acc, vid, &str); @@ -580,6 +568,9 @@ START_TEST(main) int argc; char **argv; + if(!init()) + return; + CoInitializeEx(NULL, COINIT_MULTITHREADED); argc = winetest_get_mainargs(&argv);

1 0

Piotr Caban : oleacc: Add IOleWindow interface stub to default window accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 69ab9da0da71e880bf8f7908f575009d0cd65cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ab9da0da71e880bf8f7908f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:24 2014 +0200 oleacc: Add IOleWindow interface stub to default window accessible object. --- dlls/oleacc/window.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 45c53fc..f8090b5 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); typedef struct { IAccessible IAccessible_iface; + IOleWindow IOleWindow_iface; LONG ref; } Window; @@ -46,11 +47,16 @@ static HRESULT WINAPI Window_QueryInterface(IAccessible *iface, REFIID riid, voi IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { *ppv = iface; - IAccessible_AddRef(iface); - return S_OK; + }else if(IsEqualIID(riid, &IID_IOleWindow)) { + *ppv = &This->IOleWindow_iface; + }else { + WARN("no interface: %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - return E_NOINTERFACE; + IAccessible_AddRef(iface); + return S_OK; } static ULONG WINAPI Window_AddRef(IAccessible *iface) @@ -295,6 +301,51 @@ static const IAccessibleVtbl WindowVtbl = { Window_put_accValue }; +static inline Window* impl_from_Window_OleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, Window, IOleWindow_iface); +} + +static HRESULT WINAPI Window_OleWindow_QueryInterface(IOleWindow *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_OleWindow_AddRef(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface) +{ + Window *This = impl_from_Window_OleWindow(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + Window *This = impl_from_Window_OleWindow(iface); + FIXME("(%p)->(%x)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl WindowOleWindowVtbl = { + Window_OleWindow_QueryInterface, + Window_OleWindow_AddRef, + Window_OleWindow_Release, + Window_OleWindow_GetWindow, + Window_OleWindow_ContextSensitiveHelp +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -308,6 +359,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) return E_OUTOFMEMORY; window->IAccessible_iface.lpVtbl = &WindowVtbl; + window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj);

1 0

Piotr Caban : oleacc: Add IOleWindow:: GetWindow implementation in default client accessible object.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 25312a10d35e9b45c485dba78c9c36fb79abb32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=25312a10d35e9b45c485dba78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:53:37 2014 +0200 oleacc: Add IOleWindow::GetWindow implementation in default client accessible object. --- dlls/oleacc/client.c | 7 +++++-- dlls/oleacc/tests/main.c | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 8c3f011..cc7b53a 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -471,8 +471,11 @@ static ULONG WINAPI Client_OleWindow_Release(IOleWindow *iface) static HRESULT WINAPI Client_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) { Client *This = impl_from_Client_OleWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI Client_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 3783d36..dde2786 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -384,7 +384,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; IOleWindow *ow; - HWND chld, hwnd; + HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; BSTR str; @@ -407,6 +407,9 @@ static void test_default_client_accessible_object(void) hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd2); + ok(hr == S_OK, "got %x\n", hr); + ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l);

1 0

Jacek Caban : msctf: Added IEnumTfInputProcessorProfiles interface stub implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 645cdf9dc31c226caa3b1cb6b7a8d881979e122d URL: http://source.winehq.org/git/wine.git/?a=commit;h=645cdf9dc31c226caa3b1cb6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 16:52:30 2014 +0200 msctf: Added IEnumTfInputProcessorProfiles interface stub implementation. --- dlls/msctf/inputprocessor.c | 113 ++++++++++++++++++++++++++++++++++++- dlls/msctf/tests/inputprocessor.c | 11 +++- 2 files changed, 119 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index f1595f8..89eb746 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -97,9 +97,107 @@ typedef struct tagEnumTfLanguageProfiles { ITfCategoryMgr *catmgr; } EnumTfLanguageProfiles; +typedef struct { + IEnumTfInputProcessorProfiles IEnumTfInputProcessorProfiles_iface; + LONG ref; +} EnumTfInputProcessorProfiles; + static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut); static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguageProfiles **ppOut); +static inline EnumTfInputProcessorProfiles *impl_from_IEnumTfInputProcessorProfiles(IEnumTfInputProcessorProfiles *iface) +{ + return CONTAINING_RECORD(iface, EnumTfInputProcessorProfiles, IEnumTfInputProcessorProfiles_iface); +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_QueryInterface(IEnumTfInputProcessorProfiles *iface, + REFIID riid, void **ppv) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumTfInputProcessorProfiles_iface; + }else if(IsEqualGUID(riid, &IID_IEnumTfInputProcessorProfiles)) { + TRACE("(%p)->(IID_IEnumTfInputProcessorProfiles %p)\n", This, ppv); + *ppv = &This->IEnumTfInputProcessorProfiles_iface; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumTfInputProcessorProfiles_AddRef(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumTfInputProcessorProfiles_Release(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Clone(IEnumTfInputProcessorProfiles *iface, + IEnumTfInputProcessorProfiles **ret) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)->(%p)\n", This, ret); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Next(IEnumTfInputProcessorProfiles *iface, ULONG count, + TF_INPUTPROCESSORPROFILE *profile, ULONG *fetch) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + + FIXME("(%p)->(%u %p %p)\n", This, count, profile, fetch); + + if(fetch) + *fetch = 0; + return S_FALSE; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Reset(IEnumTfInputProcessorProfiles *iface) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumTfInputProcessorProfiles_Skip(IEnumTfInputProcessorProfiles *iface, ULONG count) +{ + EnumTfInputProcessorProfiles *This = impl_from_IEnumTfInputProcessorProfiles(iface); + FIXME("(%p)->(%u)\n", This, count); + return E_NOTIMPL; +} + +static const IEnumTfInputProcessorProfilesVtbl EnumTfInputProcessorProfilesVtbl = { + EnumTfInputProcessorProfiles_QueryInterface, + EnumTfInputProcessorProfiles_AddRef, + EnumTfInputProcessorProfiles_Release, + EnumTfInputProcessorProfiles_Clone, + EnumTfInputProcessorProfiles_Next, + EnumTfInputProcessorProfiles_Reset, + EnumTfInputProcessorProfiles_Skip +}; + static inline InputProcessorProfiles *impl_from_ITfInputProcessorProfiles(ITfInputProcessorProfiles *iface) { return CONTAINING_RECORD(iface, InputProcessorProfiles, ITfInputProcessorProfiles_iface); @@ -742,8 +840,19 @@ static HRESULT WINAPI InputProcessorProfileMgr_EnumProfiles(ITfInputProcessorPro IEnumTfInputProcessorProfiles **ppEnum) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); - FIXME("(%p)->(%x %p)\n", This, langid, ppEnum); - return E_NOTIMPL; + EnumTfInputProcessorProfiles *enum_profiles; + + TRACE("(%p)->(%x %p)\n", This, langid, ppEnum); + + enum_profiles = HeapAlloc(GetProcessHeap(), 0, sizeof(*enum_profiles)); + if(!enum_profiles) + return E_OUTOFMEMORY; + + enum_profiles->IEnumTfInputProcessorProfiles_iface.lpVtbl = &EnumTfInputProcessorProfilesVtbl; + enum_profiles->ref = 1; + + *ppEnum = &enum_profiles->IEnumTfInputProcessorProfiles_iface; + return S_OK; } static HRESULT WINAPI InputProcessorProfileMgr_ReleaseInputProcessor(ITfInputProcessorProfileMgr *iface, REFCLSID rclsid, diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index f457dbb..8a052b3 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2186,15 +2186,20 @@ static void test_AssociateFocus(void) sink_check_ok(&test_OnPopContext,"OnPopContext"); } -static void test_QI(void) +static void test_profile_mgr(void) { + IEnumTfInputProcessorProfiles *enum_profiles; ITfInputProcessorProfileMgr *ipp_mgr; HRESULT hres; - /* A trivial test, probably worth moving once more will be added. */ hres = ITfInputProcessorProfiles_QueryInterface(g_ipp, &IID_ITfInputProcessorProfileMgr, (void**)&ipp_mgr); ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); + hres = ITfInputProcessorProfileMgr_EnumProfiles(ipp_mgr, 0, &enum_profiles); + ok(hres == S_OK, "EnumProfiles failed: %08x\n", hres); + + IEnumTfInputProcessorProfiles_Release(enum_profiles); + ITfInputProcessorProfileMgr_Release(ipp_mgr); } @@ -2224,7 +2229,7 @@ START_TEST(inputprocessor) test_ThreadMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); - test_QI(); + test_profile_mgr(); } else skip("Unable to create InputProcessor\n");

1 0

Martin Storsjo : ntdll: Align FILE_*_DIRECTORY_INFORMATION structs to 8 bytes.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8cb42d41351377415749008de2b6f00593309b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb42d41351377415749008de… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 15 15:25:05 2014 +0300 ntdll: Align FILE_*_DIRECTORY_INFORMATION structs to 8 bytes. --- dlls/ntdll/directory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 50bf66a..04a5b75 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -228,15 +228,15 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned switch (class) { case FileDirectoryInformation: - return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileBothDirectoryInformation: - return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileFullDirectoryInformation: - return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileIdBothDirectoryInformation: - return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_ID_BOTH_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; case FileIdFullDirectoryInformation: - return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 3) & ~3; + return (FIELD_OFFSET( FILE_ID_FULL_DIRECTORY_INFORMATION, FileName[len] ) + 7) & ~7; default: assert(0); return 0;

1 0

Alexandre Julliard : d3d10: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 29fcb82b94d584939c11f757c4514f8d5e8074c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fcb82b94d584939c11f757c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:23 2014 +0200 d3d10: Remove unnecessary DllMain implementation. --- dlls/d3d10/d3d10_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6d4d626..12c97ce 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,18 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) {

1 0

Alexandre Julliard : d3d9: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 64082aebc5d3124e7248eb9e53f09f26065cc470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64082aebc5d3124e7248eb9e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:16 2014 +0200 d3d9: Remove unnecessary DllMain implementation. --- dlls/d3d9/d3d9_main.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 8796733..0afdc04 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -90,17 +90,6 @@ void* WINAPI Direct3DShaderValidatorCreate9(void) return NULL; } -/******************************************************************* - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(inst); - - return TRUE; -} - /*********************************************************************** * D3DPERF_BeginEvent (D3D9.@) */

1 0

Hans Leidekker : winhttp: Add support for retrieving the proxy automatic configuration URL on Mac OS X.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 50c710bd914ee7197f234472523f86cd6c651a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c710bd914ee7197f2344725… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:06:02 2014 +0200 winhttp: Add support for retrieving the proxy automatic configuration URL on Mac OS X. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/session.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 948e0ed..7fbe2a7 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -2,7 +2,7 @@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = uuid jsproxy user32 advapi32 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 -EXTRALIBS = $(SOCKET_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e773f05..f2ed72b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -23,6 +23,15 @@ #include <stdarg.h> #include <stdlib.h> +#ifdef HAVE_CORESERVICES_CORESERVICES_H +#define GetCurrentThread MacGetCurrentThread +#define LoadResource MacLoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource +#undef DPRINTF +#endif + #include "windef.h" #include "winbase.h" #ifndef __MINGW32__ @@ -1286,12 +1295,42 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) return ret; } +static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) +{ +#ifdef HAVE_CORESERVICES_CORESERVICES_H + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + const void *ref; + BOOL ret = FALSE; + + if (!settings) return FALSE; + + if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) + { + CFRelease( settings ); + return FALSE; + } + if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + { + TRACE( "returning %s\n", debugstr_a(buf) ); + ret = TRUE; + } + CFRelease( settings ); + return ret; +#else + FIXME( "no support on this platform\n" ); + return FALSE; +#endif +} + +#define INTERNET_MAX_URL_LENGTH 2084 + /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) { BOOL ret = FALSE; + char system_url[INTERNET_MAX_URL_LENGTH + 1]; TRACE("0x%08x, %p\n", flags, url); @@ -1300,6 +1339,14 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } + if (get_system_proxy_autoconfig_url( system_url, sizeof(system_url) )) + { + WCHAR *urlW; + + if (!(urlW = strdupAW( system_url ))) return FALSE; + *url = urlW; + return TRUE; + } if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) { static int fixme_shown;

1 0

Piotr Caban : oleacc: Modify output buffer on incorrect role in GetRoleTextA.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 1f6ade45c1f7546e4f66378793af2feb79824c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6ade45c1f7546e4f6637879… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:52:33 2014 +0200 oleacc: Modify output buffer on incorrect role in GetRoleTextA. --- dlls/oleacc/main.c | 8 +++++++- dlls/oleacc/tests/main.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 89c0142..3634991 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -373,9 +373,15 @@ UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax) TRACE("%u %p %u\n", role, lpRole, rolemax); + if(lpRole && !rolemax) + return 0; + length = GetRoleTextW(role, NULL, 0); - if((length == 0) || (lpRole && !rolemax)) + if(!length) { + if(lpRole && rolemax) + lpRole[0] = 0; return 0; + } roletextW = HeapAlloc(GetProcessHeap(), 0, (length + 1)*sizeof(WCHAR)); if(!roletextW) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 76ea969..121a5d7 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -38,8 +38,8 @@ static void test_getroletext(void) buf[0] = '*'; ret = GetRoleTextA(-1, buf, 2); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); - ok(buf[0] == '*' || - broken(buf[0] == 0), /* Win98 and WinMe */ + ok(buf[0] == 0 || + broken(buf[0] == '*'), /* Win98 and WinMe */ "GetRoleTextA modified buffer on wrong role number\n"); buf[0] = '*'; ret = GetRoleTextA(-1, buf, 0); @@ -75,6 +75,14 @@ static void test_getroletext(void) ok(ret > 0, "GetRoleTextW doesn't return length on NULL buffer, got %d\n", ret); /* use a smaller buffer */ + bufW[0] = '*'; + ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 0); + ok(!ret, "GetRoleTextA doesn't return 0, got %d\n", ret); + ok(buf[0] == '*', "GetRoleTextA modified buffer\n"); + buffW = NULL; + ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, (WCHAR*)&buffW, 0); + ok(ret, "GetRoleTextW doesn't return length\n"); + ok(buffW != NULL, "GetRoleTextW doesn't modify buffer\n"); buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 1); ok(ret == 0, "GetRoleTextA returned wrong length\n");

1 0

Piotr Caban : oleacc: Don' t return partial data in GetRoleTextA if buffer is too small.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: dccc4283a7848eafc53d99512bc39d1d8bacb018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dccc4283a7848eafc53d99512… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 15 17:52:52 2014 +0200 oleacc: Don't return partial data in GetRoleTextA if buffer is too small. --- dlls/oleacc/main.c | 6 ++++++ dlls/oleacc/tests/main.c | 11 +++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 3634991..37d2269 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -396,6 +396,12 @@ UINT WINAPI GetRoleTextA(DWORD role, LPSTR lpRole, UINT rolemax) return length - 1; } + if(rolemax < length) { + HeapFree(GetProcessHeap(), 0, roletextW); + lpRole[0] = 0; + return 0; + } + WideCharToMultiByte( CP_ACP, 0, roletextW, -1, lpRole, rolemax, NULL, NULL ); if(rolemax < length){ diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 121a5d7..be30da3 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -87,13 +87,16 @@ static void test_getroletext(void) ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 1); ok(ret == 0, "GetRoleTextA returned wrong length\n"); ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); - buf[1] = '*'; + buf[0] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); - ok(ret == 1 || + ok(broken(ret == 1) || ret == 0, /* Vista and W2K8 */ "GetRoleTextA returned wrong length, got %d, expected 0 or 1\n", ret); - if (ret == 1) - ok(buf[1] == '\0', "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[1]); + if (ret == 0) { + ok(!buf[0] || + broken(buf[0]!='*') /* WinXP */, + "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[0]); + } bufW[0] = '*'; ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1);

1 0

Stefan Dösinger : wined3d: Fix indentation in d3dfmt_p8_init_palette.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: bdc396e4f5115b9f01037b37fac943bf81c8f8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc396e4f5115b9f01037b37f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 15 14:33:14 2014 +0200 wined3d: Fix indentation in d3dfmt_p8_init_palette. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 023439d..f198bf0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3380,7 +3380,8 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 FIXME("No palette set.\n"); /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if * there's no palette at this time. */ - for (i = 0; i < 256; i++) table[i][3] = i; + for (i = 0; i < 256; i++) + table[i][3] = i; } else {

1 0

Nikolay Sivov : xmllite/reader: Create reader input with same IMalloc as reader.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 0ae578b71cb1319f61415ef5644f2c1fbe8e9159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae578b71cb1319f61415ef56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 14 21:53:55 2014 +0400 xmllite/reader: Create reader input with same IMalloc as reader. --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index deb2d2e..d8b81ea 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2517,7 +2517,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) { /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, - NULL, NULL, FALSE, NULL, &readerinput); + This->imalloc, NULL, FALSE, NULL, &readerinput); if (hr != S_OK) return hr; This->input = impl_from_IXmlReaderInput(readerinput); }

1 0

Martin Storsjo : ntdll: Don' t write uninitialized bytes at the end of filenames.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 114444ca9cc1f855febfd6ae9c28cc8b69172f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114444ca9cc1f855febfd6ae9… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 15 15:25:04 2014 +0300 ntdll: Don't write uninitialized bytes at the end of filenames. --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 890fb71..50bf66a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1484,7 +1484,7 @@ static union file_directory_info *append_entry( void *info_ptr, IO_STATUS_BLOCK assert(0); return NULL; } - memcpy( filename, long_nameW, total_len - ((char *)filename - (char *)info) ); + memcpy( filename, long_nameW, long_len * sizeof(WCHAR) ); io->Information += total_len; return info; }

1 0

Jacek Caban : oleaut32: Use debugstr_variant in variant.c where appropriate.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 9677454f7d80483be6e6d8297d9f01f99d70217e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9677454f7d80483be6e6d8297… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 15 14:55:36 2014 +0200 oleaut32: Use debugstr_variant in variant.c where appropriate. --- dlls/oleaut32/variant.c | 110 ++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9677454f7d80483be6e6d…

1 0

Huw Davies : wininet/tests: Don't test GetLastError() on success.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: fec1ed454ce4ccc136c66511404975b9fcb1d503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec1ed454ce4ccc136c665114… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 14:06:05 2014 +0100 wininet/tests: Don't test GetLastError() on success. --- dlls/wininet/tests/url.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index e1f8612..3e9a1d4 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -851,12 +851,9 @@ static void InternetCreateUrlA_test(void) /* alloc-ed szUrl, NULL lpszScheme * shows that it uses nScheme instead */ - SetLastError(0xdeadbeef); urlComp.lpszScheme = NULL; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); @@ -864,48 +861,36 @@ static void InternetCreateUrlA_test(void) * any nScheme out of range seems ignored */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.nScheme = -3; len++; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); /* test valid lpUrlComponents, alloc-ed szUrl */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(strstr(szUrl, "80") == NULL, "Didn't expect to find 80 in szUrl\n"); ok(!strcmp(szUrl, CREATE_URL1), "Expected %s, got %s\n", CREATE_URL1, szUrl); /* valid username, NULL password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszPassword = NULL; len = 42; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 41, "Expected len 41, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL2), "Expected %s, got %s\n", CREATE_URL2, szUrl); /* valid username, empty password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL3), "Expected %s, got %s\n", CREATE_URL3, szUrl); @@ -927,39 +912,30 @@ static void InternetCreateUrlA_test(void) * if password is provided, username has to exist */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl); /* NULL username, NULL password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = NULL; urlComp.lpszPassword = NULL; len = 42; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 32, "Expected len 32, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL4), "Expected %s, got %s\n", CREATE_URL4, szUrl); /* empty username, empty password */ fill_url_components(&urlComp); - SetLastError(0xdeadbeef); urlComp.lpszUserName = empty; urlComp.lpszPassword = empty; len = 51; ret = InternetCreateUrlA(&urlComp, 0, szUrl, &len); ok(ret, "Expected success\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got %d\n", GetLastError()); ok(len == 50, "Expected len 50, got %d\n", len); ok(!strcmp(szUrl, CREATE_URL5), "Expected %s, got %s\n", CREATE_URL5, szUrl);

1 0

Alexandre Julliard : d3d10_1: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: c5b19d4ad0e9000f5479c174c8e63e3fd7408cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b19d4ad0e9000f5479c174c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:28 2014 +0200 d3d10_1: Remove unnecessary DllMain implementation. --- dlls/d3d10_1/d3d10_1_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 721fe7d..a619004 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -63,18 +63,6 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - - return TRUE; -} - HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) {

1 0

Alexandre Julliard : d3d8: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 4df26c56d832e94d138009bc28bb87701f1822c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df26c56d832e94d138009bc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:38:12 2014 +0200 d3d8: Remove unnecessary DllMain implementation. --- dlls/d3d8/d3d8_main.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 2b6ada4..8ac704c 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -56,15 +56,6 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) return &object->IDirect3D8_iface; } -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - if (reason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(inst); - - return TRUE; -} - /*********************************************************************** * ValidateVertexShader (D3D8.@) *

1 0

Alexandre Julliard : dciman32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 16352f0aeeb4a5429a9b9b78f75baa20cefd564d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16352f0aeeb4a5429a9b9b78f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:14 2014 +0200 dciman32: Remove unnecessary DllMain implementation. --- dlls/dciman32/dciman_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/dciman32/dciman_main.c b/dlls/dciman32/dciman_main.c index 2287c78..c693492 100644 --- a/dlls/dciman32/dciman_main.c +++ b/dlls/dciman32/dciman_main.c @@ -31,18 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dciman); /*********************************************************************** - * DllEntryPoint (DCIMAN32.@) - * - * DCIMAN32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - -/*********************************************************************** * DCIOpenProvider (DCIMAN32.@) */ HDC WINAPI

1 0

Alexandre Julliard : advpack: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 0289ea0e43ad099db86642e1776313c8b5ac36c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0289ea0e43ad099db86642e17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:03 2014 +0200 advpack: Remove unnecessary DllMain implementation. --- dlls/advpack/advpack.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 296abb5..83dda08 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -208,19 +208,6 @@ HRESULT WINAPI CloseINFEngine(HINF hInf) } /*********************************************************************** - * DllMain (ADVPACK.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -} - -/*********************************************************************** * IsNTAdmin (ADVPACK.@) * * Checks if the user has admin privileges.

1 0

Alexandre Julliard : msimg32: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 693faf2a7d47f1886cdb005e0f7ca296a71e05c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693faf2a7d47f1886cdb005e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:20 2014 +0200 msimg32: Remove unnecessary DllMain implementation. --- dlls/msimg32/msimg32_main.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/msimg32/msimg32_main.c b/dlls/msimg32/msimg32_main.c index 9e859c8..34beb3c 100644 --- a/dlls/msimg32/msimg32_main.c +++ b/dlls/msimg32/msimg32_main.c @@ -26,18 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimg32); -/*********************************************************************** - * DllInitialize (MSIMG32.@) - * - * MSIMG32 initialisation routine. - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); - return TRUE; -} - - /****************************************************************************** * vSetDdrawflag (MSIMG32.@) */

1 0

Alexandre Julliard : wintrust: Remove unnecessary DllMain implementation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6eb922f1d461d0afcc5e3d4e547e4a4bd6e512d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb922f1d461d0afcc5e3d4e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 15 14:37:25 2014 +0200 wintrust: Remove unnecessary DllMain implementation. --- dlls/wintrust/wintrust_main.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 9b8dd85..58e3ac3 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -59,20 +59,6 @@ void WINAPI WINTRUST_Free(void *p) } /*********************************************************************** - * DllMain (WINTRUST.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - -/*********************************************************************** * TrustIsCertificateSelfSigned (WINTRUST.@) */ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert )

1 0

Stefan Dösinger : wined3d: Move get_dc palette updates to ddraw.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: fd0189bbfa1ccc3832aaf01fb61a15fbc6ee9e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0189bbfa1ccc3832aaf01fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 15 16:13:31 2014 +0200 wined3d: Move get_dc palette updates to ddraw. --- dlls/ddraw/ddraw_private.h | 7 +++++++ dlls/ddraw/device.c | 5 +---- dlls/ddraw/surface.c | 19 +++++++++++++++++-- dlls/wined3d/palette.c | 6 ++++++ dlls/wined3d/surface.c | 27 +-------------------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 7 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2bf8132..8cc5201 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -575,6 +575,13 @@ void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) DECLSPEC_HIDDEN void multiply_matrix(D3DMATRIX *dst, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; +static inline BOOL format_is_paletteindexed(const DDPIXELFORMAT *fmt) +{ + DWORD flags = DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 + | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8; + return !!(fmt->dwFlags & flags); +} + /* Used for generic dumping */ struct flag_info { diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e184cfd..4f270fd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1798,10 +1798,7 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID static BOOL validate_surface_palette(struct ddraw_surface *surface) { - return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags - & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 - | DDPF_PALETTEINDEXEDTO8)) + return !format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat) || surface->palette; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2efc98c..3f230a2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -461,8 +461,7 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD return DDERR_INVALIDSURFACETYPE; } - if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) + if (!format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) return DDERR_INVALIDPIXELFORMAT; wined3d_mutex_lock(); @@ -2017,6 +2016,22 @@ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *hdc) hr = ddraw_surface_update_frontbuffer(surface, NULL, TRUE); if (SUCCEEDED(hr)) hr = wined3d_surface_getdc(surface->wined3d_surface, hdc); + + if (SUCCEEDED(hr) && format_is_paletteindexed(&surface->surface_desc.u4.ddpfPixelFormat)) + { + const struct ddraw_palette *palette; + + if (surface->palette) + palette = surface->palette; + else if (surface->ddraw->primary) + palette = surface->ddraw->primary->palette; + else + palette = NULL; + + if (palette) + wined3d_palette_apply_to_dc(palette->wineD3DPalette, *hdc); + } + wined3d_mutex_unlock(); switch(hr) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index e103b5b..24b344c 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -83,6 +83,12 @@ HRESULT CDECL wined3d_palette_get_entries(const struct wined3d_palette *palette, return WINED3D_OK; } +void CDECL wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc) +{ + if (SetDIBColorTable(dc, 0, 256, palette->colors) != 256) + ERR("Failed to set DIB color table.\n"); +} + HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dea27ab..023439d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1378,7 +1378,7 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) { - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); + wined3d_palette_apply_to_dc(palette, surface->hDC); x11_copy_to_screen(surface->swapchain, NULL); } } @@ -3122,31 +3122,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) surface_load_location(surface, WINED3D_LOCATION_DIB); surface_invalidate_location(surface, ~WINED3D_LOCATION_DIB); - if (surface->resource.format->id == WINED3DFMT_P8_UINT - || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) - { - /* GetDC on palettized formats is unsupported in D3D9, and the method - * is missing in D3D8, so this should only be used for DX <=7 - * surfaces (with non-device palettes). */ - const RGBQUAD *colors = NULL; - - if (surface->palette) - { - colors = surface->palette->colors; - } - else - { - struct wined3d_swapchain *swapchain = surface->resource.device->swapchains[0]; - struct wined3d_surface *dds_primary = swapchain->front_buffer; - - if (dds_primary && dds_primary->palette) - colors = dds_primary->palette->colors; - } - - if (colors) - SetDIBColorTable(surface->hDC, 0, 256, colors); - } - surface->flags |= SFLAG_DCINUSE; surface->resource.map_count++; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 41b3158..f1a45dd 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -160,6 +160,7 @@ @ cdecl wined3d_palette_create(ptr long long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) +@ cdecl wined3d_palette_apply_to_dc(ptr ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db36fbf..328b595 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2261,6 +2261,7 @@ HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flag ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); +void __cdecl wined3d_palette_apply_to_dc(const struct wined3d_palette *palette, HDC dc); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);

1 0

Nikolay Sivov : xmllite/writer: Implement Flush() method.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: caeecfa223013941f44e9974a51f9bb3bd2b2a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caeecfa223013941f44e9974a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:50:31 2014 +0400 xmllite/writer: Implement Flush() method. --- dlls/xmllite/tests/writer.c | 14 +++++++------- dlls/xmllite/writer.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2fcd5f2..b6b8fe3 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -170,24 +170,24 @@ static void test_writestartdocument(void) hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); ok(hr == S_OK, "got 0x%08x\n", hr); + /* nothing written yet */ + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXmlWriter_Flush(writer); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == E_NOTIMPL) - { - IStream_Release(stream); - IXmlWriter_Release(writer); - return; - } hr = GetHGlobalFromStream(stream, &hglobal); ok(hr == S_OK, "got 0x%08x\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 745da79..0a1d361 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -2,6 +2,7 @@ * IXmlWriter implementation * * Copyright 2011 Alistair Leslie-Hughes + * Copyright 2014 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 @@ -62,6 +63,7 @@ typedef struct IMalloc *imalloc; xml_encoding encoding; struct output_buffer buffer; + ULONG stream_written; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -223,6 +225,11 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * return S_OK; } +static inline void reset_output_buffer(xmlwriteroutput *output) +{ + output->stream_written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -243,6 +250,31 @@ static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutpu return hr; } +static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) +{ + struct output_buffer *buffer; + ULONG written = 0, len; + HRESULT hr; + + if (!output || !output->stream) + return S_OK; + + buffer = &output->buffer; + + len = buffer->written - output->stream_written; + if (!len) + return S_OK; + + hr = ISequentialStream_Write(output->stream, buffer->data + output->stream_written, len, &written); + if (FAILED(hr)) { + WARN("write to stream failed (0x%08x)\n", hr); + return hr; + } + + output->stream_written += written; + return S_OK; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -295,6 +327,7 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) TRACE("(%p)->(%p)\n", This, output); if (This->output) { + reset_output_buffer(This->output); writeroutput_release_stream(This->output); IUnknown_Release(&This->output->IXmlWriterOutput_iface); This->output = NULL; @@ -662,9 +695,9 @@ static HRESULT WINAPI xmlwriter_Flush(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p\n", This); + TRACE("%p\n", This); - return E_NOTIMPL; + return writeroutput_flush_stream(This->output); } static const struct IXmlWriterVtbl xmlwriter_vtbl = @@ -825,6 +858,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding ? encoding : utf8W, -1); writeroutput->stream = NULL; + writeroutput->stream_written = 0; hr = init_output_buffer(writeroutput); if (FAILED(hr)) { IUnknown_Release(&writeroutput->IXmlWriterOutput_iface);

1 0

Nikolay Sivov : xmllite/writer: Initial support for starting a document.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a0f67c36956dd8998a0e79e675fcc7d7151b2dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f67c36956dd8998a0e79e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:49:37 2014 +0400 xmllite/writer: Initial support for starting a document. --- dlls/xmllite/reader.c | 13 ++-- dlls/xmllite/tests/writer.c | 20 ++++-- dlls/xmllite/writer.c | 154 +++++++++++++++++++++++++++++++++++++--- dlls/xmllite/xmllite_private.h | 9 +++ 4 files changed, 175 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0f67c36956dd8998a0e7…

1 0

Nikolay Sivov : xmllite/writer: Initial support of output buffer creation.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 71ab66efa04f80ef788a485295f10dd9e0d48191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ab66efa04f80ef788a48529… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 15 18:47:26 2014 +0400 xmllite/writer: Initial support of output buffer creation. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/writer.c | 83 ++++++++++++++++++++++++++++++++++++++++ dlls/xmllite/writer.c | 48 +++++++++++++++++++++++ dlls/xmllite/xmllite_private.h | 3 +- 4 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d8b81ea..e772a08 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -554,7 +554,7 @@ static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) readerinput_free(input, buffer->data); } -static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +HRESULT get_code_page(xml_encoding encoding, UINT *cp) { if (encoding == XmlEncoding_Unknown) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 738844f..0f86fb9 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -143,6 +143,88 @@ static void test_writeroutput(void) IUnknown_Release(output); } +static void test_writestartdocument(void) +{ + static const char fullprolog[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>"; + static const char prologversion[] = "<?xml version=\"1.0\"?>"; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; + static const WCHAR xmlW[] = {'x','m','l',0}; + IXmlWriter *writer; + HGLOBAL hglobal; + IStream *stream; + HRESULT hr; + char *ptr; + + hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* output not set */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); +todo_wine + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + if (hr == E_NOTIMPL) { + IXmlWriter_Release(writer); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, fullprolog, strlen(fullprolog)), "got %s, expected %s\n", ptr, fullprolog); + GlobalUnlock(hglobal); + + /* one more time */ + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + IStream_Release(stream); + + /* now add PI manually, and try to start a document */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_SetOutput(writer, (IUnknown*)stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + /* another attempt to add 'xml' PI */ + hr = IXmlWriter_WriteProcessingInstruction(writer, xmlW, versionW); + ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &hglobal); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ptr = GlobalLock(hglobal); + ok(!strncmp(ptr, prologversion, strlen(prologversion)), "got %s\n", ptr); + GlobalUnlock(hglobal); + + IStream_Release(stream); + IXmlWriter_Release(writer); +} + START_TEST(writer) { if (!init_pointers()) @@ -150,4 +232,5 @@ START_TEST(writer) test_writer_create(); test_writeroutput(); + test_writestartdocument(); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 2432602..10d73cb 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -34,6 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); +struct output_buffer +{ + char *data; + unsigned int allocated; + unsigned int written; + UINT codepage; +}; + typedef struct { IXmlWriterOutput IXmlWriterOutput_iface; @@ -42,6 +50,7 @@ typedef struct ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; + struct output_buffer buffer; } xmlwriteroutput; static const struct IUnknownVtbl xmlwriteroutputvtbl; @@ -107,6 +116,36 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static HRESULT init_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + const int initial_len = 0x2000; + HRESULT hr; + UINT cp; + + hr = get_code_page(output->encoding, &cp); + if (FAILED(hr)) return hr; + + buffer->data = writeroutput_alloc(output, initial_len); + if (!buffer->data) return E_OUTOFMEMORY; + + memset(buffer->data, 0, 4); + buffer->allocated = initial_len; + buffer->written = 0; + buffer->codepage = cp; + + return S_OK; +} + +static void free_output_buffer(xmlwriteroutput *output) +{ + struct output_buffer *buffer = &output->buffer; + writeroutput_free(output, buffer->data); + buffer->data = NULL; + buffer->allocated = 0; + buffer->written = 0; +} + static void writeroutput_release_stream(xmlwriteroutput *writeroutput) { if (writeroutput->stream) { @@ -572,6 +611,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); if (This->stream) ISequentialStream_Release(This->stream); + free_output_buffer(This); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -627,11 +667,14 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, IXmlWriterOutput **output) { xmlwriteroutput *writeroutput; + HRESULT hr; TRACE("%p %p %s %p\n", stream, imalloc, debugstr_w(encoding), output); if (!stream || !output) return E_INVALIDARG; + *output = NULL; + if (imalloc) writeroutput = IMalloc_Alloc(imalloc, sizeof(*writeroutput)); else @@ -644,6 +687,11 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); writeroutput->stream = NULL; + hr = init_output_buffer(writeroutput); + if (FAILED(hr)) { + IUnknown_Release(&writeroutput->IXmlWriterOutput_iface); + return hr; + } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output); diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 96a78fa..642aabe 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -60,6 +60,7 @@ typedef enum XmlEncoding_Unknown } xml_encoding; -xml_encoding parse_encoding_name(const WCHAR *name, int len) DECLSPEC_HIDDEN; +xml_encoding parse_encoding_name(const WCHAR*,int) DECLSPEC_HIDDEN; +HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; #endif /* __XMLLITE_PRIVATE__ */

1 0

Hans Leidekker : winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 552225632827ffe66a3a8f4045628cc8762b1a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=552225632827ffe66a3a8f404… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:48 2014 +0200 winhttp: Reimplement WinHttpGetProxyForUrl on top of jsproxy. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/pac.js | 244 ----------------------- dlls/winhttp/rsrc.rc | 3 - dlls/winhttp/session.c | 484 ++++++---------------------------------------- 4 files changed, 58 insertions(+), 675 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552225632827ffe66a3a8…

1 0

Frédéric Delanoy : oleacc: Add message context for object state string resources.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d1dbc024b5c8ba0b9d6b539cd1a47562a34e6e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dbc024b5c8ba0b9d6b539cd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 15 09:14:59 2014 +0200 oleacc: Add message context for object state string resources. --- dlls/oleacc/oleacc.rc | 64 ++++++++++++++++++++++++------------------------- po/ar.po | 44 +++++++++++++++++++++++++++++++--- po/bg.po | 45 ++++++++++++++++++++++++++++++---- po/ca.po | 44 +++++++++++++++++++++++++++++++--- po/cs.po | 44 +++++++++++++++++++++++++++++++--- po/da.po | 44 +++++++++++++++++++++++++++++++--- po/de.po | 44 +++++++++++++++++++++++++++++++--- po/el.po | 42 +++++++++++++++++++++++++++++--- po/en.po | 32 +++++++++++++++++++++++++ po/en_US.po | 32 +++++++++++++++++++++++++ po/eo.po | 48 +++++++++++++++++++++++++++++++++---- po/es.po | 44 +++++++++++++++++++++++++++++++--- po/fa.po | 41 ++++++++++++++++++++++++++++--- po/fi.po | 44 +++++++++++++++++++++++++++++++--- po/fr.po | 44 +++++++++++++++++++++++++++++++--- po/he.po | 48 +++++++++++++++++++++++++++++++++---- po/hi.po | 32 +++++++++++++++++++++++++ po/hr.po | 44 +++++++++++++++++++++++++++++++--- po/hu.po | 44 +++++++++++++++++++++++++++++++--- po/it.po | 44 +++++++++++++++++++++++++++++++--- po/ja.po | 44 +++++++++++++++++++++++++++++++--- po/ko.po | 44 +++++++++++++++++++++++++++++++--- po/lt.po | 44 +++++++++++++++++++++++++++++++--- po/ml.po | 32 +++++++++++++++++++++++++ po/nb_NO.po | 44 +++++++++++++++++++++++++++++++--- po/nl.po | 44 +++++++++++++++++++++++++++++++--- po/or.po | 32 +++++++++++++++++++++++++ po/pa.po | 32 +++++++++++++++++++++++++ po/pl.po | 44 +++++++++++++++++++++++++++++++--- po/pt_BR.po | 44 +++++++++++++++++++++++++++++++--- po/pt_PT.po | 44 +++++++++++++++++++++++++++++++--- po/rm.po | 35 ++++++++++++++++++++++++++- po/ro.po | 44 +++++++++++++++++++++++++++++++--- po/ru.po | 44 +++++++++++++++++++++++++++++++--- po/sk.po | 43 ++++++++++++++++++++++++++++++--- po/sl.po | 44 +++++++++++++++++++++++++++++++--- po/sr_RS(a)cyrillic.po | 47 ++++++++++++++++++++++++++++++++---- po/sr_RS(a)latin.po | 47 ++++++++++++++++++++++++++++++++---- po/sv.po | 44 +++++++++++++++++++++++++++++++--- po/te.po | 32 +++++++++++++++++++++++++ po/th.po | 48 +++++++++++++++++++++++++++++++++---- po/tr.po | 44 +++++++++++++++++++++++++++++++--- po/uk.po | 44 +++++++++++++++++++++++++++++++--- po/wa.po | 44 ++++++++++++++++++++++++++++++---- po/wine.pot | 32 +++++++++++++++++++++++++ po/zh_CN.po | 48 +++++++++++++++++++++++++++++++++---- po/zh_TW.po | 44 +++++++++++++++++++++++++++++++--- 47 files changed, 1847 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1dbc024b5c8ba0b9d6b5…

1 0

Hans Leidekker : jsproxy: Implement InternetGetProxyInfo.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: f7c8f5b3e45d688e3facebd80396d10de4a44b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c8f5b3e45d688e3facebd80… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:31 2014 +0200 jsproxy: Implement InternetGetProxyInfo. --- dlls/jsproxy/Makefile.in | 3 + dlls/jsproxy/jsproxy.spec | 2 +- dlls/jsproxy/main.c | 480 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jsproxy/pac.js | 244 +++++++++++++++++++++++ dlls/jsproxy/rsrc.rc | 20 ++ 5 files changed, 748 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7c8f5b3e45d688e3face…

1 0

Hans Leidekker : jsproxy: New dll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: ae542221a074f7459f28a623498421a59516192c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae542221a074f7459f28a6234… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:07 2014 +0200 jsproxy: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/jsproxy/Makefile.in | 5 +++++ dlls/jsproxy/jsproxy.spec | 5 +++++ dlls/jsproxy/main.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 61 insertions(+) diff --git a/configure b/configure index e5a26d1..4bcbfd8 100755 --- a/configure +++ b/configure @@ -1063,6 +1063,7 @@ enable_itircl enable_itss enable_joy_cpl enable_jscript +enable_jsproxy enable_kernel32 enable_ktmw32 enable_loadperf @@ -16937,6 +16938,7 @@ wine_fn_config_test dlls/itss/tests itss_test wine_fn_config_dll joy.cpl enable_joy_cpl po wine_fn_config_dll jscript enable_jscript clean,po wine_fn_config_test dlls/jscript/tests jscript_test +wine_fn_config_dll jsproxy enable_jsproxy implib wine_fn_config_dll kernel32 enable_kernel32 clean,implib,mc wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 diff --git a/configure.ac b/configure.ac index 673323a..de5aa41 100644 --- a/configure.ac +++ b/configure.ac @@ -2914,6 +2914,7 @@ WINE_CONFIG_TEST(dlls/itss/tests) WINE_CONFIG_DLL(joy.cpl,,[po]) WINE_CONFIG_DLL(jscript,,[clean,po]) WINE_CONFIG_TEST(dlls/jscript/tests) +WINE_CONFIG_DLL(jsproxy,,[implib]) WINE_CONFIG_DLL(kernel32,,[clean,implib,mc]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) diff --git a/dlls/jsproxy/Makefile.in b/dlls/jsproxy/Makefile.in new file mode 100644 index 0000000..41b59ea --- /dev/null +++ b/dlls/jsproxy/Makefile.in @@ -0,0 +1,5 @@ +MODULE = jsproxy.dll +IMPORTLIB = jsproxy + +C_SRCS = \ + main.c diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec new file mode 100644 index 0000000..21943df --- /dev/null +++ b/dlls/jsproxy/jsproxy.spec @@ -0,0 +1,5 @@ +@ stub InternetInitializeAutoProxyDll +@ stub InternetInitializeExAutoProxyDll +@ stub InternetDeInitializeAutoProxyDll +@ stub InternetDeInitializeExAutoProxyDll +@ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c new file mode 100644 index 0000000..fa9703d --- /dev/null +++ b/dlls/jsproxy/main.c @@ -0,0 +1,48 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +static HINSTANCE instance; + +WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); + +/****************************************************************** + * DllMain (jsproxy.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Hans Leidekker : include: Add missing proxy definitions.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a8ec0edfa88dde40cdfe50dee34b1752b07b0a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8ec0edfa88dde40cdfe50dee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:04:54 2014 +0200 include: Add missing proxy definitions. --- include/wininet.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/wininet.h b/include/wininet.h index 5cc3fd5..331055c 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1720,6 +1720,36 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) +typedef struct AutoProxyHelperVtbl +{ + BOOL (WINAPI *IsResolvable)(LPSTR); + DWORD (WINAPI *GetIPAddress)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostName)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNet)(LPSTR, LPSTR, LPSTR); + BOOL (WINAPI *IsResolvableEx)(LPSTR); + DWORD (WINAPI *GetIPAddressEx)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostNameEx)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNetEx)(LPSTR, LPSTR); + DWORD (WINAPI *SortIpList)(LPSTR, LPSTR, LPDWORD); +} AutoProxyHelperVtbl; + +typedef struct AutoProxyHelperFunctions +{ + const struct AutoProxyHelperVtbl *lpVtbl; +} AutoProxyHelperFunctions; + +typedef struct +{ + DWORD dwStructSize; + LPSTR lpszScriptBuffer; + DWORD dwScriptBufferSize; +} AUTO_PROXY_SCRIPT_BUFFER, *LPAUTO_PROXY_SCRIPT_BUFFER; + +typedef BOOL (CALLBACK *pfnInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); +typedef BOOL (CALLBACK *pfnInternetGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD); +typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, + LPAUTO_PROXY_SCRIPT_BUFFER); + BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD);

1 0

Huw Davies : shell32/tests: Fix tests on win 8.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 6f7650aec11f2bc8f10d46a36207ba23f92eeb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7650aec11f2bc8f10d46a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:12 2014 +0100 shell32/tests: Fix tests on win 8. --- dlls/shell32/tests/shlfolder.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3e51c8a..474f605 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -779,7 +779,8 @@ static void test_GetDisplayName(void) if (pidlLast->mkid.cb >= 76) { ok(!lstrcmpW((WCHAR*)&pidlLast->mkid.abID[46], wszFileName) || (pidlLast->mkid.cb >= 94 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[64], wszFileName)) || /* Vista */ - (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)), /* Win7 */ + (pidlLast->mkid.cb >= 98 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[68], wszFileName)) || /* Win7 */ + (pidlLast->mkid.cb >= 102 && !lstrcmpW((WCHAR*)&pidlLast->mkid.abID[72], wszFileName)), /* Win8 */ "Filename should be stored as wchar-string at this position!\n"); } @@ -1853,8 +1854,9 @@ static void test_ITEMIDLIST_format(void) { } ok (!lstrcmpW(wszFile[i], name) || - !lstrcmpW(wszFile[i], name + 9) || /* Vista */ - !lstrcmpW(wszFile[i], name + 11), /* Win7 */ + !lstrcmpW(wszFile[i], name + 9) || /* Vista */ + !lstrcmpW(wszFile[i], name + 11) || /* Win7 */ + !lstrcmpW(wszFile[i], name + 13), /* Win8 */ "The filename should be stored in unicode at this position!\n"); } } @@ -3969,7 +3971,8 @@ static void test_GetUIObject(void) } max_id_check -= baseItem; ok((max_id_check == max_id) || - (max_id_check == max_id-1 /* Win 7 */), + (max_id_check == max_id-1) || /* Win 7 */ + (max_id_check == max_id-2), /* Win 8 */ "Not equal (or near equal), got %d and %d\n", max_id_check, max_id); #define is_win2k() (pSHGetFolderPathA && !pSHGetFolderPathAndSubDirA)

1 0

Hans Leidekker : jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8545a971c94358c904a657859aff2fe9c943a49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8545a971c94358c904a657859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 15 14:05:17 2014 +0200 jsproxy: Implement InternetInitializeAutoProxyDll and InternetDeinitializeAutoProxyDll. --- dlls/jsproxy/jsproxy.spec | 4 +- dlls/jsproxy/main.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 21943df..f557fe6 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,5 @@ -@ stub InternetInitializeAutoProxyDll +@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll @ stub InternetInitializeExAutoProxyDll -@ stub InternetDeInitializeAutoProxyDll +@ stdcall InternetDeInitializeAutoProxyDll(str long) @ stub InternetDeInitializeExAutoProxyDll @ stub InternetGetProxyInfo diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index fa9703d..9305ff8 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -23,12 +23,23 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "wininet.h" #include "wine/debug.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); +static CRITICAL_SECTION cs_jsproxy; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cs_jsproxy, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_jsproxy") } +}; +static CRITICAL_SECTION cs_jsproxy = { &critsect_debug, -1, 0, 0, 0, 0 }; + /****************************************************************** * DllMain (jsproxy.@) */ @@ -46,3 +57,101 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline WCHAR *strdupAW( const char *src, DWORD len ) +{ + WCHAR *dst = NULL; + if (src) + { + int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } + return dst; +} + +static struct pac_script +{ + WCHAR *text; +} pac_script; +static struct pac_script *global_script = &pac_script; + +/****************************************************************** + * InternetDeInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) +{ + TRACE( "%s, %u\n", debugstr_a(mime), reserved ); + + EnterCriticalSection( &cs_jsproxy ); + + heap_free( global_script->text ); + global_script->text = NULL; + + LeaveCriticalSection( &cs_jsproxy ); + return TRUE; +} + +static WCHAR *load_script( const char *filename ) +{ + HANDLE handle; + DWORD size, bytes_read; + char *buffer; + int len; + WCHAR *script = NULL; + + handle = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return NULL; + + size = GetFileSize( handle, NULL ); + if (!(buffer = heap_alloc( size ))) goto done; + if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; + + len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); + if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); + script[len] = 0; + +done: + CloseHandle( handle ); + heap_free( buffer ); + return script; +} + +/****************************************************************** + * InternetInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile, LPSTR mime, + AutoProxyHelperFunctions *callbacks, + LPAUTO_PROXY_SCRIPT_BUFFER buffer ) +{ + BOOL ret = FALSE; + + TRACE( "%u, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer ); + + if (callbacks) FIXME( "callbacks not supported\n" ); + + EnterCriticalSection( &cs_jsproxy ); + + if (global_script->text) + { + LeaveCriticalSection( &cs_jsproxy ); + return FALSE; + } + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && + (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; + + LeaveCriticalSection( &cs_jsproxy ); + return ret; +}

1 0

Huw Davies : shell32/tests: Fix the tests when run from the top directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d87aa43ce56630a5031ce492a8ac475b1ad97b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87aa43ce56630a5031ce492a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 10:27:11 2014 +0100 shell32/tests: Fix the tests when run from the top directory. --- dlls/shell32/tests/shlfolder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f096476..3e51c8a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -533,12 +533,13 @@ if (0) IShellFolder_Release(psfSystemDir); - GetCurrentDirectoryA(MAX_PATH, buf); - if(!lstrlenA(buf)) + cChars = GetCurrentDirectoryA(MAX_PATH, buf); + if(!cChars) { skip("Failed to get current directory, skipping tests.\n"); return; } + if(buf[cChars-1] != '\\') lstrcatA(buf, "\\"); SHGetDesktopFolder(&psfDesktop); @@ -546,7 +547,6 @@ if (0) /* .html */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_html); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -590,7 +590,6 @@ if (0) /* .txt */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_txt); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -604,6 +603,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild); @@ -616,7 +616,6 @@ if (0) /* .foo */ lstrcpyA(pathA, buf); - lstrcatA(pathA, "\\"); lstrcatA(pathA, filename_foo); hfile = CreateFileA(pathA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if(hfile != INVALID_HANDLE_VALUE) @@ -630,6 +629,7 @@ if (0) hr = IShellFolder_BindToObject(psfDesktop, pidl, NULL, &IID_IShellFolder, (void**)&psfChild); ok(hr == E_FAIL || /* Vista+ */ hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || /* XP, W2K3 */ + hr == E_INVALIDARG || /* W2K item in top dir */ broken(hr == S_OK), /* Win9x, NT4, W2K */ "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) IShellFolder_Release(psfChild);

1 0

Henri Verbeet : d2d1: Add the ID2D1LinearGradientBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 04af7227da3ba5f0380bb746151861bb9f61864b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04af7227da3ba5f0380bb7461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:35 2014 +0200 d2d1: Add the ID2D1LinearGradientBrush interface. --- include/d2d1.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 21af6a7..3a7901f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -659,5 +659,25 @@ interface ID2D1GradientStopCollection : ID2D1Resource D2D1_EXTEND_MODE GetExtendMode(); } +[ + local, + object, + uuid(2cd906ab-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1LinearGradientBrush : ID2D1Brush +{ + void SetStartPoint( + [in] D2D1_POINT_2F start_point + ); + void SetEndPoint( + [in] D2D1_POINT_2F end_point + ); + D2D1_POINT_2F GetStartPoint(); + D2D1_POINT_2F GetEndPoint(); + void GetGradientStopCollection( + [out] ID2D1GradientStopCollection **gradient + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1GradientStopCollection interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 36c438145d7c4c50dd553b27c7f3867d4618bcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c438145d7c4c50dd553b27c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:34 2014 +0200 d2d1: Add the ID2D1GradientStopCollection interface. --- include/d2d1.idl | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 7f7de1d..21af6a7 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -191,6 +191,13 @@ typedef enum D2D1_BITMAP_INTERPOLATION_MODE D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, } D2D1_BITMAP_INTERPOLATION_MODE; +typedef enum D2D1_GAMMA +{ + D2D1_GAMMA_2_2 = 0, + D2D1_GAMMA_1_0 = 1, + D2D1_GAMMA_FORCE_DWORD = 0xffffffff, +} D2D1_GAMMA; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -248,6 +255,12 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION D2D1_MATRIX_3X2_F transform; } D2D1_DRAWING_STATE_DESCRIPTION; +typedef struct D2D1_GRADIENT_STOP +{ + float position; + D2D1_COLOR_F color; +} D2D1_GRADIENT_STOP; + [ local, object, @@ -630,5 +643,21 @@ interface ID2D1SolidColorBrush : ID2D1Brush D2D1_COLOR_F GetColor(); } +[ + local, + object, + uuid(2cd906a7-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GradientStopCollection : ID2D1Resource +{ + UINT32 GetGradientStopCount(); + void GetGradientStops( + [out] D2D1_GRADIENT_STOP *stops, + [in] UINT32 stop_count + ); + D2D1_GAMMA GetColorInterpolationGamma(); + D2D1_EXTEND_MODE GetExtendMode(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1BitmapBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: d156bf03a6bed139e3aaf32f829e07047f6f6f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d156bf03a6bed139e3aaf32f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:32 2014 +0200 d2d1: Add the ID2D1BitmapBrush interface. --- include/d2d1.idl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 2ea05f1..88a733f 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -33,6 +33,18 @@ typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +enum +{ + D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0, + D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR = 1, + D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC = 2, + D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR = 3, + D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC = 4, + D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC = 5, + D2D1_INTERPOLATION_MODE_DEFINITION_FANT = 6, + D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR = 7, +}; + typedef enum D2D1_DEBUG_LEVEL { D2D1_DEBUG_LEVEL_NONE = 0, @@ -163,6 +175,21 @@ typedef enum D2D1_TEXT_ANTIALIAS_MODE D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, } D2D1_TEXT_ANTIALIAS_MODE; +typedef enum D2D1_EXTEND_MODE +{ + D2D1_EXTEND_MODE_CLAMP = 0, + D2D1_EXTEND_MODE_WRAP = 1, + D2D1_EXTEND_MODE_MIRROR = 2, + D2D1_EXTEND_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_EXTEND_MODE; + +typedef enum D2D1_BITMAP_INTERPOLATION_MODE +{ + D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, + D2D1_BITMAP_INTERPOLATION_MODE_LINEAR = D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR, + D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_BITMAP_INTERPOLATION_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -562,5 +589,32 @@ interface ID2D1Brush : ID2D1Resource ); } +[ + local, + object, + uuid(2cd906aa-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1BitmapBrush : ID2D1Brush +{ + void SetExtendModeX( + [in] D2D1_EXTEND_MODE mode + ); + void SetExtendModeY( + [in] D2D1_EXTEND_MODE mode + ); + void SetInterpolationMode( + [in] D2D1_BITMAP_INTERPOLATION_MODE mode + ); + void SetBitmap( + [in] ID2D1Bitmap *bitmap + ); + D2D1_EXTEND_MODE GetExtendModeX(); + D2D1_EXTEND_MODE GetExtendModeY(); + D2D1_BITMAP_INTERPOLATION_MODE GetInterpolationMode(); + void GetBitmap( + [out] ID2D1Bitmap **bitmap + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Ken Thomases : winemac: Fix a memory leak if posting WM_DROPFILES fails.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 757c57634e567b816723b67a52529a0863aa6cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=757c57634e567b816723b67a5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 14 20:15:30 2014 -0500 winemac: Fix a memory leak if posting WM_DROPFILES fails. --- dlls/winemac.drv/dragdrop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index 612a868..ad0bc8c 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -466,8 +466,8 @@ BOOL query_drag_drop(macdrv_query* query) ret = PostMessageW(hwnd, WM_DROPFILES, (WPARAM)hdrop, 0L); /* hdrop is owned by the message and freed when the recipient calls DragFinish(). */ } - else - GlobalFree(hdrop); + + if (!ret) GlobalFree(hdrop); } }

1 0

Henri Verbeet : d2d1: Add the ID2D1SolidColorBrush interface.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: a4677f8670b0bcebfeec8a6fe1baae5810acc269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4677f8670b0bcebfeec8a6fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:33 2014 +0200 d2d1: Add the ID2D1SolidColorBrush interface. --- include/d2d1.idl | 14 ++++++++++++++ include/d2dbasetypes.h | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 88a733f..7f7de1d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -32,6 +32,7 @@ typedef UINT64 D2D1_TAG; typedef D2D_SIZE_U D2D1_SIZE_U; typedef D2D_POINT_2U D2D1_POINT_2U; typedef D2D_RECT_U D2D1_RECT_U; +typedef D2D_COLOR_F D2D1_COLOR_F; enum { @@ -616,5 +617,18 @@ interface ID2D1BitmapBrush : ID2D1Brush ); } +[ + local, + object, + uuid(2cd906a9-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1SolidColorBrush : ID2D1Brush +{ + void SetColor( + [in] const D2D1_COLOR_F *color + ); + D2D1_COLOR_F GetColor(); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 61158ac..e5acff2 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -16,6 +16,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef D3DCOLORVALUE_DEFINED +typedef struct D3DCOLORVALUE +{ + float r; + float g; + float b; + float a; +} D3DCOLORVALUE; +#define D3DCOLORVALUE_DEFINED +#endif + +typedef D3DCOLORVALUE D2D_COLOR_F; + typedef struct D2D_POINT_2F { FLOAT x;

1 0

Nikolay Sivov : msxml3: Remove no longer used helper.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 8e524667578aca111fc94bb69a4afc05a4b5df1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e524667578aca111fc94bb69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 13:46:48 2014 +0400 msxml3: Remove no longer used helper. --- dlls/msxml3/msxml_private.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 167e74f..a57dc60 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -205,22 +205,6 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } -static inline LPSTR heap_strdupWtoA(LPCWSTR str) -{ - LPSTR ret = NULL; - - if(str) { - DWORD len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - ret = heap_alloc(len+1); - if(!ret) - return NULL; - - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len+1, NULL, NULL); - } - - return ret; -} - /* XSLProcessor parameter list */ struct xslprocessor_par {

1 0

Henri Verbeet : d2d1: Get rid of "optional" attributes.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 71a27809f153e11c719909e35900c807e8712c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a27809f153e11c719909e35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 15 10:15:31 2014 +0200 d2d1: Get rid of "optional" attributes. --- include/d2d1.idl | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index ef05f00..2ea05f1 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -291,80 +291,80 @@ interface ID2D1TessellationSink : IUnknown interface ID2D1Geometry : ID2D1Resource { HRESULT GetBounds( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [out] D2D1_RECT_F *bounds ); HRESULT GetWidenedBounds( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_RECT_F *bounds ); HRESULT StrokeContainsPoint( [in] D2D1_POINT_2F point, [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT FillContainsPoint( [in] D2D1_POINT_2F point, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] BOOL *contains ); HRESULT CompareWithGeometry( [in] ID2D1Geometry *geometry, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] D2D1_GEOMETRY_RELATION *relation ); HRESULT Simplify( [in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Tessellate( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1TessellationSink *sink ); HRESULT CombineWithGeometry( [in] ID2D1Geometry *geometry, [in] D2D1_COMBINE_MODE combine_mode, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT Outline( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink ); HRESULT ComputeArea( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *area ); HRESULT ComputeLength( - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [out] float *length ); HRESULT ComputePointAtLength( [in] float length, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, - [out, optional] D2D1_POINT_2F *point, - [out, optional] D2D1_POINT_2F *tangent + [out] D2D1_POINT_2F *point, + [out] D2D1_POINT_2F *tangent ); HRESULT Widen( [in] float stroke_width, - [in, optional] ID2D1StrokeStyle *stroke_style, - [in, optional] const D2D1_MATRIX_3X2_F *transform, + [in] ID2D1StrokeStyle *stroke_style, + [in] const D2D1_MATRIX_3X2_F *transform, [in] float tolerance, [in] ID2D1SimplifiedGeometrySink *sink );

1 0

Ken Thomases : winemac: Add the ability to disable high-resolution scrolling.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: wine Branch: master Commit: 451915100a61a2e5f3e848d0c6ab7fb477b08d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451915100a61a2e5f3e848d0c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 14 20:15:35 2014 -0500 winemac: Add the ability to disable high-resolution scrolling. The Mac driver can generate scroll wheel events with values which are not integral multiples of WHEEL_DELTA. Apps should handle that by scrolling a corresponding non-integral multiple of what they'd do for a WHEEL_DELTA-valued scroll or, if they can't, then at least accumulate scroll distance until its magnitude exceeds WHEEL_DELTA and do a "chunky" scroll. However, many apps don't do that properly. They may scroll way too far/fast or even in the opposite direction. If the registry setting UsePreciseScrolling is set to "n", the Mac driver will do that accumulation and chunking itself to work around such broken app behavior. --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 81 ++++++++++++++++++++++++++++++--------- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 ++ 4 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0f8926d..fc6c1ec 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -66,6 +66,9 @@ enum { double mouseMoveDeltaX, mouseMoveDeltaY; NSUInteger unmatchedMouseDowns; + NSTimeInterval lastScrollTime; + double accumScrollX, accumScrollY; + NSMutableDictionary* originalDisplayModes; NSMutableDictionary* latentDisplayModes; BOOL displaysCapturedForFullscreen; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e5594d1..d454513 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1725,7 +1725,7 @@ int macdrv_err_on; if (process) { macdrv_event* event; - CGFloat x, y; + double x, y; BOOL continuous = FALSE; event = macdrv_create_event(MOUSE_SCROLL, window); @@ -1768,26 +1768,69 @@ int macdrv_err_on; /* The x,y values so far are in pixels. Win32 expects to receive some fraction of WHEEL_DELTA == 120. By my estimation, that's roughly 6 times the pixel value. */ - event->mouse_scroll.x_scroll = 6 * x; - event->mouse_scroll.y_scroll = 6 * y; + x *= 6; + y *= 6; - if (!continuous) + if (use_precise_scrolling) { - /* For non-continuous "clicky" wheels, if there was any motion, make - sure there was at least WHEEL_DELTA motion. This is so, at slow - speeds where the system's acceleration curve is actually reducing the - scroll distance, the user is sure to get some action out of each click. - For example, this is important for rotating though weapons in a - first-person shooter. */ - if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) - event->mouse_scroll.x_scroll = 120; - else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) - event->mouse_scroll.x_scroll = -120; - - if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) - event->mouse_scroll.y_scroll = 120; - else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) - event->mouse_scroll.y_scroll = -120; + event->mouse_scroll.x_scroll = x; + event->mouse_scroll.y_scroll = y; + + if (!continuous) + { + /* For non-continuous "clicky" wheels, if there was any motion, make + sure there was at least WHEEL_DELTA motion. This is so, at slow + speeds where the system's acceleration curve is actually reducing the + scroll distance, the user is sure to get some action out of each click. + For example, this is important for rotating though weapons in a + first-person shooter. */ + if (0 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 120) + event->mouse_scroll.x_scroll = 120; + else if (-120 < event->mouse_scroll.x_scroll && event->mouse_scroll.x_scroll < 0) + event->mouse_scroll.x_scroll = -120; + + if (0 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 120) + event->mouse_scroll.y_scroll = 120; + else if (-120 < event->mouse_scroll.y_scroll && event->mouse_scroll.y_scroll < 0) + event->mouse_scroll.y_scroll = -120; + } + } + else + { + /* If it's been a while since the last scroll event or if the scrolling has + reversed direction, reset the accumulated scroll value. */ + if ([theEvent timestamp] - lastScrollTime > 1) + accumScrollX = accumScrollY = 0; + else + { + /* The accumulated scroll value is in the opposite direction/sign of the last + scroll. That's because it's the "debt" resulting from over-scrolling in + that direction. We accumulate by adding in the scroll amount and then, if + it has the same sign as the scroll value, we subtract any whole or partial + WHEEL_DELTAs, leaving it 0 or the opposite sign. So, the user switched + scroll direction if the accumulated debt and the new scroll value have the + same sign. */ + if ((accumScrollX < 0 && x < 0) || (accumScrollX > 0 && x > 0)) + accumScrollX = 0; + if ((accumScrollY < 0 && y < 0) || (accumScrollY > 0 && y > 0)) + accumScrollY = 0; + } + lastScrollTime = [theEvent timestamp]; + + accumScrollX += x; + accumScrollY += y; + + if (accumScrollX > 0 && x > 0) + event->mouse_scroll.x_scroll = 120 * ceil(accumScrollX / 120); + if (accumScrollX < 0 && x < 0) + event->mouse_scroll.x_scroll = 120 * -ceil(-accumScrollX / 120); + if (accumScrollY > 0 && y > 0) + event->mouse_scroll.y_scroll = 120 * ceil(accumScrollY / 120); + if (accumScrollY < 0 && y < 0) + event->mouse_scroll.y_scroll = 120 * -ceil(-accumScrollY / 120); + + accumScrollX -= event->mouse_scroll.x_scroll; + accumScrollY -= event->mouse_scroll.y_scroll; } if (event->mouse_scroll.x_scroll || event->mouse_scroll.y_scroll) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index d3d3ffc..30b6b64 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -148,6 +148,7 @@ extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; +extern int use_precise_scrolling DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 300b1a7..38352a8 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -56,6 +56,7 @@ BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; int cursor_clipping_locks_windows = TRUE; +int use_precise_scrolling = TRUE; HMODULE macdrv_module = 0; @@ -179,6 +180,9 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "CursorClippingLocksWindows", buffer, sizeof(buffer))) cursor_clipping_locks_windows = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "UsePreciseScrolling", buffer, sizeof(buffer))) + use_precise_scrolling = IS_OPTION_TRUE(buffer[0]); + if (appkey) RegCloseKey(appkey); if (hkey) RegCloseKey(hkey); }

1 0

Francois Gouget : testbot/TestAgent: Typographic fixes for the trace_speed () units.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: cc965a0f79b613f824448427ae7f28e234a4ca92 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cc965a0f79b613f824448427… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:32 2014 +0200 testbot/TestAgent: Typographic fixes for the trace_speed() units. --- testbot/lib/WineTestBot/TestAgent.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index b22fb06..3c84d49 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -77,14 +77,14 @@ sub trace_speed($$) if ($Elapsed) { $Speed = $Bytes * 8 / $Elapsed / 1000; - $Speed = $Speed < 1000 ? sprintf(" (%.1fKb/s)", $Speed) : - sprintf(" (%.1fMb/s)", $Speed / 1000); + $Speed = $Speed < 1000 ? sprintf(" (%.1f kb/s)", $Speed) : + sprintf(" (%.1f Mb/s)", $Speed / 1000); } $Bytes = $Bytes < 8 * 1024 ? "$Bytes bytes" : - $Bytes < 8 * 1024 * 1024 ? sprintf("%.1fKiB", $Bytes / 1024) : - sprintf("%.1fMiB", $Bytes / 1024 / 1024); - $Elapsed = $Elapsed < 1 ? sprintf("%.1fms", $Elapsed * 1000) : - sprintf("%.1fs", $Elapsed); + $Bytes < 8 * 1024 * 1024 ? sprintf("%.1f KiB", $Bytes / 1024) : + sprintf("%.1f MiB", $Bytes / 1024 / 1024); + $Elapsed = $Elapsed < 1 ? sprintf("%.1f ms", $Elapsed * 1000) : + sprintf("%.1f s", $Elapsed); debug("Transferred $Bytes in $Elapsed$Speed\n"); } }

1 0

Francois Gouget : testbot/TestAgent: Retry the Wait RPC if the connection gets broken.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: a3bc1bebd8870d08eb2593609ef72b64ad01b24a URL: http://source.winehq.org/git/tools.git/?a=commit;h=a3bc1bebd8870d08eb259360… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:23 2014 +0200 testbot/TestAgent: Retry the Wait RPC if the connection gets broken. This seems necessary to work around network flakiness. --- testbot/lib/WineTestBot/TestAgent.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index fb14b38..b22fb06 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1232,8 +1232,12 @@ sub Wait($$$;$) # The process has quit last if (defined $Result); - # Retry only if the timeout occurred on the remote end - last if ($self->{err} !~ /timed out waiting/); + # The only 'error' we should be getting here is the TestAgent server + # telling us it timed out waiting for the process. However flaky network + # connections like to break while we're waiting for the reply. So retry + # if that happens and let the automatic reconnection detect real network + # issues. + last if ($self->{err} !~ /(?:timed out waiting|network read timed out)/); } } $self->SetTimeout($OldTimeout);

1 0

Francois Gouget : testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs().
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 8f115fe2bd150ca3b96614e881b3fbf473d2aacb URL: http://source.winehq.org/git/tools.git/?a=commit;h=8f115fe2bd150ca3b96614e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:06 2014 +0200 testbot/Engine: Remove the FoundWinetestUpdate() notification. It is redundent with RescheduleJobs(). It did not use the $Bits parameter and just calls ScheduleJobs() which is what the RescheduleJobs() notification does already. --- testbot/bin/CheckForWinetestUpdate.pl | 2 +- testbot/bin/Engine.pl | 20 -------------------- testbot/lib/WineTestBot/Engine/Notify.pm | 19 +------------------ 3 files changed, 2 insertions(+), 39 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 6d33a5c..5d30913 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -251,7 +251,7 @@ else AddJob(1, $FileNameRandomPart, $Bits); } -FoundWinetestUpdate($Bits); +RescheduleJobs(); LogMsg "Submitted jobs\n"; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 72e165c..f8b7e1e 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -425,25 +425,6 @@ sub HandleVMStatusChange return "1OK"; } -sub HandleFoundWinetestUpdate -{ - my $Bits = $_[0]; - - if ($Bits !~ /^(?:32|64)$/) - { - LogMsg "Invalid number of bits in foundwinetestupdate message\n"; - return "0Invalid number of bits"; - } - - my $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleWinePatchMLSubmission { my $dh; @@ -594,7 +575,6 @@ sub HandleGetScreenshot } my %Handlers=( - "foundwinetestupdate" => \&HandleFoundWinetestUpdate, "getscreenshot" => \&HandleGetScreenshot, "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1f93db4..a241c81 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,7 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel - &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -199,23 +199,6 @@ sub VMStatusChange return substr($Reply, 1); } -sub FoundWinetestUpdate -{ - my $Bits = $_[0]; - - my $Reply = SendCmdReceiveReply("foundwinetestupdate $Bits\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub WinePatchMLSubmission { my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n");

1 0

Francois Gouget : testbot/testagentd: Fix a small comment typo.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 6d0453c6c0159353a60bf9174a067ff07c10f51b URL: http://source.winehq.org/git/tools.git/?a=commit;h=6d0453c6c0159353a60bf917… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:56:32 2014 +0200 testbot/testagentd: Fix a small comment typo. --- testbot/src/testagentd/platform_unix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 09330cb..75afc81 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -164,7 +164,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child struct timeval tv; int ready; - /* select() blocks until either the client disconnects or until, or + /* select() blocks until either the client disconnects, or * the SIGCHLD signal indicates the child has exited. The recv() call * tells us if it is the former. */

1 0

Francois Gouget : testbot/testagentd: Fix the legacy Wait RPC.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 82ca6524580cffd44a798035a478c31cb9845de6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=82ca6524580cffd44a798035… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:56:12 2014 +0200 testbot/testagentd: Fix the legacy Wait RPC. 0 means return immediately, not wait indefinitely (aka RUN_NOTIMEOUT)! --- testbot/src/testagentd/testagentd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 4bda532..3159f16 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -802,7 +802,7 @@ static void do_wait(SOCKET client) return; } - if (platform_wait(client, pid, 0, &childstatus)) + if (platform_wait(client, pid, RUN_NOTIMEOUT, &childstatus)) { send_list_size(client, 1); send_uint32(client, childstatus);

1 0

Francois Gouget : testbot/Engine: Fix a minor typo in a comment.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 30e3a6d665925d7794f14d39c16d2506412e9ff0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=30e3a6d665925d7794f14d39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:27 2014 +0200 testbot/Engine: Fix a minor typo in a comment. --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 6e2ff1c..ccaadc1 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -590,7 +590,7 @@ through the cracks, possibly because of an Engine restart. Specifically it updates the status of all the current Jobs, Steps and Tasks, then schedules Tasks to be run, checks the staging directory for wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of -changes on Wine's Patches web site dropped by WinePatchesWebNotify.pl, and +changes on Wine's Patches web site dropped by WinePatchesWebSubmit.pl, and checks whether any pending patchsets are now complete and thus can be scheduled. =back

1 0

Francois Gouget : testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: e9f20ff64423cad602bf04f9c9e42af4f0512e97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9f20ff64423cad602bf04f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:58 2014 +0200 testbot/testagentd: Use $(CC) rather than hardcoding gcc as the compiler. $(CC) is standard and does not require the autoconf machinery. --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 5a7b735..4f16f9c 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -9,11 +9,11 @@ windows: TestAgentd.exe $(builddir)/testagentd: testagentd.o platform_unix.o - gcc -o $@ $^ + $(CC) -o $@ $^ strip $@ .c.o: - gcc -Wall -g -c -o $@ $< + $(CC) -Wall -g -c -o $@ $< TestAgentd.exe: testagentd.obj platform_windows.obj

1 0

Francois Gouget : testbot/TestAgent: Make sure we don't overflow alarm()' s 32-bit limit.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 4f9cf46a80f18139f326d611f3575075d4d22d85 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4f9cf46a80f18139f326d611… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:55:45 2014 +0200 testbot/TestAgent: Make sure we don't overflow alarm()'s 32-bit limit. --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 3c84d49..1acb0cd 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -174,7 +174,8 @@ sub _SetAlarm($) { my $Timeout = $self->{deadline} - time(); die "timeout" if ($Timeout <= 0); - alarm($Timeout); + # alarm() has a 32-bit limit, even on 64-bit systems + alarm($Timeout <= 0xffffffff ? $Timeout : 0xffffffff); } }

1 0

Francois Gouget : testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: eeed0b5f0f4af7d985e9e72135f6f75ffe1c1d82 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eeed0b5f0f4af7d985e9e721… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:51:04 2014 +0200 testbot/CheckWinetestUpdate: Let the Engine handle moving staging files to the jobs directory. Otherwise there is a race condition between CheckWinetestUpdate and the Engine. --- testbot/bin/CheckForWinetestUpdate.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 98165a3..fc24fb6 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -110,8 +110,6 @@ sub AddJob LogMsg "Failed to save job: $ErrMessage\n"; exit 1; } - - $NewStep->HandleStaging($NewJob->Id); } }

1 0

Francois Gouget : testbot: Better document the use of the staging directory.
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: 7d4c644fccff381619dbc49a48ae644daf7b81b4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d4c644fccff381619dbc49a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:45 2014 +0200 testbot: Better document the use of the staging directory. Also remove an unused variable in CheckForWinetestUpdate. --- testbot/bin/CheckForWinetestUpdate.pl | 13 +++++++++---- testbot/web/Submit.pl | 6 ++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 5d30913..98165a3 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -175,7 +175,11 @@ umask 002; mkdir "$DataDir/latest"; mkdir "$DataDir/staging"; -my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; +# Store the new WineTest executable in the staging directory: +# - So we can compare it to the reference one in the latest directory to +# check that it is truly new. +# - Because we don't know the relevant Job and Step IDs yet and thus cannot +# put it in the jobs directory tree. my $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuffix}-latest.exe") { @@ -186,7 +190,7 @@ my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest${BitsSuff my $UA = LWP::UserAgent->new(); $UA->agent("WineTestBot"); my $Request = HTTP::Request->new(GET => $WinetestUrl); -my $NowDate = gmtime; +my $LatestFileName = "$DataDir/latest/winetest${BitsSuffix}-latest.exe"; if (-r $LatestFileName) { my $Since = gmtime((stat $LatestFileName)[9]); @@ -230,14 +234,15 @@ if ($Bits == 32) { AddReconfigJob(); AddJob(1, $FileNameRandomPart, $Bits); - + + # Create another copy for the non-base VMs Job. $FileNameRandomPart = GenerateRandomString(32); while (-e "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe") { $FileNameRandomPart = GenerateRandomString(32); } $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe"; - if (! copy($LatestFileName, $StagingFileName)) + if (!copy($LatestFileName, $StagingFileName)) { LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n"; } diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 3bcfad9..d381150 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -792,8 +792,10 @@ sub OnSubmit return !1; } - # Make sure the file has a unique name even when not picked up directly - # by the engine + # Store the file in the staging directory until the relevant Job and Step + # IDs are known and it can be moved to the jobs directory tree. But rename + # it so it does not get overwritten if the user submits another one before + # the Engine gets around to doing so. my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName")))

1 0

Francois Gouget : testbot/Engine: Remove the JobSubmit() notification. It' s redundant with RescheduleJobs().
by Alexandre Julliard May 15, 2014

May 15, 2014

Module: tools Branch: master Commit: f70cf6ceb4a29d8d041d2e07ca0af04789b8e741 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f70cf6ceb4a29d8d041d2e07… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 15 15:48:11 2014 +0200 testbot/Engine: Remove the JobSubmit() notification. It's redundant with RescheduleJobs(). It does not need to call Step::HandleStaging() since the Job scheduler does that already. So then it's identical to the RescheduleJobs() notification. --- testbot/bin/Engine.pl | 34 ------------------------------ testbot/lib/WineTestBot/Engine/Notify.pm | 19 +---------------- testbot/web/Submit.pl | 8 ++++--- 3 files changed, 6 insertions(+), 55 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f8b7e1e..6e2ff1c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -257,39 +257,6 @@ sub HandlePing return "1pong\n"; } -sub HandleJobSubmit -{ - my $JobKey = $_[0]; - - my $Job = CreateJobs()->GetItem($JobKey); - if (! $Job) - { - LogMsg "JobSubmit for nonexistent job $JobKey\n"; - return "0Job $JobKey not found"; - } - # We've already determined that JobKey is valid, untaint it - $JobKey =~ m/^(.*)$/; - $JobKey = $1; - - my $ErrMessage; - foreach my $Step (@{$Job->Steps->GetItems()}) - { - $ErrMessage = $Step->HandleStaging($JobKey); - if (defined($ErrMessage)) - { - LogMsg "Staging problem: $ErrMessage\n"; - } - } - - $ErrMessage = ScheduleJobs(); - if (defined($ErrMessage)) - { - LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n"; - } - - return "1OK"; -} - sub HandleJobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -579,7 +546,6 @@ my %Handlers=( "jobcancel" => \&HandleJobCancel, "jobrestart" => \&HandleJobRestart, "jobstatuschange" => \&HandleJobStatusChange, - "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, "reschedulejobs" => \&HandleRescheduleJobs, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index a241c81..d0d4890 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -33,7 +33,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel +(a)EXPORT = qw(&Shutdown &PingEngine &JobStatusChange &JobCancel &JobRestart &RescheduleJobs &VMStatusChange &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -99,23 +99,6 @@ sub PingEngine return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobSubmit -{ - my $JobKey = $_[0]; - - my $Reply = SendCmdReceiveReply("jobsubmit $JobKey\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub JobStatusChange { my ($JobKey, $OldStatus, $NewStatus) = @_; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 0d9d0b4..3bcfad9 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -917,14 +917,16 @@ sub OnSubmit $Jobs = undef; # Notify engine - if (defined(JobSubmit($JobKey))) + my $ErrMessage = RescheduleJobs(); + if (defined $ErrMessage) { + LogMsg "$ErrMessage\n"; $self->{Page} = 4; - $self->{JobKey} = $NewJob->GetKey(); + $self->{JobKey} = $JobKey; return !1; } - $self->Redirect("/JobDetails.pl?Key=" . $NewJob->Id); + $self->Redirect("/JobDetails.pl?Key=$JobKey"); exit; }

1 0

Shuai Meng : vbscript: Implemented CByte.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: db42703d5ff9eb31130896c9d7d7713b8fe09d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db42703d5ff9eb31130896c9d… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Wed May 14 23:05:02 2014 +0800 vbscript: Implemented CByte. --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 2 ++ 3 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9aeba34..484158f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -424,8 +424,25 @@ static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_CByte(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, VARIANT_LOCALBOOL, VT_UI1); + if(FAILED(hres)) + return hres; + + if(!res) { + VariantClear(&v); + return DISP_E_BADVARTYPE; + } + + *res = v; + return S_OK; } static HRESULT Global_CDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 12124b7..8197d6d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -533,4 +533,48 @@ MyObject.myval = 0 Call ok(CBool(MyObject) = False, "CBool(MyObject) = " & CBool(MyObject)) Call ok(getVT(CBool(MyObject)) = "VT_BOOL", "getVT(CBool(MyObject)) = " & getVT(CBool(MyObject))) +Sub testCByteError(strings, error_num1,error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CByte(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CByte(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CByte(Empty) = 0, "CByte(Empty) = " & CByte(Empty)) +Call ok(getVT(CByte(Empty)) = "VT_UI1", "getVT(CByte(Empty)) = " & getVT(CByte(Empty))) +Call ok(CByte(255) = 255, "CByte(255) = " & CByte(255)) +Call ok(getVT(CByte(255)) = "VT_UI1", "getVT(CByte(255)) = " & getVT(CByte(255))) +Call ok(CByte(255.49) = 255, "CByte(255.49) = " & CByte(255.49)) +Call ok(getVT(CByte(255.49)) = "VT_UI1", "getVT(CByte(255.49)) = " & getVT(CByte(255.49))) +Call testCByteError(1, 0, 458) +Call testCByteError("", 13, 13) +Call testCByteError("-1", 6, 6) +Call testCByteError("258", 6, 6) +Call testCByteError("TRUE", 13, 13) +Call testCByteError("FALSE", 13, 13) +Call testCByteError("#TRue#", 13, 13) +Call testCByteError("#fAlSE#", 13, 13) +If isEnglishLang Then + Call ok(CByte("-0.5") = 0, "CByte(""-0.5"") = " & CByte("-0.5")) + Call ok(getVT(CByte("-0.5")) = "VT_UI1", "getVT(CByte(""-0.5"")) = " & getVT(CByte("-0.5"))) +End If +Call ok(CByte(True) = 255, "CByte(True) = " & CByte(True)) +Call ok(getVT(CByte(True)) = "VT_UI1", "getVT(CByte(True)) = " & getVT(CByte(True))) +Call ok(CByte(False) = 0, "CByte(False) = " & CByte(False)) +Call ok(getVT(CByte(False)) = "VT_UI1", "getVT(CByte(False)) = " & getVT(CByte(False))) +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 1 +Call ok(CByte(MyObject) = 1, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) +MyObject.myval = 0 +Call ok(CByte(MyObject) = 0, "CByte(MyObject) = " & CByte(MyObject)) +Call ok(getVT(CByte(MyObject)) = "VT_UI1", "getVT(CByte(MyObject)) = " & getVT(CByte(MyObject))) + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 53ead45..9620398 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -181,6 +181,8 @@ static const char *vt2a(VARIANT *v) return "VT_ARRAY|VT_VARIANT"; case VT_ARRAY|VT_BYREF|VT_VARIANT: return "VT_ARRAY|VT_BYREF|VT_VARIANT"; + case VT_UI1: + return "VT_UI1"; default: ok(0, "unknown vt %d\n", V_VT(v)); return NULL;

1 0

Jacek Caban : wmvcore: Added IWMReader interface stub implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c0247ab291f11c92bba43e51633bb8adee52e290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0247ab291f11c92bba43e516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 18:43:09 2014 +0200 wmvcore: Added IWMReader interface stub implementation. --- dlls/wmvcore/wmvcore_main.c | 161 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 3 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 5903bf8..3382542 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -72,12 +72,167 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) +typedef struct { + IWMReader IWMReader_iface; + LONG ref; +} WMReader; + +static inline WMReader *impl_from_IWMReader(IWMReader *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReader_iface); +} + +static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReader(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else if(IsEqualGUID(riid, &IID_IWMReader)) { + TRACE("(%p)->(IID_IWMReader %p)\n", This, ppv); + *ppv = &This->IWMReader_iface; + }else { + *ppv = NULL; + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WMReader_AddRef(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI WMReader_Release(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url, IWMReaderCallback *callback, void *context) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(url), callback, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Close(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputCount(IWMReader *iface, DWORD *outputs) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%p)\n", This, outputs); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps **output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num, IWMOutputMediaProps *output) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, output); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %p)\n", This, output_num, formats); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) { - FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)->(%s %s %f %p)\n", This, wine_dbgstr_longlong(start), wine_dbgstr_longlong(duration), rate, context); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Stop(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Pause(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI WMReader_Resume(IWMReader *iface) +{ + WMReader *This = impl_from_IWMReader(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static const IWMReaderVtbl WMReaderVtbl = { + WMReader_QueryInterface, + WMReader_AddRef, + WMReader_Release, + WMReader_Open, + WMReader_Close, + WMReader_GetOutputCount, + WMReader_GetOutputProps, + WMReader_SetOutputProps, + WMReader_GetOutputFormatCount, + WMReader_GetOutputFormat, + WMReader_Start, + WMReader_Stop, + WMReader_Pause, + WMReader_Resume +}; + +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) +{ + WMReader *reader; + + TRACE("(%p, %x, %p)\n", reserved, rights, ret_reader); + + reader = heap_alloc(sizeof(*reader)); + if(!reader) + return E_OUTOFMEMORY; - *reader = NULL; + reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; + reader->ref = 1; + *ret_reader = &reader->IWMReader_iface; return E_NOTIMPL; }

1 0

Jacek Caban : oleaut32: Added debugstr_variant helper for better debug traces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: ed41fc1d9b0aabd581dd7f1e0eb9e1939b96b26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed41fc1d9b0aabd581dd7f1e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 14 16:55:57 2014 +0200 oleaut32: Added debugstr_variant helper for better debug traces. --- dlls/oleaut32/varformat.c | 36 +++++++++++++++--------------------- dlls/oleaut32/variant.c | 33 +++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.h | 2 ++ 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e72a170..0e1c370 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1201,9 +1201,8 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vString) = VT_EMPTY; V_VT(&vBool) = VT_BOOL; @@ -1612,9 +1611,8 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, const BYTE* pToken = NULL; HRESULT hRes; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("(%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), + debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vDate) = VT_EMPTY; @@ -1954,9 +1952,8 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, BOOL bUpper = FALSE; HRESULT hRes = S_OK; - TRACE("(%p->(%s%s),%s,%p,0x%08x,%p,0x%08x)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), rgbTok, dwFlags, pbstrOut, - lcid); + TRACE("%s,%s,%p,0x%08x,%p,0x%08x)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + rgbTok, dwFlags, pbstrOut, lcid); V_VT(&vStr) = VT_EMPTY; @@ -2168,9 +2165,8 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarIn, LPOLESTR lpszFormat, BYTE buff[256]; HRESULT hres; - TRACE("(%p->(%s%s),%s,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), debugstr_w(lpszFormat), nFirstDay, nFirstWeek, - dwFlags, pbstrOut); + TRACE("(%s,%s,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), debugstr_w(lpszFormat), + nFirstDay, nFirstWeek, dwFlags, pbstrOut); if (!pbstrOut) return E_INVALIDARG; @@ -2219,8 +2215,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, B static WCHAR szEmpty[] = { '\0' }; const BYTE* lpFmt = NULL; - TRACE("(%p->(%s%s),%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nFormat, dwFlags, pbstrOut); + TRACE("%s,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nFormat, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nFormat < 0 || nFormat > 4) return E_INVALIDARG; @@ -2272,8 +2267,8 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2383,9 +2378,8 @@ HRESULT WINAPI VarFormatPercent(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT HRESULT hRet; VARIANT vDbl; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, - dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; @@ -2457,8 +2451,8 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, HRESULT hRet; VARIANT vStr; - TRACE("(%p->(%s%s),%d,%d,%d,%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), - debugstr_VF(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); + TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, + nParens, nGrouping, dwFlags, pbstrOut); if (!pVarIn || !pbstrOut || nDigits > 9) return E_INVALIDARG; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index c3bd225..7221787 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -78,6 +78,39 @@ const char * const wine_vflags[16] = "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_HARDTYPE", }; +const char *debugstr_variant(const VARIANT *v) +{ + if(!v) + return "(null)"; + + switch(V_VT(v)) { + case VT_EMPTY: + return wine_dbg_sprintf("%p {VT_EMPTY}", v); + case VT_NULL: + return wine_dbg_sprintf("%p {VT_NULL}", v); + case VT_I1: + return wine_dbg_sprintf("%p {VT_I1: %d}", v, V_I1(v)); + case VT_I2: + return wine_dbg_sprintf("%p {VT_I2: %d}", v, V_I2(v)); + case VT_I4: + return wine_dbg_sprintf("%p {VT_I4: %d}", v, V_I4(v)); + case VT_R8: + return wine_dbg_sprintf("%p {VT_R8: %lf}", v, V_R8(v)); + case VT_BSTR: + return wine_dbg_sprintf("%p {VT_BSTR: %s}", v, debugstr_w(V_BSTR(v))); + case VT_DISPATCH: + return wine_dbg_sprintf("%p {VT_DISPATCH: %p}", v, V_DISPATCH(v)); + case VT_ERROR: + return wine_dbg_sprintf("%p {VT_ERROR: %08x}", v, V_ERROR(v)); + case VT_BOOL: + return wine_dbg_sprintf("%p {VT_BOOL: %x}", v, V_BOOL(v)); + case VT_UINT: + return wine_dbg_sprintf("%p {VT_UINT: %u}", v, V_UINT(v)); + default: + return wine_dbg_sprintf("%p {vt %s%s}", v, debugstr_VT(v), debugstr_VF(v)); + } +} + /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, VARIANTARG* ps, VARTYPE vt) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index d521b20..e13e56a 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -57,6 +57,8 @@ extern const char * const wine_vflags[] DECLSPEC_HIDDEN; #define debugstr_vf(v) (wine_vflags[((v)&VT_EXTRA_TYPE)>>12]) #define debugstr_VF(v) (!(v) ? "(null)" : debugstr_vf(V_EXTRA_TYPE(v))) +const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; + /* Size constraints */ #define I1_MAX 0x7f #define I1_MIN ((-I1_MAX)-1)

1 0

Piotr Caban : oleacc: Add GetStateText implementation.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 5f51dda7eeab4d905ecf86ac447b76346ab0df0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f51dda7eeab4d905ecf86ac4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:51 2014 +0200 oleacc: Add GetStateText implementation. --- dlls/oleacc/main.c | 64 +++++++++- dlls/oleacc/oleacc.rc | 34 ++++++ dlls/oleacc/oleacc.spec | 4 +- dlls/oleacc/resource.h | 50 ++++++++ dlls/oleacc/tests/main.c | 71 +++++++++++ po/ar.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/bg.po | 274 ++++++++++++++++++++++++++++++++---------- po/ca.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/cs.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/da.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/de.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/el.po | 269 ++++++++++++++++++++++++++++++++---------- po/en.po | 258 ++++++++++++++++++++++++++++++---------- po/en_US.po | 258 ++++++++++++++++++++++++++++++---------- po/eo.po | 282 ++++++++++++++++++++++++++++++++++---------- po/es.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fa.po | 263 +++++++++++++++++++++++++++++++---------- po/fi.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/fr.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/he.po | 285 ++++++++++++++++++++++++++++++++++---------- po/hi.po | 258 ++++++++++++++++++++++++++++++---------- po/hr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/hu.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/it.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ja.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ko.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/lt.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/ml.po | 258 ++++++++++++++++++++++++++++++---------- po/nb_NO.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/nl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/or.po | 258 ++++++++++++++++++++++++++++++---------- po/pa.po | 258 ++++++++++++++++++++++++++++++---------- po/pl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 292 +++++++++++++++++++++++++++++++++++---------- po/rm.po | 261 ++++++++++++++++++++++++++++++---------- po/ro.po | 292 +++++++++++++++++++++++++++++++++++---------- po/ru.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sk.po | 280 +++++++++++++++++++++++++++++++++---------- po/sl.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 284 ++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 288 +++++++++++++++++++++++++++++++++++---------- po/sv.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/te.po | 258 ++++++++++++++++++++++++++++++---------- po/th.po | 270 ++++++++++++++++++++++++++++++++---------- po/tr.po | 292 +++++++++++++++++++++++++++++++++++---------- po/uk.po | 294 ++++++++++++++++++++++++++++++++++++---------- po/wa.po | 263 +++++++++++++++++++++++++++++++---------- po/wine.pot | 258 ++++++++++++++++++++++++++++++---------- po/zh_CN.po | 286 ++++++++++++++++++++++++++++++++++---------- po/zh_TW.po | 294 ++++++++++++++++++++++++++++++++++++---------- 51 files changed, 10235 insertions(+), 2993 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f51dda7eeab4d905ecf8…

1 0

Piotr Caban : include: Add STATE_SYSTEM_* definition to oleacc.idl.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: b6284cfc63872a34cb5cfe4f4494f1a8187fb367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6284cfc63872a34cb5cfe4f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:40 2014 +0200 include: Add STATE_SYSTEM_* definition to oleacc.idl. --- include/oleacc.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/oleacc.idl b/include/oleacc.idl index e9cf138..daf7dec 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -18,6 +18,7 @@ import "oaidl.idl"; +cpp_quote("#define NAVDIR_MIN 0") cpp_quote("#define NAVDIR_UP 1") cpp_quote("#define NAVDIR_DOWN 2") cpp_quote("#define NAVDIR_LEFT 3") @@ -26,6 +27,7 @@ cpp_quote("#define NAVDIR_NEXT 5") cpp_quote("#define NAVDIR_PREVIOUS 6") cpp_quote("#define NAVDIR_FIRSTCHILD 7") cpp_quote("#define NAVDIR_LASTCHILD 8") +cpp_quote("#define NAVDIR_MAX 9") cpp_quote("#define ROLE_SYSTEM_TITLEBAR 1") cpp_quote("#define ROLE_SYSTEM_MENUBAR 2") @@ -100,6 +102,45 @@ cpp_quote("#define SELFLAG_ADDSELECTION 0x08") cpp_quote("#define SELFLAG_REMOVESELECTION 0x10") cpp_quote("#define SELFLAG_VALID 0x1f") +cpp_quote("#ifndef STATE_SYSTEM_UNAVAILABLE") +cpp_quote("#define STATE_SYSTEM_NORMAL 0x00000000") +cpp_quote("#define STATE_SYSTEM_UNAVAILABLE 0x00000001") +cpp_quote("#define STATE_SYSTEM_SELECTED 0x00000002") +cpp_quote("#define STATE_SYSTEM_FOCUSED 0x00000004") +cpp_quote("#define STATE_SYSTEM_PRESSED 0x00000008") +cpp_quote("#define STATE_SYSTEM_CHECKED 0x00000010") +cpp_quote("#define STATE_SYSTEM_MIXED 0x00000020") +cpp_quote("#define STATE_SYSTEM_INDETERMINATE STATE_SYSTEM_MIXED") +cpp_quote("#define STATE_SYSTEM_READONLY 0x00000040") +cpp_quote("#define STATE_SYSTEM_HOTTRACKED 0x00000080") +cpp_quote("#define STATE_SYSTEM_DEFAULT 0x00000100") +cpp_quote("#define STATE_SYSTEM_EXPANDED 0x00000200") +cpp_quote("#define STATE_SYSTEM_COLLAPSED 0x00000400") +cpp_quote("#define STATE_SYSTEM_BUSY 0x00000800") +cpp_quote("#define STATE_SYSTEM_FLOATING 0x00001000") +cpp_quote("#define STATE_SYSTEM_MARQUEED 0x00002000") +cpp_quote("#define STATE_SYSTEM_ANIMATED 0x00004000") +cpp_quote("#define STATE_SYSTEM_INVISIBLE 0x00008000") +cpp_quote("#define STATE_SYSTEM_OFFSCREEN 0x00010000") +cpp_quote("#define STATE_SYSTEM_SIZEABLE 0x00020000") +cpp_quote("#define STATE_SYSTEM_MOVEABLE 0x00040000") +cpp_quote("#define STATE_SYSTEM_SELFVOICING 0x00080000") +cpp_quote("#define STATE_SYSTEM_FOCUSABLE 0x00100000") +cpp_quote("#define STATE_SYSTEM_SELECTABLE 0x00200000") +cpp_quote("#define STATE_SYSTEM_LINKED 0x00400000") +cpp_quote("#define STATE_SYSTEM_TRAVERSED 0x00800000") +cpp_quote("#define STATE_SYSTEM_MULTISELECTABLE 0x01000000") +cpp_quote("#define STATE_SYSTEM_EXTSELECTABLE 0x02000000") +cpp_quote("#define STATE_SYSTEM_ALERT_LOW 0x04000000") +cpp_quote("#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000") +cpp_quote("#define STATE_SYSTEM_ALERT_HIGH 0x10000000") +cpp_quote("#define STATE_SYSTEM_PROTECTED 0x20000000") +cpp_quote("#define STATE_SYSTEM_VALID 0x7FFFFFFF") +cpp_quote("#endif") +cpp_quote("#ifndef STATE_SYSTEM_HASPOPUP") +cpp_quote("#define STATE_SYSTEM_HASPOPUP 0x40000000") +cpp_quote("#endif") + typedef GUID MSAAPROPID; typedef enum AnnoScope

1 0

Stefan Dösinger : wined3d: Always provide P8 GL texture information.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 7b049245f532d355ea0541c9a970d3459144aaf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b049245f532d355ea0541c9a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:51 2014 +0200 wined3d: Always provide P8 GL texture information. --- dlls/wined3d/surface.c | 23 ++--------------------- dlls/wined3d/utils.c | 2 +- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e0ba375..8e4b88b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1457,12 +1457,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct int src_pitch = 0; int dst_pitch = 0; - if (format->id == WINED3DFMT_P8_UINT) - { - gl_format = GL_ALPHA; - gl_type = GL_UNSIGNED_BYTE; - } - if (surface->flags & SFLAG_NONPOW2) { unsigned char alignment = surface->resource.device->surface_alignment; @@ -3211,8 +3205,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc const struct wined3d_gl_info *gl_info; struct wined3d_context *context; BYTE *mem; - GLint fmt; - GLint type; BYTE *row, *top, *bottom; int i; BOOL srcIsUpsideDown; @@ -3246,18 +3238,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc srcIsUpsideDown = FALSE; } - switch (surface->resource.format->id) - { - case WINED3DFMT_P8_UINT: - fmt = GL_ALPHA; - type = GL_UNSIGNED_BYTE; - break; - - default: - fmt = surface->resource.format->glFormat; - type = surface->resource.format->glType; - } - if (data.buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); @@ -3270,7 +3250,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc gl_info->gl_ops.gl.p_glReadPixels(0, 0, surface->resource.width, surface->resource.height, - fmt, type, data.addr); + surface->resource.format->glFormat, + surface->resource.format->glType, data.addr); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 044eed0..c077567 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -743,7 +743,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, - ARB_FRAGMENT_PROGRAM, NULL}, + 0, NULL}, /* Standard ARGB formats */ {WINED3DFMT_B8G8R8_UNORM, GL_RGB8, GL_RGB8, 0, GL_BGR, GL_UNSIGNED_BYTE, 0,

1 0

Henri Verbeet : d2d1: Add the ID2D1Brush interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: eb4d5c7a254fe5e1e688e874c7b142e9d8d1331f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4d5c7a254fe5e1e688e874c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:26 2014 +0200 d2d1: Add the ID2D1Brush interface. --- include/d2d1.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 367905c..ef05f00 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -543,5 +543,24 @@ interface ID2D1Bitmap : ID2D1Image ); } +[ + local, + object, + uuid(2cd906a8-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1Brush : ID2D1Resource +{ + void SetOpacity( + [in] float opacity + ); + void SetTransform( + [in] const D2D1_MATRIX_3X2_F *transform + ); + float GetOpacity(); + void GetTransform( + [out] D2D1_MATRIX_3X2_F *transform + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1Bitmap interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 2156e68a4ce47a2d1347d4c1efc40a0a6669e5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2156e68a4ce47a2d1347d4c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:38 2014 +0200 d2d1: Add the ID2D1Bitmap interface. --- include/d2d1.idl | 36 ++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 20 ++++++++++++++++++++ include/dcommon.h | 17 +++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 55a8f4d..367905c 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -17,9 +17,11 @@ */ import "unknwn.idl"; +import "dcommon.h"; import "d2dbasetypes.h"; interface ID2D1Factory; +interface ID2D1RenderTarget; interface IDWriteRenderingParams; typedef D2D_POINT_2F D2D1_POINT_2F; @@ -27,6 +29,9 @@ typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; typedef UINT64 D2D1_TAG; +typedef D2D_SIZE_U D2D1_SIZE_U; +typedef D2D_POINT_2U D2D1_POINT_2U; +typedef D2D_RECT_U D2D1_RECT_U; typedef enum D2D1_DEBUG_LEVEL { @@ -507,5 +512,36 @@ interface ID2D1Image : ID2D1Resource { } +[ + local, + object, + uuid(a2296057-ea42-4099-983b-539fb6505426) +] +interface ID2D1Bitmap : ID2D1Image +{ + D2D1_SIZE_F GetSize(); + D2D1_SIZE_U GetPixelSize(); + D2D1_PIXEL_FORMAT GetPixelFormat(); + void GetDpi( + [out] float *dpi_x, + [out] float *dpi_y + ); + HRESULT CopyFromBitmap( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1Bitmap *bitmap, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromRenderTarget( + [in] const D2D1_POINT_2U *dst_point, + [in] ID2D1RenderTarget *render_target, + [in] const D2D1_RECT_U *src_rect + ); + HRESULT CopyFromMemory( + [in] const D2D1_RECT_U *dst_rect, + [in] const void *src_data, + [in] UINT32 pitch + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 4ddb994..61158ac 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -45,3 +45,23 @@ typedef struct D2D_SIZE_F float width; float height; } D2D_SIZE_F; + +typedef struct D2D_SIZE_U +{ + UINT32 width; + UINT32 height; +} D2D_SIZE_U; + +typedef struct D2D_POINT_2U +{ + UINT32 x; + UINT32 y; +} D2D_POINT_2U; + +typedef struct D2D_RECT_U +{ + UINT32 left; + UINT32 top; + UINT32 right; + UINT32 bottom; +} D2D_RECT_U; diff --git a/include/dcommon.h b/include/dcommon.h index 50daefb..56445a3 100644 --- a/include/dcommon.h +++ b/include/dcommon.h @@ -19,6 +19,8 @@ #ifndef __WINE_DCOMMON_H #define __WINE_DCOMMON_H +#include "dxgiformat.h" + typedef enum DWRITE_MEASURING_MODE { DWRITE_MEASURING_MODE_NATURAL, @@ -26,4 +28,19 @@ typedef enum DWRITE_MEASURING_MODE DWRITE_MEASURING_MODE_GDI_NATURAL } DWRITE_MEASURING_MODE; +typedef enum D2D1_ALPHA_MODE +{ + D2D1_ALPHA_MODE_UNKNOWN = 0, + D2D1_ALPHA_MODE_PREMULTIPLIED = 1, + D2D1_ALPHA_MODE_STRAIGHT = 2, + D2D1_ALPHA_MODE_IGNORE = 3, + D2D1_ALPHA_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ALPHA_MODE; + +typedef struct D2D1_PIXEL_FORMAT +{ + DXGI_FORMAT format; + D2D1_ALPHA_MODE alphaMode; +} D2D1_PIXEL_FORMAT; + #endif /* __WINE_DCOMMON_H */

1 0

Henri Verbeet : d2d1: Add the ID2D1Image interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 61a909069d29070685f6f59ff9f6ebda7593dcec URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a909069d29070685f6f59ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:24 2014 +0200 d2d1: Add the ID2D1Image interface. --- include/d2d1.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 6fcadee..55a8f4d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -498,5 +498,14 @@ interface ID2D1DrawingStateBlock : ID2D1Resource ); } +[ + local, + object, + uuid(65019f75-8da2-497c-b32c-dfa34e48ede6) +] +interface ID2D1Image : ID2D1Resource +{ +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Henri Verbeet : d2d1: Add the ID2D1PathGeometry interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: a4b15c1bb5a07fc8ae9f610b4188f92f0321683c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b15c1bb5a07fc8ae9f610b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 07:56:22 2014 +0200 d2d1: Add the ID2D1PathGeometry interface. --- include/d2d1.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index bfed202..c6b9288 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -429,5 +429,26 @@ interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink ); } +[ + local, + object, + uuid(2cd906a5-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1PathGeometry : ID2D1Geometry +{ + HRESULT Open( + [out] ID2D1GeometrySink **sink + ); + HRESULT Stream( + [in] ID2D1GeometrySink *sink + ); + HRESULT GetSegmentCount( + [out] UINT32 *count + ); + HRESULT GetFigureCount( + [out] UINT32 *count + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Piotr Caban : user32: Fix LoadStringA behavior on 1-character long buffer.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c2df317c4b7be489d63fd559d7fb6676578a0bb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2df317c4b7be489d63fd559d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 14 16:06:27 2014 +0200 user32: Fix LoadStringA behavior on 1-character long buffer. --- dlls/user32/resource.c | 3 ++- dlls/user32/tests/resource.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1917d51..83442d8 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -310,7 +310,8 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, LPSTR buffer, INT while (id--) p += *p + 1; - RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); + if (buflen != 1) + RtlUnicodeToMultiByteN( buffer, buflen - 1, &retval, p + 1, *p * sizeof(WCHAR) ); } buffer[retval] = 0; TRACE("returning %s\n", debugstr_a(buffer)); diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 9cb7380..2388adb 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -126,6 +126,13 @@ static void test_LoadStringA (void) ok( ret == -1 || broken(ret == 0), "LoadStringA did not return -1 when called with buflen = 0, got %d, err %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + buf[0] = 'a'; + ret = LoadStringA(hInst, 1, buf, 1); + ok( !ret, "LoadString returned %d\n", ret); + ok( buf[0] == 0, "buf[0] = %c (%x)\n", buf[0], buf[0]); + ok( GetLastError() == 0xdeadbeef, "GetLastError() = %d\n", GetLastError()); } static void test_accel1(void)

1 0

Stefan Dösinger : wined3d: Don' t update the color table on palette changes.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 544816797adc4de21713abe4c9e208692d88eaa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544816797adc4de21713abe4c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:53 2014 +0200 wined3d: Don't update the color table on palette changes. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 4 ++-- dlls/wined3d/surface.c | 15 +++------------ 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ef07b97..c8f7d65 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -5126,7 +5126,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -5139,7 +5139,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 64aa519..23795d3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6194,7 +6194,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6207,7 +6207,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b760dfb..3d0bfe5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7096,7 +7096,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -7109,7 +7109,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8c5f6ac..97a6a19 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6818,7 +6818,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); @@ -6831,7 +6831,7 @@ static void test_palette_gdi(void) i = GetDIBColorTable(dc, 4, 1, &rgbquad[4]); ok(i == 1, "Expected count 1, got %u.\n", i); - todo_wine ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), + ok(!memcmp(&rgbquad[4], &expected1[4], sizeof(rgbquad[4])), "Got color table entry %u r=%#x g=%#x b=%#x, expected r=%#x g=%#x b=%#x.\n", i, rgbquad[4].rgbRed, rgbquad[4].rgbGreen, rgbquad[4].rgbBlue, expected1[4].rgbRed, expected1[4].rgbGreen, expected1[4].rgbBlue); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e4b88b..dea27ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -787,12 +787,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) } } - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) surface_load_location(surface, surface->draw_binding); @@ -1379,17 +1373,14 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) if (!palette) return; - if (surface->flags & SFLAG_DIBSECTION) - { - TRACE("Updating the DC's palette.\n"); - SetDIBColorTable(surface->hDC, 0, 256, palette->colors); - } - /* Update the image because of the palette change. Some games like e.g. * Red Alert call SetEntries a lot to implement fading. */ /* Tell the swapchain to update the screen. */ if (surface->swapchain && surface == surface->swapchain->front_buffer) + { + SetDIBColorTable(surface->hDC, 0, 256, palette->colors); x11_copy_to_screen(surface->swapchain, NULL); + } } static void gdi_surface_unmap(struct wined3d_surface *surface)

1 0

Stefan Dösinger : wined3d: Remove WINED3D_CT_PALETTED_CK.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: bfb5be0f4b93aa36044847d8d930ec6224d5fc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb5be0f4b93aa36044847d8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:50 2014 +0200 wined3d: Remove WINED3D_CT_PALETTED_CK. There's no difference between WINED3D_CT_PALETTED_CK and WINED3D_CT_PALETTED with the palette index in the alpha channel. --- dlls/wined3d/arb_program_shader.c | 3 +-- dlls/wined3d/surface.c | 10 +++------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 653298a..195c3ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7282,9 +7282,8 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; - BOOL colorkey = !!(surface->container->color_key_flags & WINEDDSD_CKSRCBLT); - d3dfmt_p8_init_palette(surface, table, colorkey); + d3dfmt_p8_init_palette(surface, table); if (!priv->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &priv->palette_texture); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e71de0..e0ba375 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1725,10 +1725,7 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ format->glInternal = GL_RGBA; format->glType = GL_UNSIGNED_BYTE; format->conv_byte_count = 4; - if (colorkey_active) - *conversion_type = WINED3D_CT_PALETTED_CK; - else - *conversion_type = WINED3D_CT_PALETTED; + *conversion_type = WINED3D_CT_PALETTED; } break; @@ -3426,7 +3423,7 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) { const struct wined3d_palette *pal = surface->palette; unsigned int i; @@ -3475,12 +3472,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } case WINED3D_CT_PALETTED: - case WINED3D_CT_PALETTED_CK: { BYTE table[256][4]; unsigned int x, y; - d3dfmt_p8_init_palette(surface, table, (conversion_type == WINED3D_CT_PALETTED_CK)); + d3dfmt_p8_init_palette(surface, table); for (y = 0; y < height; y++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f7b5c57..9233148 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,7 +2341,6 @@ enum wined3d_conversion_type { WINED3D_CT_NONE, WINED3D_CT_PALETTED, - WINED3D_CT_PALETTED_CK, WINED3D_CT_CK_565, WINED3D_CT_CK_5551, WINED3D_CT_CK_RGB24, @@ -2349,7 +2348,7 @@ enum wined3d_conversion_type WINED3D_CT_CK_ARGB32, }; -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; +void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) DECLSPEC_HIDDEN; struct wined3d_sampler {

1 0

Stefan Dösinger : wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 3cd83f4d56b94d6041acc4312073fbdb8f250a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd83f4d56b94d6041acc4312… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:52 2014 +0200 wined3d: Use GL_ALPHA8 for WINED3DFMT_P8_UINT surfaces. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c077567..6a27920 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -740,7 +740,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = | WINED3DFMT_FLAG_VTF, ARB_TEXTURE_FLOAT, NULL}, /* Palettized formats */ - {WINED3DFMT_P8_UINT, GL_RGBA, GL_RGBA, 0, + {WINED3DFMT_P8_UINT, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, 0, 0, NULL},

1 0

Stefan Dösinger : wined3d: Always store the palette index in the alpha component.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: c1cca63e5ddcf7e6235889ed95aec844495e5de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cca63e5ddcf7e6235889ed9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 13 16:21:49 2014 +0200 wined3d: Always store the palette index in the alpha component. --- dlls/wined3d/surface.c | 184 ++++++++-------------------------------- dlls/wined3d/utils.c | 35 +------- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 37 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cca63e5ddcf7e623588…

1 0

Henri Verbeet : d2d1: Add the ID2D1DrawingStateBlock interface.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d20be31395d39850da29651b90be83980ab575d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20be31395d39850da29651b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 14 13:02:37 2014 +0200 d2d1: Add the ID2D1DrawingStateBlock interface. --- include/d2d1.idl | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index c6b9288..6fcadee 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -19,10 +19,14 @@ import "unknwn.idl"; import "d2dbasetypes.h"; +interface ID2D1Factory; +interface IDWriteRenderingParams; + typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; typedef D2D_SIZE_F D2D1_SIZE_F; +typedef UINT64 D2D1_TAG; typedef enum D2D1_DEBUG_LEVEL { @@ -138,6 +142,22 @@ typedef enum D2D1_ARC_SIZE D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, } D2D1_ARC_SIZE; +typedef enum D2D1_ANTIALIAS_MODE +{ + D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0, + D2D1_ANTIALIAS_MODE_ALIASED = 1, + D2D1_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_ANTIALIAS_MODE; + +typedef enum D2D1_TEXT_ANTIALIAS_MODE +{ + D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0, + D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1, + D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2, + D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3, + D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_TEXT_ANTIALIAS_MODE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -186,7 +206,14 @@ typedef struct D2D1_ARC_SEGMENT D2D1_ARC_SIZE arcSize; } D2D1_ARC_SEGMENT; -interface ID2D1Factory; +typedef struct D2D1_DRAWING_STATE_DESCRIPTION +{ + D2D1_ANTIALIAS_MODE antialiasMode; + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode; + D2D1_TAG tag1; + D2D1_TAG tag2; + D2D1_MATRIX_3X2_F transform; +} D2D1_DRAWING_STATE_DESCRIPTION; [ local, @@ -450,5 +477,26 @@ interface ID2D1PathGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(28506e39-ebf6-46a1-bb47-fd85565ab957) +] +interface ID2D1DrawingStateBlock : ID2D1Resource +{ + void GetDescription( + [out] D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetDescription( + [in] const D2D1_DRAWING_STATE_DESCRIPTION *desc + ); + void SetTextRenderingParams( + [in] IDWriteRenderingParams *text_rendering_params + ); + void GetTextRenderingParams( + [out] IDWriteRenderingParams **text_rendering_params + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory);

1 0

Austin English : user32: Add a stub for RegisterTouchWindow.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 6458aca761f56dffcdf117e81450720c26a0c53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6458aca761f56dffcdf117e81… Author: Austin English <austinenglish(a)gmail.com> Date: Tue May 13 13:25:02 2014 -0500 user32: Add a stub for RegisterTouchWindow. --- dlls/user32/user32.spec | 1 + dlls/user32/win.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 0b5754e..1425dac 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -573,6 +573,7 @@ @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSystemThread(long long) @ stdcall RegisterTasklist (long) +@ stdcall RegisterTouchWindow(long long) # @ stub RegisterUserApiHook @ stdcall RegisterWindowMessageA(str) @ stdcall RegisterWindowMessageW(wstr) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9e30321..c9660be 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3887,3 +3887,13 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) { return WIN_SetWindowLong( hwnd, offset, sizeof(LONG_PTR), newval, FALSE ); } + +/***************************************************************************** + * RegisterTouchWindow (USER32.@) + */ +BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) +{ + FIXME("(%p %08x): stub\n", hwnd, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Huw Davies : msxml3/tests: Fix test on win 8.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: 305db0f65bc3a2e227bb8cd1972fde3d60b3c2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305db0f65bc3a2e227bb8cd19… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 14 08:02:25 2014 +0100 msxml3/tests: Fix test on win 8. --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 484be86..f5d6fcd 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1519,10 +1519,10 @@ static void test_get(void) if (!cache) return; hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); - EXPECT_HR(hr, E_NOTIMPL); + ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); hr = IXMLDOMSchemaCollection2_get(cache, _bstr_("uri"), &node); - ok(hr == E_NOTIMPL || hr == E_POINTER /* win8 */, "got %08x\n", hr); + EXPECT_HR(hr, E_NOTIMPL); IXMLDOMSchemaCollection2_Release(cache);

1 0

Nikolay Sivov : xmllite/writer: Implement GetProperty().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: wine Branch: master Commit: d2737dde801b55a1feb4d7d489082d3ced33f2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2737dde801b55a1feb4d7d48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 14 11:52:13 2014 +0400 xmllite/writer: Implement GetProperty(). --- dlls/xmllite/reader.c | 6 ++--- dlls/xmllite/tests/writer.c | 23 +++++++++++++++++++ dlls/xmllite/writer.c | 52 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e3f9cd..deb2d2e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -123,7 +123,7 @@ static const char *debugstr_nodetype(XmlNodeType nodetype) return type_names[nodetype]; } -static const char *debugstr_prop(XmlReaderProperty prop) +static const char *debugstr_reader_prop(XmlReaderProperty prop) { static const char * const prop_names[] = { @@ -2537,7 +2537,7 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %p)\n", This, debugstr_reader_prop(property), value); if (!value) return E_INVALIDARG; @@ -2561,7 +2561,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_prop(property), value); + TRACE("(%p)->(%s %lu)\n", This, debugstr_reader_prop(property), value); switch (property) { diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index b5935c1..738844f 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -71,6 +71,7 @@ static void test_writer_create(void) { HRESULT hr; IXmlWriter *writer; + LONG_PTR value; /* crashes native */ if (0) @@ -81,6 +82,28 @@ static void test_writer_create(void) hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* check default properties values */ + value = 0; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ByteOrderMark, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == TRUE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_Indent, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = TRUE; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == FALSE, "got %ld\n", value); + + value = XmlConformanceLevel_Auto; + hr = IXmlWriter_GetProperty(writer, XmlWriterProperty_ConformanceLevel, &value); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(value == XmlConformanceLevel_Document, "got %ld\n", value); + IXmlWriter_Release(writer); } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a58164b..2432602 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -52,6 +52,10 @@ typedef struct _xmlwriter LONG ref; IMalloc *imalloc; xmlwriteroutput *output; + BOOL indent; + BOOL bom; + BOOL omitxmldecl; + XmlConformanceLevel conformance; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -64,6 +68,23 @@ static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *ifac return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface); } +static const char *debugstr_writer_prop(XmlWriterProperty prop) +{ + static const char * const prop_names[] = + { + "MultiLanguage", + "Indent", + "ByteOrderMark", + "OmitXmlDeclaration", + "ConformanceLevel" + }; + + if (prop > _XmlWriterProperty_Last) + return wine_dbg_sprintf("unknown property=%d", prop); + + return prop_names[prop]; +} + /* writer output memory allocation functions */ static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len) { @@ -191,13 +212,34 @@ static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) return writeroutput_query_for_stream(This->output); } -static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) +static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LONG_PTR *value) { xmlwriter *This = impl_from_IXmlWriter(iface); - FIXME("%p %u %p\n", This, nProperty, ppValue); + TRACE("(%p)->(%s %p)\n", This, debugstr_writer_prop(property), value); - return E_NOTIMPL; + if (!value) return E_INVALIDARG; + + switch (property) + { + case XmlWriterProperty_Indent: + *value = This->indent; + break; + case XmlWriterProperty_ByteOrderMark: + *value = This->bom; + break; + case XmlWriterProperty_OmitXmlDeclaration: + *value = This->omitxmldecl; + break; + case XmlWriterProperty_ConformanceLevel: + *value = This->conformance; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) @@ -567,6 +609,10 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writer->output = NULL; + writer->indent = FALSE; + writer->bom = TRUE; + writer->omitxmldecl = FALSE; + writer->conformance = XmlConformanceLevel_Document; *obj = &writer->IXmlWriter_iface;

1 0

Francois Gouget : testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 82049e35353b4da6d074977cf1b05003c22283dd URL: http://source.winehq.org/git/tools.git/?a=commit;h=82049e35353b4da6d074977c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:43:47 2014 +0200 testbot/WinePatchesWebSubmit: Improve robustness, particularly when the Engine is not running. Now the Engine will automatically pick up patches from the patches website as part of its periodic 'SafetyNet' check. However WinePatchesWebSubmit can still be used to avoid the potential 10 minutes delay. Also, running WinePatchesWebSubmit when the Engine is stopped no longer has the side effect of leaking files in the staging directory. --- testbot/bin/Engine.pl | 86 +++++++++++++++++++----------- testbot/bin/WinePatchesWebSubmit.pl | 53 +++--------------- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 63 insertions(+), 80 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2bb563a..72e165c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -497,48 +497,73 @@ sub HandleWinePatchMLSubmission sub HandleWinePatchWebSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_patch_\d+)/) + my $LatestWebPatchId = 0; + my $Patches = CreatePatches(); + foreach my $Patch (@{$Patches->GetItems()}) { - return "0Invalid file name"; + my $WebPatchId = $Patch->WebPatchId; + if (defined $WebPatchId and $LatestWebPatchId < $WebPatchId) + { + $LatestWebPatchId = $WebPatchId; + } } - my $FullFileName = "$DataDir/staging/$1"; - if ($_[1] !~ m/^(\d+)$/) + + # Rescan the directory for robustness in case the patches site has already + # expired $LatestWebPatchId+1 (for instance if the WineTestBot has not been + # run for a while). + my (@ErrMessages, @WebPatchIds); + if (opendir(my $dh, "$DataDir/webpatches")) { - return "0Invalid patch id"; + foreach my $Entry (readdir($dh)) + { + next if ($Entry !~ /^(\d+)$/); + my $WebPatchId = $1; + next if ($WebPatchId <= $LatestWebPatchId); + + my $Patches = CreatePatches($Patches); + $Patches->AddFilter("WebPatchId", [$WebPatchId]); + if (@{$Patches->GetKeys()}) + { + push @ErrMessages, "$WebPatchId already exists and yet the latest patch is $LatestWebPatchId"; + next; + } + push @WebPatchIds, $WebPatchId; + } + close($dh); } - my $WebPatchId = $1; - my $Patches = CreatePatches(); - $Patches->AddFilter("WebPatchId", [$WebPatchId]); - if (@{$Patches->GetKeys()}) + else { - LogMsg "Patch $WebPatchId already exists\n"; - return "1OK"; + return "0Unable to open '$DataDir/webpatches': $!"; } - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Add the patches in increasing WebPatchId order so that next time + # $LatestWebPatchId still makes sense in case something goes wrong now + foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Create a working dir + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullFileName); - my $ErrMessage = CreatePatches()->NewPatch($Entity, $WebPatchId); + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open("$DataDir/webpatches/$WebPatchId"); + my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } } - unlink($FullFileName); - return defined($ErrMessage) ? "0" . $ErrMessage : "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleGetScreenshot @@ -629,6 +654,7 @@ sub SafetyNet { CheckJobs(); ScheduleJobs(); + HandleWinePatchWebSubmission(); my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); diff --git a/testbot/bin/WinePatchesWebSubmit.pl b/testbot/bin/WinePatchesWebSubmit.pl index d5b032a..15a5fd5 100755 --- a/testbot/bin/WinePatchesWebSubmit.pl +++ b/testbot/bin/WinePatchesWebSubmit.pl @@ -37,56 +37,15 @@ sub BEGIN } } -use File::Copy; -use WineTestBot::Config; use WineTestBot::Log; -use WineTestBot::Utils; -use WineTestBot::Patches; use WineTestBot::Engine::Notify; -my ($MaxCount) = @ARGV; -if (defined $MaxCount) +# Just tell the Engine to rescan the webpatches directory +my $ErrMessage = WinePatchWebSubmission(); +if (defined $ErrMessage) { - $MaxCount =~ m/^(\d+)$/; - $MaxCount = $1; + LogMsg "$ErrMessage\n"; + exit(1); } -my $LastWebPatchId = 0; -foreach my $Patch (@{CreatePatches()->GetItems()}) -{ - my $WebPatchId = $Patch->WebPatchId; - if (defined $WebPatchId and $LastWebPatchId < $WebPatchId) - { - $LastWebPatchId = $WebPatchId; - } -} - -while (1) -{ - $LastWebPatchId++; - my $NewPatch = "$DataDir/webpatches/$LastWebPatchId"; - last if (!-f $NewPatch); - - my $FileNameRandomPart = GenerateRandomString(32); - while (-e "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId") - { - $FileNameRandomPart = GenerateRandomString(32); - } - my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_patch_$LastWebPatchId"; - - if (!copy($NewPatch, $StagingFileName)) - { - LogMsg "Unable to copy '$NewPatch' to '$StagingFileName': $!\n"; - exit 1; - } - - WinePatchWebSubmission("${FileNameRandomPart}_patch_$LastWebPatchId", $LastWebPatchId); - LogMsg "Added wine-patches patch $LastWebPatchId\n"; - if (defined $MaxCount) - { - $MaxCount--; - last if ($MaxCount == 0); - } -} - -exit; +exit(0); diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 09191ee..1f93db4 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -233,9 +233,7 @@ sub WinePatchMLSubmission sub WinePatchWebSubmission { - my ($FileName, $WebPatchId) = @_; - - my $Reply = SendCmdReceiveReply("winepatchwebsubmission $FileName $WebPatchId\n"); + my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn ().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: f82c4e5293766e926c8b1bde2e353d58ab13d902 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f82c4e5293766e926c8b1bde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:36:17 2014 +0200 testbot/VMs: Catch the Libvirt exceptions in IsPoweredOn(). --- testbot/lib/WineTestBot/VMs.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 1cf1a42..0aa06eb 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -352,7 +352,10 @@ sub IsPoweredOn($) my ($ErrMessage, $Domain) = $self->_GetDomain(); return undef if (defined $ErrMessage); - return $Domain->is_active(); + my $IsActive; + eval { $IsActive = $Domain->is_active() }; + return undef if ($@); + return $IsActive; } sub PowerOn

1 0

Francois Gouget : testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 8928cfed8b86c32d627ab8b0ace514d15b7469f3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8928cfed8b86c32d627ab8b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 12 19:31:27 2014 +0200 testbot/log2revtimes: Add a script to extract the VM revert times from the WineTestBot log and prepare them for analysis. --- testbot/scripts/log2revtimes | 324 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 324 insertions(+) diff --git a/testbot/scripts/log2revtimes b/testbot/scripts/log2revtimes new file mode 100755 index 0000000..2eac048 --- /dev/null +++ b/testbot/scripts/log2revtimes @@ -0,0 +1,324 @@ +#!/usr/bin/perl +# +# Parses the WineTestBot Engine's log to extract the VM revert times. +# +# Copyright 2013-2014 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use warnings; +use strict; + +use DateTime::Format::Strptime; + + +my $name0 = $0; +$name0 =~ s+^.*/++; + +sub error(@) +{ + print STDERR "$name0:error: ", @_; +} + + +# +# Command line parsing +# + +my $Usage; + +sub check_opt_val($$) +{ + my ($option, $val) = @_; + + if (defined $val) + { + error("$option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + error("missing value for $option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +sub CheckAndConvertDate($) +{ + my ($DateStr) = @_; + return undef if (!defined $DateStr); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%Y/%m/%d', + time_zone => 'local', + ); + my $DT = $DateParser->parse_datetime($DateStr); + if (!defined $DT) + { + error("'$DateStr' is not a valid timestamp\n"); + $Usage = 2; + return undef; + } + return $DT->epoch; +} + +my ($OptLogFile, $OptMixed, $OptStart, $OptStop, $OptMaxLines); + +while (@ARGV) +{ + my $arg = shift @ARGV; + if ($arg eq "--help") + { + $Usage = 0; + } + elsif ($arg eq "--mixed") + { + $OptMixed = 1; + } + elsif ($arg eq "--start") + { + $OptStart = check_opt_val($arg, $OptStart); + } + elsif ($arg eq "--stop") + { + $OptStop = check_opt_val($arg, $OptStop); + } + elsif ($arg eq "--max-lines") + { + $OptMaxLines = check_opt_val($arg, $OptMaxLines); + } + elsif (!defined $OptLogFile) + { + $OptLogFile = $arg; + } + else + { + error("unexpected argument '$arg'\n"); + $Usage = 2; + } +} + +if (!defined $Usage) +{ + if (!defined $OptLogFile) + { + error("you must specify the log file to analyze\n"); + $Usage = 2; + } + $OptStart = CheckAndConvertDate($OptStart); + $OptStop = CheckAndConvertDate($OptStop); + if (defined $OptStart and defined $OptStop and $OptStop <= $OptStart) + { + error("the start date must be earlier than the stop date\n"); + $Usage = 2; + } + if (defined $OptMaxLines) + { + my $oldwarn = $SIG{__WARN__}; + $SIG{__WARN__} = sub { die $_[0] }; + my $bad = eval { $OptMaxLines < 1 }; + if (defined $oldwarn) + { + $SIG{__WARN__} = $oldwarn; + } + else + { + delete $SIG{__WARN__}; + } + if ($bad or $@) + { + error("the maximum line count is invalid\n"); + $Usage = 2; + } + } +} +if (defined $Usage) +{ + if ($Usage) + { + error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [--help] LOGFILE\n"; + print "\n"; + print "Analyzes a WineTestBot log file and generates a report on stdout containing the revert times per VM. The report is tab-separated and is suitable for import into a spreadsheet.\n"; + print "\n"; + print "Where:\n"; + print " LOGFILE Is the log file to analyze.\n"; + print " --mixed Report the revert times of all the VMs together instead of\n"; + print " having a set of columns for each VM.\n"; + print " --start DATE Only report about revert starting on or after the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --stop DATE Only report about revert ending on or before the specified\n"; + print " date (in yyyy/mm/dd format).\n"; + print " --max-lines COUNT The maximum number of lines to return.\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + + +# +# Log parsing +# + +my ($Lines, %VMReverts, %VMLines); + +sub AddRevert($$$$) +{ + my ($Date, $Duration, $VM, $Snapshot) = @_; + + if ($OptMixed) + { + print "$Date\t$Duration\t\"$VM\"\t\"$Snapshot\"\n"; + $Lines++; + return 0 if (defined $OptMaxLines and $Lines > $OptMaxLines); + } + else + { + # Skip reverts that have errors + return 1 if ($Duration < 0); + $VMReverts{$VM} ||= []; + push @{$VMReverts{$VM}}, [$Date, $Duration, $Snapshot]; + $VMLines{$VM}++; + return 0 if (defined $OptMaxLines and $VMLines{$VM} > $OptMaxLines); + } + return 1; +} + +if (open(my $fh, "<", $OptLogFile)) +{ + print "Timestamp\tDuration\tVM\tSnapshot\n" if ($OptMixed); + + my $DateParser = DateTime::Format::Strptime->new( + pattern => '%a %b %d %H:%M:%S %Y', + time_zone => 'local', + ); + + my (%Epochs, %Dates, %Snapshots); + my $Skip = defined $OptStart ? 1 : defined $OptStop ? 0 : undef; + foreach my $Line (<$fh>) + { + next if ($Line !~ s/^(.*?) RevertVM(?:\[[0-9]*\])?: (Reverting|Letting) ([a-zA-Z0-9-]+)//); + my ($DateStr, $Action, $VM) = ($1, $2, $3); + my $DT = $DateParser->parse_datetime($DateStr); + my $Epoch = $DT->epoch; + + if ($Skip) + { + if (defined $OptStart and $OptStart <= $Epoch) + { + $Skip = 0; + } + else + { + next; + } + } + elsif (defined $Skip and defined $OptStop and $Epoch > $OptStop) + { + last; + } + + if ($Action eq "Reverting") + { + if (defined $Epochs{$VM}) + { + # This revert never completed! + my $Snapshot = $Snapshots{$VM} || "Unknown"; + last if (!AddRevert($Dates{$VM}, -2, $VM, $Snapshot)); + } + + $Epochs{$VM} = $Epoch; + $Dates{$VM} = $DT->ymd("/") . " " . $DT->hms(); + $Snapshots{$VM} = $1 if ($Line =~ /to ([a-zA-Z0-9-]+)$/); + } + else + { + my $Snapshot = $Snapshots{$VM} || "Unknown"; + if (!defined $Epochs{$VM}) + { + # We don't have a start date for this revert! + last if (!AddRevert($Dates{$VM}, -1, $VM, "Unknown")); + } + else + { + my $Duration = $Epoch - $Epochs{$VM}; + last if (!AddRevert($Dates{$VM}, $Duration, $VM, $Snapshot)); + } + + delete $Epochs{$VM}; + delete $Dates{$VM}; + delete $Snapshots{$VM}; + } + } + close($fh); +} +else +{ + error("unable to open '$OptLogFile' for reading: $!\n"); + exit 1; +} + + +# +# Report output +# + +if (!$OptMixed) +{ + my $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "$VM\t\t"; + } + print "\n"; + + $First=1; + my $LineCount = 0; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + print "Date\tDuration\tSnapshot"; + $LineCount = $VMLines{$VM} if ($LineCount < $VMLines{$VM}); + } + print "\n"; + + for (my $i = 0; $i < $LineCount; $i++) + { + $First=1; + foreach my $VM (sort keys %VMReverts) + { + print "\t" if (!$First); + $First = undef; + + my $Revert = $VMReverts{$VM}->[$i]; + if ($Revert) + { + my ($Date, $Duration, $Snapshot) = @$Revert; + print "$Date\t$Duration\t$Snapshot"; + } + else + { + print "\t\t"; + } + } + print "\n"; + } +}

1 0

Francois Gouget : testbot/web: Fix handling of tasks error messages.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 02d6cb133c3d87be0ded493a8eaf96c81d48960c URL: http://source.winehq.org/git/tools.git/?a=commit;h=02d6cb133c3d87be0ded493a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 16:35:37 2014 +0200 testbot/web: Fix handling of tasks error messages. The <pre><code> tag nesting was broken for the error messages, resulting in unreadable multi-line error messages and an inability to view the later tasks reports. --- testbot/web/JobDetails.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b1a3186..04ec3c5 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -402,10 +402,10 @@ sub GenerateBody { print "</code></pre>\n"; } + print "<br><pre><code>"; $PrintedDll = $CurrentDll; } - print "<br>\n"; - print "<pre><code>", $self->escapeHTML($Line), "\n"; + print $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 2cdc80043ed19e500164d4255a2551bb24089203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2cdc80043ed19e500164d425… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:41:26 2014 +0200 testbot/WinePatchesMLSubmit: Better handle errors and times when the Engine is not running. WinePatchesMLSubmit must return a non-zero exit code in case it could not deliver the message so the caller gets a chance to handle the situation gracefully. Have the Engine scan the staging directory for pending patches from the mailing list and automatically handle them, in particular on startup. This makes it possible for WinePatchesMLSubmit to deliver the patches even if the Engine is not running which is more robust. This also fixes a potential source of staging files leak. --- testbot/bin/Engine.pl | 77 ++++++++++++++++-------------- testbot/bin/WinePatchesMLSubmit.pl | 24 +++++++--- testbot/lib/WineTestBot/Engine/Notify.pm | 4 +- 3 files changed, 61 insertions(+), 44 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ea04461..2bb563a 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -446,36 +446,53 @@ sub HandleFoundWinetestUpdate sub HandleWinePatchMLSubmission { - # Validate file name - if ($_[0] !~ m/([0-9a-fA-F]{32}_wine-patches)/) + my $dh; + if (!opendir($dh, "$DataDir/staging")) { - return "0Invalid file name"; + return "0Unable to open '$DataDir/staging': $!"; } - my $FullMessageFileName = "$DataDir/staging/$1"; - # Create a working dir - my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - while (-e $WorkDir) + # Read the directory ahead as we'll be adding / removing entries + my @Entries = readdir($dh); + closedir($dh); + + my @ErrMessages; + foreach my $Entry (@Entries) { - $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; - } - mkdir $WorkDir; + # Validate file name + next if ($Entry !~ m/^([0-9a-fA-F]{32}_wine-patches)$/); + my $FullMessageFileName = "$DataDir/staging/$1"; - # Process the patch - my $Parser = new MIME::Parser; - $Parser->output_dir($WorkDir); - my $Entity = $Parser->parse_open($FullMessageFileName); - CreatePatches()->NewPatch($Entity); + # Create a work directory + my $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + while (-e $WorkDir) + { + $WorkDir = "$DataDir/staging/" . GenerateRandomString(32) . "_work"; + } + mkdir $WorkDir; - # Clean up - if (!rmtree($WorkDir)) - { - # Not a fatal error but log it to help diagnosis - LogMsg "Unable to delete '$WorkDir': $!\n"; + # Process the patch + my $Parser = new MIME::Parser; + $Parser->output_dir($WorkDir); + my $Entity = $Parser->parse_open($FullMessageFileName); + my $ErrMessage = CreatePatches()->NewPatch($Entity); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + + # Clean up + if (!rmtree($WorkDir)) + { + # Not a fatal error but log it to help diagnosis + LogMsg "Unable to delete '$WorkDir': $!\n"; + } + if (!unlink($FullMessageFileName)) + { + # This is more serious because it could cause a patch to be added + # again and again. But there is not much we can do. + LogMsg "Unable to delete '$FullMessageFileName': $!\n"; + } } - unlink($FullMessageFileName); - return "1OK"; + return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } sub HandleWinePatchWebSubmission @@ -613,19 +630,6 @@ sub SafetyNet CheckJobs(); ScheduleJobs(); - if (opendir STAGING, "$DataDir/staging") - { - my @DirEntries = readdir STAGING; - closedir STAGING; - foreach my $DirEntry (@DirEntries) - { - if ($DirEntry =~ m/[0-9a-fA-F]{32}_wine-patches/) - { - HandleWinePatchMLSubmission($DirEntry); - } - } - } - my $Set = WineTestBot::PendingPatchSets::CreatePendingPatchSets(); my $ErrMessage = $Set->CheckForCompleteSet(); if (defined($ErrMessage)) @@ -737,6 +741,9 @@ sub main Cleanup(); + # Check for patches that arrived while the server was off. + HandleWinePatchMLSubmission(); + my $SockName = "$DataDir/socket/engine"; my $uaddr = sockaddr_un($SockName); my $proto = getprotobyname('tcp'); diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index ffc65cb..e904bbc 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -41,16 +41,28 @@ use File::Copy; use WineTestBot::Config; use WineTestBot::Utils; use WineTestBot::Engine::Notify; +use WineTestBot::Log; # Store the message in the staging dir -my $FileNameRandomPart = GenerateRandomString(32); -while (-e ("$DataDir/staging/${FileNameRandomPart}_wine-patches")) +my $FileName = GenerateRandomString(32) . "_wine-patches"; +while (-e ("$DataDir/staging/$FileName")) { - $FileNameRandomPart = GenerateRandomString(32); + $FileName = GenerateRandomString(32); } -copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_wine-patches"); +if (!copy(\*STDIN, "$DataDir/staging/$FileName")) +{ + LogMsg "Unable to copy the email to '$FileName': $!\n"; + exit 1; +} + -# Let the engine handle it -WinePatchMLSubmission("${FileNameRandomPart}_wine-patches"); +# Notify the Engine of the new message +my $ErrMessage = WinePatchMLSubmission(); +if (defined $ErrMessage) +{ + # The Engine will pick up the email later so return success anyway. + # But still log the issue so it can be checked out. + LogMsg "$ErrMessage\n" +} exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index f376337..09191ee 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -218,9 +218,7 @@ sub FoundWinetestUpdate sub WinePatchMLSubmission { - my $FileName = $_[0]; - - my $Reply = SendCmdReceiveReply("winepatchmlsubmission $FileName\n"); + my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs().
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 8e09345b413f4bc7acd64d3dcc3691b20934ab6a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8e09345b413f4bc7acd64d3d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 7 02:34:31 2014 +0200 testbot/Engine: Rename the TaskComplete() notification to RescheduleJobs(). It did not actually use the Task ID and only calls ScheduleJobs() so the new name is more accurate. --- testbot/bin/Engine.pl | 6 +++--- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/lib/WineTestBot/Engine/Notify.pm | 8 +++----- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index f0570d7..ea04461 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -390,12 +390,12 @@ sub HandleJobRestart return "1OK"; } -sub HandleTaskComplete +sub HandleRescheduleJobs { my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { - LogMsg "Scheduling problem in HandleTaskComplete: $ErrMessage\n"; + LogMsg "Scheduling problem in HandleRescheduleJobs: $ErrMessage\n"; } return "1OK"; @@ -560,7 +560,7 @@ my %Handlers=( "jobsubmit" => \&HandleJobSubmit, "ping" => \&HandlePing, "shutdown" => \&HandleShutdown, - "taskcomplete" => \&HandleTaskComplete, + "reschedulejobs" => \&HandleRescheduleJobs, "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e8561c9..b07454b 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -333,7 +333,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 562b9d1..555f4e4 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -76,7 +76,7 @@ sub FatalError($$$$) $VM->Save(); } - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -291,7 +291,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo completed\n"; exit 0; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index efeac8d..2413a76 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -84,7 +84,7 @@ sub FatalError($$$$$) $VM->Status('dirty'); $VM->Save(); - TaskComplete($JobKey, $StepKey, $TaskKey); + RescheduleJobs(); exit 1; } @@ -383,7 +383,7 @@ $Task = undef; $Step = undef; $Job = undef; -TaskComplete($JobId, $StepNo, $TaskNo); +RescheduleJobs(); LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n"; exit 0; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 1a1ab6d..f376337 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,7 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&Shutdown &PingEngine &JobSubmit &JobStatusChange &JobCancel - &JobRestart &TaskComplete &VMStatusChange &FoundWinetestUpdate + &JobRestart &RescheduleJobs &VMStatusChange &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -167,11 +167,9 @@ sub JobRestart return substr($Reply, 1); } -sub TaskComplete +sub RescheduleJobs { - my ($JobKey, $StepKey, $TaskKey) = @_; - - my $Reply = SendCmdReceiveReply("taskcomplete $JobKey $StepKey $TaskKey\n"); + my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) { return "Unrecognized reply received from engine";

1 0

Francois Gouget : testbot/web: Always use a random prefix for the staging filename.
by Alexandre Julliard May 14, 2014

May 14, 2014

Module: tools Branch: master Commit: 3471277f654cb79ac2dc0c4393c37a4a3fab47d8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3471277f654cb79ac2dc0c43… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 14 19:34:06 2014 +0200 testbot/web: Always use a random prefix for the staging filename. Starting with the session id means we'll have to try again to find a new unique filename. --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index f73ae6a..0d9d0b4 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -794,7 +794,7 @@ sub OnSubmit # Make sure the file has a unique name even when not picked up directly # by the engine - my $FileNameRandomPart = $self->GetCurrentSession()->Id; + my $FileNameRandomPart = GenerateRandomString(32); while (-e ("$DataDir/staging/${FileNameRandomPart}_" . $self->GetParam("FileName"))) {

1 0

Jacek Caban : ntdll: Use MAP_PRIVATE for copy on write mappings.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 5ceb22714e965692acf2b0ec9af0dabc5dfc8b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ceb22714e965692acf2b0ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 12:02:48 2014 +0200 ntdll: Use MAP_PRIVATE for copy on write mappings. --- dlls/kernel32/tests/virtual.c | 17 +++++++++++------ dlls/ntdll/virtual.c | 3 ++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 174d422..0955d30 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2489,7 +2489,7 @@ static void test_shared_memory(BOOL is_child) CloseHandle(mapping); } -static void test_shared_memory_ro(BOOL is_child) +static void test_shared_memory_ro(BOOL is_child, DWORD child_access) { HANDLE mapping; LONG *p; @@ -2501,7 +2501,7 @@ static void test_shared_memory_ro(BOOL is_child) ok(GetLastError() == ERROR_ALREADY_EXISTS, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); SetLastError(0xdeadbef); - p = MapViewOfFile(mapping, FILE_MAP_READ | (is_child ? FILE_MAP_WRITE : 0), 0, 0, 4096); + p = MapViewOfFile(mapping, is_child ? child_access : FILE_MAP_READ, 0, 0, 4096); ok(p != NULL, "MapViewOfFile error %d\n", GetLastError()); if (is_child) @@ -2517,14 +2517,17 @@ static void test_shared_memory_ro(BOOL is_child) DWORD ret; winetest_get_mainargs(&argv); - sprintf(cmdline, "\"%s\" virtual sharedmemro", argv[0]); + sprintf(cmdline, "\"%s\" virtual sharedmemro %x", argv[0], child_access); ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + if(child_access & FILE_MAP_WRITE) + ok(*p == 0xdeadbeef, "*p = %x, expected 0xdeadbeef\n", *p); + else + ok(!*p, "*p = %x, expected 0\n", *p); } UnmapViewOfFile(p); @@ -2551,7 +2554,7 @@ START_TEST(virtual) } if (!strcmp(argv[2], "sharedmemro")) { - test_shared_memory_ro(TRUE); + test_shared_memory_ro(TRUE, strtol(argv[3], NULL, 16)); return; } while (1) @@ -2580,7 +2583,9 @@ START_TEST(virtual) pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); test_shared_memory(FALSE); - test_shared_memory_ro(FALSE); + test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE); + test_shared_memory_ro(FALSE, FILE_MAP_COPY); + test_shared_memory_ro(FALSE, FILE_MAP_COPY|FILE_MAP_WRITE); test_mapping(); test_CreateFileMapping_protection(); test_VirtualAlloc_protection(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d9acac6..70dea5a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2627,7 +2627,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, + (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alexandre Julliard : ntdll: Determine the mapping type automatically from the WRITECOPY flag.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 2cef8dbcc29739278037e6409e0a00a4fa8dc0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cef8dbcc29739278037e6409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 12:28:58 2014 +0200 ntdll: Determine the mapping type automatically from the WRITECOPY flag. --- dlls/ntdll/virtual.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 70dea5a..4819d2d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -854,10 +854,11 @@ done: * The csVirtual section must be held by caller. */ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start, size_t size, - off_t offset, unsigned int vprot, int flags, BOOL removable ) + off_t offset, unsigned int vprot, BOOL removable ) { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); assert( start < view->size ); assert( start + size <= view->size ); @@ -872,7 +873,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags | MAP_FIXED, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) goto done; if ((errno == EPERM) && (prot & PROT_EXEC)) @@ -1094,7 +1095,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (!st.st_size) goto error; header_size = min( header_size, st.st_size ); if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + !dup_mapping ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; nt = (IMAGE_NT_HEADERS *)(ptr + dos->e_lfanew); header_end = ptr + ROUND_SIZE( 0, header_size ); @@ -1118,8 +1119,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ - if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) goto error; + if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, + !dup_mapping ) != STATUS_SUCCESS) goto error; /* check that all sections are loaded at the right offset */ if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error; @@ -1172,8 +1173,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz sec->PointerToRawData, (int)pos, file_size, map_size, sec->Characteristics ); if (map_file_into_view( view, shared_fd, sec->VirtualAddress, map_size, pos, - VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, - MAP_SHARED, FALSE ) != STATUS_SUCCESS) + VPROT_COMMITTED | VPROT_READ | VPROT_WRITE, FALSE ) != STATUS_SUCCESS) { ERR_(module)( "Could not map shared section %.8s\n", sec->Name ); goto error; @@ -1189,8 +1189,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz if (end > base) map_file_into_view( view, shared_fd, base, end - base, pos + (base - sec->VirtualAddress), - VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, FALSE ); + VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, FALSE ); } pos += map_size; continue; @@ -1212,7 +1211,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end < file_start || map_file_into_view( view, fd, sec->VirtualAddress, file_size, file_start, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, - MAP_PRIVATE, !dup_mapping ) != STATUS_SUCCESS) + !dup_mapping ) != STATUS_SUCCESS) { ERR_(module)( "Could not map section %.8s, file probably truncated\n", sec->Name ); goto error; @@ -2627,8 +2626,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p TRACE("handle=%p size=%lx offset=%x%08x\n", handle, size, offset.u.HighPart, offset.u.LowPart ); - res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, - (vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED, !dup_mapping ); + res = map_file_into_view( view, unix_handle, 0, size, offset.QuadPart, vprot, !dup_mapping ); if (res == STATUS_SUCCESS) { *addr_ptr = view->base;

1 0

Alex Henrie : gdi32/tests: Add MS Shell Dlg tests.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 0fb88f8d01fd69e3d026fba069a66aa05413d48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb88f8d01fd69e3d026fba06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 11 22:05:12 2014 -0600 gdi32/tests: Add MS Shell Dlg tests. --- dlls/gdi32/tests/font.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 255771a..0e75088 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4681,6 +4681,7 @@ static void test_EnumFonts(void) int ret; LOGFONTA lf; HDC hdc; + struct enum_fullname_data efnd; if (!is_truetype_font_installed("Arial")) { @@ -4741,6 +4742,28 @@ static void test_EnumFonts(void) ret = EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); ok(ret, "font Arial Italic Bold should not be enumerated\n"); + /* MS Shell Dlg and MS Shell Dlg 2 must exist */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + todo_wine ok(!ret, "expected MS Shell Dlg got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ok(ret, "did not expect MS Shell Dlg\n"); + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg 2"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg 2 is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + todo_wine ok(!ret, "expected MS Shell Dlg 2 got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ok(ret, "did not expect MS Shell Dlg 2\n"); + DeleteDC(hdc); }

1 0

Jacek Caban : mshtml: Use debugstr_mshtml_guid in a few more places.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 6ebe1c60e243ac2b70ec19cceebb7d1a6a8f2cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebe1c60e243ac2b70ec19cce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 13 18:56:30 2014 +0200 mshtml: Use debugstr_mshtml_guid in a few more places. --- dlls/mshtml/htmlstorage.c | 2 +- dlls/mshtml/htmlstylesheet.c | 42 +++++++++++++++++------------------------- dlls/mshtml/htmlwindow.c | 33 +++++++++------------------------ dlls/mshtml/main.c | 12 ++++++++++++ 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 3e169ba..60a2a3a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -56,7 +56,7 @@ static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID rii return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 4258f79..8f48a07 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -68,17 +68,17 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_QueryInterface(IHTMLStyleShe { HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetRulesCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetRulesCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetRulesCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { *ppv = NULL; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } @@ -222,28 +222,24 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_QueryInterface(IHTMLStyleSheetsC { HTMLStyleSheetsCollection *This = impl_from_IHTMLStyleSheetsCollection(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheetsCollection, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheetsCollection %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheetsCollection_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheetsCollection_AddRef(IHTMLStyleSheetsCollection *iface) @@ -415,28 +411,24 @@ static HRESULT WINAPI HTMLStyleSheet_QueryInterface(IHTMLStyleSheet *iface, REFI { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(IsEqualGUID(&IID_IHTMLStyleSheet, riid)) { - TRACE("(%p)->(IID_IHTMLStyleSheet %p)\n", This, ppv); *ppv = &This->IHTMLStyleSheet_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("unsupported %s\n", debugstr_mshtml_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("unsupported %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLStyleSheet_AddRef(IHTMLStyleSheet *iface) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a57dfba..1333608 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -141,59 +141,45 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { - TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { - TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IHTMLFramesCollection2, riid)) { - TRACE("(%p)->(IID_IHTMLFramesCollection2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow2, riid)) { - TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = &This->IHTMLWindow2_iface; }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { - TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = &This->IHTMLWindow3_iface; }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { - TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); *ppv = &This->IHTMLWindow4_iface; }else if(IsEqualGUID(&IID_IHTMLWindow5, riid)) { - TRACE("(%p)->(IID_IHTMLWindow5 %p)\n", This, ppv); *ppv = &This->IHTMLWindow5_iface; }else if(IsEqualGUID(&IID_IHTMLWindow6, riid)) { - TRACE("(%p)->(IID_IHTMLWindow6 %p)\n", This, ppv); *ppv = &This->IHTMLWindow6_iface; }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { - TRACE("(%p)->(IID_IHTMLPrivateWindow %p)\n", This, ppv); *ppv = &This->IHTMLPrivateWindow_iface; }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { - TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = &This->IServiceProvider_iface; }else if(IsEqualGUID(&IID_ITravelLogClient, riid)) { - TRACE("(%p)->(IID_ITravelLogClient %p)\n", This, ppv); *ppv = &This->ITravelLogClient_iface; }else if(IsEqualGUID(&IID_IObjectIdentity, riid)) { - TRACE("(%p)->(IID_IObjectIdentity %p)\n", This, ppv); *ppv = &This->IObjectIdentity_iface; }else if(dispex_query_interface(&This->inner_window->dispex, riid, ppv)) { assert(!*ppv); return E_NOINTERFACE; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } - if(*ppv) { - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) @@ -2407,8 +2393,7 @@ static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid UINT i; HRESULT hres; - WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); + WARN("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); for(i=0; i < cNames; i++) { /* We shouldn't use script's IDispatchEx here, so we shouldn't use GetDispID */ @@ -2686,7 +2671,7 @@ static HRESULT WINAPI HTMLWindowSP_QueryService(IServiceProvider *iface, REFGUID return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); } - TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_mshtml_guid(guidService), debugstr_mshtml_guid(riid), ppv); if(!This->outer_window->doc_obj) return E_NOINTERFACE; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 5e9d7cb..c34a6d8 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -573,9 +573,11 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLElementCollection); X(IID_IHTMLEventObj); X(IID_IHTMLFiltersCollection); + X(IID_IHTMLFramesCollection2); X(IID_IHTMLImageElementFactory); X(IID_IHTMLLocation); X(IID_IHTMLOptionElementFactory); + X(IID_IHTMLPrivateWindow); X(IID_IHTMLRect); X(IID_IHTMLScreen); X(IID_IHTMLStorage); @@ -585,9 +587,18 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IHTMLStyle4); X(IID_IHTMLStyle5); X(IID_IHTMLStyle6); + X(IID_IHTMLStyleSheet); + X(IID_IHTMLStyleSheetRulesCollection); + X(IID_IHTMLStyleSheetsCollection); + X(IID_IHTMLWindow2); + X(IID_IHTMLWindow3); + X(IID_IHTMLWindow4); + X(IID_IHTMLWindow5); + X(IID_IHTMLWindow6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); + X(IID_IObjectIdentity); X(IID_IObjectSafety); X(IID_IObjectWithSite); X(IID_IOleContainer); @@ -613,6 +624,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IServiceProvider); X(IID_ISupportErrorInfo); X(IID_ITargetContainer); + X(IID_ITravelLogClient); X(IID_IUnknown); X(IID_IViewObject); X(IID_IViewObject2);

1 0

Nikolay Sivov : xmllite/writer: Implement SetOutput() for writer.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 9080329e4e05eea155c08008618810fb88dd75e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9080329e4e05eea155c080086… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 18:25:37 2014 +0400 xmllite/writer: Implement SetOutput() for writer. --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/writer.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6e51d5e..6e3f9cd 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -642,7 +642,7 @@ static void readerinput_release_stream(xmlreaderinput *readerinput) /* Queries already stored interface for IStream/ISequentialStream. Interface supplied on creation will be overwritten */ -static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) +static inline HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) { HRESULT hr; diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 5266049..a58164b 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -39,15 +39,19 @@ typedef struct IXmlWriterOutput IXmlWriterOutput_iface; LONG ref; IUnknown *output; + ISequentialStream *stream; IMalloc *imalloc; xml_encoding encoding; } xmlwriteroutput; +static const struct IUnknownVtbl xmlwriteroutputvtbl; + typedef struct _xmlwriter { IXmlWriter IXmlWriter_iface; LONG ref; IMalloc *imalloc; + xmlwriteroutput *output; } xmlwriter; static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) @@ -82,6 +86,26 @@ static inline void writer_free(xmlwriter *writer, void *mem) m_free(writer->imalloc, mem); } +static void writeroutput_release_stream(xmlwriteroutput *writeroutput) +{ + if (writeroutput->stream) { + ISequentialStream_Release(writeroutput->stream); + writeroutput->stream = NULL; + } +} + +static inline HRESULT writeroutput_query_for_stream(xmlwriteroutput *writeroutput) +{ + HRESULT hr; + + writeroutput_release_stream(writeroutput); + hr = IUnknown_QueryInterface(writeroutput->output, &IID_IStream, (void**)&writeroutput->stream); + if (hr != S_OK) + hr = IUnknown_QueryInterface(writeroutput->output, &IID_ISequentialStream, (void**)&writeroutput->stream); + + return hr; +} + static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) { xmlwriter *This = impl_from_IXmlWriter(iface); @@ -116,6 +140,7 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) { IMalloc *imalloc = This->imalloc; + if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); writer_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -124,13 +149,46 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) } /*** IXmlWriter methods ***/ -static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *pOutput) +static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *output) { xmlwriter *This = impl_from_IXmlWriter(iface); + IXmlWriterOutput *writeroutput; + HRESULT hr; - FIXME("%p %p\n", This, pOutput); + TRACE("(%p)->(%p)\n", This, output); - return E_NOTIMPL; + if (This->output) { + writeroutput_release_stream(This->output); + IUnknown_Release(&This->output->IXmlWriterOutput_iface); + This->output = NULL; + } + + /* just reset current output */ + if (!output) + return S_OK; + + /* now try IXmlWriterOutput, ISequentialStream, IStream */ + hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&writeroutput); + if (hr == S_OK) { + if (writeroutput->lpVtbl == &xmlwriteroutputvtbl) + This->output = impl_from_IXmlWriterOutput(writeroutput); + else { + ERR("got external IXmlWriterOutput implementation: %p, vtbl=%p\n", + writeroutput, writeroutput->lpVtbl); + IUnknown_Release(writeroutput); + return E_FAIL; + + } + } + + if (hr != S_OK || !writeroutput) { + /* create IXmlWriterOutput basing on supplied interface */ + hr = CreateXmlWriterOutputWithEncodingName(output, This->imalloc, NULL, &writeroutput); + if (hr != S_OK) return hr; + This->output = impl_from_IXmlWriterOutput(writeroutput); + } + + return writeroutput_query_for_stream(This->output); } static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) @@ -471,6 +529,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) { IMalloc *imalloc = This->imalloc; if (This->output) IUnknown_Release(This->output); + if (This->stream) ISequentialStream_Release(This->stream); writeroutput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -507,6 +566,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->ref = 1; writer->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); + writer->output = NULL; *obj = &writer->IXmlWriter_iface; @@ -537,6 +597,7 @@ HRESULT WINAPI CreateXmlWriterOutputWithEncodingName(IUnknown *stream, writeroutput->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); writeroutput->encoding = parse_encoding_name(encoding, -1); + writeroutput->stream = NULL; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&writeroutput->output);

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8LobbiedApplication Initialize.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: d9ae2b828e6783cc02273bf9018e2ebba93778df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ae2b828e6783cc02273bf90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 14 14:53:40 2014 +1100 dpnet: Implement IDirectPlay8LobbiedApplication Initialize. --- dlls/dpnet/dpnet_private.h | 9 +++++++-- dlls/dpnet/lobbiedapp.c | 16 +++++++++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++-- dlls/dpnet/tests/peer.c | 32 ++++++++++++++++++++++++++++++-- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index af81474..8fd04d6 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -78,8 +78,13 @@ struct IDirectPlay8AddressImpl */ struct IDirectPlay8LobbiedApplicationImpl { - IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; - LONG ref; + IDirectPlay8LobbiedApplication IDirectPlay8LobbiedApplication_iface; + LONG ref; + + PFNDPNMESSAGEHANDLER msghandler; + DWORD flags; + void *usercontext; + DPNHANDLE *connection; }; /***************************************************************************** diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index b430776..507a895 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -89,9 +89,19 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, DPNHANDLE * const pdpnhConnection, const DWORD dwFlags) { - IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); - FIXME("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8LobbiedApplicationImpl *This = impl_from_IDirectPlay8LobbiedApplication(iface); + + TRACE("(%p)->(%p %p %p %x)\n", This, pvUserContext, pfn, pdpnhConnection, dwFlags); + + if(!pfn) + return DPNERR_INVALIDPOINTER; + + This->msghandler = pfn; + This->flags = dwFlags; + This->usercontext = pvUserContext; + This->connection = pdpnhConnection; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_RegisterProgram(IDirectPlay8LobbiedApplication *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index bf0d26f..92bed55 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -21,10 +21,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Client* client = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) @@ -33,10 +35,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static BOOL test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -56,6 +65,14 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); + return client != NULL; } @@ -195,8 +212,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Client_Close(client, 0); ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); - hr = IDirectPlay8Client_Release(client); - ok(hr == S_OK, "IDirectPlay8Client_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Client_Release(client); CoUninitialize(); } diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 670b843..1fec1f2 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -20,10 +20,12 @@ #include <stdio.h> #include <dplay8.h> +#include <dplobby8.h> #include "wine/test.h" static IDirectPlay8Peer* peer = NULL; +static IDirectPlay8LobbiedApplication* lobbied = NULL; static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) { @@ -31,10 +33,17 @@ static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, return S_OK; } +static HRESULT WINAPI DirectPlayLobbyMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + trace("DirectPlayLobbyMessageHandler: 0x%08x\n", message_id); + return S_OK; +} + static void test_init_dp(void) { HRESULT hr; DPN_SP_CAPS caps; + DPNHANDLE lobbyConnection; hr = CoInitialize(0); ok(hr == S_OK, "CoInitialize failed with %x\n", hr); @@ -53,6 +62,18 @@ static void test_init_dp(void) hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8LobbiedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectPlay8LobbiedApplication, (void **)&lobbied); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, NULL, + &lobbyConnection, 0); + ok(hr == DPNERR_INVALIDPOINTER, "Failed with %x\n", hr); + + hr = IDirectPlay8LobbiedApplication_Initialize(lobbied, NULL, DirectPlayLobbyMessageHandler, + &lobbyConnection, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Initialize failed with %x\n", hr); } static void test_enum_service_providers(void) @@ -198,8 +219,15 @@ static void test_cleanup_dp(void) hr = IDirectPlay8Peer_Close(peer, 0); ok(hr == S_OK, "IDirectPlay8Peer_Close failed with %x\n", hr); - hr = IDirectPlay8Peer_Release(peer); - ok(hr == S_OK, "IDirectPlay8Peer_Release failed with %x\n", hr); + if(lobbied) + { + hr = IDirectPlay8LobbiedApplication_Close(lobbied, 0); + ok(hr == S_OK, "IDirectPlay8LobbiedApplication_Close failed with %x\n", hr); + + IDirectPlay8LobbiedApplication_Release(lobbied); + } + + IDirectPlay8Peer_Release(peer); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 239d8077db6e9ebf9f2b3eda31e1733e30d40143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239d8077db6e9ebf9f2b3eda3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 13 00:20:21 2014 +0400 msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates. --- dlls/msxml3/tests/domdoc.c | 27 ++++++++++++++++++++------- dlls/msxml3/xslpattern.y | 5 +++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 19b2951..b028996 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -494,7 +494,7 @@ static const char szExampleXML[] = " </description>\n" " </elem>\n" "\n" -" <elem>\n" +" <elem a='a'>\n" " <a>A2 field</a>\n" " <b>B2 field</b>\n" " <c type=\"old\">C2 field</c>\n" @@ -1074,14 +1074,16 @@ static char *list_to_string(IXMLDOMNodeList *list) static char buf[4096]; char *pos = buf; LONG len = 0; + HRESULT hr; int i; if (list == NULL) { - lstrcpyA(buf, "(null)"); + strcpy(buf, "(null)"); return buf; } - ole_check(IXMLDOMNodeList_get_length(list, &len)); + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); for (i = 0; i < len; i++) { IXMLDOMNode *node; @@ -4449,12 +4451,13 @@ static const xpath_test_t xpath_test[] = { { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, { "child::text()", "" }, { "child::*/..", "E2.D1" }, - { "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, + { "child::*//@*/..", "E2.E5.E1.E2.D1 E2.E2.D1 E3.E2.E2.D1" }, { "self::node()", "E2.D1" }, { "ancestor::node()", "D1" }, { "elem[c][last()]/a", "E1.E2.E2.D1"}, { "ancestor-or-self::node()[1]", "E2.D1" }, { "((//a)[1])[last()]", "E1.E1.E2.D1" }, + { "//elem[@*]", "E2.E2.D1" }, { NULL } }; @@ -4517,7 +4520,7 @@ static void test_XPath(void) str = list_to_string(list); - ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", + ok(!strcmp(str, xptest->list), "query=%s, invalid node list: \"%s\", expected \"%s\"\n", xptest->query, str, xptest->list); if (list) @@ -6838,6 +6841,7 @@ static void test_default_properties(void) typedef struct { const char *query; const char *list; + BOOL todo; } xslpattern_test_t; static const xslpattern_test_t xslpattern_test[] = { @@ -6900,6 +6904,7 @@ static const xslpattern_test_t xslpattern_test[] = { { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, + { "root/elem[@*]", "E2.E2.D1 E3.E2.D1", TRUE }, { NULL } }; @@ -6977,8 +6982,16 @@ static void test_XSLPattern(void) len = 0; hr = IXMLDOMNodeList_get_length(list, &len); ok(len != 0, "query=%s, empty list\n", ptr->query); - if (len) - expect_list_and_release(list, ptr->list); + if (len) { + if (ptr->todo) { + char *str = list_to_string(list); + todo_wine + ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list); + IXMLDOMNodeList_Release(list); + } + else + expect_list_and_release(list, ptr->list); + } ptr++; } diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 4e3b699..9adb318 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -186,6 +186,11 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons $$=xmlStrcat($$,$2); xmlFree($2); } + | '@' '*' + { + TRACE("Got All attributes pattern: \"@*\"\n"); + $$=xmlStrdup(U("@*")); + } ; /* [2.3] Node Tests */

1 0

Henri Verbeet : d2d1: Add the ID2D1GeometrySink interface.
by Alexandre Julliard May 13, 2014

May 13, 2014

Module: wine Branch: master Commit: 29237d832bd5fd8b28282b5f951833d82089d564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29237d832bd5fd8b28282b5f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 13 09:41:13 2014 +0200 d2d1: Add the ID2D1GeometrySink interface. --- include/d2d1.idl | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ include/d2dbasetypes.h | 6 ++++++ 2 files changed, 61 insertions(+) diff --git a/include/d2d1.idl b/include/d2d1.idl index 27a617c..bfed202 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -22,6 +22,7 @@ import "d2dbasetypes.h"; typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; typedef D2D_RECT_F D2D1_RECT_F; +typedef D2D_SIZE_F D2D1_SIZE_F; typedef enum D2D1_DEBUG_LEVEL { @@ -123,6 +124,20 @@ typedef enum D2D1_COMBINE_MODE D2D1_COMBINE_MODE_FORCE_DWORD = 0xffffffff, } D2D1_COMBINE_MODE; +typedef enum D2D1_SWEEP_DIRECTION +{ + D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0, + D2D1_SWEEP_DIRECTION_CLOCKWISE = 1, + D2D1_SWEEP_DIRECTION_FORCE_DWORD = 0xffffffff, +} D2D1_SWEEP_DIRECTION; + +typedef enum D2D1_ARC_SIZE +{ + D2D1_ARC_SIZE_SMALL = 0, + D2D1_ARC_SIZE_LARGE = 1, + D2D1_ARC_SIZE_FORCE_DWORD = 0xffffffff, +} D2D1_ARC_SIZE; + typedef struct D2D1_BEZIER_SEGMENT { D2D1_POINT_2F point1; @@ -156,6 +171,21 @@ typedef struct D2D1_ELLIPSE float radiusY; } D2D1_ELLIPSE; +typedef struct D2D1_QUADRATIC_BEZIER_SEGMENT +{ + D2D1_POINT_2F point1; + D2D1_POINT_2F point2; +} D2D1_QUADRATIC_BEZIER_SEGMENT; + +typedef struct D2D1_ARC_SEGMENT +{ + D2D1_POINT_2F point; + D2D1_SIZE_F size; + float rotationAngle; + D2D1_SWEEP_DIRECTION sweepDirection; + D2D1_ARC_SIZE arcSize; +} D2D1_ARC_SEGMENT; + interface ID2D1Factory; [ @@ -374,5 +404,30 @@ interface ID2D1TransformedGeometry : ID2D1Geometry ); } +[ + local, + object, + uuid(2cd9069f-12e2-11dc-9fed-001143a055f9) +] +interface ID2D1GeometrySink : ID2D1SimplifiedGeometrySink +{ + void AddLine( + [in] D2D1_POINT_2F point + ); + void AddBezier( + [in] const D2D1_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBezier( + [in] const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier + ); + void AddQuadraticBeziers( + [in, size_is(bezier_count)] const D2D1_QUADRATIC_BEZIER_SEGMENT *beziers, + [in] UINT32 bezier_count + ); + void AddArc( + [in] const D2D1_ARC_SEGMENT *arc + ); +} + [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); diff --git a/include/d2dbasetypes.h b/include/d2dbasetypes.h index 385e0b3..4ddb994 100644 --- a/include/d2dbasetypes.h +++ b/include/d2dbasetypes.h @@ -39,3 +39,9 @@ typedef struct D2D_RECT_F float right; float bottom; } D2D_RECT_F; + +typedef struct D2D_SIZE_F +{ + float width; + float height; +} D2D_SIZE_F;

1 0