January 2021 - Wine-commits

Zebediah Figura : winegstreamer: Do not call gst_pad_event_default().
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 6fdfacb5bf4e9b2c9f918b957d3da9f903514b25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fdfacb5bf4e9b2c9f918b95… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:57:18 2021 -0600 winegstreamer: Do not call gst_pad_event_default(). This matches the behaviour of GstBaseSrc and GstBaseSink. In particular, we now return FALSE for unhandled source events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f45036ae946..a10be5c6e2f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -645,11 +645,13 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) IAsyncReader_EndFlush(This->reader); LeaveCriticalSection(&This->filter.csFilter); break; - default: - WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: - return gst_pad_event_default(pad, parent, event); + break; + default: + WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); + ret = FALSE; + break; } gst_event_unref(event); return ret; @@ -729,7 +731,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); - return gst_pad_event_default(pad, parent, event); } gst_event_unref(event); return TRUE;

1 0

Zebediah Figura : strmbase: Rename csFilter to filter_cs.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: wine Branch: master Commit: 690afb42f66fcdc4778e706ef007caaadc41a05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=690afb42f66fcdc4778e706e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 18 21:57:19 2021 -0600 strmbase: Rename csFilter to filter_cs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 8 ++--- dlls/qasf/dmowrapper.c | 4 +-- dlls/qcap/filewriter.c | 4 +-- dlls/qcap/smartteefilter.c | 16 ++++----- dlls/qcap/vfwcapture.c | 4 +-- dlls/qedit/samplegrabber.c | 12 +++---- dlls/quartz/vmr9.c | 74 +++++++++++++++++++++--------------------- dlls/strmbase/filter.c | 40 +++++++++++------------ dlls/strmbase/pin.c | 52 ++++++++++++++--------------- dlls/winegstreamer/gstdemux.c | 12 +++---- include/wine/strmbase.h | 2 +- 11 files changed, 114 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=690afb42f66fcdc4778e…

1 0

Francois Gouget : testbot/LogUtils: Move the .errors format documentation to LoadLogErrors().
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: tools Branch: master Commit: e6a493fa40dc999ba64e8f64e7a412ef91497dbb URL: https://source.winehq.org/git/tools.git/?a=commit;h=e6a493fa40dc999ba64e8f6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 19 18:55:51 2021 +0100 testbot/LogUtils: Move the .errors format documentation to LoadLogErrors(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 60 ++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 77837fb..1e7dcda 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -822,6 +822,7 @@ sub GetLogLabel($) return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } + # # Log errors caching [Part 1] # @@ -833,10 +834,36 @@ sub GetLogLabel($) Loads the specified log errors file. -See _WriteLogErrors() for the format of the errors file. - Returns the errors in the same format as TagNewErrors(). +All lines are of the following form: + <type> <value1> <value2> + +The values depend on the <type> of the line. <type> and <value1> must not +contain spaces while <value2> runs to the end of the line. +More specifically the line formats are: +=over + +=item p <name> <value> +Property lines contain (name, value) pairs. +Note that properties which can be calculated while reading the errors file +are not saved (e.g. ErrCount and NewCount). + +=item g <lineno> <groupname> +Group lines contain the group name and the line number of the first line of +the group in the log. Note that the first line would typically not be an +error line. +A group line should be followed by the old and new error lines in this group. + +=item o <lineno> <line> +Old error lines contain the line number of the error in the log and a verbatim +copy of that line (with CR/LF converted to a simple LF). + +=item n <lineno> <line> +The format for new error lines is identical to that for old errors but with a +different type. + +=back =back =cut @@ -919,35 +946,8 @@ sub LoadLogErrors($) =item C<_WriteLogErrors()> Writes the LogInfo structure in text form to the specified file descriptor. +See _LoadLogErrors() for the format of the errors file. -All lines follow are of the following form: - <type> <value1> <value2> - -The values depend on the <type> of the line. <type> and <value1> must not -contain spaces while <value2> runs to the end of the line. More specifically -the line formats are: -=over - -=item p <name> <value> -Property lines contain (name, value) pairs. -Note that properties which can be calculated while reading the errors file -are not saved (e.g. ErrCount and NewCount). - -=item g <lineno> <groupname> -Group lines contain the group name and the line number of the first line of -the group in the log. Note that the first line would typically not be an -error line. -A group line should be followed by the old and new error lines in this group. - -=item o <lineno> <line> -Old error lines contain the line number of the error in the log and a verbatim -copy of that line (with CR/LF converted to a simple LF). - -=item n <lineno> <line> -The format for new error lines is identical to that for old errors but with a -different type. - -=back =back =cut

1 0

Francois Gouget : testbot/LogUtils: Allow loading the errors from a file handle.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: tools Branch: master Commit: ce7d15ceed9dd318959e51dbfe3edfa93e4d82e0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ce7d15ceed9dd318959e51d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 19 18:55:56 2021 +0100 testbot/LogUtils: Allow loading the errors from a file handle. Furthermore LoadLogErrorsFromFh() returns unsupported lines to the caller (in addition to setting BadLog) which allows embedding .errors-formatted sections in other text files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 99 ++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 39 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1e7dcda..17be624 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -31,7 +31,7 @@ our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogLineCategory GetReportLineCategory ParseTaskLog ParseWineTestReport SnapshotLatestReport UpdateLatestReport UpdateLatestReports - CreateLogErrorsCache LoadLogErrors); + CreateLogErrorsCache LoadLogErrorsFromFh LoadLogErrors); use Algorithm::Diff; use File::Basename; @@ -830,11 +830,10 @@ sub GetLogLabel($) =pod =over 12 -=item C<LoadLogErrors()> - -Loads the specified log errors file. +=item C<LoadLogErrorsFromFh()> -Returns the errors in the same format as TagNewErrors(). +Loads the specified log errors file, returning the errors in the same format +as TagNewErrors(). All lines are of the following form: <type> <value1> <value2> @@ -867,37 +866,23 @@ different type. =back =cut -sub LoadLogErrors($) +sub LoadLogErrorsFromFh($$) { - my ($LogPath) = @_; + my ($LogInfo, $ErrorsFile) = @_; - my $LogName = basename($LogPath); - my $LogInfo = { - LogName => $LogName, - LogPath => $LogPath, + $LogInfo->{ErrGroupNames} ||= []; + $LogInfo->{ErrGroups} ||= {}; - ErrGroupNames => [], - ErrGroups => {}, - }; - $LogPath .= ".errors"; - - my $ErrorsFile; - if (!open($ErrorsFile, "<", $LogPath)) - { - $LogInfo->{BadLog} = "Unable to open '$LogName.errors' for reading: $!"; - return $LogInfo; - } - - my ($LineNo, $CurGroup); - foreach my $Line (<$ErrorsFile>) + while (my $Line = <$ErrorsFile>) { - $LineNo++; + $LogInfo->{LineNo}++; chomp $Line; + my ($Type, $Property, $Value) = split / /, $Line, 3; if (!defined $Value) { - $LogInfo->{BadLog} = "$LineNo: Found an invalid line"; - last; + $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Found an invalid line"; + return $Line; } # else $Type, $Property and $Value are all defined elsif ($Type eq "p") @@ -908,34 +893,70 @@ sub LoadLogErrors($) } else { - $LogInfo->{BadLog} = "$LineNo: Cannot set $Property = $Value because it is already set to $LogInfo->{$Property}"; - last; + $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Cannot set $Property = $Value because it is already set to $LogInfo->{$Property}"; + return $Line; } } elsif ($Type eq "g") { - $CurGroup = _AddLogGroup($LogInfo, $Value, $Property); + $LogInfo->{CurGroup} = _AddLogGroup($LogInfo, $Value, $Property); } - elsif (!$CurGroup) + elsif (!$LogInfo->{CurGroup}) { - $LogInfo->{BadLog} = "$LineNo: Got a $Type line with no group"; - last; + $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Got a $Type line with no group"; + return $Line; } elsif ($Type eq "o") { - _AddLogError($LogInfo, $CurGroup, $Value, $Property); + _AddLogError($LogInfo, $LogInfo->{CurGroup}, $Value, $Property); } elsif ($Type eq "n") { - _AddLogError($LogInfo, $CurGroup, $Value, $Property, "new"); + _AddLogError($LogInfo, $LogInfo->{CurGroup}, $Value, $Property, "new"); } else { - $LogInfo->{BadLog} = "$LineNo: Found an unknown line type ($Type)"; - last; + $LogInfo->{BadLog} = "$LogInfo->{LineNo}: Found an unknown line type ($Type)"; + return $Line; } } - close($ErrorsFile); + + return undef; +} + +=pod +=over 12 + +=item C<LoadLogErrors()> + +Loads the specified log errors file. + +See _LoadLogErrorsFromFh() for the format of the errors file. + +Returns the errors in the same format as TagNewErrors(). + +=back +=cut + +sub LoadLogErrors($) +{ + my ($LogPath) = @_; + + my $LogInfo = { + LogName => basename($LogPath), + LogPath => $LogPath, + }; + if (open(my $ErrorsFile, "<", "$LogPath.errors")) + { + LoadLogErrorsFromFh($LogInfo, $ErrorsFile); + delete $LogInfo->{CurGroup}; + close($ErrorsFile); + } + else + { + $LogInfo->{BadLog} = "Unable to open '$LogInfo->{LogName}.errors' for reading: $!"; + return $LogInfo; + } return $LogInfo; }

1 0

Francois Gouget : testbot/LogUtils: Add the ToFh suffix to _WriteLogErrors().
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: tools Branch: master Commit: 1443b2db4225fbb16e9b64761183ab7c3434f098 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1443b2db4225fbb16e9b647… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 19 18:55:59 2021 +0100 testbot/LogUtils: Add the ToFh suffix to _WriteLogErrors(). This way its name is consistent with LoadLogErrorsFromFh(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17be624..30038cf 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -964,7 +964,7 @@ sub LoadLogErrors($) =pod =over 12 -=item C<_WriteLogErrors()> +=item C<_WriteLogErrorsToFh()> Writes the LogInfo structure in text form to the specified file descriptor. See _LoadLogErrors() for the format of the errors file. @@ -972,7 +972,7 @@ See _LoadLogErrors() for the format of the errors file. =back =cut -sub _WriteLogErrors($$) +sub _WriteLogErrorsToFh($$) { my ($Fh, $LogInfo) = @_; @@ -1000,7 +1000,7 @@ sub _SaveLogErrors($) my $ErrorsPath = "$LogInfo->{LogPath}.errors"; if (open(my $ErrorsFile, ">", $ErrorsPath)) { - _WriteLogErrors($ErrorsFile, $LogInfo); + _WriteLogErrorsToFh($ErrorsFile, $LogInfo); close($ErrorsFile); # Set the mtime so Janitor reaps both at the same time @@ -1020,7 +1020,7 @@ sub _DumpErrors($$) next if ($Key =~ /^(?:ErrGroupNames|ErrGroups|NewCount)$/); print STDERR "+ $Key $LogInfo->{$Key}\n"; } - _WriteLogErrors(*STDERR, $LogInfo); + _WriteLogErrorsToFh(*STDERR, $LogInfo); }

1 0

Francois Gouget : testbot/LogUtils: Add support for recursive structures to _DumpErrors().
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: tools Branch: master Commit: dd460665790affcb05e7896470f971ea338f80f0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=dd460665790affcb05e7896… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 19 18:56:05 2021 +0100 testbot/LogUtils: Add support for recursive structures to _DumpErrors(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 30038cf..3488c7b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1010,17 +1010,25 @@ sub _SaveLogErrors($) return "Could not open '$LogInfo->{LogName}.errors' for writing: $!"; } -sub _DumpErrors($$) +sub _DumpErrors { my ($Label, $LogInfo) = @_; print STDERR "$Label:\n"; + my @SubKeys; foreach my $Key (sort keys %{$LogInfo}) { next if ($Key =~ /^(?:ErrGroupNames|ErrGroups|NewCount)$/); + if (ref($LogInfo->{$Key}) eq "HASH") + { + push @SubKeys, $Key; + next; + } + print STDERR "+ $Key $LogInfo->{$Key}\n"; } _WriteLogErrorsToFh(*STDERR, $LogInfo); + map { _DumpErrors("$Label.$_", $LogInfo->{$_}) } (@SubKeys); }

1 0

Francois Gouget : testbot/TestWTBS: Automate checking the Wine TestBot test Suite results.
by Alexandre Julliard 19 Jan '21

19 Jan '21

Module: tools Branch: master Commit: 51d7779e876241c0a39839bb6eee3837379ed092 URL: https://source.winehq.org/git/tools.git/?a=commit;h=51d7779e876241c0a39839b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 19 18:59:51 2021 +0100 testbot/TestWTBS: Automate checking the Wine TestBot test Suite results. The Wine TestBot test Suite is a series of Wine pactches that can be used to verify that the TestBot handles test failures, timeouts, etc as expected. The TestWTBS script looks for directives in the commit message of these patches to automate a range of checks on the corresponding jobs and tasks. To simplify parsing the directives, reuse the TestBot's simple errors cache format. For instance: ----- TestWTBS ----- p job.Status completed p tasks.Status completed p tests.TestFailures 1 ----- TestWTBS ----- Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/tests/TestWTBS | 459 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 459 insertions(+) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=51d7779e876241c0a39…

1 0

Henri Verbeet : wined3d: Also trace memory types in adapter_vk_init_driver_info().
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: fc50ea23511bacf2efbc60b164713692ecaea034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc50ea23511bacf2efbc60b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 18 15:38:50 2021 +0100 wined3d: Also trace memory types in adapter_vk_init_driver_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0404aa1877b..09180e7fdb6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2025,6 +2025,7 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; UINT64 vram_bytes, sysmem_bytes; + const VkMemoryType *type; const VkMemoryHeap *heap; unsigned int i; @@ -2046,6 +2047,12 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); TRACE("Total shared system memory: 0x%s.\n", wine_dbgstr_longlong(sysmem_bytes)); + for (i = 0; i < memory_properties->memoryTypeCount; ++i) + { + type = &memory_properties->memoryTypes[i]; + TRACE("Memory type [%u]: flags %#x, heap %u.\n", i, type->propertyFlags, type->heapIndex); + } + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID);

1 0

Shawn M. Chapla : dsound: Send CaptureBuffer stop notification whenever stopping.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: c0026b5cf3e82840f5df6b7c5b16f723bbc2cc92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0026b5cf3e82840f5df6b7c… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Fri Jan 15 12:33:44 2021 -0500 dsound: Send CaptureBuffer stop notification whenever stopping. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/capture.c | 7 ++++++- dlls/dsound/tests/capture.c | 34 +++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 10690f7df0d..2fb3ce8c4a6 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -527,6 +527,8 @@ out: return DS_OK; } +static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, DWORD len); + static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Stop(IDirectSoundCaptureBuffer8 *iface) { IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); @@ -544,8 +546,10 @@ static HRESULT WINAPI IDirectSoundCaptureBufferImpl_Stop(IDirectSoundCaptureBuff TRACE("old This->device->state=%s\n",captureStateString[This->device->state]); if (This->device->state == STATE_CAPTURING) This->device->state = STATE_STOPPING; - else if (This->device->state == STATE_STARTING) + else if (This->device->state == STATE_STARTING) { This->device->state = STATE_STOPPED; + capture_CheckNotify(This->device->capture_buffer, 0, 0); + } TRACE("new This->device->state=%s\n",captureStateString[This->device->state]); if(This->device->client){ @@ -880,6 +884,7 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) if(device->state == STATE_STOPPING){ device->state = STATE_STOPPED; + capture_CheckNotify(device->capture_buffer, 0, 0); return S_FALSE; } diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index e326fe8d839..2d8138aa19e 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -30,7 +30,8 @@ #include "dsound_test.h" -#define NOTIFICATIONS 5 +#define TIMESTAMP_NOTIFICATIONS 5 +#define TOTAL_NOTIFICATIONS (TIMESTAMP_NOTIFICATIONS + 1) static const char * get_format_str(WORD format) { @@ -264,8 +265,8 @@ typedef struct { LPDIRECTSOUNDCAPTUREBUFFER dscbo; LPWAVEFORMATEX wfx; - DSBPOSITIONNOTIFY posnotify[NOTIFICATIONS]; - HANDLE event[NOTIFICATIONS]; + DSBPOSITIONNOTIFY posnotify[TOTAL_NOTIFICATIONS]; + HANDLE event[TOTAL_NOTIFICATIONS]; LPDIRECTSOUNDNOTIFY notify; DWORD buffer_size; @@ -369,21 +370,24 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, state.dscbo=dscbo; state.wfx=&wfx; state.buffer_size = dscbcaps.dwBufferBytes; - for (i = 0; i < NOTIFICATIONS; i++) + for (i = 0; i < TOTAL_NOTIFICATIONS; i++) state.event[i] = CreateEventW(NULL, FALSE, FALSE, NULL); - state.size = dscbcaps.dwBufferBytes / NOTIFICATIONS; + state.size = dscbcaps.dwBufferBytes / TIMESTAMP_NOTIFICATIONS; rc=IDirectSoundCaptureBuffer_QueryInterface(dscbo,&IID_IDirectSoundNotify, (void **)&(state.notify)); ok((rc==DS_OK)&&(state.notify!=NULL), "IDirectSoundCaptureBuffer_QueryInterface() failed: %08x\n", rc); - for (i = 0; i < NOTIFICATIONS; i++) { + for (i = 0; i < TIMESTAMP_NOTIFICATIONS; i++) { state.posnotify[i].dwOffset = (i * state.size) + state.size - 1; state.posnotify[i].hEventNotify = state.event[i]; } - rc=IDirectSoundNotify_SetNotificationPositions(state.notify,NOTIFICATIONS, + state.posnotify[i].dwOffset = DSBPN_OFFSETSTOP; + state.posnotify[i].hEventNotify = state.event[i]; + + rc = IDirectSoundNotify_SetNotificationPositions(state.notify, TOTAL_NOTIFICATIONS, state.posnotify); ok(rc==DS_OK,"IDirectSoundNotify_SetNotificationPositions() failed: %08x\n", rc); @@ -403,15 +407,15 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, "GetStatus: bad status: %x\n",status); if (record) { - /* wait for the notifications */ - for (i = 0; i < (NOTIFICATIONS * 2); i++) { - rc=WaitForMultipleObjects(NOTIFICATIONS,state.event,FALSE,3000); - ok(rc==(WAIT_OBJECT_0+(i%NOTIFICATIONS)), + /* wait for timestamp notifications */ + for (i = 0; i < (TIMESTAMP_NOTIFICATIONS * 2); i++) { + rc = WaitForMultipleObjects(TOTAL_NOTIFICATIONS, state.event, FALSE, 3000); + ok(rc == (WAIT_OBJECT_0 + (i % TIMESTAMP_NOTIFICATIONS)), "WaitForMultipleObjects failed: 0x%x\n",rc); - if (rc!=(WAIT_OBJECT_0+(i%NOTIFICATIONS))) { + if (rc != (WAIT_OBJECT_0 + (i % TIMESTAMP_NOTIFICATIONS))) { ok((rc==WAIT_TIMEOUT)||(rc==WAIT_FAILED), "Wrong notification: should be %d, got %d\n", - i%NOTIFICATIONS,rc-WAIT_OBJECT_0); + i % TIMESTAMP_NOTIFICATIONS, rc - WAIT_OBJECT_0); } if (!capture_buffer_service(&state)) break; @@ -421,6 +425,10 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCaptureBuffer_Stop(dscbo); ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); + /* wait for stop notification */ + rc = WaitForSingleObject(state.event[TIMESTAMP_NOTIFICATIONS], 3000); + ok(rc == WAIT_OBJECT_0, "WaitForSingleObject failed: 0x%x\n", rc); + rc=IDirectSoundCaptureBuffer_Stop(dscbo); ok(rc==DS_OK,"IDirectSoundCaptureBuffer_Stop() failed: %08x\n", rc); }

1 0

Alistair Leslie-Hughes : dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers.
by Alexandre Julliard 18 Jan '21

18 Jan '21

Module: wine Branch: master Commit: 2e8bd2682a1c5335465ed891ea1063d82c346577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e8bd2682a1c5335465ed891… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 15 18:22:18 2021 +1100 dsound: IDirectSoundBuffer8 GetStatus return DSBSTATUS_LOCSOFTWARE for deferred buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21014 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 2 ++ dlls/dsound/tests/dsound8.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index bc30a8a5448..fafa6fc6015 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -420,6 +420,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetStatus(IDirectSoundBuffer8 *ifac if (This->playflags & DSBPLAY_LOOPING) *status |= DSBSTATUS_LOOPING; } + if (This->dsbd.dwFlags & DSBCAPS_LOCDEFER) + *status |= DSBSTATUS_LOCSOFTWARE; ReleaseSRWLockShared(&This->lock); TRACE("status=%x\n", *status); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 81c5710dbaf..85272dd9b55 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1809,6 +1809,79 @@ static void test_effects(void) ok(!ref, "Got outstanding refcount %u.\n", ref); } +static void test_AcquireResources(void) +{ + IDirectSound8 *dsound; + IDirectSoundBuffer *primary, *secondary; + DSBUFFERDESC bufdesc; + WAVEFORMATEX fmt; + HRESULT hr; + + hr = DirectSoundCreate8(NULL, &dsound, NULL); + ok(hr == DS_OK || hr == DSERR_NODRIVER, "Got hr %#x.\n", hr); + if (FAILED(hr)) + return; + + hr = IDirectSound8_SetCooperativeLevel(dsound, get_hwnd(), DSSCL_PRIORITY); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_PRIMARYBUFFER; + bufdesc.dwBufferBytes = 0; + bufdesc.dwReserved = 0; + bufdesc.lpwfxFormat = NULL; + bufdesc.guid3DAlgorithm = GUID_NULL; + + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &primary, NULL); + ok(hr == S_OK, "CreateSoundBuffer failed: %08x\n", hr); + if(hr != S_OK) { + IDirectSound_Release(dsound); + return; + } + + fmt.wFormatTag = WAVE_FORMAT_PCM; + fmt.nChannels = 2; + fmt.nSamplesPerSec = 48000; + fmt.wBitsPerSample = 16; + fmt.nBlockAlign = fmt.nChannels * fmt.wBitsPerSample / 8; + fmt.nAvgBytesPerSec = fmt.nBlockAlign * fmt.nSamplesPerSec; + fmt.cbSize = 0; + + bufdesc.lpwfxFormat = &fmt; + bufdesc.dwBufferBytes = fmt.nSamplesPerSec * fmt.nBlockAlign / 10; + bufdesc.dwFlags = DSBCAPS_LOCDEFER | DSBCAPS_CTRLVOLUME; + + /* see if we can create one more */ + hr = IDirectSound8_CreateSoundBuffer(dsound, &bufdesc, &secondary, NULL); + ok(hr == S_OK, "CreateSoundBuffer gave wrong error: %08x\n", hr); + if(hr == S_OK) { + DWORD status; + IDirectSoundBuffer8 *buffer8; + + hr = IDirectSoundBuffer_QueryInterface(secondary, &IID_IDirectSoundBuffer8, (void **)&buffer8); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + todo_wine ok(status == 0, "got: %08x\n", status); + + hr = IDirectSoundBuffer8_AcquireResources(buffer8, 0, 0, NULL); + ok(hr == S_OK, "got: %08x\n", hr); + + status = 0xFFFF; + hr = IDirectSoundBuffer8_GetStatus(buffer8, &status); + ok(hr == S_OK, "got: %08x\n", hr); + ok(status == DSBSTATUS_LOCSOFTWARE, "got: %08x\n", status); + + IDirectSoundBuffer8_Release(buffer8); + IDirectSoundBuffer_Release(secondary); + } + + IDirectSoundBuffer_Release(primary); + IDirectSound_Release(dsound); +} + START_TEST(dsound8) { DWORD cookie; @@ -1822,6 +1895,7 @@ START_TEST(dsound8) test_hw_buffers(); test_first_device(); test_primary_flags(); + test_AcquireResources(); hr = CoRegisterClassObject(&testdmo_clsid, (IUnknown *)&testdmo_cf, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &cookie);

1 0