Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-03-30 17:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSDMO] Sync with Wine Staging 3.17. CORE-15127

Browse source
This commit is contained in:
Amine Khaldi 2018-10-01 00:24:18 +01:00
parent ddfe5ce855
commit 64c1a65258
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/directx/wine/msdmo/CMakeLists.txt
View file

@ -1,7 +1,7 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
spec2def(msdmo.dll msdmo.spec) spec2def(msdmo.dll msdmo.spec ADD_IMPORTLIB)
list(APPEND SOURCE list(APPEND SOURCE
dmoreg.c dmoreg.c

4
dll/directx/wine/msdmo/dmoreg.c
View file

@ -208,7 +208,7 @@ HRESULT WINAPI DMORegister(
ret = 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 (ret) if (ret)
return HRESULT_FROM_WIN32(ret); return E_FAIL;
/* Create clsidDMO key under MediaObjects */ /* Create clsidDMO key under MediaObjects */
ret = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL, ret = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL,
@ -316,7 +316,7 @@ HRESULT WINAPI DMOUnregister(REFCLSID dmo, REFGUID category)
/* remove from all categories */ /* remove from all categories */
if (IsEqualGUID(category, &GUID_NULL)) if (IsEqualGUID(category, &GUID_NULL))
{ {
DWORD index = 0, len = sizeof(catW)/sizeof(WCHAR); DWORD index = 0, len = ARRAY_SIZE(catW);
while (!RegEnumKeyExW(categorieskey, index++, catW, &len, NULL, NULL, NULL, NULL)) while (!RegEnumKeyExW(categorieskey, index++, catW, &len, NULL, NULL, NULL, NULL))
hr = unregister_dmo_from_category(dmoW, catW, categorieskey); hr = unregister_dmo_from_category(dmoW, catW, categorieskey);

2
media/doc/README.WINE
View file

@ -37,7 +37,7 @@ reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3
reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.17 reactos/dll/directx/wine/dplayx # Synced to WineStaging-3.17
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-3.3 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-3.3
reactos/dll/directx/wine/msdmo # Synced to WineStaging-3.9 reactos/dll/directx/wine/msdmo # Synced to WineStaging-3.17
reactos/dll/directx/wine/qedit # Synced to WineStaging-3.3 reactos/dll/directx/wine/qedit # Synced to WineStaging-3.3
reactos/dll/directx/wine/quartz # Synced to WineStaging-3.9 reactos/dll/directx/wine/quartz # Synced to WineStaging-3.9
reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.9 reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.9