[ros-diffs] [cwittich] 22930: -fix msvc dll entrypoint -fix PROJECT_LFLAGS -added --enable-stdcall-fixup to PROJECT_LFLAGS

Author: cwittich
Date: Sat Jul  8 22:24:11 2006
New Revision: 22930

URL: http://svn.reactos.org/svn/reactos?rev=22930&view=rev
Log:
-fix msvc dll entrypoint
-fix PROJECT_LFLAGS
-added --enable-stdcall-fixup to PROJECT_LFLAGS

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
    trunk/reactos/tools/rbuild/module.cpp

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Jul  8 22:24:11 2006
@@ -420,8 +420,8 @@
 
 	fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" );
 	fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" );
-	fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n",
-	          GenerateProjectLFLAGS ().c_str () );
+	fprintf ( fMakefile, "PROJECT_LFLAGS := %s %s\n",
+	          GenerateProjectLFLAGS ().c_str (), "-Wl,--enable-stdcall-fixup" );
 	fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
 	fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" );
 	fprintf ( fMakefile, "\n" );

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Jul  8 22:24:11 2006
@@ -1564,15 +1564,15 @@
 		          killAt.c_str () );
 	
 		fprintf ( fMakefile,
-		          "\t%s %s %s %s -o %s %s %s %s\n",
+		          "\t%s %s %s %s %s -o %s %s %s\n",
 		          linker.c_str (),
+	              GetLinkerMacro ().c_str (),
 		          linkerParameters.c_str (),
 		          linkerScriptArgument.c_str (),
 		          temp_exp.c_str (),
 		          target.c_str (),
 		          objectsMacro.c_str (),
-		          libsMacro.c_str (),
-		          GetLinkerMacro ().c_str () );
+		          libsMacro.c_str () );
 	
 		fprintf ( fMakefile,
 		          "\t$(Q)$(PEFIXUP_TARGET) %s -exports %s\n",
@@ -2263,7 +2263,7 @@
 	fprintf ( fMakefile,
 	          "\t%s %s -o $@ %s %s\n\n",
 	          linker.c_str (),
-	          GetLinkerMacro ().c_str (),
+	          GetLinkerMacro().c_str (),
 	          objectsMacro.c_str (),
 	          libsMacro.c_str () );
 }

Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Jul  8 22:24:11 2006
@@ -443,7 +443,7 @@
 			}
 			else if ( dll )
 			{
-				fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n",
module.GetEntryPoint(false) == "" ? "DllMain" :
module.GetEntryPoint(false).c_str ());
+				fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s%s\"\r\n",
module.GetEntryPoint(false) == "" ? "" : "_",
module.GetEntryPoint(false) == "" ? "_DllMainCRTStartup@12" :
module.GetEntryPoint(false).c_str ());
 				fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr ==
"" ? "0x40000" : baseaddr.c_str ());
 			}
 			fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );

Modified: trunk/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re…
==============================================================================
--- trunk/reactos/tools/rbuild/module.cpp (original)
+++ trunk/reactos/tools/rbuild/module.cpp Sat Jul  8 22:24:11 2006
@@ -835,7 +835,7 @@
 		case NativeCUI:
 			return "NtProcessStartup@4";
 		case Win32DLL:
-			return "DllMain@12";
+			return "DllMainCRTStartup@12";
 		case Win32CUI:
 		case Test:
 			if ( isUnicode )