[Scummvm-cvs-logs] CVS: scummvm/backends/wince findgame.cpp,1.3,1.4 gapi_keys.cpp,1.2,1.3 pocketpc.cpp,1.9,1.10 screen.cpp,1.3,1.4

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/backends/wince
In directory usw-pr-cvs1:/tmp/cvs-serv7875

Modified Files:
	findgame.cpp gapi_keys.cpp pocketpc.cpp screen.cpp 
Log Message:
Real HPC support (work in progress)

Index: findgame.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/findgame.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- findgame.cpp	22 Oct 2002 22:56:26 -0000	1.3
+++ findgame.cpp	31 Oct 2002 01:03:55 -0000	1.4
@@ -25,6 +25,13 @@
 
 #include "stdafx.h"
 #include <assert.h>
+
+#if _WIN32_WCE < 300
+
+#include <Wingdi.h>
+#include <Winbase.h>
+
+#endif
 #include <Winuser.h>
 #include <Winnls.h>
 #include "resource.h"

Index: gapi_keys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/gapi_keys.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gapi_keys.cpp	22 Oct 2002 22:57:12 -0000	1.2
+++ gapi_keys.cpp	31 Oct 2002 01:03:55 -0000	1.3
@@ -25,9 +25,18 @@
 
 #include "stdafx.h"
 #include <assert.h>
+
+#if _WIN32_WCE < 300
+
+#include <Wingdi.h>
+#include <Winbase.h>
+#include <Wtypes.h>
+
+#endif
+
 #include <Winuser.h>
 #include <sipapi.h>
-#include <Aygshell.h>
+//#include <Aygshell.h>
 #include <gx.h>
 #include "dynamic_imports.h"
 

Index: pocketpc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/pocketpc.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pocketpc.cpp	26 Oct 2002 23:13:32 -0000	1.9
+++ pocketpc.cpp	31 Oct 2002 01:03:55 -0000	1.10
@@ -22,6 +22,60 @@
 #include "stdafx.h"
 #include <assert.h>
 
+//#include "commctrl.h"
+
+#if _WIN32_WCE < 300
+
+#include <Wingdi.h>
+#include <Winbase.h>
+#include <Wtypes.h>
+
+#endif
+
+#include <Winuser.h>
+#include <Winnls.h>
+#include <sipapi.h>
+
+#if _WIN32_WCE >= 300
+
+#include <Aygshell.h>
+
+#else
+
+// Put in include file
+
+typedef enum tagSIPSTATE
+{
+    SIP_UP = 0,
+    SIP_DOWN,
+	SIP_FORCEDOWN,
+    SIP_UNCHANGED,
+    SIP_INPUTDIALOG,
+} SIPSTATE;
+
+#define SHFS_SHOWTASKBAR            0x0001
+#define SHFS_HIDETASKBAR            0x0002
+#define SHFS_SHOWSIPBUTTON          0x0004
+#define SHFS_HIDESIPBUTTON          0x0008
+#define SHFS_SHOWSTARTICON          0x0010
+#define SHFS_HIDESTARTICON          0x0020
+
+typedef struct
+{
+    DWORD cbSize;
+    HWND hwndLastFocus;
+    UINT fSipUp :1;
+    UINT fSipOnDeactivation :1;
+    UINT fActive :1;
+    UINT fReserved :29;
+} SHACTIVATEINFO, *PSHACTIVATEINFO;
+
+
+#endif
+
+#include <gx.h>
+#include "resource.h"
+
 #include "scumm.h"
 #include "debug.h"
 #include "screen.h"
@@ -32,15 +86,6 @@
 #include "gapi_keys.h"
 #include "config-file.h"
 
-
-#include "commctrl.h"
-#include <Winuser.h>
-#include <Winnls.h>
-#include <sipapi.h>
-#include <Aygshell.h>
-#include <gx.h>
-#include <aygshell.h>
-#include "resource.h"
 
 #include "SDL.h"
 #include "SDL_audio.h"

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/screen.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- screen.cpp	25 Oct 2002 23:44:15 -0000	1.3
+++ screen.cpp	31 Oct 2002 01:03:55 -0000	1.4
@@ -24,7 +24,7 @@
 /* Original GFX code by Vasyl Tsvirkunov */
 
 #include <windows.h>
-#include <Aygshell.h>
+//#include <Aygshell.h>
 #include "gx.h"
 #include "screen.h"
 #include "resource.h"