January 2020 - Wine-Devel - list.winehq.org

[website] German translation for release 5.0-rc3
by Julian Rüger Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0-rc2
by Julian Rüger Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 5.0-rc1
by Julian Rüger Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH 3/3] winegcc: Use Wine crt when linking to msvcrt.
by Jacek Caban Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 1/4] ole32: Add support for non-default counter for anti moniker.
by Nikolay Sivov Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/antimoniker.c | 66 +++++++++++++++++++++++--------------- dlls/ole32/tests/moniker.c | 10 ------ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index f7912fad78..bff6500fa5 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -40,6 +40,7 @@ typedef struct AntiMonikerImpl{ IROTData IROTData_iface; LONG ref; IUnknown *pMarshal; /* custom marshaler */ + DWORD count; } AntiMonikerImpl; static inline AntiMonikerImpl *impl_from_IMoniker(IMoniker *iface) @@ -168,30 +169,35 @@ AntiMonikerImpl_IsDirty(IMoniker* iface) /****************************************************************************** * AntiMoniker_Load ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Load(IMoniker* iface,IStream* pStm) +static HRESULT WINAPI AntiMonikerImpl_Load(IMoniker *iface, IStream *stream) { - DWORD constant=1,dwbuffer; - HRESULT res; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + DWORD count = 0; + HRESULT hr; + + TRACE("%p, %p.\n", iface, stream); - /* data read by this function is only a DWORD constant (must be 1) ! */ - res=IStream_Read(pStm,&dwbuffer,sizeof(DWORD),NULL); + if (FAILED(hr = IStream_Read(stream, &count, sizeof(count), NULL))) + return hr; + + if (count > 0xfffff) + return E_INVALIDARG; - if (SUCCEEDED(res)&& dwbuffer!=constant) - return E_FAIL; + moniker->count = count; - return res; + return S_OK; } /****************************************************************************** * AntiMoniker_Save ******************************************************************************/ -static HRESULT WINAPI -AntiMonikerImpl_Save(IMoniker* iface,IStream* pStm,BOOL fClearDirty) +static HRESULT WINAPI AntiMonikerImpl_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { - static const DWORD constant = 1; - /* data written by this function is only a DWORD constant set to 1 ! */ - return IStream_Write(pStm,&constant,sizeof(constant),NULL); + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p, %d.\n", iface, stream, clear_dirty); + + return IStream_Write(stream, &moniker->count, sizeof(moniker->count), NULL); } /****************************************************************************** @@ -323,12 +329,16 @@ AntiMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) /****************************************************************************** * AntiMoniker_Hash ******************************************************************************/ -static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) +static HRESULT WINAPI AntiMonikerImpl_Hash(IMoniker *iface, DWORD *hash) { - if (pdwHash==NULL) + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p.\n", iface, hash); + + if (!hash) return E_POINTER; - *pdwHash = 0x80000001; + *hash = 0x80000000 | moniker->count; return S_OK; } @@ -434,14 +444,16 @@ AntiMonikerImpl_RelativePathTo(IMoniker* iface,IMoniker* pmOther, IMoniker** ppm * AntiMoniker_GetDisplayName ******************************************************************************/ static HRESULT WINAPI -AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, - IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) +AntiMonikerImpl_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *displayname) { - static const WCHAR back[]={'\\','.','.',0}; + AntiMonikerImpl *moniker = impl_from_IMoniker(iface); + static const WCHAR nameW[] = {'\\','.','.'}; + WCHAR *ptrW; + int i; - TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, displayname); - if (ppszDisplayName==NULL) + if (!displayname) return E_POINTER; if (pmkToLeft!=NULL){ @@ -449,12 +461,13 @@ AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, return E_NOTIMPL; } - *ppszDisplayName=CoTaskMemAlloc(sizeof(back)); - - if (*ppszDisplayName==NULL) + *displayname = ptrW = CoTaskMemAlloc((moniker->count * ARRAY_SIZE(nameW) + 1) * sizeof(WCHAR)); + if (!*displayname) return E_OUTOFMEMORY; - lstrcpyW(*ppszDisplayName,back); + for (i = 0; i < moniker->count; ++i) + memcpy(ptrW + i * ARRAY_SIZE(nameW), nameW, sizeof(nameW)); + ptrW[moniker->count * ARRAY_SIZE(nameW)] = 0; return S_OK; } @@ -598,6 +611,7 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; This->ref = 0; This->pMarshal = NULL; + This->count = 1; return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e0e3020234..dff6cbbe57 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2328,7 +2328,6 @@ todo_wine stream_write_dword(stream, 2); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); @@ -2341,13 +2340,11 @@ todo_wine hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000002, "Unexpected hash value %#x.\n", hash); /* Display name reflects anti combination. */ hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L"\\..\\.."), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); @@ -2355,30 +2352,25 @@ todo_wine stream_write_dword(stream, 0xfffff); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); stream_write_dword(stream, 0xfffff + 1); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x800fffff, "Unexpected hash value %#x.\n", hash); /* Zero combining counter is also valid. */ stream_write_dword(stream, 0); hr = IMoniker_Load(moniker, stream); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, moniker2); @@ -2391,12 +2383,10 @@ todo_wine hr = IMoniker_Hash(moniker, &hash); ok(hr == S_OK, "Failed to get hash value, hr %#x.\n", hr); -todo_wine ok(hash == 0x80000000, "Unexpected hash value %#x.\n", hash); hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &name); ok(hr == S_OK, "Failed to get display name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(name, L""), "Unexpected display name %s.\n", wine_dbgstr_w(name)); CoTaskMemFree(name); -- 2.24.1

1 3

[PATCH] testbot/LogUtils: Return the ParseWineTestReport() results as a single object.
by Francois Gouget Jan. 24, 2020

Jan. 24, 2020

Rename the variable holding it to $LogInfo for consistency with the other functions as it plays the same role and may eventually carry the same information. Store the extra errors in the $LogInfo->{Extra} field and rename _AddError() to _AddExtra() to match and avoid confusion with _AddLogError(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/UpdateTaskLogs | 10 +-- testbot/bin/WineRunTask.pl | 18 ++-- testbot/bin/WineRunWineTest.pl | 18 ++-- testbot/lib/WineTestBot/LogUtils.pm | 125 ++++++++++++++++------------ 4 files changed, 95 insertions(+), 76 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index ca9bf44a37..00a6f23223 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -190,19 +190,19 @@ sub BuildErrFile($$$$) my $TaskKey = Path2TaskKey($Dir); - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); - if (!defined $LogFailures and @$LogErrors == 1) + my $LogInfo = ParseWineTestReport("$Dir/$ReportName", $IsWineTest, $TaskTimedOut); + if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) { - return "$TaskKey: $LogErrors->[0]"; + return "$TaskKey: $LogInfo->{Extra}->[0]"; } - return undef if (!@$LogErrors); + return undef if (!@{$LogInfo->{Extra}}); Debug("$TaskKey: Creating $ReportName.err\n"); if (open(my $Log, ">", "$Dir/$ReportName.err")) { # Save the extra errors detected by ParseWineTestReport() in # $ReportName.err (see WineRunWineTest.pl). - print $Log "$_\n" for (@$LogErrors); + print $Log "$_\n" for (@{$LogInfo->{Extra}}); close($Log); return undef; } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 62bd162eed..3044cd76bd 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -556,24 +556,24 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); - $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); - if (!defined $LogFailures and @$LogErrors == 1) + my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $IsWineTest, $TaskTimedOut); + $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); + if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogErrors->[0]\n"; - LogTaskError("$LogErrors->[0]\n"); + Error "$LogInfo->{Extra}->[0]\n"; + LogTaskError("$LogInfo->{Extra}->[0]\n"); } else { - # $LogFailures can legitimately be undefined in case of a timeout - $TaskFailures += $LogFailures || 0; - if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) + # $LogInfo->{Failures} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{Failures} || 0; + if (@{$LogInfo->{Extra}} and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { # Save the extra errors detected by ParseWineTestReport() in # $RptFileName.err (see WineRunWineTest.pl). - print $Log "$_\n" for (@$LogErrors); + print $Log "$_\n" for (@{$LogInfo->{Extra}}); close($Log); } } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index fecbab0098..950661b70c 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -578,20 +578,20 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) { chmod 0664, "$TaskDir/$RptFileName"; - my ($TestUnitCount, $TimeoutCount, $LogFailures, $LogErrors) = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); - $TaskTimedOut = 1 if ($TestUnitCount == $TimeoutCount); - if (!defined $LogFailures and @$LogErrors == 1) + my $LogInfo = ParseWineTestReport("$TaskDir/$RptFileName", $Step->FileType eq "patch", $TaskTimedOut); + $TaskTimedOut = 1 if ($LogInfo->{TestUnitCount} == $LogInfo->{TimeoutCount}); + if (!defined $LogInfo->{Failures} and @{$LogInfo->{Extra}} == 1) { # Could not open the file $NewStatus = 'boterror'; - Error "$LogErrors->[0]\n"; - LogTaskError("$LogErrors->[0]\n"); + Error "$LogInfo->{Extra}->[0]\n"; + LogTaskError("$LogInfo->{Extra}->[0]\n"); } else { - # $LogFailures can legitimately be undefined in case of a timeout - $TaskFailures += $LogFailures || 0; - if (@$LogErrors and open(my $Log, ">", "$TaskDir/$RptFileName.err")) + # $LogInfo->{Failures} can legitimately be undefined in case of a timeout + $TaskFailures += $LogInfo->{Failures} || 0; + if (@{$LogInfo->{Extra}} and open(my $Log, ">", "$TaskDir/$RptFileName.err")) { # Save the extra errors detected by ParseWineTestReport() in # $RptFileName.err: @@ -600,7 +600,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) # if there are multiple .report files in the directory. # - The .err file can be moved to the latest directory next to the # reference report. - print $Log "$_\n" for (@$LogErrors); + print $Log "$_\n" for (@{$LogInfo->{Extra}}); close($Log); } } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 8cd3ae1178..d05a811d5c 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -232,56 +232,56 @@ sub _NewCurrentUnit($$) }; } -sub _AddError($$;$) +sub _AddExtra($$;$) { - my ($Parser, $Error, $Cur) = @_; + my ($LogInfo, $Error, $Cur) = @_; $Error = "$Cur->{Dll}:$Cur->{Unit} $Error" if (defined $Cur); - push @{$Parser->{Errors}}, $Error; - $Parser->{Failures}++; + push @{$LogInfo->{Extra}}, $Error; + $LogInfo->{Failures}++; } sub _CheckUnit($$$$) { - my ($Parser, $Cur, $Unit, $Type) = @_; + my ($LogInfo, $Cur, $Unit, $Type) = @_; if ($Cur->{Units}->{$Unit} or $Cur->{Unit} eq "") { - $Parser->{IsWineTest} = 1; + $LogInfo->{IsWineTest} = 1; } # To avoid issuing many duplicate errors, # only report the first misplaced message. - elsif ($Parser->{IsWineTest} and !$Cur->{IsBroken}) + elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) { - _AddError($Parser, "contains a misplaced $Type message for $Unit", $Cur); + _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); $Cur->{IsBroken} = 1; } } sub _CheckSummaryCounter($$$$) { - my ($Parser, $Cur, $Field, $Type) = @_; + my ($LogInfo, $Cur, $Field, $Type) = @_; if ($Cur->{"Line$Field"} != 0 and $Cur->{"Summary$Field"} == 0) { - _AddError($Parser, "has unaccounted for $Type messages", $Cur); + _AddExtra($LogInfo, "has unaccounted for $Type messages", $Cur); } elsif ($Cur->{"Line$Field"} == 0 and $Cur->{"Summary$Field"} != 0) { - _AddError($Parser, "is missing some $Type messages", $Cur); + _AddExtra($LogInfo, "is missing some $Type messages", $Cur); } } sub _CloseTestUnit($$$) { - my ($Parser, $Cur, $Last) = @_; + my ($LogInfo, $Cur, $Last) = @_; # Verify the summary lines if (!$Cur->{IsBroken}) { - _CheckSummaryCounter($Parser, $Cur, "Failures", "failure"); - _CheckSummaryCounter($Parser, $Cur, "Todos", "todo"); - _CheckSummaryCounter($Parser, $Cur, "Skips", "skip"); + _CheckSummaryCounter($LogInfo, $Cur, "Failures", "failure"); + _CheckSummaryCounter($LogInfo, $Cur, "Todos", "todo"); + _CheckSummaryCounter($LogInfo, $Cur, "Skips", "skip"); } # Note that the summary lines may count some failures twice @@ -290,7 +290,7 @@ sub _CloseTestUnit($$$) if ($Cur->{UnitSize} > $MaxUnitSize) { - _AddError($Parser, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); + _AddExtra($LogInfo, "prints too much data ($Cur->{UnitSize} bytes)", $Cur); } if (!$Cur->{IsBroken} and defined $Cur->{Rc}) { @@ -298,31 +298,31 @@ sub _CloseTestUnit($$$) # after the 'done' line (e.g. by subprocesses). if ($Cur->{LineFailures} != 0 and $Cur->{Rc} == 0) { - _AddError($Parser, "returned success despite having failures", $Cur); + _AddExtra($LogInfo, "returned success despite having failures", $Cur); } - elsif (!$Parser->{IsWineTest} and $Cur->{Rc} != 0) + elsif (!$LogInfo->{IsWineTest} and $Cur->{Rc} != 0) { - _AddError($Parser, "The test returned a non-zero exit code"); + _AddExtra($LogInfo, "The test returned a non-zero exit code"); } - elsif ($Parser->{IsWineTest} and $Cur->{LineFailures} == 0 and $Cur->{Rc} != 0) + elsif ($LogInfo->{IsWineTest} and $Cur->{LineFailures} == 0 and $Cur->{Rc} != 0) { - _AddError($Parser, "returned a non-zero exit code despite reporting no failures", $Cur); + _AddExtra($LogInfo, "returned a non-zero exit code despite reporting no failures", $Cur); } } # For executables TestLauncher's done line may not be recognizable. - elsif ($Parser->{IsWineTest} and !defined $Cur->{Rc}) + elsif ($LogInfo->{IsWineTest} and !defined $Cur->{Rc}) { if (!$Last) { - _AddError($Parser, "has no done line (or it is garbled)", $Cur); + _AddExtra($LogInfo, "has no done line (or it is garbled)", $Cur); } - elsif ($Last and !$Parser->{TaskTimedOut}) + elsif ($Last and !$LogInfo->{TaskTimedOut}) { - _AddError($Parser, "The report seems to have been truncated"); + _AddExtra($LogInfo, "The report seems to have been truncated"); } } - $Parser->{Failures} += $Cur->{LineFailures}; + $LogInfo->{Failures} += $Cur->{LineFailures}; } =pod @@ -330,9 +330,29 @@ sub _CloseTestUnit($$$) =item C<ParseWineTestReport()> -Parses a Wine test report and returns the number of failures and extra errors, -a list of extra errors, and whether the test timed out. +Returns a hashtable containing a summary of the WineTest report: +=over + +=item IsWineTest +True if this is a regular Wine test report, false if this is some other Windows +binary. + +=item TaskTimedOut +True if the overall task timed out waiting for the test to complete. + +=item TestUnitCount +The number of test units. + +=item TimeoutCount +The number of test units that timed out. +=item Failures +The number of failed tests. + +=item Extra +An array containing the extra errors detected during the inconsistency check. + +=back =back =cut @@ -343,18 +363,18 @@ sub ParseWineTestReport($$$) my $LogFile; if (!open($LogFile, "<", $FileName)) { - my $BaseName = basename($FileName); - return (undef, undef, undef, ["Unable to open '$BaseName' for reading: $!"]); + my $LogName = basename($FileName); + return {Extra => ["Unable to open '$LogName' for reading: $!"]}; } - my $Parser = { + my $LogInfo = { IsWineTest => $IsWineTest, TaskTimedOut => $TaskTimedOut, TestUnitCount => 0, TimeoutCount => 0, Failures => undef, - Errors => [], + Extra => [], }; my $Cur = _NewCurrentUnit("", ""); @@ -366,9 +386,9 @@ sub ParseWineTestReport($$$) my ($Dll, $Unit, $Type) = ($1, $2, $3); # Close the previous test unit - _CloseTestUnit($Parser, $Cur, 0) if ($Cur->{Dll} ne ""); + _CloseTestUnit($LogInfo, $Cur, 0) if ($Cur->{Dll} ne ""); $Cur = _NewCurrentUnit($Dll, $Unit); - $Parser->{TestUnitCount}++; + $LogInfo->{TestUnitCount}++; # Recognize skipped messages in case we need to skip tests in the VMs $Cur->{Rc} = 0 if ($Type eq "skipped"); @@ -383,21 +403,21 @@ sub ParseWineTestReport($$$) } else { - _AddError($Parser, "Misplaced $SubUnit subtest\n"); + _AddExtra($LogInfo, "Misplaced $SubUnit subtest\n"); } } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or $Line =~ /^([_a-z0-9]+)\.c:\d+: Test (?:failed|succeeded inside todo block): /) { - _CheckUnit($Parser, $Cur, $1, "failure"); + _CheckUnit($LogInfo, $Cur, $1, "failure"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test marked todo: /) or $Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: /) { - _CheckUnit($Parser, $Cur, $1, "todo"); + _CheckUnit($LogInfo, $Cur, $1, "todo"); $Cur->{LineTodos}++; } elsif (($Cur->{Unit} ne "" and @@ -417,7 +437,7 @@ sub ParseWineTestReport($$$) # This also replaces a test summary line. $Cur->{Pids}->{0} = 1; $Cur->{SummaryFailures}++; - $Parser->{IsWineTest} = 1; + $LogInfo->{IsWineTest} = 1; $Cur->{LineFailures}++; } @@ -433,7 +453,7 @@ sub ParseWineTestReport($$$) $Cur->{Pids}->{$Pid || 0} = 1; $Cur->{SummaryFailures}++; } - _CheckUnit($Parser, $Cur, $Unit, "unhandled exception"); + _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } elsif (($Cur->{Unit} ne "" and @@ -451,11 +471,11 @@ sub ParseWineTestReport($$$) $Cur->{SummaryFailures} += $Failures; $Cur->{SummaryTodos} += $Todos; $Cur->{SummarySkips} += $Skips; - $Parser->{IsWineTest} = 1; + $LogInfo->{IsWineTest} = 1; } else { - _CheckUnit($Parser, $Cur, $Unit, "test summary") if ($Todos or $Failures); + _CheckUnit($LogInfo, $Cur, $Unit, "test summary") if ($Todos or $Failures); } } elsif (($Cur->{Dll} ne "" and @@ -464,17 +484,17 @@ sub ParseWineTestReport($$$) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); - if ($Parser->{IsWineTest} and ($Dll ne $Cur->{Dll} or $Unit ne $Cur->{Unit})) + if ($LogInfo->{IsWineTest} and ($Dll ne $Cur->{Dll} or $Unit ne $Cur->{Unit})) { # First close the current test unit taking into account # it may have been polluted by the new one. $Cur->{IsBroken} = 1; - _CloseTestUnit($Parser, $Cur, 0); + _CloseTestUnit($LogInfo, $Cur, 0); # Then switch to the new one, warning it's missing a start line, # and that its results may be inconsistent. ($Cur->{Dll}, $Cur->{Unit}) = ($Dll, $Unit); - _AddError($Parser, "had no start line (or it is garbled)", $Cur); + _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); $Cur->{IsBroken} = 1; } @@ -482,9 +502,9 @@ sub ParseWineTestReport($$$) { # The done line will already be shown as a timeout (see JobDetails) # so record the failure but don't add an error message. - $Parser->{Failures}++; + $LogInfo->{Failures}++; $Cur->{IsBroken} = 1; - $Parser->{TimeoutCount}++; + $LogInfo->{TimeoutCount}++; } elsif ((!$Pid and !%{$Cur->{Pids}}) or ($Pid and !$Cur->{Pids}->{$Pid} and !$Cur->{Pids}->{0})) @@ -492,12 +512,12 @@ sub ParseWineTestReport($$$) # The main summary line is missing if ($Rc & 0xc0000000) { - _AddError($Parser, sprintf("%s:%s crashed (%08x)", $Dll, $Unit, $Rc & 0xffffffff)); + _AddExtra($LogInfo, sprintf("%s:%s crashed (%08x)", $Dll, $Unit, $Rc & 0xffffffff)); $Cur->{IsBroken} = 1; } - elsif ($Parser->{IsWineTest} and !$Cur->{IsBroken}) + elsif ($LogInfo->{IsWineTest} and !$Cur->{IsBroken}) { - _AddError($Parser, "$Dll:$Unit has no test summary line (early exit of the main process?)"); + _AddExtra($LogInfo, "$Dll:$Unit has no test summary line (early exit of the main process?)"); } } elsif ($Rc & 0xc0000000) @@ -511,12 +531,11 @@ sub ParseWineTestReport($$$) $Cur->{Rc} = $Rc; } } - $Cur->{IsBroken} = 1 if ($Parser->{TaskTimedOut}); - _CloseTestUnit($Parser, $Cur, 1); + $Cur->{IsBroken} = 1 if ($LogInfo->{TaskTimedOut}); + _CloseTestUnit($LogInfo, $Cur, 1); close($LogFile); - return ($Parser->{TestUnitCount}, $Parser->{TimeoutCount}, - $Parser->{Failures}, $Parser->{Errors}); + return $LogInfo; } -- 2.20.1

1 0

[PATCH 1/5] dwrite: Implement GetFaceNames() for fontfaces.
by Nikolay Sivov Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 4 ++- dlls/dwrite/font.c | 57 ++++++++++++++++++++---------------- dlls/dwrite/main.c | 2 +- dlls/dwrite/tests/font.c | 30 ++++++++++++++++++- 4 files changed, 65 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cf3f13b1c6..58b5e9a0e0 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -231,6 +231,8 @@ struct dwrite_fontface FONTSIGNATURE fontsig; UINT32 glyph_image_formats; + IDWriteLocalizedStrings *names; + struct scriptshaping_cache *shaping_cache; LOGFONTW lf; @@ -245,7 +247,7 @@ extern HRESULT create_trimmingsign(IDWriteFactory7 *factory, IDWriteTextFormat * extern HRESULT create_typography(IDWriteTypography**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; -extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; +extern HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection1 **collection) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4e08b2f632..df1bc5adcb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -539,6 +539,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) if (fontface->stream) IDWriteFontFileStream_Release(fontface->stream); heap_free(fontface->files); + if (fontface->names) + IDWriteLocalizedStrings_Release(fontface->names); for (i = 0; i < ARRAY_SIZE(fontface->glyphs); i++) heap_free(fontface->glyphs[i]); @@ -1259,9 +1261,11 @@ static HRESULT WINAPI dwritefontface3_GetFamilyNames(IDWriteFontFace5 *iface, ID static HRESULT WINAPI dwritefontface3_GetFaceNames(IDWriteFontFace5 *iface, IDWriteLocalizedStrings **names) { - FIXME("%p, %p: stub\n", iface, names); + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, names); + + return clone_localizedstrings(fontface->names, names); } static HRESULT WINAPI dwritefontface3_GetInformationalStrings(IDWriteFontFace5 *iface, @@ -1616,9 +1620,11 @@ static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont3 *iface) static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont3 *iface, IDWriteLocalizedStrings **names) { - struct dwrite_font *This = impl_from_IDWriteFont3(iface); - TRACE("(%p)->(%p)\n", This, names); - return clone_localizedstring(This->data->names, names); + struct dwrite_font *font = impl_from_IDWriteFont3(iface); + + TRACE("%p, %p.\n", iface, names); + + return clone_localizedstrings(font->data->names, names); } static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, @@ -1663,7 +1669,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont3 *iface, IDWriteFontFace5_Release(fontface); } - hr = clone_localizedstring(data->info_strings[stringid], strings); + hr = clone_localizedstrings(data->info_strings[stringid], strings); if (FAILED(hr)) return hr; @@ -2166,7 +2172,10 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily2 *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily2 *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); - return clone_localizedstring(family->data->familyname, names); + + TRACE("%p, %p.\n", iface, names); + + return clone_localizedstrings(family->data->familyname, names); } static BOOL is_better_font_match(const struct dwrite_font_propvec *next, const struct dwrite_font_propvec *cur, @@ -4614,6 +4623,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_list, IDWriteFontFace5 **ret) { struct file_stream_desc stream_desc; + struct dwrite_font_data *font_data; struct dwrite_fontface *fontface; HRESULT hr; int i; @@ -4678,38 +4688,35 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li */ if (desc->font_data) { - fontface->weight = desc->font_data->weight; - fontface->style = desc->font_data->style; - fontface->stretch = desc->font_data->stretch; - fontface->panose = desc->font_data->panose; - fontface->fontsig = desc->font_data->fontsig; - fontface->lf = desc->font_data->lf; - fontface->flags |= desc->font_data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); + font_data = desc->font_data; + addref_font_data(font_data); } else { IDWriteLocalizedStrings *names; - struct dwrite_font_data *data; - hr = init_font_data(desc, &names, &data); + hr = init_font_data(desc, &names, &font_data); if (FAILED(hr)) { IDWriteFontFace5_Release(&fontface->IDWriteFontFace5_iface); return hr; } - fontface->weight = data->weight; - fontface->style = data->style; - fontface->stretch = data->stretch; - fontface->panose = data->panose; - fontface->fontsig = data->fontsig; - fontface->lf = data->lf; - fontface->flags |= data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); - IDWriteLocalizedStrings_Release(names); - release_font_data(data); } + fontface->weight = font_data->weight; + fontface->style = font_data->style; + fontface->stretch = font_data->stretch; + fontface->panose = font_data->panose; + fontface->fontsig = font_data->fontsig; + fontface->lf = font_data->lf; + fontface->flags |= font_data->flags & (FONT_IS_SYMBOL | FONT_IS_MONOSPACED | FONT_IS_COLORED); + fontface->names = font_data->names; + if (fontface->names) + IDWriteLocalizedStrings_AddRef(fontface->names); + release_font_data(font_data); + fontface->cached = factory_cache_fontface(fontface->factory, cached_list, &fontface->IDWriteFontFace5_iface); *ret = &fontface->IDWriteFontFace5_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 317a6cedaf..283cccb76c 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -468,7 +468,7 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, return S_OK; } -HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) +HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **ret) { struct localizedstrings *strings, *strings_clone; size_t i; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ac70a4c137..6a2acd7cd8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4410,8 +4410,10 @@ static void test_GetFaceNames(void) static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; static const WCHAR enus2W[] = {'e','n','-','U','s',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; - IDWriteLocalizedStrings *strings, *strings2; + IDWriteLocalizedStrings *strings, *strings2, *strings3; + IDWriteFontFace3 *fontface3; IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; IDWriteFactory *factory; UINT32 count, index; IDWriteFont *font; @@ -4470,6 +4472,32 @@ static void test_GetFaceNames(void) ok(!lstrcmpW(buffW, obliqueW), "got %s\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create a font face, hr %#x.\n", hr); + + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace3, (void **)&fontface3))) + { + hr = IDWriteFontFace3_GetFaceNames(fontface3, &strings2); + ok(hr == S_OK, "Failed to get face names, hr %#x.\n", hr); + + hr = IDWriteFontFace3_GetFaceNames(fontface3, &strings3); + ok(hr == S_OK, "Failed to get face names, hr %#x.\n", hr); + ok(strings2 != strings3, "Unexpected instance.\n"); + IDWriteLocalizedStrings_Release(strings3); + + buffW[0] = 0; + hr = IDWriteLocalizedStrings_GetString(strings2, 0, buffW, ARRAY_SIZE(buffW)); + ok(hr == S_OK, "Failed to get a string, hr %#x.\n", hr); + ok(!lstrcmpW(buffW, obliqueW), "Unexpected name %s.\n", wine_dbgstr_w(buffW)); + IDWriteLocalizedStrings_Release(strings2); + + IDWriteFontFace3_Release(fontface3); + } + else + win_skip("GetFaceNames() is not supported.\n"); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); IDWriteGdiInterop_Release(interop); ref = IDWriteFactory_Release(factory); -- 2.24.1

1 4

[PATCH 1/5] winegstreamer: Rename the "ppPins" element of struct gstdemux to "sources".
by Zebediah Figura Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 7ae70d0a736..88310668540 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -57,7 +57,8 @@ struct gstdemux struct strmbase_sink sink; IAsyncReader *reader; IMemAllocator *alloc; - struct gstdemux_source **ppPins; + + struct gstdemux_source **sources; LONG cStreams; LONGLONG filesize; @@ -842,7 +843,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) TRACE("%p %p %p\n", This, bin, pad); for (x = 0; x < This->cStreams; ++x) { - if (This->ppPins[x]->their_src == pad) + if (This->sources[x]->their_src == pad) break; } if (x == This->cStreams) @@ -853,7 +854,7 @@ static void removed_decoded_pad(GstElement *bin, GstPad *pad, gpointer user) return; } - pin = This->ppPins[x]; + pin = This->sources[x]; if(pin->flipfilter) gst_pad_unlink(pin->their_src, pin->flip_sink); @@ -994,7 +995,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) } for (x = 0; x < This->cStreams; ++x) { - struct gstdemux_source *pin = This->ppPins[x]; + struct gstdemux_source *pin = This->sources[x]; if (!pin->their_src) { gst_segment_init(pin->segment, GST_FORMAT_TIME); @@ -1215,7 +1216,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig if (!index) return &filter->sink.pin; else if (index <= filter->cStreams) - return &filter->ppPins[index - 1]->pin.pin; + return &filter->sources[index - 1]->pin.pin; return NULL; } @@ -1280,7 +1281,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) for (i = 0; i < filter->cStreams; ++i) { - if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->ppPins[i]->pin))) + if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin))) hr = pin_hr; } return hr; @@ -1496,10 +1497,10 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; @@ -1947,9 +1948,9 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * struct gstdemux_source *pin, **new_array; char pad_name[19]; - if (!(new_array = heap_realloc(filter->ppPins, (filter->cStreams + 1) * sizeof(*new_array)))) + if (!(new_array = heap_realloc(filter->sources, (filter->cStreams + 1) * sizeof(*new_array)))) return NULL; - filter->ppPins = new_array; + filter->sources = new_array; if (!(pin = heap_alloc_zero(sizeof(*pin)))) return NULL; @@ -1970,7 +1971,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * gst_pad_set_event_function(pin->my_sink, event_sink_wrapper); gst_pad_set_query_function(pin->my_sink, query_sink_wrapper); - filter->ppPins[filter->cStreams++] = pin; + filter->sources[filter->cStreams++] = pin; return pin; } @@ -1990,11 +1991,11 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) This->my_src = This->their_sink = NULL; for (i = 0; i < This->cStreams; ++i) - free_source_pin(This->ppPins[i]); + free_source_pin(This->sources[i]); This->cStreams = 0; - heap_free(This->ppPins); - This->ppPins = NULL; + heap_free(This->sources); + This->sources = NULL; gst_element_set_bus(This->container, NULL); gst_object_unref(This->container); This->container = NULL; @@ -2317,10 +2318,10 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); for (i = 0; i < filter->cStreams; ++i) { - struct gstdemux_source *pin = filter->ppPins[i]; + struct gstdemux_source *pin = filter->sources[i]; const HANDLE events[2] = {pin->caps_event, filter->error_event}; pin->seek.llDuration = pin->seek.llStop = duration / 100; -- 2.25.0

2 5

[PATCH 2/2] comctl32: For multiselect monthcal control send MCN_SELCHANGE notification on WM_LBUTTONDOWN event.
by Dmitry Timoshkov Jan. 24, 2020

Jan. 24, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/monthcal.c | 3 ++- dlls/comctl32/tests/monthcal.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 244bfcee69..1de13dab36 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2258,7 +2258,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_SetSelRange(infoPtr, st); infoPtr->status = MC_SEL_LBUTDOWN; - MONTHCAL_SetDayFocus(infoPtr, &ht.st); + if (MONTHCAL_SetDayFocus(infoPtr, &ht.st) && (infoPtr->dwStyle & MCS_MULTISELECT)) + MONTHCAL_NotifySelectionChange(infoPtr); return 0; } } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 974787ac36..ae528a0ddb 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -2042,7 +2042,6 @@ static void test_sel_notify(void) got_MCN_SELECT = got_MCN_SELCHANGE = FALSE; SendMessageA(hwnd, WM_LBUTTONDOWN, 0, MAKELPARAM(mchit.pt.x, mchit.pt.y)); if (styles[i].val & MCS_MULTISELECT) -todo_wine ok(got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should be sent\n", i); else ok(!got_MCN_SELCHANGE, "%d: MCN_SELCHANGE should not be sent\n", i); -- 2.20.1

1 0

[PATCH v4] include: Add xact3wb.h
by Alistair Leslie-Hughes Jan. 23, 2020

Jan. 23, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/xact3wb.h | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 include/xact3wb.h diff --git a/include/Makefile.in b/include/Makefile.in index 8284d6fdf3..b1e7d0084f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -772,6 +772,7 @@ SOURCES = \ wtypes.idl \ wuapi.idl \ x3daudio.h \ + xact3wb.h \ xapo.idl \ xapofx.h \ xaudio2.idl \ diff --git a/include/xact3wb.h b/include/xact3wb.h new file mode 100644 index 0000000000..d283efc112 --- /dev/null +++ b/include/xact3wb.h @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2020 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __XACT3WB_H__ +#define __XACT3WB_H__ + +typedef union WAVEBANKMINIWAVEFORMAT +{ + struct + { + DWORD wFormatTag : 2; + DWORD nChannels : 3; + DWORD nSamplesPerSec : 18; + DWORD wBlockAlign : 8; + DWORD wBitsPerSample : 1; + } DUMMYSTRUCTNAME; + + DWORD dwValue; +} WAVEBANKMINIWAVEFORMAT; + +typedef struct WAVEBANKREGION +{ + DWORD dwOffset; + DWORD dwLength; +} WAVEBANKREGION; + +typedef struct WAVEBANKSAMPLEREGION +{ + DWORD dwStartSample; + DWORD dwTotalSamples; +} WAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKENTRY +{ + union + { + struct + { + DWORD dwFlags : 4; + DWORD Duration : 28; + } DUMMYSTRUCTNAME; + DWORD dwFlagsAndDuration; + } DUMMYUNIONNAME; + + WAVEBANKMINIWAVEFORMAT Format; + WAVEBANKREGION PlayRegion; + WAVEBANKSAMPLEREGION LoopRegion; +} WAVEBANKENTRY; + +#endif /* __XACT3WB_H__ */ -- 2.17.1

1 0