Author: hyperion
Date: Tue Nov 4 12:16:58 2008
New Revision: 37187
URL:
http://svn.reactos.org/svn/reactos?rev=37187&view=rev
Log:
KJK::Hyperion is proud to present "dllimport purity", another landmark commit
that you should really build only after a "clean"
Disclaimer: in an uncharacteristic and daring move, I actually built, installed and booted
this revision
modified tools/rbuild/backend/mingw/mingw.cpp
modified tools/rbuild/backend/mingw/modulehandler.cpp
modified tools/rbuild/module.cpp
modified tools/rbuild/project.dtd
modified tools/rbuild/rbuild.h
modified include/crt/_mingw.h
New module attribute iscrt for marking modules that implement a C runtime library
New module attribute crt for compiling and linking modules to a specific C runtime
library. Can be "ntdll" (for ntdll.dll) "msvcrt" (msvcrt.dll),
"crt" (statically-linked runtime), "libcntpr" (libcntpr.lib),
"dll" (one of the <library> entries specifies a CRT DLL) or
"static". Defaults to "msvcrt" for Win32 modules, to
"static" for CRT modules themselves, and to "dll" for drivers
Define _DLL for code that compiles against a dynamically-linked CRT
Define __MINGW_IMPORT and _CRTIMP according to whether _DLL is defined. We finally use
__declspec(dllimport) somewhere, anywhere (SDK headers still don't use it)
Bonus fix: actually use compiler-specific command line flags when compiling files
modified lib/3rdparty/adns/adns.rbuild
modified lib/3rdparty/libxml2/libxml2.rbuild
modified lib/3rdparty/mingw/mingw.rbuild
And for the downside: static libraries that will be linked to a module that links to
the CRT dynamically have to be compiled for a dynamically-linked CRT, as well. Say it out
aloud.
modified base/applications/wordpad/wordpad.rbuild
modified base/setup/usetup/usetup.rbuild
modified dll/3rdparty/dxtn/dxtn.rbuild
modified dll/3rdparty/freetype/freetype.rbuild
modified dll/3rdparty/mesa32/mesa32.rbuild
modified dll/cpl/desk/desk.rbuild
modified dll/cpl/input/input.rbuild
modified dll/cpl/intl/intl.rbuild
modified dll/cpl/joy/joy.rbuild
modified dll/cpl/main/main.rbuild
modified dll/cpl/mmsys/mmsys.rbuild
modified dll/cpl/odbccp32/odbccp32.rbuild
modified dll/cpl/powercfg/powercfg.rbuild
modified dll/cpl/sysdm/sysdm.rbuild
modified dll/cpl/telephon/telephon.rbuild
modified dll/cpl/timedate/timedate.rbuild
modified dll/cpl/usrmgr/usrmgr.rbuild
modified dll/directx/ddraw/ddraw.rbuild
modified dll/directx/dsound/dsound.rbuild
modified dll/directx/wine/wined3d/wined3d.rbuild
modified dll/nls/idndl_redist/idndl_redist.rbuild
modified dll/nls/normaliz_redist/normaliz_redist.rbuild
modified dll/shellext/deskadp/deskadp.rbuild
modified dll/shellext/deskmon/deskmon.rbuild
modified dll/shellext/fontext/fontext.rbuild
modified dll/win32/dhcpcsvc/dhcpcsvc.rbuild
modified dll/win32/dnsapi/dnsapi.rbuild
modified dll/win32/glu32/glu32.rbuild
modified dll/win32/icmp/icmp.rbuild
modified dll/win32/winmm/midimap/midimap.rbuild
modified drivers/video/displays/framebuf/framebuf.rbuild
modified drivers/video/displays/framebufacc/framebufacc.rbuild
modified drivers/video/displays/vga/vgaddi.rbuild
modified subsystems/win32/csrss/csrss.rbuild
modified subsystems/win32/csrss/win32csr/win32csr.rbuild
modified subsystems/win32/win32k/win32k.rbuild
Don't specify msvcrt explicitely as a <library> if it's going to be
linked implicitely as the CRT
<library>libcntpr</library> -> crt="libcntpr"
Remove miscellaneous unused <library> entries
modified dll/win32/crtdll/crtdll.rbuild
modified dll/win32/msvcrt20/msvcrt20.rbuild
modified dll/win32/msvcrt40/msvcrt40.rbuild
modified dll/win32/msvcrt/msvcrt.rbuild
Mark CRT DLLs as CRT modules
modified dll/win32/user32/windows/font.c
modified include/reactos/wine/unicode.h
Don't redefine or redeclare CRT functions
modified dll/win32/ws2_32/include/ws2_32.h
Arch, you idiot, it's defined in <stdlib.h>
modified include/crt/ctype.h
modified include/crt/wctype.h
Don't import ctype routines that were already defined as inlines
modified include/crt/stdio.h
modified include/reactos/wine/config.h
Avoid linking to libmingwex.a if possible
modified base/applications/taskmgr/taskmgr.rbuild
modified tools/nci/nci.mak
modified tools/nci/ncitool.c
modified dll/ntdll/ntdll.rbuild
Mark ntdll module as a CRT
New "ntsys" module to import just Nt/Zw from ntdll.dll. Avoids accidentally
linking to ntdll.dll's CRT when importing system calls
modified include/psdk/winternl.h
Nope, it doesn't.
modified base/applications/network/net/help.c
modified base/applications/network/net/main.c
Replace printf with puts, or GCC will do it on its own and link to the dllimport thunk
for puts
modified base/applications/network/ping/ping.c
Removed broken, unnecessary workaround
modified base/shell/cmd/cmd.rbuild
Simplify cmd module
This commit dediHAPPY BIRTHDAY STEFAN GINSBERG <3 <3 <3
Modified:
trunk/reactos/base/applications/network/net/help.c
trunk/reactos/base/applications/network/net/main.c
trunk/reactos/base/applications/network/ping/ping.c
trunk/reactos/base/applications/taskmgr/taskmgr.rbuild
trunk/reactos/base/applications/wordpad/wordpad.rbuild
trunk/reactos/base/setup/usetup/usetup.rbuild
trunk/reactos/base/shell/cmd/cmd.rbuild
trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild
trunk/reactos/dll/3rdparty/freetype/freetype.rbuild
trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild
trunk/reactos/dll/cpl/desk/desk.rbuild
trunk/reactos/dll/cpl/input/input.rbuild
trunk/reactos/dll/cpl/intl/intl.rbuild
trunk/reactos/dll/cpl/joy/joy.rbuild
trunk/reactos/dll/cpl/main/main.rbuild
trunk/reactos/dll/cpl/mmsys/mmsys.rbuild
trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild
trunk/reactos/dll/cpl/powercfg/powercfg.rbuild
trunk/reactos/dll/cpl/sysdm/sysdm.rbuild
trunk/reactos/dll/cpl/telephon/telephon.rbuild
trunk/reactos/dll/cpl/timedate/timedate.rbuild
trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild
trunk/reactos/dll/directx/ddraw/ddraw.rbuild
trunk/reactos/dll/directx/dsound/dsound.rbuild
trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild
trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
trunk/reactos/dll/ntdll/ntdll.rbuild
trunk/reactos/dll/shellext/deskadp/deskadp.rbuild
trunk/reactos/dll/shellext/deskmon/deskmon.rbuild
trunk/reactos/dll/shellext/fontext/fontext.rbuild
trunk/reactos/dll/win32/crtdll/crtdll.rbuild
trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild
trunk/reactos/dll/win32/glu32/glu32.rbuild
trunk/reactos/dll/win32/icmp/icmp.rbuild
trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
trunk/reactos/dll/win32/user32/windows/font.c
trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild
trunk/reactos/dll/win32/ws2_32/include/ws2_32.h
trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild
trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild
trunk/reactos/include/crt/_mingw.h
trunk/reactos/include/crt/ctype.h
trunk/reactos/include/crt/stdio.h
trunk/reactos/include/crt/wctype.h
trunk/reactos/include/psdk/winternl.h
trunk/reactos/include/reactos/wine/config.h
trunk/reactos/include/reactos/wine/unicode.h
trunk/reactos/lib/3rdparty/adns/adns.rbuild
trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild
trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
trunk/reactos/subsystems/win32/csrss/csrss.rbuild
trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
trunk/reactos/subsystems/win32/win32k/win32k.rbuild
trunk/reactos/tools/nci/nci.mak
trunk/reactos/tools/nci/ncitool.c
trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
trunk/reactos/tools/rbuild/module.cpp
trunk/reactos/tools/rbuild/project.dtd
trunk/reactos/tools/rbuild/rbuild.h
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/reactos/base/applications/network/net/help.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
Modified: trunk/reactos/base/applications/network/net/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
Modified: trunk/reactos/base/applications/network/ping/ping.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
Modified: trunk/reactos/base/setup/usetup/usetup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r…
Modified: trunk/reactos/base/shell/cmd/cmd.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?…
Modified: trunk/reactos/dll/3rdparty/dxtn/dxtn.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/dxtn/dxtn.rbu…
Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free…
Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32…
Modified: trunk/reactos/dll/cpl/desk/desk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r…
Modified: trunk/reactos/dll/cpl/input/input.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild…
Modified: trunk/reactos/dll/cpl/intl/intl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.rbuild?r…
Modified: trunk/reactos/dll/cpl/joy/joy.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/joy.rbuild?rev…
Modified: trunk/reactos/dll/cpl/main/main.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.rbuild?r…
Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild…
Modified: trunk/reactos/dll/cpl/odbccp32/odbccp32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/odbccp32.…
Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.…
Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild…
Modified: trunk/reactos/dll/cpl/telephon/telephon.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/telephon.…
Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.…
Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui…
Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb…
Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.…
Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w…
Modified: trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl_redist/idndl…
Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no…
Modified: trunk/reactos/dll/ntdll/ntdll.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev…
Modified: trunk/reactos/dll/shellext/deskadp/deskadp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska…
Modified: trunk/reactos/dll/shellext/deskmon/deskmon.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm…
Modified: trunk/reactos/dll/shellext/fontext/fontext.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte…
Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb…
Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcpcsv…
Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.rb…
Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui…
Modified: trunk/reactos/dll/win32/icmp/icmp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp.rbuild…
Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb…
Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2…
Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4…
Modified: trunk/reactos/dll/win32/user32/windows/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f…
Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi…
Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w…
Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra…
Modified: trunk/reactos/drivers/video/displays/framebufacc/framebufacc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/fra…
Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga…
Modified: trunk/reactos/include/crt/_mingw.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=3…
Modified: trunk/reactos/include/crt/ctype.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=37…
Modified: trunk/reactos/include/crt/stdio.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=37…
Modified: trunk/reactos/include/crt/wctype.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3…
Modified: trunk/reactos/include/psdk/winternl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re…
Modified: trunk/reactos/include/reactos/wine/config.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi…
Modified: trunk/reactos/include/reactos/wine/unicode.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico…
Modified: trunk/reactos/lib/3rdparty/adns/adns.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns.rbu…
Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm…
Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r…
Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr…
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…
Modified: trunk/reactos/tools/nci/nci.mak
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=3718…
Modified: trunk/reactos/tools/nci/ncitool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=37…
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
Modified: trunk/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re…
Modified: trunk/reactos/tools/rbuild/project.dtd
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r…
Modified: trunk/reactos/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=…