Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-03 23:01:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

modified regtests/crt/crt_regtest.rbuild

Browse source 
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

svn path=/trunk/; revision=44103
This commit is contained in:
KJK::Hyperion 2009-11-11 11:12:55 +00:00
parent 42f5d69bb4
commit 8667b162b1
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rostests/regtests/crt/crt_regtest.rbuild
View file

@ -4,7 +4,6 @@
<module name="crt_regtest" type="win32cui" installbase="bin" installname="crt_regtest.exe"> <module name="crt_regtest" type="win32cui" installbase="bin" installname="crt_regtest.exe">
<include base="crt_regtest">.</include> <include base="crt_regtest">.</include>
<library>wine</library> <library>wine</library>
<library>msvcrt</library>
<file>iofuncs.c</file> <file>iofuncs.c</file>
<file>testlist.c</file> <file>testlist.c</file>
<file>time.c</file> <file>time.c</file>

4
rostests/tests/dirdlg/dirdlg.rbuild
View file

@ -1,5 +1,9 @@
<module name="dirdlg" type="win32gui" installbase="bin" installname="dirdlg.exe"> <module name="dirdlg" type="win32gui" installbase="bin" installname="dirdlg.exe">
<include base="dirdlg">.</include> <include base="dirdlg">.</include>
<!-- FIXME: workarounds until we have a proper oldnames library -->
<define name="chdir">_chdir</define>
<library>kernel32</library> <library>kernel32</library>
<library>user32</library> <library>user32</library>
<library>gdi32</library> <library>gdi32</library>

2
rostests/tests/tcpsvr/tcpsvr.c
View file

@ -130,7 +130,7 @@ int read_line(int newSd, char *line_to_return) {
return ERROR; return ERROR;
} else if (n==0) { } else if (n==0) {
printf(" connection closed by client\n"); printf(" connection closed by client\n");
close(newSd); closesocket(newSd);
WSACleanup(); WSACleanup();
return ERROR; return ERROR;
} }

15
rostests/winetests/msvcrt/msvcrt.rbuild
View file

@ -6,8 +6,21 @@
<include base="msvcrt">include/reactos/wine/msvcrt</include> <include base="msvcrt">include/reactos/wine/msvcrt</include>
<define name="__ROS_LONG64__" /> <define name="__ROS_LONG64__" />
<define name="_CRT_NONSTDC_NO_DEPRECATE" /> <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>kernel32</library>
<library>msvcrt</library>
<file>cpp.c</file> <file>cpp.c</file>
<file>data.c</file> <file>data.c</file>
<file>dir.c</file> <file>dir.c</file>