Changeset 9693 for trunk/src/kernel32/oslibmisc.cpp

Timestamp:

Jan 20, 2003, 11:46:28 AM (23 years ago)

Author:

sandervl

Message:

Only load LVM.DLL when we actually need it; CreateProcess bugfix for thread id if launched directly; CreateFile returns ERROR_ALREADY_EXISTS if file not found and CREATE_NEW; Check and correct process type in thread wrapper

File:

• trunk/src/kernel32/oslibmisc.cpp (modified) (2 diffs)

trunk/src/kernel32/oslibmisc.cpp

@@ -1 @@
-/* $Id: oslibmisc.cpp,v 1.16 2003-01-16 00:44:31 sandervl Exp $ */
+/* $Id: oslibmisc.cpp,v 1.17 2003-01-20 10:46:28 sandervl Exp $ */
 /*
  * Misc OS/2 util. procedures
@@ -280 +280 @@
 ULONG OSLibWinQueryMsgQueue(ULONG hab)
 {
-  ULONG hmq;
-
-  hmq = (ULONG)WinCreateMsgQueue((HAB)hab, 0);
+  ULONG  hmq;
+  APIRET rc;
+  PTIB   ptib;
+  PPIB   ppib;
+
+  rc = DosGetInfoBlocks(&ptib, &ppib);
+  if(rc != NO_ERROR) {
+      dprintf(("DosGetInfoBlocks failed with rc %d", rc));
+      DebugInt3();
+      return 0;
+  }
+  if(ppib->pib_ultype == 2) {
+      dprintf(("Warning: app type changed back to VIO!!"));
+      ppib->pib_ultype = 3;
+  }
+  hmq = WinQueueFromID(hab, ppib->pib_ulpid, ptib->tib_ptib2->tib2_ultid);
+
   if(!hmq) {
-      PTIB ptib;
-      PPIB ppib;
-
-      DosGetInfoBlocks(&ptib, &ppib);
-
-      hmq = WinQueueFromID(hab, ppib->pib_ulpid, ptib->tib_ptib2->tib2_ultid);
+      dprintf(("WinQueueFromID %x %x %x proc type %x failed with error %x", hab, ppib->pib_ulpid, ptib->tib_ptib2->tib2_ultid, ppib->pib_ultype, WinGetLastError(hab)));
+
+      hmq = (ULONG)WinCreateMsgQueue((HAB)hab, 0);
+      if(!hmq) {
+          dprintf(("WinCreateMsgQueue failed with error %x", WinGetLastError(hab)));
+      }
   }
   return hmq;