Import and merge Wine-20041201 Added: trunk/reactos/lib/icmp/ Modified: trunk/reactos/lib/icmp/Makefile.in Added: trunk/reactos/lib/icmp/Makefile.ros-template Added: trunk/reactos/lib/icmp/icmp.dsp Added: trunk/reactos/lib/icmp/icmp.rc Modified: trunk/reactos/lib/icmp/icmp_main.c Modified: trunk/reactos/lib/icmp/ip.h Added: trunk/reactos/lib/icmp/makefile _____
Copied: trunk/reactos/lib/icmp (from rev 12529, vendor/wine/dlls/icmp/current) _____
Modified: trunk/reactos/lib/icmp/Makefile.in --- vendor/wine/dlls/icmp/current/Makefile.in 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/Makefile.in 2004-12-31 15:01:00 UTC (rev 12533) @@ -4,6 +4,7 @@
VPATH = @srcdir@ MODULE = icmp.dll IMPORTS = kernel32 +EXTRALIBS = @SOCKETLIBS@
C_SRCS = icmp_main.c
_____
Added: trunk/reactos/lib/icmp/Makefile.ros-template --- vendor/wine/dlls/icmp/current/Makefile.ros-template 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/Makefile.ros-template 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1,21 @@
+# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ + +TARGET_NAME = icmp + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ + +TARGET_SDKLIBS = @IMPORTS@ ws2_32.a wine.a wine_uuid.a ntdll.a + +TARGET_BASE = $(TARGET_BASE_LIB_COMCTL32) + +#TARGET_RC_SRCS = @RC_SRCS@ +#TARGET_RC_BINSRC = @RC_BINSRC@ +#TARGET_RC_BINARIES = @RC_BINARIES@ + +default: all + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk _____
Added: trunk/reactos/lib/icmp/icmp.dsp --- vendor/wine/dlls/icmp/current/icmp.dsp 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/icmp.dsp 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1,96 @@
+# Microsoft Developer Studio Project File - Name="icmp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=icmp - Win32 +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "icmp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "icmp.mak" CFG="icmp - Win32" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "icmp - Win32" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Output\Win32" +# PROP BASE Intermediate_Dir "Output\Win32" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Output\Win32" +# PROP Intermediate_Dir "Output\Win32" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICMP_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ....\include /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ICMP_" /D "__WINESRC__" /D __WINETEST_OUTPUT_DIR="Output\Win32" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c +# SUBTRACT CPP /X /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x41d /d "_DEBUG" +# ADD RSC /l 0x41d /i "....\include" /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /dll /debug /machine:I386 /def:"icmp.def" /pdbtype:sept +# Begin Target + +# Name "icmp - Win32" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\icmp.dll.dbg.c +# End Source File +# Begin Source File + +SOURCE=.\icmp.spec +# Begin Custom Build +InputPath=.\icmp.spec + +BuildCmds= \ + ....\tools\winebuild\Output\Win32\winebuild.exe --def .\icmp.spec > .\icmp.def \ + ....\tools\winebuild\Output\Win32\winebuild.exe -o .\icmp.dll.dbg.c --debug -C. icmp_main.c \ + + +".\icmp.def" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +".\icmp.dll.dbg.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build +# End Source File +# Begin Source File + +SOURCE=.\icmp_main.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project _____
Added: trunk/reactos/lib/icmp/icmp.rc --- vendor/wine/dlls/icmp/current/icmp.rc 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/icmp.rc 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1 @@
+#include "wine/wine_common_ver.rc" _____
Modified: trunk/reactos/lib/icmp/icmp_main.c --- vendor/wine/dlls/icmp/current/icmp_main.c 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/icmp_main.c 2004-12-31 15:01:00 UTC (rev 12533) @@ -95,7 +95,6 @@
#include "ip.h" #include "ip_icmp.h"
- WINE_DEFAULT_DEBUG_CHANNEL(icmp);
@@ -136,8 +135,6 @@ return(answer); }
- - /* * Exported Routines. */ _____
Modified: trunk/reactos/lib/icmp/ip.h --- vendor/wine/dlls/icmp/current/ip.h 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/ip.h 2004-12-31 15:01:00 UTC (rev 12533) @@ -39,6 +39,21 @@
*/ #define IPVERSION 4
+/* A little magic to make the Windows build happy. */ +#if defined(_MSC_VER) || defined(__MINGW32__) +#include <winsock2.h> +#include <ws2tcpip.h> +#include <time.h> + +typedef u_short n_short; +typedef u_int n_long; +typedef u_int n_time; + +#define EMSGSIZE WSAEMSGSIZE +#define ENETUNREACH WSAENETUNREACH +#define EHOSTUNREACH WSAEHOSTUNREACH +#endif + /* * Structure of an internet header, naked of options. */ _____
Added: trunk/reactos/lib/icmp/makefile --- vendor/wine/dlls/icmp/current/makefile 2004-12-31 15:00:15 UTC (rev 12529) +++ trunk/reactos/lib/icmp/makefile 2004-12-31 15:01:00 UTC (rev 12533) @@ -0,0 +1,9 @@
+# $Id: makefile 11108 2004-09-28 19:07:56Z sedwards $ + +PATH_TO_TOP = ../.. + +TARGET_TYPE = winedll + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk
-
gvg＠svn.reactos.com