[jgardou] 48150: Sync with trunk (r48144)

Author: jgardou
Date: Tue Jul 20 22:15:42 2010
New Revision: 48150
URL: http://svn.reactos.org/svn/reactos?rev=48150&view=rev
Log:
Sync with trunk (r48144)
Added:
    branches/reactos-yarotows/boot/freeldr/freeldr/freeldr_amd64.lnk
      - copied unchanged from r48145, trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk
    branches/reactos-yarotows/boot/freeldr/freeldr/freeldr_i386.lnk
      - copied unchanged from r48145, trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk
    branches/reactos-yarotows/ntoskrnl/ntoskrnl_amd64.lnk
      - copied unchanged from r48145, trunk/reactos/ntoskrnl/ntoskrnl_amd64.lnk
Removed:
    branches/reactos-yarotows/include/reactos/mingw-w64/reactos.diff
Modified:
    branches/reactos-yarotows/   (props changed)
    branches/reactos-yarotows/base/applications/mscutils/eventvwr/lang/en-US.rc
    branches/reactos-yarotows/base/shell/cmd/lang/de-DE.rc
    branches/reactos-yarotows/base/shell/cmd/lang/ja-JP.rc
    branches/reactos-yarotows/base/shell/cmd/lang/ru-RU.rc
    branches/reactos-yarotows/boot/freeldr/bootsect/ext2.asm
    branches/reactos-yarotows/boot/freeldr/bootsect/fat.asm
    branches/reactos-yarotows/boot/freeldr/bootsect/fat32.asm
    branches/reactos-yarotows/boot/freeldr/bootsect/isoboot.asm
    branches/reactos-yarotows/boot/freeldr/bootsect/isobtrt.asm
    branches/reactos-yarotows/boot/freeldr/freeldr/freeldr.rbuild
    branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild
    branches/reactos-yarotows/dll/cpl/access/resource.h
    branches/reactos-yarotows/dll/cpl/intl/lang/ro-RO.rc
    branches/reactos-yarotows/dll/cpl/sysdm/lang/ro-RO.rc
    branches/reactos-yarotows/dll/win32/devmgr/lang/ro-RO.rc
    branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc   (props changed)
    branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc
    branches/reactos-yarotows/drivers/bus/acpi/acpi.rbuild
    branches/reactos-yarotows/include/psdk/rpcndr.h
    branches/reactos-yarotows/include/psdk/sdkddkver.h
    branches/reactos-yarotows/include/reactos/mingw-w64/sect_attribs.h
    branches/reactos-yarotows/include/reactos/wine/commctrl.h
    branches/reactos-yarotows/include/reactos/wine/ddk/compstui.h
    branches/reactos-yarotows/include/reactos/wine/ddk/winddiui.h
    branches/reactos-yarotows/include/reactos/wine/ddk/winsplp.h
    branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp10.c
    branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp8.c
    branches/reactos-yarotows/lib/3rdparty/mingw/crtexe.c
    branches/reactos-yarotows/lib/3rdparty/mingw/gs_support.c
    branches/reactos-yarotows/lib/3rdparty/mingw/tlssup.c
    branches/reactos-yarotows/subsystems/win32/csrss/win32csr/   (props changed)
    branches/reactos-yarotows/tools/rbuild/backend/mingw/mingw.cpp
    branches/reactos-yarotows/tools/rbuild/backend/mingw/modulehandler.cpp
    branches/reactos-yarotows/tools/rbuild/backend/mingw/rules.mak
    branches/reactos-yarotows/tools/rbuild/module.cpp
Propchange: branches/reactos-yarotows/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 22:15:42 2010
@@ -1,4 +1,4 @@
 /branches/header-work:45691-47721
 /branches/ros-amd64-bringup:36852
/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882
-/trunk/reactos:45219-48123
+/trunk/reactos:45219-48145
Modified: branches/reactos-yarotows/base/applications/mscutils/eventvwr/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati…
==============================================================================
--- branches/reactos-yarotows/base/applications/mscutils/eventvwr/lang/en-US.rc
[iso-8859-1] (original)
+++ branches/reactos-yarotows/base/applications/mscutils/eventvwr/lang/en-US.rc
[iso-8859-1] Tue Jul 20 22:15:42 2010
@@ -114,4 +114,4 @@
     IDS_COLUMNUSER      "User"
     IDS_COLUMNCOMPUTER  "Computer"
     IDS_COLUMNEVENTDATA "Event Data"
-END
+END
Modified: branches/reactos-yarotows/base/shell/cmd/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/shell/cmd…
==============================================================================
--- branches/reactos-yarotows/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original)
+++ branches/reactos-yarotows/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,4 +1,4 @@
-/*
+/*
  *  German language file by Klemens Friedl <frik85> 2005-06-03
  *  Update: frik85 2005-06-06
  */
Modified: branches/reactos-yarotows/base/shell/cmd/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/shell/cmd…
==============================================================================
--- branches/reactos-yarotows/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original)
+++ branches/reactos-yarotows/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,4 +1,4 @@
-/*
+/*
  * Japanese translation of CMD
  */
 #pragma code_page(65001)
Modified: branches/reactos-yarotows/base/shell/cmd/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/shell/cmd…
==============================================================================
--- branches/reactos-yarotows/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original)
+++ branches/reactos-yarotows/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,4 +1,4 @@
-/*
+/*
  * Russian language file by
  * Andrey Korotaev (unC0Rr(a)inbox.ru)
  * and
Modified: branches/reactos-yarotows/boot/freeldr/bootsect/ext2.asm
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/b…
==============================================================================
--- branches/reactos-yarotows/boot/freeldr/bootsect/ext2.asm [iso-8859-1] (original)
+++ branches/reactos-yarotows/boot/freeldr/bootsect/ext2.asm [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -438,9 +438,11 @@
         mov  dl,[BYTE bp+BootDrive]
                mov  dh,[BYTE bp+BootPartition]
-        push byte 0                                            ; We loaded at 0000:8000
-        push WORD 8000h                                        ; We will do a far return
to 0000:8000h
-        retf                                                   ; Transfer control to
FreeLoader
+               push 0                                          ; push segment (0x0000)
+               mov eax, [0x8000 + 0xA8]        ; load the RVA of the EntryPoint into eax
+               add eax, 0x8000                         ; RVA -> VA
+               push ax                                         ; push offset
+               retf                                            ; Transfer control to
FreeLoader
Modified: branches/reactos-yarotows/boot/freeldr/bootsect/fat.asm
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/b…
==============================================================================
--- branches/reactos-yarotows/boot/freeldr/bootsect/fat.asm [iso-8859-1] (original)
+++ branches/reactos-yarotows/boot/freeldr/bootsect/fat.asm [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -209,7 +209,11 @@
                ; because they contain a jump instruction to skip
                ; over the helper code in the FreeLoader image.
                ;jmp  0000:8003h
-               jmp  8003h
+               push 0                                          ; push segment (0x0000)
+               mov eax, [0x8000 + 0xA8]        ; load the RVA of the EntryPoint into eax
+               add eax, 0x8003                         ; RVA -> VA and skip 3 bytes
(jump to fathelper code)
+               push ax                                         ; push offset
+               retf                                            ; Transfer control to
FreeLoader
@@ -387,10 +391,10 @@
 msgDiskError db 'Disk error',0dh,0ah,0
-msgFreeLdr   db 'freeldr.sys not found',0dh,0ah,0
+msgFreeLdr   db 'ldr not found',0dh,0ah,0
 ; Sorry, need the space...
 ;msgAnyKey    db 'Press any key to restart',0dh,0ah,0
-msgAnyKey    db 'Press any key',0dh,0ah,0
+msgAnyKey    db 'Press a key',0dh,0ah,0
 filename     db 'FREELDR SYS'
         times 509-($-$$) db 0   ; Pad to 509 bytes
Modified: branches/reactos-yarotows/boot/freeldr/bootsect/fat32.asm
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/b…
==============================================================================
--- branches/reactos-yarotows/boot/freeldr/bootsect/fat32.asm [iso-8859-1] (original)
+++ branches/reactos-yarotows/boot/freeldr/bootsect/fat32.asm [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -390,11 +390,12 @@
 LoadFileDone:
         mov  dl,[BYTE bp+BootDrive]            ; Load boot drive into DL
                mov  dh,[BootPartition]                 ; Load boot partition into DH
-        xor  ax,ax
-        push ax                                        ; We loaded at 0000:8000
-        push WORD 8000h                        ; We will do a far return to 0000:8000h
-        retf                    ; Transfer control to ROSLDR
-
+
+               push 0                                          ; push segment (0x0000)
+               mov eax, [0x8000 + 0xA8]        ; load the RVA of the EntryPoint into eax
+               add eax, 0x8000                         ; RVA -> VA
+               push ax                                         ; push offset
+               retf                                            ; Transfer control to
FreeLoader
 ; Returns the FAT entry for a given cluster number
 ; On entry EAX has cluster number
Modified: branches/reactos-yarotows/boot/freeldr/bootsect/isoboot.asm
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/b…
==============================================================================
--- branches/reactos-yarotows/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] (original)
+++ branches/reactos-yarotows/boot/freeldr/bootsect/isoboot.asm [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -373,7 +373,11 @@
        mov     dl, [DriveNo]                   ; dl = boot drive
        mov dh, 0                                       ; dh = boot partition
-       jmp     0:0x8000                        ; jump into OSLoader
+       push 0                                          ; push segment (0x0000)
+       mov eax, [0x8000 + 0xA8]        ; load the RVA of the EntryPoint into eax
+       add eax, 0x8000                         ; RVA -> VA
+       push ax                                         ; push offset
+       retf                                            ; Transfer control to ROSLDR
@@ -922,38 +926,38 @@
 isolinux_banner        db CR, LF, 'Loading IsoBoot...', CR, LF, 0
-copyright_str  db ' Copyright (C) 1994-2002 H. Peter Anvin', CR, LF, 0
+copyright_str  db ' (C) 1994-2002 H. Peter Anvin', CR, LF, 0
 presskey_msg   db 'Press any key to boot from CD', 0
 dot_msg                db '.',0
 %ifdef DEBUG_MESSAGES
-startup_msg:   db 'Starting up, DL = ', 0
-spec_ok_msg:   db 'Loaded spec packet OK, drive = ', 0
-secsize_msg:   db 'Sector size appears to be ', 0
-rootloc_msg:   db 'Root directory location: ', 0
-rootlen_msg:   db 'Root directory length: ', 0
-rootsect_msg:  db 'Root directory length(sectors): ', 0
-fileloc_msg:   db 'SETUPLDR.SYS location: ', 0
-filelen_msg:   db 'SETUPLDR.SYS length: ', 0
-filesect_msg:  db 'SETUPLDR.SYS length(sectors): ', 0
+startup_msg:   db 'Startup, DL = ', 0
+spec_ok_msg:   db 'packet OK, drive = ', 0
+secsize_msg:   db 'size appears to be ', 0
+rootloc_msg:   db 'Root dir loc: ', 0
+rootlen_msg:   db 'Root dir len: ', 0
+rootsect_msg:  db 'Root dir len(sect): ', 0
+fileloc_msg:   db 'SETUPLDR loc: ', 0
+filelen_msg:   db 'SETUPLDR len: ', 0
+filesect_msg:  db 'SETUPLDR len(sect): ', 0
 findfail_msg:  db 'Failed to find file!', 0
 startldr_msg:  db 'Starting SETUPLDR.SYS', 0
 %endif
-nosecsize_msg: db 'Failed to get sector size, assuming 0800', CR, LF, 0
-spec_err_msg:  db 'Loading spec packet failed, trying to wing it...', CR, LF, 0
-maybe_msg:     db 'Found something at drive = ', 0
-alright_msg:   db 'Looks like it might be right, continuing...', CR, LF, 0
-nothing_msg:   db 'Failed to locate CD-ROM device; boot failed.', CR, LF, 0
+nosecsize_msg: db 'No sector size, assume 0800', CR, LF, 0
+spec_err_msg:  db 'Load spec failed, trying wing ...', CR, LF, 0
+maybe_msg:     db 'Found smth at drive = ', 0
+alright_msg:   db 'might be ok, continuing...', CR, LF, 0
+nothing_msg:   db 'Failed locate CD-ROM; boot failed.', CR, LF, 0
 isolinux_str   db 'IsoBoot: ', 0
 crlf_msg       db CR, LF, 0
 diskerr_msg:   db 'Disk error ', 0
 ondrive_str:   db ', drive ', 0
-err_bootfailed db CR, LF, 'Boot failed: press a key to retry...'
+err_bootfailed db CR, LF, 'failed..', 0
 isolinux_dir   db '\LOADER', 0
-no_dir_msg     db 'Could not find the LOADER directory.', CR, LF, 0
+no_dir_msg     db 'LOADER dir not found.', CR, LF, 0
 isolinux_bin   db 'SETUPLDR.SYS', 0
-no_isolinux_msg        db 'Could not find SETUPLDR.SYS.', CR, LF, 0
+no_isolinux_msg        db 'SETUPLDR not found.', CR, LF, 0
 ;
 ; El Torito spec packet
Modified: branches/reactos-yarotows/boot/freeldr/bootsect/isobtrt.asm
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/b…
==============================================================================
--- branches/reactos-yarotows/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] (original)
+++ branches/reactos-yarotows/boot/freeldr/bootsect/isobtrt.asm [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -345,7 +345,11 @@
        mov     dl, [DriveNo]                   ; dl = boot drive
        mov dh, 0                                       ; dh = boot partition
-       jmp     0:0x8000                        ; jump into OSLoader
+       push 0                                          ; push segment (0x0000)
+       mov eax, [0x8000 + 0xA8]        ; load the RVA of the EntryPoint into eax
+       add eax, 0x8000                         ; RVA -> VA
+       push ax                                         ; push offset
+       retf                                            ; Transfer control to ROSLDR
Modified: branches/reactos-yarotows/boot/freeldr/freeldr/freeldr.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/f…
==============================================================================
--- branches/reactos-yarotows/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original)
+++ branches/reactos-yarotows/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,8 +1,14 @@
 <?xml version="1.0"?>
+
+<if property="ARCH" value="i386">
+       <property name="BASEADDRESS_FREELDR" value="0x8000" />
+<endif>
+
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
        <if property="ARCH" value="i386">
-               <module name="freeldr" type="bootloader">
+               <module name="freeldr" type="bootloader"
baseaddress="$(BASEADDRESS_FREELDR)">
+                       <linkerscript>freeldr_$(ARCH).lnk</linkerscript>
                        <bootstrap installbase="loader" />
                        <library>freeldr_startup</library>
                        <library>freeldr_base64k</library>
@@ -15,8 +21,9 @@
                        <library>rtl</library>
                        <library>libcntpr</library>
                        <group linkerset="ld">
-                               <linkerflag>-static</linkerflag>
-                               <linkerflag>-lgcc</linkerflag>
+                               <!-- linkerflag>-static</linkerflag -->
+                               <linkerflag>-nostartfiles</linkerflag>
+
                        </group>
                </module>
        </if>
Modified: branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/freeldr/f…
==============================================================================
--- branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original)
+++ branches/reactos-yarotows/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="setupldr" type="bootloader">
+       <linkerscript>freeldr_$(ARCH).lnk</linkerscript>
        <bootstrap installbase="loader" />
        <library>freeldr_startup</library>
        <library>freeldr_base64k</library>
@@ -15,8 +16,9 @@
        <library>rtl</library>
        <library>libcntpr</library>
        <group linkerset="ld">
-               <linkerflag>-nostartfiles</linkerflag>
-               <linkerflag>-nostdlib</linkerflag>
-               <linkerflag>-lgcc</linkerflag>
+               <!-- linkerflag>-nostartfiles</linkerflag -->
+               <!-- linkerflag>-nostdlib</linkerflag -->
+               <!-- linkerflag>--strip-all</linkerflag -->
+               <linkerflag>-Tbss 0x50000</linkerflag>
        </group>
 </module>
Modified: branches/reactos-yarotows/dll/cpl/access/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/access…
==============================================================================
--- branches/reactos-yarotows/dll/cpl/access/resource.h [iso-8859-1] (original)
+++ branches/reactos-yarotows/dll/cpl/access/resource.h [iso-8859-1] Tue Jul 20 22:15:42
2010
@@ -5,7 +5,7 @@
 #define PROPSHEETHEIGHT 228
 #define PROPSHEETPADDING(x)  (x+x+x+x+x+x)
 #define SYSTEM_COLUMN   (18*PROPSHEETPADDING)
-#define LABELLINE(x)  (x+x+x+2+x+x+x+x+x+x)
+#define LABELLINE(x)  (x+x+x+x+x+x+x+x+x+2)
 #define ICONSIZE        16
Modified: branches/reactos-yarotows/dll/cpl/intl/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/intl/l…
==============================================================================
--- branches/reactos-yarotows/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original)
+++ branches/reactos-yarotows/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Tue Jul 20 22:15:42
2010
@@ -1,4 +1,4 @@
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 #pragma code_page(65001)
Modified: branches/reactos-yarotows/dll/cpl/sysdm/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/cpl/sysdm/…
==============================================================================
--- branches/reactos-yarotows/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original)
+++ branches/reactos-yarotows/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Tue Jul 20 22:15:42
2010
@@ -1,4 +1,4 @@
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 #pragma code_page(65001)
Modified: branches/reactos-yarotows/dll/win32/devmgr/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/devm…
==============================================================================
--- branches/reactos-yarotows/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original)
+++ branches/reactos-yarotows/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,4 +1,4 @@
-// Romanian language resource file (Petru Dimitriu, 2009-07-15)
+// Romanian language resource file (Petru Dimitriu, 2009-07-15)
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
Propchange: branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 22:15:42 2010
@@ -2,3 +2,4 @@
 /branches/reactos-yarotows/dll/win32/jscript/jscript_Si.rc:46848,46966,47800
 /branches/ros-amd64-bringup/dll/win32/jscript/jscript_Si.rc:36852
/branches/ros-amd64-bringup/reactos/dll/win32/jscript/jscript_Si.rc:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805
+/trunk/reactos/dll/win32/jscript/jscript_Si.rc:47414-48145
Modified: branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msgi…
==============================================================================
--- branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original)
+++ branches/reactos-yarotows/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,4 +1,4 @@
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 #pragma code_page(65001)
Modified: branches/reactos-yarotows/drivers/bus/acpi/acpi.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/bus/ac…
==============================================================================
--- branches/reactos-yarotows/drivers/bus/acpi/acpi.rbuild [iso-8859-1] (original)
+++ branches/reactos-yarotows/drivers/bus/acpi/acpi.rbuild [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -11,6 +11,11 @@
        <xi:include href="compbatt/compbatt.rbuild" />
 </directory>
+<if property="ARCH" value="i386">
+       <group compilerset="msc">
+               <define name="WIN32"/>
+       </group>
+</if>
 <module name="acpi" type="kernelmodedriver"
installbase="system32/drivers" installname="acpi.sys"
allowwarnings="true">
        <bootstrap installbase="$(CDOUTPUT)" />
Modified: branches/reactos-yarotows/include/psdk/rpcndr.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/r…
==============================================================================
--- branches/reactos-yarotows/include/psdk/rpcndr.h [iso-8859-1] (original)
+++ branches/reactos-yarotows/include/psdk/rpcndr.h [iso-8859-1] Tue Jul 20 22:15:42 2010
@@ -128,7 +128,7 @@
    (RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \
    (RpcExceptionCode() == RPC_S_INVALID_BOUND))
-typedef struct
+typedef struct tagNDR_SCONTEXT
 {
   void *pad[2];
   void *userContext;
Modified: branches/reactos-yarotows/include/psdk/sdkddkver.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/s…
==============================================================================
--- branches/reactos-yarotows/include/psdk/sdkddkver.h [iso-8859-1] (original)
+++ branches/reactos-yarotows/include/psdk/sdkddkver.h [iso-8859-1] Tue Jul 20 22:15:42
2010
@@ -100,9 +100,9 @@
 #define NTDDI_WIN7                          0x06010000
 /* Version Fields in NTDDI_VERSION */
-#define OSVERSION_MASK                      0xFFFF0000
-#define SPVERSION_MASK                      0x0000FF00
-#define SUBVERSION_MASK                     0x000000FF
+#define OSVERSION_MASK                      0xFFFF0000UL
+#define SPVERSION_MASK                      0x0000FF00UL
+#define SUBVERSION_MASK                     0x000000FFUL
 /* Macros to Extract Version Fields From NTDDI_VERSION */
 #define OSVER(Version)                      ((Version) & OSVERSION_MASK)
Removed: branches/reactos-yarotows/include/reactos/mingw-w64/reactos.diff
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto…
==============================================================================
--- branches/reactos-yarotows/include/reactos/mingw-w64/reactos.diff [iso-8859-1]
(original)
+++ branches/reactos-yarotows/include/reactos/mingw-w64/reactos.diff (removed)
@@ -1,83 +1,0 @@
-Index: internal.h
-===================================================================
---- internal.h (Revision 46537)
-+++ internal.h (Arbeitskopie)
-@@ -35,6 +35,12 @@
- #define __IOINFO_TM_UTF8 1
- #define __IOINFO_TM_UTF16LE 2
-
-+#ifdef _MSC_VER
-+#pragma warning(push)
-+#pragma warning(disable:4214)
-+#pragma warning(disable:4820)
-+#endif
-+
-   typedef struct {
-     intptr_t osfhnd;
-     char osfile;
-@@ -46,6 +52,10 @@
-     char pipech2[2];
-   } ioinfo;
-
-+#ifdef _MSC_VER
-+#pragma warning(pop)
-+#endif
-+
- #define IOINFO_ARRAY_ELTS (1 << 5)
-
- #define _pioinfo(i) (__pioinfo[(i) >> 5] + ((i) & (IOINFO_ARRAY_ELTS - 1)))
-Index: oscalls.h
-===================================================================
---- oscalls.h  (Revision 46537)
-+++ oscalls.h  (Arbeitskopie)
-@@ -30,6 +30,11 @@
- #endif
- #endif
-
-+#ifdef _MSC_VER
-+#pragma warning(push)
-+#pragma warning(disable:4214)
-+#endif
-+
- typedef struct _FTIME
- {
-   unsigned short twosecs : 5;
-@@ -46,6 +51,10 @@
-   unsigned short year : 7;
- } FDATE;
-
-+#ifdef _MSC_VER
-+#pragma warning(pop)
-+#endif
-+
- typedef FDATE *PFDATE;
-
- #endif
-Index: sect_attribs.h
-===================================================================
---- sect_attribs.h     (Revision 46537)
-+++ sect_attribs.h     (Arbeitskopie)
-@@ -10,7 +10,7 @@
- #define _ATTRIBUTES shared
- #endif
-
--#if 0
-+#if defined(_MSC_VER)
- /* Reference list of existing section for msvcrt.  */
- #pragma section(".CRTMP$XCA",long,_ATTRIBUTES)
- #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES)
-@@ -55,6 +55,14 @@
- #pragma section(".rtc$IZZ",long,read)
- #pragma section(".rtc$TAA",long,read)
- #pragma section(".rtc$TZZ",long,read)
-+#pragma section(".tls",long,read,write)
-+#pragma section(".tls$ZZZ",long,read,write)
- #endif
-
-+#if defined(_MSC_VER)
-+#define _CRTALLOC(x) __declspec(allocate(x))
-+#elif defined(__GNUC__)
- #define _CRTALLOC(x) __attribute__ ((section (x) ))
-+#else
-+#error
-+#endif
Modified: branches/reactos-yarotows/include/reactos/mingw-w64/sect_attribs.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto…
==============================================================================
--- branches/reactos-yarotows/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1]
(original)
+++ branches/reactos-yarotows/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Tue
Jul 20 22:15:42 2010
@@ -4,13 +4,14 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
-#if defined (__ia64__) || defined (__x86_64)
+#if defined(_MSC_VER)
+
+#if defined(_M_IA64) || defined(_M_AMD64)
 #define _ATTRIBUTES
 #else
 #define _ATTRIBUTES shared
 #endif
-#if defined(_MSC_VER)
 /* Reference list of existing section for msvcrt.  */
 #pragma section(".CRTMP$XCA",long,_ATTRIBUTES)
 #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES)
@@ -55,14 +56,17 @@
 #pragma section(".rtc$IZZ",long,read)
 #pragma section(".rtc$TAA",long,read)
 #pragma section(".rtc$TZZ",long,read)
+/* for tlssup.c: */
 #pragma section(".tls",long,read,write)
+#pragma section(".tls$AAA",long,read,write)
 #pragma section(".tls$ZZZ",long,read,write)
-#endif
+#endif /* _MSC_VER */
 #if defined(_MSC_VER)
 #define _CRTALLOC(x) __declspec(allocate(x))
 #elif defined(__GNUC__)
 #define _CRTALLOC(x) __attribute__ ((section (x) ))
 #else
-#error
+#error Your compiler is not supported.
 #endif
+
Modified: branches/reactos-yarotows/include/reactos/wine/commctrl.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto…
==============================================================================
--- branches/reactos-yarotows/include/reactos/wine/commctrl.h [iso-8859-1] (original)
+++ branches/reactos-yarotows/include/reactos/wine/commctrl.h [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -10,7 +10,7 @@
 #define _WIN32_IE 0x0501
 #endif
-#include_next <commctrl.h>
+#include <psdk/commctrl.h>
 #undef DPA_GetPtr
 LPVOID WINAPI DPA_GetPtr(HDPA, INT);
Modified: branches/reactos-yarotows/include/reactos/wine/ddk/compstui.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto…
==============================================================================
--- branches/reactos-yarotows/include/reactos/wine/ddk/compstui.h [iso-8859-1] (original)
+++ branches/reactos-yarotows/include/reactos/wine/ddk/compstui.h [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,2 +1,2 @@
-#include_next <compstui.h>
+#include <psdk/compstui.h>
Modified: branches/reactos-yarotows/include/reactos/wine/ddk/winddiui.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto…
==============================================================================
--- branches/reactos-yarotows/include/reactos/wine/ddk/winddiui.h [iso-8859-1] (original)
+++ branches/reactos-yarotows/include/reactos/wine/ddk/winddiui.h [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,2 +1,2 @@
-#include_next <winddiui.h>
+#include <psdk/winddiui.h>
Modified: branches/reactos-yarotows/include/reactos/wine/ddk/winsplp.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto…
==============================================================================
--- branches/reactos-yarotows/include/reactos/wine/ddk/winsplp.h [iso-8859-1] (original)
+++ branches/reactos-yarotows/include/reactos/wine/ddk/winsplp.h [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -1,2 +1,2 @@
-#include_next <winsplp.h>
+#include <psdk/winsplp.h>
Modified: branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp10.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/m…
==============================================================================
--- branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -7,16 +7,18 @@
 void _fpreset (void);
 void _fpreset (void)
-{
+{
 #ifdef __GNUC__
-    __asm__ ("fninit" );
-#else
-    __asm fninit;
+  __asm__ ("fninit");
+#else /* msvc: */
+  __asm fninit;
 #endif
 }
 #ifdef __GNUC__
 void __attribute__ ((alias ("_fpreset"))) fpreset(void);
 #else
-void fpreset(void) { _fpreset(); }
+void fpreset(void) {
+    _fpreset();
+}
 #endif
Modified: branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp8.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/m…
==============================================================================
--- branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -17,5 +17,7 @@
 #ifdef __GNUC__
 void __attribute__ ((alias ("_fpreset"))) fpreset(void);
 #else
-void fpreset(void) { _fpreset(); }
+void fpreset(void) {
+    _fpreset();
+}
 #endif
Modified: branches/reactos-yarotows/lib/3rdparty/mingw/crtexe.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/m…
==============================================================================
--- branches/reactos-yarotows/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Tue Jul 20 22:15:42
2010
@@ -20,6 +20,7 @@
 #include <tchar.h>
 #include <sect_attribs.h>
 #include <locale.h>
+#include <intrin.h>
 #ifndef __winitenv
 extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv);
@@ -51,7 +52,11 @@
 #define _commode (* __MINGW_IMP_SYMBOL(_commode))
 extern int _dowildcard;
+#if defined(__GNUC__)
 int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0;
+#else
+int _MINGW_INSTALL_DEBUG_MATHERR = 0;
+#endif
 extern int __defaultmatherr;
 extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *);
Modified: branches/reactos-yarotows/lib/3rdparty/mingw/gs_support.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/m…
==============================================================================
--- branches/reactos-yarotows/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -88,19 +88,25 @@
   __security_cookie_complement = ~cookie;
 }
+
+#if defined(__GNUC__) /* wrap msvc intrinsics onto gcc builtins */
+#undef  _ReturnAddress
+#undef  _AddressOfReturnAddress
+#define _ReturnAddress()               __builtin_return_address(0)
+#define _AddressOfReturnAddress()      __builtin_frame_address (0)
+#endif /* __GNUC__ */
+
 __declspec(noreturn) void __cdecl __report_gsfailure (ULONGLONG);
 __declspec(noreturn) void __cdecl
 __report_gsfailure (ULONGLONG StackCookie)
 {
-  volatile UINT_PTR cookie[2];
+  volatile UINT_PTR __UNUSED_PARAM(cookie[2]);
 #ifdef _WIN64
   ULONG64 controlPC, imgBase, establisherFrame;
   PRUNTIME_FUNCTION fctEntry;
   PVOID hndData;
-#endif
-#ifdef _WIN64
   RtlCaptureContext (&GS_ContextRecord);
   controlPC = GS_ContextRecord.Rip;
   fctEntry = RtlLookupFunctionEntry (controlPC, &imgBase, NULL);
@@ -110,25 +116,15 @@
                        &GS_ContextRecord, &hndData, &establisherFrame, NULL);
     }
   else
-#endif
+#endif /* _WIN64 */
     {
-#ifdef __GNUC__
-#ifdef _WIN64
-      GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0);
-      GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8;
-#else
-      GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0);
-      GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4;
-#endif
-#else
 #ifdef _WIN64
       GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress();
-      GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress();
+      GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress() + 8;
 #else
       GS_ContextRecord.Eip = (DWORD) _ReturnAddress();
-      GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress();
-#endif
-#endif
+      GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress() + 4;
+#endif /* _WIN64 */
     }
 #ifdef _WIN64
@@ -137,7 +133,7 @@
 #else
   GS_ExceptionRecord.ExceptionAddress = (PVOID) GS_ContextRecord.Eip;
   GS_ContextRecord.Ecx = StackCookie;
-#endif
+#endif /* _WIN64 */
   GS_ExceptionRecord.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN;
   GS_ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
   cookie[0] = __security_cookie;
@@ -147,3 +143,4 @@
   TerminateProcess (GetCurrentProcess (), STATUS_STACK_BUFFER_OVERRUN);
   abort();
 }
+
Modified: branches/reactos-yarotows/lib/3rdparty/mingw/tlssup.c
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/lib/3rdparty/m…
==============================================================================
--- branches/reactos-yarotows/lib/3rdparty/mingw/tlssup.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/lib/3rdparty/mingw/tlssup.c [iso-8859-1] Tue Jul 20 22:15:42
2010
@@ -10,20 +10,25 @@
 #undef CRTDLL
 #endif
+#include <sect_attribs.h>
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
+
 #include <stdio.h>
 #include <memory.h>
 #include <malloc.h>
-
-#ifndef _CRTALLOC
-#define _CRTALLOC(x) __attribute__ ((section (x) ))
+#ifndef _WIN64
+#include <stdlib.h> /* for _winmajor */
 #endif
 #ifndef __INTERNAL_FUNC_DEFINED
 #define __INTERNAL_FUNC_DEFINED
-  typedef void (__cdecl *_PVFV)(void);
-  typedef int (__cdecl *_PIFV)(void);
-  typedef void (__cdecl *_PVFI)(int);
+typedef void (__cdecl *_PVFV)(void);
+typedef int (__cdecl *_PIFV)(void);
+typedef void (__cdecl *_PVFI)(int);
 #endif
 extern WINBOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved);
@@ -209,5 +214,5 @@
 int mingw_initltsdrot_force = 0;
-int mingw_initltsdyn_force=0;
+int mingw_initltsdyn_force = 0;
 int mingw_initltssuo_force = 0;
Propchange: branches/reactos-yarotows/subsystems/win32/csrss/win32csr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 20 22:15:42 2010
@@ -1,4 +1,4 @@
 /branches/header-work/subsystems/win32/csrss/win32csr:45691-46463
/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46524,46526,46534-46535,46537-46539,46589
 /branches/ros-amd64-bringup/subsystems/win32/csrss/win32csr:36852
-/trunk/reactos/subsystems/win32/csrss/win32csr:45219-48123
+/trunk/reactos/subsystems/win32/csrss/win32csr:45219-48145
Modified: branches/reactos-yarotows/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/b…
==============================================================================
--- branches/reactos-yarotows/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ branches/reactos-yarotows/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -47,7 +47,7 @@
        { HostFalse, "", "", "$(LDFLAG_DLL)" }, // Win32OCX
        { HostFalse, "", "", "$(LDFLAG_CONSOLE)" }, //
Win32CUI
        { HostFalse, "", "", "$(LDFLAG_WINDOWS)" }, //
Win32GUI
-       { HostFalse, "", "", "" }, // BootLoader
+       { HostFalse, "", "", "$(LDFLAG_DRIVER)" }, //
BootLoader
        { HostFalse, "", "-f bin", "" }, // BootSector
        { HostFalse, "", "", "" }, // Iso
        { HostFalse, "", "", "" }, // LiveIso
Modified: branches/reactos-yarotows/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/b…
==============================================================================
--- branches/reactos-yarotows/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1]
(original)
+++ branches/reactos-yarotows/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1]
Tue Jul 20 22:15:42 2010
@@ -2439,13 +2439,7 @@
 MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
 {
        fprintf ( fMakefile, "# BOOT LOADER MODULE TARGET\n" );
-       string targetName ( module.output->name );
        string targetMacro ( GetTargetMacro (module) );
-       string workingDirectory = GetWorkingDirectory ();
-       FileLocation junk_tmp ( TemporaryDirectory,
-                               "",
-                               module.name + ".junk.tmp" );
-       CLEAN_FILE ( junk_tmp );
        string objectsMacro = GetObjectsMacro ( module );
        string libsMacro = GetLibsMacro ();
@@ -2460,33 +2454,34 @@
        fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
-       if (Environment::GetArch() == "arm")
-       {
-               fprintf ( fMakefile,
-                        "\t${gcc} -Wl,--subsystem,native -o %s %s %s %s
-nostartfiles -nostdlib\n",
-                        backend->GetFullName ( junk_tmp ).c_str (),
-                        objectsMacro.c_str (),
-                        libsMacro.c_str (),
-                        GetLinkerMacro ().c_str ());
-       }
-       else
-       {
-               fprintf ( fMakefile,
-                        "\t${gcc} -Wl,--subsystem,native -Wl,-Ttext,0x8000 -o %s %s
%s %s -nostartfiles -nostdlib\n",
-                        backend->GetFullName ( junk_tmp ).c_str (),
-                        objectsMacro.c_str (),
-                        libsMacro.c_str (),
-                        GetLinkerMacro ().c_str ());
-       }
-       fprintf ( fMakefile,
-                 "\t${objcopy} -O binary %s $@\n",
-                 backend->GetFullName ( junk_tmp ).c_str () );
-       GenerateBuildMapCode ( &junk_tmp );
-       fprintf ( fMakefile,
-                 "\t-@${rm} %s 2>$(NUL)\n",
-                 backend->GetFullName ( junk_tmp ).c_str () );
-
-       delete target_file;
+       string linkerScriptArgument;
+       if ( module.linkerScript != NULL ) {
+        linkerScriptArgument = ssprintf(" -T %s",
backend->GetFullName(*module.linkerScript->file).c_str());
+       }
+
+    /* Link the stripped booloader */
+    fprintf(fMakefile,
+            "\t${ld} --strip-all --subsystem native --entry=%s --image-base=%s %s %s
$(PROJECT_CCLIBS) "
+            "$(BUILTIN_LDFLAGS) $(PROJECT_LDFLAGS) $(LDFLAG_DRIVER) %s -o
$@\n",
+            module.GetEntryPoint().c_str(),
+            module.baseaddress.c_str(),
+            objectsMacro.c_str(),
+            libsMacro.c_str(),
+            linkerScriptArgument.c_str() );
+
+    /* Link an unstripped version */
+       fprintf(fMakefile,
+               "ifeq ($(ROS_BUILDNOSTRIP),yes)\n"
+               "\t${ld} --subsystem native --entry=%s --image-base=%s %s %s
$(PROJECT_CCLIBS) "
+               "$(BUILTIN_LDFLAGS) $(PROJECT_LDFLAGS) $(LDFLAG_DRIVER) %s -o
%s$(SEP)%s.nostrip.sys\n"
+               "endif\n",
+               module.GetEntryPoint().c_str(),
+               module.baseaddress.c_str(),
+               objectsMacro.c_str(),
+               libsMacro.c_str(),
+               linkerScriptArgument.c_str(),
+               backend->GetFullPath(*target_file).c_str(),
+               module.name.c_str());
 }
Modified: branches/reactos-yarotows/tools/rbuild/backend/mingw/rules.mak
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/b…
==============================================================================
--- branches/reactos-yarotows/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original)
+++ branches/reactos-yarotows/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Tue Jul 20
22:15:42 2010
@@ -227,7 +227,11 @@
 ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(wrc_TARGET) | ${call
RBUILD_intermediate_dir,$(2)}
        $$(ECHO_RC)
+ifeq ($(ARCH),amd64)
+       $$(Q)$$(wrc_TARGET) --input=$$< -o $$@ ${call RBUILD_rc_pp_flags,$(1),$(4)}
${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
+else
        ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} |
$$(wrc_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}}
+endif
 endif
Modified: branches/reactos-yarotows/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/rbuild/m…
==============================================================================
--- branches/reactos-yarotows/tools/rbuild/module.cpp [iso-8859-1] (original)
+++ branches/reactos-yarotows/tools/rbuild/module.cpp [iso-8859-1] Tue Jul 20 22:15:42
2010
@@ -1132,6 +1132,7 @@
                        return "DllMain";
                case Win32CUI:
                case Test:
+               case BootLoader:
                        return "mainCRTStartup";
                case Win32SCR:
                case Win32GUI:
@@ -1140,7 +1141,6 @@
                case StaticLibrary:
                case HostStaticLibrary:
                case ObjectLibrary:
-               case BootLoader:
                case BootSector:
                case Iso:
                case LiveIso:
@@ -1187,11 +1187,12 @@
                        return "0x00010000";
                case ElfExecutable:
                        return "0xe00000";
+               case BootLoader:
+                       return "0x8000";
                case BuildTool:
                case StaticLibrary:
                case HostStaticLibrary:
                case ObjectLibrary:
-               case BootLoader:
                case BootSector:
                case Iso:
                case LiveIso: