[DEVENUM] Sync with Wine Staging 1.7.55. CORE-10536

[reactos.git] / reactos / dll / directx / wine / devenum / createdevenum.c

diff --git a/reactos/dll/directx/wine/devenum/createdevenum.c b/reactos/dll/directx/wine/devenum/createdevenum.c
index 29ba0e8..b752860 100644 (file)
--- a/reactos/dll/directx/wine/devenum/createdevenum.c
+++ b/reactos/dll/directx/wine/devenum/createdevenum.c
@@ -27,6 +27,7 @@
 
 #include <vfw.h>
 #include <aviriff.h>
+#include <shlwapi.h>
 
 #include "resource.h"
 
@@ -755,7 +756,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void)
                     VARIANT var;
 
                     V_VT(&var) = VT_I4;
-                    V_UNION(&var, ulVal) = i;
+                    V_I4(&var) = i;
                     res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag);
                     if (SUCCEEDED(res))
                         res = IPropertyBag_Write(pPropBag, wszWaveOutID, &var);
@@ -763,7 +764,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void)
                         pPropBag = NULL;
 
                     V_VT(&var) = VT_LPWSTR;
-                    V_UNION(&var, bstrVal) = wocaps.szPname;
+                    V_BSTR(&var) = wocaps.szPname;
                     if (SUCCEEDED(res))
                         res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var);
                     if (pPropBag)
@@ -836,7 +837,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void)
                     VARIANT var;
 
                     V_VT(&var) = VT_I4;
-                    V_UNION(&var, ulVal) = i;
+                    V_I4(&var) = i;
                     res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag);
                     if (SUCCEEDED(res))
                         res = IPropertyBag_Write(pPropBag, wszWaveInID, &var);
@@ -844,7 +845,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void)
                         pPropBag = NULL;
 
                     V_VT(&var) = VT_LPWSTR;
-                    V_UNION(&var, bstrVal) = wicaps.szPname;
+                    V_BSTR(&var) = wicaps.szPname;
                     if (SUCCEEDED(res))
                         res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var);
 
@@ -946,7 +947,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void)
                        OLECHAR wszVfwIndex[] = { 'V','F','W','I','n','d','e','x',0 };
                        VARIANT var;
                        V_VT(&var) = VT_I4;
-                       V_UNION(&var, ulVal) = i;
+                       V_I4(&var) = i;
                        res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag);
                        if (SUCCEEDED(res)) {
                            res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var);