PadNull: It compiles in Windows. (It does not pass key events, such as escape, though, so should not be used yet.)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1243 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-05-23 06:11:48 +00:00
parent 47bc9722d4
commit a180b105d3
9 changed files with 140 additions and 31 deletions

View File

@ -1,4 +1,4 @@
/* FWnull
/* PadNull
* Copyright (C) 2004-2009 PCSX2 Team
*
* This program is free software; you can redistribute it and/or modify
@ -80,4 +80,4 @@ void _PADClose()
//settings->auto_repeat_mode = autoRepeatMode;
//XChangeKeyboardControl(GSdsp, KBAutoRepeatMode, settings);
}
}

View File

@ -1,4 +1,4 @@
/* FWnull
/* PadNull
* Copyright (C) 2004-2009 PCSX2 Team
*
* This program is free software; you can redistribute it and/or modify

View File

@ -32,10 +32,7 @@ extern "C"
#endif
#ifdef _WIN32
#include <windows.h>
#include <windowsx.h>
#include "PadWin.h"
#else
#include "PadLinux.h"
#endif

View File

@ -1,6 +1,24 @@
/* PadNull
* Copyright (C) 2004-2009 PCSX2 Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdlib.h>
#include "../FW.h"
#include "../Pad.h"
extern HINSTANCE hInst;
void SaveConfig()

View File

@ -1,19 +1,23 @@
; FireWire.def : Declares the module parameters for the DLL.
LIBRARY "FWnull"
LIBRARY "PadNull"
EXPORTS
; Explicit exports can go here
PS2EgetLibType @2
PS2EgetLibName @3
PS2EgetLibVersion2 @4
FWinit @5
FWshutdown @6
FWopen @7
FWclose @8
FWread32 @11
FWwrite32 @14
FWirqCallback @15
FWconfigure @17
FWtest @18
FWabout @19
PADinit @5
PADshutdown @6
PADopen @7
PADclose @8
PADkeyEvent @9
PADstartPoll @10
PADpoll @11
PADquery @12
PADupdate @13
PADgsDriverInfo @14
PADfreeze @15
PADconfigure @16
PADtest @17
PADabout @18

View File

@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="FWnull"
Name="Padnull"
ProjectGUID="{3D0EB14D-32F3-4D82-9C6D-B806ADBB859C}"
RootNamespace="FWnull"
RootNamespace="Padnull"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
@ -122,7 +122,7 @@
/>
<Tool
Name="VCLinkerTool"
ModuleDefinitionFile="FireWireNull.def"
ModuleDefinitionFile="PadNull.def"
RandomizedBaseAddress="1"
TargetMachine="1"
/>
@ -161,7 +161,11 @@
>
</File>
<File
RelativePath="..\FW.cpp"
RelativePath="..\Pad.cpp"
>
</File>
<File
RelativePath=".\PadWin.cpp"
>
</File>
<File
@ -174,7 +178,11 @@
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
RelativePath="..\FW.h"
RelativePath="..\Pad.h"
>
</File>
<File
RelativePath=".\PadWin.h"
>
</File>
<File
@ -187,11 +195,11 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
RelativePath=".\FireWireNull.def"
RelativePath=".\PadNull.def"
>
</File>
<File
RelativePath=".\FireWireNull.rc"
RelativePath=".\PadNull.rc"
>
</File>
</Filter>

View File

@ -0,0 +1,33 @@
/* PadNull
* Copyright (C) 2004-2009 PCSX2 Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "PadWin.h"
void _PadUpdate(int pad)
{
}
s32 _PADOpen(void *pDsp)
{
return 0;
}
void _PADClose()
{
}

View File

@ -0,0 +1,30 @@
/* PadNull
* Copyright (C) 2004-2009 PCSX2 Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __PADLINUX_H__
#define __PADLINUX_H__
#include "../Pad.h"
#include <windows.h>
#include <windowsx.h>
void _PadUpdate(int pad);
s32 _PADOpen(void *pDsp);
void _PADClose();
#endif

View File

@ -1,10 +1,28 @@
/* PadNull
* Copyright (C) 2004-2009 PCSX2 Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
#include <windows.h>
#include <windowsx.h>
#include "resource.h"
#include "../FW.h"
#include "../Pad.h"
HINSTANCE hInst;
@ -15,7 +33,7 @@ void SysMessage(char *fmt, ...) {
va_start(list,fmt);
vsprintf(tmp,fmt,list);
va_end(list);
MessageBox(0, tmp, "FW Plugin Msg", 0);
MessageBox(0, tmp, "Pad Plugin Msg", 0);
}
BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
@ -34,7 +52,8 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
case IDOK:
if (IsDlgButtonChecked(hW, IDC_LOGGING))
conf.Log = 1;
else conf.Log = 0;
else
conf.Log = 0;
SaveConfig();
EndDialog(hW, FALSE);
return TRUE;
@ -58,14 +77,14 @@ BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
return FALSE;
}
void CALLBACK FWconfigure() {
EXPORT_C_(void) PADconfigure() {
DialogBox(hInst,
MAKEINTRESOURCE(IDD_CONFIG),
GetActiveWindow(),
(DLGPROC)ConfigureDlgProc);
}
void CALLBACK FWabout() {
EXPORT_C_(void) PADabout() {
DialogBox(hInst,
MAKEINTRESOURCE(IDD_ABOUT),
GetActiveWindow(),