[akhaldi] 53339: * Somehow these got missed in the sync, even though they were marked as committed...
20 Aug
2011
20 Aug
'11
1:55 p.m.
Author: akhaldi
Date: Sat Aug 20 13:55:31 2011
New Revision: 53339
URL: http://svn.reactos.org/svn/reactos?rev=53339&view=rev
Log:
* Somehow these got missed in the sync, even though they were marked as committed...
Modified:
branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h
branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h
Modified: branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/directx…
==============================================================================
--- branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/directx/wine/d3d8/d3d8_private.h [iso-8859-1] Sat Aug
20 13:55:31 2011
@@ -109,7 +109,6 @@
typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl;
typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl;
typedef struct IDirect3DSwapChain8Impl IDirect3DSwapChain8Impl;
-typedef struct IDirect3DResource8Impl IDirect3DResource8Impl;
typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl;
typedef struct IDirect3DVertexBuffer8Impl IDirect3DVertexBuffer8Impl;
typedef struct IDirect3DVertexShader8Impl IDirect3DVertexShader8Impl;
@@ -132,12 +131,9 @@
*/
struct IDirect3D8Impl
{
- /* IUnknown fields */
- const IDirect3D8Vtbl *lpVtbl;
- LONG ref;
-
- /* The WineD3D device */
- IWineD3D *WineD3D;
+ IDirect3D8 IDirect3D8_iface;
+ LONG ref;
+ struct wined3d *WineD3D;
};
/*****************************************************************************
@@ -178,22 +174,22 @@
struct IDirect3DDevice8Impl
{
/* IUnknown fields */
- const IDirect3DDevice8Vtbl *lpVtbl;
- const IWineD3DDeviceParentVtbl *device_parent_vtbl;
- LONG ref;
-/* But what about baseVertexIndex in state blocks? hmm... it may be a better idea to pass
this to wined3d */
- IWineD3DDevice *WineD3DDevice;
- struct d3d8_handle_table handle_table;
+ IDirect3DDevice8 IDirect3DDevice8_iface;
+ struct wined3d_device_parent device_parent;
+ LONG ref;
+ struct wined3d_device *wined3d_device;
+ struct d3d8_handle_table handle_table;
/* FVF management */
struct FvfToDecl *decls;
UINT numConvertedDecls, declArraySize;
/* Avoids recursion with nested ReleaseRef to 0 */
- BOOL inDestruction;
-};
-
-HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapter,
+ BOOL inDestruction;
+ BOOL lost;
+};
+
+HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT adapter,
D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS
*parameters) DECLSPEC_HIDDEN;
/* ---------------- */
@@ -205,18 +201,11 @@
*/
struct IDirect3DVolume8Impl
{
- /* IUnknown fields */
- const IDirect3DVolume8Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DVolume8 fields */
- IWineD3DVolume *wineD3DVolume;
-
- /* The volume container */
- IUnknown *container;
-
- /* If set forward refcounting to this object */
- IUnknown *forwardReference;
+ IDirect3DVolume8 IDirect3DVolume8_iface;
+ LONG ref;
+ struct wined3d_volume *wined3d_volume;
+ IUnknown *container;
+ IUnknown *forwardReference;
};
HRESULT volume_init(IDirect3DVolume8Impl *volume, IDirect3DDevice8Impl *device, UINT
width, UINT height,
@@ -232,14 +221,10 @@
struct IDirect3DSwapChain8Impl
{
/* IUnknown fields */
- const IDirect3DSwapChain8Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DSwapChain8 fields */
- IWineD3DSwapChain *wineD3DSwapChain;
-
- /* Parent reference */
- LPDIRECT3DDEVICE8 parentDevice;
+ IDirect3DSwapChain8 IDirect3DSwapChain8_iface;
+ LONG ref;
+ struct wined3d_swapchain *wined3d_swapchain;
+ IDirect3DDevice8 *parentDevice;
};
HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl *device,
@@ -257,12 +242,8 @@
/* IUnknown fields */
const IDirect3DSurface8Vtbl *lpVtbl;
LONG ref;
-
- /* IDirect3DSurface8 fields */
- IWineD3DSurface *wineD3DSurface;
-
- /* Parent reference */
- LPDIRECT3DDEVICE8 parentDevice;
+ struct wined3d_surface *wined3d_surface;
+ IDirect3DDevice8 *parentDevice;
/* The surface container */
IUnknown *container;
@@ -275,16 +256,6 @@
UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT
level,
DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD
multisample_quality) DECLSPEC_HIDDEN;
-struct IDirect3DResource8Impl
-{
- /* IUnknown fields */
- const IDirect3DResource8Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DResource8 fields */
- IWineD3DResource *wineD3DResource;
-};
-
/* ---------------------- */
/* IDirect3DVertexBuffer8 */
/* ---------------------- */
@@ -298,13 +269,9 @@
const IDirect3DVertexBuffer8Vtbl *lpVtbl;
LONG ref;
- /* IDirect3DResource8 fields */
- IWineD3DBuffer *wineD3DVertexBuffer;
-
- /* Parent reference */
- LPDIRECT3DDEVICE8 parentDevice;
-
- DWORD fvf;
+ struct wined3d_buffer *wineD3DVertexBuffer;
+ IDirect3DDevice8 *parentDevice;
+ DWORD fvf;
};
HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Impl
*device,
@@ -323,12 +290,8 @@
const IDirect3DIndexBuffer8Vtbl *lpVtbl;
LONG ref;
- /* IDirect3DResource8 fields */
- IWineD3DBuffer *wineD3DIndexBuffer;
-
- /* Parent reference */
- LPDIRECT3DDEVICE8 parentDevice;
-
+ struct wined3d_buffer *wineD3DIndexBuffer;
+ IDirect3DDevice8 *parentDevice;
enum wined3d_format_id format;
};
@@ -347,9 +310,7 @@
/* IUnknown fields */
const IDirect3DBaseTexture8Vtbl *lpVtbl;
LONG ref;
-
- /* IDirect3DResource8 fields */
- IWineD3DBaseTexture *wineD3DBaseTexture;
+ struct wined3d_texture *wined3d_texture;
};
/* --------------------- */
@@ -361,15 +322,10 @@
*/
struct IDirect3DCubeTexture8Impl
{
- /* IUnknown fields */
- const IDirect3DCubeTexture8Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DResource8 fields */
- IWineD3DCubeTexture *wineD3DCubeTexture;
-
- /* Parent reference */
- LPDIRECT3DDEVICE8 parentDevice;
+ IDirect3DCubeTexture8 IDirect3DCubeTexture8_iface;
+ LONG ref;
+ struct wined3d_texture *wined3d_texture;
+ IDirect3DDevice8 *parentDevice;
};
HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Impl
*device,
@@ -384,15 +340,10 @@
*/
struct IDirect3DTexture8Impl
{
- /* IUnknown fields */
- const IDirect3DTexture8Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DResourc8 fields */
- IWineD3DTexture *wineD3DTexture;
-
- /* Parent reference */
- LPDIRECT3DDEVICE8 parentDevice;
+ IDirect3DTexture8 IDirect3DTexture8_iface;
+ LONG ref;
+ struct wined3d_texture *wined3d_texture;
+ IDirect3DDevice8 *parentDevice;
};
HRESULT texture_init(IDirect3DTexture8Impl *texture, IDirect3DDevice8Impl *device,
@@ -407,15 +358,10 @@
*/
struct IDirect3DVolumeTexture8Impl
{
- /* IUnknown fields */
- const IDirect3DVolumeTexture8Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DResource8 fields */
- IWineD3DVolumeTexture *wineD3DVolumeTexture;
-
- /* Parent reference */
- LPDIRECT3DDEVICE8 parentDevice;
+ IDirect3DVolumeTexture8 IDirect3DVolumeTexture8_iface;
+ LONG ref;
+ struct wined3d_texture *wined3d_texture;
+ IDirect3DDevice8 *parentDevice;
};
HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice8Impl
*device,
@@ -455,7 +401,7 @@
DWORD *elements;
DWORD elements_size; /* Size of elements, in bytes */
- IWineD3DVertexDeclaration *wined3d_vertex_declaration;
+ struct wined3d_vertex_declaration *wined3d_vertex_declaration;
DWORD shader_handle;
} IDirect3DVertexDeclaration8Impl;
@@ -509,11 +455,10 @@
*/
struct IDirect3DVertexShader8Impl {
- const IDirect3DVertexShader8Vtbl *lpVtbl;
- LONG ref;
-
- IDirect3DVertexDeclaration8 *vertex_declaration;
- IWineD3DVertexShader *wineD3DVertexShader;
+ IDirect3DVertexShader8 IDirect3DVertexShader8_iface;
+ LONG ref;
+ IDirect3DVertexDeclaration8 *vertex_declaration;
+ struct wined3d_shader *wined3d_shader;
};
HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Impl
*device,
@@ -525,11 +470,10 @@
* IDirect3DPixelShader implementation structure
*/
typedef struct IDirect3DPixelShader8Impl {
- const IDirect3DPixelShader8Vtbl *lpVtbl;
+ IDirect3DPixelShader8 IDirect3DPixelShader8_iface;
LONG ref;
-
- DWORD handle;
- IWineD3DPixelShader *wineD3DPixelShader;
+ DWORD handle;
+ struct wined3d_shader *wined3d_shader;
} IDirect3DPixelShader8Impl;
HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl *device,
@@ -537,7 +481,7 @@
D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN;
enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN;
-void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader
*wined3d_vertex_shader) DECLSPEC_HIDDEN;
+void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader
*wined3d_vertex_shader) DECLSPEC_HIDDEN;
size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN;
#endif /* __WINE_D3DX8_PRIVATE_H */
Modified: branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/directx…
==============================================================================
--- branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1]
(original)
+++ branches/shell32_new-bringup/dll/directx/wine/d3d9/d3d9_private.h [iso-8859-1] Sat Aug
20 13:55:31 2011
@@ -146,11 +146,10 @@
typedef struct IDirect3D9Impl
{
/* IUnknown fields */
- const IDirect3D9ExVtbl *lpVtbl;
- LONG ref;
-
- /* The WineD3D device */
- IWineD3D *WineD3D;
+ IDirect3D9Ex IDirect3D9Ex_iface;
+ LONG ref;
+
+ struct wined3d *WineD3D;
/* Created via Direct3DCreate9Ex? Can QI extended interfaces */
BOOL extended;
@@ -163,14 +162,10 @@
*/
typedef struct IDirect3DDevice9Impl
{
- /* IUnknown fields */
- const IDirect3DDevice9ExVtbl *lpVtbl;
- const IWineD3DDeviceParentVtbl *device_parent_vtbl;
- LONG ref;
-
- /* IDirect3DDevice9 fields */
- IWineD3DDevice *WineD3DDevice;
-
+ IDirect3DDevice9Ex IDirect3DDevice9Ex_iface;
+ struct wined3d_device_parent device_parent;
+ LONG ref;
+ struct wined3d_device *wined3d_device;
/* Avoids recursion with nested ReleaseRef to 0 */
BOOL inDestruction;
@@ -180,8 +175,8 @@
BOOL notreset;
} IDirect3DDevice9Impl;
-HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT adapter,
D3DDEVTYPE device_type,
- HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters)
DECLSPEC_HIDDEN;
+HRESULT device_init(IDirect3DDevice9Impl *device, struct wined3d *wined3d, UINT adapter,
D3DDEVTYPE device_type,
+ HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters,
D3DDISPLAYMODEEX *mode) DECLSPEC_HIDDEN;
/*****************************************************************************
* IDirect3DVolume9 implementation structure
@@ -189,17 +184,11 @@
typedef struct IDirect3DVolume9Impl
{
/* IUnknown fields */
- const IDirect3DVolume9Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DVolume9 fields */
- IWineD3DVolume *wineD3DVolume;
-
- /* The volume container */
- IUnknown *container;
-
- /* If set forward refcounting to this object */
- IUnknown *forwardReference;
+ IDirect3DVolume9 IDirect3DVolume9_iface;
+ LONG ref;
+ struct wined3d_volume *wined3d_volume;
+ IUnknown *container;
+ IUnknown *forwardReference;
} IDirect3DVolume9Impl;
HRESULT volume_init(IDirect3DVolume9Impl *volume, IDirect3DDevice9Impl *device, UINT
width, UINT height,
@@ -217,15 +206,8 @@
/* IUnknown fields */
const IDirect3DSwapChain9Vtbl *lpVtbl;
LONG ref;
-
- /* IDirect3DSwapChain9 fields */
- IWineD3DSwapChain *wineD3DSwapChain;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
-
- /* Flags an implicit swap chain */
- BOOL isImplicit;
+ struct wined3d_swapchain *wined3d_swapchain;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DSwapChain9Impl;
HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device,
@@ -243,12 +225,8 @@
/* IUnknown fields */
const IDirect3DSurface9Vtbl *lpVtbl;
LONG ref;
-
- /* IDirect3DResource9 fields */
- IWineD3DSurface *wineD3DSurface;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ struct wined3d_surface *wined3d_surface;
+ IDirect3DDevice9Ex *parentDevice;
/* The surface container */
IUnknown *container;
@@ -276,12 +254,8 @@
const IDirect3DVertexBuffer9Vtbl *lpVtbl;
LONG ref;
- /* IDirect3DResource9 fields */
- IWineD3DBuffer *wineD3DVertexBuffer;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
-
+ struct wined3d_buffer *wineD3DVertexBuffer;
+ IDirect3DDevice9Ex *parentDevice;
DWORD fvf;
} IDirect3DVertexBuffer9Impl;
@@ -301,11 +275,8 @@
const IDirect3DIndexBuffer9Vtbl *lpVtbl;
LONG ref;
- /* IDirect3DResource9 fields */
- IWineD3DBuffer *wineD3DIndexBuffer;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ struct wined3d_buffer *wineD3DIndexBuffer;
+ IDirect3DDevice9Ex *parentDevice;
enum wined3d_format_id format;
} IDirect3DIndexBuffer9Impl;
@@ -321,12 +292,9 @@
*/
typedef struct IDirect3DBaseTexture9Impl
{
- /* IUnknown fields */
const IDirect3DBaseTexture9Vtbl *lpVtbl;
LONG ref;
-
- /* IDirect3DResource9 fields */
- IWineD3DBaseTexture *wineD3DBaseTexture;
+ struct wined3d_texture *wined3d_texture;
} IDirect3DBaseTexture9Impl;
/* --------------------- */
@@ -338,15 +306,10 @@
*/
typedef struct IDirect3DCubeTexture9Impl
{
- /* IUnknown fields */
- const IDirect3DCubeTexture9Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DResource9 fields */
- IWineD3DCubeTexture *wineD3DCubeTexture;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ IDirect3DCubeTexture9 IDirect3DCubeTexture9_iface;
+ LONG ref;
+ struct wined3d_texture *wined3d_texture;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DCubeTexture9Impl;
HRESULT cubetexture_init(IDirect3DCubeTexture9Impl *texture, IDirect3DDevice9Impl
*device,
@@ -361,15 +324,10 @@
*/
typedef struct IDirect3DTexture9Impl
{
- /* IUnknown fields */
- const IDirect3DTexture9Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DResource9 fields */
- IWineD3DTexture *wineD3DTexture;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ IDirect3DTexture9 IDirect3DTexture9_iface;
+ LONG ref;
+ struct wined3d_texture *wined3d_texture;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DTexture9Impl;
HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device,
@@ -384,15 +342,10 @@
*/
typedef struct IDirect3DVolumeTexture9Impl
{
- /* IUnknown fields */
- const IDirect3DVolumeTexture9Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DResource9 fields */
- IWineD3DVolumeTexture *wineD3DVolumeTexture;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ IDirect3DVolumeTexture9 IDirect3DVolumeTexture9_iface;
+ LONG ref;
+ struct wined3d_texture *wined3d_texture;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DVolumeTexture9Impl;
HRESULT volumetexture_init(IDirect3DVolumeTexture9Impl *texture, IDirect3DDevice9Impl
*device,
@@ -406,19 +359,18 @@
* IDirect3DStateBlock9 implementation structure
*/
typedef struct IDirect3DStateBlock9Impl {
- /* IUnknown fields */
- const IDirect3DStateBlock9Vtbl *lpVtbl;
+ IDirect3DStateBlock9 IDirect3DStateBlock9_iface;
LONG ref;
/* IDirect3DStateBlock9 fields */
- IWineD3DStateBlock *wineD3DStateBlock;
+ struct wined3d_stateblock *wined3d_stateblock;
/* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DStateBlock9Impl;
HRESULT stateblock_init(IDirect3DStateBlock9Impl *stateblock, IDirect3DDevice9Impl
*device,
- D3DSTATEBLOCKTYPE type, IWineD3DStateBlock *wined3d_stateblock) DECLSPEC_HIDDEN;
+ D3DSTATEBLOCKTYPE type, struct wined3d_stateblock *wined3d_stateblock)
DECLSPEC_HIDDEN;
/* --------------------------- */
/* IDirect3DVertexDeclaration9 */
@@ -436,7 +388,7 @@
UINT element_count;
/* IDirect3DVertexDeclaration9 fields */
- IWineD3DVertexDeclaration *wineD3DVertexDeclaration;
+ struct wined3d_vertex_declaration *wineD3DVertexDeclaration;
DWORD convFVF;
/* Parent reference */
@@ -457,13 +409,9 @@
typedef struct IDirect3DVertexShader9Impl {
/* IUnknown fields */
const IDirect3DVertexShader9Vtbl *lpVtbl;
- LONG ref;
-
- /* IDirect3DVertexShader9 fields */
- IWineD3DVertexShader *wineD3DVertexShader;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ LONG ref;
+ struct wined3d_shader *wined3d_shader;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DVertexShader9Impl;
HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader,
@@ -483,12 +431,8 @@
/* IUnknown fields */
const IDirect3DPixelShader9Vtbl *lpVtbl;
LONG ref;
-
- /* IDirect3DPixelShader9 fields */
- IWineD3DPixelShader *wineD3DPixelShader;
-
- /* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ struct wined3d_shader *wined3d_shader;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DPixelShader9Impl;
HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader,
@@ -502,15 +446,14 @@
* IDirect3DPixelShader implementation structure
*/
typedef struct IDirect3DQuery9Impl {
- /* IUnknown fields */
- const IDirect3DQuery9Vtbl *lpVtbl;
+ IDirect3DQuery9 IDirect3DQuery9_iface;
LONG ref;
/* IDirect3DQuery9 fields */
- IWineD3DQuery *wineD3DQuery;
+ struct wined3d_query *wineD3DQuery;
/* Parent reference */
- LPDIRECT3DDEVICE9EX parentDevice;
+ IDirect3DDevice9Ex *parentDevice;
} IDirect3DQuery9Impl;
HRESULT query_init(IDirect3DQuery9Impl *query, IDirect3DDevice9Impl *device,
5063
days inactive
5063
days old
0 comments
1 participants
participants (1)
-
akhaldi＠svn.reactos.org