[slimdx] r2204 committed - Fixed the DeviceEx.FromPointer method. Resolves issue 876.

[sli...@googlecode.com]

Revision: 2204
Author: mike.popoloski
Date: Sat Sep 15 11:09:34 2012
Log: Fixed the DeviceEx.FromPointer method. Resolves issue 876.
http://code.google.com/p/slimdx/source/detail?r=2204

Modified:
/trunk/build/ReleaseNotes.txt
/trunk/samples/Direct3D11/GameOfLife
/trunk/source/direct3d9/DeviceEx.cpp
/trunk/source/direct3d9/DeviceEx.h

=======================================
--- /trunk/build/ReleaseNotes.txt Fri May 4 21:51:40 2012
+++ /trunk/build/ReleaseNotes.txt Sat Sep 15 11:09:34 2012
@@ -13,6 +13,7 @@

Direct3D 9
* Fixed a bug in KeyframedAnimationSet.RegisterAnimationKeys that caused
invalid values to be set.
+ * Fixed the DeviceEx.FromPointer method.

Direct3D 10
* Added missing StateBlockMask constructor.
=======================================
--- /trunk/source/direct3d9/DeviceEx.cpp Sat Jan 28 10:03:11 2012
+++ /trunk/source/direct3d9/DeviceEx.cpp Sat Sep 15 11:09:34 2012
@@ -39,6 +39,26 @@
{
namespace Direct3D9
{
+ DeviceEx::DeviceEx( IDirect3DDevice9Ex* direct3d, ComObject^ owner )
+ {
+ Construct( direct3d, owner );
+ }
+
+ DeviceEx::DeviceEx( IntPtr pointer )
+ {
+ Construct( pointer, NativeInterface );
+ }
+
+ DeviceEx^ DeviceEx::FromPointer( IDirect3DDevice9Ex* pointer, ComObject^
owner, ComObjectFlags flags )
+ {
+ return ComObject::ConstructFromPointer<DeviceEx,IDirect3DDevice9Ex>(
pointer, owner, flags );
+ }
+
+ DeviceEx^ DeviceEx::FromPointer( IntPtr pointer )
+ {
+ return ComObject::ConstructFromUserPointer<DeviceEx>( pointer );
+ }
+
void DeviceEx::Internal_Constructor( Direct3DEx^ direct3D, int adapter,
DeviceType deviceType, System::IntPtr controlHandle,
CreateFlags createFlags, D3DDISPLAYMODEEX* fullscreenDisplayMode, ...
array<PresentParameters^>^ presentParameters )
{
=======================================
--- /trunk/source/direct3d9/DeviceEx.h Sat Jan 28 10:03:11 2012
+++ /trunk/source/direct3d9/DeviceEx.h Sat Sep 15 11:09:34 2012
@@ -63,7 +63,7 @@
/// <unmanaged>IDirect3DDevice9Ex</unmanaged>
public ref class DeviceEx : Device
{
- COMOBJECT(IDirect3DDevice9Ex, DeviceEx);
+ COMOBJECT_CUSTOM(IDirect3DDevice9Ex, DeviceEx);

private:
void Internal_Constructor( Direct3DEx^ direct3D, int adapter,
DeviceType deviceType, System::IntPtr controlHandle,