[D3DXOF]
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 25 Sep 2014 19:49:32 +0000 (19:49 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 25 Sep 2014 19:49:32 +0000 (19:49 +0000)
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64287

reactos/dll/directx/wine/d3dxof/d3dxof.c
reactos/media/doc/README.WINE

index 8b8f3de..97fe43c 100644 (file)
@@ -125,6 +125,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
   HRESULT hr;
   LPBYTE file_buffer;
   DWORD file_size;
+  DWORD bytes_written;
 
   TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj);
 
@@ -229,7 +230,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV
     file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL);
     if (file != INVALID_HANDLE_VALUE)
     {
-      WriteFile(file, file_buffer, file_size, NULL, NULL);
+      WriteFile(file, file_buffer, file_size, &bytes_written, NULL);
       CloseHandle(file);
     }
   }
@@ -293,6 +294,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP
   parse_buffer buf;
   HRESULT hr;
   LPBYTE decomp_buffer = NULL;
+  DWORD bytes_written;
 
   ZeroMemory(&buf, sizeof(buf));
   buf.buffer = pvData;
@@ -314,7 +316,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP
     file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL);
     if (file != INVALID_HANDLE_VALUE)
     {
-      WriteFile(file, pvData, cbSize, NULL, NULL);
+      WriteFile(file, pvData, cbSize, &bytes_written, NULL);
       CloseHandle(file);
     }
   }
index bbc5ba0..1717ffb 100644 (file)
@@ -32,7 +32,7 @@ reactos/dll/directx/wine/d3d8           # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3d9           # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.27
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27
-reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.17
+reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.27
 reactos/dll/directx/wine/ddraw          # Synced to Wine-1.7.27
 reactos/dll/directx/wine/devenum        # Synced to Wine-1.7.17
 reactos/dll/directx/wine/dinput         # Synced to Wine-1.7.17