Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

by fireball＠svn.reactos.org

Author: fireball Date: Fri Aug 14 21:07:41 2009 New Revision: 42666 URL: http://svn.reactos.org/svn/reactos?rev=42666&view=rev Log: - Merge 42250-42300. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/boot/freeldr/freeldr/mm/meminit.c branches/arwinss/reactos/dll/win32/msafd/msafd.h branches/arwinss/reactos/drivers/ksfilter/ks/api.c branches/arwinss/reactos/drivers/ksfilter/ks/bag.c branches/arwinss/reactos/drivers/ksfilter/ks/device.c branches/arwinss/reactos/drivers/ksfilter/ks/driver.c branches/arwinss/reactos/drivers/ksfilter/ks/event.c branches/arwinss/reactos/drivers/ksfilter/ks/filter.c branches/arwinss/reactos/drivers/ksfilter/ks/filterfactory.c branches/arwinss/reactos/drivers/ksfilter/ks/image.c branches/arwinss/reactos/drivers/ksfilter/ks/irp.c branches/arwinss/reactos/drivers/ksfilter/ks/ks.rbuild branches/arwinss/reactos/drivers/ksfilter/ks/ksfunc.h branches/arwinss/reactos/drivers/ksfilter/ks/ksiface.h branches/arwinss/reactos/drivers/ksfilter/ks/kstypes.h branches/arwinss/reactos/drivers/ksfilter/ks/misc.c branches/arwinss/reactos/drivers/ksfilter/ks/pin.c branches/arwinss/reactos/include/ddk/winddk.h branches/arwinss/reactos/include/psdk/ks.h branches/arwinss/reactos/include/reactos/win32k/ntuser.h branches/arwinss/reactos/ntoskrnl/dbgk/dbgkobj.c branches/arwinss/reactos/ntoskrnl/mm/i386/page.c branches/arwinss/reactos/ntoskrnl/mm/mmfault.c branches/arwinss/reactos/ntoskrnl/mm/mminit.c branches/arwinss/reactos/ntoskrnl/mm/section.c branches/arwinss/reactos/tools/rgenstat/module_list.txt branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msafd… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win… Modified: branches/arwinss/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks… Modified: branches/arwinss/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/dbgk/d… Modified: branches/arwinss/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/i38… Modified: branches/arwinss/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmf… Modified: branches/arwinss/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmi… Modified: branches/arwinss/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/sec… Modified: branches/arwinss/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rgenstat/…

15 years, 4 months

[fireball] 42665: - Merge 42200-42250. Without dll/win32/ws2help (causes merge problems).

by fireball＠svn.reactos.org

Author: fireball Date: Fri Aug 14 20:56:27 2009 New Revision: 42665 URL: http://svn.reactos.org/svn/reactos?rev=42665&view=rev Log: - Merge 42200-42250. Without dll/win32/ws2help (causes merge problems). Added: branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.h - copied unchanged from r42250, trunk/reactos/drivers/filesystems/fs_rec/udfs.h Removed: branches/arwinss/reactos/dll/win32/ws2help_new/ branches/arwinss/reactos/ntoskrnl/mm/npool.c Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/applications/cmdutils/dbgprint/dbgprint.c branches/arwinss/reactos/base/services/dhcp/api.c branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h branches/arwinss/reactos/boot/freeldr/freeldr/include/freeldr.h branches/arwinss/reactos/boot/freeldr/freeldr/machine.c branches/arwinss/reactos/boot/freeldr/freeldr/reactos/binhive.c branches/arwinss/reactos/boot/freeldr/freeldr/reactos/setupldr.c branches/arwinss/reactos/boot/freeldr/freeldr/rtl/libsupp.c branches/arwinss/reactos/boot/freeldr/freeldr/ui/tui.c branches/arwinss/reactos/boot/freeldr/freeldr/video/fade.c branches/arwinss/reactos/dll/win32/advapi32/sec/ac.c branches/arwinss/reactos/dll/win32/avicap32/avicap32.c branches/arwinss/reactos/dll/win32/avicap32/avicap32.spec branches/arwinss/reactos/drivers/filesystems/fs_rec/fs_rec.h branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.c branches/arwinss/reactos/drivers/filesystems/msfs/msfs.h branches/arwinss/reactos/drivers/input/i8042prt/mouse.c branches/arwinss/reactos/drivers/ksfilter/ks/irp.c branches/arwinss/reactos/drivers/network/afd/afd/lock.c branches/arwinss/reactos/drivers/network/ndis/ndis/misc.c branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c branches/arwinss/reactos/drivers/storage/ide/atapi/atapi.c branches/arwinss/reactos/drivers/video/displays/framebuf/pointer.c branches/arwinss/reactos/drivers/video/font/bmfd/bmfd.h branches/arwinss/reactos/drivers/video/font/ftfd/ftfd.h branches/arwinss/reactos/drivers/video/videoprt/agp.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.h branches/arwinss/reactos/hal/halx86/mp/apic.c branches/arwinss/reactos/hal/halx86/mp/mpsirql.c branches/arwinss/reactos/include/crt/process.h branches/arwinss/reactos/include/ddk/ddkmapi.h branches/arwinss/reactos/include/ddk/hidclass.h branches/arwinss/reactos/include/ddk/miniport.h branches/arwinss/reactos/include/ddk/ndis.h branches/arwinss/reactos/include/ddk/ntdd8042.h branches/arwinss/reactos/include/ddk/ntdef.h branches/arwinss/reactos/include/ddk/portcls.h branches/arwinss/reactos/include/ddk/scsiwmi.h branches/arwinss/reactos/include/ddk/srb.h branches/arwinss/reactos/include/ddk/stdunk.h branches/arwinss/reactos/include/ddk/tdikrnl.h branches/arwinss/reactos/include/ddk/video.h branches/arwinss/reactos/include/ddk/winddk.h branches/arwinss/reactos/include/host/typedefs.h branches/arwinss/reactos/include/ndk/dbgkfuncs.h branches/arwinss/reactos/include/psdk/delayimp.h branches/arwinss/reactos/include/psdk/ks.h branches/arwinss/reactos/include/psdk/winnt.h branches/arwinss/reactos/include/reactos/win32k/ntgdityp.h branches/arwinss/reactos/include/reactos/win32k/ntuser.h branches/arwinss/reactos/lib/drivers/ip/transport/tcp/if.c branches/arwinss/reactos/lib/drivers/ip/transport/udp/udp.c branches/arwinss/reactos/lib/sdk/delayimp/delayimp.c branches/arwinss/reactos/lib/sdk/uuid/uuid.rbuild branches/arwinss/reactos/ntoskrnl/ex/shutdown.c branches/arwinss/reactos/ntoskrnl/include/internal/mm.h branches/arwinss/reactos/ntoskrnl/kd/kdmain.c branches/arwinss/reactos/ntoskrnl/kdbg/kdb.c branches/arwinss/reactos/ntoskrnl/ke/procobj.c branches/arwinss/reactos/ntoskrnl/ke/wait.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/hypermap.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/miarm.h branches/arwinss/reactos/ntoskrnl/mm/dbgpool.c branches/arwinss/reactos/ntoskrnl/mm/freelist.c branches/arwinss/reactos/ntoskrnl/mm/i386/page.c branches/arwinss/reactos/ntoskrnl/mm/mminit.c branches/arwinss/reactos/ntoskrnl/mm/pe.c branches/arwinss/reactos/ntoskrnl/mm/pool.c branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/arwinss/reactos/tools/rbuild/module.cpp branches/arwinss/reactos/tools/rbuild/rbuild.h branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… Modified: branches/arwinss/reactos/base/services/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/services/d… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/advap… Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avica… Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avica… Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys… Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys… Modified: branches/arwinss/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys… Modified: branches/arwinss/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/input/i… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage… Modified: branches/arwinss/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage… Modified: branches/arwinss/reactos/drivers/video/displays/framebuf/pointer.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/d… Modified: branches/arwinss/reactos/drivers/video/font/bmfd/bmfd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/f… Modified: branches/arwinss/reactos/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/f… Modified: branches/arwinss/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/v… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/a… Modified: branches/arwinss/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/m… Modified: branches/arwinss/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/crt/pro… Modified: branches/arwinss/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ddk… Modified: branches/arwinss/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/hid… Modified: branches/arwinss/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/min… Modified: branches/arwinss/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ndi… Modified: branches/arwinss/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd… Modified: branches/arwinss/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd… Modified: branches/arwinss/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/por… Modified: branches/arwinss/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/scs… Modified: branches/arwinss/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/srb… Modified: branches/arwinss/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/std… Modified: branches/arwinss/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/tdi… Modified: branches/arwinss/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/vid… Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win… Modified: branches/arwinss/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/host/ty… Modified: branches/arwinss/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/dbg… Modified: branches/arwinss/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/de… Modified: branches/arwinss/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks… Modified: branches/arwinss/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Modified: branches/arwinss/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… Modified: branches/arwinss/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… Modified: branches/arwinss/reactos/lib/sdk/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/delayim… Modified: branches/arwinss/reactos/lib/sdk/uuid/uuid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/uuid/uu… Modified: branches/arwinss/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ex/shu… Modified: branches/arwinss/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/includ… Modified: branches/arwinss/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd/kdm… Modified: branches/arwinss/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kdbg/k… Modified: branches/arwinss/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/pro… Modified: branches/arwinss/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/wai… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/dbg… Modified: branches/arwinss/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/fre… Modified: branches/arwinss/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/i38… Modified: branches/arwinss/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmi… Removed: branches/arwinss/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/npo… Modified: branches/arwinss/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/pe.… Modified: branches/arwinss/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/poo… Modified: branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ntoskr… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/mo… Modified: branches/arwinss/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/rb…

15 years, 4 months

[janderwald] 42664: [KS] - Proper implement KsValidateConnectRequest - Dataformat isnt not yet checked

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 14 11:27:24 2009 New Revision: 42664 URL: http://svn.reactos.org/svn/reactos?rev=42664&view=rev Log: [KS] - Proper implement KsValidateConnectRequest - Dataformat isnt not yet checked Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Fri Aug 14 11:27:24 2009 @@ -8,6 +8,21 @@ #include "priv.h" + +KSPIN_INTERFACE StandardPinInterface = +{ + {STATIC_KSINTERFACESETID_Standard}, + KSINTERFACE_STANDARD_STREAMING, + 0 +}; + +KSPIN_MEDIUM StandardPinMedium = +{ + {STATIC_KSMEDIUMSETID_Standard}, + KSMEDIUM_TYPE_ANYINSTANCE, + 0 +}; + /* @implemented @@ -50,61 +65,112 @@ IN KSPIN_DESCRIPTOR* Descriptor, OUT PKSPIN_CONNECT* Connect) { - PIO_STACK_LOCATION IoStack; PKSPIN_CONNECT ConnectDetails; - LPWSTR PinName = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}\\"; - PKSDATAFORMAT DataFormat; - LPWSTR Offset; - - IoStack = IoGetCurrentIrpStackLocation(Irp); - if (!IoStack->FileObject->FileName.Buffer) + PKSPIN_INTERFACE Interface; + PKSPIN_MEDIUM Medium; + ULONG Size; + NTSTATUS Status; + ULONG Index; + ULONG Count; + BOOLEAN Found; + + /* did the caller miss the connect parameter */ + if (!Connect) return STATUS_INVALID_PARAMETER; - if (IoStack->FileObject->FileName.Length < wcslen(PinName) + sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT)) - return STATUS_INVALID_PARAMETER; - - Offset = wcsstr(IoStack->FileObject->FileName.Buffer, PinName); - if (!Offset) - { - /* request is not targeted for a pin */ - return STATUS_INVALID_PARAMETER; - } - - ConnectDetails = (PKSPIN_CONNECT)(Offset + wcslen(PinName)); - - if (ConnectDetails->PinToHandle != NULL) - { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; - } - + /* set create param size */ + Size = sizeof(KSPIN_CONNECT); + + /* fetch create parameters */ + Status = KspCopyCreateRequest(Irp, + KSSTRING_Pin, + &Size, + (PVOID*)&ConnectDetails); + + /* check for success */ + if (!NT_SUCCESS(Status)) + return Status; + + /* is pin id out of bounds */ if (ConnectDetails->PinId >= DescriptorsCount) return STATUS_INVALID_PARAMETER; -#if 0 - if (!IsEqualGUIDAligned(&ConnectDetails->Interface.Set, &KSINTERFACESETID_Standard) && - ConnectDetails->Interface.Id != KSINTERFACE_STANDARD_STREAMING) - { - //FIXME - // validate provided interface set - DPRINT1("FIXME\n"); - } - - if (!IsEqualGUIDAligned(&ConnectDetails->Medium.Set, &KSMEDIUMSETID_Standard) && - ConnectDetails->Medium.Id != KSMEDIUM_TYPE_ANYINSTANCE) - { - //FIXME - // validate provided medium set - DPRINT1("FIXME\n"); - } -#endif + /* does the pin have interface details filled in */ + if (Descriptor[ConnectDetails->PinId].InterfacesCount && Descriptor[ConnectDetails->PinId].Interfaces) + { + /* use provided pin interface count */ + Count = Descriptor[ConnectDetails->PinId].InterfacesCount; + Interface = (PKSPIN_INTERFACE)Descriptor[ConnectDetails->PinId].Interfaces; + } + else + { + /* use standard pin interface */ + Count = 1; + Interface = &StandardPinInterface; + } + + /* now check the interface */ + Found = FALSE; + Index = 0; + do + { + if (IsEqualGUIDAligned(&Interface[Index].Set, &ConnectDetails->Interface.Set) && + Interface[Index].Id == ConnectDetails->Interface.Id) + { + /* found a matching interface */ + Found = TRUE; + break; + } + /* iterate to next interface */ + Index++; + }while(Index < Count); + + if (!Found) + { + /* pin doesnt support this interface */ + return STATUS_NO_MATCH; + } + + /* does the pin have medium details filled in */ + if (Descriptor[ConnectDetails->PinId].MediumsCount && Descriptor[ConnectDetails->PinId].Mediums) + { + /* use provided pin interface count */ + Count = Descriptor[ConnectDetails->PinId].MediumsCount; + Medium = (PKSPIN_MEDIUM)Descriptor[ConnectDetails->PinId].Mediums; + } + else + { + /* use standard pin interface */ + Count = 1; + Medium = &StandardPinMedium; + } + + /* now check the interface */ + Found = FALSE; + Index = 0; + do + { + if (IsEqualGUIDAligned(&Medium[Index].Set, &ConnectDetails->Medium.Set) && + Medium[Index].Id == ConnectDetails->Medium.Id) + { + /* found a matching interface */ + Found = TRUE; + break; + } + /* iterate to next medium */ + Index++; + }while(Index < Count); + + if (!Found) + { + /* pin doesnt support this medium */ + return STATUS_NO_MATCH; + } /// FIXME /// implement format checking - DataFormat = (PKSDATAFORMAT) (ConnectDetails + 1); *Connect = ConnectDetails; - return STATUS_SUCCESS; }

15 years, 4 months

[janderwald] 42663: - A few header updates

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Aug 14 11:26:05 2009 New Revision: 42663 URL: http://svn.reactos.org/svn/reactos?rev=42663&view=rev Log: - A few header updates Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4266… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Fri Aug 14 11:26:05 2009 @@ -297,7 +297,7 @@ #endif #define STATIC_KSINTERFACESETID_Standard \ - 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x1A8766A0L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("1A8766A0-62CE-11CF-A5D6-28DB04C10000", KSINTERFACESETID_Standard); #define KSINTERFACESETID_Standard DEFINE_GUIDNAMED(KSINTERFACESETID_Standard) @@ -326,7 +326,7 @@ #define KSMEDIUM_TYPE_ANYINSTANCE 0 #define STATIC_KSMEDIUMSETID_Standard \ - 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("4747B320-62CE-11CF-A5D6-28DB04C10000", KSMEDIUMSETID_Standard); #define KSMEDIUMSETID_Standard DEFINE_GUIDNAMED(KSMEDIUMSETID_Standard) @@ -3625,6 +3625,22 @@ IN ULONG OUtSize, OUT PULONG BytesReturned); +KSDDKAPI +PKSPIN +NTAPI +KsFilterGetFirstChildPin( + IN PKSFILTER Filter, + IN ULONG PinId + ); + +KSDDKAPI +PFILE_OBJECT +NTAPI +KsPinGetConnectedPinFileObject( + IN PKSPIN Pin + ); + + #endif /* =============================================================== @@ -3988,11 +4004,21 @@ IN ULONG Length); +KSDDKAPI +VOID +NTAPI +KsReleaseControl( + IN PVOID Object + ); + #define KsDiscard(object, pointer) \ KsRemoveItemFromObjectBag(object->Bag, pointer, TRUE) #define KsFilterAcquireControl(Filter) \ KsAcquireControl((PVOID) Filter); + +#define KsFilterReleaseControl(Filter) \ + KsReleaseControl((PVOID) Filter); #define KsFilterAddEvent(Filter, EventEntry) \ KsAddEvent(Filter,EventEntry);

15 years, 4 months

[tkreuzer] 42662: More fix NtUserSetWindowContextHelpId. Spotted by Cameron.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 14 03:37:28 2009 New Revision: 42662 URL: http://svn.reactos.org/svn/reactos?rev=42662&view=rev Log: More fix NtUserSetWindowContextHelpId. Spotted by Cameron. Modified: trunk/reactos/dll/win32/user32/include/user32p.h Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Fri Aug 14 03:37:28 2009 @@ -41,7 +41,7 @@ (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN) #define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \ - (BOOL)NtUserCallHwndParam(hwnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) + (BOOL)NtUserCallHwndParam(hWnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) #define NtUserSetCaretPos(X, Y) \ (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS)

15 years, 4 months

[cgutman] 42661: - Fix several bugs so select() will now recognize when a connection gets closed

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 14 02:09:59 2009 New Revision: 42661 URL: http://svn.reactos.org/svn/reactos?rev=42661&view=rev Log: - Fix several bugs so select() will now recognize when a connection gets closed Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -777,6 +777,7 @@ PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE | AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | + AFD_EVENT_CLOSE | AFD_EVENT_ACCEPT; } } @@ -2397,7 +2398,7 @@ if (lNetworkEvents & FD_CLOSE) { - AsyncData->AsyncSelectInfo.Handles[0].Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT; + AsyncData->AsyncSelectInfo.Handles[0].Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE; } if (lNetworkEvents & FD_QOS) Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -76,7 +76,7 @@ } if (lNetworkEvents & FD_CLOSE) { - EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT; + EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE; } if (lNetworkEvents & FD_QOS) { @@ -206,7 +206,7 @@ } if (EnumReq.PollEvents & - (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT)) { + (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) { lpNetworkEvents->lNetworkEvents |= FD_CLOSE; } Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -184,6 +184,8 @@ if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->State = SOCKET_STATE_CLOSED; + FCB->PollState = AFD_EVENT_CLOSE; + PollReeval( FCB->DeviceExt, FCB->FileObject ); InFlightRequest[0] = &FCB->ListenIrp; InFlightRequest[1] = &FCB->ReceiveIrp; Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Fri Aug 14 02:09:59 2009 @@ -145,7 +145,7 @@ if( (PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); + SignalSocket( Poll, NULL, PollReq, STATUS_CANCELLED ); } } } @@ -353,20 +353,11 @@ FileObject = (PFILE_OBJECT)AFD_HANDLES(PollReq)[i].Handle; FCB = FileObject->FsContext; - if( (FCB->PollState & AFD_EVENT_CLOSE) || - (PollReq->Handles[i].Status & AFD_EVENT_CLOSE) ) { - AFD_HANDLES(PollReq)[i].Handle = 0; - PollReq->Handles[i].Events = 0; - PollReq->Handles[i].Status = AFD_EVENT_CLOSE; + PollReq->Handles[i].Status = PollReq->Handles[i].Events & FCB->PollState; + if( PollReq->Handles[i].Status ) { + AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n", + FCB, FCB->PollState)); Signalled++; - } else { - PollReq->Handles[i].Status = - PollReq->Handles[i].Events & FCB->PollState; - if( PollReq->Handles[i].Status ) { - AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n", - FCB, FCB->PollState)); - Signalled++; - } } }

15 years, 4 months

[cgutman] 42660: - Fix a NULL pointer dereference if ExAllocatePool fails - Move some sanity checks into the right location - Fix another NULL pointer dereference if there is not a socket on the queue - Also spotted by Amine Khaldi

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 14 01:42:21 2009 New Revision: 42660 URL: http://svn.reactos.org/svn/reactos?rev=42660&view=rev Log: - Fix a NULL pointer dereference if ExAllocatePool fails - Move some sanity checks into the right location - Fix another NULL pointer dereference if there is not a socket on the queue - Also spotted by Amine Khaldi Modified: trunk/reactos/lib/drivers/ip/network/routines.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Fri Aug 14 01:42:21 2009 @@ -117,9 +117,11 @@ NdisQueryPacket(IPPacket->NdisPacket, NULL, NULL, NULL, &Length); Length -= MaxLLHeaderSize; Buffer = exAllocatePool(NonPagedPool, Length); - Length = CopyPacketToBuffer(Buffer, IPPacket->NdisPacket, MaxLLHeaderSize, Length); - DisplayTCPHeader(Buffer, Length); - exFreePool(Buffer); + if (Buffer) { + Length = CopyPacketToBuffer(Buffer, IPPacket->NdisPacket, MaxLLHeaderSize, Length); + DisplayTCPHeader(Buffer, Length); + exFreePool(Buffer); + } } else { Buffer = IPPacket->Header; Length = IPPacket->ContigSize; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri Aug 14 01:42:21 2009 @@ -70,16 +70,16 @@ NTSTATUS Status = STATUS_SUCCESS; SOCKADDR_IN AddressToBind; - TI_DbgPrint(DEBUG_TCP,("TCPListen started\n")); - - TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", - Connection->SocketContext)); + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); ASSERT(Connection); ASSERT_KM_POINTER(Connection->SocketContext); ASSERT_KM_POINTER(Connection->AddressFile); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TI_DbgPrint(DEBUG_TCP,("TCPListen started\n")); + + TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", + Connection->SocketContext)); AddressToBind.sin_family = AF_INET; memcpy( &AddressToBind.sin_addr, Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Fri Aug 14 01:42:21 2009 @@ -358,14 +358,14 @@ so = head->so_q; inp = so ? (struct inpcb *)so->so_pcb : NULL; - if( inp ) { + if( inp && name ) { ((struct sockaddr_in *)AddrOut)->sin_addr.s_addr = inp->inp_faddr.s_addr; ((struct sockaddr_in *)AddrOut)->sin_port = inp->inp_fport; } OS_DbgPrint(OSK_MID_TRACE,("error = %d\n", error)); - if( FinishAccepting ) { + if( FinishAccepting && so ) { head->so_q = so->so_q; head->so_qlen--;

15 years, 4 months

[cgutman] 42659: - Fix a handle leak - Fix a potential NULL pointer dereference if ExAllocatePool fails - Fix a potential NULL pointer dereference that causes AFD to crash when the socket is closed with waiting send IRPs - Fix another NULL pointer dereference if NdisOpenConfiguration fails - Move ASSERT before accessing Status - Add some sanity checks - Most of these were found by Amine Khaldi

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 14 01:38:57 2009 New Revision: 42659 URL: http://svn.reactos.org/svn/reactos?rev=42659&view=rev Log: - Fix a handle leak - Fix a potential NULL pointer dereference if ExAllocatePool fails - Fix a potential NULL pointer dereference that causes AFD to crash when the socket is closed with waiting send IRPs - Fix another NULL pointer dereference if NdisOpenConfiguration fails - Move ASSERT before accessing Status - Add some sanity checks - Most of these were found by Amine Khaldi Modified: trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/tdiconn.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/info.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -207,7 +207,6 @@ if( (FCB->PollState & AFD_EVENT_CLOSE) || (PollReq->Handles[i].Status & AFD_EVENT_CLOSE) ) { - AFD_HANDLES(PollReq)[i].Handle = 0; PollReq->Handles[i].Events = 0; PollReq->Handles[i].Status = AFD_EVENT_CLOSE; Signalled++; Modified: trunk/reactos/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -44,7 +44,8 @@ PTA_ADDRESS TaCopyAddress( PTA_ADDRESS Source ) { UINT AddrLen = TaLengthOfAddress( Source ); PVOID Buffer = ExAllocatePool( NonPagedPool, AddrLen ); - RtlCopyMemory( Buffer, Source, AddrLen ); + if (Buffer) + RtlCopyMemory( Buffer, Source, AddrLen ); return Buffer; } Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -51,6 +51,8 @@ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + SendReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; NextIrp->IoStatus.Information = 0; UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -1850,6 +1850,12 @@ */ NdisOpenConfiguration(&NdisStatus, &ConfigHandle, (NDIS_HANDLE)&WrapperContext); + if (NdisStatus != NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Failed to open configuration key\n")); + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); + return NdisStatus; + } Size = sizeof(ULONG); Status = IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject, Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -237,10 +237,10 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + ASSERT ( Status && FileName ); + *Status = NDIS_STATUS_SUCCESS; FullFileName.Buffer = NULL; - - ASSERT ( Status && FileName ); FullFileName.Length = sizeof(NDIS_FILE_FOLDER); FullFileName.MaximumLength = FileName->MaximumLength + sizeof(NDIS_FILE_FOLDER); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -582,10 +582,7 @@ TI_DbgPrint(MIN_TRACE, ("Connection->AddressFile: %x\n", Connection->AddressFile )); - if( Connection->AddressFile ) { - TI_DbgPrint(MIN_TRACE, ("Connection->AddressFile->Listener: %x\n", - Connection->AddressFile->Listener)); - } + ASSERT(Connection->AddressFile); Status = DispPrepareIrpForCancel (TranContext->Handle.ConnectionContext, Modified: trunk/reactos/drivers/network/tcpip/tcpip/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/info.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -19,7 +19,7 @@ /* The driver returns success even when it couldn't fit every available * byte. */ - if( RememberedCBSize < SizeOut ) + if( RememberedCBSize < SizeOut || !ClientBuf ) return TDI_SUCCESS; else { CopyBufferToBufferChain( ClientBuf, 0, (PCHAR)DataOut, SizeOut ); @@ -99,7 +99,7 @@ TI_DbgPrint(DEBUG_INFO,("BufSize: %d, NeededSize: %d\n", BufSize, Size)); - if (BufSize < Size) + if (BufSize < Size || !Buffer) { TcpipReleaseSpinLock( &EntityListLock, OldIrql ); /* The buffer is too small to contain requested data, but we return Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Fri Aug 14 01:38:57 2009 @@ -91,20 +91,17 @@ RtCount = CopyFIBs( RCache ); while( RtCurrent < RouteEntries + RtCount ) { - /* Copy Desitnation */ + ASSERT(RCacheCur->Router); + RtlCopyMemory( &RtCurrent->Dest, &RCacheCur->NetworkAddress.Address, sizeof(RtCurrent->Dest) ); RtlCopyMemory( &RtCurrent->Mask, &RCacheCur->Netmask.Address, sizeof(RtCurrent->Mask) ); - - if( RCacheCur->Router ) - RtlCopyMemory( &RtCurrent->Gw, - &RCacheCur->Router->Address.Address, - sizeof(RtCurrent->Gw) ); - else - RtlZeroMemory( &RtCurrent->Gw, sizeof(RtCurrent->Gw) ); + RtlCopyMemory( &RtCurrent->Gw, + &RCacheCur->Router->Address.Address, + sizeof(RtCurrent->Gw) ); RtCurrent->Metric1 = RCacheCur->Metric; RtCurrent->Type = TDI_ADDRESS_TYPE_IP;

15 years, 4 months

[fireball] 42658: - Add a brush origin point to DC structure and update it before doing any operation potentially involving a brush origin (some unimplemented operations lack this). Partially fixes hatch brushes drawing.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 13 22:51:14 2009 New Revision: 42658 URL: http://svn.reactos.org/svn/reactos?rev=42658&view=rev Log: - Add a brush origin point to DC structure and update it before doing any operation potentially involving a brush origin (some unimplemented operations lack this). Partially fixes hatch brushes drawing. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -44,7 +44,7 @@ INT width, INT height, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, DWORD rop ) { - POINT pts[2]; + POINT pts[2], ptBrush; /* map source coordinates */ if (physDevSrc) @@ -67,6 +67,10 @@ LPtoDP(physDevDst->hUserDC, pts, 1); xDst = pts[0].x; yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, physDevSrc->hKernelDC, xSrc, ySrc, rop); @@ -402,7 +406,7 @@ BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) { - POINT pts[2]; + POINT pts[2], ptBrush; /* Map coordinates */ pts[0].x = left; @@ -416,6 +420,10 @@ left = pts[0].x; top = pts[0].y; + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); } @@ -442,6 +450,7 @@ { register int i; POINT *points; + POINT ptBrush; if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * (count+1) ))) { @@ -457,6 +466,10 @@ } points[count] = points[0]; + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + /* Call kernel mode */ RosGdiPolygon(physDev->hKernelDC, points, count+1); @@ -503,6 +516,7 @@ BOOL CDECL RosDrv_Rectangle(NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) { + POINT ptBrush; RECT rc; /* Convert coordinates */ @@ -513,6 +527,10 @@ if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); RosGdiRectangle(physDev->hKernelDC, &rc); @@ -731,7 +749,7 @@ NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, DWORD rop ) { - POINT pts[2]; + POINT pts[2], ptBrush; /* map source coordinates */ if (physDevSrc) @@ -759,6 +777,10 @@ xDst = pts[0].x; yDst = pts[0].y; + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); } Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -108,6 +108,7 @@ COLORREF APIENTRY RosGdiSetBkColor( HDC physDev, COLORREF color ); COLORREF APIENTRY RosGdiSetDCBrushColor( HDC physDev, COLORREF crColor ); DWORD APIENTRY RosGdiSetDCOrg( HDC physDev, INT x, INT y ); +VOID APIENTRY RosGdiSetBrushOrg( HDC physDev, INT x, INT y ); COLORREF APIENTRY RosGdiSetDCPenColor( HDC physDev, COLORREF crColor ); void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ); BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -423,6 +423,21 @@ return 0; } +VOID APIENTRY RosGdiSetBrushOrg( HDC physDev, INT x, INT y ) +{ + PDC pDC; + + /* Get a pointer to the DC */ + pDC = DC_Lock(physDev); + + /* Set brush origin */ + pDC->ptBrushOrg.x = x; + pDC->ptBrushOrg.y = y; + + /* Release the object */ + DC_Unlock(pDC); +} + COLORREF APIENTRY RosGdiSetDCPenColor( HDC physDev, COLORREF crColor ) { UNIMPLEMENTED; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -200,8 +200,7 @@ INT XSrc, INT YSrc, DWORD rop) { BOOLEAN bRet; - POINT BrushOrigin = {0,0}; - POINT SourcePoint; + POINT SourcePoint, BrushOrigin; RECTL DestRect; XLATEOBJ *XlateObj = NULL; BOOL UsesSource = ROP3_USES_SOURCE(rop); @@ -238,6 +237,9 @@ return FALSE; } } + + BrushOrigin.x = pDest->ptBrushOrg.x + pDest->rcDcRect.left; + BrushOrigin.y = pDest->ptBrushOrg.y + pDest->rcDcRect.top; /* Perform the bitblt operation */ bRet = GrepBitBltEx( @@ -302,8 +304,8 @@ DestRect.right += pDC->rcVport.left + pDC->rcDcRect.left; DestRect.bottom += pDC->rcVport.top + pDC->rcDcRect.top; - //BrushOrigin.x = BrushObj->ptOrigin.x + pDC->ptVportOrg.x; - //BrushOrigin.y = BrushObj->ptOrigin.y + pDC->ptVportOrg.y; + BrushOrigin.x = pDC->ptBrushOrg.x + pDC->rcDcRect.left; + BrushOrigin.y = pDC->ptBrushOrg.y + pDC->rcDcRect.top; bRet = GrepBitBltEx( &pDC->pBitmap->SurfObj, @@ -377,8 +379,8 @@ SourceRect.bottom += DCSrc->rcVport.top + DCSrc->rcDcRect.top; } - BrushOrigin.x = 0; - BrushOrigin.y = 0; + BrushOrigin.x = DCDest->ptBrushOrg.x + DCDest->rcDcRect.left; + BrushOrigin.y = DCDest->ptBrushOrg.y + DCDest->rcDcRect.top; /* Determine surfaces to be used in the bitblt */ BitmapDest = DCDest->pBitmap; @@ -401,10 +403,6 @@ goto failed; } } - - /* Offset the brush */ - BrushOrigin.x += DCDest->rcVport.left + DCDest->rcDcRect.left; - BrushOrigin.y += DCDest->rcVport.top + DCDest->rcDcRect.top; /* Make mask surface for source surface */ if (BitmapSrc && DCMask) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -27,21 +27,21 @@ BOOLEAN bRet; RECTL DestRect; MIX Mix; - POINT BrushOrigin = {0, 0}; + POINT BrushOrigin; DestRect.left = LeftRect + pDC->rcDcRect.left + pDC->rcVport.left; DestRect.right = RightRect + pDC->rcDcRect.left + pDC->rcVport.left; DestRect.top = TopRect + pDC->rcDcRect.top + pDC->rcVport.top; DestRect.bottom = BottomRect + pDC->rcDcRect.top + pDC->rcVport.top; + BrushOrigin.x = pDC->ptBrushOrg.x + pDC->rcDcRect.left; + BrushOrigin.y = pDC->ptBrushOrg.y + pDC->rcDcRect.top; + /* Draw brush-based rectangle */ if (pDC->pFillBrush) { if (!(pDC->pFillBrush->flAttrs & GDIBRUSH_IS_NULL)) { - //BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin); - //BrushOrigin.x += dc->ptlDCOrig.x; - //BrushOrigin.y += dc->ptlDCOrig.y; bRet = GrepBitBltEx(&pDC->pBitmap->SurfObj, NULL, NULL, @@ -102,7 +102,7 @@ RECTL DestRect; MIX Mix; INT i; - POINT BrushOrigin = {0, 0}; + POINT BrushOrigin; // HACK DestRect.left = 0; @@ -110,14 +110,14 @@ DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; + BrushOrigin.x = pDC->ptBrushOrg.x + pDC->rcDcRect.left; + BrushOrigin.y = pDC->ptBrushOrg.y + pDC->rcDcRect.top; + /* Draw brush-based polygon */ if (pDC->pFillBrush) { if (!(pDC->pFillBrush->flAttrs & GDIBRUSH_IS_NULL)) { - //BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin); - //BrushOrigin.x += dc->ptlDCOrig.x; - //BrushOrigin.y += dc->ptlDCOrig.y; GrepFillPolygon(pDC, &pDC->pBitmap->SurfObj, &pDC->pFillBrush->BrushObj, Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -14,8 +14,9 @@ COLORREF crBackgroundClr; /* Origins and extents */ - RECT rcDcRect; /* Relative to Vport */ - RECT rcVport; + RECT rcDcRect; /* Relative to Vport */ + RECT rcVport; + POINT ptBrushOrg; /* Combined clipping region */ CLIPOBJ *CombinedClip; Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Thu Aug 13 22:51:14 2009 @@ -24,6 +24,7 @@ RosGdiSetBkColor 2 RosGdiSetDCBrushColor 2 RosGdiSetDCOrg 3 +RosGdiSetBrushOrg 3 RosGdiSetDCPenColor 2 RosGdiSetDeviceClipping 4 RosGdiSetDeviceGammaRamp 2

15 years, 4 months

[fireball] 42657: - Create XlateObject for brushes having a bitmap. Partially fixes drawing with these kind of brushes. - Set iSolidColor back to reserved value, otherwise pattern won't be drawn.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 13 21:12:37 2009 New Revision: 42657 URL: http://svn.reactos.org/svn/reactos?rev=42657&view=rev Log: - Create XlateObject for brushes having a bitmap. Partially fixes drawing with these kind of brushes. - Set iSolidColor back to reserved value, otherwise pattern won't be drawn. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -227,6 +227,41 @@ DC_Unlock(pDC); return TRUE; +} + +// TODO: Move somewhere, give it a better name +XLATEOBJ *GrepBrushCreateXlate(PDC pDC, PBRUSHGDI pBrush, COLORREF lbColor) +{ + SURFACE *pSurfPattern; + HPALETTE hPalette; + + pSurfPattern = SURFACE_Lock(pBrush->hbmPattern); + if (!pSurfPattern) return NULL; + + /* Get default palette */ + hPalette = pDC->pBitmap->hDIBPalette; + if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; + + /* Special case: 1bpp pattern */ + if (pSurfPattern->SurfObj.iBitmapFormat == BMF_1BPP) + { + if (BitsPerFormat(pDC->pBitmap->SurfObj.iBitmapFormat) != 1) + { + pBrush->XlateObject = + IntEngCreateSrcMonoXlate(hPalette, + pDC->crBackgroundClr, + lbColor); + } + } + else if (pBrush->flAttrs & GDIBRUSH_IS_DIB) + { + pBrush->XlateObject = + IntEngCreateXlate(0, 0, hPalette, pSurfPattern->hDIBPalette); + } + + SURFACE_Unlock(pSurfPattern); + + return pBrush->XlateObject; } VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ) @@ -281,6 +316,12 @@ break; } + /* Create XLATE for hatched/pattern brushes */ + if (pLogBrush->lbStyle == BS_HATCHED || pLogBrush->lbStyle == BS_PATTERN) + { + GrepBrushCreateXlate(pDC, pDC->pFillBrush, pLogBrush->lbColor); + } + /* Release the object */ DC_Unlock(pDC); } @@ -320,6 +361,12 @@ NULL, 0, TRUE); + + /* Create XLATE if necessary */ + if (pDC->pLineBrush && pDC->pLineBrush->flAttrs & GDIBRUSH_IS_BITMAP) + { + GrepBrushCreateXlate(pDC, pDC->pLineBrush, pLogPen->lopnColor); + } } else { @@ -335,6 +382,12 @@ pExtLogPen->elpStyleEntry, 0, FALSE); + + /* Create XLATE if necessary */ + if (pDC->pLineBrush && pDC->pLineBrush->flAttrs & GDIBRUSH_IS_BITMAP) + { + GrepBrushCreateXlate(pDC, pDC->pLineBrush, pExtLogPen->elpColor); + } } /* Release the object */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/brushobj.c [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -259,7 +259,7 @@ SURFACE_Unlock(pPattern); /* Set color to the reserved value */ - pBrush->BrushObj.iSolidColor = crColor & 0xFFFFFF; + pBrush->BrushObj.iSolidColor = 0xFFFFFFFF; /* Return newly created brush */ return pBrush; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -114,8 +114,8 @@ USHORT *lpIndex; PPALETTE palGDI; - palGDI = PALETTE_LockPalette(dc->hPalette); - + palGDI = NULL;//PALETTE_LockPalette(dc->hPalette); + UNIMPLEMENTED; if (NULL == palGDI) { return NULL; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -6,9 +6,6 @@ BASEOBJECT BaseObject; PPDEVOBJ pPDevice; - - /* Device palette */ - HPALETTE hPalette; PSURFACE pBitmap; PBRUSHGDI pFillBrush; Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/xlateobj.h [iso-8859-1] Thu Aug 13 21:12:37 2009 @@ -26,6 +26,9 @@ IntEngCreateXlate(USHORT DestPalType, USHORT SourcePalType, HPALETTE PaletteDest, HPALETTE PaletteSource); +XLATEOBJ* FASTCALL +IntEngCreateSrcMonoXlate(HPALETTE PaletteDest, ULONG Color0, ULONG Color1); + VOID FASTCALL EngDeleteXlate(XLATEOBJ *XlateObj);

15 years, 4 months

← Newer
1
...
29
30
31
32
33
34
35
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009