[ros-diffs] [hyperion] 44103: modified regtests/crt/crt_regtest.rbuild Don't link msvcrt twice, bad things happen modified tests/dirdlg/dirdlg.rbuild modified winetests/msvcrt/msvcrt.rbuild More oldnames hacks modified tests/tcpsvr/tcpsvr.c Don't use close on sockets, use closesocket

Author: hyperion
Date: Wed Nov 11 12:12:55 2009
New Revision: 44103

URL: http://svn.reactos.org/svn/reactos?rev=44103&view=rev
Log:
modified   regtests/crt/crt_regtest.rbuild
   Don't link msvcrt twice, bad things happen

modified   tests/dirdlg/dirdlg.rbuild
modified   winetests/msvcrt/msvcrt.rbuild
   More oldnames hacks

modified   tests/tcpsvr/tcpsvr.c
   Don't use close on sockets, use closesocket

Modified:
    trunk/rostests/regtests/crt/crt_regtest.rbuild
    trunk/rostests/tests/dirdlg/dirdlg.rbuild
    trunk/rostests/tests/tcpsvr/tcpsvr.c
    trunk/rostests/winetests/msvcrt/msvcrt.rbuild

Modified: trunk/rostests/regtests/crt/crt_regtest.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/crt/crt_regtest.…
==============================================================================
--- trunk/rostests/regtests/crt/crt_regtest.rbuild [iso-8859-1] (original)
+++ trunk/rostests/regtests/crt/crt_regtest.rbuild [iso-8859-1] Wed Nov 11 12:12:55 2009
@@ -4,7 +4,6 @@
 <module name="crt_regtest" type="win32cui"
installbase="bin" installname="crt_regtest.exe">
 	<include base="crt_regtest">.</include>
 	<library>wine</library>
-	<library>msvcrt</library>
 	<file>iofuncs.c</file>
 	<file>testlist.c</file>
 	<file>time.c</file>

Modified: trunk/rostests/tests/dirdlg/dirdlg.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dirdlg/dirdlg.rbuil…
==============================================================================
--- trunk/rostests/tests/dirdlg/dirdlg.rbuild [iso-8859-1] (original)
+++ trunk/rostests/tests/dirdlg/dirdlg.rbuild [iso-8859-1] Wed Nov 11 12:12:55 2009
@@ -1,5 +1,9 @@
 <module name="dirdlg" type="win32gui" installbase="bin"
installname="dirdlg.exe">
 	<include base="dirdlg">.</include>
+
+	<!-- FIXME: workarounds until we have a proper oldnames library -->
+	<define name="chdir">_chdir</define>
+
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

Modified: trunk/rostests/tests/tcpsvr/tcpsvr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/tests/tcpsvr/tcpsvr.c?rev…
==============================================================================
--- trunk/rostests/tests/tcpsvr/tcpsvr.c [iso-8859-1] (original)
+++ trunk/rostests/tests/tcpsvr/tcpsvr.c [iso-8859-1] Wed Nov 11 12:12:55 2009
@@ -130,7 +130,7 @@
 	return ERROR;
       } else if (n==0) {
 	printf(" connection closed by client\n");
-	close(newSd);
+	closesocket(newSd);
         WSACleanup();
 	return ERROR;
       }

Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.r…
==============================================================================
--- trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] (original)
+++ trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] Wed Nov 11 12:12:55 2009
@@ -6,8 +6,21 @@
 	<include base="msvcrt">include/reactos/wine/msvcrt</include>
 	<define name="__ROS_LONG64__" />
 	<define name="_CRT_NONSTDC_NO_DEPRECATE" />
+
+	<!-- FIXME: workarounds until we have a proper oldnames library -->
+	<define name="open">_open</define>
+	<define name="close">_close</define>
+	<define name="tell">_tell</define>
+	<define name="unlink">_unlink</define>
+	<define name="fdopen">_fdopen</define>
+	<define name="lseek">_lseek</define>
+	<define name="read">_read</define>
+	<define name="write">_write</define>
+	<define name="mkdir">_mkdir</define>
+	<define name="rmdir">_rmdir</define>
+	<define name="putenv">_putenv</define>
+
 	<library>kernel32</library>
-	<library>msvcrt</library>
 	<file>cpp.c</file>
 	<file>data.c</file>
 	<file>dir.c</file>