Author: sserapion
Date: Thu Dec 3 20:40:01 2009
New Revision: 44389
URL: http://svn.reactos.org/svn/reactos?rev=44389&view=rev
Log:
Fix build and enable building usermode components, since they all build.
Modified:
branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp
branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild
branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild
branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c
branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c
branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild
Modified:
branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp?rev=44389&r1=44388&r2=44389&view=diff
==============================================================================
---
branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/base/applications/sndrec32/audio_resampler_acm.cpp
[iso-8859-1] Thu Dec 3 20:40:01 2009
@@ -8,6 +8,7 @@
#include "stdafx.h"
#include "audio_resampler_acm.hpp"
+#include <stdio.h>
_AUDIO_NAMESPACE_START_
Modified: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild?rev=44389&r1=44388&r2=44389&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild
[iso-8859-1] Thu Dec 3 20:40:01 2009
@@ -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.
-->
-<property name="USERMODE" value="0" />
+<property name="USERMODE" value="1" />
</group>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild?rev=44389&r1=44388&r2=44389&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/shell32.rbuild
[iso-8859-1] Thu Dec 3 20:40:01 2009
@@ -1,5 +1,5 @@
<group>
-<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}"
installbase="system32" installname="shell32.dll" crt="msvcrt">
+<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}"
installbase="system32" installname="shell32.dll" crt="msvcrt"
allowwarnings="true">
<autoregister infsection="OleControlDlls" type="Both" />
<importlibrary definition="shell32.spec" />
<include base="shell32">.</include>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c?rev=44389&r1=44388&r2=44389&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/socklife.c
[iso-8859-1] Thu Dec 3 20:40:01 2009
@@ -176,7 +176,7 @@
SOCKET
WSPAPI
WPUCreateSocketHandle(IN DWORD dwCatalogEntryId,
- IN DWORD dwContext,
+ IN DWORD_PTR dwContext,
OUT LPINT lpErrno)
{
UNIMPLEMENTED;
@@ -277,7 +277,7 @@
INT
WSPAPI
WPUQuerySocketHandleContext(IN SOCKET s,
- OUT LPDWORD lpContext,
+ OUT PDWORD_PTR lpContext,
OUT LPINT lpErrno)
{
UNIMPLEMENTED;
Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c?rev=44389&r1=44388&r2=44389&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/src/sputil.c
[iso-8859-1] Thu Dec 3 20:40:01 2009
@@ -173,7 +173,7 @@
WSPAPI
WPUQueueApc(IN LPWSATHREADID lpThreadId,
IN LPWSAUSERAPC lpfnUserApc,
- IN DWORD dwContext,
+ IN DWORD_PTR dwContext,
OUT LPINT lpErrno)
{
UNIMPLEMENTED;
Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild?rev=44389&r1=44388&r2=44389&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32_new/ws2_32.rbuild
[iso-8859-1] Thu Dec 3 20:40:01 2009
@@ -1,4 +1,4 @@
-<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}"
installbase="system32" installname="ws2_32_new.dll">
+<module name="ws2_32_new" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}"
installbase="system32" installname="ws2_32_new.dll" allowwarnings="true">
<importlibrary definition="ws2_32.spec" />
<include base="ws2_32_new">inc</include>
<include base="ReactOS">include/reactos/winsock</include>
Modified: branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild?rev=44389&r1=44388&r2=44389&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/ws2help/ws2help.rbuild
[iso-8859-1] Thu Dec 3 20:40:01 2009
@@ -1,4 +1,4 @@
-<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}"
installbase="system32" installname="ws2help.dll">
+<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}"
installbase="system32" installname="ws2help.dll" allowwarnings="true">
<importlibrary definition="ws2help.spec" />
<include base="ws2help">.</include>
<include base="ReactOS">include/reactos/winsock</include>
