[akhaldi] 72262: [D3DXOF] Sync with Wine Staging 1.9.16. CORE-11866

Author: akhaldi
Date: Thu Aug 18 09:40:45 2016
New Revision: 72262

URL: http://svn.reactos.org/svn/reactos?rev=72262&view=rev
Log:
[D3DXOF] Sync with Wine Staging 1.9.16. CORE-11866

Modified:
    trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
    trunk/reactos/dll/directx/wine/d3dxof/parsing.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c	[iso-8859-1] Thu Aug 18 09:40:45 2016
@@ -889,7 +889,7 @@
   object->level = 0;
   object->from_ref = TRUE;
 
-  *ppDataObj = (LPDIRECTXFILEDATA)object;
+  *ppDataObj = &object->IDirectXFileData_iface;
 
   return DXFILE_OK;
 }
@@ -1044,10 +1044,10 @@
     goto error;
   }
 
-  *ppDataObj = (LPDIRECTXFILEDATA)object;
+  *ppDataObj = &object->IDirectXFileData_iface;
 
   /* Get a reference to created object */
-  This->pRefObjects[This->nb_xobjects] = (LPDIRECTXFILEDATA)object;
+  This->pRefObjects[This->nb_xobjects] = &object->IDirectXFileData_iface;
   IDirectXFileData_AddRef(This->pRefObjects[This->nb_xobjects]);
 
   This->nb_xobjects++;

Modified: trunk/reactos/dll/directx/wine/d3dxof/parsing.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/pa…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3dxof/parsing.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3dxof/parsing.c	[iso-8859-1] Thu Aug 18 09:40:45 2016
@@ -736,7 +736,7 @@
       {
         buf->list_nb_elements--;
         buf->list_separator = FALSE;
-        /* Insert separarator between each values and since list does not accept
separator at the end
+        /* Insert separator between each value, and since list does not accept separator
at the end
            use a comma so any extra separator will generate an error */
         token = TOKEN_COMMA;
       }
@@ -749,7 +749,7 @@
         *(DWORD*)buf->value = value;
 
         buf->list_separator = TRUE;
-        /* Convert list into a serie of their basic type counterpart */
+        /* Convert list into a series of their basic type counterpart */
         token = buf->list_type_float ? TOKEN_FLOAT : TOKEN_INTEGER;
       }
       dump_TOKEN(token);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Aug 18 09:40:45 2016
@@ -27,7 +27,7 @@
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/d3drm          # Synced to WineStaging-1.9.16
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4
-reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-1.9.11
+reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-1.9.16
 reactos/dll/directx/wine/ddraw          # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/devenum        # Synced to WineStaging-1.9.11
 reactos/dll/directx/wine/dinput         # Synced to WineStaging-1.9.11