ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of the WINED3DADAPTER_IDENTIFIER typedef.

Browse Source
This commit is contained in:
Henri Verbeet 2011-11-23 21:14:57 +01:00 committed by Alexandre Julliard
parent 2fb21e0a2e
commit 376ffdf3d5
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/directx.c
View File

@ -123,7 +123,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier(LPDIRECT3D8 iface, UIN
DWORD Flags, D3DADAPTER_IDENTIFIER8 *pIdentifier) DWORD Flags, D3DADAPTER_IDENTIFIER8 *pIdentifier)
{ {
IDirect3D8Impl *This = impl_from_IDirect3D8(iface); IDirect3D8Impl *This = impl_from_IDirect3D8(iface);
WINED3DADAPTER_IDENTIFIER adapter_id; struct wined3d_adapter_identifier adapter_id;
HRESULT hr; HRESULT hr;
TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n",

4
dlls/d3d9/directx.c
View File

@ -121,7 +121,7 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(IDirect3D9Ex *iface, U
DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier) DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier)
{ {
IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface); IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
WINED3DADAPTER_IDENTIFIER adapter_id; struct wined3d_adapter_identifier adapter_id;
HRESULT hr; HRESULT hr;
TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n",
@ -529,7 +529,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3
static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid) static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid)
{ {
IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface); IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface);
WINED3DADAPTER_IDENTIFIER adapter_id; struct wined3d_adapter_identifier adapter_id;
HRESULT hr; HRESULT hr;
TRACE("iface %p, adapter %u, luid %p.\n", iface, adapter, luid); TRACE("iface %p, adapter %u, luid %p.\n", iface, adapter, luid);

2
dlls/ddraw/ddraw.c
View File

@ -1551,7 +1551,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C
*free = wined3d_device_get_available_texture_mem(This->wined3d_device); *free = wined3d_device_get_available_texture_mem(This->wined3d_device);
if (total) if (total)
{ {
WINED3DADAPTER_IDENTIFIER desc = {0}; struct wined3d_adapter_identifier desc = {0};
hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc); hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc);
*total = desc.video_memory; *total = desc.video_memory;

2
dlls/dxgi/adapter.c
View File

@ -138,7 +138,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac
static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc)
{ {
struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface);
WINED3DADAPTER_IDENTIFIER adapter_id; struct wined3d_adapter_identifier adapter_id;
char description[128]; char description[128];
struct wined3d *wined3d; struct wined3d *wined3d;
HRESULT hr; HRESULT hr;

2
dlls/wined3d/directx.c
View File

@ -3031,7 +3031,7 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI
/* NOTE: due to structure differences between dx8 and dx9 D3DADAPTER_IDENTIFIER, /* NOTE: due to structure differences between dx8 and dx9 D3DADAPTER_IDENTIFIER,
and fields being inserted in the middle, a new structure is used in place */ and fields being inserted in the middle, a new structure is used in place */
HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d,
UINT adapter_idx, DWORD flags, WINED3DADAPTER_IDENTIFIER *identifier) UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier)
{ {
const struct wined3d_adapter *adapter; const struct wined3d_adapter *adapter;
size_t len; size_t len;

6
include/wine/wined3d.h
View File

@ -1615,7 +1615,7 @@ struct wined3d_tri_patch_info
WINED3DDEGREETYPE degree; WINED3DDEGREETYPE degree;
}; };
typedef struct _WINED3DADAPTER_IDENTIFIER struct wined3d_adapter_identifier
{ {
char *driver; char *driver;
UINT driver_size; UINT driver_size;
@ -1632,7 +1632,7 @@ typedef struct _WINED3DADAPTER_IDENTIFIER
DWORD whql_level; DWORD whql_level;
LUID adapter_luid; LUID adapter_luid;
SIZE_T video_memory; SIZE_T video_memory;
} WINED3DADAPTER_IDENTIFIER; };
typedef struct _WINED3DPRESENT_PARAMETERS typedef struct _WINED3DPRESENT_PARAMETERS
{ {
@ -2126,7 +2126,7 @@ UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d);
HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx,
struct wined3d_display_mode *mode); struct wined3d_display_mode *mode);
HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx,
DWORD flags, WINED3DADAPTER_IDENTIFIER *identifier); DWORD flags, struct wined3d_adapter_identifier *identifier);
UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d,
UINT adapter_idx, enum wined3d_format_id format_id); UINT adapter_idx, enum wined3d_format_id format_id);
HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx); HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx);