Christian Costa : d3dx9_36: Add stub for D3DXLoadVolumeFromMemory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 60f736af87971143887e526b0ae36bb7dd73163d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=60f736af87971143887e526b0a...

Author: Christian Costa <titan.costa(a)wanadoo.fr>
Date:   Wed Mar 31 22:45:27 2010 +0200

d3dx9_36: Add stub for D3DXLoadVolumeFromMemory.

---

 dlls/d3dx9_36/Makefile.in   |    3 ++-
 dlls/d3dx9_36/d3dx9_36.spec |    2 +-
 dlls/d3dx9_36/volume.c      |   40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
index d7f558b..e38c62a 100644
--- a/dlls/d3dx9_36/Makefile.in
+++ b/dlls/d3dx9_36/Makefile.in
@@ -21,7 +21,8 @@ C_SRCS = \
 	sprite.c \
 	surface.c \
 	texture.c \
-	util.c
+	util.c \
+	volume.c
 
 LEX_SRCS = asmshader.l
 BISON_SRCS = asmshader.y
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
index 3e64218..a847aac 100644
--- a/dlls/d3dx9_36/d3dx9_36.spec
+++ b/dlls/d3dx9_36/d3dx9_36.spec
@@ -192,7 +192,7 @@
 @ stub D3DXLoadVolumeFromFileA
 @ stub D3DXLoadVolumeFromFileInMemory
 @ stub D3DXLoadVolumeFromFileW
-@ stub D3DXLoadVolumeFromMemory
+@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long)
 @ stub D3DXLoadVolumeFromResourceA
 @ stub D3DXLoadVolumeFromResourceW
 @ stub D3DXLoadVolumeFromVolume
diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c
new file mode 100644
index 0000000..1eae9f4
--- /dev/null
+++ b/dlls/d3dx9_36/volume.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2010 Christian Costa
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "wine/debug.h"
+#include "d3dx9_36_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
+
+HRESULT WINAPI D3DXLoadVolumeFromMemory(LPDIRECT3DVOLUME9 destvolume,
+                                        CONST PALETTEENTRY* destpalette,
+                                        CONST D3DBOX* destbox,
+                                        LPCVOID srcmemory,
+                                        D3DFORMAT srcformat,
+                                        UINT srcrowpitch,
+                                        UINT srcslicepitch,
+                                        CONST PALETTEENTRY* srcpalette,
+                                        CONST D3DBOX* srcbox,
+                                        DWORD filter,
+                                        D3DCOLOR colorkey)
+{
+    FIXME("(%p, %p, %p, %p, %x, %u, %u, %p, %p, %x, %x): stub\n", destvolume, destpalette, destbox, srcmemory, srcformat,
+        srcrowpitch, srcslicepitch, srcpalette, srcbox, filter, colorkey);
+
+    return E_NOTIMPL;
+}