Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/directory.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/displays/directory.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/directory.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml
Added: branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml
Modified: branches/xmlbuildsystem/reactos/lib/directory.xml
Added: branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml
Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml
Modified: branches/xmlbuildsystem/reactos/subsys/directory.xml
Modified: branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c
Added: branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
--- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -19,3 +19,6 @@
<directory name="storage">
<xi:include href="storage/directory.xml" />
</directory>
+<directory name="video">
+ <xi:include href="video/directory.xml" />
+</directory>
--- branches/xmlbuildsystem/reactos/drivers/video/directory.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/directory.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,9 @@
+<directory name="displays">
+ <xi:include href="displays/directory.xml" />
+</directory>
+<directory name="miniport">
+ <xi:include href="miniport/directory.xml" />
+</directory>
+<directory name="videoprt">
+ <xi:include href="videoprt/videoprt.xml" />
+</directory>
--- branches/xmlbuildsystem/reactos/drivers/video/displays/directory.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/displays/directory.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,6 @@
+<directory name="framebuf">
+ <xi:include href="framebuf/framebuf.xml" />
+</directory>
+<directory name="vga">
+ <xi:include href="vga/vgaddi.xml" />
+</directory>
--- branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/framebuf.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,14 @@
+<module name="framebuf" type="kernelmodedriver">
+ <importlibrary definition="framebuf.def" />
+ <include base="framebuf">.</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <library>win32k</library>
+ <file>enable.c</file>
+ <file>palette.c</file>
+ <file>pointer.c</file>
+ <file>screen.c</file>
+ <file>surface.c</file>
+ <file>framebuf.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/displays/vga/vgaddi.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,25 @@
+<module name="vgaddi" type="kernelmodedriver">
+ <importlibrary definition="vgaddi.def" />
+ <include base="vgaddi">.</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <library>win32k</library>
+ <directory name="main">
+ <file>enable.c</file>
+ </directory>
+ <directory name="objects">
+ <file>screen.c</file>
+ <file>pointer.c</file>
+ <file>lineto.c</file>
+ <file>paint.c</file>
+ <file>bitblt.c</file>
+ <file>transblt.c</file>
+ <file>offscreen.c</file>
+ <file>copybits.c</file>
+ </directory>
+ <directory name="vgavideo">
+ <file>vgavideo.c</file>
+ </directory>
+ <file>vgaddi.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/drivers/video/miniport/directory.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/miniport/directory.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,9 @@
+<directory name="vbe">
+ <xi:include href="vbe/vbemp.xml" />
+</directory>
+<directory name="vga">
+ <xi:include href="vga/vgamp.xml" />
+</directory>
+<directory name="xboxvmp">
+ <xi:include href="xboxvmp/xboxvmp.xml" />
+</directory>
--- branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/vbemp.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,10 @@
+<module name="vbemp" type="kernelmodedriver">
+ <include base="vbemp">.</include>
+ <include base="ntoskrnl">include</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <library>videoprt</library>
+ <file>vbemp.c</file>
+ <file>vbemp.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/vgamp.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,11 @@
+<module name="vgamp" type="kernelmodedriver">
+ <include base="vgamp">.</include>
+ <include base="ntoskrnl">include</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <library>videoprt</library>
+ <file>initvga.c</file>
+ <file>vgamp.c</file>
+ <file>vgamp.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/xboxvmp.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,10 @@
+<module name="xboxvmp" type="kernelmodedriver">
+ <include base="xboxvmp">.</include>
+ <include base="ntoskrnl">include</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <library>videoprt</library>
+ <file>xboxvmp.c</file>
+ <file>xboxvmp.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/drivers/video/videoprt/videoprt.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,19 @@
+<module name="videoprt" type="kernelmodedriver">
+ <importlibrary definition="videoprt.def" />
+ <include base="videoprt">.</include>
+ <include base="ntoskrnl">include</include>
+ <define name="__USE_W32API" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <file>dispatch.c</file>
+ <file>dma.c</file>
+ <file>event.c</file>
+ <file>int10.c</file>
+ <file>interrupt.c</file>
+ <file>resource.c</file>
+ <file>services.c</file>
+ <file>spinlock.c</file>
+ <file>timer.c</file>
+ <file>videoprt.c</file>
+ <file>videoprt.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -7,6 +7,9 @@
<directory name="dnsapi">
<xi:include href="dnsapi/dnsapi.xml" />
</directory>
+<directory name="freetype">
+ <xi:include href="freetype/freetype.xml" />
+</directory>
<directory name="gdi32">
<xi:include href="gdi32/gdi32.xml" />
</directory>
--- branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/lib/freetype/freetype.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,88 @@
+<module name="freetype" type="kernelmodedll">
+ <importlibrary definition="freetype.def" />
+ <include base="freetype">include</include>
+ <define name="_DISABLE_TIDENTS" />
+ <define name="_SEH_NO_NATIVE_NLG" />
+ <define name="__NTDRIVER__" />
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <directory name="i386">
+ <file>setjmplongjmp.s</file>
+ </directory>
+ <directory name="src">
+ <directory name="base">
+ <file>ftsystem.c</file>
+ <file>ftdebug.c</file>
+ <file>ftinit.c</file>
+ <file>ftbase.c</file>
+ <file>ftbbox.c</file>
+ <file>ftbdf.c</file>
+ <file>ftglyph.c</file>
+ <file>ftmm.c</file>
+ <file>ftpfr.c</file>
+ <file>ftstroke.c</file>
+ <file>fttype1.c</file>
+ <file>ftwinfnt.c</file>
+ <file>ftxf86.c</file>
+ </directory>
+ <directory name="autohint">
+ <file>autohint.c</file>
+ </directory>
+ <directory name="bdf">
+ <file>bdf.c</file>
+ </directory>
+ <directory name="cache">
+ <file>ftcache.c</file>
+ </directory>
+ <directory name="cff">
+ <file>cff.c</file>
+ </directory>
+ <directory name="cid">
+ <file>type1cid.c</file>
+ </directory>
+ <directory name="gzip">
+ <file>ftgzip.c</file>
+ </directory>
+ <directory name="lzw">
+ <file>ftlzw.c</file>
+ </directory>
+ <directory name="pcf">
+ <file>pcf.c</file>
+ </directory>
+ <directory name="pfr">
+ <file>pfr.c</file>
+ </directory>
+ <directory name="psaux">
+ <file>psaux.c</file>
+ </directory>
+ <directory name="pshinter">
+ <file>pshinter.c</file>
+ </directory>
+ <directory name="psnames">
+ <file>psmodule.c</file>
+ </directory>
+ <directory name="raster">
+ <file>raster.c</file>
+ </directory>
+ <directory name="sfnt">
+ <file>sfnt.c</file>
+ </directory>
+ <directory name="smooth">
+ <file>smooth.c</file>
+ </directory>
+ <directory name="truetype">
+ <file>truetype.c</file>
+ </directory>
+ <directory name="type1">
+ <file>type1.c</file>
+ </directory>
+ <directory name="type42">
+ <file>type42.c</file>
+ </directory>
+ <directory name="winfonts">
+ <file>winfnt.c</file>
+ </directory>
+ </directory>
+ <file>rosglue.c</file>
+ <file>freetype.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -1,6 +1,6 @@
<module name="iphlpapi" type="win32dll">
<dependency>winebuild</dependency>
- <importlibrary definition="iphlpapi.def" />
+ <importlibrary definition="iphlpapi.spec.def" />
<include base="iphlpapi">include</include>
<include base="ReactOS">include/wine</include>
<define name="YDEBUG" />
@@ -9,7 +9,6 @@
<define name="__REACTOS__" />
<define name="__USE_W32API" />
<library>wine</library>
-<!-- <library>wine_uuid</library> -->
<library>rtl</library>
<library>ntdll</library>
<library>kernel32</library>
--- branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/subsys/directory.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -1,3 +1,6 @@
<directory name="system">
<xi:include href="system/directory.xml" />
</directory>
+<directory name="win32k">
+ <xi:include href="win32k/win32k.xml" />
+</directory>
--- branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c 2005-01-19 19:49:57 UTC (rev 13135)
@@ -199,12 +199,8 @@
}
-/*
- * This definition doesn't work
- */
-// BOOL STDCALL DllMain(VOID)
NTSTATUS STDCALL
-DllMain (
+DriverEntry (
IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegistryPath)
{
--- branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/subsys/win32k/win32k.xml 2005-01-19 19:49:57 UTC (rev 13135)
@@ -0,0 +1,132 @@
+<module name="win32k" type="kernelmodedriver">
+ <importlibrary definition="win32k.def" />
+ <include base="win32k">.</include>
+ <include base="win32k">include</include>
+ <include base="ntoskrnl">include</include>
+ <include base="freetype">include</include>
+ <define name="UNICODE" />
+ <define name="__USE_W32API" />
+ <define name="_WIN32_WINNT">0x0501</define>
+ <define name="WINVER">0x600</define>
+ <define name="_WIN32K_" />
+ <library>rosrtl</library>
+ <library>ntoskrnl</library>
+ <library>hal</library>
+ <library>pseh</library>
+ <library>freetype</library>
+ <directory name="dib">
+ <file>dib1bpp.c</file>
+ <file>dib4bpp.c</file>
+ <file>dib8bpp.c</file>
+ <file>dib16bpp.c</file>
+ <file>dib24bpp.c</file>
+ <file>dib32bpp.c</file>
+ <file>dib.c</file>
+ </directory>
+ <directory name="eng">
+ <file>bitblt.c</file>
+ <file>brush.c</file>
+ <file>clip.c</file>
+ <file>copybits.c</file>
+ <file>debug.c</file>
+ <file>device.c</file>
+ <file>error.c</file>
+ <file>event.c</file>
+ <file>float.c</file>
+ <file>gradient.c</file>
+ <file>lineto.c</file>
+ <file>mem.c</file>
+ <file>misc.c</file>
+ <file>mouse.c</file>
+ <file>paint.c</file>
+ <file>palette.c</file>
+ <file>perfcnt.c</file>
+ <file>semaphor.c</file>
+ <file>sort.c</file>
+ <file>surface.c</file>
+ <file>transblt.c</file>
+ <file>xlate.c</file>
+ </directory>
+ <directory name="ldr">
+ <file>loader.c</file>
+ </directory>
+ <directory name="main">
+ <file>dllmain.c</file>
+ <file>svctabm.c</file>
+ </directory>
+ <directory name="misc">
+ <file>driver.c</file>
+ <file>error.c</file>
+ <file>math.c</file>
+ <file>object.c</file>
+ </directory>
+ <directory name="ntddraw">
+ <file>ddraw.c</file>
+ <file>stubs.c</file>
+ </directory>
+ <directory name="ntuser">
+ <file>accelerator.c</file>
+ <file>callback.c</file>
+ <file>caret.c</file>
+ <file>class.c</file>
+ <file>clipboard.c</file>
+ <file>csr.c</file>
+ <file>cursoricon.c</file>
+ <file>desktop.c</file>
+ <file>focus.c</file>
+ <file>guicheck.c</file>
+ <file>hook.c</file>
+ <file>hotkey.c</file>
+ <file>input.c</file>
+ <file>keyboard.c</file>
+ <file>menu.c</file>
+ <file>message.c</file>
+ <file>metric.c</file>
+ <file>misc.c</file>
+ <file>monitor.c</file>
+ <file>msgqueue.c</file>
+ <file>painting.c</file>
+ <file>prop.c</file>
+ <file>scrollbar.c</file>
+ <file>stubs.c</file>
+ <file>timer.c</file>
+ <file>useratom.c</file>
+ <file>vis.c</file>
+ <file>windc.c</file>
+ <file>window.c</file>
+ <file>winpos.c</file>
+ <file>winsta.c</file>
+ </directory>
+ <directory name="objects">
+ <file>bezier.c</file>
+ <file>bitmaps.c</file>
+ <file>brush.c</file>
+ <file>cliprgn.c</file>
+ <file>color.c</file>
+ <file>coord.c</file>
+ <file>dc.c</file>
+ <file>dib.c</file>
+ <file>fillshap.c</file>
+ <file>font.c</file>
+ <file>gdiobj.c</file>
+ <file>icm.c</file>
+ <file>line.c</file>
+ <file>metafile.c</file>
+ <file>paint.c</file>
+ <file>palette.c</file>
+ <file>path.c</file>
+ <file>pen.c</file>
+ <file>polyfill.c</file>
+ <file>print.c</file>
+ <file>rect.c</file>
+ <file>region.c</file>
+ <file>stockobj.c</file>
+ <file>text.c</file>
+ <file>wingl.c</file>
+ </directory>
+ <directory name="stubs">
+ <file>stubs.c</file>
+ <file>xpstubs.c</file>
+ </directory>
+ <file>win32k.rc</file>
+</module>
--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-01-19 19:14:56 UTC (rev 13134)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-01-19 19:49:57 UTC (rev 13135)
@@ -628,11 +628,11 @@
{
string basename = GetBasename ( sourceFilename );
fprintf ( fMakefile,
- "%s.def: %s\n",
+ "%s.spec.def: %s\n",
basename.c_str (),
sourceFilename.c_str () );
fprintf ( fMakefile,
- "\t%s --def=%s -o %s.def\n",
+ "\t%s --def=%s -o %s.spec.def\n",
"${winebuild}",
sourceFilename.c_str (),
basename.c_str () );
@@ -1126,7 +1126,7 @@
MingwModuleHandler::GetSpecObjectDependencies ( const string& filename ) const
{
string basename = GetBasename ( filename );
- return basename + ".def" + " " + basename + ".stubs.c";
+ return basename + ".spec.def" + " " + basename + ".stubs.c";
}
string