https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db2b3364c65aa5044df613...
commit db2b3364c65aa5044df613b9f2e1b4f8a0a875c8 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Mon Oct 1 00:20:18 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Mon Oct 1 00:20:18 2018 +0100
[D3DXOF] Sync with Wine Staging 3.17. CORE-15127 --- dll/directx/wine/d3dxof/main.c | 4 ++-- media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dll/directx/wine/d3dxof/main.c b/dll/directx/wine/d3dxof/main.c index 572f38831f..385609ace0 100644 --- 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 0fa0aa7abf..d017ab97c2 100644 --- 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
-
Amine Khaldi