[ros-diffs] [pschweitzer] 42572: Fixed winebuild build. Also fixed bad *.def usage in ntdll.rbuild

Author: pschweitzer
Date: Sun Aug  9 21:46:27 2009
New Revision: 42572

URL: http://svn.reactos.org/svn/reactos?rev=42572&view=rev
Log:
Fixed winebuild build. Also fixed bad *.def usage in ntdll.rbuild

Modified:
    branches/pierre-fsd/dll/ntdll/ntdll.rbuild
    branches/pierre-fsd/tools/winebuild/build.h
    branches/pierre-fsd/tools/winebuild/parser.c
    branches/pierre-fsd/tools/winebuild/spec32.c

Modified: branches/pierre-fsd/dll/ntdll/ntdll.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/ntdll/ntdll.rbui…
==============================================================================
--- branches/pierre-fsd/dll/ntdll/ntdll.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Aug  9 21:46:27 2009
@@ -6,7 +6,7 @@
 	</module>
 	<module name="ntdll" type="win32dll" entrypoint="0"
baseaddress="${BASEADDRESS_NTDLL}" installbase="system32"
installname="ntdll.dll" iscrt="yes">
 		<bootstrap installbase="$(CDOUTPUT)/system32" />
-		<importlibrary definition="def/ntdll.def" />
+		<importlibrary definition="def/ntdll_$(ARCH).def" />
 		<include base="ntdll">include</include>
 		<include base="ntdll" root="intermediate"></include>
 		<include base="ReactOS">include/reactos/subsys</include>

Modified: branches/pierre-fsd/tools/winebuild/build.h
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/buil…
==============================================================================
--- branches/pierre-fsd/tools/winebuild/build.h [iso-8859-1] (original)
+++ branches/pierre-fsd/tools/winebuild/build.h [iso-8859-1] Sun Aug  9 21:46:27 2009
@@ -40,6 +40,7 @@
     TYPE_STDCALL,      /* stdcall function (Win32) */
     TYPE_CDECL,        /* cdecl function (Win32) */
     TYPE_VARARGS,      /* varargs function (Win32) */
+    TYPE_FASTCALL,     /* fastcall function (Win32) */
     TYPE_EXTERN,       /* external symbol (Win32) */
     TYPE_NBTYPES
 } ORD_TYPE;

Modified: branches/pierre-fsd/tools/winebuild/parser.c
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/pars…
==============================================================================
--- branches/pierre-fsd/tools/winebuild/parser.c [iso-8859-1] (original)
+++ branches/pierre-fsd/tools/winebuild/parser.c [iso-8859-1] Sun Aug  9 21:46:27 2009
@@ -57,6 +57,7 @@
     "stdcall",      /* TYPE_STDCALL */
     "cdecl",        /* TYPE_CDECL */
     "varargs",      /* TYPE_VARARGS */
+    "fastcall",     /* TYPE_FASTCALL */
     "extern"        /* TYPE_EXTERN */
 };
 
@@ -513,6 +514,7 @@
     case TYPE_STDCALL:
     case TYPE_VARARGS:
     case TYPE_CDECL:
+    case TYPE_FASTCALL:
         if (!parse_spec_export( odp, spec )) goto error;
         break;
     case TYPE_ABS:

Modified: branches/pierre-fsd/tools/winebuild/spec32.c
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/spec…
==============================================================================
--- branches/pierre-fsd/tools/winebuild/spec32.c [iso-8859-1] (original)
+++ branches/pierre-fsd/tools/winebuild/spec32.c [iso-8859-1] Sun Aug  9 21:46:27 2009
@@ -624,9 +624,6 @@
 
         if (!(odp->flags & FLAG_PRIVATE)) total++;
 
-
-        output( "  %s", name );
-
         switch(odp->type)
         {
         case TYPE_EXTERN:
@@ -635,12 +632,14 @@
         case TYPE_VARARGS:
         case TYPE_CDECL:
             /* try to reduce output */
+            output( "  %s", name );
             if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD))
                 output( "=%s", odp->link_name );
             break;
         case TYPE_STDCALL:
         {
             int at_param = strlen(odp->u.func.arg_types) * get_ptr_size();
+            output( "  %s", name );
             if (!kill_at && target_cpu == CPU_x86) output( "@%d",
at_param );
             if  (odp->flags & FLAG_FORWARD)
             {
@@ -677,6 +676,7 @@
         }
         case TYPE_STUB:
         {
+            output( "  %s", name );
             if (!kill_at)
             {
                 const char *check = name + strlen(name);