From 7db0e48454314fd4afe0e4e1e2e9aa082630db17 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Mon, 3 Nov 2025 10:10:34 -0500
Subject: [PATCH] wasapi: Minor style tweaks.
---
src/audio/wasapi/SDL_wasapi.c | 3 +--
src/core/windows/SDL_immdevice.c | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/audio/wasapi/SDL_wasapi.c b/src/audio/wasapi/SDL_wasapi.c
index b641d01eb25b1..a0ff4022b8b00 100644
--- a/src/audio/wasapi/SDL_wasapi.c
+++ b/src/audio/wasapi/SDL_wasapi.c
@@ -728,8 +728,7 @@ static bool mgmtthrtask_PrepDevice(void *userdata)
newspec.freq = waveformat->nSamplesPerSec;
- if (device->recording && device->hidden->isplayback)
- {
+ if (device->recording && device->hidden->isplayback) {
streamflags |= AUDCLNT_STREAMFLAGS_LOOPBACK;
}
diff --git a/src/core/windows/SDL_immdevice.c b/src/core/windows/SDL_immdevice.c
index e6cf1cec198d8..93c4afa5d5b32 100644
--- a/src/core/windows/SDL_immdevice.c
+++ b/src/core/windows/SDL_immdevice.c
@@ -147,7 +147,7 @@ static SDL_AudioDevice *SDL_IMMDevice_Add(const bool recording, const char *devn
if (!device) {
// handle is freed by SDL_IMMDevice_FreeDeviceHandle!
- SDL_IMMDevice_HandleData *handle = (SDL_IMMDevice_HandleData *)SDL_malloc(sizeof(SDL_IMMDevice_HandleData));
+ SDL_IMMDevice_HandleData *handle = (SDL_IMMDevice_HandleData *)SDL_calloc(1, sizeof(*handle));
if (!handle) {
return NULL;
}
@@ -156,7 +156,7 @@ static SDL_AudioDevice *SDL_IMMDevice_Add(const bool recording, const char *devn
SDL_free(handle);
return NULL;
}
- SDL_memcpy(&handle->directsound_guid, dsoundguid, sizeof(GUID));
+ SDL_copyp(&handle->directsound_guid, &dsoundguid);
SDL_AudioSpec spec;
SDL_zero(spec);
@@ -168,7 +168,7 @@ static SDL_AudioDevice *SDL_IMMDevice_Add(const bool recording, const char *devn
if (!recording && supports_recording_playback_devices) {
// handle is freed by SDL_IMMDevice_FreeDeviceHandle!
- SDL_IMMDevice_HandleData *recording_handle = (SDL_IMMDevice_HandleData *)SDL_malloc(sizeof(SDL_IMMDevice_HandleData));
+ SDL_IMMDevice_HandleData *recording_handle = (SDL_IMMDevice_HandleData *)SDL_malloc(sizeof(*recording_handle));
if (!recording_handle) {
return NULL;
}