From f4f1719ca5e3c57a99e7152009beaba62774dfa0 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Sat, 17 Oct 1998 12:10:19 +0000
Subject: [PATCH] Fixed some more missing WINAPIs (hopefully correct).

---
 dlls/msacm32/builtin.c | 4 ++--
 include/syslevel.h     | 4 ++--
 misc/registry.c        | 5 +++--
 multimedia/dplay.c     | 2 +-
 multimedia/dsound.c    | 2 +-
 multimedia/mmsystem.c  | 4 ++--
 multimedia/time.c      | 2 +-
 windows/caret.c        | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dlls/msacm32/builtin.c b/dlls/msacm32/builtin.c
index a3a87795949..985c76fd005 100644
--- a/dlls/msacm32/builtin.c
+++ b/dlls/msacm32/builtin.c
@@ -17,7 +17,7 @@
 /***********************************************************************
  *           MSACM_BuiltinDrivers
  */
-LONG MSACM_DummyDriverProc(
+LONG WINAPI MSACM_DummyDriverProc(
    DWORD dwDriverId, HDRVR32 hdrvr, UINT32 msg,
    LONG lParam1, LONG lParam2); 
 
@@ -29,7 +29,7 @@ WINE_ACMBUILTINDRIVER32 MSACM_BuiltinDrivers32[] = {
 /***********************************************************************
  *           MSACM_DummyDriverProc
  */
-LONG MSACM_DummyDriverProc(
+LONG WINAPI MSACM_DummyDriverProc(
    DWORD dwDriverId, HDRVR32 hdrvr, UINT32 msg,
    LONG lParam1, LONG lParam2)
 {
diff --git a/include/syslevel.h b/include/syslevel.h
index d2756dc3d97..aad7a054f00 100644
--- a/include/syslevel.h
+++ b/include/syslevel.h
@@ -14,8 +14,8 @@ extern WORD SYSLEVEL_Win16CurrentTeb;
 extern WORD SYSLEVEL_EmergencyTeb;
 
 void SYSLEVEL_Init(void);
-VOID SYSLEVEL_EnterWin16Lock(VOID);
-VOID SYSLEVEL_LeaveWin16Lock(VOID);
+VOID WINAPI SYSLEVEL_EnterWin16Lock(VOID);
+VOID WINAPI SYSLEVEL_LeaveWin16Lock(VOID);
 VOID SYSLEVEL_ReleaseWin16Lock(VOID);
 VOID SYSLEVEL_RestoreWin16Lock(VOID);
 
diff --git a/misc/registry.c b/misc/registry.c
index a2f3c6b72d5..bf9e335b42e 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -1244,7 +1244,7 @@ static LPKEYSTRUCT _w95_processKey ( LPKEYSTRUCT lpkey,
 	}
 
 	while (curdata < next) {
-	  struct	dkh *xdkh = curdata;
+	  struct	dkh *xdkh = (struct dkh*)curdata;
 
 	  bytesread += sizeof(dkh); /* FIXME... nextkeyoff? */
 	  if (xdkh->nrLS == nrLS) {
@@ -2471,11 +2471,12 @@ DWORD WINAPI RegSetValueEx32W( HKEY hkey, LPWSTR lpszValueName,
 		lpkey->nrofvalues++;
 		memset(lpkey->values+i,'\0',sizeof(KEYVALUE));
 	}
-	if (lpkey->values[i].name==NULL)
+	if (lpkey->values[i].name==NULL) {
 		if (lpszValueName)
 			lpkey->values[i].name = strdupW(lpszValueName);
 		else
 			lpkey->values[i].name = NULL;
+	}
 	lpkey->values[i].len	= cbData;
 	lpkey->values[i].type	= dwType;
 	if (lpkey->values[i].data !=NULL)
diff --git a/multimedia/dplay.c b/multimedia/dplay.c
index e7316f86126..5ae1de75750 100644
--- a/multimedia/dplay.c
+++ b/multimedia/dplay.c
@@ -427,7 +427,7 @@ static ULONG WINAPI IDirectPlayLobbyA_Release
   /* Deallocate if this is the last reference to the object */
   if( !(this->ref) )
   {
-    deleteDPConnection( this->lpSession );
+    deleteDPConnection( &(this->lpSession) );
     HeapFree( GetProcessHeap(), 0, this );
     return S_OK;
   }
diff --git a/multimedia/dsound.c b/multimedia/dsound.c
index 654206fe361..9f5337418f9 100644
--- a/multimedia/dsound.c
+++ b/multimedia/dsound.c
@@ -903,7 +903,7 @@ DSOUND_MixInBuffer(IDirectSoundBuffer *dsb) {
 	}
 }
 
-static DWORD
+static DWORD WINAPI
 DSOUND_thread(LPVOID arg) {
 	int	res,i,curleft,playing,haveprimary = 0;
 
diff --git a/multimedia/mmsystem.c b/multimedia/mmsystem.c
index 07c1692946c..236c5e86940 100644
--- a/multimedia/mmsystem.c
+++ b/multimedia/mmsystem.c
@@ -295,7 +295,7 @@ ckid=%.4s fccType=%.4s cksize=%08lX \n", (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo
     return bRet;
 }
 
-static DWORD PlaySound_Thread(LPVOID arg) 
+static DWORD WINAPI PlaySound_Thread(LPVOID arg) 
 {
     DWORD     res;
     
@@ -1957,7 +1957,7 @@ struct SCA32 {
 
 DWORD WINAPI mciSendCommand32A(UINT32 wDevID, UINT32 wMsg, DWORD dwParam1, DWORD dwParam2);
 
-static DWORD mciSCAStarter32(LPVOID arg)
+static DWORD WINAPI mciSCAStarter32(LPVOID arg)
 {
     struct SCA32*	sca = (struct SCA32*)arg;
     DWORD		ret;
diff --git a/multimedia/time.c b/multimedia/time.c
index ce9bc14fdcd..8c4fc9954a9 100644
--- a/multimedia/time.c
+++ b/multimedia/time.c
@@ -101,7 +101,7 @@ static	void	TIME_TriggerCallBack(LPTIMERENTRY lpTimer, DWORD dwCurrent)
 /**************************************************************************
  *           TIME_MMSysTimeCallback
  */
-static VOID TIME_MMSysTimeCallback( HWND32 hwnd, UINT32 msg,
+static VOID WINAPI TIME_MMSysTimeCallback( HWND32 hwnd, UINT32 msg,
                                     UINT32 id, DWORD dwTime )
 {
     LPTIMERENTRY lpTimer;
diff --git a/windows/caret.c b/windows/caret.c
index 2f32db7a887..49026e3b10a 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -75,7 +75,7 @@ static void CARET_DisplayCaret( DISPLAY_CARET status )
 /*****************************************************************
  *               CARET_Callback
  */
-static VOID CARET_Callback( HWND32 hwnd, UINT32 msg, UINT32 id, DWORD ctime)
+static VOID CALLBACK CARET_Callback( HWND32 hwnd, UINT32 msg, UINT32 id, DWORD ctime)
 {
     TRACE(caret,"hwnd=%04x, timerid=%d, caret=%d\n",
                   hwnd, id, Caret.on);