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

Francois Gouget : testbot/WineRunTask: Better handle the test unit transitions.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: tools Branch: master Commit: 33d1d7591cf0e9335f186e0567a1ccbae25137dc URL: http://source.winehq.org/git/tools.git/?a=commit;h=33d1d7591cf0e9335f186e05… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 22 05:32:36 2017 +0200 testbot/WineRunTask: Better handle the test unit transitions. Only close a test unit when finding the start of the next one. This makes it possible to take into account misplaced lines from subprocesses if any. Better check that everything is in order at the end of each test unit. Also add helper functions to simplify the code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 188 +++++++++++++++++++++++++++------------------ 1 file changed, 112 insertions(+), 76 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 5f9d4f3..f8e6977 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -470,7 +470,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # track of the current one. Also note that for the TestBot we don't really # care about the todos and skips my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); - my ($CurrentIsPolluted, %CurrentPids, $LogFailures); + my ($CurrentIsBroken, %CurrentPids, $CurrentRc, $LogFailures); sub CheckUnit($$) { @@ -481,24 +481,96 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } # To avoid issuing many duplicate errors, # only report the first misplaced message. - elsif ($IsWineTest and !$CurrentIsPolluted) + elsif ($IsWineTest and !$CurrentIsBroken) { LogTaskError("$CurrentDll:$CurrentUnit contains a misplaced $Type message for $Unit\n"); $LogFailures++; - $CurrentIsPolluted = 1; + $CurrentIsBroken = 1; } } - foreach my $Line (<$LogFile>) + sub CheckSummaryCounter($$$) { - if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + my ($Count, $SCount, $Type) = @_; + + if ($Count != 0 and $SCount == 0) { - my ($Dll, $Unit) = ($1, $2); - if ($CurrentDll ne "") + LogTaskError("$CurrentDll:$CurrentUnit has unaccounted for $Type messages\n"); + $LogFailures++; + } + elsif ($Count == 0 and $SCount != 0) + { + LogTaskError("$CurrentDll:$CurrentUnit is missing some $Type messages\n"); + $LogFailures++; + } + } + + sub CloseTestUnit($) + { + my ($Last) = @_; + + # Verify the summary lines + if (!$CurrentIsBroken) + { + CheckSummaryCounter($LineFailures, $SummaryFailures, "failure"); + } + + # Note that the summary lines may count some failures twice + # so only use them as a fallback. + $LineFailures ||= $SummaryFailures; + + if (!$CurrentIsBroken and defined $CurrentRc) + { + # Check the exit code, particularly against failures reported + # after the 'done' line (e.g. by subprocesses). + if ($LineFailures != 0 and $CurrentRc == 0) { - LogTaskError("$CurrentDll:$CurrentUnit has no done line\n"); + LogTaskError("$CurrentDll:$CurrentUnit returned success despite having failures\n"); $LogFailures++; } + elsif (!$IsWineTest and $CurrentRc != 0) + { + LogTaskError("The test returned a non-zero exit code\n"); + $LogFailures++; + } + elsif ($IsWineTest and $LineFailures == 0 and $CurrentRc != 0) + { + LogTaskError("$CurrentDll:$CurrentUnit returned a non-zero exit code despite reporting no failures\n"); + $LogFailures++; + } + } + # For executables TestLauncher's done line may not be recognizable. + elsif ($IsWineTest and !defined $CurrentRc) + { + if (!$Last) + { + LogTaskError("$CurrentDll:$CurrentUnit has no done line (or it is garbled)\n"); + } + elsif ($Last and !$TaskTimedOut) + { + LogTaskError("The report seems to have been truncated\n"); + } + $LogFailures++; + } + + $LogFailures += $LineFailures; + + $CurrentDll = $CurrentUnit = ""; + $LineFailures = $SummaryFailures = 0; + $CurrentIsBroken = 0; + $CurrentRc = undef; + %CurrentPids = (); + } + + foreach my $Line (<$LogFile>) + { + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + { + my ($Dll, $Unit) = ($1, $2); + + # Close the previous test unit + CloseTestUnit(0) if ($CurrentDll ne ""); + ($CurrentDll, $CurrentUnit) = ($Dll, $Unit); } elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): / or @@ -561,93 +633,57 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if ($IsWineTest and ($Dll ne $CurrentDll or $Unit ne $CurrentUnit)) { - LogTaskError("$Dll:$Unit had no start line\n"); + # First close the current test unit taking into account + # it may have been polluted by the new one. $LogFailures++; - $CurrentIsPolluted = 1; + $CurrentIsBroken = 1; + CloseTestUnit(0); + + # Then switch to the new one, warning it's missing a start line, + # and that its results may be inconsistent. + ($CurrentDll, $CurrentUnit) = ($Dll, $Unit); + LogTaskError("$Dll:$Unit had no start line (or it is garbled)\n"); + $CurrentIsBroken = 1; } - # Verify the summary lines - if (!$CurrentIsPolluted) + if ($Rc == 258) { - if ($LineFailures != 0 and $SummaryFailures == 0 and $Rc != 258) - { - LogTaskError("$Dll:$Unit has unreported failures\n"); - $LogFailures++; - } - elsif ($LineFailures == 0 and $SummaryFailures != 0) - { - LogTaskError("$Dll:$Unit is missing some 'test failed' messages\n"); - $LogFailures++; - } + # The done line will already be shown as a timeout (see JobDetails) + # so record the failure but don't add an error message. + $LogFailures++; + $CurrentIsBroken = 1; } - # Note that $SummaryFailures may count some failures twice so only use - # it as a fallback for $LineFailures. - $LineFailures ||= $SummaryFailures; - - if (!$CurrentIsPolluted) + elsif ((!$Pid and !%CurrentPids) or + ($Pid and !$CurrentPids{$Pid} and !$CurrentPids{0})) { - # Verify the exit code - if ($LineFailures != 0 and $Rc == 0) - { - LogTaskError("$Dll:$Unit returned success despite having failures\n"); - $LogFailures++; - } - elsif ($Rc == 258) - { - # This is a timeout. Those are already reported based on the - # done line. - $LogFailures++; - } - elsif (!$IsWineTest and $Rc != 0) + # The main summary line is missing + if ($Rc & 0xc0000000) { - LogTaskError("The test returned a non-zero exit code\n"); + LogTaskError(sprintf("%s:%s crashed (%08x)\n", $Dll, $Unit, $Rc & 0xffffffff)); $LogFailures++; + $CurrentIsBroken = 1; } - elsif ($LineFailures == 0 and $Rc != 0) + elsif ($IsWineTest and !$CurrentIsBroken) { - LogTaskError("$Dll:$Unit returned an error ($Rc) despite having no failures\n"); + LogTaskError("$Dll:$Unit has no test summary line (early exit of the main process?)\n"); $LogFailures++; } } - - if ($IsWineTest and $Rc != 258 and - ((!$Pid and !%CurrentPids) or - ($Pid and !$CurrentPids{$Pid} and !$CurrentPids{0}))) + elsif ($Rc & 0xc0000000) { - LogTaskError("$Dll:$Unit has no test summary line (early exit of the main process?)\n"); - $LogFailures++; + # We know the crash happened in the main process which means we got + # an "unhandled exception" message. So there is no need to add an + # extra message or to increment the failure count. Still note that + # there may be inconsistencies (e.g. unreported todos or skips). + $CurrentIsBroken = 1; } - - $LogFailures += $LineFailures; - - $CurrentDll = $CurrentUnit = ""; - %CurrentPids = (); - $CurrentIsPolluted = $LineFailures = $SummaryFailures = 0; + $CurrentRc = $Rc; } } + $CurrentIsBroken = 1 if ($TaskTimedOut); + CloseTestUnit(1); close($LogFile); - if (!$IsWineTest or $TaskTimedOut) - { - # This is either not a Wine test, which means the report need not follow - # the Wine test standards, or the report got truncated due to the - # timeout. In either case ignore the other checks. - } - elsif (!defined $LogFailures) - { - LogTaskError("Found no trace of a test summary line or of a crash\n"); - $LogFailures = 1; - } - elsif ($CurrentDll ne "") - { - LogTaskError("The report seems to have been truncated\n"); - $LogFailures++; - } - elsif ($LineFailures or $SummaryFailures) - { - LogTaskError("Found a trailing test summary or test failed line.\n"); - $LogFailures++; - } # $LogFailures can legitimately be undefined in case of a timeout $TaskFailures += $LogFailures || 0; }

1 0

Alexandre Julliard : wsdapi/tests: Remove tests that use uninitialized variables.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 0ad76226ccf9504323d731958a90e2e1a50ed08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad76226ccf9504323d731958… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 19 20:26:12 2017 +0200 wsdapi/tests: Remove tests that use uninitialized variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 482fe85..cf08784 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -117,12 +117,6 @@ static void AddChild_tests(void) hr = WSDXMLAddChild(NULL, NULL); ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); - hr = WSDXMLAddChild(parent, NULL); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); - - hr = WSDXMLAddChild(NULL, child1); - ok(hr == E_INVALIDARG, "WSDXMLAddChild failed with %08x\n", hr); - /* Populate structures */ ns.Uri = uri; ns.PreferredPrefix = prefix; @@ -208,12 +202,6 @@ static void AddSibling_tests(void) hr = WSDXMLAddSibling(NULL, NULL); ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); - hr = WSDXMLAddSibling(child1, NULL); - ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); - - hr = WSDXMLAddSibling(NULL, child2); - ok(hr == E_INVALIDARG, "WSDXMLAddSibling failed with %08x\n", hr); - /* Populate structures */ ns.Uri = uri; ns.PreferredPrefix = prefix;

1 0

Alistair Leslie-Hughes : include/mfreadwrite.idl: Add interface IMFSinkWriter.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 3f01ab4c39ffa50e26916a5f33d82dec1a2e42dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f01ab4c39ffa50e26916a5f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 19 04:03:32 2017 +0000 include/mfreadwrite.idl: Add interface IMFSinkWriter. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index a146552..c8816cd 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -31,6 +31,26 @@ enum MF_SOURCE_READER_CURRENT_TYPE_INDEX = 0xffffffff }; +typedef struct _MF_SINK_WRITER_STATISTICS +{ + DWORD cb; + LONGLONG llLastTimestampReceived; + LONGLONG llLastTimestampEncoded; + LONGLONG llLastTimestampProcessed; + LONGLONG llLastStreamTickReceived; + LONGLONG llLastSinkSampleRequest; + QWORD qwNumSamplesReceived; + QWORD qwNumSamplesEncoded; + QWORD qwNumSamplesProcessed; + QWORD qwNumStreamTicksReceived; + DWORD dwByteCountQueued; + QWORD qwByteCountProcessed; + DWORD dwNumOutstandingSinkSampleRequests; + DWORD dwAverageSampleRateReceived; + DWORD dwAverageSampleRateEncoded; + DWORD dwAverageSampleRateProcessed; +} MF_SINK_WRITER_STATISTICS; + interface IMFMediaSource; [ @@ -53,5 +73,25 @@ interface IMFSourceReader : IUnknown HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); }; +[ + object, + uuid(3137f1cd-fe5e-4805-a5d8-fb477448cb3d), + local +] +interface IMFSinkWriter : IUnknown +{ + HRESULT AddStream([in] IMFMediaType *type, [out] DWORD *index); + HRESULT SetInputMediaType([in] DWORD index, [in] IMFMediaType *type, [in] IMFAttributes *parameters); + HRESULT BeginWriting(void); + HRESULT WriteSample([in] DWORD index, [in] IMFSample *sample); + HRESULT SendStreamTick([in] DWORD index, [in] LONGLONG timestamp); + HRESULT PlaceMarker([in] DWORD index, [in] void *context); + HRESULT NotifyEndOfSegment([in] DWORD index); + HRESULT Flush([in] DWORD index); + HRESULT Finalize(void); + HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); + HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); +}; + cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" )

1 0

Austin English : user32: Add LogicalToPhysicalPoint/ PhysicalToLogicalPoint stubs.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 3b9e49b4d8815754e5c7b7a0c4f982e6efa0ac62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9e49b4d8815754e5c7b7a0c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 13:20:07 2017 -0500 user32: Add LogicalToPhysicalPoint/PhysicalToLogicalPoint stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 2 +- .../ext-ms-win-ntuser-window-l1-1-1.spec | 2 +- dlls/user32/user32.spec | 2 ++ dlls/user32/winpos.c | 24 ++++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec index 69488d1..4b563ff 100644 --- a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec @@ -36,7 +36,7 @@ @ stdcall IsWindow(long) user32.IsWindow @ stdcall IsWindowUnicode(long) user32.IsWindowUnicode @ stdcall IsWindowVisible(long) user32.IsWindowVisible -@ stub LogicalToPhysicalPoint +@ stdcall LogicalToPhysicalPoint(long ptr) user32.LogicalToPhysicalPoint @ stdcall MoveWindow(long long long long long long) user32.MoveWindow @ stdcall RemovePropW(long wstr) user32.RemovePropW @ stdcall SetForegroundWindow(long) user32.SetForegroundWindow diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec index 69488d1..4b563ff 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec @@ -36,7 +36,7 @@ @ stdcall IsWindow(long) user32.IsWindow @ stdcall IsWindowUnicode(long) user32.IsWindowUnicode @ stdcall IsWindowVisible(long) user32.IsWindowVisible -@ stub LogicalToPhysicalPoint +@ stdcall LogicalToPhysicalPoint(long ptr) user32.LogicalToPhysicalPoint @ stdcall MoveWindow(long long long long long long) user32.MoveWindow @ stdcall RemovePropW(long wstr) user32.RemovePropW @ stdcall SetForegroundWindow(long) user32.SetForegroundWindow diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1d492e4..4514877 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -491,6 +491,7 @@ @ stub LockWindowStation @ stdcall LockWindowUpdate(long) @ stdcall LockWorkStation() +@ stdcall LogicalToPhysicalPoint(long ptr) @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stub MBToWCSEx @@ -541,6 +542,7 @@ # @ stub PaintMenuBar @ stdcall PeekMessageA(ptr long long long long) @ stdcall PeekMessageW(ptr long long long long) +@ stdcall PhysicalToLogicalPoint(long ptr) @ stub PlaySoundEvent @ stdcall PostMessageA(long long long long) @ stdcall PostMessageW(long long long long) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c2b35ec..a9f3d9e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2949,3 +2949,27 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) else WINPOS_ShowIconTitle( hwnd, TRUE ); } } + +/*********************************************************************** + * LogicalToPhysicalPoint (USER32.@) + */ +BOOL WINAPI LogicalToPhysicalPoint(HWND hwnd, POINT *point) +{ + static int once; + + if (!once++) + FIXME("(%p %p) stub\n", hwnd, point); + return TRUE; +} + +/*********************************************************************** + * PhysicalToLogicalPoint (USER32.@) + */ +BOOL WINAPI PhysicalToLogicalPoint(HWND hwnd, POINT *point) +{ + static int once; + + if (!once++) + FIXME("(%p %p) stub\n", hwnd, point); + return TRUE; +}

1 0

Owen Rudge : wsdapi/tests: Add tests for IWSDXMLContext_AddNameToNamespace.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 8951c03e8e575c1a240309ecf45f49348030c076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8951c03e8e575c1a240309ecf… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 18 22:39:27 2017 +0100 wsdapi/tests: Add tests for IWSDXMLContext_AddNameToNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 22f5faf..482fe85 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -407,6 +407,111 @@ static void XMLContext_AddNamespace_tests(void) IWSDXMLContext_Release(context); } +static void XMLContext_AddNameToNamespace_tests(void) +{ + WCHAR ns1Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t',0}; + WCHAR ns2Uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','r','o','c','k','s',0}; + WCHAR prefix2[] = {'w','i','n','e',0}; + WCHAR unPrefix0[] = {'u','n','0',0}; + WCHAR name1Text[] = {'B','o','b',0}; + WCHAR name2Text[] = {'T','i','m',0}; + IWSDXMLContext *context; + WSDXML_NAMESPACE *ns2 = NULL; + WSDXML_NAME *name1 = NULL, *name2 = NULL; + HRESULT hr; + + hr = WSDXMLCreateContext(&context); + ok(hr == S_OK, "WSDXMLCreateContext failed with %08x\n", hr); + + /* Test calling AddNameToNamespace with invalid arguments */ + hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + /* Test calling AddNameToNamespace without the ppName parameter */ + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); + todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + + /* Now retrieve the created name */ + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); + todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(name1 != NULL, "name1 == NULL\n"); + + if (name1 != NULL) + { + ok(lstrcmpW(name1->LocalName, name1Text) == 0, "LocalName returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name1->LocalName)); + ok(name1->LocalName != name1Text, "LocalName has not been cloned\n"); + + ok(name1->Space != NULL, "Space returned by AddNameToNamespace is null\n"); + ok(lstrcmpW(name1->Space->Uri, ns1Uri) == 0, "URI returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name1->Space->Uri)); + ok(lstrcmpW(name1->Space->PreferredPrefix, unPrefix0) == 0, "PreferredPrefix returned by AddName is not as expected (%s)\n", wine_dbgstr_w(name1->Space->PreferredPrefix)); + ok(name1->Space->Names == NULL, "Names array is not empty\n"); + ok(name1->Space->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", name1->Space->NamesCount); + ok(name1->Space->Uri != ns1Uri, "URI has not been cloned\n"); + } + + /* Test calling AddNamespace with parameters that are too large */ + hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + /* Try creating a namespace explicitly */ + hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Now add a name to it */ + hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); + todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(name2 != NULL, "name2 == NULL\n"); + + if (name2 != NULL) + { + ok(lstrcmpW(name2->LocalName, name2Text) == 0, "LocalName returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name2->LocalName)); + ok(name2->LocalName != name2Text, "LocalName has not been cloned\n"); + + ok(name2->Space != NULL, "Space returned by AddNameToNamespace is null\n"); + ok(name2->Space != ns2, "Space returned by AddNameToNamespace is equal to the namespace returned by AddNamespace\n"); + ok(lstrcmpW(name2->Space->Uri, ns2Uri) == 0, "URI returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name2->Space->Uri)); + ok(lstrcmpW(name2->Space->PreferredPrefix, prefix2) == 0, "PreferredPrefix returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name2->Space->PreferredPrefix)); + ok(name2->Space->Names == NULL, "Names array is not empty\n"); + ok(name2->Space->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", name2->Space->NamesCount); + ok(name2->Space->Uri != ns2Uri, "URI has not been cloned\n"); + } + + WSDFreeLinkedMemory(name1); + WSDFreeLinkedMemory(name2); + WSDFreeLinkedMemory(ns2); + + /* Now re-retrieve ns2 */ + hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(ns2 != NULL, "ns2 == NULL\n"); + + if (ns2 != NULL) + { + ok(lstrcmpW(ns2->Uri, ns2Uri) == 0, "URI returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->Uri)); + + /* Apparently wsdapi always leaves the namespace names array as empty */ + ok(ns2->Names == NULL, "Names array is not empty\n"); + ok(ns2->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", ns2->NamesCount); + } + + IWSDXMLContext_Release(context); +} + START_TEST(xml) { /* Allocate a large text buffer for use in tests */ @@ -418,6 +523,7 @@ START_TEST(xml) AddSibling_tests(); XMLContext_AddNamespace_tests(); + XMLContext_AddNameToNamespace_tests(); HeapFree(GetProcessHeap(), 0, largeText); }

1 0

Austin English : api-ms-win-downlevel-ole32-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 17ec193b2e2d4e531770c7111ca297c8b0b6148e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ec193b2e2d4e531770c7111… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:21 2017 -0500 api-ms-win-downlevel-ole32-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-ole32-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec index 82ff0f1..14fee79 100644 --- a/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-ole32-l1-1-0/api-ms-win-downlevel-ole32-l1-1-0.spec @@ -20,8 +20,8 @@ @ stdcall CoImpersonateClient() ole32.CoImpersonateClient @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity -@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface @ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject @ stdcall CoRegisterInitializeSpy(ptr ptr) ole32.CoRegisterInitializeSpy @ stdcall CoRegisterMessageFilter(ptr ptr) ole32.CoRegisterMessageFilter

1 0

Austin English : api-ms-win-devices-config-l1-1-1: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 23730eb39e1e8b3234449b166f2c48bd17e0be43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23730eb39e1e8b3234449b166… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:19 2017 -0500 api-ms-win-devices-config-l1-1-1: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-1.spec | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index 09313bb..ab2a8a9 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -1,39 +1,39 @@ @ stub CM_Delete_Class_Key -@ stub CM_Delete_Device_Interface_KeyW @ stub CM_Delete_DevNode_Key +@ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode @ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child -@ stub CM_Get_Class_Property_Keys @ stub CM_Get_Class_PropertyW +@ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW +@ stub CM_Get_DevNode_PropertyW +@ stub CM_Get_DevNode_Property_Keys +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW @ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_ListW -@ stub CM_Get_Device_Interface_Property_KeysW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW -@ stub CM_Get_DevNode_Property_Keys -@ stub CM_Get_DevNode_PropertyW -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stub CM_Get_Device_Interface_Property_KeysW @ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent @ stub CM_Get_Sibling @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW -@ stub CM_Open_Device_Interface_KeyW @ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW @ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW -@ stub CM_Set_Device_Interface_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW +@ stub CM_Set_Device_Interface_PropertyW @ stub CM_Setup_DevNode @ stub CM_Uninstall_DevNode @ stub CM_Unregister_Notification

1 0

Austin English : api-ms-win-core-windowserrorreporting-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 97e9d2de44f581ff45da89a5e93dfcc7deaa4e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e9d2de44f581ff45da89a5e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:18 2017 -0500 api-ms-win-core-windowserrorreporting-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index e5b4a61..96511a7 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -1,10 +1,10 @@ @ stub GetApplicationRecoveryCallback @ stub GetApplicationRestartSettings -@ stub WerpNotifyLoadStringResource -@ stub WerpNotifyUseStringResource @ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile @ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock @ stub WerUnregisterRuntimeExceptionModule +@ stub WerpNotifyLoadStringResource +@ stub WerpNotifyUseStringResource

1 0

Austin English : api-ms-win-core-misc-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 9c647ce0d7c29741eec8dceef7b8e4141f161672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c647ce0d7c29741eec8dceef… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:14 2017 -0500 api-ms-win-core-misc-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-misc-l1-1-0.spec | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec index 0d45e0d..07d28bf 100644 --- a/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec +++ b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec @@ -13,18 +13,6 @@ @ stdcall LocalLock(long) kernel32.LocalLock @ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc @ stdcall LocalUnlock(long) kernel32.LocalUnlock -@ stdcall lstrcmpA(str str) kernel32.lstrcmpA -@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA -@ stdcall lstrcmpi(str str) kernel32.lstrcmpi -@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW -@ stdcall lstrcmp(str str) kernel32.lstrcmp -@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW -@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA -@ stdcall lstrcpyn(ptr str long) kernel32.lstrcpyn -@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW -@ stdcall lstrlenA(str) kernel32.lstrlenA -@ stdcall lstrlen(str) kernel32.lstrlen -@ stdcall lstrlenW(wstr) kernel32.lstrlenW @ stdcall NeedCurrentDirectoryForExePathA(str) kernel32.NeedCurrentDirectoryForExePathA @ stdcall NeedCurrentDirectoryForExePathW(wstr) kernel32.NeedCurrentDirectoryForExePathW @ stdcall PulseEvent(long) kernel32.PulseEvent @@ -32,3 +20,15 @@ @ stdcall Sleep(long) kernel32.Sleep @ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection @ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection +@ stdcall lstrcmp(str str) kernel32.lstrcmp +@ stdcall lstrcmpA(str str) kernel32.lstrcmpA +@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW +@ stdcall lstrcmpi(str str) kernel32.lstrcmpi +@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA +@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW +@ stdcall lstrcpyn(ptr str long) kernel32.lstrcpyn +@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA +@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW +@ stdcall lstrlen(str) kernel32.lstrlen +@ stdcall lstrlenA(str) kernel32.lstrlenA +@ stdcall lstrlenW(wstr) kernel32.lstrlenW

1 0

Austin English : api-ms-win-core-localization-private-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 34ce3be779f676ecc1e6a945ec15cb56ab377051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ce3be779f676ecc1e6a945e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:13 2017 -0500 api-ms-win-core-localization-private-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-private-l1-1-0.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec b/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec index b704db6..e445dc6 100644 --- a/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec @@ -1,6 +1,3 @@ -@ stub _AddMUIStringToCache -@ stub _GetMUIStringFromCache -@ stub _OpenMuiStringCache @ stub GetCPFileNameFromRegistry @ stub LoadStringByReference @ stub NlsCheckPolicy @@ -9,3 +6,6 @@ @ stub NlsUpdateLocale @ stub NlsUpdateSystemLocale @ stub NlsWriteEtwEvent +@ stub _AddMUIStringToCache +@ stub _GetMUIStringFromCache +@ stub _OpenMuiStringCache

1 0