From 9444dd25416a120b284f4471aa8804dee653adcc Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Tue, 15 Oct 2002 21:00:05 +0000
Subject: [PATCH] Compile fix when all handles are converted to a void*.

---
 dlls/user/lstr.c      |  2 +-
 dlls/winmm/lolvldrv.c | 18 +++++++++---------
 windows/painting.c    |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index dbf99b15a60..5a9d03c8d66 100644
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
@@ -627,7 +627,7 @@ DWORD WINAPI FormatMessage16(
     }
     if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) {
         INT16	bufsize;
-	HINSTANCE16 hinst16 = ((HMODULE)lpSource & 0xffff);
+	HINSTANCE16 hinst16 = ((HINSTANCE16)lpSource & 0xffff);
 
 	dwMessageId &= 0xFFFF;
 	bufsize=LoadString16(hinst16,dwMessageId,NULL,0);
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index 997cd9277e5..6eac372e7d5 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -2031,15 +2031,15 @@ LPWINE_MLD	MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags,
 
     /* find an empty slot in MM_MLDrvs table */
     for (*hndl = 0; *hndl < MAX_MM_MLDRVS; (*hndl)++) {
-	if (!MM_MLDrvs[*hndl]) break;
+	if (!MM_MLDrvs[(UINT)*hndl]) break;
     }
     if (*hndl == MAX_MM_MLDRVS) {
 	/* the MM_MLDrvs table could be made growable in the future if needed */
 	ERR("Too many open drivers\n");
 	return NULL;
     }
-    MM_MLDrvs[*hndl] = mld;
-    *hndl |= 0x8000;
+    MM_MLDrvs[(UINT)*hndl] = mld;
+    *hndl = (HANDLE)((UINT)*hndl | 0x8000);
 
     mld->type = type;
     if ((UINT)*hndl < MMDRV_GetNum(type) || HIWORD(*hndl) != 0) {
@@ -2067,8 +2067,8 @@ LPWINE_MLD	MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags,
  */
 void	MMDRV_Free(HANDLE hndl, LPWINE_MLD mld)
 {
-    if (hndl & 0x8000) {
-	unsigned idx = hndl & ~0x8000;
+    if ((UINT)hndl & 0x8000) {
+	unsigned idx = (UINT)hndl & ~0x8000;
 	if (idx < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) {
 	    MM_MLDrvs[idx] = NULL;
 	    HeapFree(GetProcessHeap(), 0, mld);
@@ -2153,14 +2153,14 @@ LPWINE_MLD	MMDRV_Get(HANDLE hndl, UINT type, BOOL bCanBeID)
 
     if ((UINT)hndl >= llTypes[type].wMaxId &&
 	hndl != (UINT16)-1 && hndl != (UINT)-1) {
-	if (hndl & 0x8000) {
-	    hndl &= ~0x8000;
+	if ((UINT)hndl & 0x8000) {
+	    hndl = (HANDLE)((UINT)hndl & ~0x8000);
 	    if (hndl < sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) {
-		mld = MM_MLDrvs[hndl];
+		mld = MM_MLDrvs[(UINT)hndl];
 		if (!mld || !HeapValidate(GetProcessHeap(), 0, mld) || mld->type != type)
 		    mld = NULL;
 	    }
-	    hndl |= 0x8000;
+	    hndl = (HANDLE)((UINT)hndl | 0x8000);
 	}
     }
     if (mld == NULL && bCanBeID) {
diff --git a/windows/painting.c b/windows/painting.c
index ba13de40730..3c4b6af35e1 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -430,7 +430,7 @@ static void RDW_UpdateRgns( WND* wndPtr, HRGN hRgn, UINT flags, BOOL firstRecurs
     {
 	if( hRgn > 1 )
 	{
-	    switch( wndPtr->hrgnUpdate )
+	    switch ((UINT)wndPtr->hrgnUpdate)
 	    {
 		default:
 			CombineRgn( wndPtr->hrgnUpdate, wndPtr->hrgnUpdate, hRgn, RGN_OR );
-- 
2.11.4.GIT