Fixed some issues found by winapi_check.
This commit is contained in:
parent
ad00529bd8
commit
d5f824b482
|
@ -11,7 +11,7 @@
|
||||||
#include "ts_xlib.h"
|
#include "ts_xlib.h"
|
||||||
#include "ts_xf86dga2.h"
|
#include "ts_xf86dga2.h"
|
||||||
#include "x11drv.h"
|
#include "x11drv.h"
|
||||||
#include <ddraw.h>
|
#include "ddraw.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* Direct Draw Thunks and old vtables
|
/* Direct Draw Thunks and old vtables
|
||||||
* Copyright 2000 TransGaming Technologies Inc.
|
* Copyright 2000 TransGaming Technologies Inc.
|
||||||
*/
|
*/
|
||||||
#include <ddraw.h>
|
#include "ddraw.h"
|
||||||
#include "ddraw_private.h"
|
#include "ddraw_private.h"
|
||||||
#include "ddcomimpl.h"
|
#include "ddcomimpl.h"
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "debugtools.h"
|
#include "debugtools.h"
|
||||||
#include <ddraw.h>
|
#include "ddraw.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#include "ts_xlib.h"
|
#include "ts_xlib.h"
|
||||||
#include "ts_xf86vmode.h"
|
#include "ts_xf86vmode.h"
|
||||||
#include "x11drv.h"
|
#include "x11drv.h"
|
||||||
#include <ddraw.h>
|
#include "ddraw.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -13,8 +13,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include <ddraw.h>
|
#include "ddraw.h"
|
||||||
#include <d3d.h>
|
#include "d3d.h"
|
||||||
|
|
||||||
#include "debugtools.h"
|
#include "debugtools.h"
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
* Copyright 2000 TransGaming Technologies Inc.
|
* Copyright 2000 TransGaming Technologies Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ddraw.h>
|
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "ddraw.h"
|
||||||
|
|
||||||
#include "ddraw_private.h"
|
#include "ddraw_private.h"
|
||||||
|
|
||||||
void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS* pIn, DDSCAPS2* pOut)
|
void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS* pIn, DDSCAPS2* pOut)
|
||||||
|
|
|
@ -525,7 +525,7 @@ debug_channels (msvcrt)
|
||||||
@ stub _wfindnexti64 #(long ptr)
|
@ stub _wfindnexti64 #(long ptr)
|
||||||
@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
|
@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
|
||||||
@ stub _wfreopen #(wstr wstr ptr)
|
@ stub _wfreopen #(wstr wstr ptr)
|
||||||
@ cdecl _wfsopen(wstr wstr) MSVCRT__wfsopen
|
@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
|
||||||
@ stub _wfullpath #(wstr wstr long)
|
@ stub _wfullpath #(wstr wstr long)
|
||||||
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
|
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
|
||||||
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
|
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
|
||||||
|
@ -742,7 +742,7 @@ debug_channels (msvcrt)
|
||||||
@ cdecl vprintf(str long) MSVCRT_vprintf
|
@ cdecl vprintf(str long) MSVCRT_vprintf
|
||||||
@ cdecl vsprintf(ptr str ptr) vsprintf
|
@ cdecl vsprintf(ptr str ptr) vsprintf
|
||||||
@ cdecl vswprintf(wstr wstr long) MSVCRT_vswprintf
|
@ cdecl vswprintf(wstr wstr long) MSVCRT_vswprintf
|
||||||
@ varargs vwprintf(wstr long) MSVCRT_vwprintf
|
@ cdecl vwprintf(wstr long) MSVCRT_vwprintf
|
||||||
@ forward -noimport wcscat ntdll.wcscat
|
@ forward -noimport wcscat ntdll.wcscat
|
||||||
@ forward -noimport wcschr ntdll.wcschr
|
@ forward -noimport wcschr ntdll.wcschr
|
||||||
@ forward -noimport wcscmp ntdll.wcscmp
|
@ forward -noimport wcscmp ntdll.wcscmp
|
||||||
|
|
|
@ -21,7 +21,7 @@ debug_channels (shdocvw)
|
||||||
134 stub DoOrganizeFavDlg
|
134 stub DoOrganizeFavDlg
|
||||||
144 stub DoOrganizeFavDlgW
|
144 stub DoOrganizeFavDlgW
|
||||||
106 stub HlinkFindFrame
|
106 stub HlinkFindFrame
|
||||||
155 stub HlinkFrameNavigate
|
154 stub HlinkFrameNavigate
|
||||||
155 stub HlinkFrameNavigateNHL
|
155 stub HlinkFrameNavigateNHL
|
||||||
156 stub IEWriteErrorLog
|
156 stub IEWriteErrorLog
|
||||||
157 stub OpenURL
|
157 stub OpenURL
|
||||||
|
|
|
@ -6,7 +6,7 @@ owner w32skrnl
|
||||||
2 pascal16 BootTask() BootTask16
|
2 pascal16 BootTask() BootTask16
|
||||||
3 stub CREATEPROCESS
|
3 stub CREATEPROCESS
|
||||||
4 stub WAITFORDEBUGEVENT
|
4 stub WAITFORDEBUGEVENT
|
||||||
5 pascal CONTINUEDEBUGEVENT(long long long) ContinueDebugEvent
|
5 pascal ContinueDebugEvent(long long long) ContinueDebugEvent
|
||||||
6 pascal READPROCESSMEMORY(long ptr ptr long ptr) ReadProcessMemory
|
6 pascal READPROCESSMEMORY(long ptr ptr long ptr) ReadProcessMemory
|
||||||
7 stub WRITEPROCESSMEMORY
|
7 stub WRITEPROCESSMEMORY
|
||||||
8 stub GETTHREADCONTEXT
|
8 stub GETTHREADCONTEXT
|
||||||
|
|
|
@ -61,7 +61,7 @@ DECLARE_DEBUG_CHANNEL(relay);
|
||||||
|
|
||||||
typedef struct _DOSEVENT {
|
typedef struct _DOSEVENT {
|
||||||
int irq,priority;
|
int irq,priority;
|
||||||
void (*relay)(CONTEXT86*,void*);
|
DOSRELAY relay;
|
||||||
void *data;
|
void *data;
|
||||||
struct _DOSEVENT *next;
|
struct _DOSEVENT *next;
|
||||||
} DOSEVENT, *LPDOSEVENT;
|
} DOSEVENT, *LPDOSEVENT;
|
||||||
|
@ -213,7 +213,7 @@ static void DOSVM_SendQueuedEvents(CONTEXT86 *context)
|
||||||
DOSVM_SendQueuedEvent(context);
|
DOSVM_SendQueuedEvent(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WINAPI DOSVM_QueueEvent( int irq, int priority, void (*relay)(CONTEXT86*,void*), void *data)
|
void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data)
|
||||||
{
|
{
|
||||||
LPDOSEVENT event, cur, prev;
|
LPDOSEVENT event, cur, prev;
|
||||||
|
|
||||||
|
@ -413,7 +413,7 @@ static void DOSVM_ProcessMessage(MSG *msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WINAPI DOSVM_Wait( int read_pipe, HANDLE hObject )
|
void WINAPI DOSVM_Wait( INT read_pipe, HANDLE hObject )
|
||||||
{
|
{
|
||||||
MSG msg;
|
MSG msg;
|
||||||
DWORD waitret;
|
DWORD waitret;
|
||||||
|
@ -481,7 +481,7 @@ chk_console_input:
|
||||||
} while (TRUE);
|
} while (TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
int WINAPI DOSVM_Enter( CONTEXT86 *context )
|
INT WINAPI DOSVM_Enter( CONTEXT86 *context )
|
||||||
{
|
{
|
||||||
struct vm86plus_struct VM86;
|
struct vm86plus_struct VM86;
|
||||||
int stat,len,sig;
|
int stat,len,sig;
|
||||||
|
@ -584,7 +584,7 @@ void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void WINAPI DOSVM_SetTimer( unsigned ticks )
|
void WINAPI DOSVM_SetTimer( UINT ticks )
|
||||||
{
|
{
|
||||||
int stat=DOSMOD_SET_TIMER;
|
int stat=DOSMOD_SET_TIMER;
|
||||||
struct timeval tim;
|
struct timeval tim;
|
||||||
|
@ -608,7 +608,7 @@ void WINAPI DOSVM_SetTimer( unsigned ticks )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned WINAPI DOSVM_GetTimer( void )
|
UINT WINAPI DOSVM_GetTimer( void )
|
||||||
{
|
{
|
||||||
int stat=DOSMOD_GET_TIMER;
|
int stat=DOSMOD_GET_TIMER;
|
||||||
struct timeval tim;
|
struct timeval tim;
|
||||||
|
@ -632,17 +632,17 @@ unsigned WINAPI DOSVM_GetTimer( void )
|
||||||
|
|
||||||
#else /* !MZ_SUPPORTED */
|
#else /* !MZ_SUPPORTED */
|
||||||
|
|
||||||
int WINAPI DOSVM_Enter( CONTEXT86 *context )
|
INT WINAPI DOSVM_Enter( CONTEXT86 *context )
|
||||||
{
|
{
|
||||||
ERR_(module)("DOS realmode not supported on this architecture!\n");
|
ERR_(module)("DOS realmode not supported on this architecture!\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void WINAPI DOSVM_Wait( int read_pipe, HANDLE hObject) {}
|
void WINAPI DOSVM_Wait( INT read_pipe, HANDLE hObject) {}
|
||||||
void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val) {}
|
void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val) {}
|
||||||
void WINAPI DOSVM_SetTimer( unsigned ticks ) {}
|
void WINAPI DOSVM_SetTimer( UINT ticks ) {}
|
||||||
unsigned WINAPI DOSVM_GetTimer( void ) { return 0; }
|
UINT WINAPI DOSVM_GetTimer( void ) { return 0; }
|
||||||
void WINAPI DOSVM_QueueEvent( int irq, int priority, void (*relay)(CONTEXT86*,void*), void *data)
|
void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data)
|
||||||
{
|
{
|
||||||
if (irq<0) {
|
if (irq<0) {
|
||||||
/* callback event, perform it with dummy context */
|
/* callback event, perform it with dummy context */
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
* Copyright 1999 Eric Pouech
|
* Copyright 1999 Eric Pouech
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "wingdi.h"
|
#include "wingdi.h"
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
|
|
||||||
struct _DOSEVENT;
|
struct _DOSEVENT;
|
||||||
|
|
||||||
|
typedef void (*DOSRELAY)(CONTEXT86*,void*);
|
||||||
|
|
||||||
typedef struct _DOSTASK {
|
typedef struct _DOSTASK {
|
||||||
WORD psp_seg, retval;
|
WORD psp_seg, retval;
|
||||||
WORD dpmi_flag;
|
WORD dpmi_flag;
|
||||||
|
@ -35,11 +37,11 @@ extern BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVO
|
||||||
extern void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval );
|
extern void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval );
|
||||||
extern LPDOSTASK WINAPI MZ_Current( void );
|
extern LPDOSTASK WINAPI MZ_Current( void );
|
||||||
extern LPDOSTASK WINAPI MZ_AllocDPMITask( void );
|
extern LPDOSTASK WINAPI MZ_AllocDPMITask( void );
|
||||||
extern int WINAPI DOSVM_Enter( CONTEXT86 *context );
|
extern INT WINAPI DOSVM_Enter( CONTEXT86 *context );
|
||||||
extern void WINAPI DOSVM_Wait( int read_pipe, HANDLE hObject );
|
extern void WINAPI DOSVM_Wait( INT read_pipe, HANDLE hObject );
|
||||||
extern void WINAPI DOSVM_QueueEvent( int irq, int priority, void (*relay)(CONTEXT86*,void*), void *data );
|
extern void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data );
|
||||||
extern void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val );
|
extern void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val );
|
||||||
extern void WINAPI DOSVM_SetTimer( unsigned ticks );
|
extern void WINAPI DOSVM_SetTimer( UINT ticks );
|
||||||
extern unsigned WINAPI DOSVM_GetTimer( void );
|
extern UINT WINAPI DOSVM_GetTimer( void );
|
||||||
|
|
||||||
#endif /* __WINE_DOSEXE_H */
|
#endif /* __WINE_DOSEXE_H */
|
||||||
|
|
|
@ -241,9 +241,9 @@ void output_c_symbol (const parsed_symbol *sym)
|
||||||
if (!sym->function_name)
|
if (!sym->function_name)
|
||||||
{
|
{
|
||||||
/* #ifdef'd dummy */
|
/* #ifdef'd dummy */
|
||||||
fprintf (cfile, "#if 0\n%s %s_%s()\n{\n\t%s in .spec */\n}\n#endif\n\n\n",
|
fprintf (cfile, "#if 0\n%s %s_%s()\n{\n\t/* %s in .spec */\n}\n#endif\n\n\n",
|
||||||
CALLING_CONVENTION, OUTPUT_UC_DLL_NAME, sym->symbol,
|
CALLING_CONVENTION, OUTPUT_UC_DLL_NAME, sym->symbol,
|
||||||
globals.forward_dll ? "/* @forward" : "/* @stub");
|
globals.forward_dll ? "@forward" : "@stub");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue