[ros-diffs] [reactos] 01/01: [MIDIMAP] MIDIMAP_modMessage(): Fix a MSVC amd64 C4133 warning

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4121b0e80591b1862555d…

commit 4121b0e80591b1862555ddd1fb60dd333e8c3f77
Author:     Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr>
AuthorDate: Thu Nov 12 01:22:46 2020 +0100
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Mon Apr 11 19:20:13 2022 +0300

    [MIDIMAP] MIDIMAP_modMessage(): Fix a MSVC amd64 C4133 warning
    
    MSVC amd64
    '...\dll\win32\winmm\midimap\midimap.c(474): warning C4133: 'function':
incompatible types - from 'LPDWORD' to 'DWORD_PTR *''
    
    Import missed parts of
   
https://source.winehq.org/git/wine.git/commit/29b00e1a8c2d06573027278de53b8…
    
    Addendum to b40e7f0 (r47900).
    CORE-7538
---
 dll/win32/winmm/midimap/CMakeLists.txt | 5 -----
 dll/win32/winmm/midimap/midimap.c      | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dll/win32/winmm/midimap/CMakeLists.txt
b/dll/win32/winmm/midimap/CMakeLists.txt
index 2e4aaa22403..517f1bc7364 100644
--- a/dll/win32/winmm/midimap/CMakeLists.txt
+++ b/dll/win32/winmm/midimap/CMakeLists.txt
@@ -8,11 +8,6 @@ add_library(midimap MODULE
 
 set_module_type(midimap win32dll UNICODE)
 
-if(MSVC)
-    # error C4133: 'function': incompatible types - from 'LPDWORD' to
'DWORD_PTR *'
-    remove_target_compile_option(midimap "/we4133")
-endif()
-
 target_link_libraries(midimap uuid wine)
 add_importlibs(midimap advapi32 user32 winmm msvcrt kernel32 ntdll)
 add_cd_file(TARGET midimap DESTINATION reactos/system32 FOR all)
diff --git a/dll/win32/winmm/midimap/midimap.c b/dll/win32/winmm/midimap/midimap.c
index fd9ecae485e..8eefac33d14 100644
--- a/dll/win32/winmm/midimap/midimap.c
+++ b/dll/win32/winmm/midimap/midimap.c
@@ -392,7 +392,7 @@ static	DWORD	modData(MIDIMAPDATA* mom, DWORD_PTR dwParam)
 	}
 	break;
     default:
-	FIXME("ooch %lu\n", dwParam);
+	FIXME("ooch %lx\n", dwParam);
     }
 
     return ret;
@@ -471,7 +471,7 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR
dwUser,
 	/* FIXME: Pretend this is supported */
 	return 0;
 
-    case MODM_OPEN:	 	return modOpen		((LPDWORD)dwUser,     
(LPMIDIOPENDESC)dwParam1,dwParam2);
+    case MODM_OPEN: return modOpen((DWORD_PTR *)dwUser, (LPMIDIOPENDESC)dwParam1,
dwParam2);
     case MODM_CLOSE:	 	return modClose		((MIDIMAPDATA*)dwUser);
 
     case MODM_DATA:		return modData		((MIDIMAPDATA*)dwUser, dwParam1);