WinCE build tool changes. stubbing out GetDIBits, clock. implementing FatalAppExitW. npodb
authorDoug Turner <dougt@meer.net>
Mon, 29 Sep 2008 10:48:58 -0700
changeset 19877 ea5f761982ed4726bc4968173251d03fcdf92374
parent 19868 aa4d3083995f851d9a075eec55baed0c94c95984
child 19878 ef97f45f7c8063cda1e6d23035c42c015f6bd9b5
push id2514
push userdougt@mozilla.com
push dateMon, 29 Sep 2008 21:20:28 +0000
treeherdermozilla-central@8858457b51ce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1b1pre
WinCE build tool changes. stubbing out GetDIBits, clock. implementing FatalAppExitW. npodb
build/wince/shunt/include/mozce_shunt.h
build/wince/shunt/stdio.cpp
build/wince/shunt/win32.cpp
build/wince/tools/vs8ppc2003arm/build_tools.bat
build/wince/tools/vs8ppc2003arm/toolspath.h
build/wince/tools/vs9ppc2003arm/toolspath.h
--- a/build/wince/shunt/include/mozce_shunt.h
+++ b/build/wince/shunt/include/mozce_shunt.h
@@ -433,13 +433,16 @@ MOZCE_SHUNT_API BOOL MoveFileExW(
 MOZCE_SHUNT_API int  _wrmdir(const wchar_t * _Path);
 MOZCE_SHUNT_API int _wremove(const wchar_t * _Filename);
 MOZCE_SHUNT_API int _wchmod(const wchar_t * _Filename, int _Mode);
 MOZCE_SHUNT_API wchar_t *_wgetcwd(wchar_t *buffer,int maxlen);
 MOZCE_SHUNT_API wchar_t *_wfullpath(wchar_t *abspath, const wchar_t *relpath, int maxlen);
 
 MOZCE_SHUNT_API HWND GetAncestor(HWND hwnd, UINT gaFlags);
 
+MOZCE_SHUNT_API int _chdir (const char *dirname);
+MOZCE_SHUNT_API int _wchdir (const wchar_t *dirname);
+
 #ifdef __cplusplus
 };
 #endif
 
 #endif //MOZCE_SHUNT_H
--- a/build/wince/shunt/stdio.cpp
+++ b/build/wince/shunt/stdio.cpp
@@ -153,16 +153,28 @@ MOZCE_SHUNT_API int remove(const char* i
                 
             }
         }
     }
     
     return retval;
 }
 
+MOZCE_SHUNT_API int setmode(FILE*, int) 
+{
+    return 0;
+}
+MOZCE_SHUNT_API int _chdir (const char *dirname)
+{
+    return 0;
+}
+MOZCE_SHUNT_API int _wchdir (const wchar_t *dirname)
+{
+    return 0;
+}
 MOZCE_SHUNT_API char* getcwd(char* buff, size_t size)
 {
     WINCE_LOG_API_CALL("getcwd called.\n");
 
     int i;
     unsigned short dir[MAX_PATH];
     GetModuleFileName(GetModuleHandle (NULL), dir, MAX_PATH);
     for (i = _tcslen(dir); i && dir[i] != TEXT('\\'); i--) {}
--- a/build/wince/shunt/win32.cpp
+++ b/build/wince/shunt/win32.cpp
@@ -1188,22 +1188,37 @@ MOZCE_SHUNT_API DWORD SetNamedSecurityIn
                                             PSID psidGroup,
                                             PACL pDacl,
                                             PACL pSacl)
 {
     return 0;
 }
 
 
-
 MOZCE_SHUNT_API void FatalAppExitW(UINT uAction, LPCWSTR lpMessageText)
 {
   if ( ::MessageBoxW(NULL, lpMessageText, L"Runtime Error", MB_OKCANCEL | MB_ICONERROR) == IDCANCEL )
     return;
 
   exit(-1);
 }
 
+MOZCE_SHUNT_API int clock() 
+{
+    return -1;
+}
+
+MOZCE_SHUNT_API int GetDIBits(HDC hdc, HBITMAP hbmp, UINT uStartScan, UINT cScanLines, 
+                              LPVOID lpvBits, LPBITMAPINFO lpbi, UINT uUsage) 
+{
+  
+#if 0
+    return GetBitmapBits(hbmp,lpbi->bmiHeader.biSize, lpvBits); 
+#else
+    return 0;
+#endif                 
+                 
+}
 
 #if 0
 {
 #endif
 } /* extern "C" */
--- a/build/wince/tools/vs8ppc2003arm/build_tools.bat
+++ b/build/wince/tools/vs8ppc2003arm/build_tools.bat
@@ -6,12 +6,13 @@ REM rm arm-wince-link.exe
 rm *.obj
 rm *.ilk
 rm *.pdb
 
 cl arm-wince-as.c 
 cl arm-wince-gcc.c
 cl arm-wince-lib.c
 cl arm-wince-link.c 
+cl arm-wince-res.c
    
 rm *.obj
 rm *.ilk
 rm *.pdb
--- a/build/wince/tools/vs8ppc2003arm/toolspath.h
+++ b/build/wince/tools/vs8ppc2003arm/toolspath.h
@@ -6,18 +6,18 @@
 #include "../topsrcdir.h"
 #endif
 
 #define WCE_BIN   "c:\\Program Files\\Microsoft Visual Studio 8\\VC\\ce\\bin\\x86_arm\\"
 #define WCE_CRT   "c:\\Program Files\\Microsoft Visual Studio 8\\VC/ce\\lib\\armv4i"
 #define WCE_INC   "c:\\Program Files\\Windows Mobile 6 SDK\\Smartphone\\Include\\Armv4i"
 #define WCE_LIB   "c:\\Program Files\\Windows Mobile 6 SDK\\Smartphone\\Lib\\Armv4i"
 
-#define WCE_RC_BIN "c:\\Program Files\\Microsoft Visual Studio 8\\VC\\bin\\"
-//#define WCE_RC_BIN "c:\\Program Files\\Microsoft SDKs\\Windows\\v6.0a\\bin\\"
+//#define WCE_RC_BIN "c:\\Program Files\\Microsoft Visual Studio 8\\VC\\bin\\"
+#define WCE_RC_BIN "c:\\Program Files\\Microsoft SDKs\\Windows\\v6.0\\bin\\"
 
 #define SHUNT_LIB TOPSRCDIR "/build/wince/shunt/build/vs8/"
 #define SHUNT_INC TOPSRCDIR "/build/wince/shunt/include/"
 
 #define ASM_PATH  WCE_BIN "armasm.exe"
 #define CL_PATH   WCE_BIN "cl.exe"
 #define LIB_PATH  WCE_BIN "lib.exe"
 #define LINK_PATH WCE_BIN "link.exe"
--- a/build/wince/tools/vs9ppc2003arm/toolspath.h
+++ b/build/wince/tools/vs9ppc2003arm/toolspath.h
@@ -2,17 +2,18 @@
 #include <stdio.h>
 #include <process.h>
 
 #ifndef TOPSRCDIR
 #include "../topsrcdir.h"
 #endif
 
 #define WCE_BIN    "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\ce\\bin\\x86_arm\\"
-#define WCE_RC_BIN "c:\\Program Files\\Microsoft SDKs\\Windows\\v6.0a\\bin\\"
+//#define WCE_RC_BIN "c:\\Program Files\\Microsoft SDKs\\Windows\\v6.0a\\bin\\"
+#define WCE_RC_BIN "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\bin\\"
 #define WCE_CRT    "c:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\ce\\lib\\armv4i"
 #define WCE_INC    "c:\\Program Files\\Windows Mobile 6 SDK\\Smartphone\\Include\\Armv4i"
 #define WCE_LIB    "c:\\Program Files\\Windows Mobile 6 SDK\\Smartphone\\Lib\\Armv4i"
 
 
 #define SHUNT_LIB TOPSRCDIR "/build/wince/shunt/build/vs9/"
 #define SHUNT_INC TOPSRCDIR "/build/wince/shunt/include/"