From 8f51e0fb9de92b4d62ee0b4a2460578edd63bbc5 Mon Sep 17 00:00:00 2001 From: Samuel Serapion Date: Thu, 3 Dec 2009 19:40:01 +0000 Subject: [PATCH] Fix build and enable building usermode components, since they all build. svn path=/branches/ros-amd64-bringup/; revision=44389 --- reactos/base/applications/sndrec32/audio_resampler_acm.cpp | 1 + reactos/config-amd64.template.rbuild | 2 +- reactos/dll/win32/shell32/shell32.rbuild | 2 +- reactos/dll/win32/ws2_32_new/src/socklife.c | 4 ++-- reactos/dll/win32/ws2_32_new/src/sputil.c | 2 +- reactos/dll/win32/ws2_32_new/ws2_32.rbuild | 2 +- reactos/dll/win32/ws2help/ws2help.rbuild | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/reactos/base/applications/sndrec32/audio_resampler_acm.cpp b/reactos/base/applications/sndrec32/audio_resampler_acm.cpp index fa2617ac177..da1dec0a488 100644 --- a/reactos/base/applications/sndrec32/audio_resampler_acm.cpp +++ b/reactos/base/applications/sndrec32/audio_resampler_acm.cpp @@ -8,6 +8,7 @@ #include "stdafx.h" #include "audio_resampler_acm.hpp" +#include _AUDIO_NAMESPACE_START_ diff --git a/reactos/config-amd64.template.rbuild b/reactos/config-amd64.template.rbuild index e3ab7541de1..942da261250 100644 --- a/reactos/config-amd64.template.rbuild +++ b/reactos/config-amd64.template.rbuild @@ -86,7 +86,7 @@ Whether to compile any usermode parts. This is while kernel mode is under heavy development and usermode part not relevant for bootcd. --> - + diff --git a/reactos/dll/win32/shell32/shell32.rbuild b/reactos/dll/win32/shell32/shell32.rbuild index 5276af049f5..f020da53f1c 100644 --- a/reactos/dll/win32/shell32/shell32.rbuild +++ b/reactos/dll/win32/shell32/shell32.rbuild @@ -1,5 +1,5 @@ - + . diff --git a/reactos/dll/win32/ws2_32_new/src/socklife.c b/reactos/dll/win32/ws2_32_new/src/socklife.c index 5d8dc80cc58..d1cd3a9a349 100644 --- a/reactos/dll/win32/ws2_32_new/src/socklife.c +++ b/reactos/dll/win32/ws2_32_new/src/socklife.c @@ -176,7 +176,7 @@ WPUCloseSocketHandle(IN SOCKET s, SOCKET WSPAPI WPUCreateSocketHandle(IN DWORD dwCatalogEntryId, - IN DWORD dwContext, + IN DWORD_PTR dwContext, OUT LPINT lpErrno) { UNIMPLEMENTED; @@ -277,7 +277,7 @@ WPUModifyIFSHandle(IN DWORD dwCatalogEntryId, INT WSPAPI WPUQuerySocketHandleContext(IN SOCKET s, - OUT LPDWORD lpContext, + OUT PDWORD_PTR lpContext, OUT LPINT lpErrno) { UNIMPLEMENTED; diff --git a/reactos/dll/win32/ws2_32_new/src/sputil.c b/reactos/dll/win32/ws2_32_new/src/sputil.c index e82922a7e9a..80277c33fe3 100644 --- a/reactos/dll/win32/ws2_32_new/src/sputil.c +++ b/reactos/dll/win32/ws2_32_new/src/sputil.c @@ -173,7 +173,7 @@ INT WSPAPI WPUQueueApc(IN LPWSATHREADID lpThreadId, IN LPWSAUSERAPC lpfnUserApc, - IN DWORD dwContext, + IN DWORD_PTR dwContext, OUT LPINT lpErrno) { UNIMPLEMENTED; diff --git a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild index 2fee79c1a9e..5e768ff99e6 100644 --- a/reactos/dll/win32/ws2_32_new/ws2_32.rbuild +++ b/reactos/dll/win32/ws2_32_new/ws2_32.rbuild @@ -1,4 +1,4 @@ - + inc include/reactos/winsock diff --git a/reactos/dll/win32/ws2help/ws2help.rbuild b/reactos/dll/win32/ws2help/ws2help.rbuild index 045c924e7ff..b802793480a 100644 --- a/reactos/dll/win32/ws2help/ws2help.rbuild +++ b/reactos/dll/win32/ws2help/ws2help.rbuild @@ -1,4 +1,4 @@ - + . include/reactos/winsock