ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Project64-Input: Fix input plugin to compile as 64bit

This commit is contained in:
zilmar 2020-08-19 14:54:49 +09:30
parent 883632b4a4
commit 76a197f26e
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-input/CProject64Input.cpp
View File

@ -41,7 +41,7 @@ void CProject64Input::InitiateControllers(CONTROL_INFO * ControlInfo)
} }
m_DirectInput->Initiate(ControlInfo); m_DirectInput->Initiate(ControlInfo);
m_iFirstController = -1; m_iFirstController = -1;
for (size_t i = 0, n = sizeof(m_Controllers) / sizeof(m_Controllers[0]); i < n; i++) for (uint32_t i = 0, n = sizeof(m_Controllers) / sizeof(m_Controllers[0]); i < n; i++)
{ {
g_Settings->LoadController(i, m_ControlInfo.Controls[i], m_Controllers[i]); g_Settings->LoadController(i, m_ControlInfo.Controls[i], m_Controllers[i]);
m_DirectInput->MapControllerDevice(m_Controllers[i]); m_DirectInput->MapControllerDevice(m_Controllers[i]);

2
Source/Project64-input/InputConfigUI.cpp
View File

@ -409,7 +409,7 @@ void CInputConfigUI::UpdateDeviceMapping(void)
&m_pgController3 &m_pgController3
}; };
for (size_t i = 0, n = GetPageCount(); i < n; i++) for (uint32_t i = 0, n = GetPageCount(); i < n; i++)
{ {
HWND hPage = IndexToHwnd(i); HWND hPage = IndexToHwnd(i);
if (hPage != nullptr && i < (sizeof(Pages) / sizeof(Pages[0]))) if (hPage != nullptr && i < (sizeof(Pages) / sizeof(Pages[0])))

4
Source/Project64-input/OptionsUI.cpp
View File

@ -68,10 +68,10 @@ public:
} }
CComboBox ControllerPak(GetDlgItem(IDC_PAKTYPE)); CComboBox ControllerPak(GetDlgItem(IDC_PAKTYPE));
int32_t Pak = ControllerPak.GetItemData(ControllerPak.GetCurSel()); DWORD_PTR Pak = ControllerPak.GetItemData(ControllerPak.GetCurSel());
if (Pak != m_ControlInfo.Plugin) if (Pak != m_ControlInfo.Plugin)
{ {
m_ControlInfo.Plugin = Pak; m_ControlInfo.Plugin = (Pak & 0xFFFFFFFF);
bChanged = true; bChanged = true;
} }

12
Source/Project64-input/Project64-input.vcxproj
View File

@ -46,14 +46,10 @@
<Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-input\Version.h.in" "$(SolutionDir)Source\Project64-input\Version.h"</Command> <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-input\Version.h.in" "$(SolutionDir)Source\Project64-input\Version.h"</Command>
</PreBuildEvent> </PreBuildEvent>
<Link> <Link>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ImageHasSafeExceptionHandlers> <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<Link>
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<ImageHasSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ImageHasSafeExceptionHandlers>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

4
Source/Project64-input/wtl-BitmapPicture.cpp
View File

@ -55,7 +55,7 @@ bool CBitmapPicture::SetIcon(LPCWSTR lpszResourceName, uint32_t nWidth, uint32_t
} }
if (IS_INTRESOURCE(lpszResourceName)) if (IS_INTRESOURCE(lpszResourceName))
{ {
m_nResourceID = (int)lpszResourceName; m_nResourceID = (((DWORD_PTR)lpszResourceName) & 0xFFFF);
} }
else else
{ {
@ -77,7 +77,7 @@ void CBitmapPicture::SetBitmap(LPCWSTR lpszResourceName)
{ {
if (IS_INTRESOURCE(lpszResourceName)) if (IS_INTRESOURCE(lpszResourceName))
{ {
m_nResourceID = (int)lpszResourceName; m_nResourceID = (((DWORD_PTR)lpszResourceName) & 0xFFFF);
} }
else else
{ {