From 46304a73613d30ac237a1b15b5fc716c1aad9308 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Thu, 2 Jan 2003 19:28:09 +0000
Subject: [PATCH] Fixed some issues found by winapi_check.

---
 dlls/crtdll/crtdll_main.c   |  5 ++++-
 dlls/d3d8/shader.c          |  6 ++++++
 dlls/d3dx8/d3dx8_main.c     | 12 ++++++------
 dlls/msvcrt/msvcrt.spec     |  2 +-
 dlls/winmm/winejack/audio.c |  4 +++-
 include/d3dx8core.h         | 12 ++++++------
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c
index e16a9bdc174..f4614595bca 100644
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@@ -19,9 +19,12 @@
  */
 
 #include "config.h"
+
+#include <sys/stat.h>
+
 #include "windef.h"
 #include "winbase.h"
-#include "sys/stat.h"
+
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(crtdll);
diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c
index 022e0121c47..9a8de0b574d 100644
--- a/dlls/d3d8/shader.c
+++ b/dlls/d3d8/shader.c
@@ -787,11 +787,17 @@ DWORD vshader_decl_parse(VERTEXSHADER8* vshader) {
   return len * sizeof(DWORD);
 }
 
+/***********************************************************************
+ *		ValidateVertexShader (D3D8.@)
+ */
 BOOL WINAPI ValidateVertexShader(LPVOID what, LPVOID toto) {
   FIXME("(void): stub: %p\n", what);
   return TRUE;
 }
 
+/***********************************************************************
+ *		ValidatePixelShader (D3D8.@)
+ */
 BOOL WINAPI ValidatePixelShader(LPVOID what, LPVOID toto) {
   FIXME("(void): stub: %p\n", what);
   return TRUE;
diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c
index 18abfa93b87..98b35c7f8f2 100644
--- a/dlls/d3dx8/d3dx8_main.c
+++ b/dlls/d3dx8/d3dx8_main.c
@@ -34,7 +34,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 
-HRESULT D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) {
+HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) {
   ID3DXBufferImpl *object;
 
   object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl));
@@ -55,17 +55,17 @@ HRESULT D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) {
   return D3D_OK;
 }
 
-HRESULT D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont) {
+HRESULT WINAPI D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont) {
   FIXME("(void): stub\n");
   return D3D_OK;
 }
 
-UINT D3DXGetFVFVertexSize(DWORD FVF) {
+UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF) {
   FIXME("(void): stub\n");
   return 0;
 }
 
-HRESULT D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, 
+HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, 
 			   LPD3DXBUFFER* ppConstants, 
 			   LPD3DXBUFFER* ppCompiledShader,
 			   LPD3DXBUFFER* ppCompilationErrors) {
@@ -73,7 +73,7 @@ HRESULT D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags,
   return D3D_OK;
 }
 
-HRESULT D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors) {
@@ -81,7 +81,7 @@ HRESULT D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
   return D3D_OK;
 }
 
-HRESULT D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors) {
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 1200c9d458c..936f9e4e0ce 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -327,7 +327,7 @@
 @ cdecl _lrotr(long long) _lrotr
 @ cdecl _lsearch(ptr ptr long long ptr) _lsearch
 @ cdecl _lseek(long long long) _lseek
-@ cdecl -ret64 _lseeki64(long long long) _lseeki64
+@ cdecl -ret64 _lseeki64(long long long long) _lseeki64
 @ forward _ltoa ntdll._ltoa
 @ cdecl _ltow(long ptr long) _ltow
 @ cdecl _makepath(str str str str str) _makepath
diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c
index 0d1c5bd5787..8d5c1caf9c8 100644
--- a/dlls/winmm/winejack/audio.c
+++ b/dlls/winmm/winejack/audio.c
@@ -40,7 +40,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include "windef.h"
diff --git a/include/d3dx8core.h b/include/d3dx8core.h
index f54b9615da0..00457ec00d4 100644
--- a/include/d3dx8core.h
+++ b/include/d3dx8core.h
@@ -107,18 +107,18 @@ ICOM_DEFINE(ID3DXFont,IUnknown)
 /*************************************************************************************
  * Define entrypoints 
  */
-HRESULT D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer);
-HRESULT D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont);
-UINT D3DXGetFVFVertexSize(DWORD FVF);
-HRESULT D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, 
+HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer);
+HRESULT WINAPI D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont);
+UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF);
+HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, 
 			   LPD3DXBUFFER* ppConstants, 
 			   LPD3DXBUFFER* ppCompiledShader,
 			   LPD3DXBUFFER* ppCompilationErrors);
-HRESULT D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors);
-HRESULT D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags,
+HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags,
 				    LPD3DXBUFFER* ppConstants,
 				    LPD3DXBUFFER* ppCompiledShader,
 				    LPD3DXBUFFER* ppCompilationErrors);