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

diff --git a/dll/directx/wine/d3dxof/main.c b/dll/directx/wine/d3dxof/main.c
index 572f388..385609a 100644 (file)
--- a/dll/directx/wine/d3dxof/main.c
+++ b/dll/directx/wine/d3dxof/main.c
@@ -195,13 +195,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
         && ! IsEqualGUID( &IID_IUnknown, riid) )
        return E_NOINTERFACE;
 
-    for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++)
+    for (i = 0; i < ARRAY_SIZE(object_creation); i++)
     {
        if (IsEqualGUID(object_creation[i].clsid, rclsid))
            break;
     }
 
-    if (i == sizeof(object_creation)/sizeof(object_creation[0]))
+    if (i == ARRAY_SIZE(object_creation))
     {
        FIXME("%s: no class found.\n", debugstr_guid(rclsid));
        return CLASS_E_CLASSNOTAVAILABLE;

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 0fa0aa7..d017ab9 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -27,7 +27,7 @@ reactos/dll/directx/wine/d3d9           # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.17
 reactos/dll/directx/wine/d3drm          # Synced to WineStaging-3.9
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.17
-reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-3.3
+reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-3.17
 reactos/dll/directx/wine/ddraw          # Synced to WineStaging-3.9
 reactos/dll/directx/wine/devenum        # Synced to WineStaging-3.9
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-3.9