Sync to trunk r38250

svn path=/branches/ros-amd64-bringup/; revision=38496

diff --cc reactos/dll/cpl/desk/desk.rbuild
index c08264f,131e0da..301884c
--- 1/reactos/dll/cpl/desk/desk.rbuild
--- 2/reactos/dll/cpl/desk/desk.rbuild
+++ b/reactos/dll/cpl/desk/desk.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes">
+ <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes" crt="msvcrt">
 -      <importlibrary definition="desk.def" />
 +      <importlibrary definition="desk.spec" />
        <include base="desk">.</include>
        <define name="_WIN32" />
        <library>kernel32</library>

diff --cc reactos/dll/cpl/intl/intl.rbuild
index 469c1d8,800c9ec..9e03875
--- 1/reactos/dll/cpl/intl/intl.rbuild
--- 2/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@@@ -1,24 -1,24 +1,24 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes">
+ <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes" crt="msvcrt">
 -    <importlibrary definition="intl.def" />
 -    <include base="intl">.</include>
 -    <library>kernel32</library>
 -    <library>user32</library>
 -    <library>comctl32</library>
 -    <library>advapi32</library>
 -    <library>setupapi</library>
 -    <library>shell32</library>
 -    <file>currency.c</file>
 -    <file>date.c</file>
 -    <file>generalp.c</file>
 -    <file>intl.c</file>
 -    <file>inplocale.c</file>
 -    <file>numbers.c</file>
 -    <file>time.c</file>
 -    <file>misc.c</file>
 -    <file>languages.c</file>
 -    <file>advanced.c</file>
 -    <file>sort.c</file>
 -    <file>intl.rc</file>
 +      <importlibrary definition="intl.spec" />
 +      <include base="intl">.</include>
 +      <library>kernel32</library>
 +      <library>user32</library>
 +      <library>comctl32</library>
 +      <library>advapi32</library>
 +      <library>setupapi</library>
 +      <library>shell32</library>
 +      <file>currency.c</file>
 +      <file>date.c</file>
 +      <file>generalp.c</file>
 +      <file>intl.c</file>
 +      <file>inplocale.c</file>
 +      <file>numbers.c</file>
 +      <file>time.c</file>
 +      <file>misc.c</file>
 +      <file>languages.c</file>
 +      <file>advanced.c</file>
 +      <file>sort.c</file>
 +      <file>intl.rc</file>
  </module>

diff --cc reactos/dll/cpl/main/main.rbuild
index 5a6d280,563add0..1156495
--- 1/reactos/dll/cpl/main/main.rbuild
--- 2/reactos/dll/cpl/main/main.rbuild
+++ b/reactos/dll/cpl/main/main.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes">
+ <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes" crt="msvcrt">
 -      <importlibrary definition="main.def" />
 +      <importlibrary definition="main.spec" />
        <include base="main">.</include>
        <library>kernel32</library>
        <library>advapi32</library>

diff --cc reactos/dll/cpl/usrmgr/usrmgr.rbuild
index 1988b4d,1a612c9..ad2925f
--- 1/reactos/dll/cpl/usrmgr/usrmgr.rbuild
--- 2/reactos/dll/cpl/usrmgr/usrmgr.rbuild
+++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes">
+ <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes" crt="msvcrt">
 -      <importlibrary definition="usrmgr.def" />
 +      <importlibrary definition="usrmgr.spec" />
        <include base="usrmgr">.</include>
        <library>kernel32</library>
        <library>advapi32</library>

diff --cc reactos/dll/directx/ddraw/ddraw.rbuild
index 153564c,ab79138..97a5d89
--- 1/reactos/dll/directx/ddraw/ddraw.rbuild
--- 2/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes">
+ <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes" crt="msvcrt">
 -      <importlibrary definition="ddraw.def" />
 +      <importlibrary definition="ddraw.spec" />
        <include base="ddraw">.</include>
        <library>kernel32</library>
        <library>user32</library>

diff --cc reactos/dll/win32/advapi32/sec/misc.c
Simple merge

diff --cc reactos/dll/win32/gdi32/gdi32.rbuild
index a06f4ba,91ddb0c..e407d5a
--- 1/reactos/dll/win32/gdi32/gdi32.rbuild
--- 2/reactos/dll/win32/gdi32/gdi32.rbuild
+++ b/reactos/dll/win32/gdi32/gdi32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true">
 -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll">
 -      <importlibrary definition="gdi32.def" />
++<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll" allowwarnings="true">
 +      <importlibrary definition="gdi32.spec" />
        <include base="gdi32">include</include>
        <define name="_DISABLE_TIDENTS" />
        <define name="LANGPACK" />

diff --cc reactos/dll/win32/glu32/glu32.rbuild
index eb5aee7,9ce9837..fd75052
--- 1/reactos/dll/win32/glu32/glu32.rbuild
--- 2/reactos/dll/win32/glu32/glu32.rbuild
+++ b/reactos/dll/win32/glu32/glu32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true">
+ <module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true" crt="msvcrt">
 -      <importlibrary definition="glu32.def" />
 +      <importlibrary definition="glu32.spec" />
        <include base="glu32">include</include>
        <include base="glu32">libnurbs/internals</include>
        <include base="glu32">libnurbs/interface</include>

diff --cc reactos/dll/win32/kernel32/kernel32.rbuild
index 353cfeb,7b5041a..046685f
--- 1/reactos/dll/win32/kernel32/kernel32.rbuild
--- 2/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
  <group>
-       <module name="kernel32_base" type="objectlibrary" allowwarnings="true">
 -      <module name="kernel32_base" type="objectlibrary" crt="dll">
++      <module name="kernel32_base" type="objectlibrary" crt="dll" allowwarnings="true">
                <include base="kernel32_base">.</include>
                <include base="kernel32_base">include</include>
                <include base="ReactOS">include/reactos/subsys</include>
@@@ -141,8 -135,8 +141,8 @@@
                </directory>
                <library>normalize</library>
        </module>
-       <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">
+       <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll">
 -              <importlibrary definition="kernel32.def" />
 +              <importlibrary definition="kernel32.spec" />
                <include base="kernel32">.</include>
                <include base="kernel32" root="intermediate">.</include>
                <include base="kernel32">include</include>

diff --cc reactos/dll/win32/msvcrt/msvcrt.rbuild
Simple merge

diff --cc reactos/dll/win32/opengl32/opengl32.rbuild
index 5c01e93,7f40023..6836100
--- 1/reactos/dll/win32/opengl32/opengl32.rbuild
--- 2/reactos/dll/win32/opengl32/opengl32.rbuild
+++ b/reactos/dll/win32/opengl32/opengl32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes">
+ <module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes" crt="msvcrt">
 -      <importlibrary definition="opengl32.def" />
 +      <importlibrary definition="opengl32.spec" />
        <define name="_DISABLE_TIDENTS" />
        <library>ntdll</library>
        <library>kernel32</library>

diff --cc reactos/dll/win32/user32/user32.rbuild
index cd81923,246b26b..b278c95
--- 1/reactos/dll/win32/user32/user32.rbuild
--- 2/reactos/dll/win32/user32/user32.rbuild
+++ b/reactos/dll/win32/user32/user32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" allowwarnings="true">
 -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll">
 -      <importlibrary definition="user32.def" />
++<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll" allowwarnings="true">
 +      <importlibrary definition="user32.pspec" />
        <include base="user32">.</include>
        <include base="user32">include</include>
        <include base="ReactOS">include/reactos/subsys</include>

diff --cc reactos/include/crt/mingw32/intrin_x86.h
Simple merge

diff --cc reactos/include/psdk/winbase.h
Simple merge

diff --cc reactos/include/psdk/winnt.h
Simple merge

diff --cc reactos/include/reactos/libs/pseh/pseh2.h
Simple merge

diff --cc reactos/ntoskrnl/io/iomgr/iofunc.c
Simple merge

diff --cc reactos/tools/rbuild/module.cpp
Simple merge

diff --cc reactos/tools/widl/typegen.c
Simple merge