From f89d4a8673acfb6dfea679df9721179192615cbf Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Sat, 23 Mar 2002 21:39:05 +0000
Subject: [PATCH] Fixed some issues found by winapi_check.

---
 dlls/avicap32/avicap32_main.c | 8 ++++----
 dlls/shlwapi/shlwapi.spec     | 4 ++--
 dlls/wininet/internet.c       | 8 ++++----
 files/smb.c                   | 6 ++++--
 files/smb.h                   | 2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c
index 97abd40966e..3b8cefda6ed 100644
--- a/dlls/avicap32/avicap32_main.c
+++ b/dlls/avicap32/avicap32_main.c
@@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(avicap32);
 
 /***********************************************************************
  *
- *		capCreateCaptureWindowA (AVICAP.@)
+ *		capCreateCaptureWindowA (AVICAP32.@)
  *
  */
 HWND WINAPI capCreateCaptureWindowA( LPCSTR pszTitle, DWORD dwStyle, int x, int y, int width, int height, HWND hwndParent, int nID )
@@ -42,7 +42,7 @@ HWND WINAPI capCreateCaptureWindowA( LPCSTR pszTitle, DWORD dwStyle, int x, int
 
 /***********************************************************************
  *
- *		capCreateCaptureWindowW (AVICAP.@)
+ *		capCreateCaptureWindowW (AVICAP32.@)
  *
  */
 HWND WINAPI capCreateCaptureWindowW( LPCWSTR pwszTitle, DWORD dwStyle, int x, int y, int width, int height, HWND hwndParent, int nID )
@@ -54,7 +54,7 @@ HWND WINAPI capCreateCaptureWindowW( LPCWSTR pwszTitle, DWORD dwStyle, int x, in
 
 /***********************************************************************
  *
- *		capGetDriverDescriptionA (AVICAP.@)
+ *		capGetDriverDescriptionA (AVICAP32.@)
  *
  */
 BOOL WINAPI capGetDriverDescriptionA( UINT uDriverIndex, LPSTR pszName, int cbName, LPSTR pszVersion, int cbVersion )
@@ -66,7 +66,7 @@ BOOL WINAPI capGetDriverDescriptionA( UINT uDriverIndex, LPSTR pszName, int cbNa
 
 /***********************************************************************
  *
- *		capGetDriverDescriptionW (AVICAP.@)
+ *		capGetDriverDescriptionW (AVICAP32.@)
  *
  */
 BOOL WINAPI capGetDriverDescriptionW( UINT uDriverIndex, LPWSTR pwszName, int cbName, LPWSTR pwszVersion, int cbVersion )
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 6bb6703afd6..489f03eeeaf 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -708,8 +708,8 @@ debug_channels (shell)
 @ stdcall PathIsNetworkPathW(wstr) PathIsNetworkPathW
 @ stdcall PathIsLFNFileSpecA(str) PathIsLFNFileSpecA
 @ stdcall PathIsLFNFileSpecW(wstr) PathIsLFNFileSpecW
-@ stdcall PathFindSuffixArrayA(str) PathFindSuffixArrayA
-@ stdcall PathFindSuffixArrayW(wstr) PathFindSuffixArrayW
+@ stdcall PathFindSuffixArrayA(str ptr long) PathFindSuffixArrayA
+@ stdcall PathFindSuffixArrayW(wstr ptr long) PathFindSuffixArrayW
 @ stdcall _SHGetInstanceExplorer@4(ptr) _SHGetInstanceExplorer
 @ stdcall PathUndecorateA(str) PathUndecorateA
 @ stdcall PathUndecorateW(wstr) PathUndecorateW
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 3e5e30ce776..364634999a8 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -965,7 +965,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption,
 
 
 /***********************************************************************
- *           InternetQueryOptionW (WININET.@)
+ *           InternetSetOptionW (WININET.@)
  *
  * Sets an options on the specified handle
  *
@@ -974,7 +974,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption,
  *    FALSE on failure
  *
  */
-BOOLAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
+BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
                            LPVOID lpBuffer, DWORD dwBufferLength)
 {
     LPWININETHANDLEHEADER lpwhh;
@@ -1003,7 +1003,7 @@ BOOLAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
 
 
 /***********************************************************************
- *           InternetQueryOptionA (WININET.@)
+ *           InternetSetOptionA (WININET.@)
  *
  * Sets an options on the specified handle.
  *
@@ -1012,7 +1012,7 @@ BOOLAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption,
  *    FALSE on failure
  *
  */
-BOOLAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption,
+BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption,
                            LPVOID lpBuffer, DWORD dwBufferLength)
 {
     /* FIXME!!! implement if lpBuffer is a string, dwBufferLength is
diff --git a/files/smb.c b/files/smb.c
index 6047210558a..305387660ac 100644
--- a/files/smb.c
+++ b/files/smb.c
@@ -51,7 +51,9 @@
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
 #include <sys/types.h>
 #ifdef HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
@@ -1030,7 +1032,7 @@ static BOOL SMB_SetOffset(HANDLE hFile, DWORD offset)
     return !r;
 }
 
-WINAPI BOOL SMB_ReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD bytesRead, LPOVERLAPPED lpOverlapped)
+BOOL WINAPI SMB_ReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD bytesRead, LPOVERLAPPED lpOverlapped)
 {
     int fd;
     DWORD total, count, offset;
diff --git a/files/smb.h b/files/smb.h
index 268261f6ee2..ca26f38b309 100644
--- a/files/smb.h
+++ b/files/smb.h
@@ -91,7 +91,7 @@
 #define SMB_COM_CLOSE_PRINT_FILE       0xC2
 #define SMB_COM_GET_PRINT_QUEUE        0xC3
 
-extern WINAPI BOOL SMB_ReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD bytesRead, LPOVERLAPPED lpOverlapped);
+extern BOOL WINAPI SMB_ReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD bytesRead, LPOVERLAPPED lpOverlapped);
 extern HANDLE WINAPI SMB_CreateFileA( LPCSTR filename, DWORD access, DWORD sharing,
                               LPSECURITY_ATTRIBUTES sa, DWORD creation,
                               DWORD attributes, HANDLE template );