actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More Windows API type inconsistency fix

Browse Source
This commit is contained in:
Prcuvu
2019-10-03 09:33:27 +08:00
parent 54c067f48d
commit 4026d41c16
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/Dialog/DialogDriver_Win32.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ static INT_PTR CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM
}
// TODO: Return a different brush if the default is not desired
return (BOOL)hbr;
return reinterpret_cast<INT_PTR>(hbr);
}
}
return FALSE;
src/arch/InputHandler/InputHandler_Win32_MIDI.cpp
+4 -4
View File
@@ -11,7 +11,7 @@
REGISTER_INPUT_HANDLER_CLASS2( MIDI, Win32_MIDI );
static HMIDIIN g_device;
static void CALLBACK midiCallback(HMIDIIN g_device, UINT status, DWORD instancePtr, DWORD data, DWORD timestamp);
static void CALLBACK midiCallback(HMIDIIN g_device, UINT status, DWORD_PTR instancePtr, DWORD_PTR data, DWORD_PTR timestamp);
static RString GetMidiError( MMRESULT result )
{
@@ -33,7 +33,7 @@ InputHandler_Win32_MIDI::InputHandler_Win32_MIDI()
}
m_bFoundDevice = true;
MMRESULT result = midiInOpen( &g_device, device_id, (DWORD) &midiCallback, (DWORD) this, CALLBACK_FUNCTION );
MMRESULT result = midiInOpen( &g_device, device_id, reinterpret_cast<DWORD_PTR>(&midiCallback), reinterpret_cast<DWORD_PTR>(this), CALLBACK_FUNCTION );
if( result != MMSYSERR_NOERROR )
{
LOG->Warn( "Error opening MIDI device: %s", GetMidiError(result).c_str() );
@@ -75,7 +75,7 @@ void InputHandler_Win32_MIDI::GetDevicesAndDescriptions( vector<InputDeviceInfo>
}
}
static void CALLBACK midiCallback( HMIDIIN device, UINT status, DWORD instancePtr, DWORD data, DWORD timestamp )
static void CALLBACK midiCallback( HMIDIIN device, UINT status, DWORD_PTR instancePtr, DWORD_PTR data, DWORD_PTR timestamp )
{
if( status == MIM_DATA )
{
@@ -91,7 +91,7 @@ static void CALLBACK midiCallback( HMIDIIN device, UINT status, DWORD instancePt
{
DeviceInput di = DeviceInput( DEVICE_MIDI, enum_add2(MIDI_FIRST, iChannel), iValue > 0 );
di.ts.Touch();
((InputHandler_Win32_MIDI *)instancePtr)->SetDev( di );
(reinterpret_cast<InputHandler_Win32_MIDI*>(instancePtr))->SetDev( di );
}
}
}
src/arch/LoadingWindow/LoadingWindow_Win32.cpp
+1 -1
View File
@@ -118,7 +118,7 @@ void LoadingWindow_Win32::SetIcon( const RageSurface *pIcon )
m_hIcon = IconFromSurface( pIcon );
if( m_hIcon != nullptr )
SetClassLongPtrA( hwnd, GCLP_HICON, (LONG) m_hIcon );
SetClassLongPtrA( hwnd, GCLP_HICON, reinterpret_cast<LONG_PTR>(m_hIcon) );
}
void LoadingWindow_Win32::SetSplash( const RageSurface *pSplash )