Module: wine Branch: master Commit: 5fe7522ba1a17e1aba129df4683cebf55e8d7835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe7522ba1a17e1aba129df468...
Author: Dylan Smith dylan.ah.smith@gmail.com Date: Mon Feb 21 09:29:56 2011 -0500
d3dx9: Add stubs for D3DXCreateText.
---
dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/mesh.c | 24 ++++++++++++++++++++++++ include/d3dx9shape.h | 19 +++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index cbb6d20..f91f962 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -90,8 +90,8 @@ @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) -@ stub D3DXCreateTextA -@ stub D3DXCreateTextW +@ stdcall D3DXCreateTextA(ptr long str float float ptr ptr ptr) +@ stdcall D3DXCreateTextW(ptr long wstr float float ptr ptr ptr) @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stdcall D3DXCreateTextureFromFileA(ptr str ptr) @ stdcall D3DXCreateTextureFromFileExA(ptr str long long long long long long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d9dd01f..f8f7c48 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1499,3 +1499,27 @@ HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3
return E_NOTIMPL; } + +HRESULT WINAPI D3DXCreateTextA(LPDIRECT3DDEVICE9 device, + HDC hdc, LPCSTR text, + FLOAT deviation, FLOAT extrusion, + LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics) +{ + FIXME("(%p, %p, %s, %f, %f, %p, %p, %p): stub\n", device, hdc, + debugstr_a(text), deviation, extrusion, mesh, adjacency, glyphmetrics); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, + HDC hdc, LPCWSTR text, + FLOAT deviation, FLOAT extrusion, + LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics) +{ + FIXME("(%p, %p, %s, %f, %f, %p, %p, %p): stub\n", device, hdc, + debugstr_w(text), deviation, extrusion, mesh, adjacency, glyphmetrics); + + return E_NOTIMPL; +} diff --git a/include/d3dx9shape.h b/include/d3dx9shape.h index 1a521de..690b183 100644 --- a/include/d3dx9shape.h +++ b/include/d3dx9shape.h @@ -52,6 +52,25 @@ HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency);
+HRESULT WINAPI D3DXCreateTextA(LPDIRECT3DDEVICE9 device, + HDC hdc, + LPCSTR text, + FLOAT deviation, + FLOAT extrusion, + LPD3DXMESH *mesh, + LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics); + +HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, + HDC hdc, + LPCWSTR text, + FLOAT deviation, + FLOAT extrusion, + LPD3DXMESH *mesh, + LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics); +#define D3DXCreateText WINELIB_NAME_AW(D3DXCreateText) + #ifdef __cplusplus } #endif