dsound: Fixed compilation error caused by 942f2ce7
Alexander E. Patrakov
patrakov at gmail.com
Sat May 19 08:35:18 CDT 2012
There is no dummy union u anymore.
--
Alexander E. Patrakov
-------------- next part --------------
From 649ad26ae3f727fea9d27fe5fa2a68f4f1973a9e Mon Sep 17 00:00:00 2001
From: "Alexander E. Patrakov" <patrakov at gmail.com>
Date: Sat, 19 May 2012 18:25:09 +0600
Subject: [PATCH 1/3] dsound: Fixed compilation error caused by 942f2ce7
---
dlls/dsound/dsound_main.c | 6 +++---
dlls/dsound/propset.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index c0d2b33..76b71c9 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -228,7 +228,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps,
return hr;
}
- CLSIDFromString(pv.u.pwszVal, guid);
+ CLSIDFromString(pv.pwszVal, guid);
PropVariantClear(&pv);
IPropertyStore_Release(ps);
@@ -447,9 +447,9 @@ static BOOL send_device(IMMDevice *device, GUID *guid,
}
TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(guid),
- wine_dbgstr_w(pv.u.pwszVal));
+ wine_dbgstr_w(pv.pwszVal));
- keep_going = cb(guid, pv.u.pwszVal, wine_vxd_drv, user);
+ keep_going = cb(guid, pv.pwszVal, wine_vxd_drv, user);
PropVariantClear(&pv);
IPropertyStore_Release(ps);
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 242b237..c48160d 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -256,10 +256,10 @@ static HRESULT DSPROPERTY_DescriptionW(
return hr;
}
- desclen = lstrlenW(pv.u.pwszVal) + 1;
+ desclen = lstrlenW(pv.pwszVal) + 1;
/* FIXME: Still a memory leak.. */
ppd->Description = HeapAlloc(GetProcessHeap(), 0, desclen * sizeof(WCHAR));
- memcpy(ppd->Description, pv.u.pwszVal, desclen * sizeof(WCHAR));
+ memcpy(ppd->Description, pv.pwszVal, desclen * sizeof(WCHAR));
ppd->Module = wine_vxd_drv;
ppd->Interface = wInterface;
ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
--
1.7.8.6
More information about the wine-patches
mailing list