Author: fireball
Date: Mon Aug 10 11:10:53 2009
New Revision: 42582
URL: http://svn.reactos.org/svn/reactos?rev=42582&view=rev
Log:
- Add missing constifying to MonitorFromRect API
- Don't compile d3d8thk.dll since it relies on a nonstubbed GDI API now.
- Remove d3d8thk.dll and ftfd.dll from bootcd, and add freetype.dll and
winent.drv.
- Update some merge history.
- Arwinss branch now can be compiled with a usual "makex bootcd".
Modified:
branches/arwinss/reactos/boot/bootdata/packages/reactos.dff
branches/arwinss/reactos/dll/directx/directx.rbuild
branches/arwinss/reactos/dll/win32/user32/misc.c
branches/arwinss/reactos/include/psdk/winuser.h
branches/arwinss/reactos/tools/rsym/log2lines.c (props changed)
branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed)
branches/arwinss/reactos/tools/rsym/rsym.c (props changed)
branches/arwinss/reactos/tools/rsym/rsym.h (props changed)
branches/arwinss/reactos/tools/rsym/rsym.mak (props changed)
branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed)
Modified: branches/arwinss/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/bootdata/packages/reactos.dff?rev=42582&r1=42581&r2=42582&view=diff
==============================================================================
--- branches/arwinss/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1]
(original)
+++ branches/arwinss/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1]
Mon Aug 10 11:10:53 2009
@@ -155,7 +155,7 @@
dll\directx\dsound\dsound.dll 1
dll\directx\dxdiagn\dxdiagn.dll 1
dll\directx\wine\ddraw\ddraw.dll 1
-dll\directx\d3d8thk\d3d8thk.dll 1
+;dll\directx\d3d8thk\d3d8thk.dll 1
dll\directx\devenum\devenum.dll 1
dll\directx\ksproxy\ksproxy.ax 1
dll\directx\ksuser\ksuser.dll 1
@@ -248,6 +248,7 @@
dll\ntdll\ntdll.dll 1
+dll\3rdparty\freetype\freetype.dll 1
dll\win32\acledit\acledit.dll 1
dll\win32\aclui\aclui.dll 1
dll\win32\activeds\activeds.dll 1
@@ -437,6 +438,7 @@
dll\win32\vdmdbg\vdmdbg.dll 1
dll\win32\version\version.dll 1
dll\win32\winemp3.acm\winemp3.acm 1
+dll\win32\winent.drv\winent.drv 1
dll\win32\winfax\winfax.dll 1
dll\win32\winhttp\winhttp.dll 1
dll\win32\wininet\wininet.dll 1
@@ -510,7 +512,7 @@
drivers\video\miniport\vga\vgamp.sys 2
drivers\video\miniport\vbe\vbemp.sys 2
drivers\video\videoprt\videoprt.sys 2
-drivers\video\font\ftfd\ftfd.dll 1
+;drivers\video\font\ftfd\ftfd.dll 1
drivers\wdm\audio\filters\kmixer\kmixer.sys 2
drivers\wdm\audio\sysaudio\sysaudio.sys 2
Modified: branches/arwinss/reactos/dll/directx/directx.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/directx/directx.rbuild?rev=42582&r1=42581&r2=42582&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/directx/directx.rbuild [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/directx/directx.rbuild [iso-8859-1] Mon Aug 10
11:10:53 2009
@@ -4,9 +4,9 @@
<directory name="amstream">
<xi:include href="amstream/amstream.rbuild" />
</directory>
- <directory name="d3d8thk">
+ <!--directory name="d3d8thk">
<xi:include href="d3d8thk/d3d8thk.rbuild" />
- </directory>
+ </directory-->
<directory name="devenum">
<xi:include href="devenum/devenum.rbuild" />
</directory>
Modified: branches/arwinss/reactos/dll/win32/user32/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32/misc.c?rev=42582&r1=42581&r2=42582&view=diff
==============================================================================
--- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Mon Aug 10
11:10:53 2009
@@ -393,7 +393,7 @@
/***********************************************************************
* MonitorFromRect (USER32.@)
*/
-HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags )
+HMONITOR WINAPI MonitorFromRect( LPCRECT rect, DWORD flags )
{
struct monitor_enum_info info;
Modified: branches/arwinss/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/winuser.h?rev=42582&r1=42581&r2=42582&view=diff
==============================================================================
--- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Mon Aug 10
11:10:53 2009
@@ -4269,7 +4269,7 @@
BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR);
BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR);
HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);
-HMONITOR WINAPI MonitorFromRect(LPRECT,DWORD);
+HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD);
HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);
void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak
------------------------------------------------------------------------------
(empty)
Propchange: branches/arwinss/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 10 11:10:53 2009
@@ -1,1 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
+/trunk/reactos/tools/rsym/rsym.c:42202,42376,42419
Propchange: branches/arwinss/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 10 11:10:53 2009
@@ -1,1 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
+/trunk/reactos/tools/rsym/rsym.h:42202,42376,42419
Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 10 11:10:53 2009
@@ -1,1 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
+/trunk/reactos/tools/rsym/rsym.mak:42202,42376,42419
Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 10 11:10:53 2009
@@ -1,1 +1,2 @@
/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
+/trunk/reactos/tools/rsym/rsym_common.c:42202,42376,42419
