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