June 2011 - Wine-Commits - list.winehq.org

Dylan Smith : d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 3d7af6a334eadc6f207e97e5eb0a4a65eb67a603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7af6a334eadc6f207e97e5e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Jun 25 14:32:16 2011 -0400 d3dx9/tests: Fix comparison that expects NAN, since NAN != NAN. --- dlls/d3dx9_36/tests/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c96b94e..98d77d9 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4809,7 +4809,7 @@ static void test_create_skin_info(void) exp_vertices[0] = 0; exp_vertices[1] = 0x87654321; exp_weights[0] = 0.5; - exp_weights[1] = 0.0f / 0.0f; + exp_weights[1] = 0.0f / 0.0f; /* NAN */ num_influences = 2; hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 1, num_influences, vertices, weights); @@ -4834,7 +4834,7 @@ static void test_create_skin_info(void) for (i = 0; i < num_influences; i++) { ok(exp_vertices[i] == vertices[i], "influence[%d]: expected vertex %u, got %u\n", i, exp_vertices[i], vertices[i]); - ok(exp_weights[i] == weights[i], + ok((isnan(exp_weights[i]) && isnan(weights[i])) || exp_weights[i] == weights[i], "influence[%d]: expected weights %g, got %g\n", i, exp_weights[i], weights[i]); }

1 0

Piotr Caban : comctl32: Improved setting button state.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: d2c9a5cfae5251ba03cf6ff639012a2a9216a39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c9a5cfae5251ba03cf6ff63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:59 2011 +0200 comctl32: Improved setting button state. --- dlls/comctl32/theme_button.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 488c751..90e1172 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -246,18 +246,26 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); - ButtonState drawState = IsWindowEnabled(hwnd) ? STATE_NORMAL : STATE_DISABLED; + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); + ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; - if (paint) + if(!paint) + return FALSE; + + if(IsWindowEnabled(hwnd)) { - hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags); - if (!hParamDC) EndPaint(hwnd, &ps); - return TRUE; + if(state & BST_PUSHED) drawState = STATE_PRESSED; + else if(state & BST_HOT) drawState = STATE_HOT; + else if(state & BST_FOCUS) drawState = STATE_DEFAULTED; + else drawState = STATE_NORMAL; } + else drawState = STATE_DISABLED; - return FALSE; /* Delegate drawing to the non-themed code. */ + hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); + paint(theme, hwnd, hDC, drawState, dtFlags); + if (!hParamDC) EndPaint(hwnd, &ps); + return TRUE; } /**********************************************************************

1 0

Piotr Caban : include: Added vsstyle.h.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: b3831c474a6a1403d6027ff834d1d27901b65f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3831c474a6a1403d6027ff83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:25 2011 +0200 include: Added vsstyle.h. --- include/Makefile.in | 1 + include/vsstyle.h | 1746 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1747 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3831c474a6a1403d6027…

1 0

Piotr Caban : user32: Don't redeclare button state macros.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 371cff4883f465587c5b00eb5a66b2c517fd4c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371cff4883f465587c5b00eb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:06 2011 +0200 user32: Don't redeclare button state macros. --- dlls/user32/button.c | 80 +++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=371cff4883f465587c5b0…

1 0

Aric Stewart : usp10: Restart Indic syllable processing immediately after malformed syllable.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: cf40ef178e6cb8da6efc552409f03d07dddaef28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf40ef178e6cb8da6efc55240… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 27 11:00:58 2011 -0500 usp10: Restart Indic syllable processing immediately after malformed syllable. --- dlls/usp10/indic.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index f3b7f3a..43bf0e5 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -353,16 +353,8 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L } else if (index < cChar) { - int i; TRACE("Processing failed at %i\n",index); - for (i = index; i < cChar; i++) - if (lex(input[i])==lex_Generic) - { - TRACE("Restart processing at %i\n",i); - next = i; - index = i; - break; - } + next = ++index; } } TRACE("Processed %i of %i characters into %i syllables\n",index,cChar,*syllable_count);

1 0

Piotr Caban : comctl32: Prevent double theme closing when WM_DESTROY is called many times.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 7e3103199cc8e115e0828bcad9441a5b940e4b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3103199cc8e115e0828bcad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:22:40 2011 +0200 comctl32: Prevent double theme closing when WM_DESTROY is called many times. --- dlls/comctl32/theme_dialog.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 915db07..cdca2dd 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -54,7 +54,9 @@ LRESULT CALLBACK THEMING_DialogSubclassProc (HWND hWnd, UINT msg, case WM_DESTROY: CloseThemeData ( theme ); - return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); + SetWindowTheme( hWnd, NULL, NULL ); + OpenThemeData( hWnd, NULL ); + return THEMING_CallOriginalClass (hWnd, msg, wParam, lParam); case WM_THEMECHANGED: CloseThemeData ( theme );

1 0

Piotr Caban : comctl32: Use vssym32.h instead of tmschema.h.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: f831f77515fdaa9332473a8304e05d8633df0d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f831f77515fdaa9332473a830… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 27 14:21:48 2011 +0200 comctl32: Use vssym32.h instead of tmschema.h. --- dlls/comctl32/header.c | 2 +- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/progress.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/status.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/theme_button.c | 2 +- dlls/comctl32/theme_combo.c | 2 +- dlls/comctl32/theme_dialog.c | 2 +- dlls/comctl32/theme_edit.c | 2 +- dlls/comctl32/theme_listbox.c | 2 +- dlls/comctl32/toolbar.c | 2 +- dlls/comctl32/trackbar.c | 2 +- dlls/comctl32/treeview.c | 2 +- dlls/comctl32/updown.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 603d0a3..1cf28aa 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -40,7 +40,7 @@ #include "commctrl.h" #include "comctl32.h" #include "imagelist.h" -#include "tmschema.h" +#include "vssym32.h" #include "uxtheme.h" #include "wine/debug.h" diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 79133ba..ebe53f4 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -53,7 +53,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 71fba9d..d331d19 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -44,7 +44,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(progress); diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cc3c8a7..99bde77 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -92,7 +92,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rebar); diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 427fb76..1cb69eb 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -52,7 +52,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(statusbar); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 1ad8c53..e4a7adc 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -64,7 +64,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" #include <math.h> diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 113e851..488c751 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ diff --git a/dlls/comctl32/theme_combo.c b/dlls/comctl32/theme_combo.c index a6c6f87..9482a3b 100644 --- a/dlls/comctl32/theme_combo.c +++ b/dlls/comctl32/theme_combo.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/theme_dialog.c b/dlls/comctl32/theme_dialog.c index 9285941..915db07 100644 --- a/dlls/comctl32/theme_dialog.c +++ b/dlls/comctl32/theme_dialog.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/theme_edit.c b/dlls/comctl32/theme_edit.c index b3b142a..c6fd34c 100644 --- a/dlls/comctl32/theme_edit.c +++ b/dlls/comctl32/theme_edit.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/theme_listbox.c b/dlls/comctl32/theme_listbox.c index 8147ba4..9177214 100644 --- a/dlls/comctl32/theme_listbox.c +++ b/dlls/comctl32/theme_listbox.c @@ -28,7 +28,7 @@ #include "wingdi.h" #include "winuser.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "comctl32.h" #include "wine/debug.h" diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 2af5cec..46584b5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -81,7 +81,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(toolbar); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c924b53..91f8176 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -42,7 +42,7 @@ #include "winnls.h" #include "commctrl.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/debug.h" #include "comctl32.h" diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index bd65fca..909c1eb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -60,7 +60,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 75653e1..2c5fc60 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -41,7 +41,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0

John Edmonds : ddraw: Warning message about an invalid structure size will now print the structure 's size.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: ed1788bad0eb7bb2a41eb832f1197fadda4d8db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1788bad0eb7bb2a41eb832f… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Sun Jun 26 13:52:27 2011 -0400 ddraw: Warning message about an invalid structure size will now print the structure's size. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1b70d7e..102aa55 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -863,7 +863,7 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, if(DDSD->dwSize != sizeof(DDSURFACEDESC) && DDSD->dwSize != sizeof(DDSURFACEDESC2)) { - WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDERR_INVALIDPARAMS); + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDSD->dwSize); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; }

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: BeginPass().
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: fb6c973b4be113d4a1cf72329820b37422f68e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6c973b4be113d4a1cf72329… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:24 2011 +0200 d3dx9: Implement ID3DXEffect::BeginPass(). --- dlls/d3dx9_36/effect.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a1bdc5d..79b53b1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -166,6 +166,7 @@ struct ID3DXEffectImpl LPDIRECT3DDEVICE9 device; LPD3DXEFFECTPOOL pool; D3DXHANDLE active_technique; + D3DXHANDLE active_pass; ID3DXBaseEffect *base_effect; }; @@ -2819,13 +2820,25 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect* iface, UINT pass) +static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = get_technique_struct(This->active_technique); - FIXME("(%p)->(%u): stub\n", This, pass); + TRACE("iface %p, pass %u\n", This, pass); - return E_NOTIMPL; + if (technique && pass < technique->pass_count && !This->active_pass) + { + This->active_pass = technique->pass_handles[pass]; + + FIXME("No states applied, yet!\n"); + + return D3D_OK; + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) @@ -5012,6 +5025,7 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC if (object->technique_handles) { effect->active_technique = object->technique_handles[0]; + effect->active_pass = NULL; } return D3D_OK;

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect::Begin().
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: a63be635fcceed3b08bec53963b5daddb93586f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63be635fcceed3b08bec5396… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:20 2011 +0200 d3dx9: Implement ID3DXEffect::Begin(). --- dlls/d3dx9_36/effect.c | 32 +++++++++++++++++++++++++++++--- include/d3dx9effect.h | 6 ++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4b320fd..a1bdc5d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -165,6 +165,7 @@ struct ID3DXEffectImpl LPD3DXEFFECTSTATEMANAGER manager; LPDIRECT3DDEVICE9 device; LPD3DXEFFECTPOOL pool; + D3DXHANDLE active_technique; ID3DXBaseEffect *base_effect; }; @@ -2790,13 +2791,32 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL return FALSE; } -static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect* iface, UINT *passes, DWORD flags) +static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx_technique *technique = get_technique_struct(This->active_technique); - FIXME("(%p)->(%p, %#x): stub\n", This, passes, flags); + FIXME("iface %p, passes %p, flags %#x partial stub\n", This, passes, flags); - return E_NOTIMPL; + if (passes && technique) + { + if (This->manager || flags & D3DXFX_DONOTSAVESTATE) + { + TRACE("State capturing disabled.\n"); + } + else + { + FIXME("State capturing not supported, yet!\n"); + } + + *passes = technique->pass_count; + + return D3D_OK; + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect* iface, UINT pass) @@ -4988,6 +5008,12 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC effect->base_effect = &object->ID3DXBaseEffect_iface; + /* initialize defaults - check because of unsupported ascii effects */ + if (object->technique_handles) + { + effect->active_technique = object->technique_handles[0]; + } + return D3D_OK; err_out: diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index e0d1de5..035f4d6 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -21,6 +21,12 @@ #ifndef __D3DX9EFFECT_H__ #define __D3DX9EFFECT_H__ +#define D3DXFX_DONOTSAVESTATE (1 << 0) +#define D3DXFX_DONOTSAVESHADERSTATE (1 << 1) +#define D3DXFX_DONOTSAVESAMPLERSTATE (1 << 2) +#define D3DXFX_NOT_CLONEABLE (1 << 11) +#define D3DXFX_LARGEADDRESSAWARE (1 << 17) + #define D3DX_PARAMETER_SHARED 1 #define D3DX_PARAMETER_LITERAL 2 #define D3DX_PARAMETER_ANNOTATION 4

1 0