From 4f148c28a1e695817673b7e99fa6e4aa363558a7 Mon Sep 17 00:00:00 2001 From: Tony Wasserka Date: Tue, 19 Feb 2008 19:46:30 +0100 Subject: [PATCH] d3dx9: Implement D3DXCheckVersion. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_24/d3dx9_24_main.c | 12 ++++++++++++ dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_25/d3dx9_25_main.c | 12 ++++++++++++ dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_26/d3dx9_26_main.c | 12 ++++++++++++ dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_27/d3dx9_27_main.c | 12 ++++++++++++ dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_28/d3dx9_28_main.c | 12 ++++++++++++ dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_29/d3dx9_29_main.c | 12 ++++++++++++ dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_30/d3dx9_30_main.c | 12 ++++++++++++ dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_31/d3dx9_31_main.c | 12 ++++++++++++ dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_32/d3dx9_32_main.c | 13 +++++++++++++ dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_33/d3dx9_33_main.c | 13 +++++++++++++ dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_34/d3dx9_34_main.c | 12 ++++++++++++ dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_35/d3dx9_35_main.c | 12 ++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/d3dx9_36_main.c | 12 ++++++++++++ 26 files changed, 171 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index 3cd695ab86d..3a7e007e873 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_24/d3dx9_24_main.c b/dlls/d3dx9_24/d3dx9_24_main.c index c5d671635b4..1d4e9786a03 100644 --- a/dlls/d3dx9_24/d3dx9_24_main.c +++ b/dlls/d3dx9_24/d3dx9_24_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==24) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index 74b013d51c4..849d0ababe4 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_25/d3dx9_25_main.c b/dlls/d3dx9_25/d3dx9_25_main.c index c5d671635b4..7d1955aac23 100644 --- a/dlls/d3dx9_25/d3dx9_25_main.c +++ b/dlls/d3dx9_25/d3dx9_25_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==25) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index a06efef2422..55d40425803 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_26/d3dx9_26_main.c b/dlls/d3dx9_26/d3dx9_26_main.c index c5d671635b4..570bfeac92e 100644 --- a/dlls/d3dx9_26/d3dx9_26_main.c +++ b/dlls/d3dx9_26/d3dx9_26_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==26) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index a06efef2422..55d40425803 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_27/d3dx9_27_main.c b/dlls/d3dx9_27/d3dx9_27_main.c index c5d671635b4..e872a9dded8 100644 --- a/dlls/d3dx9_27/d3dx9_27_main.c +++ b/dlls/d3dx9_27/d3dx9_27_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==27) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index 6b837dcaf34..e6648b86480 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_28/d3dx9_28_main.c b/dlls/d3dx9_28/d3dx9_28_main.c index c5d671635b4..d861b37841d 100644 --- a/dlls/d3dx9_28/d3dx9_28_main.c +++ b/dlls/d3dx9_28/d3dx9_28_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==28) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index 6b837dcaf34..e6648b86480 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_29/d3dx9_29_main.c b/dlls/d3dx9_29/d3dx9_29_main.c index c5d671635b4..a1dc9ae9d5e 100644 --- a/dlls/d3dx9_29/d3dx9_29_main.c +++ b/dlls/d3dx9_29/d3dx9_29_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==29) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index 6b837dcaf34..e6648b86480 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_30/d3dx9_30_main.c b/dlls/d3dx9_30/d3dx9_30_main.c index c5d671635b4..1cafa4156d7 100644 --- a/dlls/d3dx9_30/d3dx9_30_main.c +++ b/dlls/d3dx9_30/d3dx9_30_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==30) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index 9e5e2e3a26a..807b7a90b74 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_31/d3dx9_31_main.c b/dlls/d3dx9_31/d3dx9_31_main.c index c5d671635b4..13f8e170853 100644 --- a/dlls/d3dx9_31/d3dx9_31_main.c +++ b/dlls/d3dx9_31/d3dx9_31_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==31) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index 54abbd96324..5a152aeeef8 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_32/d3dx9_32_main.c b/dlls/d3dx9_32/d3dx9_32_main.c index c5d671635b4..f03c4397631 100644 --- a/dlls/d3dx9_32/d3dx9_32_main.c +++ b/dlls/d3dx9_32/d3dx9_32_main.c @@ -51,3 +51,16 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==32) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index 54abbd96324..5a152aeeef8 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_33/d3dx9_33_main.c b/dlls/d3dx9_33/d3dx9_33_main.c index c5d671635b4..e8e144be434 100644 --- a/dlls/d3dx9_33/d3dx9_33_main.c +++ b/dlls/d3dx9_33/d3dx9_33_main.c @@ -51,3 +51,16 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==33) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index 54abbd96324..5a152aeeef8 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_34/d3dx9_34_main.c b/dlls/d3dx9_34/d3dx9_34_main.c index c5d671635b4..e34b4d647ca 100644 --- a/dlls/d3dx9_34/d3dx9_34_main.c +++ b/dlls/d3dx9_34/d3dx9_34_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==34) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index 54abbd96324..5a152aeeef8 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements -@ stdcall D3DXCheckVersion(long long) d3dx9_36.D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements @ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_35/d3dx9_35_main.c b/dlls/d3dx9_35/d3dx9_35_main.c index c5d671635b4..bde53688c38 100644 --- a/dlls/d3dx9_35/d3dx9_35_main.c +++ b/dlls/d3dx9_35/d3dx9_35_main.c @@ -51,3 +51,15 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) } return TRUE; } + +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==35) + return TRUE; + else + return FALSE; +} diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 607a09876c4..1a26ebcebad 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -6,7 +6,7 @@ @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx8.D3DXBoxBoundProbe @ stub D3DXCheckCubeTextureRequirements @ stub D3DXCheckTextureRequirements -@ stub D3DXCheckVersion +@ stdcall D3DXCheckVersion(long long) @ stub D3DXCheckVolumeTextureRequirements @ stub D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx8.D3DXColorAdjustContrast diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/d3dx9_36_main.c index 6ccb78c9b3a..1857eb9323b 100644 --- a/dlls/d3dx9_36/d3dx9_36_main.c +++ b/dlls/d3dx9_36/d3dx9_36_main.c @@ -53,6 +53,18 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return TRUE; } +/*********************************************************************** + * D3DXCheckVersion + * Checks wether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==36) + return TRUE; + else + return FALSE; +} + /*********************************************************************** * D3DXGetDriverLevel. * Returns always 900 (DX 9) for us