Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

[fireball] 32547: - Implement MiShutdownMemoryManager (stops MPW thread and writes all dirty pages to disk). - Move MiShutdownMemoryManager invocation to where it should really happen (before filesystems shutdown). - As a result, MPW doesn't have a chance to flush pages when filesystems are already down. However, 1st assertion as mentioned in bug 2872 still happens. 2nd one is gone. See issue #2872 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 3 19:03:04 2008 New Revision: 32547 URL: http://svn.reactos.org/svn/reactos?rev=3D32547&view=3Drev Log: - Implement MiShutdownMemoryManager (stops MPW thread and writes all dirty = pages to disk). - Move MiShutdownMemoryManager invocation to where it should really happen = (before filesystems shutdown). - As a result, MPW doesn't have a chance to flush pages when filesystems ar= e already down. However, 1st assertion as mentioned in bug 2872 still happe= ns. 2nd one is gone. See issue #2872 for more details. Modified: trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/mpw.c Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.= c?rev=3D32547&r1=3D32546&r2=3D32547&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Mon Mar 3 19:03:04 2008 @@ -167,12 +167,11 @@ } = PspShutdownProcessManager(); - = + CmShutdownSystem(); + MiShutdownMemoryManager(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); - - MiShutdownMemoryManager(); = if (Action =3D=3D ShutdownNoReboot) { Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?= rev=3D32547&r1=3D32546&r2=3D32547&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Mon Mar 3 19:03:04 2008 @@ -57,6 +57,9 @@ PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; extern KMUTANT MmSystemLoadLock; +extern HANDLE MpwThreadHandle; +extern BOOLEAN MpwThreadShouldTerminate; +extern KEVENT MpwThreadEvent; BOOLEAN MiDbgEnableMdDump =3D #ifdef _ARM_ TRUE; @@ -70,7 +73,33 @@ NTAPI MiShutdownMemoryManager(VOID) { - + ULONG PagesWritten; + PETHREAD Thread; + + /* Ask MPW thread to shutdown */ + MpwThreadShouldTerminate =3D TRUE; + KeSetEvent(&MpwThreadEvent, IO_NO_INCREMENT, FALSE); + + /* Wait for it */ + ObReferenceObjectByHandle(MpwThreadHandle, + THREAD_ALL_ACCESS, + PsThreadType, + KernelMode, + (PVOID*)&Thread, + NULL); + + KeWaitForSingleObject(Thread, + Executive, + KernelMode, + FALSE, + NULL); + + ObDereferenceObject(Thread); + + /* Check if there are any dirty pages, and flush them. + There will be no other chance to do this later, since filesystems + are going to be shut down. */ + CcRosFlushDirtyPages(128, &PagesWritten); } = VOID @@ -401,13 +430,10 @@ MmPagedPoolBase =3D (PVOID)PAGE_ROUND_UP((ULONG_PTR)MiNonPagedPoolStar= t + MiNonPagedPoolLength); MmPagedPoolSize =3D MM_PAGED_POOL_SIZE; - = /* Dump kernel memory layout */ MiDbgKernelLayout(); - = /* Initialize the page list */ MmInitializePageList(); - = /* Unmap low memory */ MmDeletePageTable(NULL, 0); = Modified: trunk/reactos/ntoskrnl/mm/mpw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mpw.c?rev= =3D32547&r1=3D32546&r2=3D32547&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/mpw.c (original) +++ trunk/reactos/ntoskrnl/mm/mpw.c Mon Mar 3 19:03:04 2008 @@ -17,10 +17,10 @@ = /* GLOBALS ***************************************************************= ****/ = -static HANDLE MpwThreadHandle; +HANDLE MpwThreadHandle; static CLIENT_ID MpwThreadId; -static KEVENT MpwThreadEvent; -static volatile BOOLEAN MpwThreadShouldTerminate; +KEVENT MpwThreadEvent; +BOOLEAN MpwThreadShouldTerminate; = /* FUNCTIONS *************************************************************= ****/ =

16 years, 9 months

[cfinck] 32546: Put all the stuff from "ntoskrnl.rbuild" into a new file "ntoskrnl-generic.rbuild", which is then included by "ntoskrnl.rbuild". Simplifies building the kernel as the same stuff is also needed in "ntkrnlmp.rbuild", which now defines CONFIG_SMP and then just includes "ntoskrnl-generic.rbuild". Also added a disabled "ntkrnlmp.rbuild" entry to "ReactOS-generic.rbuild" (disabled, because building the SMP kernel is broken atm)

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Mar 2 21:18:17 2008 New Revision: 32546 URL: http://svn.reactos.org/svn/reactos?rev=3D32546&view=3Drev Log: Put all the stuff from "ntoskrnl.rbuild" into a new file "ntoskrnl-generic.= rbuild", which is then included by "ntoskrnl.rbuild". Simplifies building the kernel as the same stuff is also needed in "ntkrnlm= p.rbuild", which now defines CONFIG_SMP and then just includes "ntoskrnl-ge= neric.rbuild". Also added a disabled "ntkrnlmp.rbuild" entry to "ReactOS-generic.rbuild" (= disabled, because building the SMP kernel is broken atm) Added: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (with props) Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuil= d?rev=3D32546&r1=3D32545&r2=3D32546&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Sun Mar 2 21:18:17 2008 @@ -58,6 +58,7 @@ </directory> <directory name=3D"ntoskrnl"> <xi:include href=3D"ntoskrnl/ntoskrnl.rbuild" /> +  </directory> <directory name=3D"subsystems"> <xi:include href=3D"subsystems/subsystems.rbuild" /> Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbu= ild?rev=3D32546&r1=3D32545&r2=3D32546&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntkrnlmp.rbuild (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp.rbuild Sun Mar 2 21:18:17 2008 @@ -1,436 +1,7 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name=3D"ntkrnlmp" type=3D"kernel" installbase=3D"system32" install= name=3D"ntkrnlmp.exe"> - <bootstrap installbase=3D"$(CDOUTPUT)" /> - <importlibrary definition=3D"ntoskrnl.def" /> - -  <define name=3D"CONFIG_SMP" /> = - <define name=3D"_DISABLE_TIDENTS" /> - <define name=3D"__NTOSKRNL__" /> - <define name=3D"_NTOSKRNL_" /> - <define name=3D"_NTSYSTEM_" /> - <define name=3D"__NO_CTYPE_INLINES" /> - <define name=3D"WIN9X_COMPAT_SPINLOCK" /> - <define name=3D"_IN_KERNEL_" /> - <if property=3D"_WINKD_" value=3D"1"> - <define name=3D"_WINKD_" /> - </if> - <if property=3D"_ELF" value=3D"1"> - <define name=3D"_ELF_" /> - </if> - <include base=3D"cmlib">.</include> - <include base=3D"ntoskrnl">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate"></include> - <include base=3D"ntoskrnl" root=3D"intermediate">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate">include/internal</includ= e> - <include base=3D"ReactOS">include/reactos/drivers</include> - <library>csq</library> - <library>hal</library> - <library>pseh</library> - <library>cmlib</library> - <library>rtl</library> - <library>rossym</library> - <library>libcntpr</library> - <library>kdcom</library> - <library>bootvid</library> - <library>wdmguid</library> - <library>ppcmmu</library> - <directory name=3D"include"> - <pch>ntoskrnl.h</pch> - </directory> - <directory name=3D"ke"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file first=3D"true">boot.S</file> - <file>abios.c</file> - <file>cpu.c</file> - <file>ctxswitch.S</file> - <file>exp.c</file> - <file>irqobj.c</file> - <file>kiinit.c</file> - <file>ldt.c</file> - <file>mtrr.c</file> - <file>patpge.c</file> - <file>systimer.S</file> - <file>thrdini.c</file> - <file>trap.s</file> - <file>usercall_asm.S</file> - <file>usercall.c</file> - <file>v86vdm.c</file> - <file>v86m_sup.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file first=3D"true">main_asm.S</file> - <file>cpu.c</file> - <file>exp.c</file> - <file>kiinit.c</file> - <file>ppc_irq.c</file> - <file>stubs.c</file> - <file>systimer.c</file> - <file>thrdini.c</file> - <file>ctxswitch.c</file> - <file>ctxhelp.S</file> - </directory> - </if> - <file>apc.c</file> - <file>balmgr.c</file> - <file>bug.c</file> - <file>clock.c</file> - <file>config.c</file> - <file>devqueue.c</file> - <file>dpc.c</file> - <file>eventobj.c</file> - <file>except.c</file> - <file>freeldr.c</file> - <file>gate.c</file> - <file>gmutex.c</file> - <file>ipi.c</file> - <file>krnlinit.c</file> - <file>mutex.c</file> - <file>procobj.c</file> - <file>profobj.c</file> - <file>queue.c</file> - <file>semphobj.c</file> - <file>spinlock.c</file> - <file>thrdschd.c</file> - <file>thrdobj.c</file> - <file>timerobj.c</file> - <file>wait.c</file> - </directory> - <directory name=3D"cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> - </directory> - <directory name=3D"config"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>cmhardwr.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>cmhardwr.c</file> - </directory> - </if> - <file>cmalloc.c</file> - <file>cmapi.c</file> - <file>cmboot.c</file> - <file>cmcheck.c</file> - <file>cmcontrl.c</file> - <file>cmconfig.c</file> - <file>cmdata.c</file> - <file>cmdelay.c</file> - <file>cmindex.c</file> - <file>cminit.c</file> - <file>cmhook.c</file> - <file>cmkcbncb.c</file> - <file>cmkeydel.c</file> - <file>cmlazy.c</file> - <file>cmmapvw.c</file> - <file>cmname.c</file> - <file>cmparse.c</file> - <file>cmse.c</file> - <file>cmsecach.c</file> - <file>cmsysini.c</file> - <file>cmvalue.c</file> - <file>cmvalche.c</file> - <file>cmwraprs.c</file> - <file>ntapi.c</file> - </directory> - <directory name=3D"dbgk"> - <file>dbgkutil.c</file> - <file>dbgkobj.c</file> - </directory> - <directory name=3D"ex" root=3D"intermediate"> - <file>zw.S</file> - </directory> - <directory name=3D"ex"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>interlck_asm.S</file> - <file>fastinterlck_asm.S</file> - <file>ioport.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>ioport.s</file> - <file>fastinterlck.c</file> - </directory> - </if> - <file>atom.c</file> - <file>callback.c</file> - <file>dbgctrl.c</file> - <file>efi.c</file> - <file>event.c</file> - <file>evtpair.c</file> - <file>fmutex.c</file> - <file>handle.c</file> - <file>harderr.c</file> - <file>hdlsterm.c</file> - <file>init.c</file> - <file>keyedevt.c</file> - <file>locale.c</file> - <file>lookas.c</file> - <file>mutant.c</file> - <file>pushlock.c</file> - <file>profile.c</file> - <file>resource.c</file> - <file>rundown.c</file> - <file>sem.c</file> - <file>shutdown.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>uuid.c</file> - <file>win32k.c</file> - <file>work.c</file> - <file>xipdisp.c</file> - <file>zone.c</file> - </directory> - <directory name=3D"fsrtl"> - <file>dbcsname.c</file> - <file>fastio.c</file> - <file>faulttol.c</file> - <file>filelock.c</file> - <file>filter.c</file> - <file>filtrctx.c</file> - <file>fsfilter.c</file> - <file>fsrtlpc.c</file> - <file>largemcb.c</file> - <file>name.c</file> - <file>notify.c</file> - <file>oplock.c</file> - <file>pnp.c</file> - <file>stackovf.c</file> - <file>tunnel.c</file> - <file>unc.c</file> - </directory> - <directory name=3D"fstub"> - <file>disksup.c</file> - <file>fstubex.c</file> - <file>halstub.c</file> - </directory> - <directory name=3D"inbv"> - <file>inbv.c</file> - </directory> - <directory name=3D"io"> - <directory name=3D"iomgr"> - <file>adapter.c</file> - <file>arcname.c</file> - <file>bootlog.c</file> - <file>controller.c</file> - <file>device.c</file> - <file>deviface.c</file> - <file>driver.c</file> - <file>drvrlist.c</file> - <file>error.c</file> - <file>file.c</file> - <file>iocomp.c</file> - <file>ioevent.c</file> - <file>iofunc.c</file> - <file>iomdl.c</file> - <file>iomgr.c</file> - <file>iorsrce.c</file> - <file>iotimer.c</file> - <file>iowork.c</file> - <file>irp.c</file> - <file>irq.c</file> - <file>rawfs.c</file> - <file>remlock.c</file> - <file>util.c</file> - <file>symlink.c</file> - <file>volume.c</file> - </directory> - <directory name=3D"pnpmgr"> - <file>plugplay.c</file> - <file>pnpdma.c</file> - <file>pnpmgr.c</file> - <file>pnpnotify.c</file> - <file>pnpreport.c</file> - <file>pnproot.c</file> - </directory> - </directory> - <if property=3D"_WINKD_" value=3D"0"> - <directory name=3D"kdbg"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <if property=3D"KDBG" value=3D"1"> - <group> - <file>i386-dis.c</file> - <file>kdb_help.S</file> - <file>longjmp.S</file> - <file>setjmp.S</file> - </group> - </if> - </directory> - </if> - <if property=3D"KDBG" value=3D"1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> - <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> - <file>kdb_string.c</file> - </if> - <if property=3D"DBG_OR_KDBG" value=3D"true"> - <file>kdb_symbols.c</file> - </if> - </directory> - <directory name=3D"kd"> - <directory name=3D"wrappers"> - <file>bochs.c</file> - <if property=3D"ARCH" value=3D"i386"> - <file>gdbstub.c</file> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <file>gdbstub_powerpc.c</file> - </if> - <file>kdbg.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> - </directory> - </if> - <if property=3D"_WINKD_" value =3D"1"> - <directory name=3D"kd64"> - <file>kdapi.c</file> - <file>kdbreak.c</file> - <file>kddata.c</file> - <file>kdinit.c</file> - <file>kdlock.c</file> - <file>kdprint.c</file> - <file>kdtrap.c</file> - </directory> - </if> - <directory name=3D"lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>reply.c</file> - <file>send.c</file> - </directory> - <directory name=3D"mm"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>page.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>pfault.c</file> - <file>page.c</file> - </directory> - </if> - <file>anonmem.c</file> - <file>aspace.c</file> - <file>balance.c</file> - <file>cont.c</file> - <file>drvlck.c</file> - <file>freelist.c</file> - <file>iospace.c</file> - <file>kmap.c</file> - <file>marea.c</file> - <file>mdlsup.c</file> - <file>mm.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> - <file>pageop.c</file> - <file>pager.c</file> - <file>pagfault.c</file> - <file>paging.c</file> - <file>pe.c</file> - <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>procsup.c</file> - <file>region.c</file> - <file>rmap.c</file> - <file>section.c</file> - <file>sysldr.c</file> - <file>verifier.c</file> - <file>virtual.c</file> - <file>wset.c</file> - <if property=3D"_ELF_" value=3D"1"> - <file>elf32.c</file> - <file>elf64.c</file> - </if> - </directory> - <directory name=3D"ob"> - <file>obdir.c</file> - <file>obinit.c</file> - <file>obhandle.c</file> - <file>obname.c</file> - <file>oblife.c</file> - <file>obref.c</file> - <file>sdcache.c</file> - <file>obsecure.c</file> - <file>oblink.c</file> - <file>obwait.c</file> - </directory> - <directory name=3D"po"> - <file>power.c</file> - <file>events.c</file> - </directory> - <directory name=3D"ps"> - <file>debug.c</file> - <file>job.c</file> - <file>kill.c</file> - <file>psnotify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> - <file>quota.c</file> - <file>security.c</file> - <file>state.c</file> - <file>thread.c</file> - <file>win32.c</file> - </directory> - <directory name=3D"rtl"> - <file>libsupp.c</file> - <file>misc.c</file> - <file>strtok.c</file> - </directory> - <directory name=3D"se"> - <file>access.c</file> - <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> - <file>luid.c</file> - <file>priv.c</file> - <file>sd.c</file> - <file>semgr.c</file> - <file>sid.c</file> - <file>token.c</file> - </directory> - <directory name=3D"vdm"> - <if property=3D"ARCH" value=3D"i386"> - <file>vdmmain.c</file> - <file>vdmexec.c</file> - </if> - </directory> - <directory name=3D"wmi"> - <file>wmi.c</file> - </directory> - <file>bugcodes.mc</file> - <file>ntoskrnl.rc</file> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> - <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> + <xi:include href=3D"ntoskrnl-generic.rbuild" /> </module> Added: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-gen= eric.rbuild?rev=3D32546&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (added) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Sun Mar 2 21:18:17 2008 @@ -1,0 +1,447 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi=3D"http://www.w3.org/2001/XInclude"> + <bootstrap installbase=3D"$(CDOUTPUT)" /> + <importlibrary definition=3D"ntoskrnl_$(ARCH).def" /> + <define name=3D"_DISABLE_TIDENTS" /> + <define name=3D"__NTOSKRNL__" /> + <define name=3D"_NTOSKRNL_" /> + <define name=3D"_NTSYSTEM_" /> + <define name=3D"__NO_CTYPE_INLINES" /> + <define name=3D"WIN9X_COMPAT_SPINLOCK" /> + <define name=3D"_IN_KERNEL_" /> + <if property=3D"_WINKD_" value=3D"1"> + <define name=3D"_WINKD_" /> + </if> + <if property=3D"_ELF" value=3D"1"> + <define name=3D"_ELF_" /> + </if> + <include base=3D"cmlib">.</include> + <include base=3D"ntoskrnl">include</include> + <include base=3D"ntoskrnl" root=3D"intermediate"></include> + <include base=3D"ntoskrnl" root=3D"intermediate">include</include> + <include base=3D"ntoskrnl" root=3D"intermediate">include/internal</includ= e> + <include base=3D"ReactOS">include/reactos/drivers</include> + <library>csq</library> + <library>hal</library> + <library>pseh</library> + <library>cmlib</library> + <library>rtl</library> + <library>rossym</library> + <library>libcntpr</library> + <library>kdcom</library> + <library>bootvid</library> + <library>wdmguid</library> + <directory name=3D"include"> + <pch>ntoskrnl.h</pch> + </directory> + <directory name=3D"ke"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file first=3D"true">boot.S</file> + <file>abios.c</file> + <file>cpu.c</file> + <file>ctxswitch.S</file> + <file>exp.c</file> + <file>irqobj.c</file> + <file>kiinit.c</file> + <file>ldt.c</file> + <file>mtrr.c</file> + <file>patpge.c</file> + <file>systimer.S</file> + <file>thrdini.c</file> + <file>trap.s</file> + <file>usercall_asm.S</file> + <file>usercall.c</file> + <file>v86vdm.c</file> + <file>v86m_sup.S</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"arm"> + <directory name=3D"arm"> + <file first=3D"true">boot.s</file> + <file>arm_kprintf.c</file> + <file>cpu.c</file> + <file>exp.c</file> + <file>kiinit.c</file> + <file>stubs_asm.s</file> + <file>stubs.c</file> + <file>thrdini.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file first=3D"true">main_asm.S</file> + <file>cpu.c</file> + <file>exp.c</file> + <file>kiinit.c</file> + <file>ppc_irq.c</file> + <file>stubs.c</file> + <file>systimer.c</file> + <file>thrdini.c</file> + <file>ctxswitch.c</file> + <file>ctxhelp.S</file> + </directory> + </if> + <file>apc.c</file> + <file>balmgr.c</file> + <file>bug.c</file> + <file>clock.c</file> + <file>config.c</file> + <file>devqueue.c</file> + <file>dpc.c</file> + <file>eventobj.c</file> + <file>except.c</file> + <file>freeldr.c</file> + <file>gate.c</file> + <file>gmutex.c</file> + <file>ipi.c</file> + <file>krnlinit.c</file> + <file>mutex.c</file> + <file>procobj.c</file> + <file>profobj.c</file> + <file>queue.c</file> + <file>semphobj.c</file> + <file>spinlock.c</file> + <file>thrdschd.c</file> + <file>thrdobj.c</file> + <file>timerobj.c</file> + <file>wait.c</file> + </directory> + <directory name=3D"cc"> + <file>cacheman.c</file> + <file>copy.c</file> + <file>fs.c</file> + <file>mdl.c</file> + <file>pin.c</file> + <file>view.c</file> + </directory> + <directory name=3D"config"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file>cmhardwr.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file>cmhardwr.c</file> + </directory> + </if> + <file>cmalloc.c</file> + <file>cmapi.c</file> + <file>cmboot.c</file> + <file>cmcheck.c</file> + <file>cmcontrl.c</file> + <file>cmconfig.c</file> + <file>cmdata.c</file> + <file>cmdelay.c</file> + <file>cmindex.c</file> + <file>cminit.c</file> + <file>cmhook.c</file> + <file>cmkcbncb.c</file> + <file>cmkeydel.c</file> + <file>cmlazy.c</file> + <file>cmmapvw.c</file> + <file>cmname.c</file> + <file>cmparse.c</file> + <file>cmse.c</file> + <file>cmsecach.c</file> + <file>cmsysini.c</file> + <file>cmvalue.c</file> + <file>cmvalche.c</file> + <file>cmwraprs.c</file> + <file>ntapi.c</file> + </directory> + <directory name=3D"dbgk"> + <file>dbgkutil.c</file> + <file>dbgkobj.c</file> + </directory> + <directory name=3D"ex" root=3D"intermediate"> + <file>zw.S</file> + </directory> + <directory name=3D"ex"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file>interlck_asm.S</file> + <file>fastinterlck_asm.S</file> + <file>ioport.S</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file>ioport.s</file> + <file>fastinterlck.c</file> + </directory> + </if> + <file>atom.c</file> + <file>callback.c</file> + <file>dbgctrl.c</file> + <file>efi.c</file> + <file>event.c</file> + <file>evtpair.c</file> + <file>fmutex.c</file> + <file>handle.c</file> + <file>harderr.c</file> + <file>hdlsterm.c</file> + <file>init.c</file> + <file>keyedevt.c</file> + <file>locale.c</file> + <file>lookas.c</file> + <file>mutant.c</file> + <file>pushlock.c</file> + <file>profile.c</file> + <file>resource.c</file> + <file>rundown.c</file> + <file>sem.c</file> + <file>shutdown.c</file> + <file>sysinfo.c</file> + <file>time.c</file> + <file>timer.c</file> + <file>uuid.c</file> + <file>win32k.c</file> + <file>work.c</file> + <file>xipdisp.c</file> + <file>zone.c</file> + </directory> + <directory name=3D"fsrtl"> + <file>dbcsname.c</file> + <file>fastio.c</file> + <file>faulttol.c</file> + <file>filelock.c</file> + <file>filter.c</file> + <file>filtrctx.c</file> + <file>fsfilter.c</file> + <file>fsrtlpc.c</file> + <file>largemcb.c</file> + <file>name.c</file> + <file>notify.c</file> + <file>oplock.c</file> + <file>pnp.c</file> + <file>stackovf.c</file> + <file>tunnel.c</file> + <file>unc.c</file> + </directory> + <directory name=3D"fstub"> + <file>disksup.c</file> + <file>fstubex.c</file> + <file>halstub.c</file> + </directory> + <directory name=3D"inbv"> + <file>inbv.c</file> + </directory> + <directory name=3D"io"> + <directory name=3D"iomgr"> + <file>adapter.c</file> + <file>arcname.c</file> + <file>bootlog.c</file> + <file>controller.c</file> + <file>device.c</file> + <file>deviface.c</file> + <file>driver.c</file> + <file>drvrlist.c</file> + <file>error.c</file> + <file>file.c</file> + <file>iocomp.c</file> + <file>ioevent.c</file> + <file>iofunc.c</file> + <file>iomdl.c</file> + <file>iomgr.c</file> + <file>iorsrce.c</file> + <file>iotimer.c</file> + <file>iowork.c</file> + <file>irp.c</file> + <file>irq.c</file> + <file>rawfs.c</file> + <file>remlock.c</file> + <file>util.c</file> + <file>symlink.c</file> + <file>volume.c</file> + </directory> + <directory name=3D"pnpmgr"> + <file>plugplay.c</file> + <file>pnpdma.c</file> + <file>pnpmgr.c</file> + <file>pnpnotify.c</file> + <file>pnpreport.c</file> + <file>pnproot.c</file> + </directory> + </directory> + <if property=3D"_WINKD_" value=3D"0"> + <directory name=3D"kdbg"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <if property=3D"KDBG" value=3D"1"> + <group> + <file>i386-dis.c</file> + <file>kdb_help.S</file> + <file>longjmp.S</file> + <file>setjmp.S</file> + </group> + </if> + </directory> + </if> + <if property=3D"KDBG" value=3D"1"> + <file>kdb.c</file> + <file>kdb_cli.c</file> + <file>kdb_expr.c</file> + <file>kdb_keyboard.c</file> + <file>kdb_serial.c</file> + </if> + <if property=3D"DBG_OR_KDBG" value=3D"true"> + <file>kdb_symbols.c</file> + </if> + </directory> + <directory name=3D"kd"> + <directory name=3D"wrappers"> + <file>bochs.c</file> + <if property=3D"ARCH" value=3D"i386"> + <file>gdbstub.c</file> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <file>gdbstub_powerpc.c</file> + </if> + <file>kdbg.c</file> + </directory> + <file>kdinit.c</file> + <file>kdio.c</file> + <file>kdmain.c</file> + </directory> + </if> + <if property=3D"_WINKD_" value =3D"1"> + <directory name=3D"kd64"> + <file>kdapi.c</file> + <file>kdbreak.c</file> + <file>kddata.c</file> + <file>kdinit.c</file> + <file>kdlock.c</file> + <file>kdprint.c</file> + <file>kdtrap.c</file> + </directory> + </if> + <directory name=3D"lpc"> + <file>close.c</file> + <file>complete.c</file> + <file>connect.c</file> + <file>create.c</file> + <file>listen.c</file> + <file>port.c</file> + <file>reply.c</file> + <file>send.c</file> + </directory> + <directory name=3D"mm"> + <if property=3D"ARCH" value=3D"i386"> + <directory name=3D"i386"> + <file>page.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"arm"> + <directory name=3D"arm"> + <file>stubs.c</file> + </directory> + </if> + <if property=3D"ARCH" value=3D"powerpc"> + <directory name=3D"powerpc"> + <file>pfault.c</file> + <file>page.c</file> + </directory> + </if> + <file>anonmem.c</file> + <file>aspace.c</file> + <file>balance.c</file> + <file>cont.c</file> + <file>drvlck.c</file> + <file>freelist.c</file> + <file>iospace.c</file> + <file>kmap.c</file> + <file>marea.c</file> + <file>mdlsup.c</file> + <file>mm.c</file> + <file>mminit.c</file> + <file>mpw.c</file> + <file>ncache.c</file> + <file>npool.c</file> + <file>pagefile.c</file> + <file>pageop.c</file> + <file>pager.c</file> + <file>pagfault.c</file> + <file>paging.c</file> + <file>pe.c</file> + <file>physical.c</file> + <file>pool.c</file> + <file>ppool.c</file> + <file>procsup.c</file> + <file>region.c</file> + <file>rmap.c</file> + <file>section.c</file> + <file>sysldr.c</file> + <file>verifier.c</file> + <file>virtual.c</file> + <file>wset.c</file> + <if property=3D"_ELF_" value=3D"1"> + <file>elf32.c</file> + <file>elf64.c</file> + </if> + </directory> + <directory name=3D"ob"> + <file>obdir.c</file> + <file>obinit.c</file> + <file>obhandle.c</file> + <file>obname.c</file> + <file>oblife.c</file> + <file>obref.c</file> + <file>sdcache.c</file> + <file>obsecure.c</file> + <file>oblink.c</file> + <file>obwait.c</file> + </directory> + <directory name=3D"po"> + <file>power.c</file> + <file>events.c</file> + </directory> + <directory name=3D"ps"> + <file>debug.c</file> + <file>job.c</file> + <file>kill.c</file> + <file>psnotify.c</file> + <file>process.c</file> + <file>psmgr.c</file> + <file>query.c</file> + <file>quota.c</file> + <file>security.c</file> + <file>state.c</file> + <file>thread.c</file> + <file>win32.c</file> + </directory> + <directory name=3D"rtl"> + <file>libsupp.c</file> + <file>misc.c</file> + <file>strtok.c</file> + </directory> + <directory name=3D"se"> + <file>access.c</file> + <file>acl.c</file> + <file>audit.c</file> + <file>lsa.c</file> + <file>luid.c</file> + <file>priv.c</file> + <file>sd.c</file> + <file>semgr.c</file> + <file>sid.c</file> + <file>token.c</file> + </directory> + <directory name=3D"vdm"> + <if property=3D"ARCH" value=3D"i386"> + <file>vdmmain.c</file> + <file>vdmexec.c</file> + </if> + </directory> + <directory name=3D"wmi"> + <file>wmi.c</file> + </directory> + <file>bugcodes.mc</file> + <file>ntoskrnl.rc</file> + <linkerflag>-nostartfiles</linkerflag> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> + <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> +</group> Propchange: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbu= ild?rev=3D32546&r1=3D32545&r2=3D32546&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Mar 2 21:18:17 2008 @@ -1,447 +1,5 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name=3D"ntoskrnl" type=3D"kernel" installbase=3D"system32" install= name=3D"ntoskrnl.exe"> - <bootstrap installbase=3D"$(CDOUTPUT)" /> - <importlibrary definition=3D"ntoskrnl_$(ARCH).def" /> - <define name=3D"_DISABLE_TIDENTS" /> - <define name=3D"__NTOSKRNL__" /> - <define name=3D"_NTOSKRNL_" /> - <define name=3D"_NTSYSTEM_" /> - <define name=3D"__NO_CTYPE_INLINES" /> - <define name=3D"WIN9X_COMPAT_SPINLOCK" /> - <define name=3D"_IN_KERNEL_" /> - <if property=3D"_WINKD_" value=3D"1"> - <define name=3D"_WINKD_" /> - </if> - <if property=3D"_ELF" value=3D"1"> - <define name=3D"_ELF_" /> - </if> - <include base=3D"cmlib">.</include> - <include base=3D"ntoskrnl">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate"></include> - <include base=3D"ntoskrnl" root=3D"intermediate">include</include> - <include base=3D"ntoskrnl" root=3D"intermediate">include/internal</includ= e> - <include base=3D"ReactOS">include/reactos/drivers</include> - <library>csq</library> - <library>hal</library> - <library>pseh</library> - <library>cmlib</library> - <library>rtl</library> - <library>rossym</library> - <library>libcntpr</library> - <library>kdcom</library> - <library>bootvid</library> - <library>wdmguid</library> - <directory name=3D"include"> - <pch>ntoskrnl.h</pch> - </directory> - <directory name=3D"ke"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file first=3D"true">boot.S</file> - <file>abios.c</file> - <file>cpu.c</file> - <file>ctxswitch.S</file> - <file>exp.c</file> - <file>irqobj.c</file> - <file>kiinit.c</file> - <file>ldt.c</file> - <file>mtrr.c</file> - <file>patpge.c</file> - <file>systimer.S</file> - <file>thrdini.c</file> - <file>trap.s</file> - <file>usercall_asm.S</file> - <file>usercall.c</file> - <file>v86vdm.c</file> - <file>v86m_sup.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"arm"> - <directory name=3D"arm"> - <file first=3D"true">boot.s</file> - <file>arm_kprintf.c</file> - <file>cpu.c</file> - <file>exp.c</file> - <file>kiinit.c</file> - <file>stubs_asm.s</file> - <file>stubs.c</file> - <file>thrdini.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file first=3D"true">main_asm.S</file> - <file>cpu.c</file> - <file>exp.c</file> - <file>kiinit.c</file> - <file>ppc_irq.c</file> - <file>stubs.c</file> - <file>systimer.c</file> - <file>thrdini.c</file> - <file>ctxswitch.c</file> - <file>ctxhelp.S</file> - </directory> - </if> - <file>apc.c</file> - <file>balmgr.c</file> - <file>bug.c</file> - <file>clock.c</file> - <file>config.c</file> - <file>devqueue.c</file> - <file>dpc.c</file> - <file>eventobj.c</file> - <file>except.c</file> - <file>freeldr.c</file> - <file>gate.c</file> - <file>gmutex.c</file> - <file>ipi.c</file> - <file>krnlinit.c</file> - <file>mutex.c</file> - <file>procobj.c</file> - <file>profobj.c</file> - <file>queue.c</file> - <file>semphobj.c</file> - <file>spinlock.c</file> - <file>thrdschd.c</file> - <file>thrdobj.c</file> - <file>timerobj.c</file> - <file>wait.c</file> - </directory> - <directory name=3D"cc"> - <file>cacheman.c</file> - <file>copy.c</file> - <file>fs.c</file> - <file>mdl.c</file> - <file>pin.c</file> - <file>view.c</file> - </directory> - <directory name=3D"config"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>cmhardwr.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>cmhardwr.c</file> - </directory> - </if> - <file>cmalloc.c</file> - <file>cmapi.c</file> - <file>cmboot.c</file> - <file>cmcheck.c</file> - <file>cmcontrl.c</file> - <file>cmconfig.c</file> - <file>cmdata.c</file> - <file>cmdelay.c</file> - <file>cmindex.c</file> - <file>cminit.c</file> - <file>cmhook.c</file> - <file>cmkcbncb.c</file> - <file>cmkeydel.c</file> - <file>cmlazy.c</file> - <file>cmmapvw.c</file> - <file>cmname.c</file> - <file>cmparse.c</file> - <file>cmse.c</file> - <file>cmsecach.c</file> - <file>cmsysini.c</file> - <file>cmvalue.c</file> - <file>cmvalche.c</file> - <file>cmwraprs.c</file> - <file>ntapi.c</file> - </directory> - <directory name=3D"dbgk"> - <file>dbgkutil.c</file> - <file>dbgkobj.c</file> - </directory> - <directory name=3D"ex" root=3D"intermediate"> - <file>zw.S</file> - </directory> - <directory name=3D"ex"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>interlck_asm.S</file> - <file>fastinterlck_asm.S</file> - <file>ioport.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>ioport.s</file> - <file>fastinterlck.c</file> - </directory> - </if> - <file>atom.c</file> - <file>callback.c</file> - <file>dbgctrl.c</file> - <file>efi.c</file> - <file>event.c</file> - <file>evtpair.c</file> - <file>fmutex.c</file> - <file>handle.c</file> - <file>harderr.c</file> - <file>hdlsterm.c</file> - <file>init.c</file> - <file>keyedevt.c</file> - <file>locale.c</file> - <file>lookas.c</file> - <file>mutant.c</file> - <file>pushlock.c</file> - <file>profile.c</file> - <file>resource.c</file> - <file>rundown.c</file> - <file>sem.c</file> - <file>shutdown.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timer.c</file> - <file>uuid.c</file> - <file>win32k.c</file> - <file>work.c</file> - <file>xipdisp.c</file> - <file>zone.c</file> - </directory> - <directory name=3D"fsrtl"> - <file>dbcsname.c</file> - <file>fastio.c</file> - <file>faulttol.c</file> - <file>filelock.c</file> - <file>filter.c</file> - <file>filtrctx.c</file> - <file>fsfilter.c</file> - <file>fsrtlpc.c</file> - <file>largemcb.c</file> - <file>name.c</file> - <file>notify.c</file> - <file>oplock.c</file> - <file>pnp.c</file> - <file>stackovf.c</file> - <file>tunnel.c</file> - <file>unc.c</file> - </directory> - <directory name=3D"fstub"> - <file>disksup.c</file> - <file>fstubex.c</file> - <file>halstub.c</file> - </directory> - <directory name=3D"inbv"> - <file>inbv.c</file> - </directory> - <directory name=3D"io"> - <directory name=3D"iomgr"> - <file>adapter.c</file> - <file>arcname.c</file> - <file>bootlog.c</file> - <file>controller.c</file> - <file>device.c</file> - <file>deviface.c</file> - <file>driver.c</file> - <file>drvrlist.c</file> - <file>error.c</file> - <file>file.c</file> - <file>iocomp.c</file> - <file>ioevent.c</file> - <file>iofunc.c</file> - <file>iomdl.c</file> - <file>iomgr.c</file> - <file>iorsrce.c</file> - <file>iotimer.c</file> - <file>iowork.c</file> - <file>irp.c</file> - <file>irq.c</file> - <file>rawfs.c</file> - <file>remlock.c</file> - <file>util.c</file> - <file>symlink.c</file> - <file>volume.c</file> - </directory> - <directory name=3D"pnpmgr"> - <file>plugplay.c</file> - <file>pnpdma.c</file> - <file>pnpmgr.c</file> - <file>pnpnotify.c</file> - <file>pnpreport.c</file> - <file>pnproot.c</file> - </directory> - </directory> - <if property=3D"_WINKD_" value=3D"0"> - <directory name=3D"kdbg"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <if property=3D"KDBG" value=3D"1"> - <group> - <file>i386-dis.c</file> - <file>kdb_help.S</file> - <file>longjmp.S</file> - <file>setjmp.S</file> - </group> - </if> - </directory> - </if> - <if property=3D"KDBG" value=3D"1"> - <file>kdb.c</file> - <file>kdb_cli.c</file> - <file>kdb_expr.c</file> - <file>kdb_keyboard.c</file> - <file>kdb_serial.c</file> - </if> - <if property=3D"DBG_OR_KDBG" value=3D"true"> - <file>kdb_symbols.c</file> - </if> - </directory> - <directory name=3D"kd"> - <directory name=3D"wrappers"> - <file>bochs.c</file> - <if property=3D"ARCH" value=3D"i386"> - <file>gdbstub.c</file> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <file>gdbstub_powerpc.c</file> - </if> - <file>kdbg.c</file> - </directory> - <file>kdinit.c</file> - <file>kdio.c</file> - <file>kdmain.c</file> - </directory> - </if> - <if property=3D"_WINKD_" value =3D"1"> - <directory name=3D"kd64"> - <file>kdapi.c</file> - <file>kdbreak.c</file> - <file>kddata.c</file> - <file>kdinit.c</file> - <file>kdlock.c</file> - <file>kdprint.c</file> - <file>kdtrap.c</file> - </directory> - </if> - <directory name=3D"lpc"> - <file>close.c</file> - <file>complete.c</file> - <file>connect.c</file> - <file>create.c</file> - <file>listen.c</file> - <file>port.c</file> - <file>reply.c</file> - <file>send.c</file> - </directory> - <directory name=3D"mm"> - <if property=3D"ARCH" value=3D"i386"> - <directory name=3D"i386"> - <file>page.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"arm"> - <directory name=3D"arm"> - <file>stubs.c</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>pfault.c</file> - <file>page.c</file> - </directory> - </if> - <file>anonmem.c</file> - <file>aspace.c</file> - <file>balance.c</file> - <file>cont.c</file> - <file>drvlck.c</file> - <file>freelist.c</file> - <file>iospace.c</file> - <file>kmap.c</file> - <file>marea.c</file> - <file>mdlsup.c</file> - <file>mm.c</file> - <file>mminit.c</file> - <file>mpw.c</file> - <file>ncache.c</file> - <file>npool.c</file> - <file>pagefile.c</file> - <file>pageop.c</file> - <file>pager.c</file> - <file>pagfault.c</file> - <file>paging.c</file> - <file>pe.c</file> - <file>physical.c</file> - <file>pool.c</file> - <file>ppool.c</file> - <file>procsup.c</file> - <file>region.c</file> - <file>rmap.c</file> - <file>section.c</file> - <file>sysldr.c</file> - <file>verifier.c</file> - <file>virtual.c</file> - <file>wset.c</file> - <if property=3D"_ELF_" value=3D"1"> - <file>elf32.c</file> - <file>elf64.c</file> - </if> - </directory> - <directory name=3D"ob"> - <file>obdir.c</file> - <file>obinit.c</file> - <file>obhandle.c</file> - <file>obname.c</file> - <file>oblife.c</file> - <file>obref.c</file> - <file>sdcache.c</file> - <file>obsecure.c</file> - <file>oblink.c</file> - <file>obwait.c</file> - </directory> - <directory name=3D"po"> - <file>power.c</file> - <file>events.c</file> - </directory> - <directory name=3D"ps"> - <file>debug.c</file> - <file>job.c</file> - <file>kill.c</file> - <file>psnotify.c</file> - <file>process.c</file> - <file>psmgr.c</file> - <file>query.c</file> - <file>quota.c</file> - <file>security.c</file> - <file>state.c</file> - <file>thread.c</file> - <file>win32.c</file> - </directory> - <directory name=3D"rtl"> - <file>libsupp.c</file> - <file>misc.c</file> - <file>strtok.c</file> - </directory> - <directory name=3D"se"> - <file>access.c</file> - <file>acl.c</file> - <file>audit.c</file> - <file>lsa.c</file> - <file>luid.c</file> - <file>priv.c</file> - <file>sd.c</file> - <file>semgr.c</file> - <file>sid.c</file> - <file>token.c</file> - </directory> - <directory name=3D"vdm"> - <if property=3D"ARCH" value=3D"i386"> - <file>vdmmain.c</file> - <file>vdmexec.c</file> - </if> - </directory> - <directory name=3D"wmi"> - <file>wmi.c</file> - </directory> - <file>bugcodes.mc</file> - <file>ntoskrnl.rc</file> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> - <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> + <xi:include href=3D"ntoskrnl-generic.rbuild" /> </module>

16 years, 9 months

[greatlrd] 32545: Fixed all known issue with DdCreateSurface in gdi32, it works with more that one surface now.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Mar 2 19:19:08 2008 New Revision: 32545 URL: http://svn.reactos.org/svn/reactos?rev=3D32545&view=3Drev Log: Fixed all known issue with DdCreateSurface in gdi32, it works with more tha= t one surface now. Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32545&r1=3D32544&r2=3D32545&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 19:19:08 2008 @@ -274,11 +274,11 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = - - - - -/* TODO : finish all fixme */ = +/* + * @implemented + * + * DdCreateSurface + */ DWORD WINAPI DdCreateSurface(LPDDHAL_CREATESURFACEDATA pCreateSurface) @@ -301,6 +301,24 @@ PHANDLE phSurface =3D NULL, puhSurface =3D NULL; ULONG i; LPDDSURFACEDESC pSurfaceDesc =3D NULL; + + /* TODO : Speed optimze, most games/dx apps/program does not want 1 su= rface, they want lest 2 + * so we need incress the stack so it can contain 2 surface instead of= one, this will incress = + * the speed of the apps when it trying alloc buffer. How to incress t= he surface stack space + * we need create a own struct for DD_SURFACE_LOCAL DdSurfaceLocal, DD= _SURFACE_MORE DdSurfaceMore + * DD_SURFACE_GLOBAL DdSurfaceGlobal. HANDLE hPrevSurface, hSurface. l= ike + * struct { DD_SURFACE_LOCAL DdSurfaceLocal1, DD_SURFACE_LOCAL DdSurfa= ceLocal2 } + * lest so it contain two surface. maybe 4. we need watch what is most= common here before = + * we create the size activate this IF when you start doing the optim= ze and please also + * take report from user which value they got here + */ = +#if 0 + { + char buffer[1024]; \ + sprintf ( buffer, "Function %s : Optimze max to %d Surface ? (%s:%= d)\n", __FUNCTION__,SurfaceCount,__FILE__,__LINE__ ); + OutputDebugStringA(buffer); + } +#endif = /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) @@ -475,12 +493,11 @@ lcl->lpSurfMore->ddsCapsEx.dwCaps3 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps3; lcl->lpSurfMore->ddsCapsEx.dwCaps4 =3D ptmpDdSurfaceMore->= ddsCapsEx.dwCaps4; } - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - we only support one surface create at moment - */ + + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

16 years, 9 months

[greatlrd] 32544: small change in DdCreateSurface. now we pass down all usermode surface data to win32k. left todo is translate back all surface data.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Mar 2 18:50:11 2008 New Revision: 32544 URL: http://svn.reactos.org/svn/reactos?rev=3D32544&view=3Drev Log: small change in DdCreateSurface. now we pass down all usermode surface dat= a to win32k. left todo is translate back all surface data. = Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32544&r1=3D32543&r2=3D32544&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 18:50:11 2008 @@ -409,13 +409,10 @@ ptmpDdSurfaceMore->dwSurfaceHandle =3D (DWORD) pCreateSurf= ace->lplpSList[i]->dbnOverlayNode.object_int; } = - /* FIXME count to next SurfaceCount for - ptmpDdSurfaceGlobal =3D pDdSurfaceGlobal; - ptmpDdSurfaceLocal =3D pDdSurfaceLocal; - ptmpDdSurfaceMore =3D pDdSurfaceMore; - - we only support one surface create at moment - */ + /* count to next SurfaceCount */ + ptmpDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) (((PBYTE) ((ULONG= _PTR) ptmpDdSurfaceGlobal)) + sizeof(DD_SURFACE_GLOBAL)); + ptmpDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) (((PBYTE) ((ULONG_P= TR) ptmpDdSurfaceLocal)) + sizeof(DD_SURFACE_LOCAL)); + ptmpDdSurfaceMore =3D (PDD_SURFACE_MORE) (((PBYTE) ((ULONG_PTR= ) ptmpDdSurfaceMore)) + sizeof(DD_SURFACE_MORE)); } } =

16 years, 9 months

[greatlrd] 32543: started adding support for more that one surface in DdCreateSurface

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Mar 2 17:28:54 2008 New Revision: 32543 URL: http://svn.reactos.org/svn/reactos?rev=3D32543&view=3Drev Log: started adding support for more that one surface in DdCreateSurface Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32543&r1=3D32542&r2=3D32543&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Mar 2 17:28:54 2008 @@ -274,6 +274,10 @@ (PDD_CANCREATESURFACEDATA)CanCreateSurf= ace); } = + + + + /* TODO : finish all fixme */ = DWORD WINAPI @@ -286,7 +290,6 @@ DD_SURFACE_GLOBAL DdSurfaceGlobal; = HANDLE hPrevSurface, hSurface; - = PDD_SURFACE_LOCAL pDdSurfaceLocal =3D NULL; PDD_SURFACE_MORE pDdSurfaceMore =3D NULL; @@ -302,8 +305,40 @@ /* Check how many surfaces there are */ if (SurfaceCount !=3D 1) { - /* We'll have to allocate more data, our stack isn't big enough */ - + /* We got more that one surface so we need alloc memory for them */ + pDdSurfaceLocal =3D (PDD_SURFACE_LOCAL) HeapAlloc(GetProcessHeap()= , HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_LOCAL) * SurfaceCount )); + pDdSurfaceMore =3D (PDD_SURFACE_MORE) HeapAlloc(GetProcessHeap(), = HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_MORE) * SurfaceCount )); + pDdSurfaceGlobal =3D (PDD_SURFACE_GLOBAL) HeapAlloc(GetProcessHea= p(), HEAP_ZERO_MEMORY, (sizeof(DD_SURFACE_GLOBAL) * SurfaceCount )); + phSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeo= f(HANDLE) * SurfaceCount )); + puhSurface =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (size= of(HANDLE) * SurfaceCount )); + + /* check if we sueese alloc all memory we need */ + if ((pDdSurfaceLocal =3D=3D NULL) || (pDdSurfaceMore =3D=3D NULL) = || (pDdSurfaceGlobal =3D=3D NULL) || (phSurface =3D=3D NULL) || (puhSurface= =3D=3D NULL)) + { + pCreateSurface->ddRVal =3D DDERR_OUTOFMEMORY; + + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } + + return DDHAL_DRIVER_HANDLED; + } } else { @@ -455,7 +490,25 @@ /* Check if we have to free all our local allocations */ if (SurfaceCount > 1) { - /* FIXME: */ + if ( pDdSurfaceLocal !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceLocal); + } + + if ( pDdSurfaceMore !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, pDdSurfaceMore); + } + + if ( phSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, phSurface); + } + + if ( puhSurface !=3D NULL ) + { + HeapFree(GetProcessHeap(), 0, puhSurface); + } } = /* Return */ @@ -1094,9 +1147,7 @@ * ReactOS keep this behoir to be compatible with * Windows XP */ - pData->ddRVal =3D retValue; - = - + pData->ddRVal =3D retValue; = } = /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */

16 years, 9 months

[gbrunmar] 32542: * Implemented IDirect3D::CheckDeviceFormatConversion() * Replaced all LocalAlloc() with HeapAlloc() and LocalFree() with HeapFree() on recommendation from GreatLord

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Mar 2 15:12:24 2008 New Revision: 32542 URL: http://svn.reactos.org/svn/reactos?rev=3D32542&view=3Drev Log: * Implemented IDirect3D::CheckDeviceFormatConversion() * Replaced all LocalAlloc() with HeapAlloc() and LocalFree() with HeapFree(= ) on recommendation from GreatLord Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h trunk/reactos/dll/directx/d3d9/format.c trunk/reactos/dll/directx/d3d9/format.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adap= ter.c?rev=3D32542&r1=3D32541&r2=3D32542&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Sun Mar 2 15:12:24 2008 @@ -86,7 +86,7 @@ if (DriverFileSize > 0) { VS_FIXEDFILEINFO* FixedFileInfo =3D NULL; - LPVOID pBlock =3D LocalAlloc(LMEM_ZEROINIT, DriverFileSize); + LPVOID pBlock =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Dr= iverFileSize); = if (TRUE =3D=3D GetFileVersionInfoA(pIdentifier->Driver, 0, Driver= FileSize, pBlock)) { @@ -97,7 +97,7 @@ } } = - LocalFree(pBlock); + HeapFree(GetProcessHeap(), 0, pBlock); } = if (bIsWow64) @@ -292,7 +292,7 @@ return Format; } = - pBitmapInfo =3D LocalAlloc(LMEM_ZEROINIT, sizeof(BITMAPINFOHEADER) + 4= * sizeof(RGBQUAD)); + pBitmapInfo =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(B= ITMAPINFOHEADER) + 4 * sizeof(RGBQUAD)); if (NULL =3D=3D pBitmapInfo) { DeleteObject(hBitmap); @@ -316,7 +316,7 @@ } } = - LocalFree(pBitmapInfo); + HeapFree(GetProcessHeap(), 0, pBitmapInfo); DeleteObject(hBitmap); DeleteDC(hDC); = Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _create.c?rev=3D32542&r1=3D32541&r2=3D32542&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_create.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Sun Mar 2 15:12:24 2008 @@ -65,7 +65,7 @@ if (NULL =3D=3D (hDC =3D CreateDCA(NULL, pDisplayAdapter->szDeviceName= , NULL, NULL))) return FALSE; = - pDeviceData =3D LocalAlloc(LMEM_ZEROINIT, sizeof(D3D9_DEVICEDATA)); + pDeviceData =3D HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(D= 3D9_DEVICEDATA)); if (NULL =3D=3D pDeviceData) { DPRINT1("Out of memory, could not initialize Direct3D adapter"); Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _helpers.c?rev=3D32542&r1=3D32541&r2=3D32542&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Sun Mar 2 15:12:24 2008 @@ -64,7 +64,7 @@ = dwSize +=3D MEM_ALIGNMENT; = - AlignedPtr =3D (CHAR *)LocalAlloc(LMEM_ZEROINIT, dwSize); + AlignedPtr =3D (CHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, d= wSize); = if (AlignedPtr =3D=3D 0) return DDERR_OUTOFMEMORY; @@ -91,5 +91,5 @@ = NonAlignedPtr -=3D *(AlignedPtr - 1); = - LocalFree(NonAlignedPtr); + HeapFree(GetProcessHeap(), 0, NonAlignedPtr); } Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _impl.c?rev=3D32542&r1=3D32541&r2=3D32542&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Mar 2 15:12:24 2008 @@ -640,12 +640,79 @@ return D3D_OK; } = + +/*++ +* @name IDirect3D9::CheckDeviceFormatConversion +* @implemented +* +* The function IDirect3D9Impl_CheckDeviceFormatConversion checks if a spec= ific D3DFORMAT +* can be converted to another on the specified display adapter. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primar= y display. +* The maximum value for this is the value returned by IDirect3D::GetAdapte= rCount(). +* +* @param D3DDEVTYPE DeviceType +* One of the D3DDEVTYPE enum members. Only D3DDEVTYPE_HAL can potentially = return D3D_OK. +* +* @param D3DFORMAT SourceFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be converted from. +* +* @param D3DFORMAT TargetFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be converted to. +* +* @return HRESULT +* If the SourceFormat can be converted to the TargetFormat, the method ret= urns D3D_OK. +* If the SourceFormat can NOT be converted to the TargetFormat, the method= returns D3DERR_NOTAVAILABLE. +* If Adapter is out of range, DeviceType is invalid, +* SourceFormat or TargetFormat is invalid, the method returns D3DERR_INVAL= IDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3= D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT= SourceFormat, D3DFORMAT TargetFormat) { - UNIMPLEMENTED - - return D3D_OK; + HRESULT hResult; + LPDIRECT3D9_INT This =3D impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >=3D This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (DeviceType !=3D D3DDEVTYPE_HAL && + DeviceType !=3D D3DDEVTYPE_REF && + DeviceType !=3D D3DDEVTYPE_SW) + { + DPRINT1("Invalid DeviceType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (SourceFormat =3D=3D D3DFMT_UNKNOWN || + TargetFormat =3D=3D D3DFMT_UNKNOWN) + { + DPRINT1("Invalid D3DFORMAT specified"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if (DeviceType =3D=3D D3DDEVTYPE_HAL) + { + hResult =3D CheckDeviceFormatConversion(&This->DisplayAdapters[Ada= pter].DriverCaps, SourceFormat, TargetFormat); + } + else + { + hResult =3D D3DERR_NOTAVAILABLE; + } + + UNLOCK_D3D9(); + return hResult; } = = Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _private.h?rev=3D32542&r1=3D32541&r2=3D32542&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Mar 2 15:12:24 2008 @@ -89,7 +89,7 @@ /* 0x0220 */ CHAR szDeviceName[CCHDEVICENAME]; /* 0x0240 */ HDC hDC; /* 0x0244 */ GUID DisplayGuid; -/* 0x0254 */ LPDWORD pUnknown0254; //D3D9_Unknown6BC_INT* pUnknown6BC; = // hDirectDrawLocal = +/* 0x0254 */ LPDWORD pUnknown0254; //D3D9_Unknown6BC_INT* pUnknown6BC; /* 0x0258 */ D3DDEVTYPE DeviceType; /* 0x025c */ HMODULE hD3DRefDll; /* 0x0260 */ DWORD unknown0152; @@ -103,7 +103,7 @@ /* 0x0118 */ BOOL bInUseFlag; /* 0x011c */ DWORD MasterAdapterIndex; /* 0x0120 */ DWORD AdapterIndexInGroup; -/* 0x0124 */ DWORD NumAdaptersInGroup; /* 0x00000001 */ +/* 0x0124 */ DWORD NumAdaptersInGroup; /* 0x0128 */ DWORD NumSupportedD3DFormats; /* 0x012c */ DWORD NumSupportedD3DExtendedFormats; /* 0x0130 */ D3DDISPLAYMODE* pSupportedD3DFormats; @@ -116,7 +116,7 @@ = typedef struct _tagDIRECT3D9_INT_ { -/* 0x0000 */ struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 functoions = table */ +/* 0x0000 */ struct IDirect3D9Vtbl *lpVtbl; /* LPDIRECTD3D9 function ta= ble */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; /* 0x001c */ DWORD unknown000007; /* 0x00000001 */ /* 0x0020 */ DWORD dwProcessId; Modified: trunk/reactos/dll/directx/d3d9/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.c?rev=3D32542&r1=3D32541&r2=3D32542&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.c (original) +++ trunk/reactos/dll/directx/d3d9/format.c Sun Mar 2 15:12:24 2008 @@ -31,6 +31,20 @@ BOOL IsMultiElementFormat(D3DFORMAT Format) { return (Format =3D=3D D3DFMT_MULTI2_ARGB8); +} + +BOOL IsFourCCFormat(D3DFORMAT Format) +{ + CHAR* cFormat =3D (CHAR*)&Format; + if (isalnum(cFormat[0]) && + isalnum(cFormat[1]) && + isalnum(cFormat[2]) && + isalnum(cFormat[3])) + { + return TRUE; + } + + return FALSE; } = BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp) @@ -321,3 +335,47 @@ = return D3DERR_NOTAVAILABLE; } + +HRESULT CheckDeviceFormatConversion(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORM= AT SourceFormat, D3DFORMAT TargetFormat) +{ + D3DFORMAT NonAlphaSourceFormat; + D3DFORMAT NonAlphaTargetFormat; + + NonAlphaSourceFormat =3D RemoveAlphaChannel(SourceFormat); + NonAlphaTargetFormat =3D RemoveAlphaChannel(TargetFormat); + + if (NonAlphaSourceFormat =3D=3D NonAlphaTargetFormat) + { + return D3D_OK; + } + + if (FALSE =3D=3D IsFourCCFormat(SourceFormat)) + { + switch (SourceFormat) + { + case D3DFMT_A8R8G8B8: + case D3DFMT_X8R8G8B8: + case D3DFMT_R5G6B5: + case D3DFMT_X1R5G5B5: + case D3DFMT_A1R5G5B5: + case D3DFMT_A2R10G10B10: + /* Do nothing, valid SourceFormat */ + break; + + default: + return D3DERR_NOTAVAILABLE; + } + } + else if (pDriverCaps->DriverCaps9.DevCaps2 =3D=3D 0) + { + return D3D_OK; + } + + if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, SourceFormat, D3DFOR= MAT_OP_CONVERT_TO_ARGB) || + FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, TargetFormat, D3DFOR= MAT_MEMBEROFGROUP_ARGB)) + { + return D3DERR_NOTAVAILABLE; + } + + return D3D_OK; +} Modified: trunk/reactos/dll/directx/d3d9/format.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.h?rev=3D32542&r1=3D32541&r2=3D32542&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.h (original) +++ trunk/reactos/dll/directx/d3d9/format.h Sun Mar 2 15:12:24 2008 @@ -33,4 +33,6 @@ = HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); = +HRESULT CheckDeviceFormatConversion(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORM= AT SourceFormat, D3DFORMAT TargetFormat); + #endif // _FORMAT_H_

16 years, 9 months

[gbrunmar] 32541: Implemented IDirect3D:CheckDeviceFormat()

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Mar 2 13:29:35 2008 New Revision: 32541 URL: http://svn.reactos.org/svn/reactos?rev=3D32541&view=3Drev Log: Implemented IDirect3D:CheckDeviceFormat() Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h trunk/reactos/dll/directx/d3d9/format.c trunk/reactos/dll/directx/d3d9/format.h trunk/reactos/include/psdk/d3d9types.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _impl.c?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Mar 2 13:29:35 2008 @@ -363,7 +363,7 @@ * One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be checked. * * @param D3DFORMAT BackBufferFormat -* One of the D3DFORMAT enum membersfor the render target mode to be checke= d. D3DFMT_UNKNOWN is only allowed in windowed mode. +* One of the D3DFORMAT enum members for the render target mode to be check= ed. D3DFMT_UNKNOWN is only allowed in windowed mode. * * @param BOOL Windowed * If this value is TRUE, the D3DFORMAT check will be done for windowed mod= e and FALSE equals fullscreen mode. @@ -426,19 +426,200 @@ return D3DERR_NOTAVAILABLE; } = - hResult =3D CheckDeviceFormat(&This->DisplayAdapters[Adapter].DriverCa= ps, DisplayFormat, BackBufferFormat, Windowed); + hResult =3D CheckDeviceType(&This->DisplayAdapters[Adapter].DriverCaps= , DisplayFormat, BackBufferFormat, Windowed); = UNLOCK_D3D9(); return hResult; } = + +/*++ +* @name IDirect3D9::CheckDeviceFormat +* @implemented +* +* The function IDirect3D9Impl_CheckDeviceFormat checks if a specific D3DFO= RMAT +* can be used for a specific purpose like texture, depth/stencil buffer or= as a render target +* on the specified display adapter. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primar= y display. +* The maximum value for this is the value returned by IDirect3D::GetAdapte= rCount(). +* +* @param D3DDEVTYPE DeviceType +* One of the D3DDEVTYPE enum members. +* +* @param D3DFORMAT AdapterFormat +* One of the D3DFORMAT enum members except D3DFMT_UNKNOWN for the display = adapter mode to be checked. +* +* @param DWORD Usage +* Valid values are any of the D3DUSAGE_QUERY constants or any of these D3D= USAGE constants: +* D3DUSAGE_AUTOGENMIPMAP, D3DUSAGE_DEPTHSTENCIL, D3DUSAGE_DMAP, D3DUSAGE_D= YNAMIC, +* D3DUSAGE_NONSECURE, D3DUSAGE_RENDERTARGET and D3DUSAGE_SOFTWAREPROCESSIN= G. +* +* @param D3DRESOURCETYPE RType +* One of the D3DRESOURCETYPE enum members. Specifies what format will be u= sed for. +* +* @param D3DFORMAT CheckFormat +* One of the D3DFORMAT enum members for the surface format to be checked. +* +* @return HRESULT +* If the format is compatible with the specified usage and resource type, = the method returns D3D_OK. +* If the format isn't compatible with the specified usage and resource typ= e - the return value will be D3DERR_NOTAVAILABLE. +* If Adapter is out of range, DeviceType is invalid, AdapterFormat or Chec= kFormat is invalid, +* Usage and RType isn't compatible - the return value will be D3DERR_INVAL= IDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, = UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFo= rmat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckForm= at) { - UNIMPLEMENTED - - return D3D_OK; + LPD3D9_DRIVERCAPS pDriverCaps; + BOOL bIsTextureRType =3D FALSE; + HRESULT hResult; + + LPDIRECT3D9_INT This =3D impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >=3D This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (DeviceType !=3D D3DDEVTYPE_HAL && + DeviceType !=3D D3DDEVTYPE_REF && + DeviceType !=3D D3DDEVTYPE_SW) + { + DPRINT1("Invalid DeviceType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (AdapterFormat =3D=3D D3DFMT_UNKNOWN || + CheckFormat =3D=3D D3DFMT_UNKNOWN) + { + DPRINT1("Invalid D3DFORMAT specified"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if ((Usage & (D3DUSAGE_DONOTCLIP | D3DUSAGE_NPATCHES | D3DUSAGE_POINTS= | D3DUSAGE_RTPATCHES | D3DUSAGE_TEXTAPI | D3DUSAGE_WRITEONLY)) !=3D 0) + { + DPRINT1("Invalid Usage specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (RType =3D=3D D3DRTYPE_TEXTURE || + RType =3D=3D D3DRTYPE_VOLUMETEXTURE || + RType =3D=3D D3DRTYPE_CUBETEXTURE) + { + bIsTextureRType =3D TRUE; + } + else if (RType =3D=3D D3DRTYPE_SURFACE && + (Usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) =3D= =3D 0 && + Usage !=3D 0) + { + DPRINT1("When RType is set to D3DRTYPE_SURFACE, Usage must be 0 or= have set D3DUSAGE_DEPTHSTENCIL or D3DUSAGE_RENDERTARGET"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_DEPTHSTENCIL) !=3D 0) + { + if (FALSE =3D=3D IsZBufferFormat(CheckFormat)) + { + DPRINT1("Invalid CheckFormat Z-Buffer format"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_AUTOGENMIPMAP) !=3D 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_DEPTHSTENCIL and D3= DUSAGE_AUTOGENMIPMAP can't be combined."); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if (FALSE =3D=3D bIsTextureRType && + RType !=3D D3DRTYPE_SURFACE && + RType !=3D D3DRTYPE_VOLUME) + { + DPRINT1("Invalid RType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & (D3DUSAGE_AUTOGENMIPMAP | D3DUSAGE_DEPTHSTENCIL | D3DUSAG= E_RENDERTARGET)) !=3D 0) + { + if (RType =3D=3D D3DRTYPE_VOLUME || RType =3D=3D D3DRTYPE_VOLUMETE= XTURE) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_AUTOGENMIPMAP, D3DU= SAGE_DEPTHSTENCIL and D3DUSAGE_RENDERTARGET can't be combined with RType D3= DRTYPE_VOLUME or D3DRTYPE_VOLUMETEXTURE"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if (FALSE =3D=3D bIsTextureRType && + (Usage & D3DUSAGE_QUERY_VERTEXTEXTURE) !=3D 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_QUERY_VERTEXTEXTURE can= only be used with a texture RType"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((Usage & D3DUSAGE_AUTOGENMIPMAP) !=3D 0 && + TRUE =3D=3D IsMultiElementFormat(CheckFormat)) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_AUTOGENMIPMAP can't be = used with a multi-element format"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + pDriverCaps =3D &This->DisplayAdapters[Adapter].DriverCaps; + if ((Usage & D3DUSAGE_DYNAMIC) !=3D 0 && bIsTextureRType =3D=3D TRUE) + { + if ((pDriverCaps->DriverCaps9.Caps2 & D3DCAPS2_DYNAMICTEXTURES) = =3D=3D 0) + { + DPRINT1("Driver doesn't support dynamic textures"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if ((Usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) !=3D= 0) + { + DPRINT1("Invalid Usage specified, D3DUSAGE_DEPTHSTENCIL and D3= DUSAGE_RENDERTARGET can't be combined with D3DUSAGE_DYNAMIC and a texture R= Type"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + if ((Usage & D3DUSAGE_DMAP) !=3D 0) + { + if ((pDriverCaps->DriverCaps9.DevCaps2 & (D3DDEVCAPS2_PRESAMPLEDDM= APNPATCH | D3DDEVCAPS2_DMAPNPATCH)) =3D=3D 0) + { + DPRINT1("Driver doesn't support displacement mapping"); + UNLOCK_D3D9(); + return D3DERR_NOTAVAILABLE; + } + + if (RType !=3D D3DRTYPE_TEXTURE) + { + DPRINT1("Invalid Usage speficied, D3DUSAGE_DMAP must be combin= ed with RType D3DRTYPE_TEXTURE"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + } + + hResult =3D CheckDeviceFormat(pDriverCaps, AdapterFormat, Usage, RType= , CheckFormat); + + UNLOCK_D3D9(); + return hResult; } = static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D= 9 iface, UINT Adapter, D3DDEVTYPE DeviceType, Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _private.h?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Mar 2 13:29:35 2008 @@ -222,8 +222,8 @@ /* 0x227c */ DWORD unknown002207; /* 0x2280 */ DWORD unknown002208; /* 0x2284 */ DWORD unknown002209; -/* 0x2288 */ DWORD unknown002210; -/* 0x228c */ DWORD unknown002211; +/* 0x2288 */ DWORD NumSupportedRefFormatOps; +/* 0x228c */ LPDDSURFACEDESC pSupportedRefFormatOps; /* 0x2290 */ DWORD unknown002212; /* 0x2294 */ DWORD unknown002213; /* 0x2298 */ DWORD unknown002214; @@ -1286,8 +1286,8 @@ /* 0x331c */ DWORD unknown003271; /* 0x3320 */ DWORD unknown003272; /* 0x3324 */ DWORD unknown003273; -/* 0x3328 */ DWORD unknown003274; -/* 0x332c */ DWORD unknown003275; +/* 0x3328 */ DWORD NumSupportedSoftwareFormatOps; +/* 0x332c */ LPDDSURFACEDESC pSupportedSoftwareFormatOps; /* 0x3330 */ DWORD unknown003276; /* 0x3334 */ DWORD unknown003277; /* 0x3338 */ DWORD unknown003278; Modified: trunk/reactos/dll/directx/d3d9/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.c?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.c (original) +++ trunk/reactos/dll/directx/d3d9/format.c Sun Mar 2 13:29:35 2008 @@ -8,6 +8,7 @@ = #include "format.h" #include <ddrawi.h> +#include <debug.h> = BOOL IsBackBufferFormat(D3DFORMAT Format) { @@ -18,6 +19,18 @@ BOOL IsExtendedFormat(D3DFORMAT Format) { return (Format =3D=3D D3DFMT_A2R10G10B10); +} + +BOOL IsZBufferFormat(D3DFORMAT Format) +{ + UNIMPLEMENTED + + return TRUE; +} + +BOOL IsMultiElementFormat(D3DFORMAT Format) +{ + return (Format =3D=3D D3DFMT_MULTI2_ARGB8); } = BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp) @@ -38,7 +51,7 @@ return FALSE; } = -HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Display= Format, D3DFORMAT BackBufferFormat, BOOL Windowed) +HRESULT CheckDeviceType(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayFo= rmat, D3DFORMAT BackBufferFormat, BOOL Windowed) { if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, DisplayFormat, D3DFO= RMAT_OP_DISPLAYMODE | D3DFORMAT_OP_3DACCELERATION)) { @@ -89,3 +102,222 @@ = return D3D_OK; } + +static D3DFORMAT GetStencilFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT= CheckFormat) +{ + switch (CheckFormat) + { + case D3DFMT_D15S1: + case D3DFMT_D24S8: + case D3DFMT_D24X8: + case D3DFMT_D24X4S4: + if (IsSupportedFormatOp(pDriverCaps, CheckFormat - 1, 0)) + return CheckFormat - 1; + break; + + case D3DFMT_D16: + if (IsSupportedFormatOp(pDriverCaps, CheckFormat, 0)) + return CheckFormat; + else + return D3DFMT_D16_LOCKABLE; + + default: + /* StencilFormat same as CheckFormat */ + break; + } + + return CheckFormat; +} + +static D3DFORMAT RemoveAlphaChannel(D3DFORMAT CheckFormat) +{ + switch (CheckFormat) + { + case D3DFMT_A8R8G8B8: + return D3DFMT_X8R8G8B8; + + case D3DFMT_A1R5G5B5: + return D3DFMT_X1R5G5B5; + + case D3DFMT_A4R4G4B4: + return D3DFMT_X4R4G4B4; + + case D3DFMT_A8B8G8R8: + return D3DFMT_X8B8G8R8; + + default: + /* CheckFormat has not relevant alpha channel */ + break; + } + + return CheckFormat; +} + +HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) +{ + const DWORD NumFormatOps =3D pDriverCaps->NumSupportedFormatOps; + DWORD NonCompatibleOperations =3D 0, MustSupportOperations =3D 0; + BOOL bSupportedWithAutogen =3D FALSE; + DWORD FormatOpIndex; + + if (FALSE =3D=3D IsSupportedFormatOp(pDriverCaps, AdapterFormat, D3DFO= RMAT_OP_DISPLAYMODE | D3DFORMAT_OP_3DACCELERATION)) + { + return D3DERR_NOTAVAILABLE; + } + + /* Check for driver auto generated mip map support if requested */ + if ((Usage & (D3DUSAGE_AUTOGENMIPMAP)) !=3D 0) + { + switch (RType) + { + case D3DRTYPE_TEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + case D3DRTYPE_VOLUME: + case D3DRTYPE_VOLUMETEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PVOLUMEMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + case D3DRTYPE_CUBETEXTURE: + if ((pDriverCaps->DriverCaps9.TextureCaps & D3DPTEXTURECAPS_MI= PCUBEMAP) =3D=3D 0) + return D3DERR_NOTAVAILABLE; + + break; + + default: + /* Do nothing */ + break; + } + + MustSupportOperations |=3D D3DFORMAT_OP_AUTOGENMIPMAP; + } + + /* Translate from RType and Usage parameters to FormatOps */ + switch (RType) + { + case D3DRTYPE_TEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_TEXTURE; + break; + + case D3DRTYPE_VOLUME: + case D3DRTYPE_VOLUMETEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_VOLUMETEXTURE; + break; + + case D3DRTYPE_CUBETEXTURE: + MustSupportOperations |=3D D3DFORMAT_OP_CUBETEXTURE; + break; + + default: + /* Do nothing */ + break; + } + + if (Usage =3D=3D 0 && RType =3D=3D D3DRTYPE_SURFACE) + { + MustSupportOperations |=3D D3DFORMAT_OP_OFFSCREENPLAIN; + } + + if ((Usage & D3DUSAGE_DEPTHSTENCIL) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_ZSTENCIL; + } + + if ((Usage & D3DUSAGE_DMAP) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_DMAP; + } + + if ((Usage & D3DUSAGE_QUERY_LEGACYBUMPMAP) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_BUMPMAP; + } + + if ((Usage & D3DUSAGE_QUERY_SRGBREAD) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_SRGBREAD; + } + + if ((Usage & D3DUSAGE_QUERY_SRGBWRITE) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_SRGBWRITE; + } + + if ((Usage & D3DUSAGE_QUERY_VERTEXTEXTURE) !=3D 0) + { + MustSupportOperations |=3D D3DFORMAT_OP_VERTEXTEXTURE; + } + + CheckFormat =3D GetStencilFormat(pDriverCaps, CheckFormat); + + if ((Usage & D3DUSAGE_RENDERTARGET) !=3D 0) + { + if (AdapterFormat =3D=3D CheckFormat) + { + MustSupportOperations |=3D D3DFORMAT_OP_SAME_FORMAT_RENDERTARG= ET; + } + else + { + D3DFORMAT NonAlphaAdapterFormat; + D3DFORMAT NonAlphaCheckFormat; + + NonAlphaAdapterFormat =3D RemoveAlphaChannel(AdapterFormat); + NonAlphaCheckFormat =3D RemoveAlphaChannel(CheckFormat); + + if (NonAlphaAdapterFormat =3D=3D NonAlphaCheckFormat && + NonAlphaCheckFormat !=3D D3DFMT_UNKNOWN) + { + MustSupportOperations |=3D D3DFORMAT_OP_SAME_FORMAT_UP_TO_= ALPHA_RENDERTARGET; + } + else + { + MustSupportOperations |=3D D3DFORMAT_OP_OFFSCREEN_RENDERTA= RGET; + } + } + } + + if ((Usage & D3DUSAGE_QUERY_FILTER) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_OFFSCREENPLAIN; + } + + if ((Usage & D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_NOALPHABLEND; + } + + if ((Usage & D3DUSAGE_QUERY_WRAPANDMIP) !=3D 0) + { + NonCompatibleOperations |=3D D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP; + } + + for (FormatOpIndex =3D 0; FormatOpIndex < NumFormatOps; FormatOpIndex+= +) + { + DWORD dwOperations; + LPDDSURFACEDESC pSurfaceDesc =3D &pDriverCaps->pSupportedFormatOps= [FormatOpIndex]; + + if (pSurfaceDesc->ddpfPixelFormat.dwFourCC !=3D CheckFormat) + continue; + + dwOperations =3D pSurfaceDesc->ddpfPixelFormat.dwOperations; + + if ((dwOperations & NonCompatibleOperations) !=3D 0) + continue; + + if ((dwOperations & MustSupportOperations) =3D=3D MustSupportOpera= tions) + return D3D_OK; + = + if (((dwOperations & MustSupportOperations) | D3DFORMAT_OP_AUTOGEN= MIPMAP) =3D=3D MustSupportOperations) + bSupportedWithAutogen =3D TRUE; + } + + if (TRUE =3D=3D bSupportedWithAutogen) + return D3DOK_NOAUTOGEN; + + return D3DERR_NOTAVAILABLE; +} Modified: trunk/reactos/dll/directx/d3d9/format.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/form= at.h?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/format.h (original) +++ trunk/reactos/dll/directx/d3d9/format.h Sun Mar 2 13:29:35 2008 @@ -12,12 +12,25 @@ #include <d3d9.h> #include "d3d9_private.h" = +#define D3DFORMAT_OP_DMAP 0x00020000L + +/* MSVC compile fix */ +#ifndef D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP +#define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L +#endif + BOOL IsBackBufferFormat(D3DFORMAT Format); = BOOL IsExtendedFormat(D3DFORMAT Format); = +BOOL IsZBufferFormat(D3DFORMAT Format); + +BOOL IsMultiElementFormat(D3DFORMAT Format); + BOOL IsSupportedFormatOp(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayF= ormat, DWORD FormatOp); = -HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Display= Format, D3DFORMAT BackBufferFormat, BOOL Windowed); +HRESULT CheckDeviceType(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT DisplayFo= rmat, D3DFORMAT BackBufferFormat, BOOL Windowed); + +HRESULT CheckDeviceFormat(LPD3D9_DRIVERCAPS pDriverCaps, D3DFORMAT Adapter= Format, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); = #endif // _FORMAT_H_ Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9type= s.h?rev=3D32541&r1=3D32540&r2=3D32541&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/include/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Sun Mar 2 13:29:35 2008 @@ -110,6 +110,9 @@ #define D3DUSAGE_DYNAMIC 0x00000200L #define D3DUSAGE_AUTOGENMIPMAP 0x00000400L #define D3DUSAGE_DMAP 0x00004000L +#ifndef D3D_DISABLE_9EX +#define D3DUSAGE_TEXTAPI 0x10000000L +#endif = #define D3DUSAGE_QUERY_FILTER 0x00020000L #define D3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000L

16 years, 9 months

[fireball] 32540: - The bootloader must zero user shared data page before passing control to the kernel. This fixes the "invalid timer state", "assert(SharedUserData->NumberOfPages == 0" family of bugs after warm reboot. See issue #3085 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 2 11:26:59 2008 New Revision: 32540 URL: http://svn.reactos.org/svn/reactos?rev=3D32540&view=3Drev Log: - The bootloader must zero user shared data page before passing control to = the kernel. This fixes the "invalid timer state", "assert(SharedUserData->N= umberOfPages =3D=3D 0" family of bugs after warm reboot. See issue #3085 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/= arch/i386/loader.c?rev=3D32540&r1=3D32539&r2=3D32540&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sun Mar 2 11:26:= 59 2008 @@ -202,5 +202,8 @@ PageDir->Pde[0x1FF].Valid =3D 1; PageDir->Pde[0x1FF].Write =3D 1; PageDir->Pde[0x1FF].PageFrameNumber =3D 1; + + /* Zero shared data */ + RtlZeroMemory((PVOID)(2 << MM_PAGE_SHIFT), PAGE_SIZE); } =

16 years, 9 months

[greatlrd] 32539: finish implemented of DvpVideoport, misc, misc2, Color Control, NT callbacks not tested to 100% yet stub up almost all callbacks that DdGetDriverInfo setup, mark out where DirectX DdBltAlphaBlend are ReactOS gdi32.dll was tested in windows xp and it seam working fine with dx1-7 at moment, even not everything are finish.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Mar 1 18:28:44 2008 New Revision: 32539 URL: http://svn.reactos.org/svn/reactos?rev=3D32539&view=3Drev Log: finish implemented of DvpVideoport, misc, misc2, Color Control, NT callback= s not tested to 100% yet stub up almost all callbacks that DdGetDriverInfo setup, mark out where Dir= ectX DdBltAlphaBlend are = ReactOS gdi32.dll was tested in windows xp and it seam working fine with d= x1-7 at moment, even not everything are finish. = Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/= gdientry.c?rev=3D32539&r1=3D32538&r2=3D32539&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sat Mar 1 18:28:44 2008 @@ -603,7 +603,7 @@ WINAPI DvpWaitForVideoPortSync(LPDDHAL_WAITFORVPORTSYNCDATA pDvdWaitForVideoPortS= ync) { - return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoP= ort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); + return NtGdiDvpWaitForVideoPortSync(pDvdWaitForVideoPortSync->lpVideoP= ort->hDDVideoPort, (PDD_WAITFORVPORTSYNCDATA) pDvdWaitForVideoPortSync); } = /* @@ -670,121 +670,485 @@ return NtGdiDvpUpdateVideoPort(pDvdUpdateVideoPort->lpVideoPort->hDDVi= deoPort,phSurfaceVideo,phSurfaceVbi, (PDD_UPDATEVPORTDATA)pDvdUpdateVideoPo= rt); } = +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortField(LPDDHAL_FLIPVPORTDATA pDvdGetVideoPortField) +{ + return NtGdiDvpGetVideoPortField(pDvdGetVideoPortField->lpVideoPort->h= DDVideoPort, (PDD_GETVPORTFIELDDATA)pDvdGetVideoPortField); +} + +/* + * @implemented + * + * DvpWaitForVideoPortSync + */ +DWORD +WINAPI +DvpGetVideoPortInputFormats(LPDDHAL_GETVPORTINPUTFORMATDATA pDvdGetVideoPo= rtInputFormat) +{ + return NtGdiDvpGetVideoPortInputFormats(pDvdGetVideoPortInputFormat->l= pVideoPort->hDDVideoPort, (PDD_GETVPORTINPUTFORMATDATA) pDvdGetVideoPortInp= utFormat); +} + + +/* + * @implemented + * + * DvpGetVideoPortLine + */ +DWORD +WINAPI +DvpGetVideoPortLine(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortLine) +{ + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortLine->lpVideoPort->hDD= VideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortLine); +} + +/* + * @implemented + * + * DvpGetVideoPortOutputFormats + */ +DWORD +WINAPI +DvpGetVideoPortOutputFormats(LPDDHAL_GETVPORTLINEDATA pDvdGetVideoPortOutp= utFormat) +{ + return NtGdiDvpGetVideoPortLine(pDvdGetVideoPortOutputFormat->lpVideoP= ort->hDDVideoPort, (PDD_GETVPORTLINEDATA)pDvdGetVideoPortOutputFormat); +} + + +/* + * @implemented + * + * DvpGetVideoPortConnectInfo + */ +DWORD +WINAPI +DvpGetVideoPortConnectInfo(LPDDHAL_GETVPORTCONNECTDATA pDvdGetVideoPortInf= o) +{ + return NtGdiDvpGetVideoPortConnectInfo( GetDdHandle( pDvdGetVideoPortI= nfo->lpDD->lpGbl->hDD) , (PDD_GETVPORTCONNECTDATA) pDvdGetVideoPortInfo); +} + +/* + * @implemented + * + * DdGetAvailDriverMemory + */ +DWORD +WINAPI +DdGetAvailDriverMemory(LPDDHAL_GETAVAILDRIVERMEMORYDATA pDdGetAvailDriverM= emory) +{ + return NtGdiDdGetAvailDriverMemory(GetDdHandle( pDdGetAvailDriverMemory-= >lpDD->hDD), (PDD_GETAVAILDRIVERMEMORYDATA) pDdGetAvailDriverMemory); +} + +/* + * @implemented + * + * DdAlphaBlt + */ +DWORD +WINAPI +DdAlphaBlt(LPDDHAL_BLTDATA pDdAlphaBlt) +{ + HANDLE hDDSrcSurface =3D 0; = + + if (pDdAlphaBlt->lpDDSrcSurface !=3D 0) + { + hDDSrcSurface =3D (HANDLE) pDdAlphaBlt->lpDDSrcSurface->hDDSurface= ; = + } + = + return NtGdiDdAlphaBlt((HANDLE)pDdAlphaBlt->lpDDDestSurface->hDDSurfac= e, hDDSrcSurface, (PDD_BLTDATA)&pDdAlphaBlt); +} + +/* + * @implemented + * + * DdCreateSurfaceEx + */ +DWORD +WINAPI +DdCreateSurfaceEx(LPDDHAL_CREATESURFACEEXDATA pDdCreateSurfaceEx) +{ + pDdCreateSurfaceEx->ddRVal =3D NtGdiDdCreateSurfaceEx( GetDdHandle(pDd= CreateSurfaceEx->lpDDLcl->lpGbl->hDD), + (HANDLE)pDdCreate= SurfaceEx->lpDDSLcl->hDDSurface, = + pDdCreateSurfaceE= x->lpDDSLcl->lpSurfMore->dwSurfaceHandle); = + return TRUE; +} + +/* + * @implemented + * + * DdColorControl + */ +DWORD +WINAPI +DdColorControl(LPDDHAL_COLORCONTROLDATA pDdColorControl) +{ + return NtGdiDdColorControl( (HANDLE) pDdColorControl->lpDDSurface->hDD= Surface, (PDD_COLORCONTROLDATA) &pDdColorControl); +} + + +/* + * @implemented + * + * DdSetExclusiveMode + */ +DWORD +WINAPI +DdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA pDdSetExclusiveMode) +{ + return NtGdiDdSetExclusiveMode( GetDdHandle(pDdSetExclusiveMode->lpDD-= >hDD), (PDD_SETEXCLUSIVEMODEDATA) &pDdSetExclusiveMode); +} + +/* + * @implemented + * + * DdFlipToGDISurface + */ +DWORD +WINAPI +DdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA pDdFlipToGDISurface) +{ + return NtGdiDdFlipToGDISurface( GetDdHandle(pDdFlipToGDISurface->lpDD-= >hDD), (PDD_FLIPTOGDISURFACEDATA) &pDdFlipToGDISurface); +} + + + + /* TODO */ - DWORD WINAPI DdGetDriverInfo(LPDDHAL_GETDRIVERINFODATA pData) -{ - HANDLE hDD =3D GetDdHandle(pData->dwContext); - - /* Get videoport callbacks */ - if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) - { - DDHAL_GETDRIVERINFODATA pDvdPortInfo; - DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; - DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPORTCAL= LBACKS *)pData->lpvData; - DWORD retValue; +{ = + DDHAL_GETDRIVERINFODATA pDrvInfoData; + DWORD retValue =3D DDHAL_DRIVER_NOTHANDLED; + HANDLE hDD; + + /* FIXME add SEH around this functions */ + + RtlZeroMemory(&pDrvInfoData, sizeof (DDHAL_GETDRIVERINFODATA)); = = + RtlCopyMemory(&pDrvInfoData.guidInfo, &pData->guidInfo, sizeof(GUI= D)); + = + hDD =3D GetDdHandle(pData->dwContext); + + pDrvInfoData.dwSize =3D sizeof (DDHAL_GETDRIVERINFODATA); + pDrvInfoData.ddRVal =3D DDERR_GENERIC; = + pDrvInfoData.dwContext =3D (ULONG_PTR)hDD; = - /* Clear user out buffer */ - RtlZeroMemory(pUserDvdPort, DDVIDEOPORTCALLBACKSSIZE); = - - /* Clear internal out buffer and set it up*/ - RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); - pDvdPort.dwSize =3D DDVIDEOPORTCALLBACKSSIZE; - - /* Clear internal in buffer and set it up*/ - RtlZeroMemory(&pDvdPortInfo, sizeof (DDHAL_GETDRIVERINFODATA)); = = - pDvdPortInfo.dwSize =3D sizeof (DDHAL_GETDRIVERINFODATA); - pDvdPortInfo.guidInfo =3D GUID_VideoPortCallbacks; - pDvdPortInfo.lpvData =3D (PVOID)&pDvdPort; - pDvdPortInfo.ddRVal =3D DDERR_GENERIC; - pDvdPortInfo.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = - pDvdPortInfo.dwContext =3D (ULONG_PTR) hDD; + = + /* Videoport Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_VideoPortCallbacks)) + { = + DDHAL_DDVIDEOPORTCALLBACKS pDvdPort; + DDHAL_DDVIDEOPORTCALLBACKS* pUserDvdPort =3D (DDHAL_DDVIDEOPOR= TCALLBACKS *)pData->lpvData; = + + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pDvdPort, DDVIDEOPORTCALLBACKSSIZE); + pDvdPort.dwSize =3D DDVIDEOPORTCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pDvdPort; = + pDrvInfoData.dwExpectedSize =3D DDVIDEOPORTCALLBACKSSIZE ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + /* Setup user out buffer and convert kmode callbacks to user m= ode */ + pUserDvdPort->dwSize =3D DDVIDEOPORTCALLBACKSSIZE; = + pUserDvdPort->dwFlags =3D pDrvInfoData.dwFlags =3D 0; + = + pUserDvdPort->dwFlags =3D (pDrvInfoData.dwFlags & ~(DDHAL_VPOR= T32_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT3= 2_DESTROY | DDHAL_VPORT32_UPDATE | DDHAL_VPORT32_WAITFORSYNC)) | + (DDHAL_VPORT3= 2_CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | + DDHAL_VPORT3= 2_DESTROY | DDHAL_VPORT32_UPDATE); + + pData->dwActualSize =3D DDVIDEOPORTCALLBACKSSIZE; = + pUserDvdPort->CreateVideoPort =3D (LPDDHALVPORTCB_CREATEVIDEOP= ORT) DvpCreateVideoPort; + pUserDvdPort->FlipVideoPort =3D (LPDDHALVPORTCB_FLIP) DvpFlipV= ideoPort; + pUserDvdPort->DestroyVideoPort =3D (LPDDHALVPORTCB_DESTROYVPOR= T) DvpDestroyVideoPort; + pUserDvdPort->UpdateVideoPort =3D (LPDDHALVPORTCB_UPDATE) DvpU= pdateVideoPort; + + if (pDvdPort.CanCreateVideoPort) + { + pUserDvdPort->CanCreateVideoPort =3D (LPDDHALVPORTCB_CANCR= EATEVIDEOPORT) DvpCanCreateVideoPort; + } + + if (pDvdPort.GetVideoPortBandwidth) + { + pUserDvdPort->GetVideoPortBandwidth =3D (LPDDHALVPORTCB_GE= TBANDWIDTH) DvpGetVideoPortBandwidth; + } + + if (pDvdPort.GetVideoPortInputFormats) + { + pUserDvdPort->GetVideoPortInputFormats =3D (LPDDHALVPORTCB= _GETINPUTFORMATS) DvpGetVideoPortInputFormats; + } + + if (pDvdPort.GetVideoPortOutputFormats) + { + pUserDvdPort->GetVideoPortOutputFormats =3D (LPDDHALVPORTC= B_GETOUTPUTFORMATS) DvpGetVideoPortOutputFormats; + } + + if (pDvdPort.GetVideoPortField) + { + pUserDvdPort->GetVideoPortField =3D (LPDDHALVPORTCB_GETFIE= LD) DvpGetVideoPortField; = + } + + if (pDvdPort.GetVideoPortLine) + { + pUserDvdPort->GetVideoPortLine =3D (LPDDHALVPORTCB_GETLINE= ) DvpGetVideoPortLine; + } + + if (pDvdPort.GetVideoPortConnectInfo) + { + pUserDvdPort->GetVideoPortConnectInfo =3D (LPDDHALVPORTCB_= GETVPORTCONNECT) DvpGetVideoPortConnectInfo; + } + + if (pDvdPort.GetVideoPortFlipStatus) + { + pUserDvdPort->GetVideoPortFlipStatus =3D (LPDDHALVPORTCB_G= ETFLIPSTATUS) DvpGetVideoPortFlipStatus; + } = - /* Call win32k */ - retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)&pDv= dPortInfo); - - /* Setup user out buffer and convert kmode callbacks to user mode = */ - pUserDvdPort->dwSize =3D DDVIDEOPORTCALLBACKSSIZE; = - = - pUserDvdPort->dwFlags =3D (pDvdPortInfo.dwFlags & ~(DDHAL_VPORT32_= CREATEVIDEOPORT | DDHAL_VPORT32_FLIP | - DDHAL_VPORT32_DE= STROY | DDHAL_VPORT32_UPDATE )) | - (DDHAL_VPORT32_CR= EATEVIDEOPORT | DDHAL_VPORT32_FLIP | - DDHAL_VPORT32_DE= STROY | DDHAL_VPORT32_UPDATE); - - pData->dwActualSize =3D DDVIDEOPORTCALLBACKSSIZE; = - pUserDvdPort->CreateVideoPort =3D (LPDDHALVPORTCB_CREATEVIDEOPORT)= DvpCreateVideoPort; - pUserDvdPort->FlipVideoPort =3D (LPDDHALVPORTCB_FLIP) DvpFlipVideo= Port; - pUserDvdPort->DestroyVideoPort =3D (LPDDHALVPORTCB_DESTROYVPORT) D= vpDestroyVideoPort; - pUserDvdPort->UpdateVideoPort =3D (LPDDHALVPORTCB_UPDATE) DvpUpdat= eVideoPort; - - if (pDvdPort.CanCreateVideoPort) - { - pUserDvdPort->CanCreateVideoPort =3D (LPDDHALVPORTCB_CANCREAT= EVIDEOPORT) DvpCanCreateVideoPort; - } - - if (pDvdPort.GetVideoPortBandwidth) - { - pUserDvdPort->GetVideoPortBandwidth =3D (LPDDHALVPORTCB_GETBAN= DWIDTH) DvpGetVideoPortBandwidth; - } - - if (pDvdPort.GetVideoPortInputFormats) - { - pUserDvdPort->GetVideoPortInputFormats =3D (LPDDHALVPORTCB_GET= INPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats - } - - if (pDvdPort.GetVideoPortOutputFormats) - { - pUserDvdPort->GetVideoPortOutputFormats =3D (LPDDHALVPORTCB_GE= TOUTPUTFORMATS) NULL; // FIXME : DvpGetVideoPortInputFormats - } - - if (pDvdPort.GetVideoPortField) - { - pUserDvdPort->GetVideoPortField =3D (LPDDHALVPORTCB_GETFIELD) = NULL; // FIXME : DvpGetVideoPortField = - } - - if (pDvdPort.GetVideoPortLine) - { - pUserDvdPort->GetVideoPortLine =3D (LPDDHALVPORTCB_GETLINE) NU= LL; // FIXME : DvpGetVideoPortLine - } - - if (pDvdPort.GetVideoPortConnectInfo) - { - pUserDvdPort->GetVideoPortConnectInfo =3D (LPDDHALVPORTCB_GETV= PORTCONNECT) NULL; // FIXME : DvpGetVideoPortConnectInfo - } - - if (pDvdPort.GetVideoPortFlipStatus) - { - pUserDvdPort->GetVideoPortFlipStatus =3D (LPDDHALVPORTCB_GETFL= IPSTATUS) DvpGetVideoPortFlipStatus; - } - = - if (pDvdPort.WaitForVideoPortSync) - { - pUserDvdPort->WaitForVideoPortSync =3D (LPDDHALVPORTCB_WAITFOR= SYNC) DvpWaitForVideoPortSync; = - } - - if (pDvdPort.GetVideoSignalStatus) - { - pUserDvdPort->GetVideoSignalStatus =3D (LPDDHALVPORTCB_GETSIGN= ALSTATUS) DvpGetVideoSignalStatus; - } - - if (pDvdPort.ColorControl) - { - pUserDvdPort->ColorControl =3D (LPDDHALVPORTCB_COLORCONTROL) D= vpColorControl; - } - - /* Windows XP never repot back the true return value, = - * it only report back if we have a driver or not - * ReactOS keep this behoir to be compatible with - * Windows XP - */ - pData->ddRVal =3D retValue; - return retValue; - } - - /* FIXME not supported yet */ - return 0; + if (pDvdPort.WaitForVideoPortSync) + { + pUserDvdPort->WaitForVideoPortSync =3D (LPDDHALVPORTCB_WAI= TFORSYNC) DvpWaitForVideoPortSync; = + } + + if (pDvdPort.GetVideoSignalStatus) + { + pUserDvdPort->GetVideoSignalStatus =3D (LPDDHALVPORTCB_GET= SIGNALSTATUS) DvpGetVideoSignalStatus; + } + + if (pDvdPort.ColorControl) + { + pUserDvdPort->ColorControl =3D (LPDDHALVPORTCB_COLORCONTRO= L) DvpColorControl; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Color Control Callbacks check and setup for DirectX/ ReactX */ + if (IsEqualGUID(&pData->guidInfo, &GUID_ColorControlCallbacks)) + { + DDHAL_DDCOLORCONTROLCALLBACKS pColorControl; + DDHAL_DDCOLORCONTROLCALLBACKS* pUserColorControl =3D (DDHAL_DD= COLORCONTROLCALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pColorControl, DDCOLORCONTROLCALLBACKSSIZE); + pColorControl.dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pColorControl; = + pDrvInfoData.dwExpectedSize =3D DDCOLORCONTROLCALLBACKSSIZE ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + = + pData->dwActualSize =3D DDCOLORCONTROLCALLBACKSSIZE; + pData->dwFlags =3D pDrvInfoData.dwFlags; + + pUserColorControl->dwSize =3D DDCOLORCONTROLCALLBACKSSIZE; + pUserColorControl->dwFlags =3D pUserColorControl->dwFlags; + = + if (pColorControl.ColorControl !=3D NULL) + { + pUserColorControl->ColorControl =3D (LPDDHALCOLORCB_COLORC= ONTROL) DdColorControl; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Misc Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MiscellaneousCallback= s)) + { + DDHAL_DDMISCELLANEOUSCALLBACKS pMisc; + DDHAL_DDMISCELLANEOUSCALLBACKS* pUserMisc =3D (DDHAL_DDMISCELL= ANEOUSCALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUSCALLBACKSSIZE); + pMisc.dwSize =3D DDMISCELLANEOUSCALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pMisc; = + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUSCALLBACKSSIZE ;= = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D DDMISCELLANEOUSCALLBACKSSIZE; + + /* Only one callbacks are supported */ = + pUserMisc->dwFlags =3D pMisc.dwFlags & DDHAL_MISCCB32_GETAVAIL= DRIVERMEMORY; + pUserMisc->GetAvailDriverMemory =3D (LPDDHAL_GETAVAILDRIVERMEM= ORY) DdGetAvailDriverMemory; + + /* This callbacks are only for win9x and theirfor it is not lo= nger use in NT or ReactOS + * pUserMisc->UpdateNonLocalHeap; + * pUserMisc->GetHeapAlignment; + * pUserMisc->GetSysmemBltStatus; */ + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* Misc 2 Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_Miscellaneous2Callbac= ks)) + { + DDHAL_DDMISCELLANEOUS2CALLBACKS pMisc; + DDHAL_DDMISCELLANEOUS2CALLBACKS* pUserMisc =3D (DDHAL_DDMISCEL= LANEOUS2CALLBACKS *)pData->lpvData; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pMisc, DDMISCELLANEOUS2CALLBACKSSIZE); + pMisc.dwSize =3D DDMISCELLANEOUS2CALLBACKSSIZE; + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pMisc; = + pDrvInfoData.dwExpectedSize =3D DDMISCELLANEOUS2CALLBACKSSIZE = ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D DDMISCELLANEOUS2CALLBACKSSIZE; + + pUserMisc->dwFlags =3D pMisc.dwFlags; + + /* This functions are not documneted in MSDN for this struct, = here is directx/reactx alpha blend */ = + if ( pMisc.Reserved ) + { + pUserMisc->Reserved =3D (LPVOID) DdAlphaBlt; + } + + if ( pMisc.CreateSurfaceEx ) + { + pUserMisc->CreateSurfaceEx =3D (LPDDHAL_CREATESURFACEEX) D= dCreateSurfaceEx; + } + + if ( pMisc.GetDriverState ) + { + pUserMisc->GetDriverState =3D (LPDDHAL_GETDRIVERSTATE) NtG= diDdGetDriverState; + } + + /* NOTE : pUserMisc->DestroyDDLocal is outdated and are not be= ign tuch */ + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + /* NT Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_NTCallbacks)) + { + /* MS does not have DHAL_* version of this callbacks = + * so we are force using PDD_* callbacks here = + */ + DD_NTCALLBACKS pNtKernel; + PDD_NTCALLBACKS pUserNtKernel =3D (PDD_NTCALLBACKS)pData->lpvD= ata; + = + /* Clear internal out buffer and set it up*/ + RtlZeroMemory(&pNtKernel, sizeof(DD_NTCALLBACKS)); + pNtKernel.dwSize =3D sizeof(DD_NTCALLBACKS); + + /* set up internal buffer */ = = + pDrvInfoData.lpvData =3D (PVOID)&pNtKernel; = + pDrvInfoData.dwExpectedSize =3D sizeof(DD_NTCALLBACKS) ; = + = + /* Call win32k */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + pData->dwActualSize =3D sizeof(DD_NTCALLBACKS); + + pUserNtKernel->dwSize =3D sizeof(DD_NTCALLBACKS); + pUserNtKernel->dwFlags =3D pNtKernel.dwFlags; = + pUserNtKernel->FreeDriverMemory =3D 0; + = + if (pNtKernel.SetExclusiveMode) + { = + pUserNtKernel->SetExclusiveMode =3D (PDD_SETEXCLUSIVEMODE)= DdSetExclusiveMode; = + } + + if (pNtKernel.FlipToGDISurface) + { + pUserNtKernel->FlipToGDISurface =3D (PDD_FLIPTOGDISURFACE)= DdFlipToGDISurface; + } + + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + = + + } + + /* D3D Callbacks version 2 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks2)) + { + // FIXME GUID_D3DCallbacks2 + } + + /* D3D Callbacks version 3 check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DCallbacks3)) + { + // FIXME GUID_D3DCallbacks3 + } + + /* D3DParseUnknownCommand Callbacks check and setup for DirectX/ R= eactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_D3DParseUnknownComman= dCallback)) + { + // FIXME GUID_D3DParseUnknownCommandCallback + } + + /* MotionComp Callbacks check and setup for DirectX/ ReactX */ + else if (IsEqualGUID(&pData->guidInfo, &GUID_MotionCompCallbacks)) + { + // FIXME GUID_MotionCompCallbacks + } + + /* FIXME VPE2 Callbacks check and setup for DirectX/ ReactX */ + //else if (IsEqualGUID(&pData->guidInfo, &GUID_VPE2Callbacks)) + //{ + // FIXME GUID_VPE2Callbacks + //} + else + { + /* set up internal buffer */ = + pDrvInfoData.dwExpectedSize =3D pData->dwExpectedSize; = + pDrvInfoData.lpvData =3D pData->lpvData; + + /* We do not cover all callbacks for user mode, they are only = cover by kmode */ + retValue =3D NtGdiDdGetDriverInfo(hDD, (PDD_GETDRIVERINFODATA)= &pDrvInfoData); + + /* Setup return data */ = + pData->dwActualSize =3D pDrvInfoData.dwActualSize; + pData->lpvData =3D pDrvInfoData.lpvData; = + /* Windows XP never repot back the true return value, = + * it only report back if we have a driver or not + * ReactOS keep this behoir to be compatible with + * Windows XP + */ + pData->ddRVal =3D retValue; + } + + return retValue; } = = @@ -1594,3 +1958,4 @@ = = = +

16 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2008