Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 25119: - Add missing header.
by ion＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: ion Date: Mon Dec 11 00:21:08 2006 New Revision: 25119 URL: http://svn.reactos.org/svn/reactos?rev=25119&view=rev Log: - Add missing header. Added: trunk/reactos/ntoskrnl/include/internal/io_i.h Added: trunk/reactos/ntoskrnl/include/internal/io_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_i.h (added) +++ trunk/reactos/ntoskrnl/include/internal/io_i.h Mon Dec 11 00:21:08 2006 @@ -1,0 +1,280 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/io_i.h + * PURPOSE: Info Classes for the I/O Manager + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +// +// File Information Classes +// +UCHAR IopQueryOperationLength[] = +{ + 0, + 0, + 0, + 0, + sizeof(FILE_BASIC_INFORMATION), + sizeof(FILE_STANDARD_INFORMATION), + sizeof(FILE_INTERNAL_INFORMATION), + sizeof(FILE_EA_INFORMATION), + sizeof(FILE_ACCESS_INFORMATION), + sizeof(FILE_NAME_INFORMATION), + 0, + 0, + 0, + 0, + sizeof(FILE_POSITION_INFORMATION), + 0, + sizeof(FILE_MODE_INFORMATION), + sizeof(FILE_ALIGNMENT_INFORMATION), + sizeof(FILE_ALL_INFORMATION), + 0, + 0, + sizeof(FILE_NAME_INFORMATION), + sizeof(FILE_STREAM_INFORMATION), + sizeof(FILE_PIPE_INFORMATION), + sizeof(FILE_PIPE_LOCAL_INFORMATION), + sizeof(FILE_PIPE_REMOTE_INFORMATION), + sizeof(FILE_MAILSLOT_QUERY_INFORMATION), + 0, + sizeof(FILE_COMPRESSION_INFORMATION), + sizeof(FILE_OBJECTID_INFORMATION), + 0, + 0, + sizeof(FILE_QUOTA_INFORMATION), + sizeof(FILE_REPARSE_POINT_INFORMATION), + sizeof(FILE_NETWORK_OPEN_INFORMATION), + sizeof(FILE_ATTRIBUTE_TAG_INFORMATION), + 0, + 0, + 0, + 0, + 0, +#if 0 // VISTA + sizeof(FILE_IO_COMPLETION_NOTIFICATION_INFORMATION), + sizeof(FILE_IOSTATUSBLOCK_RANGE_INFORMATION), + sizeof(FILE_IO_PRIORITY_HINT_INFORMATION), + sizeof(FILE_SFIO_RESERVE_INFORMATION), + sizeof(FILE_SFIO_VOLUME_INFORMATION), + 0, + sizeof(FILE_PROCESS_IDS_USING_FILE_INFORMATION), + 0, + sizeof(FILE_NETWORK_PHYSICAL_NAME_INFORMATION), +#endif + 0xFF +}; + +UCHAR IopSetOperationLength[] = +{ + 0, + 0, + 0, + 0, + sizeof(FILE_BASIC_INFORMATION), + 0, + 0, + 0, + 0, + 0, + sizeof(FILE_RENAME_INFORMATION), + sizeof(FILE_LINK_INFORMATION), + 0, + sizeof(FILE_DISPOSITION_INFORMATION), + sizeof(FILE_POSITION_INFORMATION), + 0, + sizeof(FILE_MODE_INFORMATION), + 0, + 0, + sizeof(FILE_ALLOCATION_INFORMATION), + sizeof(FILE_END_OF_FILE_INFORMATION), + 0, + 0, + sizeof(FILE_PIPE_INFORMATION), + 0, + 0, + 0, + sizeof(FILE_MAILSLOT_SET_INFORMATION), + 0, + sizeof(FILE_OBJECTID_INFORMATION), + sizeof(FILE_COMPLETION_INFORMATION), + sizeof(FILE_MOVE_CLUSTER_INFORMATION), + sizeof(FILE_QUOTA_INFORMATION), + 0, + 0, + 0, + sizeof(FILE_TRACKING_INFORMATION), + 0, + 0, + sizeof(FILE_VALID_DATA_LENGTH_INFORMATION), + sizeof(UNICODE_STRING), + 0xFF +}; + +ACCESS_MASK IopQueryOperationAccess[] = +{ + 0, + 0, + 0, + 0, + FILE_READ_ATTRIBUTES, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + FILE_READ_EA, + 0, + 0, + FILE_READ_ATTRIBUTES, + 0, + 0, + 0, + 0, + FILE_READ_ATTRIBUTES, + FILE_READ_ATTRIBUTES, + FILE_READ_ATTRIBUTES, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + FILE_READ_ATTRIBUTES, + FILE_READ_ATTRIBUTES, + 0, + 0, + 0, + 0, + 0, + 0xFFFFFFFF +}; + +ACCESS_MASK IopSetOperationAccess[] = +{ + 0, + 0, + 0, + 0, + FILE_WRITE_ATTRIBUTES, + 0, + 0, + 0, + 0, + 0, + DELETE, + 0, + 0, + DELETE, + 0, + FILE_WRITE_EA, + 0, + 0, + 0, + FILE_WRITE_DATA, + FILE_WRITE_DATA, + 0, + 0, + FILE_WRITE_ATTRIBUTES, + 0, + FILE_WRITE_ATTRIBUTES, + 0, + 0, + 0, + 0, + 0, + FILE_WRITE_DATA, + 0, + 0, + 0, + 0, + FILE_WRITE_DATA, + 0, + 0, + FILE_WRITE_DATA, + DELETE, + 0xFFFFFFFF +}; + +// +// Volume Information Classes +// +UCHAR IopQueryFsOperationLength[] = +{ + 0, + sizeof(FILE_FS_VOLUME_INFORMATION), + 0, + sizeof(FILE_FS_SIZE_INFORMATION), + sizeof(FILE_FS_DEVICE_INFORMATION), + sizeof(FILE_FS_ATTRIBUTE_INFORMATION), + sizeof(FILE_FS_CONTROL_INFORMATION), + sizeof(FILE_FS_FULL_SIZE_INFORMATION), + sizeof(FILE_FS_OBJECTID_INFORMATION), + sizeof(FILE_FS_DRIVER_PATH_INFORMATION), +#if 0 // VISTA + sizeof(FILE_FS_VOLUME_FLAGS_INFORMATION), +#endif + 0xFF +}; + +UCHAR IopSetFsOperationLength[] = +{ + 0, + 0, + sizeof(FILE_FS_LABEL_INFORMATION), + 0, + 0, + 0, + sizeof(FILE_FS_CONTROL_INFORMATION), + 0, + sizeof(FILE_FS_OBJECTID_INFORMATION), + 0, +#if 0 // VISTA + sizeof(FILE_FS_VOLUME_FLAGS_INFORMATION), +#endif + 0xFF +}; + +ULONG IopQueryFsOperationAccess[] = +{ + 0, + 0, + 0, + 0, + 0, + 0, + FILE_READ_DATA, + 0, + 0, + 0, +#if 0 // VISTA + 0, +#endif + 0xFFFFFFFF +}; + +ULONG IopSetFsOperationAccess[] = +{ + 0, + 0, + FILE_WRITE_DATA, + 0, + 0, + 0, + FILE_WRITE_DATA, + 0, + FILE_WRITE_DATA, + 0, +#if 0 // VISTA + 0, +#endif + 0xFFFFFFFF +};

1 0

[ion] 25118: - Fix SleepEx. - Put volatile statements in EX_RUNDOWN_REF, IRP, DEVICE_OBJECT, ERESOURCE, FILE_OBJECT, IO_REMOVE_LOCK, WORK_QUEUE_ITEM where required (thanks to Microsoft's changes in the WDK to mark the fields properly). - Update FILE_OBJECT definition. - Add some asserts to some I/O functions. - Add stub support for File Objects created by XP+ Drivers which have File Object Extensions. - Add some fixes to IopDeleteFile, including proper reference counting for the DO and VPB, as w
by ion＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: ion Date: Sun Dec 10 21:40:30 2006 New Revision: 25118 URL: http://svn.reactos.org/svn/reactos?rev=25118&view=rev Log: - Fix SleepEx. - Put volatile statements in EX_RUNDOWN_REF, IRP, DEVICE_OBJECT, ERESOURCE, FILE_OBJECT, IO_REMOVE_LOCK, WORK_QUEUE_ITEM where required (thanks to Microsoft's changes in the WDK to mark the fields properly). - Update FILE_OBJECT definition. - Add some asserts to some I/O functions. - Add stub support for File Objects created by XP+ Drivers which have File Object Extensions. - Add some fixes to IopDeleteFile, including proper reference counting for the DO and VPB, as well as cleanup when the file is closed without a handle. - Fix a bug in IopSecurityFile. - Queue and unqueue IRPs in all I/O functions. - Fully support IRP cancellation now. - Fix critical bugs in NtDeviceIoControlFile and NtDeviceFsControlFile which were causing double queueing of IRPs and freeing of invalid memory, as well as invalid paramter checking for user-mode buffers. - Add exhaustive validation checks to IoCreateFile, add more failure cases, and validate the EA buffer. Also support IO_ATTACH_DEVICE_API flag. - Implement IoCreateStreamFileObjectEx and IoCreateStreamFileObjectLite and fix several bugs in the original implementation of IoCreateStreamFileObject. - Fix a bug in RtlRaiseException. - Update Io*ShareAccess routines to support XP+ style semantics related to special File Object flags which disable their use. - Add validation to all Query/Set routines so that information clasess, lengths, buffers and alignment are properly checked. - Also add an array for the proper acess rights that each query/set operation requires. - Check backup/restore privileges during I/O File operations. - Check traverse access during I/O File Operations. - Check access privileges to the device during I/O file operations. - Rename IopReferenceDeviceObject and also verify if an exclusive DO is trying to be invalidly opened. - Support various extra security checks during I/O File/Device Parse Routine. - Fix a bug during IopCleanupIrp so that we don't dereference the File OBject if this was a create operation. - Fix some bogus asserts in IofCompleteRequest, and save the IRP Flags before signalling it's event, since the driver might've freed it behind our back. - Fix a large bug in ObInsertObject which affected the insert of unnamed objects with forced security options (Such as process/threads). - Fix the creation of the Process/Thread/Job Obejct Types to that security information is forced. - Remove "Fix PS!!!" messages since the bug is now fixed and these objects now get proper security descriptors. - Fix another bug in ObInsertObjet which wasn't properly validating user-mode objects and always assumed kernel mode. - Silence multiple trace/checkpoint messages that have accumulated throughout time for various debugging purposes. Modified: trunk/reactos/base/system/lsass/lsass.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/drivers/base/bootvid/vid.c trunk/reactos/drivers/filesystems/fs_rec/udfs.c trunk/reactos/drivers/filesystems/np/fsctrl.c trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/lib/rtl/exception.c trunk/reactos/lib/rtl/i386/exception.c trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/cm/import.c trunk/reactos/ntoskrnl/dbgk/debug.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/include/internal/debug.h trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/io_x.h trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Modified: trunk/reactos/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid.c… Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… Modified: trunk/reactos/drivers/filesystems/np/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/np/fsc… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=25… Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=25… Modified: trunk/reactos/lib/rtl/i386/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/exception.c?r… Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=251… Modified: trunk/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2… Modified: trunk/reactos/ntoskrnl/dbgk/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/debug.c?rev=… Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… Modified: trunk/reactos/ntoskrnl/include/internal/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=25… Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=25… Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

1 0

[greatlrd] 25117: commit the patch from bug 1874 even it does not use the RDMSR and WRMSR measure methood, we need use the RDMSR and WRMSR for dual core and CPU support it see Intel documentations AP-485, who u should do it. The patch is from HTO Bugfix detections of RTSC support for single and dual core by me, adding check if the CPU support RDMSR and WRMSR and send a true or false value to GetCpuSpeed, so we known which method we should use. HTO patch should be use when it is false. other wise
by greatlrd＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: greatlrd Date: Sun Dec 10 20:39:01 2006 New Revision: 25117 URL: http://svn.reactos.org/svn/reactos?rev=25117&view=rev Log: commit the patch from bug 1874 even it does not use the RDMSR and WRMSR measure methood, we need use the RDMSR and WRMSR for dual core and CPU support it see Intel documentations AP-485, who u should do it. The patch is from HTO Bugfix detections of RTSC support for single and dual core by me, adding check if the CPU support RDMSR and WRMSR and send a true or false value to GetCpuSpeed, so we known which method we should use. HTO patch should be use when it is false. other wise we should use the RDMSR and WRMSR measure method See issue #1874 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Sun Dec 10 20:39:01 2006 @@ -24,6 +24,12 @@ #define NDEBUG #include <debug.h> +#define HZ (100) +#define CLOCK_TICK_RATE (1193182) +#define LATCH (CLOCK_TICK_RATE / HZ) +#define CALIBRATE_LATCH (5 * LATCH) +#define CALIBRATE_TIME (5 * 1000020/HZ) + #define MP_FP_SIGNATURE 0x5F504D5F /* "_MP_" */ #define MP_CT_SIGNATURE 0x504D4350 /* "PCMP" */ @@ -73,17 +79,44 @@ /* FUNCTIONS ****************************************************************/ static ULONG -GetCpuSpeed(VOID) +GetCpuSpeed(BOOLEAN DualCoreSpeedMesure) { ULONGLONG Timestamp1; ULONGLONG Timestamp2; ULONGLONG Diff; + ULONG Count = 0; + + /* + FIXME + if the DualCoreSpeedMesure is true we need + use the wrmsr and rdmsr to mesure the speed + + The rdtc are outdate to use if cpu support + the wrmsr and rdmsr, see intel doc AP-485 + for more informations and how to use it. + + Follow code is good on cpu that does not + support dual core or have a mmx unit or + more. + */ + + + /* Initialise timer channel 2 */ + /* Set the Gate high, disable speaker */ + WRITE_PORT_UCHAR((PUCHAR)0x61, (READ_PORT_UCHAR((PUCHAR)0x61) & ~0x02) | 0x01); + WRITE_PORT_UCHAR((PUCHAR)0x43, 0xB0); /* binary, mode 0, LSB/MSB, ch 2 */ + WRITE_PORT_UCHAR((PUCHAR)0x42, CALIBRATE_LATCH & 0xff); /* LSB */ + WRITE_PORT_UCHAR((PUCHAR)0x42, CALIBRATE_LATCH >> 8); /* MSB */ /* Read TSC (Time Stamp Counter) */ Timestamp1 = RDTSC(); - /* Wait for 0.1 seconds (= 100 milliseconds = 100000 microseconds)*/ - StallExecutionProcessor(100000); + /* Wait */ + do + { + Count++; + } + while ((READ_PORT_UCHAR((PUCHAR)0x61) & 0x20) == 0); /* Read TSC (Time Stamp Counter) again */ Timestamp2 = RDTSC(); @@ -98,7 +131,7 @@ Diff = Timestamp2 + (((ULONGLONG)-1) - Timestamp1); } - return (ULONG)(Diff / 100000); + return (ULONG)(Diff / CALIBRATE_TIME); } @@ -123,7 +156,7 @@ LONG Error; BOOLEAN SupportTSC = FALSE; ULONG CpuSpeed; - + BOOLEAN DualCoreSpeedMesure = FALSE; /* Create the CPU instance key */ Error = RegCreateKey(CpuKey, @@ -169,8 +202,12 @@ (unsigned int)((eax >> 4) & 0x0F), (unsigned int)(eax & 0x0F)); FeatureSet = edx; - if (((eax >> 8) & 0x0F) >= 5) + + if ((FeatureSet & 0x10) == 0x10) SupportTSC = TRUE; + + if ((FeatureSet & 0x20) == 0x20) + DualCoreSpeedMesure = TRUE; /* Check if Extended CPUID information is supported */ GetCpuid(0x80000000, &eax, &ebx, &ecx, &edx); @@ -283,7 +320,7 @@ /* Set '~MHz' value (CPU only) */ if (SupportTSC) { - CpuSpeed = GetCpuSpeed(); + CpuSpeed = GetCpuSpeed(DualCoreSpeedMesure); Error = RegSetValue(CpuInstKey, L"~MHz", @@ -467,9 +504,19 @@ /* FIXME: Set 'Update Status' value (CPU only) */ /* Set '~MHz' value (CPU only) */ - if (((CpuEntry->CpuSignature >> 8) & 0x0F) >= 5) - { - CpuSpeed = GetCpuSpeed(); + + + if ((CpuEntry->FeatureFlags & 0x10) == 0x10) + { + if ((CpuEntry->FeatureFlags & 0x20) == 0x20) + { + CpuSpeed = GetCpuSpeed(TRUE); + } + else + { + DbgPrint((DPRINT_HWDETECT, "Does not support MSR that are need for mesure the speed correct\n", (int)Error)); + CpuSpeed = GetCpuSpeed(FALSE); + } Error = RegSetValue(CpuInstKey, L"~MHz", @@ -477,10 +524,11 @@ (PCHAR)&CpuSpeed, sizeof(ULONG)); if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - } - } + { + + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); + } + } }

1 0

[peterw] 25116: - Added -x1 option to output the number of CPUs + 1.
by peterw＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: peterw Date: Sun Dec 10 19:35:47 2006 New Revision: 25116 URL: http://svn.reactos.org/svn/reactos?rev=25116&view=rev Log: - Added -x1 option to output the number of CPUs + 1. Modified: trunk/tools/mingw-make/cpucount.c Modified: trunk/tools/mingw-make/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/mingw-make/cpucount.c?rev=25… ============================================================================== --- trunk/tools/mingw-make/cpucount.c (original) +++ trunk/tools/mingw-make/cpucount.c Sun Dec 10 19:35:47 2006 @@ -9,6 +9,12 @@ { GetSystemInfo(&SystemInformation); printf("%ld\n", SystemInformation.dwNumberOfProcessors); + return 0; + } + else if (!strcmp(argv[1], "-x1")) + { + GetSystemInfo(&SystemInformation); + printf("%ld\n", (SystemInformation.dwNumberOfProcessors + 1)); return 0; } else if (!strcmp(argv[1], "-x2"))

1 0

[silverblade] 25115: Stubbing of Kernel Streaming DRM module
by silverblade＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: silverblade Date: Sun Dec 10 18:12:12 2006 New Revision: 25115 URL: http://svn.reactos.org/svn/reactos?rev=25115&view=rev Log: Stubbing of Kernel Streaming DRM module Added: trunk/reactos/drivers/multimedia/drmk/ trunk/reactos/drivers/multimedia/drmk/drmk.def trunk/reactos/drivers/multimedia/drmk/drmk.rbuild trunk/reactos/drivers/multimedia/drmk/drmk.rc trunk/reactos/drivers/multimedia/drmk/stubs.c Modified: trunk/reactos/drivers/multimedia/directory.rbuild Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild Sun Dec 10 18:12:12 2006 @@ -12,6 +12,10 @@ <xi:include href="ks/ks.rbuild" /> </directory> +<directory name="drmk"> + <xi:include href="drmk/drmk.rbuild" /> +</directory> + <directory name="portcls"> <xi:include href="portcls/portcls.rbuild" /> </directory> Added: trunk/reactos/drivers/multimedia/drmk/drmk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/dr… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/drmk.def (added) +++ trunk/reactos/drivers/multimedia/drmk/drmk.def Sun Dec 10 18:12:12 2006 @@ -1,0 +1,12 @@ +; +; Exports definition file for drmk.sys +; + +EXPORTS +DrmAddContentHandlers@12 +DrmCreateContentMixed@12 +DrmDestroyContent@4 +DrmForwardContentToDeviceObject@12 +DrmForwardContentToFileObject@8 +DrmForwardContentToInterface@12 +DrmGetContentRights@8 Added: trunk/reactos/drivers/multimedia/drmk/drmk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/dr… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/drmk.rbuild (added) +++ trunk/reactos/drivers/multimedia/drmk/drmk.rbuild Sun Dec 10 18:12:12 2006 @@ -1,0 +1,11 @@ +<module name="drmk" type="exportdriver" installbase="system32/drivers" installname="drmk.sys" allowwarnings="true"> + <include base="drmk">.</include> + <include base="drmk">..</include> + <include base="drmk">../include</include> + <importlibrary definition="drmk.def" /> + <library>ntoskrnl</library> + <define name="__USE_W32API" /> + <define name="BUILDING_DRMK" /> + <file>drmk.rc</file> + <file>stubs.c</file> +</module> Added: trunk/reactos/drivers/multimedia/drmk/drmk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/dr… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/drmk.rc (added) +++ trunk/reactos/drivers/multimedia/drmk/drmk.rc Sun Dec 10 18:12:12 2006 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Digital Rights Management\0" +#define REACTOS_STR_INTERNAL_NAME "drmk\0" +#define REACTOS_STR_ORIGINAL_FILENAME "drmk.sys\0" +#include <reactos/version.rc> Added: trunk/reactos/drivers/multimedia/drmk/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/st… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/stubs.c (added) +++ trunk/reactos/drivers/multimedia/drmk/stubs.c Sun Dec 10 18:12:12 2006 @@ -1,0 +1,131 @@ +/* + ReactOS Kernel Streaming + Digital Rights Management + + Please see COPYING in the top-level directory for license information. + + Author: Andrew Greenwood + + Notes: + This is just a file containing stub functions. The DRMK kernel library + deals with Digital Rights Management. This is not essential for the + operation of audio/video (except in the cases where content has digital + rights information) but is needed for linking with PORTCLS. +*/ + +#include <drmk.h> + +/* + Provide a driver interface consisting of functions for handling DRM + protected content +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmAddContentHandlers( + IN ULONG ContentId, + IN PVOID *paHandlers, + IN ULONG NumHandlers) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Creates a DRM content ID to identify a KS audio stream containing + mixed content from several input streams. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmCreateContentMixed( + IN PULONG paContentId, + IN ULONG cContentId, + OUT PULONG pMixedContentId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Deletes a DRM content ID. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmDestroyContent( + IN ULONG ContentId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Authenticates a driver, then passes it the DRM content ID, along with + the content rights which have been assigned to a stream. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmForwardContentToDeviceObject( + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Obsolete because it forces the system to run at a lower DRM security + level. Returns STATUS_NOT_IMPLEMENTED if a pin associated with + FileObject doesnt support the rights assigned to ContentId. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmForwardContentToFileObject( + IN ULONG ContentId, + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Similar to DrmForwardContentToDeviceObject, except this works with a driver + object rather than just a driver. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmForwardContentToInterface( + IN ULONG ContentId, + IN PUNKNOWN pUnknown, + IN ULONG NumMethods) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Retrieves DRM Content rights that have been assigend to a DRM Content ID. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmGetContentRights( + IN ULONG ContentId, + OUT PDRMRIGHTS DrmRights) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} +

1 0

[silverblade] 25114: Further stubbing of Kernel Streaming APIs: KS.SYS PORTCLS.SYS
by silverblade＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: silverblade Date: Sun Dec 10 18:09:46 2006 New Revision: 25114 URL: http://svn.reactos.org/svn/reactos?rev=25114&view=rev Log: Further stubbing of Kernel Streaming APIs: KS.SYS PORTCLS.SYS Added: trunk/reactos/drivers/multimedia/ks/ks.rc trunk/reactos/drivers/multimedia/portcls/adapter.c trunk/reactos/drivers/multimedia/portcls/dll.c trunk/reactos/drivers/multimedia/portcls/drm.c trunk/reactos/drivers/multimedia/portcls/stubs.c Removed: trunk/reactos/drivers/multimedia/include/ trunk/reactos/drivers/multimedia/portcls/portcls.c trunk/reactos/drivers/multimedia/portcls/portcls.h Modified: trunk/reactos/drivers/multimedia/directory.rbuild trunk/reactos/drivers/multimedia/ks/ks.rbuild trunk/reactos/drivers/multimedia/portcls/portcls.def trunk/reactos/drivers/multimedia/portcls/portcls.rbuild Modified: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild (original) +++ trunk/reactos/drivers/multimedia/directory.rbuild Sun Dec 10 18:09:46 2006 @@ -8,9 +8,6 @@ This is mostly incomplete at the moment. --> - <directory name="ks"> <xi:include href="ks/ks.rbuild" /> </directory> Modified: trunk/reactos/drivers/multimedia/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/ks.r… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/ks.rbuild (original) +++ trunk/reactos/drivers/multimedia/ks/ks.rbuild Sun Dec 10 18:09:46 2006 @@ -6,6 +6,7 @@ <library>ntoskrnl</library> <define name="__USE_W32API" /> <define name="BUILDING_KS" /> + <file>ks.rc</file> <file>allocators.c</file> <file>clocks.c</file> <file>connectivity.c</file> Added: trunk/reactos/drivers/multimedia/ks/ks.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/ks.r… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/ks.rc (added) +++ trunk/reactos/drivers/multimedia/ks/ks.rc Sun Dec 10 18:09:46 2006 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Kernel Streaming API\0" +#define REACTOS_STR_INTERNAL_NAME "ks\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ks.sys\0" +#include <reactos/version.rc> Added: trunk/reactos/drivers/multimedia/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/adapter.c (added) +++ trunk/reactos/drivers/multimedia/portcls/adapter.c Sun Dec 10 18:09:46 2006 @@ -1,0 +1,87 @@ +/* + ReactOS Kernel Streaming + Port Class API: Adapter initialization + + Author: Andrew Greenwood + +*/ + +#include <portcls.h> + + +NTSTATUS +PcStartIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* Internal function */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +PcUnload( + IN PDRIVER_OBJECT DriverObject) +{ + /* Internal function */ + return STATUS_UNSUCCESSFUL; +} + + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcInitializeAdapterDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName, + IN PDRIVER_ADD_DEVICE AddDevice) +{ + /* + This is effectively a common DriverEntry function for PortCls drivers. + So it has similar responsibilities to a normal driver. + + First 2 parameters are from DriverEntry. + Installs the supplied AddDevice routine in the driver object?s driver extension and installs the PortCls driver?s IRP handlers in the driver object itself. + */ + + DriverObject->DriverExtension->AddDevice = AddDevice; + + /* + TODO: (* = implement here, otherwise KS default) + IRP_MJ_CLOSE + * IRP_MJ_CREATE + IRP_MJ_DEVICE_CONTROL + IRP_MJ_FLUSH_BUFFERS + * IRP_MJ_PNP + * IRP_MJ_POWER + IRP_MJ_QUERY_SECURITY + IRP_MJ_READ + IRP_MJ_SET_SECURITY + * IRP_MJ_SYSTEM_CONTROL + IRP_MJ_WRITE + */ + + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcAddAdapterDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PCPFNSTARTDEVICE StartDevice, + IN ULONG MaxObjects, + IN ULONG DeviceExtensionSize) +{ + /* + Note - after this has been called, we can + handle IRP_MN_START_DEVICE by calling StartDevice + */ + + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} Added: trunk/reactos/drivers/multimedia/portcls/dll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/dll.c (added) +++ trunk/reactos/drivers/multimedia/portcls/dll.c Sun Dec 10 18:09:46 2006 @@ -1,0 +1,29 @@ +/* + ReactOS Kernel Streaming + Port Class / Library Init and Cleanup + + Author: Andrew Greenwood + + Notes: + - +*/ + +#include <ntddk.h> + +/* + * @implemented + */ +ULONG STDCALL +DllInitialize(ULONG Unknown) +{ + return 0; +} + +/* + * @implemented + */ +ULONG STDCALL +DllUnload(VOID) +{ + return 0; +} Added: trunk/reactos/drivers/multimedia/portcls/drm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/drm.c (added) +++ trunk/reactos/drivers/multimedia/portcls/drm.c Sun Dec 10 18:09:46 2006 @@ -1,0 +1,73 @@ +/* + ReactOS Kernel Streaming + Port Class / Digital Rights Management + + Author: Andrew Greenwood + + Notes: + These are convenience functions for accessing DRM facilities, as + documented here: + http://www.osronline.com/ddkx/stream/aud-prop_9f77.htm +*/ + +#include <portcls.h> +#include <drmk.h> + +PORTCLASSAPI NTSTATUS NTAPI +PcAddContentHandlers( + IN ULONG ContentId, + IN PVOID *paHandlers, + IN ULONG NumHandlers) +{ + return DrmAddContentHandlers(ContentId, paHandlers, NumHandlers); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcCreateContentMixed( + IN PULONG paContentId, + IN ULONG cContentId, + OUT PULONG pMixedContentId) +{ + return DrmCreateContentMixed(paContentId, cContentId, pMixedContentId); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcDestroyContent( + IN ULONG ContentId) +{ + return DrmDestroyContent(ContentId); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToDeviceObject( + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward) +{ + return DrmForwardContentToDeviceObject(ContentId, Reserved, DrmForward); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToFileObject( + IN ULONG ContentId, + IN PFILE_OBJECT FileObject) +{ + return DrmForwardContentToFileObject(ContentId, FileObject); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToInterface( + IN ULONG ContentId, + IN PUNKNOWN pUnknown, + IN ULONG NumMethods) +{ + return DrmForwardContentToInterface(ContentId, pUnknown, NumMethods); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcGetContentRights( + IN ULONG ContentId, + OUT PDRMRIGHTS DrmRights) +{ + return DrmGetContentRights(ContentId, DrmRights); +} Removed: trunk/reactos/drivers/multimedia/portcls/portcls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/portcls.c (original) +++ trunk/reactos/drivers/multimedia/portcls/portcls.c (removed) @@ -1,489 +1,0 @@ -/* - * PROJECT: ReactOS Sound System - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/multimedia/portcls/portcls.c - * PURPOSE: Audio Port Class Functions - * PROGRAMMERS: - * - */ - -#include "portcls.h" - - -#define NDEBUG -#include <debug.h> - - -NTSTATUS STDCALL -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -{ - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -ULONG STDCALL -DllInitialize(ULONG Unknown) -{ - return 0; -} - -/* - * @implemented - */ -ULONG STDCALL -DllUnload(VOID) -{ - return 0; -} - - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcAddAdapterDevice( - ULONG DriverObject, - ULONG PhysicalDeviceObject, - ULONG StartDevice, - ULONG MaxObjects, - ULONG DeviceExtensionSize -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcAddContentHandlers( - ULONG ContentId, - ULONG paHandlers, - ULONG NumHandlers -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcCompleteIrp( - ULONG DeviceObject, - ULONG Irp, - ULONG Status -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcCompletePendingPropertyRequest( - ULONG PropertyRequest, - ULONG NtStatus -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcCreateContentMixed( - ULONG paContentId, - ULONG cContentId, - ULONG pMixedContentId -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcDestroyContent( - ULONG ContentId -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcDispatchIrp( - ULONG DeviceObject, - ULONG Irp -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcForwardContentToDeviceObject( - ULONG ContentId, - ULONG Reserved, - ULONG DrmForward -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcForwardContentToFileObject( - ULONG ContentId, - ULONG FileObject -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcForwardContentToInterface( - ULONG ContentId, - ULONG Unknown, - ULONG NumMethods -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcForwardIrpSynchronous( - ULONG DeviceObject, - ULONG Irp -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcGetContentRights( - ULONG ContentId, - ULONG DrmRights -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcGetDeviceProperty( - ULONG DeviceObject, - ULONG DeviceProperty, - ULONG BufferLength, - ULONG PropertyBuffer, - ULONG ResultLength -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @implemented - */ -ULONGLONG STDCALL -PcGetTimeInterval( - ULONGLONG Timei -) -{ - LARGE_INTEGER CurrentTime; - - KeQuerySystemTime( &CurrentTime); - - return (Timei - CurrentTime.QuadPart); -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcInitializeAdapterDriver( - ULONG DriverObject, - ULONG RegistryPathName, - ULONG AddDevice -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewDmaChannel( - ULONG OutDmaChannel, - ULONG Unknown, - ULONG PoolType, - ULONG DeviceDescription, - ULONG DeviceObject -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewInterruptSync( - ULONG OutInterruptSync, - ULONG Unknown, - ULONG ResourceList, - ULONG ResourceIndex, - ULONG Mode -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewMiniport( - ULONG OutMiniport, - ULONG ClassId -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewPort( - ULONG OutPort, - ULONG ClassId -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewRegistryKey( - ULONG OutRegistryKey, - ULONG Unknown, - ULONG RegistryKeyType, - ULONG DesiredAccess, - ULONG DeviceObject, - ULONG SubDevice, - ULONG ObjectAttributes, - ULONG CreateOptions, - ULONG Disposition -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewResourceList( - ULONG OutResourceList, - ULONG Unknown, - ULONG PoolType, - ULONG TranslatedResources, - ULONG UntranslatedResources -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewResourceSublist( - ULONG OutResourceList, - ULONG Unknown, - ULONG PoolType, - ULONG ParentList, - ULONG MaximumEntries -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcNewServiceGroup( - ULONG OutServiceGroup, - ULONG Unknown -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcRegisterAdapterPowerManagement( - ULONG Unknown, - ULONG pvContext -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcRegisterIoTimeout( - ULONG pDeviceObject, - ULONG pTimerRoutine, - ULONG pContext -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcRegisterPhysicalConnection( - ULONG DeviceObject, - ULONG FromUnknown, - ULONG FromPin, - ULONG ToUnknown, - ULONG ToPin -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcRegisterPhysicalConnectionFromExternal( - ULONG DeviceObject, - ULONG FromString, - ULONG FromPin, - ULONG ToUnknown, - ULONG ToPin -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcRegisterPhysicalConnectionToExternal( - ULONG DeviceObject, - ULONG FromUnknown, - ULONG FromPin, - ULONG ToString, - ULONG ToPin -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcRegisterSubdevice( - ULONG DeviceObject, - ULONG SubdevName, - ULONG Unknown -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcRequestNewPowerState( - ULONG pDeviceObject, - ULONG RequestedNewState -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -PcUnregisterIoTimeout( - ULONG pDeviceObject, - ULONG pTimerRoutine, - ULONG pContext -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - Modified: trunk/reactos/drivers/multimedia/portcls/portcls.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/portcls.def (original) +++ trunk/reactos/drivers/multimedia/portcls/portcls.def Sun Dec 10 18:09:46 2006 @@ -2,21 +2,14 @@ ; Exports definition file for portcls.sys ; EXPORTS +DllInitialize@4 +DllUnload@0 + +; Adapters (adapter.c) PcAddAdapterDevice@20 -PcAddContentHandlers@12 -PcCompleteIrp@12 -PcCompletePendingPropertyRequest@8 -PcCreateContentMixed@12 -PcDestroyContent@4 -PcDispatchIrp@8 -PcForwardContentToDeviceObject@12 -PcForwardContentToFileObject@8 -PcForwardContentToInterface@12 -PcForwardIrpSynchronous@8 -PcGetContentRights@8 -PcGetDeviceProperty@20 -PcGetTimeInterval@8 PcInitializeAdapterDriver@12 + +; Factories PcNewDmaChannel@20 PcNewInterruptSync@20 PcNewMiniport@8 @@ -25,12 +18,38 @@ PcNewResourceList@20 PcNewResourceSublist@20 PcNewServiceGroup@8 -PcRegisterAdapterPowerManagement@8 -PcRegisterIoTimeout@12 + +; Digital Rights Management (drm.c) +PcAddContentHandlers@12 +PcCreateContentMixed@12 +PcDestroyContent@4 +PcForwardContentToDeviceObject@12 +PcForwardContentToFileObject@8 +PcForwardContentToInterface@12 +PcGetContentRights@8 + +; IRP Helpers +PcCompleteIrp@12 +PcDispatchIrp@8 +PcForwardIrpSynchronous@8 + +; Misc +PcGetTimeInterval@8 +PcRegisterSubdevice@12 + +; Physical Connections PcRegisterPhysicalConnection@20 PcRegisterPhysicalConnectionFromExternal@20 PcRegisterPhysicalConnectionToExternal@20 -PcRegisterSubdevice@12 + +; Power Management +PcRegisterAdapterPowerManagement@8 PcRequestNewPowerState@8 + +; Properties +PcCompletePendingPropertyRequest@8 +PcGetDeviceProperty@20 + +; Timeouts +PcRegisterIoTimeout@12 PcUnregisterIoTimeout@12 - Removed: trunk/reactos/drivers/multimedia/portcls/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/portcls.h (original) +++ trunk/reactos/drivers/multimedia/portcls/portcls.h (removed) @@ -1,253 +1,0 @@ -/* - - Move to w32api when it is ready. - - */ -#ifndef _PORTCLS_H -#define _PORTCLS_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* This header is total bull**** */ - -#include <ntddk.h> - -#define PORTCLASSAPI extern - -PORTCLASSAPI NTSTATUS STDCALL -PcAddAdapterDevice( - ULONG DriverObject, - ULONG PhysicalDeviceObject, - ULONG StartDevice, - ULONG MaxObjects, - ULONG DeviceExtensionSize -); - -PORTCLASSAPI NTSTATUS STDCALL -PcAddContentHandlers( - ULONG ContentId, - ULONG paHandlers, - ULONG NumHandlers -); - -PORTCLASSAPI NTSTATUS STDCALL -PcCompleteIrp( - ULONG DeviceObject, - ULONG Irp, - ULONG Status -); - -PORTCLASSAPI NTSTATUS STDCALL -PcCompletePendingPropertyRequest( - ULONG PropertyRequest, - ULONG NtStatus -); - -PORTCLASSAPI NTSTATUS STDCALL -PcCreateContentMixed( - ULONG paContentId, - ULONG cContentId, - ULONG pMixedContentId -); - -PORTCLASSAPI NTSTATUS STDCALL -PcDestroyContent( - ULONG ContentId -); - -PORTCLASSAPI NTSTATUS STDCALL -PcDispatchIrp( - ULONG DeviceObject, - ULONG Irp -); - -PORTCLASSAPI NTSTATUS STDCALL -PcForwardContentToDeviceObject( - ULONG ContentId, - ULONG Reserved, - ULONG DrmForward -); - -PORTCLASSAPI NTSTATUS STDCALL -PcForwardContentToFileObject( - ULONG ContentId, - ULONG FileObject -); - -PORTCLASSAPI NTSTATUS STDCALL -PcForwardContentToInterface( - ULONG ContentId, - ULONG Unknown, - ULONG NumMethods -); - -PORTCLASSAPI NTSTATUS STDCALL -PcForwardIrpSynchronous( - ULONG DeviceObject, - ULONG Irp -); - -PORTCLASSAPI NTSTATUS STDCALL -PcGetContentRights( - ULONG ContentId, - ULONG DrmRights -); - -PORTCLASSAPI NTSTATUS STDCALL -PcGetDeviceProperty( - ULONG DeviceObject, - ULONG DeviceProperty, - ULONG BufferLength, - ULONG PropertyBuffer, - ULONG ResultLength -); - -PORTCLASSAPI ULONGLONG STDCALL -PcGetTimeInterval( - ULONGLONG Timei -); - -PORTCLASSAPI NTSTATUS STDCALL -PcInitializeAdapterDriver( - ULONG DriverObject, - ULONG RegistryPathName, - ULONG AddDevice -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewDmaChannel( - ULONG OutDmaChannel, - ULONG Unknown, - ULONG PoolType, - ULONG DeviceDescription, - ULONG DeviceObject -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewInterruptSync( - ULONG OutInterruptSync, - ULONG Unknown, - ULONG ResourceList, - ULONG ResourceIndex, - ULONG Mode -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewMiniport( - ULONG OutMiniport, - ULONG ClassId -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewPort( - ULONG OutPort, - ULONG ClassId -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewRegistryKey( - ULONG OutRegistryKey, - ULONG Unknown, - ULONG RegistryKeyType, - ULONG DesiredAccess, - ULONG DeviceObject, - ULONG SubDevice, - ULONG ObjectAttributes, - ULONG CreateOptions, - ULONG Disposition -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewResourceList( - ULONG OutResourceList, - ULONG Unknown, - ULONG PoolType, - ULONG TranslatedResources, - ULONG UntranslatedResources -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewResourceSublist( - ULONG OutResourceList, - ULONG Unknown, - ULONG PoolType, - ULONG ParentList, - ULONG MaximumEntries -); - -PORTCLASSAPI NTSTATUS STDCALL -PcNewServiceGroup( - ULONG OutServiceGroup, - ULONG Unknown -); - -PORTCLASSAPI NTSTATUS STDCALL -PcRegisterAdapterPowerManagement( - ULONG Unknown, - ULONG pvContext -); - -PORTCLASSAPI NTSTATUS STDCALL -PcRegisterIoTimeout( - ULONG pDeviceObject, - ULONG pTimerRoutine, - ULONG pContext -); - -PORTCLASSAPI NTSTATUS STDCALL -PcRegisterPhysicalConnection( - ULONG DeviceObject, - ULONG FromUnknown, - ULONG FromPin, - ULONG ToUnknown, - ULONG ToPin -); - -PORTCLASSAPI NTSTATUS STDCALL -PcRegisterPhysicalConnectionFromExternal( - ULONG DeviceObject, - ULONG FromString, - ULONG FromPin, - ULONG ToUnknown, - ULONG ToPin -); - -PORTCLASSAPI NTSTATUS STDCALL -PcRegisterPhysicalConnectionToExternal( - ULONG DeviceObject, - ULONG FromUnknown, - ULONG FromPin, - ULONG ToString, - ULONG ToPin -); - -PORTCLASSAPI NTSTATUS STDCALL -PcRegisterSubdevice( - ULONG DeviceObject, - ULONG SubdevName, - ULONG Unknown -); - -PORTCLASSAPI NTSTATUS STDCALL -PcRequestNewPowerState( - ULONG pDeviceObject, - ULONG RequestedNewState -); - -PORTCLASSAPI NTSTATUS STDCALL -PcUnregisterIoTimeout( - ULONG pDeviceObject, - ULONG pTimerRoutine, - ULONG pContext -); - -#ifdef __cplusplus -} -#endif - -#endif Modified: trunk/reactos/drivers/multimedia/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/multimedia/portcls/portcls.rbuild Sun Dec 10 18:09:46 2006 @@ -1,8 +1,12 @@ -<module name="portcls" type="exportdriver" installbase="system32/drivers" installname="portcls.sys"> +<module name="portcls" type="exportdriver" installbase="system32/drivers" installname="portcls.sys" allowwarnings="true"> <importlibrary definition="portcls.def" /> <define name="__USE_W32API" /> + <include base="portcls">../include</include> <library>ntoskrnl</library> - <library>hal</library> - <file>portcls.c</file> + <library>drmk</library> + <file>dll.c</file> + <file>adapter.c</file> + <file>drm.c</file> + <file>stubs.c</file> <file>portcls.rc</file> </module> Added: trunk/reactos/drivers/multimedia/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls/stubs.c (added) +++ trunk/reactos/drivers/multimedia/portcls/stubs.c Sun Dec 10 18:09:46 2006 @@ -1,0 +1,338 @@ +/* + Port Class API + Stubbed functions +*/ + +#include <portcls.h> + +/* + Factory Stubs +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewDmaChannel( + OUT PDMACHANNEL* OutDmaChannel, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PDEVICE_DESCRIPTION DeviceDescription, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewInterruptSync( + OUT PINTERRUPTSYNC* OUtInterruptSync, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN PRESOURCELIST ResourceList, + IN ULONG ResourceIndex, + IN INTERRUPTSYNCMODE Mode) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewMiniport( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewPort( + OUT PPORT* OutPort, + IN REFCLSID ClassId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewRegistryKey( + OUT PREGISTRYKEY* OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN PVOID DeviceObject OPTIONAL, + IN PVOID SubDevice OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceList( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PCM_RESOURCE_LIST TranslatedResources, + IN PCM_RESOURCE_LIST UntranslatedResources) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceSublist( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ParentList, + IN ULONG MaximumEntries) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewServiceGroup( + OUT PSERVICEGROUP* OutServiceGroup, + IN PUNKNOWN OuterUnknown OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + IRP Handling +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcDispatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcCompleteIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN NTSTATUS Status) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcForwardIrpSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Power Management +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterAdapterPowerManagement( + IN PUNKNOWN pUnknown, + IN PVOID pvContext1) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRequestNewPowerState( + IN PDEVICE_OBJECT pDeviceObject, + IN DEVICE_POWER_STATE RequestedNewState) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Properties +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcGetDeviceProperty( + IN PVOID DeviceObject, + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ResultLength) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcCompletePendingPropertyRequest( + IN PPCPROPERTY_REQUEST PropertyRequest, + IN NTSTATUS NtStatus) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + I/O Timeouts +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcUnregisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Physical Connections +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnection( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnectionFromExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnectionToExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNICODE_STRING ToString, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Misc +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI ULONGLONG NTAPI +PcGetTimeInterval( + IN ULONGLONG Since) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterSubdevice( + IN PDEVICE_OBJECT DeviceObject, + IN PWCHAR Name, + IN PUNKNOWN Unknown) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +}

1 0

[greatlrd] 25113: Fixed all hack in createsurface, we still have some bugs and do not create surface as we should. but we lest create a single primary surface.
by greatlrd＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: greatlrd Date: Sun Dec 10 16:32:35 2006 New Revision: 25113 URL: http://svn.reactos.org/svn/reactos?rev=25113&view=rev Log: Fixed all hack in createsurface, we still have some bugs and do not create surface as we should. but we lest create a single primary surface. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Dec 10 16:32:35 2006 @@ -184,8 +184,7 @@ LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; LPDDRAWI_DDRAWSURFACE_INT That; DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - DDHAL_CREATESURFACEDATA mDdCreateSurface; - LPDDRAWI_DDRAWSURFACE_MORE SurfaceMore; + DDHAL_CREATESURFACEDATA mDdCreateSurface; /* * check if pUnkOuter is NULL if it is not fail @@ -266,6 +265,17 @@ DxHeapMemFree(That); return DDERR_OUTOFMEMORY; } + + That->lpLcl->lpSurfMore->slist = DxHeapMemAlloc(sizeof(LPDDRAWI_DDRAWSURFACE_LCL)<<1); + if (That->lpLcl->lpSurfMore->slist == NULL) + { + /* shall we free it if it fail ?? */ + DxHeapMemFree(That->lpLcl->lpSurfMore); + DxHeapMemFree(That->lpLcl); + DxHeapMemFree(That); + return DDERR_OUTOFMEMORY; + } + /* setup some value */ *ppSurf = (LPDIRECTDRAWSURFACE7)That; @@ -276,6 +286,7 @@ That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That->lpLcl->lpSurfMore->lpDD_int = This; That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; + That->lpLcl->lpSurfMore->slist[0] = That->lpLcl; That->lpLcl->dwProcessId = GetCurrentProcessId(); /* this two line should be move to startup code */ @@ -301,16 +312,14 @@ mDdCreateSurface.ddRVal = DDERR_GENERIC; mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - //mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - //mDdCreateSurface.lplpSList = &That->lpLcl; + + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; This->lpLcl->lpPrimary = That; - That->lpLcl->lpSurfMore->slist = mpPrimaryLocals; - + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; @@ -320,16 +329,33 @@ { return DDERR_NOTINITIALIZED; } - - That->lpLcl->lpGbl->wWidth = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; - That->lpLcl->lpGbl->wHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; - That->lpLcl->lpGbl->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch; + + /* FIXME + * check the value from pDDSD and use it as size + */ + + if (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) + { + That->lpLcl->lpGbl->wWidth = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; + That->lpLcl->lpGbl->wHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + That->lpLcl->lpGbl->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch; + } + else + { + RECT rect; + + if(GetWindowRect((HWND)This->lpLcl->hWnd, &rect)) + { + That->lpLcl->lpGbl->wWidth = rect.right - rect.left; + That->lpLcl->lpGbl->wHeight = rect.bottom - rect.top; + That->lpLcl->lpGbl->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch; + } + } + - That->lpLcl->dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + // That->lpLcl->dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - mpPrimaryLocals[0] = That->lpLcl; - + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED)

1 0

[greatlrd] 25112: fixed some check in createsurface so user can not easy crash it.
by greatlrd＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: greatlrd Date: Sun Dec 10 13:44:39 2006 New Revision: 25112 URL: http://svn.reactos.org/svn/reactos?rev=25112&view=rev Log: fixed some check in createsurface so user can not easy crash it. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Dec 10 13:44:39 2006 @@ -187,16 +187,57 @@ DDHAL_CREATESURFACEDATA mDdCreateSurface; LPDDRAWI_DDRAWSURFACE_MORE SurfaceMore; + /* + * check if pUnkOuter is NULL if it is not fail + * for accrdiong msdn and own test this member is not + * set. + */ + if (pUnkOuter!=NULL) { return CLASS_E_NOAGGREGATION; } - if (sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) + /* Check so it is vaild pointer we got of ppSurf */ + if (IsBadWritePtr( ppSurf, sizeof( LPDIRECTDRAWSURFACE7 )) ) + { + return DDERR_INVALIDPARAMS; + } + + /* Check so it is vaild pointer we got of pDDSD + */ + if (IsBadWritePtr( pDDSD, sizeof( LPDDSURFACEDESC2 )) ) + { + return DDERR_INVALIDPARAMS; + } + + if (IsBadReadPtr(pDDSD, sizeof( LPDDSURFACEDESC2 )) ) + { + return DDERR_INVALIDPARAMS; + } + + /* Check if it version 1 or version 2 of the DDSURFACEDESC struct + * both struct are vaild. + */ + if (sizeof(DDSURFACEDESC2)!=pDDSD->dwSize) { return DDERR_UNSUPPORTED; } + + + /* here we need start fixing bugs + * the code above is 100% correct behovir + * checked how ms ddraw behivor + */ + + /* FIXME + * Alloc memory for the ppSurf pointer + * we expect it is NULL, But we maybe should add a NULL check + * for it, so we do not over write it, and also add a pointer vaildate + * for it. + */ + That = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); if (That == NULL) @@ -204,26 +245,34 @@ return E_OUTOFMEMORY; } - That->lpLcl = (LPDDRAWI_DDRAWSURFACE_LCL)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL)); - - if (That == NULL) - { + /* FIXME + Alloc memory for the local surface struct we need + we should check if NULL or not see comment above + */ + That->lpLcl = (LPDDRAWI_DDRAWSURFACE_LCL)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL)); + if (That->lpLcl == NULL) + { + /* shall we free it if it fail ?? */ + DxHeapMemFree(That); return E_OUTOFMEMORY; } - SurfaceMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (SurfaceMore == NULL) - { + /* Alloc memory for DDRAWI_DDRAWSURFACE_MORE */ + That->lpLcl->lpSurfMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); + if (That->lpLcl->lpSurfMore == NULL) + { + /* shall we free it if it fail ?? */ + DxHeapMemFree(That->lpLcl); + DxHeapMemFree(That); return DDERR_OUTOFMEMORY; } - That->lpVtbl = &DirectDrawSurface7_Vtable; + /* setup some value */ *ppSurf = (LPDIRECTDRAWSURFACE7)That; - + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpLcl->lpGbl = &ddSurfGbl; - That->lpLcl->lpGbl->lpDD = &ddgbl; - That->lpLcl->lpSurfMore = SurfaceMore; + That->lpLcl->lpGbl->lpDD = &ddgbl; That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); That->lpLcl->lpSurfMore->lpDD_int = This; That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; @@ -232,6 +281,14 @@ /* this two line should be move to startup code */ That->lpLcl->lpGbl->lpDD = This->lpLcl->lpGbl; That->lpLcl->lpGbl->lpDDHandle = This->lpLcl->lpGbl; + + + /* setup the callback struct right + * maybe we should fill in + * xx.lpDD, xx.function, xx.ddRVal + * in startup and do a cache of it + * to save time ?? + */ mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat;

1 0

[greatlrd] 25111: Remove more of createsurface hack for primary surface.
by greatlrd＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: greatlrd Date: Sun Dec 10 11:11:08 2006 New Revision: 25111 URL: http://svn.reactos.org/svn/reactos?rev=25111&view=rev Log: Remove more of createsurface hack for primary surface. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Dec 10 11:11:08 2006 @@ -263,13 +263,10 @@ { return DDERR_NOTINITIALIZED; } - - /* FIXME : - * This tree line is hack - */ - That->lpLcl->lpGbl->wWidth = 1024; //(WORD)mpModeInfos[0].dwWidth; - That->lpLcl->lpGbl->wHeight = 768; //(WORD)mpModeInfos[0].dwHeight; - That->lpLcl->lpGbl->lPitch = 32; //mpModeInfos[0].lPitch; + + That->lpLcl->lpGbl->wWidth = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; + That->lpLcl->lpGbl->wHeight = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + That->lpLcl->lpGbl->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch; That->lpLcl->dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps;

1 0

[greatlrd] 25110: small optimzing of drawing line by George Veskov (jkxxster at gmail dot com) irc nick jkxx
by greatlrd＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: greatlrd Date: Sun Dec 10 10:39:20 2006 New Revision: 25110 URL: http://svn.reactos.org/svn/reactos?rev=25110&view=rev Log: small optimzing of drawing line by George Veskov (jkxxster at gmail dot com) irc nick jkxx Modified: trunk/reactos/dll/win32/gdi32/objects/linedda.c Modified: trunk/reactos/dll/win32/gdi32/objects/linedda.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/li… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/linedda.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/linedda.c Sun Dec 10 10:39:20 2006 @@ -43,7 +43,44 @@ INT cnt; INT dx = nXEnd - nXStart; INT dy = nYEnd - nYStart; - + + // optimized for vertical and horizontal lines so we avoid unnecessary math + if(nXStart == nXEnd) + { + // vertical line - use dx,dy as temp variables so we don't waste stack space + if(nYStart < nYEnd) + { + dx = nYStart; + dy = nYEnd; + } else { + dx = nYEnd; + dy = nYStart; + } + for(cnt = dx; cnt <= dy; cnt++) + { + lpLineFunc(nXStart,cnt,lpData); + } + return TRUE; + } + + if(nYStart == nYEnd) + { + // horizontal line - use dx,dy as temp variables so we don't waste stack space + if(nXStart < nXEnd) + { + dx = nXStart; + dy = nXEnd; + } else { + dx = nXEnd; + dy = nXStart; + } + for(cnt = dx; cnt <= dy; cnt++) + { + lpLineFunc(cnt, nYStart,lpData); + } + return TRUE; + } + // end of H/V line code if (dx < 0) { dx = -dx; xadd = -1; }

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