From patchwork Sun Apr 5 07:50:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 11474583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A4BB21667 for ; Sun, 5 Apr 2020 07:51:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82728206F5 for ; Sun, 5 Apr 2020 07:51:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82728206F5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=t-online.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:45512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jL03v-0005lv-L2 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 05 Apr 2020 03:51:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jL02x-0004pT-6p for qemu-devel@nongnu.org; Sun, 05 Apr 2020 03:50:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jL02v-0001Gd-IM for qemu-devel@nongnu.org; Sun, 05 Apr 2020 03:50:22 -0400 Received: from mailout08.t-online.de ([194.25.134.20]:60980) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jL02v-0001Fu-Cg for qemu-devel@nongnu.org; Sun, 05 Apr 2020 03:50:21 -0400 Received: from fwd32.aul.t-online.de (fwd32.aul.t-online.de [172.20.26.144]) by mailout08.t-online.de (Postfix) with SMTP id C13C541B921F; Sun, 5 Apr 2020 09:50:20 +0200 (CEST) Received: from linpower.localnet (SrBfFuZdwhYvr51O9eLyuro6+AN6vTh4yGX0rXJBHrL8TEp4KnMl6NdfipfR85xQfv@[93.236.147.242]) by fwd32.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1jL02u-2WcS480; Sun, 5 Apr 2020 09:50:20 +0200 Received: by linpower.localnet (Postfix, from userid 1000) id 905A620061E; Sun, 5 Apr 2020 09:50:17 +0200 (CEST) From: =?utf-8?q?Volker_R=C3=BCmelin?= To: Gerd Hoffmann Subject: [PATCH v2 2/3] dsoundaudio: fix "Could not lock capture buffer" warning Date: Sun, 5 Apr 2020 09:50:16 +0200 Message-Id: <20200405075017.9901-2-vr_qemu@t-online.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: MIME-Version: 1.0 X-ID: SrBfFuZdwhYvr51O9eLyuro6+AN6vTh4yGX0rXJBHrL8TEp4KnMl6NdfipfR85xQfv X-TOI-MSGID: 6c8f1f2f-5875-47db-888f-453735f739cc X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 194.25.134.20 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU , =?utf-8?b?Wm9sdMOhbiBLxZF2w6Fnw7M=?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" IDirectSoundCaptureBuffer_Lock() fails on Windows when called with len = 0. Return early from dsound_get_buffer_in() in this case. To reproduce the warning start a linux guest. In the guest start Audacity and you will see a lot of "Could not lock capture buffer" warnings. Signed-off-by: Volker Rümelin --- audio/dsoundaudio.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index 9e621c8899..a08d519cae 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -542,6 +542,11 @@ static void *dsound_get_buffer_in(HWVoiceIn *hw, size_t *size) req_size = audio_ring_dist(cpos, hw->pos_emul, hw->size_emul); req_size = MIN(req_size, hw->size_emul - hw->pos_emul); + if (req_size == 0) { + *size = 0; + return NULL; + } + err = dsound_lock_in(dscb, &hw->info, hw->pos_emul, req_size, &ret, NULL, &act_size, NULL, false, ds->s); if (err) {