Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSDMO] Sync with Wine Staging 1.7.47. CORE-9924

Browse source 
svn path=/trunk/; revision=68525
This commit is contained in:
Amine Khaldi 2015-07-21 23:28:13 +00:00
parent f4d73cfa6b
commit b4e4e5004d
2 changed files with 103 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

194
reactos/dll/directx/wine/msdmo/dmoreg.c
View file

@ -80,7 +80,7 @@ typedef struct
IEnumDMO IEnumDMO_iface; IEnumDMO IEnumDMO_iface;
LONG ref; LONG ref;
DWORD index; DWORD index;
const GUID* guidCategory; GUID category;
DWORD dwFlags; DWORD dwFlags;
DWORD cInTypes; DWORD cInTypes;
DMO_PARTIAL_MEDIATYPE *pInTypes; DMO_PARTIAL_MEDIATYPE *pInTypes;
@ -179,25 +179,26 @@ HRESULT WINAPI DMORegister(
HKEY hkey = 0; HKEY hkey = 0;
HKEY hckey = 0; HKEY hckey = 0;
HKEY hclskey = 0; HKEY hclskey = 0;
LONG ret;
TRACE("%s %s %s\n", debugstr_w(szName), debugstr_guid(clsidDMO), debugstr_guid(guidCategory)); TRACE("%s %s %s\n", debugstr_w(szName), debugstr_guid(clsidDMO), debugstr_guid(guidCategory));
if (IsEqualGUID(guidCategory, &GUID_NULL)) if (IsEqualGUID(guidCategory, &GUID_NULL))
return E_INVALIDARG; return E_INVALIDARG;
hres = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL, ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrkey, NULL); REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrkey, NULL);
if (ERROR_SUCCESS != hres) if (ret)
goto lend; return HRESULT_FROM_WIN32(ret);
/* Create clsidDMO key under MediaObjects */ /* Create clsidDMO key under MediaObjects */
hres = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL, ret = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL);
if (ERROR_SUCCESS != hres) if (ret)
goto lend; goto lend;
/* Set default Name value */ /* Set default Name value */
hres = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName,
(strlenW(szName) + 1) * sizeof(WCHAR)); (strlenW(szName) + 1) * sizeof(WCHAR));
/* Set InputTypes */ /* Set InputTypes */
@ -209,28 +210,28 @@ HRESULT WINAPI DMORegister(
if (dwFlags & DMO_REGISTERF_IS_KEYED) if (dwFlags & DMO_REGISTERF_IS_KEYED)
{ {
/* Create Keyed key */ /* Create Keyed key */
hres = RegCreateKeyExW(hkey, szDMOKeyed, 0, NULL, ret = RegCreateKeyExW(hkey, szDMOKeyed, 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL);
if (ERROR_SUCCESS != hres) if (ret)
goto lend; goto lend;
RegCloseKey(hckey); RegCloseKey(hckey);
} }
/* Register the category */ /* Register the category */
hres = RegCreateKeyExW(hrkey, szDMOCategories, 0, NULL, ret = RegCreateKeyExW(hrkey, szDMOCategories, 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL); REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hckey, NULL);
if (ERROR_SUCCESS != hres) if (ret)
goto lend; goto lend;
RegCloseKey(hkey); RegCloseKey(hkey);
hres = RegCreateKeyExW(hckey, GUIDToString(szguid, guidCategory), 0, NULL, ret = RegCreateKeyExW(hckey, GUIDToString(szguid, guidCategory), 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL);
if (ERROR_SUCCESS != hres) if (ret)
goto lend; goto lend;
hres = RegCreateKeyExW(hkey, GUIDToString(szguid, clsidDMO), 0, NULL, ret = RegCreateKeyExW(hkey, GUIDToString(szguid, clsidDMO), 0, NULL,
REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hclskey, NULL); REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hclskey, NULL);
if (ERROR_SUCCESS != hres) if (ret)
goto lend; goto lend;
lend: lend:
@ -243,6 +244,7 @@ lend:
if (hrkey) if (hrkey)
RegCloseKey(hrkey); RegCloseKey(hrkey);
hres = HRESULT_FROM_WIN32(ret);
TRACE(" hresult=0x%08x\n", hres); TRACE(" hresult=0x%08x\n", hres);
return hres; return hres;
} }
@ -317,57 +319,54 @@ lend:
/*************************************************************** /***************************************************************
* DMOGetName (MSDMO.@) * DMOGetName (MSDMO.@)
* *
* Get DMP Name from the registry * Get DMO Name from the registry
*/ */
HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[])
{ {
static const INT max_name_len = 80*sizeof(WCHAR);
DWORD count = max_name_len;
WCHAR szguid[64]; WCHAR szguid[64];
HKEY hrkey = 0; HKEY hrkey, hkey;
HKEY hkey = 0;
static const INT max_name_len = 80;
DWORD count;
LONG ret; LONG ret;
TRACE("%s\n", debugstr_guid(clsidDMO)); TRACE("%s %p\n", debugstr_guid(clsidDMO), name);
ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &hrkey); if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &hrkey))
if (ERROR_SUCCESS != ret) return E_FAIL;
goto lend;
ret = RegOpenKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, KEY_READ, &hkey); ret = RegOpenKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, KEY_READ, &hkey);
if (ERROR_SUCCESS != ret) RegCloseKey(hrkey);
goto lend; if (ret)
return E_FAIL;
count = max_name_len * sizeof(WCHAR); ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)name, &count);
ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); RegCloseKey(hkey);
TRACE(" szName=%s\n", debugstr_w(szName)); if (!ret && count > 1)
lend: {
if (hkey) TRACE("name=%s\n", debugstr_w(name));
RegCloseKey(hrkey); return S_OK;
if (hkey) }
RegCloseKey(hkey);
return HRESULT_FROM_WIN32(ret); name[0] = 0;
return S_FALSE;
} }
/************************************************************************** static HRESULT dup_partial_mediatype(const DMO_PARTIAL_MEDIATYPE *types, DWORD count, DMO_PARTIAL_MEDIATYPE **ret)
* IEnumDMOImpl_Destructor
*/
static BOOL IEnumDMOImpl_Destructor(IEnumDMOImpl* This)
{ {
TRACE("%p\n", This); *ret = NULL;
if (This->hkey) if (count == 0)
RegCloseKey(This->hkey); return S_OK;
HeapFree(GetProcessHeap(), 0, This->pInTypes); *ret = HeapAlloc(GetProcessHeap(), 0, count*sizeof(*types));
HeapFree(GetProcessHeap(), 0, This->pOutTypes); if (!*ret)
return E_OUTOFMEMORY;
return TRUE; memcpy(*ret, types, count*sizeof(*types));
return S_OK;
} }
/************************************************************************** /**************************************************************************
* IEnumDMO_Constructor * IEnumDMO_Constructor
*/ */
@ -381,8 +380,7 @@ static HRESULT IEnumDMO_Constructor(
IEnumDMO **obj) IEnumDMO **obj)
{ {
IEnumDMOImpl* lpedmo; IEnumDMOImpl* lpedmo;
HRESULT hr = S_OK; HRESULT hr;
UINT size;
LONG ret; LONG ret;
*obj = NULL; *obj = NULL;
@ -394,34 +392,18 @@ static HRESULT IEnumDMO_Constructor(
lpedmo->IEnumDMO_iface.lpVtbl = &edmovt; lpedmo->IEnumDMO_iface.lpVtbl = &edmovt;
lpedmo->ref = 1; lpedmo->ref = 1;
lpedmo->index = -1; lpedmo->index = -1;
lpedmo->guidCategory = guidCategory; lpedmo->category = *guidCategory;
lpedmo->dwFlags = dwFlags; lpedmo->dwFlags = dwFlags;
lpedmo->cInTypes = cInTypes;
lpedmo->cOutTypes = cOutTypes;
if (cInTypes > 0) hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes);
{ if (FAILED(hr))
size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); goto lerr;
lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size);
if (!lpedmo->pInTypes)
{
hr = E_OUTOFMEMORY;
goto lerr;
}
memcpy(lpedmo->pInTypes, pInTypes, size);
lpedmo->cInTypes = cInTypes;
}
if (cOutTypes > 0) hr = dup_partial_mediatype(pOutTypes, cOutTypes, &lpedmo->pOutTypes);
{ if (FAILED(hr))
size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); goto lerr;
lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size);
if (!lpedmo->pOutTypes)
{
hr = E_OUTOFMEMORY;
goto lerr;
}
memcpy(lpedmo->pOutTypes, pOutTypes, size);
lpedmo->cOutTypes = cOutTypes;
}
/* If not filtering by category enum from media objects root */ /* If not filtering by category enum from media objects root */
if (IsEqualGUID(guidCategory, &GUID_NULL)) if (IsEqualGUID(guidCategory, &GUID_NULL))
@ -434,8 +416,7 @@ static HRESULT IEnumDMO_Constructor(
WCHAR szguid[64]; WCHAR szguid[64];
WCHAR szKey[MAX_PATH]; WCHAR szKey[MAX_PATH];
wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory));
GUIDToString(szguid, guidCategory));
if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey)))
hr = HRESULT_FROM_WIN32(ret); hr = HRESULT_FROM_WIN32(ret);
} }
@ -443,10 +424,7 @@ static HRESULT IEnumDMO_Constructor(
lerr: lerr:
if (FAILED(hr)) if (FAILED(hr))
{ IEnumDMO_Release(&lpedmo->IEnumDMO_iface);
IEnumDMOImpl_Destructor(lpedmo);
HeapFree(GetProcessHeap(), 0, lpedmo);
}
else else
{ {
TRACE("returning %p\n", lpedmo); TRACE("returning %p\n", lpedmo);
@ -482,7 +460,7 @@ static HRESULT WINAPI IEnumDMO_fnQueryInterface(IEnumDMO* iface, REFIID riid, vo
IsEqualIID(riid, &IID_IUnknown)) IsEqualIID(riid, &IID_IUnknown))
{ {
*ppvObj = iface; *ppvObj = iface;
IEnumDMO_fnAddRef(iface); IEnumDMO_AddRef(iface);
} }
return *ppvObj ? S_OK : E_NOINTERFACE; return *ppvObj ? S_OK : E_NOINTERFACE;
@ -500,8 +478,11 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface)
if (!refCount) if (!refCount)
{ {
IEnumDMOImpl_Destructor(This); if (This->hkey)
HeapFree(GetProcessHeap(),0,This); RegCloseKey(This->hkey);
HeapFree(GetProcessHeap(), 0, This->pInTypes);
HeapFree(GetProcessHeap(), 0, This->pOutTypes);
HeapFree(GetProcessHeap(), 0, This);
} }
return refCount; return refCount;
} }
@ -517,7 +498,6 @@ static HRESULT WINAPI IEnumDMO_fnNext(
WCHAR ** Names, WCHAR ** Names,
DWORD * pcItemsFetched) DWORD * pcItemsFetched)
{ {
FILETIME ft;
HKEY hkey; HKEY hkey;
WCHAR szNextKey[MAX_PATH]; WCHAR szNextKey[MAX_PATH];
WCHAR szGuidKey[64]; WCHAR szGuidKey[64];
@ -540,7 +520,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
This->index++; This->index++;
len = MAX_PATH; len = MAX_PATH;
ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, NULL);
if (ret != ERROR_SUCCESS) if (ret != ERROR_SUCCESS)
{ {
hres = HRESULT_FROM_WIN32(ret); hres = HRESULT_FROM_WIN32(ret);
@ -563,6 +543,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey); wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey);
ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey);
TRACE("testing %s\n", debugstr_w(szKey));
if (This->pInTypes) if (This->pInTypes)
{ {
@ -582,6 +563,12 @@ static HRESULT WINAPI IEnumDMO_fnNext(
pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue;
TRACE("read %d intypes for %s:\n", cInTypes, debugstr_w(szKey));
for (i = 0; i < cInTypes; i++) {
TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type),
debugstr_guid(&pInTypes[i].subtype));
}
for (i = 0; i < This->cInTypes; i++) for (i = 0; i < This->cInTypes; i++)
{ {
for (j = 0; j < cInTypes; j++) for (j = 0; j < cInTypes; j++)
@ -619,6 +606,12 @@ static HRESULT WINAPI IEnumDMO_fnNext(
pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue;
TRACE("read %d outtypes for %s:\n", cOutTypes, debugstr_w(szKey));
for (i = 0; i < cOutTypes; i++) {
TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type),
debugstr_guid(&pOutTypes[i].subtype));
}
for (i = 0; i < This->cOutTypes; i++) for (i = 0; i < This->cOutTypes; i++)
{ {
for (j = 0; j < cOutTypes; j++) for (j = 0; j < cOutTypes; j++)
@ -644,7 +637,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len);
if (ERROR_SUCCESS == ret) if (ERROR_SUCCESS == ret)
{ {
Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR));
if (Names[count]) if (Names[count])
strcpyW(Names[count], szValue); strcpyW(Names[count], szValue);
} }
@ -700,7 +693,7 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum)
{ {
IEnumDMOImpl *This = impl_from_IEnumDMO(iface); IEnumDMOImpl *This = impl_from_IEnumDMO(iface);
TRACE("(%p)->(%p)\n", This, ppEnum); TRACE("(%p)->(%p)\n", This, ppEnum);
return IEnumDMO_Constructor(This->guidCategory, This->dwFlags, This->cInTypes, This->pInTypes, return IEnumDMO_Constructor(&This->category, This->dwFlags, This->cInTypes, This->pInTypes,
This->cOutTypes, This->pOutTypes, ppEnum); This->cOutTypes, This->pOutTypes, ppEnum);
} }
@ -711,18 +704,35 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum)
* Enumerate DirectX Media Objects in the registry. * Enumerate DirectX Media Objects in the registry.
*/ */
HRESULT WINAPI DMOEnum( HRESULT WINAPI DMOEnum(
REFGUID guidCategory, REFGUID category,
DWORD dwFlags, DWORD flags,
DWORD cInTypes, DWORD cInTypes,
const DMO_PARTIAL_MEDIATYPE *pInTypes, const DMO_PARTIAL_MEDIATYPE *pInTypes,
DWORD cOutTypes, DWORD cOutTypes,
const DMO_PARTIAL_MEDIATYPE *pOutTypes, const DMO_PARTIAL_MEDIATYPE *pOutTypes,
IEnumDMO **ppEnum) IEnumDMO **ppEnum)
{ {
TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n", TRACE("%s 0x%08x %d %p %d %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes,
guidCategory, dwFlags, cInTypes, cOutTypes); cOutTypes, pOutTypes, ppEnum);
return IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, if (TRACE_ON(msdmo))
{
DWORD i;
if (cInTypes)
{
for (i = 0; i < cInTypes; i++)
TRACE("intype %d - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type),
debugstr_guid(&pInTypes[i].subtype));
}
if (cOutTypes) {
for (i = 0; i < cOutTypes; i++)
TRACE("outtype %d - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type),
debugstr_guid(&pOutTypes[i].subtype));
}
}
return IEnumDMO_Constructor(category, flags, cInTypes,
pInTypes, cOutTypes, pOutTypes, ppEnum); pInTypes, cOutTypes, pOutTypes, ppEnum);
} }

2
reactos/media/doc/README.WINE
View file

@ -38,7 +38,7 @@ reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29
reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47
reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.37
reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.37