Changeset 6646 for trunk/src/kernel32/module.cpp

Timestamp:

Sep 5, 2001, 2:58:00 PM (24 years ago)

Author:

bird

Message:

Added $Id:$ keyword.

File:

• trunk/src/kernel32/module.cpp (modified) (10 diffs)

trunk/src/kernel32/module.cpp

@@ -1 @@
-/*
+/* $Id: module.cpp,v 1.3 2001-09-05 12:57:59 bird Exp $
+ *
  * GetBinaryTypeA/W (Wine Port)
  *
@@ -13 +14 @@
 #include <misc.h>
 
-#define DBG_LOCALLOG    DBG_module
+#define DBG_LOCALLOG    DBG_module
 #include "dbglocal.h"
 
@@ -38 +39 @@
       || (!(ReadFile(hfile, modtab, ne->ne_cmod*sizeof(WORD), &len, NULL)))
       || (len != ne->ne_cmod*sizeof(WORD)) )
-        goto broken;
+    goto broken;
 
     /* read imported names table */
@@ -45 +46 @@
       || (!(ReadFile(hfile, nametab, ne->ne_enttab - ne->ne_imptab, &len, NULL)))
       || (len != ne->ne_enttab - ne->ne_imptab) )
-        goto broken;
+    goto broken;
 
     for (i=0; i < ne->ne_cmod; i++)
     {
-        LPSTR module = &nametab[modtab[i]];
-        TRACE("modref: %.*s\n", module[0], &module[1]);
-        if (!(strncmp(&module[1], "KERNEL", module[0])))
-        { /* very old Windows file */
-            MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n");
-            type = SCS_WOW_BINARY;
-            goto good;
-        }
+    LPSTR module = &nametab[modtab[i]];
+    TRACE("modref: %.*s\n", module[0], &module[1]);
+    if (!(strncmp(&module[1], "KERNEL", module[0])))
+    { /* very old Windows file */
+        MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n");
+        type = SCS_WOW_BINARY;
+        goto good;
+    }
     }
 
@@ -107 +108 @@
     /* Seek to the start of the file and read the DOS header information.
      */
-    if (    SetFilePointer( hfile, 0, NULL, SEEK_SET ) != -1  
+    if (    SetFilePointer( hfile, 0, NULL, SEEK_SET ) != -1
          && ReadFile( hfile, &mz_header, sizeof(mz_header), &len, NULL )
          && len == sizeof(mz_header) )
@@ -132 +133 @@
                      ( mz_header.e_lfarlc >= sizeof(IMAGE_DOS_HEADER) ) )
                     if (    mz_header.e_lfanew >= sizeof(IMAGE_DOS_HEADER)
-                         && SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ) != -1  
+                         && SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ) != -1
                          && ReadFile( hfile, magic, sizeof(magic), &len, NULL )
                          && len == sizeof(magic) )
@@ -162 +163 @@
                      * "extended header is a Windows executable (NE)
                      * header."  This can mean either a 16-bit OS/2
-                     * or a 16-bit Windows or even a DOS program 
+                     * or a 16-bit Windows or even a DOS program
                      * (running under a DOS extender).  To decide
                      * which, we'll have to read the NE header.
@@ -168 +169 @@
 
                      IMAGE_OS2_HEADER ne;
-                     if (    SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ) != -1  
+                     if (    SetFilePointer( hfile, mz_header.e_lfanew, NULL, SEEK_SET ) != -1
                           && ReadFile( hfile, &ne, sizeof(ne), &len, NULL )
                           && len == sizeof(ne) )
@@ -177 +178 @@
                          case 5:  *lpBinaryType = SCS_DOS_BINARY;   return TRUE;
                          default: *lpBinaryType =
-                                  MODULE_Decide_OS2_OldWin(hfile, &mz_header, &ne);
-                                  return TRUE;
+                  MODULE_Decide_OS2_OldWin(hfile, &mz_header, &ne);
+                  return TRUE;
                          }
                      }
@@ -187 +188 @@
                 {
                     /* Unknown extended header, but this file is nonetheless
-                       DOS-executable.
+               DOS-executable.
                      */
                     *lpBinaryType = SCS_DOS_BINARY;
-                    return TRUE;
+                return TRUE;
                 }
             }