Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 35599: - Remove deprecated makefile
by sginsberg＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: sginsberg Date: Sun Aug 24 10:42:30 2008 New Revision: 35599 URL: http://svn.reactos.org/svn/reactos?rev=35599&view=rev Log: - Remove deprecated makefile Removed: trunk/reactos/boot/freeldr/rules.mak Removed: trunk/reactos/boot/freeldr/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/rules.mak?rev… ============================================================================== --- trunk/reactos/boot/freeldr/rules.mak [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/rules.mak (removed) @@ -1,4 +1,0 @@ -include $(PATH_TO_TOP)/rules.mak - -BIN2C = ..$(SEP)tools$(SEP)bin2c -FREELDR_TOOLS_PATH = ..$(SEP)tools

1 0

[sginsberg] 35598: - Formatting and comment fixes (no code change)
by sginsberg＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: sginsberg Date: Sun Aug 24 10:41:13 2008 New Revision: 35598 URL: http://svn.reactos.org/svn/reactos?rev=35598&view=rev Log: - Formatting and comment fixes (no code change) Modified: trunk/reactos/ntoskrnl/ke/profobj.c Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sun Aug 24 10:41:13 2008 @@ -1,13 +1,13 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/profile.c + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/ke/profobj.c * PURPOSE: Kernel Profiling - * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES *****************************************************************/ + #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> @@ -68,8 +68,8 @@ KeAcquireSpinLockAtDpcLevel(&KiProfileLock); /* Make sure it's not running */ - if (!Profile->Started) { - + if (!Profile->Started) + { /* Set it as Started */ Profile->Buffer = Buffer; Profile->Started = TRUE; @@ -77,13 +77,15 @@ /* Get the process, if any */ ProfileProcess = Profile->Process; - /* Insert it into the Process List or Global List */ - if (ProfileProcess) { - + /* Check where we should insert it */ + if (ProfileProcess) + { + /* Insert it into the Process List */ InsertTailList(&ProfileProcess->ProfileListHead, &Profile->ProfileListEntry); - - } else { - + } + else + { + /* Insert it into the Global List */ InsertTailList(&KiProfileListHead, &Profile->ProfileListEntry); } @@ -91,14 +93,15 @@ LIST_FOR_EACH(CurrentSource, &KiProfileSourceListHead, KPROFILE_SOURCE_OBJECT, ListEntry) { /* Check if it's the same as the one being requested now */ - if (CurrentSource->Source == Profile->Source) { + if (CurrentSource->Source == Profile->Source) + { break; } } /* See if the loop found something */ - if (!CurrentSource) { - + if (!CurrentSource) + { /* Nothing found, use our allocated buffer */ CurrentSource = SourceBuffer; @@ -134,8 +137,8 @@ KeAcquireSpinLockAtDpcLevel(&KiProfileLock); /* Make sure it's running */ - if (Profile->Started) { - + if (Profile->Started) + { /* Remove it from the list and disable */ RemoveEntryList(&Profile->ProfileListEntry); Profile->Started = FALSE; @@ -143,7 +146,8 @@ /* Find the Source Object */ LIST_FOR_EACH(CurrentSource, &KiProfileSourceListHead, KPROFILE_SOURCE_OBJECT, ListEntry) { - if (CurrentSource->Source == Profile->Source) { + if (CurrentSource->Source == Profile->Source) + { /* Remove it */ RemoveEntryList(&CurrentSource->ListEntry); break; @@ -171,13 +175,13 @@ KeQueryIntervalProfile(KPROFILE_SOURCE ProfileSource) { /* Check if this is the timer profile */ - if (ProfileSource == ProfileTime) { - + if (ProfileSource == ProfileTime) + { /* Return the good old 100ns sampling interval */ return KiProfileTimeInterval; - - } else { - + } + else + { /* Request it from HAL. FIXME: What structure is used? */ HalQuerySystemInformation(HalProfileSourceInformation, sizeof(NULL), @@ -194,18 +198,17 @@ ULONG Interval) { /* Check if this is the timer profile */ - if (ProfileSource == ProfileTime) { - + if (ProfileSource == ProfileTime) + { /* Set the good old 100ns sampling interval */ KiProfileTimeInterval = Interval; - - } else { - + } + else + { /* Set it with HAL. FIXME: What structure is used? */ HalSetSystemInformation(HalProfileSourceInformation, sizeof(NULL), NULL); - } } @@ -236,8 +239,8 @@ #ifdef _M_IX86 if ((Profile->Source != Source) || (TrapFrame->Eip < (ULONG_PTR)Profile->RangeBase) || - (TrapFrame->Eip > (ULONG_PTR)Profile->RangeLimit)) { - + (TrapFrame->Eip > (ULONG_PTR)Profile->RangeLimit)) + { continue; }

1 0

[cgutman] 35597: - Add some missing calls to PollReeval - Move an existing PollReeval to always be called
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 08:56:35 2008 New Revision: 35597 URL: http://svn.reactos.org/svn/reactos?rev=35597&view=rev Log: - Add some missing calls to PollReeval - Move an existing PollReeval to always be called Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 24 08:56:35 2008 @@ -98,6 +98,7 @@ if( FCB->Recv.BytesUsed == FCB->Recv.Content ) { FCB->Recv.BytesUsed = FCB->Recv.Content = 0; FCB->PollState &= ~AFD_EVENT_RECEIVE; + PollReeval( FCB->DeviceExt, FCB->FileObject ); if( !FCB->ReceiveIrp.InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Sun Aug 24 08:56:35 2008 @@ -140,8 +140,9 @@ SocketCalloutLeave( FCB ); } else { FCB->PollState |= AFD_EVENT_SEND; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } + } + + PollReeval( FCB->DeviceExt, FCB->FileObject ); if( TotalBytesCopied > 0 ) { UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); @@ -395,6 +396,8 @@ FCB->EventsFired &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) return UnlockAndMaybeComplete

1 0

[cgutman] 35596: - Fail if DatagramRecv->Address is NULL
by cgutman＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: cgutman Date: Sun Aug 24 08:25:19 2008 New Revision: 35596 URL: http://svn.reactos.org/svn/reactos?rev=35596&view=rev Log: - Fail if DatagramRecv->Address is NULL Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 24 08:25:19 2008 @@ -480,12 +480,16 @@ DatagramRecv->Address = TaCopyTransportAddress( FCB->AddressFrom->RemoteAddress ); - InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); + if( !DatagramRecv->Address ) Status = STATUS_NO_MEMORY; + } else Status = STATUS_NO_MEMORY; if( !NT_SUCCESS( Status ) ) { + if( DatagramRecv ) ExFreePool( DatagramRecv ); SocketStateUnlock( FCB ); return Status; + } else { + InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); } /* Satisfy as many requests as we can */

1 0

[arty] 35595: Finish merging up. We're fairly current after this.
by arty＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: arty Date: Sun Aug 24 08:01:29 2008 New Revision: 35595 URL: http://svn.reactos.org/svn/reactos?rev=35595&view=rev Log: Finish merging up. We're fairly current after this. Added: branches/arty-newcc/include/ddk/ - copied from r35365, trunk/reactos/include/ddk/ branches/arty-newcc/include/ddk/afilter.h - copied unchanged from r35365, trunk/reactos/include/ddk/afilter.h branches/arty-newcc/include/ddk/amtvuids.h - copied unchanged from r35365, trunk/reactos/include/ddk/amtvuids.h branches/arty-newcc/include/ddk/atm.h - copied unchanged from r35365, trunk/reactos/include/ddk/atm.h branches/arty-newcc/include/ddk/atsmedia.h - copied unchanged from r35365, trunk/reactos/include/ddk/atsmedia.h branches/arty-newcc/include/ddk/batclass.h - copied unchanged from r35365, trunk/reactos/include/ddk/batclass.h branches/arty-newcc/include/ddk/cfg.h - copied unchanged from r35365, trunk/reactos/include/ddk/cfg.h branches/arty-newcc/include/ddk/cfgmgr32.h - copied unchanged from r35365, trunk/reactos/include/ddk/cfgmgr32.h branches/arty-newcc/include/ddk/compstui.h - copied unchanged from r35365, trunk/reactos/include/ddk/compstui.h branches/arty-newcc/include/ddk/csq.h - copied unchanged from r35365, trunk/reactos/include/ddk/csq.h branches/arty-newcc/include/ddk/d3dhal.h - copied unchanged from r35365, trunk/reactos/include/ddk/d3dhal.h branches/arty-newcc/include/ddk/d3dhalex.h - copied unchanged from r35365, trunk/reactos/include/ddk/d3dhalex.h branches/arty-newcc/include/ddk/d3dnthal.h - copied unchanged from r35365, trunk/reactos/include/ddk/d3dnthal.h branches/arty-newcc/include/ddk/d4drvif.h - copied unchanged from r35365, trunk/reactos/include/ddk/d4drvif.h branches/arty-newcc/include/ddk/d4iface.h - copied unchanged from r35365, trunk/reactos/include/ddk/d4iface.h branches/arty-newcc/include/ddk/dciddi.h - copied unchanged from r35365, trunk/reactos/include/ddk/dciddi.h branches/arty-newcc/include/ddk/dderror.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/dderror.h branches/arty-newcc/include/ddk/ddkernel.h - copied unchanged from r35365, trunk/reactos/include/ddk/ddkernel.h branches/arty-newcc/include/ddk/ddkmapi.h - copied unchanged from r35365, trunk/reactos/include/ddk/ddkmapi.h branches/arty-newcc/include/ddk/ddrawi.h - copied unchanged from r35365, trunk/reactos/include/ddk/ddrawi.h branches/arty-newcc/include/ddk/ddrawint.h - copied unchanged from r35365, trunk/reactos/include/ddk/ddrawint.h branches/arty-newcc/include/ddk/diskguid.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/diskguid.h branches/arty-newcc/include/ddk/dmemmgr.h - copied unchanged from r35365, trunk/reactos/include/ddk/dmemmgr.h branches/arty-newcc/include/ddk/drivinit.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/drivinit.h branches/arty-newcc/include/ddk/drmk.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/drmk.h branches/arty-newcc/include/ddk/dvp.h - copied unchanged from r35365, trunk/reactos/include/ddk/dvp.h branches/arty-newcc/include/ddk/dxapi.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/dxapi.h branches/arty-newcc/include/ddk/fltsafe.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/fltsafe.h branches/arty-newcc/include/ddk/hidclass.h - copied unchanged from r35365, trunk/reactos/include/ddk/hidclass.h branches/arty-newcc/include/ddk/hidpi.h - copied unchanged from r35365, trunk/reactos/include/ddk/hidpi.h branches/arty-newcc/include/ddk/hidusage.h - copied unchanged from r35365, trunk/reactos/include/ddk/hidusage.h branches/arty-newcc/include/ddk/ide.h - copied unchanged from r35365, trunk/reactos/include/ddk/ide.h branches/arty-newcc/include/ddk/ieverp.h - copied unchanged from r35365, trunk/reactos/include/ddk/ieverp.h branches/arty-newcc/include/ddk/imm.h - copied unchanged from r35365, trunk/reactos/include/ddk/imm.h branches/arty-newcc/include/ddk/ioaccess.h - copied unchanged from r35365, trunk/reactos/include/ddk/ioaccess.h branches/arty-newcc/include/ddk/isguids.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/isguids.h branches/arty-newcc/include/ddk/kbdmou.h - copied unchanged from r35365, trunk/reactos/include/ddk/kbdmou.h branches/arty-newcc/include/ddk/kcom.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/kcom.h branches/arty-newcc/include/ddk/ksdebug.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/ksdebug.h branches/arty-newcc/include/ddk/ksuuids.h - copied unchanged from r35365, trunk/reactos/include/ddk/ksuuids.h branches/arty-newcc/include/ddk/lmon.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/lmon.h branches/arty-newcc/include/ddk/mcd.h - copied unchanged from r35365, trunk/reactos/include/ddk/mcd.h branches/arty-newcc/include/ddk/miniport.h - copied unchanged from r35365, trunk/reactos/include/ddk/miniport.h branches/arty-newcc/include/ddk/minitape.h - copied unchanged from r35365, trunk/reactos/include/ddk/minitape.h branches/arty-newcc/include/ddk/mountdev.h - copied unchanged from r35365, trunk/reactos/include/ddk/mountdev.h branches/arty-newcc/include/ddk/mountmgr.h - copied unchanged from r35365, trunk/reactos/include/ddk/mountmgr.h branches/arty-newcc/include/ddk/ndis.h - copied unchanged from r35365, trunk/reactos/include/ddk/ndis.h branches/arty-newcc/include/ddk/ndisguid.h - copied unchanged from r35365, trunk/reactos/include/ddk/ndisguid.h branches/arty-newcc/include/ddk/ndistapi.h - copied unchanged from r35365, trunk/reactos/include/ddk/ndistapi.h branches/arty-newcc/include/ddk/ndiswan.h - copied unchanged from r35365, trunk/reactos/include/ddk/ndiswan.h branches/arty-newcc/include/ddk/netevent.h - copied unchanged from r35365, trunk/reactos/include/ddk/netevent.h branches/arty-newcc/include/ddk/netpnp.h - copied unchanged from r35365, trunk/reactos/include/ddk/netpnp.h branches/arty-newcc/include/ddk/nettypes.h - copied unchanged from r35365, trunk/reactos/include/ddk/nettypes.h branches/arty-newcc/include/ddk/newdev.h - copied unchanged from r35365, trunk/reactos/include/ddk/newdev.h branches/arty-newcc/include/ddk/ntagp.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntagp.h branches/arty-newcc/include/ddk/ntdd1394.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntdd1394.h branches/arty-newcc/include/ddk/ntdd1934.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntdd1934.h branches/arty-newcc/include/ddk/ntdd8042.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntdd8042.h branches/arty-newcc/include/ddk/ntddbeep.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddbeep.h branches/arty-newcc/include/ddk/ntddcdrm.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddcdrm.h branches/arty-newcc/include/ddk/ntddcdvd.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddcdvd.h branches/arty-newcc/include/ddk/ntddchgr.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddchgr.h branches/arty-newcc/include/ddk/ntdddisk.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntdddisk.h branches/arty-newcc/include/ddk/ntddft.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/ntddft.h branches/arty-newcc/include/ddk/ntddk.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddk.h branches/arty-newcc/include/ddk/ntddkbd.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddkbd.h branches/arty-newcc/include/ddk/ntddmou.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddmou.h branches/arty-newcc/include/ddk/ntddndis.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddndis.h branches/arty-newcc/include/ddk/ntddpar.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddpar.h branches/arty-newcc/include/ddk/ntddpcm.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddpcm.h branches/arty-newcc/include/ddk/ntddscsi.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddscsi.h branches/arty-newcc/include/ddk/ntddser.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddser.h branches/arty-newcc/include/ddk/ntddstor.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddstor.h branches/arty-newcc/include/ddk/ntddtape.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddtape.h branches/arty-newcc/include/ddk/ntddtdi.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddtdi.h branches/arty-newcc/include/ddk/ntddvdeo.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddvdeo.h branches/arty-newcc/include/ddk/ntddvol.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntddvol.h branches/arty-newcc/include/ddk/ntifs.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntifs.h branches/arty-newcc/include/ddk/ntnls.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntnls.h branches/arty-newcc/include/ddk/ntpoapi.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntpoapi.h branches/arty-newcc/include/ddk/ntstatus.h - copied unchanged from r35365, trunk/reactos/include/ddk/ntstatus.h branches/arty-newcc/include/ddk/ntstrsafe.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/ntstrsafe.h branches/arty-newcc/include/ddk/objerror.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/objerror.h branches/arty-newcc/include/ddk/oprghdlr.h - copied unchanged from r35365, trunk/reactos/include/ddk/oprghdlr.h branches/arty-newcc/include/ddk/parallel.h - copied unchanged from r35365, trunk/reactos/include/ddk/parallel.h branches/arty-newcc/include/ddk/pfhook.h - copied unchanged from r35365, trunk/reactos/include/ddk/pfhook.h branches/arty-newcc/include/ddk/poclass.h - copied unchanged from r35365, trunk/reactos/include/ddk/poclass.h branches/arty-newcc/include/ddk/polarity.h - copied unchanged from r35365, trunk/reactos/include/ddk/polarity.h branches/arty-newcc/include/ddk/portcls.h - copied unchanged from r35365, trunk/reactos/include/ddk/portcls.h branches/arty-newcc/include/ddk/prntfont.h - copied unchanged from r35365, trunk/reactos/include/ddk/prntfont.h branches/arty-newcc/include/ddk/punknown.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/punknown.h branches/arty-newcc/include/ddk/scsi.h - copied unchanged from r35365, trunk/reactos/include/ddk/scsi.h branches/arty-newcc/include/ddk/scsiscan.h - copied unchanged from r35365, trunk/reactos/include/ddk/scsiscan.h branches/arty-newcc/include/ddk/scsiwmi.h - copied unchanged from r35365, trunk/reactos/include/ddk/scsiwmi.h branches/arty-newcc/include/ddk/smbus.h - copied unchanged from r35365, trunk/reactos/include/ddk/smbus.h branches/arty-newcc/include/ddk/srb.h - copied unchanged from r35365, trunk/reactos/include/ddk/srb.h branches/arty-newcc/include/ddk/stdunk.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/stdunk.h branches/arty-newcc/include/ddk/stierr.h - copied unchanged from r35365, trunk/reactos/include/ddk/stierr.h branches/arty-newcc/include/ddk/stireg.h - copied unchanged from r35365, trunk/reactos/include/ddk/stireg.h branches/arty-newcc/include/ddk/storport.h - copied unchanged from r35365, trunk/reactos/include/ddk/storport.h branches/arty-newcc/include/ddk/tdi.h - copied unchanged from r35365, trunk/reactos/include/ddk/tdi.h branches/arty-newcc/include/ddk/tdiinfo.h - copied unchanged from r35365, trunk/reactos/include/ddk/tdiinfo.h branches/arty-newcc/include/ddk/tdikrnl.h - copied, changed from r35365, trunk/reactos/include/ddk/tdikrnl.h branches/arty-newcc/include/ddk/tdistat.h - copied unchanged from r35365, trunk/reactos/include/ddk/tdistat.h branches/arty-newcc/include/ddk/tvout.h - copied unchanged from r35365, trunk/reactos/include/ddk/tvout.h branches/arty-newcc/include/ddk/unknown.h - copied unchanged from r35365, trunk/reactos/include/ddk/unknown.h branches/arty-newcc/include/ddk/upssvc.h - copied unchanged from r35365, trunk/reactos/include/ddk/upssvc.h branches/arty-newcc/include/ddk/usb.h - copied unchanged from r35365, trunk/reactos/include/ddk/usb.h branches/arty-newcc/include/ddk/usb100.h - copied unchanged from r35365, trunk/reactos/include/ddk/usb100.h branches/arty-newcc/include/ddk/usb200.h - copied unchanged from r35365, trunk/reactos/include/ddk/usb200.h branches/arty-newcc/include/ddk/usbcamdi.h - copied unchanged from r35365, trunk/reactos/include/ddk/usbcamdi.h branches/arty-newcc/include/ddk/usbdi.h - copied unchanged from r35365, trunk/reactos/include/ddk/usbdi.h branches/arty-newcc/include/ddk/usbioctl.h - copied unchanged from r35365, trunk/reactos/include/ddk/usbioctl.h branches/arty-newcc/include/ddk/usbiodef.h - copied unchanged from r35365, trunk/reactos/include/ddk/usbiodef.h branches/arty-newcc/include/ddk/usbkern.h - copied unchanged from r35365, trunk/reactos/include/ddk/usbkern.h branches/arty-newcc/include/ddk/usbprint.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/usbprint.h branches/arty-newcc/include/ddk/usbscan.h - copied unchanged from r35365, trunk/reactos/include/ddk/usbscan.h branches/arty-newcc/include/ddk/usbuser.h - copied unchanged from r35365, trunk/reactos/include/ddk/usbuser.h branches/arty-newcc/include/ddk/video.h - copied unchanged from r35365, trunk/reactos/include/ddk/video.h branches/arty-newcc/include/ddk/videoagp.h - copied unchanged from r35365, trunk/reactos/include/ddk/videoagp.h branches/arty-newcc/include/ddk/warning.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/warning.h branches/arty-newcc/include/ddk/wdm.h (contents, props changed) - copied, changed from r35365, trunk/reactos/include/ddk/wdm.h branches/arty-newcc/include/ddk/wdmguid.h - copied unchanged from r35365, trunk/reactos/include/ddk/wdmguid.h branches/arty-newcc/include/ddk/win2k.h - copied unchanged from r35365, trunk/reactos/include/ddk/win2k.h branches/arty-newcc/include/ddk/winddi.h - copied unchanged from r35365, trunk/reactos/include/ddk/winddi.h branches/arty-newcc/include/ddk/winddk.h - copied, changed from r35365, trunk/reactos/include/ddk/winddk.h branches/arty-newcc/include/ddk/winnt4.h - copied unchanged from r35365, trunk/reactos/include/ddk/winnt4.h branches/arty-newcc/include/ddk/winxp.h - copied unchanged from r35365, trunk/reactos/include/ddk/winxp.h branches/arty-newcc/include/ddk/ws2san.h - copied unchanged from r35365, trunk/reactos/include/ddk/ws2san.h branches/arty-newcc/include/ddk/xfilter.h - copied unchanged from r35365, trunk/reactos/include/ddk/xfilter.h branches/arty-newcc/include/ddk/xmldsodid.h - copied unchanged from r35365, trunk/reactos/include/ddk/xmldsodid.h Modified: branches/arty-newcc/base/applications/cmdutils/more/lang/fr-FR.rc branches/arty-newcc/base/applications/games/solitaire/lang/fr-FR.rc branches/arty-newcc/base/applications/msconfig/lang/fr-FR.rc branches/arty-newcc/base/applications/msconfig/lang/no-NO.rc branches/arty-newcc/base/applications/mscutils/devmgmt/lang/fr-FR.rc branches/arty-newcc/base/applications/mscutils/eventvwr/lang/fr-FR.rc branches/arty-newcc/base/applications/mscutils/servman/lang/fr-FR.rc branches/arty-newcc/base/applications/mstsc/lang/no-NO.rc branches/arty-newcc/base/applications/network/ipconfig/lang/no-NO.rc branches/arty-newcc/base/applications/regedit/lang/it-IT.rc branches/arty-newcc/base/setup/reactos/lang/it-IT.rc branches/arty-newcc/base/setup/usetup/cabinet.c branches/arty-newcc/base/setup/usetup/filesup.c branches/arty-newcc/base/setup/usetup/format.c branches/arty-newcc/base/setup/usetup/fslist.c branches/arty-newcc/base/shell/cmd/alias.c branches/arty-newcc/base/shell/cmd/cmd.c branches/arty-newcc/base/shell/cmd/cmdinput.c branches/arty-newcc/base/shell/cmd/start.c branches/arty-newcc/base/system/format/lang/sk-SK.rc branches/arty-newcc/base/system/regsvr32/lang/fr-FR.rc branches/arty-newcc/boot/freeldr/freeldr/arch/i386/loader.c branches/arty-newcc/boot/freeldr/freeldr/bootmgr.c branches/arty-newcc/boot/freeldr/freeldr/include/freeldr.h branches/arty-newcc/boot/freeldr/freeldr/include/ramdisk.h branches/arty-newcc/drivers/filesystems/cdfs/finfo.c branches/arty-newcc/drivers/filesystems/fastfat/close.c branches/arty-newcc/drivers/filesystems/fastfat/create.c branches/arty-newcc/drivers/filesystems/fastfat/dir.c branches/arty-newcc/drivers/filesystems/fastfat/fat.c branches/arty-newcc/drivers/filesystems/fastfat/fcb.c branches/arty-newcc/drivers/filesystems/fastfat/finfo.c branches/arty-newcc/drivers/filesystems/fastfat/misc.c branches/arty-newcc/drivers/filesystems/fastfat/rw.c branches/arty-newcc/drivers/filesystems/fastfat/vfat.h branches/arty-newcc/drivers/filesystems/fastfat/volume.c branches/arty-newcc/drivers/filesystems/fs_rec/blockdev.c branches/arty-newcc/drivers/filesystems/fs_rec/fat.c branches/arty-newcc/drivers/filesystems/fs_rec/fs_rec.c branches/arty-newcc/drivers/network/afd/afd/connect.c branches/arty-newcc/drivers/network/afd/afd/context.c branches/arty-newcc/drivers/network/afd/afd/info.c branches/arty-newcc/drivers/network/afd/afd/listen.c branches/arty-newcc/drivers/network/afd/afd/lock.c branches/arty-newcc/drivers/network/afd/afd/main.c branches/arty-newcc/drivers/network/afd/afd/read.c branches/arty-newcc/drivers/network/afd/afd/select.c branches/arty-newcc/drivers/network/afd/afd/tdi.c branches/arty-newcc/drivers/network/afd/afd/write.c branches/arty-newcc/drivers/network/afd/include/debug.h branches/arty-newcc/include/ndk/asm.h branches/arty-newcc/include/ndk/i386/ketypes.h branches/arty-newcc/include/ndk/ketypes.h branches/arty-newcc/lib/drivers/oskittcp/oskittcp/interface.c branches/arty-newcc/lib/drivers/oskittcp/oskittcp/ip_output.c branches/arty-newcc/ntoskrnl/ex/i386/fastinterlck_asm.S branches/arty-newcc/ntoskrnl/ex/i386/interlck_asm.S branches/arty-newcc/ntoskrnl/ex/init.c branches/arty-newcc/ntoskrnl/ex/resource.c branches/arty-newcc/ntoskrnl/fstub/disksup.c branches/arty-newcc/ntoskrnl/include/internal/cm.h branches/arty-newcc/ntoskrnl/include/internal/ex.h branches/arty-newcc/ntoskrnl/include/internal/i386/ke.h branches/arty-newcc/ntoskrnl/include/internal/io_x.h branches/arty-newcc/ntoskrnl/include/internal/kd.h branches/arty-newcc/ntoskrnl/include/internal/kd64.h branches/arty-newcc/ntoskrnl/include/internal/ke.h branches/arty-newcc/ntoskrnl/include/internal/mm.h branches/arty-newcc/ntoskrnl/include/internal/ntoskrnl.h branches/arty-newcc/ntoskrnl/include/internal/se.h branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c branches/arty-newcc/ntoskrnl/io/iomgr/iomgr.c branches/arty-newcc/ntoskrnl/io/iomgr/irp.c branches/arty-newcc/ntoskrnl/io/pnpmgr/plugplay.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpdma.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpmgr.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpnotify.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c branches/arty-newcc/ntoskrnl/io/pnpmgr/pnproot.c branches/arty-newcc/ntoskrnl/kdbg/kdb.c branches/arty-newcc/ntoskrnl/ke/clock.c branches/arty-newcc/ntoskrnl/ke/config.c branches/arty-newcc/ntoskrnl/ke/i386/cpu.c branches/arty-newcc/ntoskrnl/ke/i386/ctxswitch.S branches/arty-newcc/ntoskrnl/ke/i386/kiinit.c branches/arty-newcc/ntoskrnl/ke/procobj.c branches/arty-newcc/ntoskrnl/ke/thrdobj.c branches/arty-newcc/ntoskrnl/ke/thrdschd.c branches/arty-newcc/ntoskrnl/mm/i386/page.c branches/arty-newcc/ntoskrnl/mm/mm.c branches/arty-newcc/ntoskrnl/mm/mminit.c branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild branches/arty-newcc/ntoskrnl/ntoskrnl.spec branches/arty-newcc/ntoskrnl/ob/obdir.c branches/arty-newcc/ntoskrnl/ob/obinit.c branches/arty-newcc/ntoskrnl/ob/oblife.c branches/arty-newcc/ntoskrnl/ob/oblink.c branches/arty-newcc/ntoskrnl/ob/obname.c branches/arty-newcc/ntoskrnl/ob/obref.c branches/arty-newcc/ntoskrnl/ob/obsdcach.c branches/arty-newcc/ntoskrnl/po/events.c branches/arty-newcc/ntoskrnl/po/power.c branches/arty-newcc/ntoskrnl/ps/kill.c branches/arty-newcc/ntoskrnl/ps/process.c branches/arty-newcc/ntoskrnl/ps/thread.c branches/arty-newcc/ntoskrnl/rtl/libsupp.c branches/arty-newcc/ntoskrnl/se/semgr.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arty-newcc/base/applications/cmdutils/more/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/cm… Modified: branches/arty-newcc/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ga… Modified: branches/arty-newcc/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ms… Modified: branches/arty-newcc/base/applications/msconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ms… Modified: branches/arty-newcc/base/applications/mscutils/devmgmt/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ms… Modified: branches/arty-newcc/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ms… Modified: branches/arty-newcc/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ms… Modified: branches/arty-newcc/base/applications/mstsc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ms… Modified: branches/arty-newcc/base/applications/network/ipconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/ne… Modified: branches/arty-newcc/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/re… Modified: branches/arty-newcc/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/reactos/l… Modified: branches/arty-newcc/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/usetup/ca… Modified: branches/arty-newcc/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/usetup/fi… Modified: branches/arty-newcc/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/usetup/fo… Modified: branches/arty-newcc/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/usetup/fs… Modified: branches/arty-newcc/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/shell/cmd/alias… Modified: branches/arty-newcc/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/shell/cmd/cmd.c… Modified: branches/arty-newcc/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/shell/cmd/cmdin… Modified: branches/arty-newcc/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/shell/cmd/start… Modified: branches/arty-newcc/base/system/format/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/format/l… Modified: branches/arty-newcc/base/system/regsvr32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/system/regsvr32… Modified: branches/arty-newcc/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/boot/freeldr/freeldr… Modified: branches/arty-newcc/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/fat.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fs_rec/blockdev.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fs_rec/fat.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/… Modified: branches/arty-newcc/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Modified: branches/arty-newcc/drivers/network/afd/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/network/afd/… Copied: branches/arty-newcc/include/ddk/dderror.h (from r35365, trunk/reactos/include/ddk/dderror.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/dderror.… Copied: branches/arty-newcc/include/ddk/diskguid.h (from r35365, trunk/reactos/include/ddk/diskguid.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/diskguid… Copied: branches/arty-newcc/include/ddk/drivinit.h (from r35365, trunk/reactos/include/ddk/drivinit.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/drivinit… Copied: branches/arty-newcc/include/ddk/drmk.h (from r35365, trunk/reactos/include/ddk/drmk.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/drmk.h?p… Copied: branches/arty-newcc/include/ddk/dxapi.h (from r35365, trunk/reactos/include/ddk/dxapi.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/dxapi.h?… Copied: branches/arty-newcc/include/ddk/fltsafe.h (from r35365, trunk/reactos/include/ddk/fltsafe.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/fltsafe.… Copied: branches/arty-newcc/include/ddk/isguids.h (from r35365, trunk/reactos/include/ddk/isguids.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/isguids.… Copied: branches/arty-newcc/include/ddk/kcom.h (from r35365, trunk/reactos/include/ddk/kcom.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/kcom.h?p… Copied: branches/arty-newcc/include/ddk/ksdebug.h (from r35365, trunk/reactos/include/ddk/ksdebug.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/ksdebug.… Copied: branches/arty-newcc/include/ddk/lmon.h (from r35365, trunk/reactos/include/ddk/lmon.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/lmon.h?p… Copied: branches/arty-newcc/include/ddk/ntddft.h (from r35365, trunk/reactos/include/ddk/ntddft.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/ntddft.h… Copied: branches/arty-newcc/include/ddk/ntstrsafe.h (from r35365, trunk/reactos/include/ddk/ntstrsafe.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/ntstrsaf… Copied: branches/arty-newcc/include/ddk/objerror.h (from r35365, trunk/reactos/include/ddk/objerror.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/objerror… Copied: branches/arty-newcc/include/ddk/punknown.h (from r35365, trunk/reactos/include/ddk/punknown.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/punknown… Copied: branches/arty-newcc/include/ddk/stdunk.h (from r35365, trunk/reactos/include/ddk/stdunk.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/stdunk.h… Copied: branches/arty-newcc/include/ddk/tdikrnl.h (from r35365, trunk/reactos/include/ddk/tdikrnl.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/tdikrnl.… Copied: branches/arty-newcc/include/ddk/usbprint.h (from r35365, trunk/reactos/include/ddk/usbprint.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/usbprint… Copied: branches/arty-newcc/include/ddk/warning.h (from r35365, trunk/reactos/include/ddk/warning.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/warning.… Copied: branches/arty-newcc/include/ddk/wdm.h (from r35365, trunk/reactos/include/ddk/wdm.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/wdm.h?p2… Copied: branches/arty-newcc/include/ddk/winddk.h (from r35365, trunk/reactos/include/ddk/winddk.h) URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ddk/winddk.h… Modified: branches/arty-newcc/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/asm.h?re… Modified: branches/arty-newcc/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/i386/ket… Modified: branches/arty-newcc/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/ndk/ketypes.… Modified: branches/arty-newcc/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/drivers/oskittcp… Modified: branches/arty-newcc/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/lib/drivers/oskittcp… Modified: branches/arty-newcc/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ex/i386/fas… Modified: branches/arty-newcc/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ex/i386/int… Modified: branches/arty-newcc/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ex/init.c?r… Modified: branches/arty-newcc/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ex/resource… Modified: branches/arty-newcc/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/fstub/disks… Modified: branches/arty-newcc/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/io… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/io… Modified: branches/arty-newcc/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/iomgr/ir… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpdma.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpnotify.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/io/pnpmgr/p… Modified: branches/arty-newcc/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/kdbg/kdb.c?… Modified: branches/arty-newcc/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/clock.c?… Modified: branches/arty-newcc/ntoskrnl/ke/config.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/config.c… Modified: branches/arty-newcc/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/i386/cpu… Modified: branches/arty-newcc/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/i386/ctx… Modified: branches/arty-newcc/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/i386/kii… Modified: branches/arty-newcc/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/procobj.… Modified: branches/arty-newcc/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/thrdobj.… Modified: branches/arty-newcc/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ke/thrdschd… Modified: branches/arty-newcc/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/i386/pag… Modified: branches/arty-newcc/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mm.c?rev… Modified: branches/arty-newcc/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mminit.c… Modified: branches/arty-newcc/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl-ge… Modified: branches/arty-newcc/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ntoskrnl.sp… Modified: branches/arty-newcc/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/obdir.c?… Modified: branches/arty-newcc/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/obinit.c… Modified: branches/arty-newcc/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/oblife.c… Modified: branches/arty-newcc/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/oblink.c… Modified: branches/arty-newcc/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/obname.c… Modified: branches/arty-newcc/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/obref.c?… Modified: branches/arty-newcc/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ob/obsdcach… Modified: branches/arty-newcc/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/po/events.c… Modified: branches/arty-newcc/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/po/power.c?… Modified: branches/arty-newcc/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/kill.c?r… Modified: branches/arty-newcc/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/process.… Modified: branches/arty-newcc/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/ps/thread.c… Modified: branches/arty-newcc/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/rtl/libsupp… Modified: branches/arty-newcc/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/se/semgr.c?…

1 0

[gbrunmar] 35594: D3D9: * Implemented IDirect3DSwapChain9::GetDevice() and GetPresentParameters() * Added helper function to D3D9BaseObject to convert IUnknown* to IDirect3D9Device* * Fixed behavior in IDirect3DDevice9::GetSwapChain() when an invalid index was specified
by gbrunmar＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: gbrunmar Date: Sun Aug 24 06:18:30 2008 New Revision: 35594 URL: http://svn.reactos.org/svn/reactos?rev=35594&view=rev Log: D3D9: * Implemented IDirect3DSwapChain9::GetDevice() and GetPresentParameters() * Added helper function to D3D9BaseObject to convert IUnknown* to IDirect3D9Device* * Fixed behavior in IDirect3DDevice9::GetSwapChain() when an invalid index was specified Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -61,3 +61,13 @@ return Ref; } + +HRESULT D3D9BaseObject_GetDevice(D3D9BaseObject* pBaseObject, IDirect3DDevice9** ppDevice) +{ + if (pBaseObject->pUnknown) + { + return pBaseObject->pUnknown->lpVtbl->QueryInterface((IUnknown*) &pBaseObject->pUnknown->lpVtbl, &IID_IDirect3DDevice9, (void**)ppDevice); + } + + return E_NOINTERFACE; +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -9,6 +9,9 @@ #define _D3D9_BASEOBJECT_H_ #include "d3d9_common.h" +#include <d3d9.h> + +struct _D3D9BaseObject; enum REF_TYPE { @@ -38,5 +41,6 @@ ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject); ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject); +HRESULT D3D9BaseObject_GetDevice(D3D9BaseObject* pBaseObject, IDirect3DDevice9** ppDevice); #endif // _D3D9_BASEOBJECT_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_device.c [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -341,16 +341,18 @@ LPDIRECT3DDEVICE9_INT This = impl_from_IDirect3DDevice9(iface); LOCK_D3DDEVICE9(); + if (IsBadWritePtr(ppSwapChain, sizeof(IDirect3DSwapChain9*))) + { + DPRINT1("Invalid ppSwapChain parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + *ppSwapChain = NULL; + if (iSwapChain >= IDirect3DDevice9_GetNumberOfSwapChains(iface)) { DPRINT1("Invalid iSwapChain parameter specified"); - UNLOCK_D3DDEVICE9(); - return D3DERR_INVALIDCALL; - } - - if (IsBadWritePtr(ppSwapChain, sizeof(IDirect3DSwapChain9*))) - { - DPRINT1("Invalid ppSwapChain parameter specified"); UNLOCK_D3DDEVICE9(); return D3DERR_INVALIDCALL; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -13,6 +13,11 @@ #include "d3d9_helpers.h" #include "d3d9_device.h" +#define LOCK_D3DDEVICE9() if (This->BaseObject.pUnknown && ((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->bLockDevice) \ + EnterCriticalSection(&((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->CriticalSection); +#define UNLOCK_D3DDEVICE9() if (This->BaseObject.pUnknown && ((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->bLockDevice) \ + LeaveCriticalSection(&((LPDIRECT3DDEVICE9_INT)This->BaseObject.pUnknown)->CriticalSection); + /* Convert a IDirect3DSwapChain9 pointer safely to the internal implementation struct */ static LPDIRECT3DSWAPCHAIN9_INT IDirect3DSwapChain9ToImpl(LPDIRECT3DSWAPCHAIN9 iface) { @@ -81,15 +86,81 @@ return D3D_OK; } +/*++ +* @name IDirect3DSwapChain9::GetDevice +* @implemented +* +* The function Direct3DSwapChain9_GetDevice sets the ppDevice argument +* to the device connected to create the swap chain. +* +* @param LPDIRECT3DSWAPCHAIN9 iface +* Pointer to a IDirect3DSwapChain9 object returned from IDirect3D9Device::GetSwapChain() +* +* @param IDirect3DDevice9** ppDevice +* Pointer to a IDirect3DDevice9* structure to be set to the device object. +* +* @return HRESULT +* If the method successfully sets the ppDevice value, the return value is D3D_OK. +* If ppDevice is a bad pointer the return value will be D3DERR_INVALIDCALL. +* If the swap chain didn't contain any device, the return value will be D3DERR_INVALIDDEVICE. +* +*/ static HRESULT WINAPI Direct3DSwapChain9_GetDevice(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DDevice9** ppDevice) { - UNIMPLEMENTED - return D3D_OK; -} - + LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(ppDevice, sizeof(IDirect3DDevice9**))) + { + DPRINT1("Invalid ppDevice parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + if (FAILED(D3D9BaseObject_GetDevice(&This->BaseObject, ppDevice))) + { + DPRINT1("Invalid This parameter speficied"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDDEVICE; + } + + UNLOCK_D3DDEVICE9(); + return D3D_OK; +} + +/*++ +* @name IDirect3DSwapChain9::GetPresentParameters +* @implemented +* +* The function Direct3DSwapChain9_GetPresentParameters fills the pPresentationParameters +* argument with the D3DPRESENT_PARAMETERS parameters that was used to create the swap chain. +* +* @param LPDIRECT3DSWAPCHAIN9 iface +* Pointer to a IDirect3DSwapChain9 object returned from IDirect3D9Device::GetSwapChain() +* +* @param D3DPRESENT_PARAMETERS* pPresentationParameters +* Pointer to a D3DPRESENT_PARAMETERS structure to be filled with the creation parameters. +* +* @return HRESULT +* If the method successfully fills the pPresentationParameters structure, the return value is D3D_OK. +* If pPresentationParameters is a bad pointer the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI Direct3DSwapChain9_GetPresentParameters(LPDIRECT3DSWAPCHAIN9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { - UNIMPLEMENTED + LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); + LOCK_D3DDEVICE9(); + + if (IsBadWritePtr(pPresentationParameters, sizeof(D3DPRESENT_PARAMETERS))) + { + DPRINT1("Invalid pPresentationParameters parameter specified"); + UNLOCK_D3DDEVICE9(); + return D3DERR_INVALIDCALL; + } + + *pPresentationParameters = This->PresentParameters; + + UNLOCK_D3DDEVICE9(); return D3D_OK; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.h [iso-8859-1] Sun Aug 24 06:18:30 2008 @@ -12,6 +12,8 @@ #include <d3d9.h> #include <ddraw.h> #include "d3d9_baseobject.h" + +struct _Direct3DDevice9_INT; typedef struct _Direct3DSwapChain9_INT {

1 0

[gbrunmar] 35593: D3D9: * Replace D3D9BaseObject's dependency on Direct3DDevice9 * More HAL device init stuff
by gbrunmar＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: gbrunmar Date: Sun Aug 24 05:15:44 2008 New Revision: 35593 URL: http://svn.reactos.org/svn/reactos?rev=35593&view=rev Log: D3D9: * Replace D3D9BaseObject's dependency on Direct3DDevice9 * More HAL device init stuff Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -25,18 +25,18 @@ D3D9BaseObject_Destroy }; -VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice) +VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, IUnknown* pUnknown) { pBaseObject->lpVtbl = &D3D9BaseObject_Vtbl; pBaseObject->RefType = RefType; - pBaseObject->pBaseDevice = pBaseDevice; + pBaseObject->pUnknown = pUnknown; } ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject) { - if (pBaseObject->pBaseDevice) + if (pBaseObject->pUnknown) { - pBaseObject->pBaseDevice->lpVtbl->AddRef((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + pBaseObject->pUnknown->lpVtbl->AddRef((IUnknown*) &pBaseObject->pUnknown->lpVtbl); } return InterlockedIncrement(&pBaseObject->lRefCnt); @@ -52,9 +52,9 @@ if (Ref == 0) { - if (pBaseObject->pBaseDevice) + if (pBaseObject->pUnknown) { - pBaseObject->pBaseDevice->lpVtbl->Release((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + pBaseObject->pUnknown->lpVtbl->Release((IUnknown*) &pBaseObject->pUnknown->lpVtbl); } } } Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -27,14 +27,14 @@ /* 0x0000 */ ID3D9BaseObjectVtbl* lpVtbl; /* 0x0004 */ LONG lRefCnt; /* 0x0008 */ DWORD dwNumUsed; -/* 0x000c */ struct _Direct3DDevice9_INT* pBaseDevice; +/* 0x000c */ IUnknown* pUnknown; /* 0x0010 */ DWORD dwUnknown0010; // Index? Unique id? /* 0x0014 */ HANDLE hKernelHandle; /* 0x0018 */ LPDWORD dwUnknown0018; /* 0x001c */ enum REF_TYPE RefType; } D3D9BaseObject; -VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice); +VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, IUnknown* pUnknown); ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject); ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject); Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -119,7 +119,7 @@ return NULL; } - InitD3D9BaseObject((D3D9BaseObject*) &pThisSwapChain->BaseObject.lpVtbl, RefType, pBaseDevice); + InitD3D9BaseObject((D3D9BaseObject*) &pThisSwapChain->BaseObject.lpVtbl, RefType, (IUnknown*) &pBaseDevice->lpVtbl); pThisSwapChain->lpVtbl = &Direct3DSwapChain9_Vtbl; @@ -149,6 +149,7 @@ } pThisSwapChain->PresentParameters = pPresentationParameters[pThisSwapChain->ChainIndex]; + pThisSwapChain->SwapEffect = pPresentationParameters->SwapEffect; return Direct3DSwapChain9_Reset(pThisSwapChain, pPresentationParameters); } Modified: trunk/reactos/dll/directx/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sun Aug 24 05:15:44 2008 @@ -51,6 +51,10 @@ pThisBaseDevice->lpVtbl = &Direct3DDevice9_Vtbl; pThisBaseDevice->lRefCnt = 1; + pThisBaseDevice->dwProcessId = GetCurrentThreadId(); + pThisBaseDevice->pUnknown = (IUnknown*) &pThisBaseDevice->lpVtbl; + InitializeCriticalSection(&pThisBaseDevice->CriticalSection); + pThisBaseDevice->pDirect3D9 = pDirect3D9; pThisBaseDevice->DeviceType = DeviceType; pThisBaseDevice->hWnd = hFocusWindow;

1 0

[gbrunmar] 35592: D3D9: * Fixed incomplete HAL device * Fixed IDirect3DSwapChain9 and D3D9BaseObject ref counting
by gbrunmar＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: gbrunmar Date: Sun Aug 24 04:34:16 2008 New Revision: 35592 URL: http://svn.reactos.org/svn/reactos?rev=35592&view=rev Log: D3D9: * Fixed incomplete HAL device * Fixed IDirect3DSwapChain9 and D3D9BaseObject ref counting Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/device.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.c [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -9,9 +9,14 @@ #include "d3d9_device.h" #include <debug.h> +#include "d3d9_helpers.h" -VOID D3D9BaseObject_Destroy() +VOID D3D9BaseObject_Destroy(D3D9BaseObject* pBaseObject, BOOL bFreeThis) { + if (bFreeThis) + { + AlignedFree((LPVOID*) pBaseObject); + } } ID3D9BaseObjectVtbl D3D9BaseObject_Vtbl = @@ -22,7 +27,6 @@ VOID InitD3D9BaseObject(D3D9BaseObject* pBaseObject, enum REF_TYPE RefType, struct _Direct3DDevice9_INT* pBaseDevice) { - // TODO: Add dtor to vtbl pBaseObject->lpVtbl = &D3D9BaseObject_Vtbl; pBaseObject->RefType = RefType; pBaseObject->pBaseDevice = pBaseDevice; @@ -30,14 +34,30 @@ ULONG D3D9BaseObject_AddRef(D3D9BaseObject* pBaseObject) { - // TODO: Implement ref counting - UNIMPLEMENTED - return 1; + if (pBaseObject->pBaseDevice) + { + pBaseObject->pBaseDevice->lpVtbl->AddRef((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + } + + return InterlockedIncrement(&pBaseObject->lRefCnt); } ULONG D3D9BaseObject_Release(D3D9BaseObject* pBaseObject) { - // TODO: Implement ref counting - UNIMPLEMENTED - return 0; + ULONG Ref = 0; + + if (pBaseObject) + { + Ref = InterlockedDecrement(&pBaseObject->lRefCnt); + + if (Ref == 0) + { + if (pBaseObject->pBaseDevice) + { + pBaseObject->pBaseDevice->lpVtbl->Release((IDirect3DDevice9*)&pBaseObject->pBaseDevice->lpVtbl); + } + } + } + + return Ref; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_base… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_baseobject.h [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -19,14 +19,14 @@ typedef struct _D3D9BaseObjectVtbl { - VOID (*Destroy)(); + VOID (*Destroy)(struct _D3D9BaseObject* pBaseObject, BOOL bFreeThis); } ID3D9BaseObjectVtbl; typedef struct _D3D9BaseObject { /* 0x0000 */ ID3D9BaseObjectVtbl* lpVtbl; -/* 0x0004 */ DWORD dwUnknown0004; -/* 0x0008 */ DWORD dwUnknown0008; +/* 0x0004 */ LONG lRefCnt; +/* 0x0008 */ DWORD dwNumUsed; /* 0x000c */ struct _Direct3DDevice9_INT* pBaseDevice; /* 0x0010 */ DWORD dwUnknown0010; // Index? Unique id? /* 0x0014 */ HANDLE hKernelHandle; Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -41,15 +41,13 @@ static ULONG WINAPI Direct3DSwapChain9_AddRef(LPDIRECT3DSWAPCHAIN9 iface) { LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); - D3D9BaseObject* BaseObject = (D3D9BaseObject*)((ULONG_PTR)This - FIELD_OFFSET(Direct3DSwapChain9_INT, lpVtbl) - FIELD_OFFSET(Direct3DSwapChain9_INT, BaseObject)); - return D3D9BaseObject_AddRef(BaseObject); + return D3D9BaseObject_AddRef((D3D9BaseObject*) &This->BaseObject.lpVtbl); } static ULONG WINAPI Direct3DSwapChain9_Release(LPDIRECT3DSWAPCHAIN9 iface) { LPDIRECT3DSWAPCHAIN9_INT This = IDirect3DSwapChain9ToImpl(iface); - D3D9BaseObject* BaseObject = (D3D9BaseObject*)((ULONG_PTR)This - FIELD_OFFSET(Direct3DSwapChain9_INT, lpVtbl) - FIELD_OFFSET(Direct3DSwapChain9_INT, BaseObject)); - return D3D9BaseObject_Release(BaseObject); + return D3D9BaseObject_Release((D3D9BaseObject*) &This->BaseObject.lpVtbl); } /* IDirect3DSwapChain9 interface */ @@ -121,7 +119,7 @@ return NULL; } - InitD3D9BaseObject(&pThisSwapChain->BaseObject, RefType, pBaseDevice); + InitD3D9BaseObject((D3D9BaseObject*) &pThisSwapChain->BaseObject.lpVtbl, RefType, pBaseDevice); pThisSwapChain->lpVtbl = &Direct3DSwapChain9_Vtbl; Modified: trunk/reactos/dll/directx/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/device.c [iso-8859-1] Sun Aug 24 04:34:16 2008 @@ -49,6 +49,8 @@ pThisBaseDevice->pResourceManager = pResourceManager; + pThisBaseDevice->lpVtbl = &Direct3DDevice9_Vtbl; + pThisBaseDevice->lRefCnt = 1; pThisBaseDevice->pDirect3D9 = pDirect3D9; pThisBaseDevice->DeviceType = DeviceType; pThisBaseDevice->hWnd = hFocusWindow;

1 0

[janderwald] 35591: - Use the name of the cpl as the mutex name - The mutex name is a unicode buffer, pass it to CreateMutexW function - fixes bug 3489
by janderwald＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: janderwald Date: Sun Aug 24 03:37:25 2008 New Revision: 35591 URL: http://svn.reactos.org/svn/reactos?rev=35591&view=rev Log: - Use the name of the cpl as the mutex name - The mutex name is a unicode buffer, pass it to CreateMutexW function - fixes bug 3489 Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/control.c [iso-8859-1] Sun Aug 24 03:37:25 2008 @@ -348,21 +348,34 @@ LPWSTR beg = NULL; LPWSTR end; WCHAR ch; - LPWSTR ptr; + LPWSTR ptr, ptr2; + WCHAR szName[MAX_PATH]; unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; BOOL spSet = FALSE; - HANDLE hMutex; - - hMutex = CreateMutex(NULL, FALSE, (LPCTSTR) wszCmd); + HANDLE hMutex; + UINT Length; + + ptr = wcsrchr(wszCmd, L'\\'); + ptr2 = wcsrchr(wszCmd, L','); + if (!ptr || !ptr2) + return; + + Length = (ptr2 - ptr - 1); + if (Length >= MAX_PATH) + return; + + memcpy(szName, ptr + 1, Length * sizeof(WCHAR)); + szName[Length] = L'\0'; + hMutex = CreateMutexW(NULL, FALSE, szName); + if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) return; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; end = lstrcpyW(buffer, wszCmd); - for (;;) { ch = *end; if (ch == '"') quoted = !quoted;

1 0

[martinf] 35590: update XMLStorage: correctly handle dots and colons in attribute names
by martinf＠svn.reactos.org 24 Aug '08

24 Aug '08

Author: martinf Date: Sun Aug 24 01:58:19 2008 New Revision: 35590 URL: http://svn.reactos.org/svn/reactos?rev=35590&view=rev Log: update XMLStorage: correctly handle dots and colons in attribute names Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] Sun Aug 24 01:58:19 2008 @@ -666,9 +666,10 @@ for(; *p; ++p) { char c = *p; + // NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender if (c == '\xC3') // UTF-8 escape character ++p; //TODO only continue on umlaut characters - else if (!isalnum(c) && c!='_' && c!='-') + else if (!isalnum(c) && c!='.' && c!='-' && c!='_' && c!=':') break; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs