diff --git a/configure b/configure index 8c706cbc1e1bb27e471e92908f4d79a9eb534eeb..fa9716ef64ee0cdb5da6929609fdeb82d938f73b 100755 --- a/configure +++ b/configure @@ -16420,7 +16420,7 @@ MAKE_LIB_RULES=libs/Makelib.rules MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile libs/wpp/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wrc/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile libs/wpp/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -17019,6 +17019,7 @@ do "dlls/msvcrtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvcrtd/Makefile" ;; "dlls/msvideo/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvideo/Makefile" ;; "dlls/msvideo/msrle32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/msvideo/msrle32/Makefile" ;; + "dlls/mswsock/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mswsock/Makefile" ;; "dlls/netapi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/netapi32/Makefile" ;; "dlls/netapi32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/netapi32/tests/Makefile" ;; "dlls/ntdll/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/ntdll/Makefile" ;; diff --git a/configure.ac b/configure.ac index 8f718b3e887abc3515515a1e478608325ce5ab5f..e9aa3d5bde6fdf61e30258580d5dac5cd87b319d 100644 --- a/configure.ac +++ b/configure.ac @@ -1452,6 +1452,7 @@ dlls/msvcrt20/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile +dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 158ddc18604f4b1cee34eb857e51734fb749792e..23a4711c76fdbcbe002d0cc274b4a9168dbd0e1e 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -66,6 +66,7 @@ BASEDIRS = \ msvcrtd \ msvideo \ msvideo/msrle32 \ + mswsock \ netapi32 \ ntdll \ odbc32 \ @@ -254,6 +255,7 @@ SYMLINKS = \ msvcrt20.dll$(DLLEXT) \ msvcrtd.dll$(DLLEXT) \ msvfw32.dll$(DLLEXT) \ + mswsock.dll$(DLLEXT) \ netapi32.dll$(DLLEXT) \ ntdll.dll$(DLLEXT) \ odbc32.dll$(DLLEXT) \ @@ -504,6 +506,9 @@ msvcrtd.dll$(DLLEXT): msvcrtd/msvcrtd.dll$(DLLEXT) msvfw32.dll$(DLLEXT) msvideo.dll$(DLLEXT): msvideo/msvfw32.dll$(DLLEXT) $(RM) $@ && $(LN_S) msvideo/msvfw32.dll$(DLLEXT) $@ +mswsock.dll$(DLLEXT): mswsock/mswsock.dll$(DLLEXT) + $(RM) $@ && $(LN_S) mswsock/mswsock.dll$(DLLEXT) $@ + netapi32.dll$(DLLEXT): netapi32/netapi32.dll$(DLLEXT) $(RM) $@ && $(LN_S) netapi32/netapi32.dll$(DLLEXT) $@ @@ -721,6 +726,7 @@ IMPORT_LIBS = \ libmsvcrt20 \ libmsvcrtd \ libmsvfw32 \ + libmswsock \ libnetapi32 \ libntdll \ libodbc32 \ @@ -1023,6 +1029,11 @@ libmsvfw32.def: msvideo/msvfw32.spec.def libmsvfw32.a: msvideo/msvfw32.spec.def $(DLLTOOL) -k -l $@ -d msvideo/msvfw32.spec.def +libmswsock.def: mswsock/mswsock.spec.def + $(RM) $@ && $(LN_S) mswsock/mswsock.spec.def $@ +libmswsock.a: mswsock/mswsock.spec.def + $(DLLTOOL) -k -l $@ -d mswsock/mswsock.spec.def + libnetapi32.def: netapi32/netapi32.spec.def $(RM) $@ && $(LN_S) netapi32/netapi32.spec.def $@ libnetapi32.a: netapi32/netapi32.spec.def @@ -1304,6 +1315,7 @@ msvcrt/msvcrt.spec.def: $(WINEBUILD) msvcrt20/msvcrt20.spec.def: $(WINEBUILD) msvcrtd/msvcrtd.spec.def: $(WINEBUILD) msvideo/msvfw32.spec.def: $(WINEBUILD) +mswsock/mswsock.spec.def: $(WINEBUILD) netapi32/netapi32.spec.def: $(WINEBUILD) ntdll/ntdll.spec.def: $(WINEBUILD) odbc32/odbc32.spec.def: $(WINEBUILD) @@ -1420,6 +1432,7 @@ msvcrt/msvcrt.dll$(DLLEXT): msvcrt msvcrt20/msvcrt20.dll$(DLLEXT): msvcrt20 msvcrtd/msvcrtd.dll$(DLLEXT): msvcrtd msvideo/msvfw32.dll$(DLLEXT): msvideo +mswsock/mswsock.dll$(DLLEXT): mswsock netapi32/netapi32.dll$(DLLEXT): netapi32 ntdll/ntdll.dll$(DLLEXT): ntdll odbc32/odbc32.dll$(DLLEXT): odbc32 diff --git a/dlls/mswsock/.cvsignore b/dlls/mswsock/.cvsignore new file mode 100644 index 0000000000000000000000000000000000000000..8c08a57ac6f66e3616c9bca54d08ed6542c27776 --- /dev/null +++ b/dlls/mswsock/.cvsignore @@ -0,0 +1,5 @@ +Makefile +mswsock.dll.dbg.c +mswsock.spec.c +mswsock.spec.def +version.res diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in new file mode 100644 index 0000000000000000000000000000000000000000..cea38b2815b283ed33637ca53d0bc2213daf5601 --- /dev/null +++ b/dlls/mswsock/Makefile.in @@ -0,0 +1,18 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mswsock.dll +IMPORTS = ws2_32 iphlpapi kernel32 + +LDDLLFLAGS = @LDDLLFLAGS@ +SYMBOLFILE = $(MODULE).tmp.o + +C_SRCS = \ + mswsock.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +### Dependencies: diff --git a/dlls/mswsock/mswsock.c b/dlls/mswsock/mswsock.c new file mode 100644 index 0000000000000000000000000000000000000000..224272e5f9cb28a10dbcf39afa3ab17c770b7f31 --- /dev/null +++ b/dlls/mswsock/mswsock.c @@ -0,0 +1,85 @@ +/* + * MSWSOCK specific functions + * + * Copyright (C) 2003 André Johansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "config.h" +#include "windef.h" +#include "winbase.h" +#include "winsock2.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mswsock); + +/****************************************************************************** + * This structure is used with the TransmitFile() function. + * + */ + +typedef struct _TRANSMIT_FILE_BUFFERS { + PVOID Head; + DWORD HeadLength; + PVOID Tail; + DWORD TailLength; +} TRANSMIT_FILE_BUFFERS; +typedef TRANSMIT_FILE_BUFFERS* LPTRANSMIT_FILE_BUFFERS; + + +/****************************************************************************** + * TransmitFile (MSWSOCK.@) + * + * This function is used to transmit a file over socket. + * + * TODO + * This function is currently implemented as a stub. + */ + +void WINAPI TransmitFile(SOCKET s, + HANDLE f, + DWORD size, + DWORD numpersend, + LPOVERLAPPED overlapped, + LPTRANSMIT_FILE_BUFFERS trans, + DWORD flags) +{ + FIXME("not implemented\n"); +} + + +/****************************************************************************** + * AcceptEx (MSWSOCK.@) + * + * This function is used to accept a new connection, get the local and remote + * address, and receive the initial block of data sent by the client. + * + * TODO + * This function is currently implemented as a stub. + */ + +void WINAPI AcceptEx(SOCKET listener, + SOCKET acceptor, + PVOID oput, + DWORD recvlen, + DWORD locaddrlen, + DWORD remaddrlen, + LPDWORD bytesrecv, + LPOVERLAPPED overlapped) +{ + FIXME("not implemented\n"); +} diff --git a/dlls/mswsock/mswsock.spec b/dlls/mswsock/mswsock.spec new file mode 100644 index 0000000000000000000000000000000000000000..81fff4360e26fb1898d95d4cb8fd48406a09379d --- /dev/null +++ b/dlls/mswsock/mswsock.spec @@ -0,0 +1,2 @@ +@ stdcall AcceptEx(long long ptr long long long ptr ptr) +@ stdcall TransmitFile(long long long long ptr ptr long) diff --git a/dlls/mswsock/version.rc b/dlls/mswsock/version.rc new file mode 100644 index 0000000000000000000000000000000000000000..a170065d00ea7c094acc3971945c404395a173f4 --- /dev/null +++ b/dlls/mswsock/version.rc @@ -0,0 +1,28 @@ +/* + * Copyright 2003 Francois Gouget (for CodeWeavers) + * Copyright 2003 André Johansen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define WINE_FILEVERSION 4,0,0,0 +#define WINE_FILEVERSION_STR "4.0.0.0" +#define WINE_FILEDESCRIPTION_STR "Wine core dll" +#define WINE_FILENAME_STR "mswsock.dll" + +#define WINE_PRODUCTVERSION 4,0,0,0 +#define WINE_PRODUCTVERSION_STR "4.0" + +#include "wine/wine_common_ver.rc"