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

diff --git a/dll/directx/wine/msdmo/CMakeLists.txt b/dll/directx/wine/msdmo/CMakeLists.txt
index 3a76372..43b7a80 100644 (file)
--- a/dll/directx/wine/msdmo/CMakeLists.txt
+++ b/dll/directx/wine/msdmo/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-spec2def(msdmo.dll msdmo.spec)
+spec2def(msdmo.dll msdmo.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     dmoreg.c

diff --git a/dll/directx/wine/msdmo/dmoreg.c b/dll/directx/wine/msdmo/dmoreg.c
index 2161d40..864cb85 100644 (file)
--- a/dll/directx/wine/msdmo/dmoreg.c
+++ b/dll/directx/wine/msdmo/dmoreg.c
@@ -208,7 +208,7 @@ HRESULT WINAPI DMORegister(
     ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, NULL,
         REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hrkey, NULL);
     if (ret)
-        return HRESULT_FROM_WIN32(ret);
+        return E_FAIL;
 
     /* Create clsidDMO key under MediaObjects */ 
     ret = RegCreateKeyExW(hrkey, GUIDToString(szguid, clsidDMO), 0, NULL,
@@ -316,7 +316,7 @@ HRESULT WINAPI DMOUnregister(REFCLSID dmo, REFGUID category)
     /* remove from all categories */
     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))
             hr = unregister_dmo_from_category(dmoW, catW, categorieskey);

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index b51b408..5fb5472 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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/dsound         # Synced to Wine-1.3.29
 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/quartz         # Synced to WineStaging-3.9
 reactos/dll/directx/wine/wined3d        # Synced to WineStaging-3.9