Update of /cvsroot/clientapps/guiplayer/win
In directory cvs-new:/tmp/cvs-serv28600/win

Modified Files:
	controls.rc winmain.cpp 
Added Files:
	newres.h 
Log Message:
Adding support for Wince4.2 on X86


--- NEW FILE: newres.h ---
#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> 
	#else
		#define I_IMAGENONE		(-2)
		#define NOMENU			0xFFFF
		#define IDS_SHNEW		1

		#define IDM_SHAREDNEW        10
		#define IDM_SHAREDNEWDEFAULT 11
	#endif
#endif // _WIN32_WCE


#ifdef RC_INVOKED
#ifndef _INC_WINDOWS
#define _INC_WINDOWS
	#include "winuser.h"           // extract from windows header
#endif
#endif

#ifdef IDC_STATIC
#undef IDC_STATIC
#endif
#define IDC_STATIC      (-1)

#endif //__NEWRES_H__

Index: winmain.cpp
===================================================================
RCS file: /cvsroot/clientapps/guiplayer/win/winmain.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- winmain.cpp	13 Feb 2003 15:09:38 -0000	1.3
+++ winmain.cpp	7 May 2004 22:11:03 -0000	1.4
@@ -42,17 +42,26 @@
 #include "chelixappwin.h"
 #include "dllpaths.h"
 
+#include "hlxosstr.h"
 
+#ifndef TEXT
+#define TEXT(w)  OS_STRING(w)
+#endif
+
+#ifndef _WINDOWS
+#define TCHAR  char
+#endif
 
 int WINAPI 
-WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR pCmdLine, int nCmdShow)
+WinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR pCmdLine, int nCmdShow)
 {
     // XXXNH: ugly hack
-    char pFileName[1001] = ""; /* Flawfinder: ignore */
+    TCHAR pFileName[1001] = TEXT(""); /* Flawfinder: ignore */
     HX_VERIFY(GetModuleFileName(hInstance, pFileName, 1000) < 1000);
     int argc = 2;
-    char* argv[3] = { pFileName, pCmdLine, NULL };
-
+	OS_STRING_TYPE ospFileName(pFileName), ospCmdLine(pCmdLine);
+    char* argv[3] = { (char*)ospFileName, (char*)ospCmdLine, NULL };
+	
     // create the platform-specific app
     CHelixAppWin app(hInstance);
 

Index: controls.rc
===================================================================
RCS file: /cvsroot/clientapps/guiplayer/win/controls.rc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- controls.rc	18 Oct 2002 01:53:40 -0000	1.1.1.1
+++ controls.rc	7 May 2004 22:11:03 -0000	1.2
@@ -44,7 +44,11 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
+#ifdef _WIN32_WCE
+#include "newres.h"
+#else
 #include "afxres.h"
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -63,18 +67,26 @@
 // Dialog
 //
 
-IDD_CONTROLS DIALOGEX 0, 0, 200, 24
+IDD_CONTROLS DIALOGEX 0, 0, 300, 24
 STYLE WS_CHILD
+#ifndef _WIN32_WCE
 EXSTYLE WS_EX_CONTROLPARENT
+#endif
 FONT 8, "MS Sans Serif"
 BEGIN
-    PUSHBUTTON      "play",IDC_BUTTONPLAY,0,0,25,14,BS_CENTER | BS_VCENTER | 
-                    WS_DISABLED
-    PUSHBUTTON      "pause",IDC_BUTTONPAUSE,25,0,25,14,WS_DISABLED
-    PUSHBUTTON      "stop",IDC_BUTTONSTOP,50,0,25,14,WS_DISABLED
+    PUSHBUTTON      "&Play",IDC_BUTTONPLAY,0,0,25,14,BS_CENTER | BS_VCENTER | WS_DISABLED
+    PUSHBUTTON      "Pa&use",IDC_BUTTONPAUSE,25,0,25,14,WS_DISABLED
+    PUSHBUTTON      "&Stop",IDC_BUTTONSTOP,50,0,25,14,WS_DISABLED
+#ifdef HAVE_REW_AND_FWD_CONTROLS
+    PUSHBUTTON      "&Rewind",IDC_BUTTONREW,75,0,35,14,WS_DISABLED
+    PUSHBUTTON      "&Forward",IDC_BUTTONFWD,110,0,35,14,WS_DISABLED
     CONTROL         "",IDC_SLIDERPOS,"msctls_trackbar32",TBS_BOTH | 
-                    TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,75,0,124,15
-    LTEXT           "",IDC_TEXTSTATUS,0,14,200,10
+                    TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,145,0,150,15
+#else//HAVE_REW_AND_FWD_CONTROLS
+    CONTROL         "",IDC_SLIDERPOS,"msctls_trackbar32",TBS_BOTH | 
+                    TBS_NOTICKS | WS_DISABLED | WS_TABSTOP,75,0,220,15
+#endif//HAVE_REW_AND_FWD_CONTROLS
+    LTEXT           "",IDC_TEXTSTATUS,0,14,300,10
 END
 
 IDD_OPENURL DIALOG DISCARDABLE  0, 0, 239, 50