Module: wine Branch: master Commit: 376ffdf3d52b022dbb655d18f58d0bb90028a440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376ffdf3d52b022dbb655d18f5...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Nov 23 21:14:57 2011 +0100
wined3d: Get rid of the WINED3DADAPTER_IDENTIFIER typedef.
---
dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 4 ++-- dlls/ddraw/ddraw.c | 2 +- dlls/dxgi/adapter.c | 2 +- dlls/wined3d/directx.c | 2 +- include/wine/wined3d.h | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 657eacd..379c911 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -123,7 +123,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier(LPDIRECT3D8 iface, UIN DWORD Flags, D3DADAPTER_IDENTIFIER8 *pIdentifier) { IDirect3D8Impl *This = impl_from_IDirect3D8(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; HRESULT hr;
TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 4e202a5..144cad5 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -121,7 +121,7 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(IDirect3D9Ex *iface, U DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier) { IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; HRESULT hr;
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) { IDirect3D9Impl *This = impl_from_IDirect3D9Ex(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; HRESULT hr;
TRACE("iface %p, adapter %u, luid %p.\n", iface, adapter, luid); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b5ff3fc..d7aad8f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1551,7 +1551,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C *free = wined3d_device_get_available_texture_mem(This->wined3d_device); if (total) { - WINED3DADAPTER_IDENTIFIER desc = {0}; + struct wined3d_adapter_identifier desc = {0};
hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc); *total = desc.video_memory; diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index bf27a60..87d886b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -138,7 +138,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) { struct dxgi_adapter *This = impl_from_IWineDXGIAdapter(iface); - WINED3DADAPTER_IDENTIFIER adapter_id; + struct wined3d_adapter_identifier adapter_id; char description[128]; struct wined3d *wined3d; HRESULT hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 574c406..e8cce94 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -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, and fields being inserted in the middle, a new structure is used in place */ 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; size_t len; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6585800..5bcc35b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1615,7 +1615,7 @@ struct wined3d_tri_patch_info WINED3DDEGREETYPE degree; };
-typedef struct _WINED3DADAPTER_IDENTIFIER +struct wined3d_adapter_identifier { char *driver; UINT driver_size; @@ -1632,7 +1632,7 @@ typedef struct _WINED3DADAPTER_IDENTIFIER DWORD whql_level; LUID adapter_luid; SIZE_T video_memory; -} WINED3DADAPTER_IDENTIFIER; +};
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, struct wined3d_display_mode *mode); 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 adapter_idx, enum wined3d_format_id format_id); HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx);