Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix ws2_32_new's build problems

Browse source 
- ws2_32_new is now included in build (output file is ws2_32_new.dll for any curious testers :P)

svn path=/trunk/; revision=42776
This commit is contained in:
Cameron Gutman 2009-08-18 21:40:20 +00:00
parent ca5c8b53bf
commit ad72be7f7f
7 changed files with 7 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/win32.rbuild
View file

@ -619,6 +619,9 @@
<directory name="ws2_32">
<xi:include href="ws2_32/ws2_32.rbuild" />
</directory>
<directory name="ws2_32_new">
<xi:include href="ws2_32_new/ws2_32.rbuild" />
</directory>
<directory name="ws2help">
<xi:include href="ws2help/ws2help.rbuild" />
</directory>

4
reactos/dll/win32/ws2_32_new/inc/ws2_32.h
View file

@ -25,9 +25,7 @@
#include <ws2spi.h>
#include <ndk/umtypes.h>
#include <ndk/rtlfuncs.h>
/* Shared NSP Headers */
#include <nsp_dns.h>
#include <svcguid.h>
/* Winsock Helper Header */
#include <ws2help.h>

1
reactos/dll/win32/ws2_32_new/src/getxbyxx.c
View file

@ -8,6 +8,7 @@
/* INCLUDES ******************************************************************/
#include "ws2_32.h"
#include <nsp_dns.h>
//#define NDEBUG
#include <debug.h>

1
reactos/dll/win32/ws2_32_new/ws2_32.rbuild
View file

@ -1,6 +1,7 @@
<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32_new.dll">
<importlibrary definition="ws2_32.spec" />
<include base="ws2_32_new">inc</include>
<include base="ReactOS">include/reactos/winsock</include>
<define name="LE" />
<library>wine</library>
<library>ntdll</library>

163
reactos/dll/win32/ws2help/ws2help.h
View file

@ -1,163 +0,0 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS WinSock 2 Helper DLL
* FILE: include/libs/winsock/ws2help.h
* PURPOSE: WinSock 2 Helper DLL header
*/
#ifndef __WS2HELP_H
#define __WS2HELP_H
/* Types */
typedef struct _WSH_HANDLE
{
LONG RefCount;
HANDLE Handle;
} WSH_HANDLE, *PWAH_HANDLE;
typedef struct _WSH_HASH_TABLE
{
DWORD Size;
PWAH_HANDLE Handles[1];
} WSH_HASH_TABLE, *PWAH_HASH_TABLE;
typedef struct _WSH_SEARCH_TABLE
{
volatile PWAH_HASH_TABLE HashTable;
volatile PLONG CurrentCount;
LONG Count1;
LONG Count2;
LONG SpinCount;
BOOL Expanding;
CRITICAL_SECTION Lock;
} WSH_SEARCH_TABLE, *PWAH_SEARCH_TABLE;
typedef struct _WSH_HANDLE_TABLE
{
DWORD Mask;
WSH_SEARCH_TABLE SearchTables[1];
} WSH_HANDLE_TABLE, *PWAH_HANDLE_TABLE;
//typedef struct _WSH_HANDLE_TABLE *PWAH_HANDLE_TABLE;
typedef BOOL
(WINAPI *PWAH_HANDLE_ENUMERATE_PROC)(
IN PVOID Context,
IN PWAH_HANDLE Handle
);
PWAH_HANDLE
WINAPI
WahReferenceContextByHandle(
IN PWAH_HANDLE_TABLE Table,
IN HANDLE Handle
);
DWORD
WINAPI
WahRemoveHandleContext(
IN PWAH_HANDLE_TABLE Table,
IN PWAH_HANDLE Handle
);
DWORD
WINAPI
WahCloseSocketHandle(
IN HANDLE HelperHandle,
IN SOCKET Socket
);
DWORD
WINAPI
WahOpenCurrentThread(
IN HANDLE HelperHandle,
OUT LPWSATHREADID ThreadId
);
DWORD
WINAPI
WahCloseApcHelper(
IN HANDLE HelperHandle
);
DWORD
WINAPI
WahCloseThread(
IN HANDLE HelperHandle,
IN LPWSATHREADID ThreadId
);
DWORD
WINAPI
WahCloseHandleHelper(
IN HANDLE HelperHandle
);
DWORD
WINAPI
WahCloseNotificationHandleHelper(
IN HANDLE HelperHandle
);
DWORD
WINAPI
WahOpenNotificationHandleHelper(
OUT PHANDLE HelperHandle
);
DWORD
WINAPI
WahCreateNotificationHandle(
IN HANDLE HelperHandle,
OUT PHANDLE NotificationHelperHandle
);
INT
WINAPI
WahWaitForNotification(
IN HANDLE NotificationHelperHandle,
IN HANDLE lpNotificationHandle,
IN LPWSAOVERLAPPED lpOverlapped,
IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
);
INT
WINAPI
WahNotifyAllProcesses(
IN HANDLE NotificationHelperHandle
);
BOOL
WINAPI
WahEnumerateHandleContexts(
IN PWAH_HANDLE_TABLE Table,
IN PWAH_HANDLE_ENUMERATE_PROC Callback,
IN PVOID Context
);
DWORD
WINAPI
WahCreateHandleContextTable(
OUT PWAH_HANDLE_TABLE *Table
);
DWORD
WINAPI
WahDestroyHandleContextTable(
IN PWAH_HANDLE_TABLE Table
);
PWAH_HANDLE
WINAPI
WahInsertHandleContext(
IN PWAH_HANDLE_TABLE Table,
IN PWAH_HANDLE Handle
);
DWORD
WINAPI
WahOpenApcHelper(
OUT PHANDLE ApcHelperHandle
);
#endif

1
reactos/dll/win32/ws2help/ws2help.rbuild
View file

@ -1,6 +1,7 @@
<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll">
<importlibrary definition="ws2help.spec" />
<include base="ws2help">.</include>
<include base="ReactOS">include/reactos/winsock</include>
<library>advapi32</library>
<library>ntdll</library>
<library>kernel32</library>

0
reactos/include/reactos/winsock/.gitignore vendored Normal file
View file