Changeset 2836 for trunk/src/win32k/ldr/myldrOpen.cpp

Timestamp:

Feb 21, 2000, 5:45:47 AM (26 years ago)

Author:

bird

Message:

ProbKrnl and code for importing krnl symbols has been enhanched.
Now we'll lock 32-bit segments into memory too.
And some other fixes...

File:

• trunk/src/win32k/ldr/myldrOpen.cpp (modified) (12 diffs)

trunk/src/win32k/ldr/myldrOpen.cpp

@@ -1 @@
-/* $Id: myldrOpen.cpp,v 1.7 2000-02-19 08:40:30 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.8 2000-02-21 04:45:47 bird Exp $
  *
  * myldrOpen - ldrOpen.
@@ -130 +130 @@
                 if (options.fPE == FLAGS_PE_NOT)
                 {
-                    free(pszBuffer);
+                    rfree(pszBuffer);
                     return NO_ERROR;
                 }
@@ -208 +208 @@
                             rc = ldrOpen(phFile, "pe.exe", param3);  /* path....! problems! */
                             kprintf(("ldrOpen: pe.exe - open returned with rc = %d\n", rc));
-                            free(pszBuffer);
+                            rfree(pszBuffer);
                             return rc;
                         }
                     }
                 }
-                free(pszBuffer);
+                rfree(pszBuffer);
                 return NO_ERROR;
             }
@@ -231 +231 @@
                      * Do nothing more yet. NEED AN ELF LOADER!!!
                      */
-                    free(pszBuffer);
+                    rfree(pszBuffer);
                     return NO_ERROR;
                 }
@@ -273 +273 @@
                 {
                     char *pszStart = pach+2;
+                    kprintf(("ldrOpen: scrtip debug 1\n"));
 
                     /* Make sure we don't read to much... */
@@ -283 +284 @@
                     while (*pszStart != '\0' && (*pszStart == ' ' || *pszStart == '\t'))
                         pszStart++;
+                    kprintf(("ldrOpen: scrtip debug 2\n"));
 
                     /* anything left on the line? */
@@ -295 +297 @@
                          */
                         pszEnd = pszStart;
+                        kprintf(("ldrOpen: scrtip debug 3\n"));
                         //pszFirstArg = NULL;
                         while (*pszEnd != '\0' && *pszEnd != '\r' && *pszEnd != '\n')
@@ -314 +317 @@
                         }
                         *pszEnd = '\0';
+                        kprintf(("ldrOpen: scrtip debug 4\n"));
 
                         /*
@@ -319 +323 @@
                          */
                         pBuffer = QueryBufferPointerFromFilename(pszFilename);
+                        kprintf(("ldrOpen: scrtip debug 5\n"));
                         if (pBuffer != NULL)
                         {
                             unsigned cchArguments = getArgsLength(pBuffer->achArgs);
                             kprintf(("ldrOpen: debug1\n"));
+
+                            kprintf(("ldrOpen: scrtip debug 6\n"));
 
                             /*
@@ -329 +336 @@
                             if (cchArguments + cchToAdd < sizeof(pBuffer->achArgs))
                             {
-                                kprintf(("ldrOpen: debug2\n"));
+                                kprintf(("ldrOpen: scrtip debug 7\n"));
                                 /*
                                  * Open the interpreter.
@@ -337 +344 @@
                                 if (rc == NO_ERROR)
                                 {
-                                    kprintf(("ldrOpen: debug3\n"));
+                                    kprintf(("ldrOpen: scritp debug 8\n"));
                                     /* Make space for the addition arguments. */
                                     memmove(&pBuffer->achArgs[cchToAdd], &pBuffer->achArgs[0], cchArguments);
                                     memcpy(&pBuffer->achArgs[0], pszBuffer, cchToAdd);
-                                    kprintf(("ldrOpen: debug4\n"));
+                                    kprintf(("ldrOpen: scrtip debug 9\n"));
                                 }
                                 else
@@ -375 +382 @@
             rc = NO_ERROR;
         }
-        free(pszBuffer);
+        rfree(pszBuffer);
     }
     return rc;