https://git.reactos.org/?p=reactos.git;a=commitdiff;h=889b077b23490f5eeeb5558501a8a25c637396d1
commit 889b077b23490f5eeeb5558501a8a25c637396d1 Author: Serge Gautherie <[email protected]> AuthorDate: Sun Sep 20 19:21:11 2020 +0200 Commit: GitHub <[email protected]> CommitDate: Sun Sep 20 19:21:11 2020 +0200 [REACTOS] *.spec: Fix some function/parameter types (#3154) --- boot/freeldr/freeldr/freeldr.spec | 2 +- dll/appcompat/apphelp/apphelp.spec | 2 +- dll/ntdll/def/ntdll.spec | 4 ++-- dll/win32/advapi32/advapi32.spec | 4 ++-- dll/win32/oledlg/oledlg.spec | 4 ++-- dll/win32/shell32/shell32.spec | 4 ++-- dll/win32/shlwapi/shlwapi.spec | 2 +- drivers/storage/class/classpnp/classpnp.spec | 2 +- drivers/storage/port/scsiport/scsiport.spec | 2 +- drivers/storage/port/storport/storport.spec | 2 +- drivers/wdm/audio/legacy/stream/stream.spec | 2 +- ntoskrnl/ntoskrnl.spec | 14 +++++++------- sdk/lib/debugsup/debugsup-ntos.spec | 6 +++--- win32ss/drivers/videoprt/videoprt.spec | 2 +- win32ss/user/user32/user32.spec | 4 ++-- win32ss/win32k.spec | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/boot/freeldr/freeldr/freeldr.spec b/boot/freeldr/freeldr/freeldr.spec index aec37ea8457..3ffd70aac37 100644 --- a/boot/freeldr/freeldr/freeldr.spec +++ b/boot/freeldr/freeldr/freeldr.spec @@ -1,5 +1,5 @@ @ stdcall RtlAssert(ptr ptr long ptr) -@ cdecl ScsiDebugPrint() +@ varargs ScsiDebugPrint(long str) @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) @ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) diff --git a/dll/appcompat/apphelp/apphelp.spec b/dll/appcompat/apphelp/apphelp.spec index 8f08f24d47a..b2f7ba27fa0 100644 --- a/dll/appcompat/apphelp/apphelp.spec +++ b/dll/appcompat/apphelp/apphelp.spec @@ -172,7 +172,7 @@ @ stub SE_GetShimCount @ stub SE_LdrEntryRemoved @ stub SetPermLayers -@ cdecl ShimDbgPrint(long str str) +@ varargs ShimDbgPrint(long str str) @ stdcall ShimDumpCache(ptr ptr wstr long) @ stdcall ShimFlushCache(ptr ptr wstr long) @ stdcall SetPermLayerState(wstr wstr long long long) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 6f3204ae897..dc9969102e2 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -108,8 +108,8 @@ @ stdcall -version=0x502 EtwStopTraceW(double wstr ptr) @ stdcall -version=0x502 EtwTraceEvent(double ptr) @ stdcall -stub EtwTraceEventInstance(double ptr ptr ptr) -@ varargs EtwTraceMessage(ptr long ptr long) -@ stdcall -stub EtwTraceMessageVa(double long ptr long ptr) +@ varargs EtwTraceMessage(int64 long ptr long) +@ stdcall -stub EtwTraceMessageVa(int64 long ptr long ptr) @ stdcall EtwUnregisterTraceGuids(double) @ stdcall -version=0x502 EtwUpdateTraceA(double str ptr) @ stdcall -version=0x502 EtwUpdateTraceW(double wstr ptr) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 543b6ca4f6b..9a580df9df6 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -631,8 +631,8 @@ @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory @ stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent @ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance -@ varargs TraceMessage(ptr long ptr long) ntdll.EtwTraceMessage -@ stdcall TraceMessageVa(double long ptr long ptr) ntdll.EtwTraceMessageVa +@ varargs TraceMessage() ntdll.EtwTraceMessage +@ stdcall TraceMessageVa() ntdll.EtwTraceMessageVa @ stdcall TreeResetNamedSecurityInfoA(str ptr ptr ptr ptr ptr ptr long ptr ptr ptr) @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) @ stub TrusteeAccessToObjectA diff --git a/dll/win32/oledlg/oledlg.spec b/dll/win32/oledlg/oledlg.spec index c4f35fd5778..3220d070ef2 100644 --- a/dll/win32/oledlg/oledlg.spec +++ b/dll/win32/oledlg/oledlg.spec @@ -7,10 +7,10 @@ 7 stdcall OleUIConvertA(ptr) 8 stdcall OleUIBusyA(ptr) 9 stdcall OleUIUpdateLinksA(ptr long str long) - 10 varargs OleUIPromptUserA(long long) + 10 varargs OleUIPromptUserA(long ptr) 11 stdcall OleUIObjectPropertiesA(ptr) 12 stdcall OleUIChangeSourceA(ptr) - 13 varargs OleUIPromptUserW(long long) + 13 varargs OleUIPromptUserW(long ptr) 14 stdcall OleUIAddVerbMenuW(ptr wstr long long long long long long ptr) 15 stdcall OleUIBusyW(ptr) 16 stdcall OleUIChangeIconW(ptr) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index f5270cc103f..b96c0f209d5 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -178,8 +178,8 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxW(long long wstr wstr long) ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') -183 varargs ShellMessageBoxA(long long str str long) +182 varargs ShellMessageBoxW() ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') +183 varargs ShellMessageBoxA(ptr ptr str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long) 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 9bcd21739bf..dd1e3cd7d1b 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 varargs -noname ShellMessageBoxWrapW(long long wstr wstr long) +388 varargs -noname ShellMessageBoxWrapW(ptr ptr wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) diff --git a/drivers/storage/class/classpnp/classpnp.spec b/drivers/storage/class/classpnp/classpnp.spec index 9ab5443db18..6662c168f33 100644 --- a/drivers/storage/class/classpnp/classpnp.spec +++ b/drivers/storage/class/classpnp/classpnp.spec @@ -30,7 +30,7 @@ @ stdcall ClassInvalidateBusRelations(ptr) @ stdcall ClassMarkChildrenMissing(ptr) @ stdcall ClassMarkChildMissing(ptr long) - @ varargs ClassDebugPrint(long long) + @ varargs ClassDebugPrint(long str) @ stdcall ClassGetDriverExtension(ptr) @ stdcall ClassCompleteRequest(ptr ptr long) @ stdcall ClassReleaseRemoveLock(ptr ptr) diff --git a/drivers/storage/port/scsiport/scsiport.spec b/drivers/storage/port/scsiport/scsiport.spec index 705ab7c3a45..f01b7a48f12 100644 --- a/drivers/storage/port/scsiport/scsiport.spec +++ b/drivers/storage/port/scsiport/scsiport.spec @@ -1,4 +1,4 @@ -@ cdecl ScsiDebugPrint() +@ varargs ScsiDebugPrint(long str) @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) @ stdcall -arch=i386,arm ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger diff --git a/drivers/storage/port/storport/storport.spec b/drivers/storage/port/storport/storport.spec index a36e5ed49a8..7ccc9513fd9 100644 --- a/drivers/storage/port/storport/storport.spec +++ b/drivers/storage/port/storport/storport.spec @@ -6,7 +6,7 @@ @ stdcall StorPortCompleteRequest(ptr long long long long) @ stdcall StorPortConvertPhysicalAddressToUlong(long long) @ stdcall StorPortConvertUlongToPhysicalAddress(long) -@ cdecl StorPortDebugPrint() +@ varargs StorPortDebugPrint(long str) @ stdcall StorPortDeviceBusy(ptr long long long long) @ stdcall StorPortDeviceReady(ptr long long long) @ cdecl StorPortExtendedFunction() diff --git a/drivers/wdm/audio/legacy/stream/stream.spec b/drivers/wdm/audio/legacy/stream/stream.spec index 85cb8dc4b6a..0986510c112 100644 --- a/drivers/wdm/audio/legacy/stream/stream.spec +++ b/drivers/wdm/audio/legacy/stream/stream.spec @@ -3,7 +3,7 @@ @ stdcall StreamClassRegisterAdapter(ptr ptr ptr) @ stdcall StreamClassReenumerateStreams(ptr long) @ stdcall StreamClassDebugAssert(long long ptr long) -@ cdecl StreamClassDebugPrint (long str) +@ varargs StreamClassDebugPrint(long str) @ cdecl StreamClassDeviceNotification(long ptr) @ stdcall StreamClassGetDmaBuffer(ptr) @ stdcall StreamClassReadWriteConfig(ptr long ptr long long) \ No newline at end of file diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 5da7e3bf0af..2965a67ffbf 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -47,9 +47,9 @@ @ stdcall DbgBreakPointWithStatus(long) @ stdcall DbgCommandString(ptr ptr) @ stdcall DbgLoadImageSymbols(ptr ptr long) -@ cdecl DbgPrint(str) -@ cdecl DbgPrintEx(long long str) -@ cdecl DbgPrintReturnControlC(str) +@ varargs DbgPrint(str) +@ varargs DbgPrintEx(long long str) +@ varargs DbgPrintReturnControlC(str) @ stdcall DbgPrompt(str ptr long) @ stdcall DbgQueryDebugFilterState(long long) @ stdcall DbgSetDebugFilterState(long long long) @@ -1404,8 +1404,8 @@ @ stdcall WmiStartTrace(ptr) @ stdcall WmiStopTrace(ptr) @ fastcall WmiTraceFastEvent(ptr) -@ cdecl WmiTraceMessage() -@ stdcall WmiTraceMessageVa(double long ptr long long) +@ varargs WmiTraceMessage(int64 long ptr long) +@ stdcall WmiTraceMessageVa(int64 long ptr long ptr) @ stdcall WmiUpdateTrace(ptr) @ stdcall XIPDispatch(long ptr long) @ stdcall ZwAccessCheckAndAuditAlarm(ptr ptr ptr ptr ptr long ptr long ptr ptr ptr) @@ -1595,7 +1595,7 @@ @ cdecl memset() @ cdecl qsort() @ cdecl rand() -@ cdecl sprintf() +@ varargs sprintf(ptr str) @ cdecl srand() @ cdecl strcat() @ cdecl strchr() @@ -1615,7 +1615,7 @@ @ cdecl towupper() @ stdcall vDbgPrintEx(long long str ptr) @ stdcall vDbgPrintExWithPrefix(str long long str ptr) -@ cdecl vsprintf() +@ cdecl vsprintf(ptr str ptr) @ cdecl wcscat() @ cdecl wcschr() @ cdecl wcscmp() diff --git a/sdk/lib/debugsup/debugsup-ntos.spec b/sdk/lib/debugsup/debugsup-ntos.spec index f7ec548c629..04e5e970a59 100644 --- a/sdk/lib/debugsup/debugsup-ntos.spec +++ b/sdk/lib/debugsup/debugsup-ntos.spec @@ -1,8 +1,8 @@ @ stdcall DbgBreakPoint() @ stdcall DbgBreakPointWithStatus(long) -@ varargs DbgPrint() -@ varargs DbgPrintEx() +@ varargs DbgPrint(str) +@ varargs DbgPrintEx(long long str) @ stdcall DbgPrompt(ptr ptr long) @ stdcall RtlAssert(ptr ptr long ptr) @ stdcall RtlUnwind(ptr ptr ptr ptr) -@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr) +@ stdcall vDbgPrintExWithPrefix(str long long str ptr) diff --git a/win32ss/drivers/videoprt/videoprt.spec b/win32ss/drivers/videoprt/videoprt.spec index ee12c0692de..2f9b065afe7 100644 --- a/win32ss/drivers/videoprt/videoprt.spec +++ b/win32ss/drivers/videoprt/videoprt.spec @@ -19,7 +19,7 @@ @ stdcall VideoPortCreateSecondaryDisplay(ptr ptr long) @ stdcall VideoPortCreateSpinLock(ptr ptr) @ stdcall VideoPortDDCMonitorHelper(ptr ptr ptr long) -@ cdecl VideoPortDebugPrint(long ptr) +@ varargs VideoPortDebugPrint(long str) @ stdcall VideoPortDeleteEvent(ptr ptr) @ stdcall VideoPortDeleteSpinLock(ptr ptr) @ stdcall VideoPortDisableInterrupt(ptr) diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index dc54a3e22e5..9e87f95c49f 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -744,7 +744,7 @@ 735 stdcall WindowFromPoint(double) 736 stdcall keybd_event(long long long long) 737 stdcall mouse_event(long long long long long) -738 varargs wsprintfA(str str) -739 varargs wsprintfW(wstr wstr) +738 varargs wsprintfA(ptr str) +739 varargs wsprintfW(ptr wstr) 740 stdcall wvsprintfA(ptr str ptr) 741 stdcall wvsprintfW(ptr wstr ptr) diff --git a/win32ss/win32k.spec b/win32ss/win32k.spec index a33552cbd74..6bf69b5f6ec 100644 --- a/win32ss/win32k.spec +++ b/win32ss/win32k.spec @@ -30,7 +30,7 @@ @ stdcall EngCreateSemaphore() @ stdcall EngCreateWnd(ptr ptr ptr long long) @ stdcall EngDebugBreak() NTOSKRNL.DbgBreakPoint -@ stdcall EngDebugPrint(ptr ptr ptr) +@ stdcall EngDebugPrint(str str ptr) @ stdcall EngDeleteClip(ptr) @ stdcall EngDeleteDriverObj(ptr long long) @ stdcall EngDeleteEvent(ptr)
