From a274dd9105f7b0a1d9f6d23388afa6cd06900f90 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Mon, 2 Jul 2001 01:22:10 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/gdi/dispdib.spec | 2 +- dlls/gdi/wing.spec | 42 +++++++++++++++++++++--------------------- dlls/kernel/stress.spec | 40 ++++++++++++++++++++-------------------- dlls/msvideo/msvideo.spec | 2 +- dlls/ntdll/signal_i386.c | 26 +++++++++++++------------- dlls/ole32/compobj.spec | 2 +- dlls/winmm/mmsystem.spec | 2 +- 7 files changed, 58 insertions(+), 58 deletions(-) rewrite dlls/gdi/wing.spec (67%) rewrite dlls/kernel/stress.spec (75%) diff --git a/dlls/gdi/dispdib.spec b/dlls/gdi/dispdib.spec index 6c158fe0ddf..82b94c2959a 100644 --- a/dlls/gdi/dispdib.spec +++ b/dlls/gdi/dispdib.spec @@ -2,4 +2,4 @@ name dispdib type win16 owner gdi32 - 1 pascal16 DISPLAYDIB(ptr ptr word) DisplayDib +1 pascal16 DisplayDib(ptr ptr word) DisplayDib diff --git a/dlls/gdi/wing.spec b/dlls/gdi/wing.spec dissimilarity index 67% index b1a6858d067..0d7a4e786ce 100644 --- a/dlls/gdi/wing.spec +++ b/dlls/gdi/wing.spec @@ -1,21 +1,21 @@ -name wing -type win16 -owner gdi32 - -1001 pascal16 WINGCREATEDC() WinGCreateDC16 -1002 pascal16 WINGRECOMMENDDIBFORMAT(ptr) WinGRecommendDIBFormat16 -1003 pascal16 WINGCREATEBITMAP(word ptr ptr) WinGCreateBitmap16 -1004 pascal WINGGETDIBPOINTER(word ptr) WinGGetDIBPointer16 -1005 pascal16 WINGGETDIBCOLORTABLE(word word word ptr) WinGGetDIBColorTable16 -1006 pascal16 WINGSETDIBCOLORTABLE(word word word ptr) WinGSetDIBColorTable16 -1007 pascal16 WINGCREATEHALFTONEPALETTE() WinGCreateHalfTonePalette16 -1008 pascal16 WINGCREATEHALFTONEBRUSH(word word word) WinGCreateHalfToneBrush16 -1009 pascal16 WINGSTRETCHBLT(word word word word word word word word word word) WinGStretchBlt16 -1010 pascal16 WINGBITBLT(word word word word word word word word) WinGBitBlt16 - -# Seem that 1299 is the limit... weird... -#1500 stub WINGINITIALIZETHUNK16 -#1501 stub WINGTHUNK16 - -#2000 stub REGISTERWINGPAL -#2001 stub EXCEPTIONHANDLER +name wing +type win16 +owner gdi32 + +1001 pascal16 WinGCreateDC() WinGCreateDC16 +1002 pascal16 WinGRecommendDIBFormat(ptr) WinGRecommendDIBFormat16 +1003 pascal16 WinGCreateBitmap(word ptr ptr) WinGCreateBitmap16 +1004 pascal WinGGetDIBPointer(word ptr) WinGGetDIBPointer16 +1005 pascal16 WinGGetDIBColorTable(word word word ptr) WinGGetDIBColorTable16 +1006 pascal16 WinGSetDIBColorTable(word word word ptr) WinGSetDIBColorTable16 +1007 pascal16 WinGCreateHalfTonePalette() WinGCreateHalfTonePalette16 +1008 pascal16 WinGCreateHalfToneBrush(word word word) WinGCreateHalfToneBrush16 +1009 pascal16 WinGStretchBlt(word word word word word word word word word word) WinGStretchBlt16 +1010 pascal16 WinGBitBlt(word word word word word word word word) WinGBitBlt16 + +# Seem that 1299 is the limit... weird... +#1500 stub WINGINITIALIZETHUNK16 +#1501 stub WINGTHUNK16 + +#2000 stub REGISTERWINGPAL +#2001 stub EXCEPTIONHANDLER diff --git a/dlls/kernel/stress.spec b/dlls/kernel/stress.spec dissimilarity index 75% index 3cb450849d9..4bc3064a5bc 100644 --- a/dlls/kernel/stress.spec +++ b/dlls/kernel/stress.spec @@ -1,20 +1,20 @@ -# summary: resource modification dll -# -name stress -type win16 -owner kernel32 - -2 pascal allocmem(long) AllocMem -3 pascal freeallmem() FreeAllMem -6 pascal allocfilehandles(word) AllocFileHandles -7 pascal unallocfilehandles() UnAllocFileHandles -8 pascal getfreefilehandles() GetFreeFileHandles -10 pascal allocdiskspace(long word) AllocDiskSpace -11 pascal unallocdiskspace(word) UnAllocDiskSpace -12 pascal allocusermem(word) AllocUserMem -13 pascal freeallusermem() FreeAllUserMem -14 pascal allocgdimem(word) AllocGDIMem -15 pascal freeallgdimem() FreeAllGDIMem -16 stub GETFREEHEAP32SPACE -17 stub ALLOCHEAP32MEM -18 stub FREEALLHEAP32MEM +# summary: resource modification dll +# +name stress +type win16 +owner kernel32 + +2 pascal AllocMem(long) AllocMem +3 pascal FreeAllMem() FreeAllMem +6 pascal AllocFileHandles(word) AllocFileHandles +7 pascal UnAllocFileHandles() UnAllocFileHandles +8 pascal GetFreeFileHandles() GetFreeFileHandles +10 pascal AllocDiskSpace(long word) AllocDiskSpace +11 pascal UnAllocDiskSpace(word) UnAllocDiskSpace +12 pascal AllocUserMem(word) AllocUserMem +13 pascal FreeAllUserMem() FreeAllUserMem +14 pascal AllocGDIMem(word) AllocGDIMem +15 pascal FreeAllGDIMem() FreeAllGDIMem +16 stub GETFREEHEAP32SPACE +17 stub ALLOCHEAP32MEM +18 stub FREEALLHEAP32MEM diff --git a/dlls/msvideo/msvideo.spec b/dlls/msvideo/msvideo.spec index 90b156f58ba..64c9ec456c5 100644 --- a/dlls/msvideo/msvideo.spec +++ b/dlls/msvideo/msvideo.spec @@ -5,7 +5,7 @@ owner msvfw32 2 pascal VideoForWindowsVersion() VideoForWindowsVersion 20 stub VIDEOGETNUMDEVS 21 stub VIDEOGETERRORTEXT -22 pascal VIDEOCAPDRIVERDESCANDVER(word ptr word ptr word) VideoCapDriverDescAndVer +22 pascal VideoCapDriverDescAndVer(word ptr word ptr word) VideoCapDriverDescAndVer 28 stub VIDEOOPEN 29 stub VIDEOCLOSE 30 stub VIDEODIALOG diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e1e718bf9b7..0c7c4ebe571 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -134,7 +134,7 @@ __ASM_GLOBAL_FUNC(vm86_enter, "popl %ebp\n\t" "ret" ); -#define HAVE_VM86 +#define __HAVE_VM86 #endif /* linux */ @@ -394,7 +394,7 @@ static inline void *get_cr2_value( const SIGCONTEXT *sigcontext ) } -#ifdef HAVE_VM86 +#ifdef __HAVE_VM86 /*********************************************************************** * save_vm86_context * @@ -445,7 +445,7 @@ static void restore_vm86_context( const CONTEXT *context, struct vm86plus_struct vm86->regs.ss = context->SegSs; vm86->regs.eflags = context->EFlags; } -#endif /* HAVE_VM86 */ +#endif /* __HAVE_VM86 */ /*********************************************************************** @@ -469,7 +469,7 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { fs = SYSLEVEL_Win16CurrentTeb; } -#ifdef HAVE_VM86 +#ifdef __HAVE_VM86 else if ((void *)EIP_sig(sigcontext) == vm86_return) /* vm86 mode */ { /* retrieve pointer to vm86plus struct that was stored in vm86_enter */ @@ -481,7 +481,7 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) save_vm86_context( context, vm86 ); return; } -#endif /* HAVE_VM86 */ +#endif /* __HAVE_VM86 */ __set_fs(fs); @@ -514,7 +514,7 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) */ static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) { -#ifdef HAVE_VM86 +#ifdef __HAVE_VM86 /* check if exception occurred in vm86 mode */ if ((void *)EIP_sig(sigcontext) == vm86_return && IS_SELECTOR_SYSTEM(CS_sig(sigcontext))) @@ -524,7 +524,7 @@ static void restore_context( const CONTEXT *context, SIGCONTEXT *sigcontext ) restore_vm86_context( context, vm86 ); return; } -#endif /* HAVE_VM86 */ +#endif /* __HAVE_VM86 */ EAX_sig(sigcontext) = context->Eax; EBX_sig(sigcontext) = context->Ebx; @@ -775,7 +775,7 @@ static void do_fpe( CONTEXT *context, int trap_code ) } -#ifdef HAVE_VM86 +#ifdef __HAVE_VM86 /********************************************************************** * set_vm86_pend * @@ -863,7 +863,7 @@ static HANDLER_DEF(alrm_handler) set_vm86_pend( &context ); restore_context( &context, HANDLER_CONTEXT ); } -#endif /* HAVE_VM86 */ +#endif /* __HAVE_VM86 */ /********************************************************************** @@ -1013,7 +1013,7 @@ BOOL SIGNAL_Init(void) if (set_handler( SIGTRAP, have_sigaltstack, (void (*)())trap_handler ) == -1) goto error; #endif -#ifdef HAVE_VM86 +#ifdef __HAVE_VM86 if (set_handler( SIGALRM, have_sigaltstack, (void (*)())alrm_handler ) == -1) goto error; if (set_handler( SIGUSR2, have_sigaltstack, (void (*)())usr2_handler ) == -1) goto error; #endif @@ -1026,7 +1026,7 @@ BOOL SIGNAL_Init(void) } -#ifdef HAVE_VM86 +#ifdef __HAVE_VM86 /********************************************************************** * __wine_enter_vm86 * @@ -1108,12 +1108,12 @@ cancel_vm86: } } -#else /* HAVE_VM86 */ +#else /* __HAVE_VM86 */ void __wine_enter_vm86( CONTEXT *context ) { MESSAGE("vm86 mode not supported on this platform\n"); } -#endif /* HAVE_VM86 */ +#endif /* __HAVE_VM86 */ /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ole32/compobj.spec b/dlls/ole32/compobj.spec index fd5632ed39c..d08748ccc0f 100644 --- a/dlls/ole32/compobj.spec +++ b/dlls/ole32/compobj.spec @@ -76,7 +76,7 @@ owner ole32 72 stub _IID_IEXTERNALCONNECTION 73 stub COCREATEGUID 75 stub FNASSERT -76 pascal STRINGFROMGUID2(ptr ptr word) StringFromGUID2 +76 pascal StringFromGUID2(ptr ptr word) StringFromGUID2 77 stub COGETCLASSEXT 78 stub OLE1CLASSFROMCLSID2 79 stub CLSIDFROMOLE1CLASS diff --git a/dlls/winmm/mmsystem.spec b/dlls/winmm/mmsystem.spec index edcf4144ff4..7de1f4b80b9 100644 --- a/dlls/winmm/mmsystem.spec +++ b/dlls/winmm/mmsystem.spec @@ -7,7 +7,7 @@ owner winmm 3 pascal PlaySound(ptr word long) PlaySound16 5 pascal mmsystemGetVersion() mmsystemGetVersion16 6 pascal DriverProc(long word word long long) DriverProc16 -8 pascal WMMMIDIRUNONCE() WMMMidiRunOnce16 +8 pascal WMMMidiRunOnce() WMMMidiRunOnce16 30 pascal16 OutputDebugStr(str) OutputDebugStr16 31 pascal DriverCallback(long word word word long long long) DriverCallback16 32 pascal StackEnter() StackEnter16 -- 2.11.4.GIT