Fixed some issues found by winapi_check.

This commit is contained in:
Patrik Stridvall 2003-01-02 19:28:09 +00:00 committed by Alexandre Julliard
parent caa74b66be
commit 46304a7361
6 changed files with 26 additions and 15 deletions

View File

@ -19,9 +19,12 @@
*/ */
#include "config.h" #include "config.h"
#include <sys/stat.h>
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "sys/stat.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(crtdll); WINE_DEFAULT_DEBUG_CHANNEL(crtdll);

View File

@ -787,11 +787,17 @@ DWORD vshader_decl_parse(VERTEXSHADER8* vshader) {
return len * sizeof(DWORD); return len * sizeof(DWORD);
} }
/***********************************************************************
* ValidateVertexShader (D3D8.@)
*/
BOOL WINAPI ValidateVertexShader(LPVOID what, LPVOID toto) { BOOL WINAPI ValidateVertexShader(LPVOID what, LPVOID toto) {
FIXME("(void): stub: %p\n", what); FIXME("(void): stub: %p\n", what);
return TRUE; return TRUE;
} }
/***********************************************************************
* ValidatePixelShader (D3D8.@)
*/
BOOL WINAPI ValidatePixelShader(LPVOID what, LPVOID toto) { BOOL WINAPI ValidatePixelShader(LPVOID what, LPVOID toto) {
FIXME("(void): stub: %p\n", what); FIXME("(void): stub: %p\n", what);
return TRUE; return TRUE;

View File

@ -34,7 +34,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DEFAULT_DEBUG_CHANNEL(d3d);
HRESULT D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) {
ID3DXBufferImpl *object; ID3DXBufferImpl *object;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl)); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl));
@ -55,17 +55,17 @@ HRESULT D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) {
return D3D_OK; return D3D_OK;
} }
HRESULT D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont) { HRESULT WINAPI D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont) {
FIXME("(void): stub\n"); FIXME("(void): stub\n");
return D3D_OK; return D3D_OK;
} }
UINT D3DXGetFVFVertexSize(DWORD FVF) { UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF) {
FIXME("(void): stub\n"); FIXME("(void): stub\n");
return 0; return 0;
} }
HRESULT D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags,
LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppConstants,
LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompiledShader,
LPD3DXBUFFER* ppCompilationErrors) { LPD3DXBUFFER* ppCompilationErrors) {
@ -73,7 +73,7 @@ HRESULT D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags,
return D3D_OK; return D3D_OK;
} }
HRESULT D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags, HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppConstants,
LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompiledShader,
LPD3DXBUFFER* ppCompilationErrors) { LPD3DXBUFFER* ppCompilationErrors) {
@ -81,7 +81,7 @@ HRESULT D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
return D3D_OK; return D3D_OK;
} }
HRESULT D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags, HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags,
LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppConstants,
LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompiledShader,
LPD3DXBUFFER* ppCompilationErrors) { LPD3DXBUFFER* ppCompilationErrors) {

View File

@ -327,7 +327,7 @@
@ cdecl _lrotr(long long) _lrotr @ cdecl _lrotr(long long) _lrotr
@ cdecl _lsearch(ptr ptr long long ptr) _lsearch @ cdecl _lsearch(ptr ptr long long ptr) _lsearch
@ cdecl _lseek(long long long) _lseek @ 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 @ forward _ltoa ntdll._ltoa
@ cdecl _ltow(long ptr long) _ltow @ cdecl _ltow(long ptr long) _ltow
@ cdecl _makepath(str str str str str) _makepath @ cdecl _makepath(str str str str str) _makepath

View File

@ -40,7 +40,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include "windef.h" #include "windef.h"

View File

@ -107,18 +107,18 @@ ICOM_DEFINE(ID3DXFont,IUnknown)
/************************************************************************************* /*************************************************************************************
* Define entrypoints * Define entrypoints
*/ */
HRESULT D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer); HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer);
HRESULT D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont); HRESULT WINAPI D3DXCreateFont(LPDIRECT3DDEVICE8 pDevice, HFONT hFont, LPD3DXFONT* ppFont);
UINT D3DXGetFVFVertexSize(DWORD FVF); UINT WINAPI D3DXGetFVFVertexSize(DWORD FVF);
HRESULT D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags, HRESULT WINAPI D3DXAssembleShader(LPCVOID pSrcData, UINT SrcDataLen, DWORD Flags,
LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppConstants,
LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompiledShader,
LPD3DXBUFFER* ppCompilationErrors); LPD3DXBUFFER* ppCompilationErrors);
HRESULT D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags, HRESULT WINAPI D3DXAssembleShaderFromFileA(LPSTR pSrcFile, DWORD Flags,
LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppConstants,
LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompiledShader,
LPD3DXBUFFER* ppCompilationErrors); LPD3DXBUFFER* ppCompilationErrors);
HRESULT D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags, HRESULT WINAPI D3DXAssembleShaderFromFileW(LPSTR pSrcFile, DWORD Flags,
LPD3DXBUFFER* ppConstants, LPD3DXBUFFER* ppConstants,
LPD3DXBUFFER* ppCompiledShader, LPD3DXBUFFER* ppCompiledShader,
LPD3DXBUFFER* ppCompilationErrors); LPD3DXBUFFER* ppCompilationErrors);