Changeset 9957 for trunk/src/win32k/pe2lx/pe2lxmain.cpp

Timestamp:

Mar 31, 2003, 4:53:32 AM (22 years ago)

Author:

bird

Message:

Cleaned up Customb Dll handling, pluss exclude dll feature. Added support for all object RW.

File:

• trunk/src/win32k/pe2lx/pe2lxmain.cpp (modified) (4 diffs)

trunk/src/win32k/pe2lx/pe2lxmain.cpp

@@ -1 @@
-/* $Id: pe2lxmain.cpp,v 1.8 2001-09-28 07:43:03 sandervl Exp $
+/* $Id: pe2lxmain.cpp,v 1.9 2003-03-31 02:52:50 bird Exp $
  *
  * Pe2Lx main program. (Ring 3 only!)
@@ -129 +129 @@
                     break;
 
-                case 'f': //ignore internal fixups
+                case 'f': /* ignore internal fixups */
                 case 'F':
                     options.fSkipFixups = TRUE;
                     break;
 
-                case 'c':
-                case 'C': //custom odin dll name
-                    if(!hasCustomExports()) {
-                        printf("Syntax error: export table file not specified (/O).\n\n");
+                case 'r': /* all read-write objects */
+                case 'R':
+                    if (argv[argi][2] != 'w' && argv[argi][2] != 'W')
+                    {
+                        printf("Syntax error: Invalid argument, '%s'\n", argv[argi]);
                         return 5;
                     }
+                    options.fAllRWObjects = TRUE;
+                    break;
+
+                case 'c': /* custom odin dll name */
+                case 'C':
+                    if (!hasCustomExports())
+                    {
+                        printf("Syntax error: export table file not specified (-o:).\n\n");
+                        return 5;
+                    }
                     options.pszCustomDll = &argv[argi][3];
                     break;
-                case 'o':
+
+                case 'o': /* custom odin dll ordinal mapping */
                 case 'O':
                 {
@@ -152 +164 @@
                     read(fileIn, options.pszCustomExports, sizein);
                     close(fileIn);
+                    break;
+                }
+
+                case 'x': /* custombuild exclude dll */
+                case 'X':
+                {
+                    int cch = strlen(&argv[argi][3]);
+                    if (!cch)
+                    {
+                        printf("Syntax error: optino -x: requires a dll name!");
+                        return 5;
+                    }
+                    int cchNew = cch + 4;
+                    if (options.pszCustomDllExclude)
+                        cchNew += strlen(options.pszCustomDllExclude);
+                    options.pszCustomDllExclude = (char*)realloc(options.pszCustomDllExclude, cchNew);
+
+                    char *psz = options.pszCustomDllExclude;
+                    if (cchNew != cch + 4)
+                        psz = psz + strlen(psz);
+
+                    /* copy the name in uppercase with ';' at both ends. */
+                    *psz++ = ';';
+                    for (strcpy(psz, &argv[argi][3]); *psz; psz++)
+                        if (*psz >= 'a' && *psz <= 'z')
+                            *psz += ('A' - 'a');
+                    *psz++ =';';
+                    *psz = '\0';
                     break;
                 }
@@ -293 +333 @@
            "                     *: Forced. Applied every time.\n"
            "                Default: -1*\n"
+           "  -rw           Make all segments writable. For use with -1+. A trick to make\n"
+           "                it possible for OS/2 to load the objects following on another.\n"
+           "                This of course doesn't solve the alignment difference. So if\n"
+           "                you build the program pass /ALIGN:0x10000 to the linker.\n"
+           "  -f            Strip fixups forcing. Don't use with DLLs, may cause traps.\n"
+           "\n"
+           " Custombuild options:\n"
+           "  -o:<ordfile>  Ordinal file. form: <W32DLL>.<name/ord> @<CustDLLOrd>\n"
+           "  -c:<custdll>  Custombuild dll. After -o:!\n"
+           "  -x:<dll>      Exclude from custombuild. -x:MSVCRT for example.\n"
+           "\n"
            "  Win32File     Input Win32 Exe, Dll or other Win32 PE file.\n"
            "  Odin32File    Output Odin32-file. If not specified the Win32-file is\n"