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