From ad72be7f7fad2a5b619a9e50cd8851964de43563 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 18 Aug 2009 21:40:20 +0000
Subject: [PATCH]  - Fix ws2_32_new's build problems  - 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
---
 reactos/dll/win32/win32.rbuild              |   3 +
 reactos/dll/win32/ws2_32_new/inc/ws2_32.h   |   4 +-
 reactos/dll/win32/ws2_32_new/src/getxbyxx.c |   1 +
 reactos/dll/win32/ws2_32_new/ws2_32.rbuild  |   1 +
 reactos/dll/win32/ws2help/ws2help.h         | 163 --------------------
 reactos/dll/win32/ws2help/ws2help.rbuild    |   1 +
 reactos/include/reactos/winsock/.gitignore  |   0
 7 files changed, 7 insertions(+), 166 deletions(-)
 delete mode 100644 reactos/dll/win32/ws2help/ws2help.h
 create mode 100644 reactos/include/reactos/winsock/.gitignore

diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 44e313c0b62..c3261d565cf 100644
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -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>
diff --git a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
index 4dd0944dc99..62fc54019bf 100644
--- a/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
+++ b/reactos/dll/win32/ws2_32_new/inc/ws2_32.h
@@ -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>
diff --git a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c
index dd989e653d6..1c9da671f54 100644
--- a/reactos/dll/win32/ws2_32_new/src/getxbyxx.c
+++ b/reactos/dll/win32/ws2_32_new/src/getxbyxx.c
@@ -8,6 +8,7 @@
 
 /* INCLUDES ******************************************************************/
 #include "ws2_32.h"
+#include <nsp_dns.h>
 
 //#define NDEBUG
 #include <debug.h>
diff --git a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
index 644114de826..88bce90550f 100644
--- a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
+++ b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
@@ -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>
diff --git a/reactos/dll/win32/ws2help/ws2help.h b/reactos/dll/win32/ws2help/ws2help.h
deleted file mode 100644
index c24eaa60851..00000000000
--- a/reactos/dll/win32/ws2help/ws2help.h
+++ /dev/null
@@ -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
diff --git a/reactos/dll/win32/ws2help/ws2help.rbuild b/reactos/dll/win32/ws2help/ws2help.rbuild
index 7468db923a1..52794c2398b 100644
--- a/reactos/dll/win32/ws2help/ws2help.rbuild
+++ b/reactos/dll/win32/ws2help/ws2help.rbuild
@@ -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>
diff --git a/reactos/include/reactos/winsock/.gitignore b/reactos/include/reactos/winsock/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d