Jacek Caban : devenum: Use nameless structs and unions.
Alexandre Julliard
julliard at winehq.org
Tue Mar 23 16:54:30 CDT 2021
Module: wine
Branch: master
Commit: f59b482c2cd04cb4c64ff76f1af016f62cb03066
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59b482c2cd04cb4c64ff76f1af016f62cb03066
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Mar 23 00:30:39 2021 +0100
devenum: Use nameless structs and unions.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/devenum/Makefile.in | 1 -
dlls/devenum/createdevenum.c | 48 ++++++++++++++++++++++----------------------
2 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in
index b50339dcfd6..6ce1967a6dd 100644
--- a/dlls/devenum/Makefile.in
+++ b/dlls/devenum/Makefile.in
@@ -1,7 +1,6 @@
MODULE = devenum.dll
IMPORTS = dmoguids strmiids uuid ole32 oleaut32 avicap32 winmm user32 advapi32 dsound msdmo
DELAYIMPORTS = msvfw32
-EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
EXTRADLLFLAGS = -mno-cygwin
diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c
index f7b53ad271f..8e9cf56eb09 100644
--- a/dlls/devenum/createdevenum.c
+++ b/dlls/devenum/createdevenum.c
@@ -237,8 +237,8 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2)
REGFILTERPINS2 *rgPins = NULL;
rgf2->dwVersion = 2;
- rgf2->u.s2.cPins2 = 0;
- rgf2->u.s2.rgPins2 = NULL;
+ rgf2->cPins2 = 0;
+ rgf2->rgPins2 = NULL;
if (RegOpenKeyExW(hkeyFilterClass, L"Pins", 0, KEY_READ, &hkeyPins) != ERROR_SUCCESS)
return ;
@@ -265,7 +265,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2)
HKEY hkeyPinKey = NULL;
WCHAR wszPinName[MAX_PATH];
DWORD cName = ARRAY_SIZE(wszPinName);
- REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2];
+ REGFILTERPINS2 *rgPin = &rgPins[rgf2->cPins2];
DWORD value, size, Type;
LONG lRet;
@@ -306,7 +306,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2)
DEVENUM_ReadPinTypes(hkeyPinKey, rgPin);
- ++rgf2->u.s2.cPins2;
+ ++rgf2->cPins2;
continue;
error_cleanup:
@@ -316,38 +316,38 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2)
RegCloseKey(hkeyPins);
- if (rgPins && !rgf2->u.s2.cPins2)
+ if (rgPins && !rgf2->cPins2)
{
CoTaskMemFree(rgPins);
rgPins = NULL;
}
- rgf2->u.s2.rgPins2 = rgPins;
+ rgf2->rgPins2 = rgPins;
}
static void free_regfilter2(REGFILTER2 *rgf)
{
- if (rgf->u.s2.rgPins2)
+ if (rgf->rgPins2)
{
UINT iPin;
- for (iPin = 0; iPin < rgf->u.s2.cPins2; iPin++)
+ for (iPin = 0; iPin < rgf->cPins2; iPin++)
{
- if (rgf->u.s2.rgPins2[iPin].lpMediaType)
+ if (rgf->rgPins2[iPin].lpMediaType)
{
UINT iType;
- for (iType = 0; iType < rgf->u.s2.rgPins2[iPin].nMediaTypes; iType++)
+ for (iType = 0; iType < rgf->rgPins2[iPin].nMediaTypes; iType++)
{
- CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType[iType].clsMajorType);
- CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType[iType].clsMinorType);
+ CoTaskMemFree((void *)rgf->rgPins2[iPin].lpMediaType[iType].clsMajorType);
+ CoTaskMemFree((void *)rgf->rgPins2[iPin].lpMediaType[iType].clsMinorType);
}
- CoTaskMemFree((void *)rgf->u.s2.rgPins2[iPin].lpMediaType);
+ CoTaskMemFree((void *)rgf->rgPins2[iPin].lpMediaType);
}
}
- CoTaskMemFree((void *)rgf->u.s2.rgPins2);
+ CoTaskMemFree((void *)rgf->rgPins2);
}
}
@@ -508,8 +508,8 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons
/* write filter data */
rgf.dwVersion = 2;
rgf.dwMerit = guid ? MERIT_DO_NOT_USE : MERIT_PREFERRED;
- rgf.u.s2.cPins2 = 1;
- rgf.u.s2.rgPins2 = &rgpins;
+ rgf.cPins2 = 1;
+ rgf.rgPins2 = &rgpins;
rgpins.dwFlags = REG_PINFLAG_B_RENDERER;
/* FIXME: native registers many more formats */
rgpins.nMediaTypes = 1;
@@ -558,8 +558,8 @@ static void register_waveout_devices(void)
/* write filter data */
rgf.dwVersion = 2;
rgf.dwMerit = MERIT_DO_NOT_USE;
- rgf.u.s2.cPins2 = 1;
- rgf.u.s2.rgPins2 = &rgpins;
+ rgf.cPins2 = 1;
+ rgf.rgPins2 = &rgpins;
rgpins.dwFlags = REG_PINFLAG_B_RENDERER;
rgpins.nMediaTypes = 1;
rgpins.lpMediaType = &rgtypes;
@@ -642,8 +642,8 @@ static void register_midiout_devices(void)
/* write filter data */
rgf.dwVersion = 2;
rgf.dwMerit = (i == -1) ? MERIT_PREFERRED : MERIT_DO_NOT_USE;
- rgf.u.s2.cPins2 = 1;
- rgf.u.s2.rgPins2 = &rgpins;
+ rgf.cPins2 = 1;
+ rgf.rgPins2 = &rgpins;
rgpins.dwFlags = REG_PINFLAG_B_RENDERER;
rgpins.nMediaTypes = 1;
rgpins.lpMediaType = &rgtypes;
@@ -692,8 +692,8 @@ static void register_vfw_codecs(void)
/* write filter data */
rgf.dwVersion = 2;
rgf.dwMerit = MERIT_DO_NOT_USE;
- rgf.u.s2.cPins2 = 2;
- rgf.u.s2.rgPins2 = rgpins;
+ rgf.cPins2 = 2;
+ rgf.rgPins2 = rgpins;
rgpins[0].dwFlags = 0;
rgpins[0].nMediaTypes = 1;
rgpins[0].lpMediaType = &rgtypes[0];
@@ -746,8 +746,8 @@ static void register_avicap_devices(void)
rgf.dwVersion = 2;
rgf.dwMerit = MERIT_DO_NOT_USE;
- rgf.u.s2.cPins2 = 1;
- rgf.u.s2.rgPins2 = &rgpins;
+ rgf.cPins2 = 1;
+ rgf.rgPins2 = &rgpins;
rgpins.dwFlags = 0;
rgpins.nMediaTypes = 1;
rgpins.lpMediaType = &rgtypes;
More information about the wine-cvs
mailing list