Changeset 3006

Timestamp:

Apr 7, 2007, 4:30:08 AM (18 years ago)

Author:

bird

Message:

Fixed watcom .def-file parsing.

File:

• trunk/emx/src/emxomf/emxomfld.c (modified) (3 diffs)

trunk/emx/src/emxomf/emxomfld.c

@@ -2070 +2070 @@
             }
           token = _md_next_token (pMd);
-          if (token == _MD_LIBRARY || token == _MD_PHYSICAL || token == _MD_VIRTUAL)
-            dll_flag = TRUE;
-          if (dll_flag)
+          if (token == _MD_PHYSICAL)
+            {
+              dll_flag = TRUE;
+              fprintf (response_file, "FORMAT OS2 LX PHYSdevice\n");
+            }
+          else if (token == _MD_VIRTUAL)
+            {
+              dll_flag = TRUE;
+              fprintf (response_file, "FORMAT OS2 LX VIRTdevice\n");
+            }
+          else if (token == _MD_LIBRARY || dll_flag)
             {
               int fInitInstance = 1;
@@ -2080 +2088 @@
                   switch (_md_next_token (pMd))
                     {
-                      case _MD_INITINSTANCE:  fInitInstance = 1; continue;
-                      case _MD_INITGLOBAL:    fInitInstance = 0; continue;
-                      case _MD_TERMINSTANCE:  fTermInstance = 1; continue;
-                      case _MD_TERMGLOBAL:    fTermInstance = 0; continue;
-                      default: break;
+                      case _MD_INITINSTANCE:    fInitInstance = 1; continue;
+                      case _MD_INITGLOBAL:      fInitInstance = 0; continue;
+                      case _MD_TERMINSTANCE:    fTermInstance = 1; continue;
+                      case _MD_TERMGLOBAL:      fTermInstance = 0; continue;
+                      case _MD_quote:           continue;
+                      case _MD_word:            continue;
+                      default:                  break;
                     }
                   break;
                 }
+              dll_flag = TRUE;
               fprintf (response_file, "FORMAT OS2 LX DLL %s %s\n",
                        fInitInstance ? "INITINSTANCE" : "INITGLOBAL",
@@ -2093 +2104 @@
             }
           else
-            switch (_md_next_token (pMd))
-              {
-                case _MD_WINDOWAPI:
-                  fprintf (response_file, "FORMAT OS2 LX PM\n");
-                  break;
-                default:
-                case _MD_WINDOWCOMPAT:
-                  fprintf (response_file, "FORMAT OS2 LX PMCompatible\n");
-                  break;
-                case _MD_NOTWINDOWCOMPAT:
-                  fprintf (response_file, "FORMAT OS2 LX FullScreen\n");
-                  break;
-              }
+            {
+              if (token == _MD_NAME)
+                  token = _md_next_token (pMd);
+              if (token == _MD_quote || token == _MD_word)
+                  token = _md_next_token (pMd);
+              switch (token)
+                {
+                  case _MD_WINDOWAPI:
+                    fprintf (response_file, "FORMAT OS2 LX PM\n");
+                    break;
+                  default:
+                  case _MD_WINDOWCOMPAT:
+                    fprintf (response_file, "FORMAT OS2 LX PMCompatible\n");
+                    break;
+                  case _MD_NOTWINDOWCOMPAT:
+                    fprintf (response_file, "FORMAT OS2 LX FullScreen\n");
+                    break;
+                }
+            }
           _md_close (pMd);
         }