26 Sep
2014
26 Sep
'14
8:56 a.m.
Author: akhaldi
Date: Fri Sep 26 08:56:44 2014
New Revision: 64295
URL: http://svn.reactos.org/svn/reactos?rev=64295&view=rev
Log:
[DEVENUM]
* Sync with Wine 1.7.27.
CORE-8540
Modified:
trunk/reactos/dll/directx/wine/devenum/createdevenum.c
trunk/reactos/dll/directx/wine/devenum/devenum_main.c
trunk/reactos/dll/directx/wine/devenum/mediacatenum.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c…
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Fri Sep 26
08:56:44 2014
@@ -756,7 +756,7 @@
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);
@@ -764,7 +764,7 @@
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)
@@ -837,7 +837,7 @@
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);
@@ -845,7 +845,7 @@
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);
@@ -947,7 +947,7 @@
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);
Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] Fri Sep 26 08:56:44
2014
@@ -33,7 +33,9 @@
BOOL instance;
} register_info;
+#ifdef __REACTOS__
static void DEVENUM_RegisterQuartz(void);
+#endif
/***********************************************************************
* Global string constant definitions
@@ -96,8 +98,10 @@
res = __wine_register_resources( DEVENUM_hInstance );
+#ifdef __REACTOS__
/* Quartz is needed for IFilterMapper2 */
DEVENUM_RegisterQuartz();
+#endif
/*** ActiveMovieFilter Categories ***/
@@ -146,6 +150,8 @@
return __wine_unregister_resources( DEVENUM_hInstance );
}
+#ifdef __REACTOS__
+
typedef HRESULT (WINAPI *DllRegisterServer_func)(void);
/* calls DllRegisterServer() for the Quartz DLL */
@@ -162,3 +168,5 @@
ERR("Failed to register Quartz. Error was 0x%x)\n", hr);
}
}
+
+#endif
Modified: trunk/reactos/dll/directx/wine/devenum/mediacatenum.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/m…
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] Fri Sep 26 08:56:44
2014
@@ -146,15 +146,15 @@
switch (V_VT(pVar))
{
case VT_LPWSTR:
- V_UNION(pVar, bstrVal) = CoTaskMemAlloc(received);
- memcpy(V_UNION(pVar, bstrVal), pData, received);
+ V_BSTR(pVar) = CoTaskMemAlloc(received);
+ memcpy(V_BSTR(pVar), pData, received);
res = S_OK;
break;
case VT_EMPTY:
V_VT(pVar) = VT_BSTR;
/* fall through */
case VT_BSTR:
- V_UNION(pVar, bstrVal) = SysAllocStringLen(pData, received/sizeof(WCHAR)
- 1);
+ V_BSTR(pVar) = SysAllocStringLen(pData, received/sizeof(WCHAR) - 1);
res = S_OK;
break;
}
@@ -168,7 +168,7 @@
/* fall through */
case VT_I4:
case VT_UI4:
- V_UNION(pVar, ulVal) = *(DWORD *)pData;
+ V_I4(pVar) = *(DWORD *)pData;
res = S_OK;
break;
}
@@ -186,7 +186,7 @@
V_VT(pVar) = VT_ARRAY | VT_UI1;
/* fall through */
case VT_ARRAY | VT_UI1:
- if (!(V_UNION(pVar, parray) = SafeArrayCreate(VT_UI1, 1,
&bound)))
+ if (!(V_ARRAY(pVar) = SafeArrayCreate(VT_UI1, 1, &bound)))
res = E_OUTOFMEMORY;
else
res = S_OK;
@@ -196,12 +196,12 @@
if (res == E_INVALIDARG)
break;
- res = SafeArrayAccessData(V_UNION(pVar, parray), &pArrayElements);
+ res = SafeArrayAccessData(V_ARRAY(pVar), &pArrayElements);
if (FAILED(res))
break;
CopyMemory(pArrayElements, pData, received);
- res = SafeArrayUnaccessData(V_UNION(pVar, parray));
+ res = SafeArrayUnaccessData(V_ARRAY(pVar));
break;
}
}
@@ -232,15 +232,15 @@
{
case VT_BSTR:
case VT_LPWSTR:
- TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal)));
- lpData = V_UNION(pVar, bstrVal);
+ TRACE("writing %s\n", debugstr_w(V_BSTR(pVar)));
+ lpData = V_BSTR(pVar);
dwType = REG_SZ;
- cbData = (lstrlenW(V_UNION(pVar, bstrVal)) + 1) * sizeof(WCHAR);
+ cbData = (lstrlenW(V_BSTR(pVar)) + 1) * sizeof(WCHAR);
break;
case VT_I4:
case VT_UI4:
- TRACE("writing %u\n", V_UNION(pVar, ulVal));
- lpData = &V_UNION(pVar, ulVal);
+ TRACE("writing %u\n", V_UI4(pVar));
+ lpData = &V_UI4(pVar);
dwType = REG_DWORD;
cbData = sizeof(DWORD);
break;
@@ -249,11 +249,11 @@
LONG lUbound = 0;
LONG lLbound = 0;
dwType = REG_BINARY;
- res = SafeArrayGetLBound(V_UNION(pVar, parray), 1, &lLbound);
- res = SafeArrayGetUBound(V_UNION(pVar, parray), 1, &lUbound);
+ res = SafeArrayGetLBound(V_ARRAY(pVar), 1, &lLbound);
+ res = SafeArrayGetUBound(V_ARRAY(pVar), 1, &lUbound);
cbData = (lUbound - lLbound + 1) /* * sizeof(BYTE)*/;
TRACE("cbData: %d\n", cbData);
- res = SafeArrayAccessData(V_UNION(pVar, parray), &lpData);
+ res = SafeArrayAccessData(V_ARRAY(pVar), &lpData);
break;
}
default:
@@ -267,7 +267,7 @@
res = E_FAIL;
if (V_VT(pVar) & VT_ARRAY)
- res = SafeArrayUnaccessData(V_UNION(pVar, parray));
+ res = SafeArrayUnaccessData(V_ARRAY(pVar));
return res;
}
@@ -418,8 +418,8 @@
}
if (SUCCEEDED(res))
{
- res = CLSIDFromString(V_UNION(&var,bstrVal), &clsID);
- CoTaskMemFree(V_UNION(&var, bstrVal));
+ res = CLSIDFromString(V_BSTR(&var), &clsID);
+ CoTaskMemFree(V_BSTR(&var));
}
if (SUCCEEDED(res))
{
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Sep 26 08:56:44 2014
@@ -34,7 +34,7 @@
reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27
reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.27
reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27
-reactos/dll/directx/wine/devenum # Synced to Wine-1.7.17
+reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27
reactos/dll/directx/wine/dinput # Synced to Wine-1.7.17
reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.17
reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.17