Changeset 115

Timestamp:

Aug 26, 2010, 12:00:13 PM (15 years ago)

Author:

dmik

Message:

hotspot: os::print_dll_info(): Accidentally found a fix for the DosQuerySysState() bug.

File:

• trunk/openjdk/hotspot/src/os/os2/vm/os_os2.cpp (modified) (1 diff)

trunk/openjdk/hotspot/src/os/os2/vm/os_os2.cpp ¶

@@ -86 +86 @@
             pLibRec->hmte = os2_NULLHANDLE;
             st->print("  %s\n", pLibRec->pName);
-            // It happens that for some modules ctObj is > 0 but
-            // pbjInfo is NULL. I have no idea why.
-            if (pLibRec->pObjInfo && pLibRec->fFlat) {
-                for (ULONG i = 0; i < pLibRec->ctObj; ++i) {
-                    if (pLibRec->pObjInfo[i].oaddr)
-                        st->print("    " PTR_FORMAT " - " PTR_FORMAT "\n",
-                                  pLibRec->pObjInfo[i].oaddr,
-                                  pLibRec->pObjInfo[i].oaddr +
-                                  pLibRec->pObjInfo[i].osize);
-                }
+            // It happens that for some modules ctObj is > 0 but pbjInfo is
+            // NULL. This seems to be an OS/2 FP13 bug. Here is the solution I
+            // found in the Odin32 sources (kernel32/winimagepe2lx.cpp):
+            if (pLibRec->ctObj > 0 && pLibRec->pObjInfo == NULL) {
+                pLibRec->pObjInfo = (os2_QSLOBJREC *)
+                    ((char*) pLibRec
+                     + ((sizeof(os2_QSLREC)                         /* size of the lib record */
+                         + pLibRec->ctImpMod * sizeof(os2_USHORT)   /* size of the array of imported modules */
+                         + strlen((char*)pLibRec->pName) + 1        /* size of the filename */
+                         + 3) & ~3));                               /* the size is align on 4 bytes boundrary */
+                pLibRec->pNextRec = (os2_PVOID *)((char *)pLibRec->pObjInfo
+                                                  + sizeof(os2_QSLOBJREC) * pLibRec->ctObj);
+            }
+            for (ULONG i = 0; i < pLibRec->ctObj; ++i) {
+                if (pLibRec->pObjInfo[i].oaddr)
+                    st->print("    " PTR_FORMAT " - " PTR_FORMAT "\n",
+                              pLibRec->pObjInfo[i].oaddr,
+                              pLibRec->pObjInfo[i].oaddr +
+                              pLibRec->pObjInfo[i].osize);
             }
             // Print imported modules of this module