Changeset afe75c32b3832a99d89ac7f2d789130d3fde21e9

Timestamp:

02/24/10 15:22:07 (5 months ago)

Author:

Tobias Bieniek <Tobias.Bieniek@…>

Parents:

1524164f078bcf60de07521a278132e7ff06e79f

Children:

4dad3c770c382907aac2d8e8d65238358ac4811b

git-committer:

Tobias Bieniek <Tobias.Bieniek@gmx.de> / 2010-02-24T13:22:07Z+0100

Message:

UtilsSystem?: Corrected Format and Indentation

Files:

• src/UtilsSystem.cpp (modified) (12 diffs)

src/UtilsSystem.cpp

@@ -72 +72 @@
 
 #ifdef WINDOWSPC
-int SCREENWIDTH=640;
-int SCREENHEIGHT=480;
+int SCREENWIDTH = 640;
+int SCREENHEIGHT = 480;
 #endif
 
 long CheckFreeRam(void) {
 #ifdef WIN32
-  MEMORYSTATUS    memInfo;
+  MEMORYSTATUS memInfo;
   // Program memory
   memInfo.dwLength = sizeof(memInfo);
@@ -103 +103 @@
 #ifdef WINDOWSPC
 #ifdef _DEBUG
-  _CrtMemCheckpoint( &memstate_s1 );
+  _CrtMemCheckpoint(&memstate_s1);
 #endif
 #endif
@@ -114 +114 @@
 
    // Store a 2nd memory checkpoint in s2
-   _CrtMemCheckpoint( &memstate_s2 );
-
-   if ( _CrtMemDifference( &memstate_s3, &memstate_s1, &memstate_s2 ) ) {
-     _CrtMemDumpStatistics( &memstate_s3 );
+   _CrtMemCheckpoint(&memstate_s2);
+
+   if ( _CrtMemDifference(&memstate_s3, &memstate_s1, &memstate_s2)) {
+     _CrtMemDumpStatistics(&memstate_s3);
      _CrtMemDumpAllObjectsSince(&memstate_s1);
    }
@@ -131 +131 @@
 void MyCompactHeaps() {
 #ifdef WIN32
-#if defined(WINDOWSPC)||(defined(GNAV) && !defined(__GNUC__))
-  HeapCompact(GetProcessHeap(),0);
+#if defined(WINDOWSPC) || (defined(GNAV) && !defined(__GNUC__))
+  HeapCompact(GetProcessHeap(), 0);
 #else
   typedef DWORD (_stdcall *CompactAllHeapsFn) (void);
   static CompactAllHeapsFn CompactAllHeaps = NULL;
-  static bool init=false;
+  static bool init = false;
   if (!init) {
     // get the pointer to the function
-    CompactAllHeaps = (CompactAllHeapsFn)
-      GetProcAddress(LoadLibrary(_T("coredll.dll")),
-                     _T("CompactAllHeaps"));
-    init=true;
-  }
-  if (CompactAllHeaps) {
+    CompactAllHeaps = (CompactAllHeapsFn)GetProcAddress(
+        LoadLibrary(_T("coredll.dll")), _T("CompactAllHeaps"));
+    init = true;
+  }
+  if (CompactAllHeaps)
     CompactAllHeaps();
-  }
 #endif
 #endif /* WIN32 */
@@ -167 +165 @@
   ULARGE_INTEGER TotalNumberOfFreeBytes;
   if (GetDiskFreeSpaceEx(path,
-                         &FreeBytesAvailableToCaller,
-                         &TotalNumberOfBytes,
-                         &TotalNumberOfFreeBytes)) {
-    return FreeBytesAvailableToCaller.LowPart/1024;
+                         &FreeBytesAvailableToCaller,
+                         &TotalNumberOfBytes,
+                         &TotalNumberOfFreeBytes)) {
+    return FreeBytesAvailableToCaller.LowPart / 1024;
   } else
     return 0;
@@ -199 +197 @@
 }
 
-bool RotateScreen() {
+bool
+RotateScreen()
+{
 #ifdef DM_DISPLAYORIENTATION
   //
@@ -468 +468 @@
  * max brightness and no timeout if on power is the rule. Otherwise, do it manually..
  */
-bool SetBacklight()
+bool
+SetBacklight()
 {
   HKEY hKey;
@@ -628 +629 @@
 bool CheckDataDir() {
         TCHAR srcdir[MAX_PATH];
-
-        _stprintf(srcdir,_T("%s%S"),gmfpathname(), XCSDATADIR );
-        if (  GetFileAttributes(srcdir) != FILE_ATTRIBUTE_DIRECTORY) return false;
+  _stprintf(srcdir, _T("%s%S"), gmfpathname(), XCSDATADIR);
+
+  if (GetFileAttributes(srcdir) != FILE_ATTRIBUTE_DIRECTORY)
+          return false;
         return true;
 }
@@ -644 +646 @@
 bool CheckRegistryProfile() {
         TCHAR srcpath[MAX_PATH];
-        if ( GlobalModelType == MODELTYPE_PNA_HP31X ) return false;
-        _stprintf(srcpath,_T("%s%S\\%S"),gmfpathname(), XCSDATADIR , XCSPROFILE);
-        if (  GetFileAttributes(srcpath) == 0xffffffff) return false;
+        if (GlobalModelType == MODELTYPE_PNA_HP31X)
+          return false;
+
+        _stprintf(srcpath,_T("%s%S\\%S"),gmfpathname(), XCSDATADIR , XCSPROFILE);
+
+        if (GetFileAttributes(srcpath) == 0xffffffff)
+          return false;
         return true;
 }
@@ -656 +662 @@
  * @param CommandLine not in use
  */
-void ParseCommandLine(LPCTSTR CommandLine) {
+void
+ParseCommandLine(LPCTSTR CommandLine)
+{
   TCHAR extrnProfileFile[MAX_PATH];
   extrnProfileFile[0] = 0;
@@ -682 +690 @@
 
   pC = _tcsstr(CommandLine, _T("-profile="));
-  if (pC != NULL){
+  if (pC != NULL) {
     pC += strlen("-profile=");
-    if (*pC == '"'){
+    if (*pC == '"') {
       pC++;
       pCe = pC;
-      while (*pCe != '"' && *pCe != '\0') pCe++;
-    } else{
+      while (*pCe != '"' && *pCe != '\0')
+        pCe++;
+    } else {
       pCe = pC;
-      while (*pCe != ' ' && *pCe != '\0') pCe++;
+      while (*pCe != ' ' && *pCe != '\0')
+        pCe++;
     }
-    if (pCe != NULL && pCe-1 > pC){
-
-      _tcsncpy(extrnProfileFile, pC, pCe-pC);
-      extrnProfileFile[pCe-pC] = '\0';
+    if (pCe != NULL && pCe - 1 > pC) {
+      _tcsncpy(extrnProfileFile, pC, pCe - pC);
+      extrnProfileFile[pCe - pC] = '\0';
     }
   }
+
 #ifdef WINDOWSPC
   pC = _tcsstr(CommandLine, _T("-800x480"));
@@ -774 +784 @@
 
   if (GlobalModelType == MODELTYPE_PNA_HP31X) {
-      //                if (wParam == 0x7b) wParam=0xc1;  // VK_APP1
+      /*
+      if (wParam == 0x7b)
+        // VK_APP1
+        wParam = 0xc1;
+      */
+
       if (wParam == 0x7b)
         // VK_ESCAPE
         wParam = 0x1b;
-      //                if (wParam == 0x7b) wParam=0x27;  // VK_RIGHT
-      //                if (wParam == 0x7b) wParam=0x25;  // VK_LEFT
+
+      /*
+      if (wParam == 0x7b)
+        // VK_RIGHT
+        wParam = 0x27;
+      if (wParam == 0x7b)
+        // VK_LEFT
+        wParam=0x25;
+      */
   } else if (GlobalModelType == MODELTYPE_PNA_PN6000) {
     switch(wParam) {