Francois Gouget : d3dx8: Fix the D3DXAssembleShaderFromFileA/W() prototypes .

Alexandre Julliard julliard at winehq.org
Tue Feb 5 06:34:46 CST 2008


Module: wine
Branch: master
Commit: 3d962e27ed69829645f3c8f99c17087f92d89e01
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3d962e27ed69829645f3c8f99c17087f92d89e01

Author: Francois Gouget <fgouget at free.fr>
Date:   Tue Feb  5 00:04:54 2008 +0100

d3dx8: Fix the D3DXAssembleShaderFromFileA/W() prototypes.

---

 dlls/d3dx8/d3dx8_main.c |    4 ++--
 include/d3dx8core.h     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c
index c24aedc..ee897a8 100644
--- a/dlls/d3dx8/d3dx8_main.c
+++ b/dlls/d3dx8/d3dx8_main.c
@@ -73,7 +73,7 @@ HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags
   return D3D_OK;
 }
 
-HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors) {
@@ -91,7 +91,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
   return ret;
 }
 
-HRESULT WINAPI D3DXAssembleShaderFromFileW(LPWSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors) {
diff --git a/include/d3dx8core.h b/include/d3dx8core.h
index fb99e7a..6de4583 100644
--- a/include/d3dx8core.h
+++ b/include/d3dx8core.h
@@ -114,11 +114,11 @@ HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags
 			   LPD3DXBUFFER* ppConstants, 
 			   LPD3DXBUFFER* ppCompiledShader,
 			   LPD3DXBUFFER* ppCompilationErrors);
-HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors);
-HRESULT WINAPI D3DXAssembleShaderFromFileW(LPWSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors);




More information about the wine-cvs mailing list