- Fix warnings

svn path=/trunk/; revision=16773

diff --git a/reactos/lib/winmm/mci.c b/reactos/lib/winmm/mci.c
index 728d38d..5faa40d 100644 (file)
--- a/reactos/lib/winmm/mci.c
+++ b/reactos/lib/winmm/mci.c
@@ -456,15 +456,15 @@ static DWORD MCI_UnmapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR dwParam2,
             if (dwParam1 & MCI_OPEN_TYPE)\r
             {\r
                 if (!(dwParam1 & MCI_OPEN_TYPE_ID))\r
             if (dwParam1 & MCI_OPEN_TYPE)\r
             {\r
                 if (!(dwParam1 & MCI_OPEN_TYPE_ID))\r

-                    HeapFree(GetProcessHeap(), 0, mci_openW->lpstrDeviceType);\r
+                    HeapFree(GetProcessHeap(), 0, (PVOID)mci_openW->lpstrDeviceType);\r

             }\r
             if (dwParam1 & MCI_OPEN_ELEMENT)\r
             {\r
                 if (!(dwParam1 & MCI_OPEN_ELEMENT_ID))\r
             }\r
             if (dwParam1 & MCI_OPEN_ELEMENT)\r
             {\r
                 if (!(dwParam1 & MCI_OPEN_ELEMENT_ID))\r

-                    HeapFree(GetProcessHeap(), 0, mci_openW->lpstrElementName);\r
+                    HeapFree(GetProcessHeap(), 0, (PVOID)mci_openW->lpstrElementName);\r

             }\r
             if (dwParam1 & MCI_OPEN_ALIAS)\r
             }\r
             if (dwParam1 & MCI_OPEN_ALIAS)\r

-                HeapFree(GetProcessHeap(), 0, mci_openW->lpstrAlias);\r
+                HeapFree(GetProcessHeap(), 0, (PVOID)mci_openW->lpstrAlias);\r

             HeapFree(GetProcessHeap(), 0, ptr);\r
         }\r
         break;\r
             HeapFree(GetProcessHeap(), 0, ptr);\r
         }\r
         break;\r

diff --git a/reactos/lib/winmm/winmm.c b/reactos/lib/winmm/winmm.c
index 45f5307..ed5614e 100644 (file)
--- a/reactos/lib/winmm/winmm.c
+++ b/reactos/lib/winmm/winmm.c
@@ -103,8 +103,10 @@ static     void WINMM_DeleteIData(void)
  *             WINMM_LoadMMSystem\r
  *\r
  */\r
  *             WINMM_LoadMMSystem\r
  *\r
  */\r

+#ifndef __REACTOS__\r

 static HANDLE (WINAPI *pGetModuleHandle16)(LPCSTR);\r
 static DWORD (WINAPI *pLoadLibrary16)(LPCSTR);\r
 static HANDLE (WINAPI *pGetModuleHandle16)(LPCSTR);\r
 static DWORD (WINAPI *pLoadLibrary16)(LPCSTR);\r

+#endif\r

 \r
 BOOL WINMM_CheckForMMSystem(void)\r
 {\r
 \r
 BOOL WINMM_CheckForMMSystem(void)\r
 {\r