From 7175367ad5c010dfe83b921cad4ff92a626722d5 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Fri, 30 Aug 2013 08:42:47 +0200
Subject: [PATCH] d3dx9: Avoid some needless casts.

---
 dlls/d3dx9_36/shader.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 8e5236d9a81..e3f6d5c7f28 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -328,13 +328,13 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR
 HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
         ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
 {
+    void *buffer;
     HRSRC res;
-    LPCSTR buffer;
     DWORD len;
 
     if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA)))
         return D3DXERR_INVALIDDATA;
-    if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len)))
+    if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
         return D3DXERR_INVALIDDATA;
     return D3DXAssembleShader(buffer, len, defines, include, flags,
                               shader, error_messages);
@@ -343,13 +343,13 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou
 HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
         ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
 {
+    void *buffer;
     HRSRC res;
-    LPCSTR buffer;
     DWORD len;
 
     if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA)))
         return D3DXERR_INVALIDDATA;
-    if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len)))
+    if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
         return D3DXERR_INVALIDDATA;
     return D3DXAssembleShader(buffer, len, defines, include, flags,
                               shader, error_messages);
@@ -448,13 +448,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour
         ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags,
         ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table)
 {
+    void *buffer;
     HRSRC res;
-    LPCSTR buffer;
     DWORD len;
 
     if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA)))
         return D3DXERR_INVALIDDATA;
-    if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len)))
+    if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
         return D3DXERR_INVALIDDATA;
     return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile,
                              flags, shader, error_messages, constant_table);
@@ -464,13 +464,13 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou
         ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags,
         ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table)
 {
+    void *buffer;
     HRSRC res;
-    LPCSTR buffer;
     DWORD len;
 
     if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA)))
         return D3DXERR_INVALIDDATA;
-    if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len)))
+    if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
         return D3DXERR_INVALIDDATA;
     return D3DXCompileShader(buffer, len, defines, include, entrypoint, profile,
                              flags, shader, error_messages, constant_table);
@@ -534,13 +534,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA
 HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *resource, const D3DXMACRO *defines,
         ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
 {
+    void *buffer;
     HRSRC res;
-    const char *buffer;
     DWORD len;
 
     if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA)))
         return D3DXERR_INVALIDDATA;
-    if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len)))
+    if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
         return D3DXERR_INVALIDDATA;
     return D3DXPreprocessShader(buffer, len, defines, include,
                                 shader, error_messages);
@@ -549,13 +549,13 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res
 HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *resource, const D3DXMACRO *defines,
         ID3DXInclude *include, ID3DXBuffer **shader, ID3DXBuffer **error_messages)
 {
+    void *buffer;
     HRSRC res;
-    const char *buffer;
     DWORD len;
 
     if (!(res = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA)))
         return D3DXERR_INVALIDDATA;
-    if (FAILED(load_resource_into_memory(module, res, (void **)&buffer, &len)))
+    if (FAILED(load_resource_into_memory(module, res, &buffer, &len)))
         return D3DXERR_INVALIDDATA;
     return D3DXPreprocessShader(buffer, len, defines, include,
                                 shader, error_messages);
-- 
2.11.4.GIT