Author: akhaldi
Date: Thu Sep 25 19:49:32 2014
New Revision: 64287
URL:
http://svn.reactos.org/svn/reactos?rev=64287&view=rev
Log:
[D3DXOF]
* Sync with Wine 1.7.27.
CORE-8540
Modified:
trunk/reactos/dll/directx/wine/d3dxof/d3dxof.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 Sep 25 19:49:32 2014
@@ -125,6 +125,7 @@
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 @@
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 @@
parse_buffer buf;
HRESULT hr;
LPBYTE decomp_buffer = NULL;
+ DWORD bytes_written;
ZeroMemory(&buf, sizeof(buf));
buf.buffer = pvData;
@@ -314,7 +316,7 @@
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);
}
}
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 Sep 25 19:49:32 2014
@@ -32,7 +32,7 @@
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