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

Merge pull request #1259 from RadWolfie/fix-compile-warnings-general 

Fix compile warnings general
This commit is contained in:
PatrickvL 2018-06-08 07:32:25 +02:00 committed by GitHub
parent c5e908efa1 2c72cfee6f
commit 119b760bed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CxbxKrnl/EmuKrnlKe.cpp
View File

@ -1526,7 +1526,7 @@ XBSYSAPI EXPORTNUM(145) xboxkrnl::LONG NTAPI xboxkrnl::KeSetEvent
// TODO: Find out why some XDKs do not call KeInitializeEvent first
//We can check the event type from the internal structure, see https://www.geoffchappell.com/studies/windows/km/ntoskrnl/structs/kobjects.htm?tx=111
if (Event->Header.Type & 0x7F == 0x01)
if ((Event->Header.Type & 0x7F) == 0x01)
{
KeInitializeEvent(Event, NotificationEvent, TRUE);
}

6
src/CxbxKrnl/EmuXapi.cpp
View File

@ -98,7 +98,7 @@ std::vector<XTL::X_XINPUT_DEVICE_INFO> g_XboxInputDeviceInfo;
//look for xbox Device info from global info vector, and return the found index. return -1 for not found.
int FindDeviceInfoIndexByXboxType(UCHAR ucType)
{
int i;
size_t i;
for (i = 0; i < g_XboxInputDeviceInfo.size(); i++) {
if (g_XboxInputDeviceInfo[i].ucType == ucType) {
return i;
@ -110,7 +110,7 @@ int FindDeviceInfoIndexByXboxType(UCHAR ucType)
//look for xbox Device info from global info vector, and return the found index. return -1 for not found.
int FindDeviceInfoIndexByDeviceType(XTL::PXPP_DEVICE_TYPE DeviceType)
{
int i;
size_t i;
for (i = 0; i < g_XboxInputDeviceInfo.size(); i++) {
if (g_XboxInputDeviceInfo[i].DeviceType == DeviceType) {
return i;
@ -1180,7 +1180,7 @@ DWORD WINAPI XTL::EMUPATCH(XInputSetState)
//printf("SBC setstate!\n");
//EmuXSBCSetState((UCHAR *)&pFeedback->Rumble);
//UpdateVirtualSBCFeedbackDlg((UCHAR *)&pFeedback->Rumble);
DWORD dwVXBCSetStateResult;
//DWORD dwVXBCSetStateResult;
if (g_module != 0 && fnCxbxVSBCSetState == 0) {
fnCxbxVSBCSetState = (PFARPROC2)GetProcAddress(g_module, "VSBCSetState");
//fnCxbxVSBCGetState = (PFARPROC2)GetProcAddress(g_module, "VSBCGetState");

2
src/CxbxVSBC/CxbxVSBC.h
View File

@ -5,7 +5,9 @@
#endif#pragma once
//#include <windef.h>
//#include "../CxbxKrnl/EmuXapi.h"
#ifndef X_XONTROLLER_HOST_BRIDGE_HOSTTYPE_VIRTUAL_SBC
#define X_XONTROLLER_HOST_BRIDGE_HOSTTYPE_VIRTUAL_SBC 0x80
#endif
/*
extern "C" static CXBXVSBC_API DWORD VSBCGetState(UCHAR * pSBCGamepad);
extern "C" static CXBXVSBC_API DWORD VSBCSetState(UCHAR * pSBCFeedback);