commit d7b76822ef593b8afa59c87bbdaf60c62007e8d3
author Alexandre Julliard <julliard@winehq.org> Thu Dec 20 00:19:40 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Dec 20 00:19:40 2001 +0000
tree 5be215a30180b505efe58ee941975ae82d402e0d
parent 6f011c08476fa5a0a4aa71f332232fc4336f6448

Use MapLS/UnMapLS instead of SEGPTR_* macros.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index c507a4c..b49e28b 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -804,13 +804,13 @@
     {
 	args++;
 	arglen = strlen(args);
-	cmdline = SEGPTR_ALLOC( 2 + arglen );
+	cmdline = HeapAlloc( GetProcessHeap(), 0, 2 + arglen );
 	cmdline[0] = (BYTE)arglen;
 	strcpy( cmdline + 1, args );
     }
     else
     {
-	cmdline = SEGPTR_ALLOC( 2 );
+	cmdline = HeapAlloc( GetProcessHeap(), 0, 2 );
 	cmdline[0] = cmdline[1] = 0;
     }
 
@@ -819,22 +819,22 @@
     if (SearchPathA( NULL, name, ".exe", sizeof(buffer), buffer, NULL ))
     {
         LOADPARAMS16 params;
-        WORD *showCmd = SEGPTR_ALLOC( 2*sizeof(WORD) );
+        WORD showCmd[2];
         showCmd[0] = 2;
         showCmd[1] = nCmdShow;
 
         params.hEnvironment = 0;
-        params.cmdLine = SEGPTR_GET(cmdline);
-        params.showCmd = SEGPTR_GET(showCmd);
+        params.cmdLine = MapLS( cmdline );
+        params.showCmd = MapLS( showCmd );
         params.reserved = 0;
 
         ret = LoadModule16( buffer, &params );
-
-        SEGPTR_FREE( showCmd );
-        SEGPTR_FREE( cmdline );
+        UnMapLS( params.cmdLine );
+        UnMapLS( params.showCmd );
     }
     else ret = GetLastError();
 
+    HeapFree( GetProcessHeap(), 0, cmdline );
     if (name != lpCmdLine) HeapFree( GetProcessHeap(), 0, name );
 
     if (ret == 21)  /* 32-bit module */