From bf8943c60cf331721447c3b47c9cdfaf7790a4b2 Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Mon, 2 Oct 2000 03:39:34 +0000
Subject: [PATCH] Fixed some issues found by winapi_check.

---
 dlls/kernel/time.c       |  1 +
 dlls/winaspi/winaspi32.c | 14 +++++++++++---
 include/wnaspi32.h       |  9 +++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c
index b7cd314b7e2..dcd0cb28ada 100644
--- a/dlls/kernel/time.c
+++ b/dlls/kernel/time.c
@@ -9,6 +9,7 @@
 #include <sys/time.h>
 #include <sys/times.h>
 #include "file.h"
+#include "ntddk.h"
 #include "winerror.h"
 #include "debugtools.h"
 
diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c
index 272e361519c..f0e39a88a7a 100644
--- a/dlls/winaspi/winaspi32.c
+++ b/dlls/winaspi/winaspi32.c
@@ -450,7 +450,7 @@ error_exit:
  *    HIBYTE of LOWORD: status (SS_COMP or SS_FAILED_INIT)
  *    LOBYTE of LOWORD: # of host adapters.  
  */
-DWORD WINAPI GetASPI32SupportInfo()
+DWORD __cdecl GetASPI32SupportInfo(void)
 {
     return ((SS_COMP << 8) | ASPI_GetNumControllers());
 }
@@ -536,8 +536,7 @@ DWORD __cdecl SendASPI32Command(LPSRB lpSRB)
 /***********************************************************************
  *             GetASPI32DLLVersion   (WNASPI32.3)
  */
-
-DWORD WINAPI GetASPI32DLLVersion()
+DWORD __cdecl GetASPI32DLLVersion(void)
 {
 #ifdef linux
 	TRACE("Returning version 1\n");
@@ -548,18 +547,27 @@ DWORD WINAPI GetASPI32DLLVersion()
 #endif
 }
 
+/***********************************************************************
+ *             GetASPI32Buffer   (WNASPI32.@)
+ */
 BOOL __cdecl GetASPI32Buffer(/*PASPI32BUFF*/LPVOID pab)
 {
     FIXME("(%p), stub !\n", pab);
     return TRUE;
 }
 
+/***********************************************************************
+ *             FreeASPI32Buffer   (WNASPI32.@)
+ */
 BOOL __cdecl FreeASPI32Buffer(/*PASPI32BUFF*/LPVOID pab)
 {
     FIXME("(%p), stub !\n", pab);
     return TRUE;
 }
 
+/***********************************************************************
+ *             TranslateASPI32Address   (WNASPI32.@)
+ */
 BOOL __cdecl TranslateASPI32Address(LPDWORD pdwPath, LPDWORD pdwDEVNODE)
 {
     FIXME("(%p, %p), stub !\n", pdwPath, pdwDEVNODE);
diff --git a/include/wnaspi32.h b/include/wnaspi32.h
index 6f2097f949c..ab729e51abe 100644
--- a/include/wnaspi32.h
+++ b/include/wnaspi32.h
@@ -203,12 +203,9 @@ typedef union tagSRB32 {
 #include "poppack.h"
 
 /* Prototypes */
-extern DWORD __cdecl
-SendASPI32Command (PSRB);
-extern DWORD WINAPI
-GetASPI32SupportInfo (void);
-extern DWORD WINAPI
-GetASPI32DLLVersion(void);
+extern DWORD __cdecl SendASPI32Command (PSRB);
+extern DWORD __cdecl GetASPI32SupportInfo (void);
+extern DWORD __cdecl GetASPI32DLLVersion(void);
 
 #ifdef __cplusplus
 }