[ros-diffs] [sserapion] 44388: - Allow warnings in gdi32 - Fix ntdll build - Fix mysteriously broken (in last sync) obdc32
sserapion at svn.reactos.org
sserapion at svn.reactos.org
Thu Dec 3 20:03:26 CET 2009
Author: sserapion
Date: Thu Dec 3 20:03:25 2009
New Revision: 44388
URL: http://svn.reactos.org/svn/reactos?rev=44388&view=rev
Log:
- Allow warnings in gdi32
- Fix ntdll build
- Fix mysteriously broken (in last sync) obdc32
Modified:
branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def
branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c
branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c
branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild
branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild
Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] Thu Dec 3 20:03:25 2009
@@ -1015,7 +1015,7 @@
RtlQueryHeapInformation
RtlQueryInformationAcl
RtlQueryInformationActivationContext
-RtlQueryInformationActiveActivationContext
+;RtlQueryInformationActiveActivationContext
;RtlQueryInterfaceMemoryStream
;RtlQueryModuleInformation
;RtlQueryProcessBackTraceInformation
Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/actctx.c [iso-8859-1] Thu Dec 3 20:03:25 2009
@@ -15,8 +15,8 @@
LDR_RESOURCE_INFO info;
IMAGE_RESOURCE_DATA_ENTRY *entry;
- info.Type = (ULONG)RT_MANIFEST;
- info.Name = (ULONG)ISOLATIONAWARE_MANIFEST_RESOURCE_ID;
+ info.Type = (ULONG_PTR)RT_MANIFEST;
+ info.Name = (ULONG_PTR)ISOLATIONAWARE_MANIFEST_RESOURCE_ID;
info.Language = 0;
if (!(status = LdrFindResource_U( module->DllBase, &info, 3, &entry )))
{
Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Thu Dec 3 20:03:25 2009
@@ -3477,7 +3477,7 @@
}
/* FIXME: Cookie is based on part of the thread id */
- *Cookie = (ULONG)NtCurrentTeb()->RealClientId.UniqueThread;
+ *Cookie = (ULONG_PTR)NtCurrentTeb()->RealClientId.UniqueThread;
return Status;
}
@@ -3489,7 +3489,7 @@
if (Flags != 0x01)
return STATUS_INVALID_PARAMETER_1;
- if (Cookie != (ULONG)NtCurrentTeb()->RealClientId.UniqueThread)
+ if (Cookie != (ULONG_PTR)NtCurrentTeb()->RealClientId.UniqueThread)
return STATUS_INVALID_PARAMETER_2;
RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock);
Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Thu Dec 3 20:03:25 2009
@@ -1,4 +1,4 @@
-<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll">
+<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll" allowwarnings=true>
<importlibrary definition="gdi32.spec" />
<include base="gdi32">include</include>
<define name="LANGPACK" />
Modified: branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild?rev=44388&r1=44387&r2=44388&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/odbc32/odbc32.rbuild [iso-8859-1] Thu Dec 3 20:03:25 2009
@@ -7,6 +7,7 @@
<include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" />
<library>wine</library>
+ <library>advapi32</library>
<file>proxyodbc.c</file>
</module>
</group>
More information about the Ros-diffs
mailing list