Make D3DX9 required on Windows for D3D support.

Also, fix a few assorted D3D errors found by Visual Studio.

Author: SiegeLordEx

CMakeLists.txt

@@ -872,21 +872,18 @@ if(WIN32)
     endif(XINPUT_FOUND)
 
     if(WANT_D3D)
-        if(D3D9_FOUND)
+        if(D3D9_FOUND AND D3DX9_FOUND)
             set(SUPPORT_D3D 1)
             set(ALLEGRO_CFG_D3D 1)
-        endif(D3D9_FOUND)
-    endif(WANT_D3D)
+            set(ALLEGRO_CFG_D3DX9 1)
+        endif()
 
-    if(SUPPORT_D3D)
         if(D3DX9_FOUND)
             include_directories(BEFORE ${D3DX9_INCLUDE_DIR})
-            set(ALLEGRO_CFG_D3DX9 1)
         else()
-            message("D3DX9 not found. You will not be able to compress or "
-                    "decompress textures on the GPU.")
+            message("D3DX9 not found, disabling D3D support.")
         endif()
-    endif(SUPPORT_D3D)
+    endif(WANT_D3D)
 
     if(WANT_D3D9EX AND SUPPORT_D3D)
         set(ALLEGRO_CFG_D3D9EX 1)

addons/primitives/primitives.c

@@ -160,7 +160,7 @@ void* al_lock_index_buffer(ALLEGRO_INDEX_BUFFER* buffer, int offset,
 void al_unlock_vertex_buffer(ALLEGRO_VERTEX_BUFFER* buffer)
 {
    ASSERT(addon_initialized);
-   return _al_unlock_vertex_buffer(buffer);
+   _al_unlock_vertex_buffer(buffer);
 }
 
 /* Function: al_unlock_index_buffer

src/win/d3d_disp.cpp

@@ -3085,7 +3085,7 @@ static D3D_STATE setup_state(LPDIRECT3DDEVICE9 device, const ALLEGRO_VERTEX_DECL
       if (use_fixed_pipeline) {
          device->GetTextureStageState(0, D3DTSS_TEXTURETRANSFORMFLAGS, &state.old_ttf_state);
          device->SetTextureStageState(0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
-         device->SetTransform(D3DTS_TEXTURE0, (D3DMATRIX *)&mat);
+         device->SetTransform(D3DTS_TEXTURE0, (D3DMATRIX *)mat);
       }
       else {
          d3d_disp->effect->SetMatrix(ALLEGRO_SHADER_VAR_TEX_MATRIX, (D3DXMATRIX *)mat);