Author: hyperion Date: Wed Nov 11 04:21:16 2009 New Revision: 44090
URL: http://svn.reactos.org/svn/reactos?rev=44090&view=rev Log: modified lib/3rdparty/mingw/mingw.rbuild oldnames is not an import library and dlltool --add-underscore is not an appropriate way to build it. Delete it for now
modified base/applications/network/ftp/ftp.rbuild modified base/applications/winhlp32/winhlp32.rbuild modified base/services/dhcp/dhcp.rbuild modified dll/win32/crypt32/crypt32.rbuild modified dll/win32/mshtml/mshtml.rbuild modified dll/win32/setupapi/setupapi.rbuild modified dll/win32/wininet/wininet.rbuild modified lib/3rdparty/libxml2/libxml2.rbuild Workarounds for the removal of oldnames
modified dll/directx/d3d8/d3d8.rbuild Use a file that actually exists
modified dll/win32/crtdll/crtdll.rbuild modified dll/win32/msvcrt/msvcrt.rbuild "mangledsymbols" never did anything: remove it
modified dll/win32/msvcrt/msvcrt.def modified lib/sdk/crt/crt.rbuild We don't actually implement j0/j1/jn/y0/y1/yn: _j0 calls __imp__j0, which is an alias for __imp___j0, which redirects back to _j0 in a perfect loop. Remove them for the time being
modified lib/3rdparty/bzip2/bzip2.rbuild This was actually called unbzip2.dll. Who knew
Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild trunk/reactos/base/applications/winhlp32/winhlp32.rbuild trunk/reactos/base/services/dhcp/dhcp.rbuild trunk/reactos/dll/directx/d3d8/d3d8.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/mshtml/mshtml.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild
Modified: trunk/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/f... ============================================================================== --- trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -3,6 +3,18 @@ <module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe"> <include base="ftp">.</include> <define name="lint" /> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="chdir">_chdir</define> + <define name="getcwd">_getcwd</define> + <define name="mktemp">_mktemp</define> + <define name="unlink">_unlink</define> + <define name="close">_close</define> + <define name="fileno">_fileno</define> + <define name="read">_read</define> + <define name="write">_write</define> + <define name="lseek">_lseek</define> + <library>kernel32</library> <library>ws2_32</library> <library>iphlpapi</library>
Modified: trunk/reactos/base/applications/winhlp32/winhlp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/... ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhlp32.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -5,6 +5,11 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__ROS_LONG64__" /> <define name="_CRT_NONSTDC_NO_DEPRECATE" /> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="fileno">_fileno</define> + <define name="isatty">_isatty</define> + <library>wine</library> <library>user32</library> <library>gdi32</library>
Modified: trunk/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhcp.rbu... ============================================================================== --- trunk/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -3,6 +3,13 @@ <module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe"> <include base="dhcp">.</include> <include base="dhcp">include</include> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="tzset">_tzset</define> + <define name="close">_close</define> + <define name="read">_read</define> + <define name="write">_write</define> + <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library>
Modified: trunk/reactos/dll/directx/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.rbuil... ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d8" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8.dll"> - <importlibrary definition="d3d8.spec.def" /> + <importlibrary definition="d3d8.spec" /> <file>d3d8.c</file> <file>d3d8.rc</file> <file>d3d8.spec</file>
Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rbu... ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -1,4 +1,4 @@ -<module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true" installbase="system32" installname="crtdll.dll" iscrt="true"> +<module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" installbase="system32" installname="crtdll.dll" iscrt="true"> <importlibrary definition="crtdll.spec" /> <include base="crtdll">.</include> <include base="crt">include</include>
Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.r... ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -4,6 +4,12 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="fdopen">_fdopen</define> + <define name="open">_open</define> + <define name="close">_close</define> + <library>wine</library> <library>user32</library> <library>advapi32</library>
Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.rbu... ============================================================================== --- trunk/reactos/dll/win32/mshtml/mshtml.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mshtml.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -1,13 +1,18 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true"> +<module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="mshtml.spec" /> <include base="mshtml">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="open">_open</define> + <define name="close">_close</define> + <file>conpoint.c</file> <file>dispex.c</file> <file>editor.c</file>
Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.def... ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -365,9 +365,10 @@ _isnan @359 _itoa @360 _itow @361 - _j0 @362 - _j1 @363 - _jn @364 +; FIXME: these aren't actually implemented in CRT +; _j0 @362 +; _j1 @363 +; _jn @364 _kbhit @365 _lfind @366 _loaddll @367 @@ -648,9 +649,10 @@ _wunlink @642 _wutime @643 ; _wutime64 @644 - _y0 @645 - _y1 @646 - _yn @647 +; FIXME: these aren't actually implemented in CRT +; _y0 @645 +; _y1 @646 +; _yn @647 abort @648 abs @649 acos @650
Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rbu... ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -1,4 +1,4 @@ -<module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" iscrt="yes"> +<module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" installbase="system32" installname="msvcrt.dll" iscrt="yes"> <importlibrary definition="msvcrt.def" /> <include base="msvcrt">.</include> <include base="crt">include</include>
Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupapi... ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -5,6 +5,10 @@ <include base="setupapi">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="pnp_client">.</include> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="wcsnicmp">_wcsnicmp</define> + <define name="_SETUPAPI_" /> <library>pnp_client</library> <library>uuid</library>
Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.r... ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -8,6 +8,10 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <define name="_WINE" /> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="close">_close</define> + <library>wine</library> <library>mpr</library> <library>shlwapi</library>
Modified: trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/bzip2.rb... ============================================================================== --- trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="bzip2" type="kernelmodedll" installbase="system32/drivers" installname="bzip2.dll"> +<module name="bzip2" type="kernelmodedll" installbase="system32/drivers" installname="unbzip2.dll"> <importlibrary definition="unbzip2.def" /> <define name="BZ_NO_STDIO" /> <define name="BZ_DECOMPRESS_ONLY" />
Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxml... ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -11,6 +11,14 @@ <define name="__MINGW32__" /> <include base="libxml2">include</include> <include base="libxml2">.</include> + + <!-- FIXME: workarounds until we have a proper oldnames library --> + <define name="getcwd">_getcwd</define> + <define name="close">_close</define> + <define name="write">_write</define> + <define name="read">_read</define> + <define name="open">_open</define> + <file>c14n.c</file> <file>catalog.c</file> <file>chvalid.c</file>
Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.rb... ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -1,9 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true" crt="dll"> +<module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> - <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="ReactOS">include/reactos/mingw-w64</include> <library>kernel32</library> <file>_newmode.c</file>
Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev=... ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Wed Nov 11 04:21:16 2009 @@ -155,9 +155,10 @@ <file>fmod.c</file> <file>ldexp.c</file> </directory> - <file>j0_y0.c</file> + <!-- FIXME: we don't actually implement these... they recursively call themselves through an alias --> + <!--<file>j0_y0.c</file> <file>j1_y1.c</file> - <file>jn_yn.c</file> + <file>jn_yn.c</file>--> </if> <if property="ARCH" value="amd64"> <directory name="i386"> @@ -166,9 +167,10 @@ <file>fmod.c</file> <file>ldexp.c</file> </directory> - <file>j0_y0.c</file> + <!-- FIXME: we don't actually implement these... they recursively call themselves through an alias --> + <!--<file>j0_y0.c</file> <file>j1_y1.c</file> - <file>jn_yn.c</file> + <file>jn_yn.c</file>--> </if> <ifnot property="ARCH" value="i386"> <file>stubs.c</file>