Finishing new WinCE port

svn-id: r3757

wince/PocketSCUMM.rc

@@ -0,0 +1,175 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "newres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""newres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_GAMESELECT DIALOG DISCARDABLE  0, 0, 128, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+CAPTION "Choose a Game"
+FONT 8, "System"
+BEGIN
+    LISTBOX         IDC_LISTAVAILABLE,6,47,113,70,LBS_NOINTEGRALHEIGHT | 
+                    WS_VSCROLL | WS_TABSTOP
+    CONTROL         133,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0,2,
+                    125,35
+    LTEXT           "",IDC_GAMEDESC,2,117,116,8
+    PUSHBUTTON      "Play",IDC_PLAY,52,125,19,9
+    LTEXT           "",IDC_FILEPATH,5,39,120,8
+    PUSHBUTTON      "Scan",IDC_SCAN,4,125,19,9
+    PUSHBUTTON      "Exit",IDC_EXIT,100,125,19,9
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menubar
+//
+
+IDM_MENU MENU DISCARDABLE 
+BEGIN
+    POPUP "PocketSCUMM"
+    BEGIN
+        MENUITEM "Load/Save",                   IDC_LOADSAVE
+        MENUITEM "Options",                     IDC_OPTIONS
+        MENUITEM "Exit",                        IDC_EXIT
+        MENUITEM SEPARATOR
+        MENUITEM "Landscape",                   IDC_LANDSCAPE
+        MENUITEM "Skip section",                IDC_SKIP
+        MENUITEM SEPARATOR
+        MENUITEM "Sound",                       IDC_SOUND
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Data
+//
+
+IDM_MENU SHMENUBAR DISCARDABLE 
+BEGIN
+    IDM_MENU, 1,
+    I_IMAGENONE, IDM_POCKETSCUMM, TBSTATE_ENABLED, 
+    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_POCKETSCUMM, 0, 0,
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_GAMESELECT, DIALOG
+    BEGIN
+        RIGHTMARGIN, 125
+        HORZGUIDE, 2
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_CAP_POCKETSCUMM     "PocketSCUMM"
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDL_POCKETSCUMM         ICON    DISCARDABLE     "PocketSCUMM.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_MENUTITLE           BITMAP  DISCARDABLE     "MenuTitle.bmp"
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

wince/PocketSCUMM.vcc

@@ -0,0 +1,39 @@
+; CLW file contains information for the MFC ClassWizard
+
+[General Info]
+Version=1
+LastClass=
+LastTemplate=CDialog
+NewFileInclude1=#include "stdafx.h"
+NewFileInclude2=#include "pocketscumm.h"
+LastPage=0
+
+ClassCount=0
+
+ResourceCount=2
+Resource1=IDD_GAMESELECT (English (U.S.))
+Resource2=IDM_MENU (English (U.S.))
+
+[DLG:IDD_GAMESELECT (English (U.S.))]
+Type=1
+Class=?
+ControlCount=7
+Control1=IDC_LISTAVAILABLE,listbox,1352728833
+Control2=IDC_STATIC,static,1342177806
+Control3=IDC_GAMEDESC,static,1342308352
+Control4=IDC_PLAY,button,1342242816
+Control5=IDC_FILEPATH,static,1342308352
+Control6=IDC_SCAN,button,1342242816
+Control7=IDC_EXIT,button,1342242816
+
+[MNU:IDM_MENU (English (U.S.))]
+Type=1
+Class=?
+Command1=IDC_LOADSAVE
+Command2=IDC_OPTIONS
+Command3=IDC_EXIT
+Command4=IDC_LANDSCAPE
+Command5=IDC_SKIP
+Command6=IDC_SOUND
+CommandCount=6
+

wince/PocketSCUMM.vcw

@@ -0,0 +1,29 @@
+Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "PocketSCUMM"=.\PocketSCUMM.vcp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

wince/findgame.cpp

@@ -4,6 +4,7 @@
 
 #include "stdafx.h"
 #include <Winuser.h>
+#include <Winnls.h>
 #include "resource.h"
 
 #define MAX_GAMES 20

wince/newres.h

@@ -0,0 +1,41 @@
+#ifndef __NEWRES_H__
+#define __NEWRES_H__
+
+#if !defined(UNDER_CE)
+#define UNDER_CE _WIN32_WCE
+#endif
+
+#if defined(_WIN32_WCE)
+	#if !defined(WCEOLE_ENABLE_DIALOGEX)
+		#define DIALOGEX DIALOG DISCARDABLE
+	#endif
+	#include <commctrl.h>
+	#define  SHMENUBAR RCDATA
+	#if defined(WIN32_PLATFORM_PSPC) && (_WIN32_WCE >= 300)
+		#include <aygshell.h>
+		#define AFXCE_IDR_SCRATCH_SHMENU  28700
+	#else
+		#define I_IMAGENONE		(-2)
+		#define NOMENU			0xFFFF
+		#define IDS_SHNEW		1
+
+		#define IDM_SHAREDNEW        10
+		#define IDM_SHAREDNEWDEFAULT 11
+	#endif // _WIN32_WCE_PSPC
+	#define AFXCE_IDD_SAVEMODIFIEDDLG 28701
+#endif // _WIN32_WCE
+
+#ifdef RC_INVOKED
+#ifndef _INC_WINDOWS
+#define _INC_WINDOWS
+	#include "winuser.h"           // extract from windows header
+	#include "winver.h"   
+#endif
+#endif
+
+#ifdef IDC_STATIC
+#undef IDC_STATIC
+#endif
+#define IDC_STATIC      (-1)
+
+#endif //__NEWRES_H__

wince/pocketpc.cpp

@@ -33,6 +33,7 @@
 #include "commctrl.h"
 
 #include <Winuser.h>
+#include <Winnls.h>
 #include <sipapi.h>
 #include <Aygshell.h>
 #include <gx.h>
@@ -44,6 +45,8 @@
 #include "SDL_timer.h"
 #include "SDL_thread.h"
 
+#define POCKETSCUMM_BUILD "031402"
+
 #define VERSION "Build " POCKETSCUMM_BUILD " (VM " SCUMMVM_CVS ")"
 
 #define SHMenuBar_GetMenu(hWndMB,ID_MENU) (HMENU)SendMessage((hWndMB), SHCMBM_GETSUBMENU, (WPARAM)0, (LPARAM)ID_MENU)
@@ -960,7 +963,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin
 	sprintf(argdir, "-p%s", _directory);
 	argv[2] = argdir;
 	scumm._savegame_dir = _directory;
-	scumm._error_handler = error_handler;
+//	scumm._error_handler = error_handler;
 
 	if(argv[1] == NULL)
 		return 0;
@@ -1019,5 +1022,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin
 void setShakePos(Scumm *s, int shake_pos) {}
 // TODO : switch to MP3 support
 void cd_playtrack(int track, int offset, int delay) {}
+// Never happening on Pocket version
+void launcherLoop() {}
 
 

wince/resource.h

@@ -0,0 +1,57 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by PocketSCUMM.rc
+//
+#define IDD_GAMESELECT                  105
+#define IDD_SOUND_DIALOG                106
+#define IDB_SKIP                        113
+#define IDB_DISK                        115
+#define IDB_EXIT                        116
+#define IDB_SOUND_ON                    117
+#define IDB_SOUND_OFF                   118
+#define IDB_PANEL                       119
+#define IDI_POCKETSCUMM                 127
+#define IDB_KEYBOARD                    129
+#define IDL_POCKETSCUMM                 130
+#define IDB_MENUTITLE                   133
+#define IDM_MENU                        1000
+#define IDC_ABOUT                       1000
+#define IDC_MONKEY                      1000
+#define IDC_OPTIONS                     1000
+#define IDC_EXIT                        1001
+#define IDC_MONKEY2                     1001
+#define IDD_SLIDERMUSIC                 1001
+#define IDC_ATLANTIS                    1002
+#define IDD_SLIDERSFX                   1002
+#define IDC_PLAYFATE                    1003
+#define IDC_TENTACLE                    1004
+#define IDC_DOTTDEMO                    1005
+#define IDC_SAMNMAX                     1006
+#define IDC_SNMDEMO                     1007
+#define IDC_DISABLE_SOUND               1008
+#define IDC_SLOW_SOUND                  1009
+#define IDC_FT                          1010
+#define IDC_LISTAVAILABLE               1011
+#define IDC_GAMEDESC                    1014
+#define IDC_PLAY                        1015
+#define IDC_FILEPATH                    1016
+#define IDC_SCAN                        1018
+#define ID_POCKETSCUMM                  40005
+#define IDS_CAP_POCKETSCUMM             40006
+#define IDC_LANDSCAPE                   40007
+#define IDC_SKIP                        40008
+#define IDC_LOADSAVE                    40009
+#define IDC_SOUND                       40011
+#define IDC_SOUNDVOL                    40012
+#define IDM_POCKETSCUMM                 40013
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        134
+#define _APS_NEXT_COMMAND_VALUE         40014
+#define _APS_NEXT_CONTROL_VALUE         1016
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

wince/screen.h

@@ -0,0 +1,33 @@
+/* (C) 2001  Vasyl Tsvirkunov */
+
+#ifndef SCREEN_H
+#define SCREEN_H
+
+#ifndef UBYTE
+#define UBYTE unsigned char
+#endif
+
+int GraphicsOn(HWND hWndMain);
+void GraphicsOff();
+void GraphicsSuspend();
+void GraphicsResume();
+
+void SetPalEntry(int ent, UBYTE r, UBYTE g, UBYTE b);
+void Blt(UBYTE * scr_ptr);
+
+/* meaning: 0 - portrait, 1 - left hand landscape, 2 - right hand landscape */
+void SetScreenMode(int mode);
+int GetScreenMode();
+
+void Translate(int* x, int* y);
+
+typedef enum ToolbarSelected {
+	ToolbarNone,
+	ToolbarSaveLoad,
+	ToolbarExit,
+	ToolbarSkip,
+	ToolbarSound
+} ToolbarSelected;
+	
+
+#endif