Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 34796: - add a hack to basetsd.h to undefine _X86_ on amd64 builds (gcc defines it) - include _M_AMD64 for defintitions in ioaccess.h - remove KeGetCurrentThread from winddk.h (doesn't work that way) - hack amd64/ketypes.h to make it compile
by tkreuzer＠svn.reactos.org 26 Jul '08

26 Jul '08

Author: tkreuzer Date: Fri Jul 25 19:02:34 2008 New Revision: 34796 URL: http://svn.reactos.org/svn/reactos?rev=34796&view=rev Log: - add a hack to basetsd.h to undefine _X86_ on amd64 builds (gcc defines it) - include _M_AMD64 for defintitions in ioaccess.h - remove KeGetCurrentThread from winddk.h (doesn't work that way) - hack amd64/ketypes.h to make it compile Modified: branches/ros-amd64-bringup/reactos/include/ddk/ioaccess.h branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ioaccess.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ioaccess.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ioaccess.h [iso-8859-1] Fri Jul 25 19:02:34 2008 @@ -31,7 +31,7 @@ #ifndef NO_PORT_MACROS -#if defined(_X86_) +#if defined(_X86_) || defined(_M_AMD64) #define READ_REGISTER_UCHAR(r) (*(volatile UCHAR *)(r)) #define READ_REGISTER_USHORT(r) (*(volatile USHORT *)(r)) #define READ_REGISTER_ULONG(r) (*(volatile ULONG *)(r)) Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Fri Jul 25 19:02:34 2008 @@ -5496,15 +5496,19 @@ #elif defined(__x86_64__) +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CLOCK_LEVEL 13 +#define IPI_LEVEL 14 +#define POWER_LEVEL 14 +#define PROFILE_LEVEL 15 +#define HIGH_LEVEL 15 + typedef struct _KFLOATING_SAVE { ULONG Dummy; } KFLOATING_SAVE, *PKFLOATING_SAVE; - -NTKERNELAPI -PRKTHREAD -NTAPI -KeGetCurrentThread( - VOID); #elif defined(__PowerPC__) Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Fri Jul 25 19:02:34 2008 @@ -8,7 +8,7 @@ Abstract: - i386 Type definitions for the Kernel services. + amd64 Type definitions for the Kernel services. Author: @@ -16,8 +16,8 @@ --*/ -#ifndef _IAMD64_KETYPES_H -#define _IAMD64_KETYPES_H +#ifndef _AMD64_KETYPES_H +#define _AMD64_KETYPES_H // // Dependencies @@ -26,12 +26,12 @@ // // KPCR Access for non-IA64 builds // -#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) -#define PCR ((volatile KPCR * const)K0IPCR) -#if defined(CONFIG_SMP) || defined(NT_BUILD) -#undef KeGetPcr -#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) -#endif +//#define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) +//#define PCR ((volatile KPCR * const)K0IPCR) +//#if defined(CONFIG_SMP) || defined(NT_BUILD) +//#undef KeGetPcr +//#define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) +//#endif // // Machine Types @@ -296,7 +296,8 @@ struct _KPRCB * KeGetCurrentPrcb(VOID) { - return (struct _KPRCB *)(ULONG_PTR)__readgsqword(FIELD_OFFSET(KPCR, Prcb)); +// return (struct _KPRCB *)(ULONG_PTR)__readgsqword(FIELD_OFFSET(KPCR, Prcb)); + return 0; } // Modified: branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/basetsd.h [iso-8859-1] Fri Jul 25 19:02:34 2008 @@ -7,6 +7,11 @@ #ifdef __GNUC__ #ifndef __int64 #define __int64 long long +#endif +#if defined(_M_AMD64) || defined(__x86_64__) +#if defined(_X86_) +#undef _X86_ +#endif #endif #endif

1 0

[sserapion] 34795: Fix dozens of 64bit warnings. Create amd64 def file.
by sserapion＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: sserapion Date: Fri Jul 25 18:41:31 2008 New Revision: 34795 URL: http://svn.reactos.org/svn/reactos?rev=34795&view=rev Log: Fix dozens of 64bit warnings. Create amd64 def file. Added: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def (with props) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/capture.c branches/ros-amd64-bringup/reactos/dll/ntdll/dbg/dbgui.c branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_arm.def branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/csr/capture.c [iso-8859-1] Fri Jul 25 18:41:31 2008 @@ -42,7 +42,7 @@ /* Do the probe */ Pointer = (PUCHAR)Address; Data = *Pointer; - Pointer = (PUCHAR)((ULONG)Address + Length -1); + Pointer = (PUCHAR)((ULONG_PTR)Address + Length -1); Data = *Pointer; } @@ -72,7 +72,7 @@ Pointer = (PUCHAR)Address; Data = *Pointer; *Pointer = Data; - Pointer = (PUCHAR)((ULONG)Address + Length -1); + Pointer = (PUCHAR)((ULONG_PTR)Address + Length -1); Data = *Pointer; *Pointer = Data; } Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] Fri Jul 25 18:41:31 2008 @@ -65,9 +65,9 @@ HANDLE ThreadHandle; /* Write common data */ - DebugEvent->dwProcessId = (DWORD)WaitStateChange-> + DebugEvent->dwProcessId = (ULONG_PTR)WaitStateChange-> AppClientId.UniqueProcess; - DebugEvent->dwThreadId = (DWORD)WaitStateChange->AppClientId.UniqueThread; + DebugEvent->dwThreadId = (ULONG_PTR)WaitStateChange->AppClientId.UniqueThread; /* Check what kind of even this is */ switch (WaitStateChange->NewState) Added: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def (added) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def [iso-8859-1] Fri Jul 25 18:41:31 2008 @@ -1,0 +1,1097 @@ +; $Id: ntdll.def 34404 2008-07-10 09:46:25Z fireball $ +; +; ReactOS Operating System +; +LIBRARY ntdll.dll + +EXPORTS +CsrAllocateCaptureBuffer +CsrAllocateMessagePointer +CsrCaptureMessageBuffer +CsrCaptureMessageMultiUnicodeStringsInPlace +CsrCaptureMessageString +CsrCaptureTimeout +CsrClientCallServer +CsrClientConnectToServer +CsrFreeCaptureBuffer +CsrGetProcessId +CsrIdentifyAlertableThread +CsrNewThread +CsrProbeForRead +CsrProbeForWrite +CsrSetPriorityClass +DbgBreakPoint +DbgPrint +DbgPrintEx +DbgPrompt +DbgUiConvertStateChangeStructure +DbgUiDebugActiveProcess +DbgUiConnectToDbg +DbgUiContinue +DbgUiGetThreadDebugObject +DbgUiIssueRemoteBreakin +DbgUiRemoteBreakin +DbgUiSetThreadDebugObject +DbgUiStopDebugging +DbgUiWaitStateChange +DbgUserBreakPoint +KiRaiseUserExceptionDispatcher +KiUserApcDispatcher +KiUserCallbackDispatcher +KiUserExceptionDispatcher +KiIntSystemCall +KiFastSystemCallRet +KiFastSystemCall +LdrAccessResource +LdrAddRefDll +LdrDisableThreadCalloutsForDll +LdrEnumResources +LdrFindEntryForAddress +LdrFindResourceDirectory_U +LdrFindResource_U +LdrGetDllHandle +LdrGetProcedureAddress +LdrInitializeThunk +LdrLoadDll +LdrProcessRelocationBlock +LdrQueryImageFileExecutionOptions +LdrQueryProcessModuleInformation +LdrShutdownProcess +LdrShutdownThread +LdrUnloadDll +LdrVerifyImageMatchesChecksum +NlsAnsiCodePage DATA +NlsMbCodePageTag DATA +NlsMbOemCodePageTag DATA +NtAcceptConnectPort +NtAccessCheck +NtAccessCheckAndAuditAlarm +NtAddAtom +NtAddBootEntry +NtAdjustGroupsToken +NtAdjustPrivilegesToken +NtAlertResumeThread +NtAlertThread +NtAllocateLocallyUniqueId +NtAllocateUuids +NtAllocateVirtualMemory +NtAssignProcessToJobObject +NtCallbackReturn +NtCancelIoFile +NtCancelTimer +NtClearEvent +NtClose +NtCloseObjectAuditAlarm +NtCompareTokens +NtCompleteConnectPort +NtConnectPort +NtContinue +NtCreateDebugObject +NtCreateDirectoryObject +NtCreateEvent +NtCreateEventPair +NtCreateFile +NtCreateIoCompletion +NtCreateJobObject +NtCreateKey +NtCreateMailslotFile +NtCreateMutant +NtCreateNamedPipeFile +NtCreatePagingFile +NtCreatePort +NtCreateProcess +NtCreateProfile +NtCreateSection +NtCreateSemaphore +NtCreateSymbolicLinkObject +NtCreateThread +NtCreateTimer +NtCreateToken +NtCreateWaitablePort +NtCurrentTeb=_NtCurrentTeb +NtDebugContinue +NtDelayExecution +NtDeleteAtom +NtDeleteFile +NtDeleteKey +NtDeleteObjectAuditAlarm +NtDeleteValueKey +NtDeviceIoControlFile +NtDisplayString +NtDuplicateObject +NtDuplicateToken +NtEnumerateKey +NtEnumerateValueKey +NtExtendSection +NtFindAtom +NtFlushBuffersFile +NtFlushInstructionCache +NtFlushKey +NtFlushVirtualMemory +NtFlushWriteBuffer +NtFreeVirtualMemory +NtFsControlFile +NtGetContextThread +NtGetPlugPlayEvent +NtImpersonateAnonymousToken +NtImpersonateClientOfPort +NtImpersonateThread +NtInitializeRegistry +NtIsProcessInJob +NtListenPort +NtLoadDriver +NtLoadKey +NtLoadKey2 +NtLockFile +NtLockVirtualMemory +NtMakeTemporaryObject +NtMapViewOfSection +NtNotifyChangeDirectoryFile +NtNotifyChangeKey +NtOpenDirectoryObject +NtOpenEvent +NtOpenEventPair +NtOpenFile +NtOpenIoCompletion +NtOpenJobObject +NtOpenKey +NtOpenMutant +NtOpenObjectAuditAlarm +NtOpenProcess +NtOpenProcessToken +NtOpenSection +NtOpenSemaphore +NtOpenSymbolicLinkObject +NtOpenThread +NtOpenThreadToken +NtOpenTimer +NtPlugPlayControl +NtPowerInformation +NtPrivilegeCheck +NtPrivilegedServiceAuditAlarm +NtPrivilegeObjectAuditAlarm +NtProtectVirtualMemory +NtPulseEvent +NtQueryAttributesFile +NtQueryDebugFilterState +NtQueryDefaultLocale +NtQueryDefaultUILanguage +NtQueryDirectoryFile +NtQueryDirectoryObject +NtQueryEaFile +NtQueryEvent +NtQueryFullAttributesFile +NtQueryInformationAtom +NtQueryInformationFile +NtQueryInformationJobObject +NtQueryInformationPort +NtQueryInformationProcess +NtQueryInformationThread +NtQueryInformationToken +NtQueryInstallUILanguage +NtQueryIntervalProfile +NtQueryIoCompletion +NtQueryKey +NtQueryMultipleValueKey +NtQueryMutant +NtQueryObject +NtQueryPerformanceCounter +NtQuerySection +NtQuerySecurityObject +NtQuerySemaphore +NtQuerySymbolicLinkObject +NtQuerySystemEnvironmentValue +NtQuerySystemInformation +NtQuerySystemTime +NtQueryTimer +NtQueryTimerResolution +NtQueryValueKey +NtQueryVirtualMemory +NtQueryVolumeInformationFile +NtQueueApcThread +NtRaiseException +NtRaiseHardError +NtReadFile +NtReadFileScatter +NtReadRequestData +NtReadVirtualMemory +NtRegisterThreadTerminatePort +NtReleaseMutant +NtReleaseSemaphore +NtRemoveIoCompletion +NtReplaceKey +NtReplyPort +NtReplyWaitReceivePort +NtReplyWaitReceivePortEx +NtReplyWaitReplyPort +NtRequestPort +NtRequestWaitReplyPort +NtResetEvent +NtRestoreKey +NtResumeProcess +NtResumeThread +NtSaveKey +NtSecureConnectPort +NtSetContextThread +NtSetDebugFilterState +NtSetDefaultHardErrorPort +NtSetDefaultLocale +NtSetDefaultUILanguage +NtSetEaFile +NtSetEvent +NtSetHighEventPair +NtSetHighWaitLowEventPair +NtSetInformationDebugObject +NtSetInformationFile +NtSetInformationJobObject +NtSetInformationKey +NtSetInformationObject +NtSetInformationProcess +NtSetInformationThread +NtSetInformationToken +NtSetIntervalProfile +NtSetIoCompletion +NtSetLdtEntries +NtSetLowEventPair +NtSetLowWaitHighEventPair +NtSetSecurityObject +NtSetSystemEnvironmentValue +NtSetSystemInformation +NtSetSystemPowerState +NtSetSystemTime +NtSetTimer +NtSetTimerResolution +NtSetUuidSeed +NtSetValueKey +NtSetVolumeInformationFile +NtShutdownSystem +NtSignalAndWaitForSingleObject +NtStartProfile +NtStopProfile +NtSuspendProcess +NtSuspendThread +NtSystemDebugControl +NtTerminateJobObject +NtTerminateProcess +NtTerminateThread +NtTestAlert +NtUnloadDriver +NtUnloadKey +NtUnlockFile +NtUnlockVirtualMemory +NtUnmapViewOfSection +NtVdmControl +NtWaitForDebugEvent +NtWaitForMultipleObjects +NtWaitForSingleObject +NtWaitHighEventPair +NtWaitLowEventPair +NtWriteFile +NtWriteFileGather +NtWriteRequestData +NtWriteVirtualMemory +NtYieldExecution +;PfxFindPrefix +;PfxInitialize +;PfxInsertPrefix +;PfxRemovePrefix +;PropertyLengthAsVariant +;RestoreEmContext +;RtlAbortRXact +RtlAbsoluteToSelfRelativeSD +RtlAcquirePebLock +RtlAcquireResourceExclusive +RtlAcquireResourceShared +RtlAcquireSRWLockExclusive +RtlAcquireSRWLockShared +RtlAddAccessAllowedAce +RtlAddAccessAllowedAceEx +RtlAddAccessAllowedObjectAce +RtlAddAccessDeniedAce +RtlAddAccessDeniedAceEx +RtlAddAccessDeniedObjectAce +RtlAddAce +;RtlAddActionToRXact +RtlAddAtomToAtomTable +;RtlAddAttributeActionToRXact +RtlAddAuditAccessAce +RtlAddAuditAccessAceEx +RtlAddAuditAccessObjectAce +;RtlAddCompoundAce +RtlAddMandatoryAce +RtlAddRange +RtlAddVectoredExceptionHandler +RtlAdjustPrivilege +RtlAllocateAndInitializeSid +RtlAllocateHandle +RtlAllocateHeap +RtlAnsiCharToUnicodeChar +RtlAnsiStringToUnicodeSize=RtlxAnsiStringToUnicodeSize +RtlAnsiStringToUnicodeString +RtlAppendAsciizToString +RtlAppendStringToString +RtlAppendUnicodeStringToString +RtlAppendUnicodeToString +;RtlApplyRXact +;RtlApplyRXactNoFlush +RtlAreAllAccessesGranted +RtlAreAnyAccessesGranted +RtlAreBitsClear +RtlAreBitsSet +RtlAssert +RtlCaptureStackBackTrace +RtlCharToInteger +RtlCheckRegistryKey +RtlClearAllBits +RtlClearBits +RtlCompactHeap +RtlCompareMemory +RtlCompareMemoryUlong +RtlCompareString +RtlCompareUnicodeString +RtlCompressBuffer +RtlComputeCrc32 +;RtlConsoleMultiByteToUnicodeN +RtlConvertExclusiveToShared +RtlConvertLongToLargeInteger +RtlConvertSharedToExclusive +RtlConvertSidToUnicodeString +;RtlConvertUiListToApiList +RtlConvertUlongToLargeInteger +RtlCopyLuid +RtlCopyLuidAndAttributesArray +RtlCopyRangeList +RtlCopySecurityDescriptor +RtlCopySid +RtlCopySidAndAttributesArray +RtlCopyString +RtlCopyUnicodeString +RtlCreateAcl +;RtlCreateAndSetSD +RtlCreateAtomTable +RtlCreateEnvironment +RtlCreateHeap +RtlCreateProcessParameters +RtlCreateQueryDebugBuffer +RtlCreateRegistryKey +RtlCreateSecurityDescriptor +RtlCreateTagHeap +RtlCreateTimer +RtlCreateTimerQueue +RtlCreateUnicodeString +RtlCreateUnicodeStringFromAsciiz +RtlCreateUserProcess +;RtlCreateUserSecurityObject +RtlCreateUserThread +RtlCustomCPToUnicodeN +RtlCutoverTimeToSystemTime +RtlDeNormalizeProcessParams +RtlDecodePointer=RtlEncodePointer +RtlDecompressBuffer +RtlDecompressFragment +RtlDelete +RtlDeleteAce +RtlDeleteAtomFromAtomTable +RtlDeleteCriticalSection +RtlDeleteElementGenericTable +RtlDeleteElementGenericTableAvl +RtlDeleteNoSplay +RtlDeleteOwnersRanges +RtlDeleteRange +RtlDeleteRegistryValue +RtlDeleteResource +RtlDeleteSecurityObject +RtlDeleteTimer +RtlDeleteTimerQueue +RtlDeleteTimerQueueEx +RtlDeregisterWait +RtlDeregisterWaitEx +RtlDestroyAtomTable +RtlDestroyEnvironment +RtlDestroyHandleTable +RtlDestroyHeap +RtlDestroyProcessParameters +RtlDestroyQueryDebugBuffer +RtlDetermineDosPathNameType_U +RtlDllShutdownInProgress +RtlDoesFileExists_U +RtlDosPathNameToNtPathName_U +RtlDosPathNameToRelativeNtPathName_U +RtlDosSearchPath_U +RtlDowncaseUnicodeChar +RtlDowncaseUnicodeString +RtlDumpResource +RtlDuplicateUnicodeString +RtlEmptyAtomTable +RtlEncodePointer +RtlEnlargedIntegerMultiply +RtlEnlargedUnsignedDivide +RtlEnlargedUnsignedMultiply +RtlEnterCriticalSection +RtlEnumProcessHeaps +RtlEnumerateGenericTable +RtlEnumerateGenericTableAvl +RtlEnumerateGenericTableLikeADirectory +RtlEnumerateGenericTableWithoutSplaying +RtlEnumerateGenericTableWithoutSplayingAvl +RtlEqualComputerName +RtlEqualDomainName +RtlEqualLuid +RtlEqualPrefixSid +RtlEqualSid +RtlEqualString +RtlEqualUnicodeString +RtlEraseUnicodeString +RtlExitUserThread +RtlExpandEnvironmentStrings_U +RtlExtendHeap +RtlExtendedIntegerMultiply +RtlExtendedLargeIntegerDivide +RtlExtendedMagicDivide +RtlFillMemory +RtlFillMemoryUlong +RtlFindClearBits +RtlFindClearBitsAndSet +RtlFindClearRuns +RtlFindLastBackwardRunClear +RtlFindLeastSignificantBit +RtlFindLongestRunClear +RtlFindLongestRunSet +RtlFindMessage +RtlFindMostSignificantBit +RtlFindNextForwardRunClear +RtlFindRange +RtlFindSetBits +RtlFindSetBitsAndClear +RtlFirstFreeAce +RtlFormatCurrentUserKeyPath +RtlFormatMessage +RtlFreeAnsiString +RtlFreeHandle +RtlFreeHeap +RtlFreeOemString +RtlFreeRangeList +RtlFreeSid +RtlFreeUnicodeString +RtlFreeUserThreadStack +RtlGUIDFromString +RtlGeneratedotName +RtlGetAce +;RtlGetCallersAddress +RtlGetCompressionWorkSpaceSize +RtlGetControlSecurityDescriptor +RtlGetCurrentDirectory_U +RtlGetDaclSecurityDescriptor +RtlGetElementGenericTable +RtlGetElementGenericTableAvl +RtlGetFirstRange +RtlGetFullPathName_U +RtlGetGroupSecurityDescriptor +RtlGetLastNtStatus +RtlGetLastWinError +RtlGetLongestNtPathLength +RtlGetNextRange +RtlGetNtGlobalFlags +RtlGetNtProductType +RtlGetNtVersionNumbers +RtlGetOwnerSecurityDescriptor +RtlGetProcessHeaps +RtlGetSaclSecurityDescriptor +RtlGetSecurityDescriptorRMControl +RtlGetSetBootStatusData +RtlGetUserInfoHeap +RtlGetVersion +RtlHashUnicodeString +RtlIdentifierAuthoritySid +RtlImageDirectoryEntryToData +RtlImageNtHeader +RtlImageRvaToSection +RtlImageRvaToVa +RtlImpersonateSelf +RtlInitAnsiString +RtlInitCodePageTable +RtlInitNlsTables +RtlInitString +RtlInitUnicodeString +RtlInitUnicodeStringEx +;RtlInitializeAtomPackage +RtlInitializeBitMap +RtlInitializeConditionVariable +RtlInitializeContext +RtlInitializeCriticalSection +RtlInitializeCriticalSectionEx +RtlInitializeCriticalSectionAndSpinCount +RtlInitializeGenericTable +RtlInitializeGenericTableAvl +RtlInitializeHandleTable +RtlInitializeRangeList +RtlInitializeResource +;RtlInitializeRXact +RtlInitializeSid +RtlInitializeSRWLock +RtlInsertElementGenericTable +RtlInsertElementGenericTableAvl +RtlInsertElementGenericTableFull +RtlInsertElementGenericTableFullAvl +RtlIntToUnicodeString +RtlIntegerToChar +RtlIntegerToUnicodeString +RtlInvertRangeList +RtlIpvAddressToStringA +RtlIpvAddressToStringExA +RtlIpvAddressToStringExW +RtlIpvAddressToStringW +RtlIpvStringToAddressA +RtlIpvStringToAddressExA +RtlIpvStringToAddressExW +RtlIpvStringToAddressW +RtlIpvAddressToStringA +RtlIpvAddressToStringExA +RtlIpvAddressToStringExW +RtlIpvAddressToStringW +RtlIpvStringToAddressA +RtlIpvStringToAddressExA +RtlIpvStringToAddressExW +RtlIpvStringToAddressW +RtlIsDosDeviceName_U +RtlIsGenericTableEmpty +RtlIsGenericTableEmptyAvl +RtlIsNameLegalDOS8Dot3 +RtlIsRangeAvailable +RtlIsTextUnicode +RtlIsValidHandle +RtlIsValidIndexHandle +RtlLargeIntegerAdd +RtlLargeIntegerArithmeticShift +RtlLargeIntegerDivide +RtlLargeIntegerNegate +RtlLargeIntegerShiftLeft +RtlLargeIntegerShiftRight +RtlLargeIntegerSubtract +RtlLargeIntegerToChar +RtlLeaveCriticalSection +RtlLengthRequiredSid +RtlLengthSecurityDescriptor +RtlLengthSid +RtlLocalTimeToSystemTime +RtlLockBootStatusData +RtlLockHeap +RtlLookupAtomInAtomTable +RtlLookupElementGenericTable +RtlLookupElementGenericTableAvl +RtlLookupElementGenericTableFull +RtlLookupElementGenericTableFullAvl +RtlMakeSelfRelativeSD +RtlMapGenericMask +RtlMergeRangeLists +RtlMoveMemory +RtlMultiByteToUnicodeN +RtlMultiByteToUnicodeSize +;RtlNewInstanceSecurityObject +;RtlNewSecurityGrantedAccess +RtlNewSecurityObject +RtlNormalizeProcessParams +RtlNtPathNameToDosPathName +RtlNtStatusToDosError +RtlNumberGenericTableElements +RtlNumberGenericTableElementsAvl +RtlNumberOfClearBits +RtlNumberOfSetBits +RtlOemStringToUnicodeSize=RtlxOemStringToUnicodeSize +RtlOemStringToUnicodeString +RtlOemToUnicodeN +RtlOpenCurrentUser +RtlPcToFileHeader +RtlPinAtomInAtomTable +RtlPrefixString +RtlPrefixUnicodeString +;RtlProtectHeap +RtlQueryAtomInAtomTable +RtlQueryEnvironmentVariable_U +RtlQueryInformationAcl +;RtlQueryProcessBackTraceInformation +RtlQueryProcessDebugInformation +;RtlQueryProcessHeapInformation +;RtlQueryProcessLockInformation +RtlQueryRegistryValues +RtlQuerySecurityObject +RtlQueryTagHeap +RtlQueryTimeZoneInformation +RtlQueueWorkItem +RtlRaiseException +RtlRaiseStatus +RtlRandom +RtlRandomEx=RtlRandom +RtlReAllocateHeap +RtlRealPredecessor +RtlRealSuccessor +RtlRegisterWait +RtlReleasePebLock +RtlReleaseRelativeName +RtlReleaseResource +RtlReleaseSRWLockExclusive +RtlReleaseSRWLockShared +;RtlRemoteCall +RtlRemoveVectoredExceptionHandler +RtlResetRtlTranslations +RtlRestoreLastWinError=RtlSetLastWinError +RtlRunDecodeUnicodeString +RtlRunEncodeUnicodeString +RtlSecondsSinceToTime +RtlSecondsSinceToTime +RtlSelfRelativeToAbsoluteSD +RtlSelfRelativeToAbsoluteSD2 +RtlSetAllBits +RtlSetAttributesSecurityDescriptor +RtlSetBits +RtlSetControlSecurityDescriptor +RtlSetCriticalSectionSpinCount +RtlSetCurrentDirectory_U +RtlSetCurrentEnvironment +RtlSetDaclSecurityDescriptor +RtlSetEnvironmentVariable +RtlSetGroupSecurityDescriptor +RtlSetInformationAcl +RtlSetLastWinError +RtlSetLastWinErrorAndNtStatusFromNtStatus +RtlSetOwnerSecurityDescriptor +RtlSetProcessIsCritical +RtlSetSaclSecurityDescriptor +RtlSetSecurityDescriptorRMControl +RtlSetSecurityObject +RtlSetTimeZoneInformation +;RtlSetUnicodeCallouts +RtlSetUserFlagsHeap +RtlSetUserValueHeap +RtlSizeHeap +RtlSleepConditionVariableCS +RtlSleepConditionVariableSRW +RtlSplay +;RtlStartRXact +RtlStringFromGUID +RtlSubAuthorityCountSid +RtlSubAuthoritySid +RtlSubtreePredecessor +RtlSubtreeSuccessor +RtlSystemTimeToLocalTime +RtlTimeFieldsToTime +RtlTimeToElapsedTimeFields +RtlTimeToSecondsSince1970 +RtlTimeToSecondsSince1980 +RtlTimeToTimeFields +RtlTryEnterCriticalSection +RtlUlongByteSwap +RtlUlonglongByteSwap +RtlUnhandledExceptionFilter +RtlUnicodeStringToAnsiSize=RtlxUnicodeStringToAnsiSize +RtlUnicodeStringToAnsiString +RtlUnicodeStringToCountedOemString +RtlUnicodeStringToInteger +RtlUnicodeStringToOemSize=RtlxUnicodeStringToOemSize +RtlUnicodeStringToOemString +RtlUnicodeToCustomCPN +RtlUnicodeToMultiByteN +RtlUnicodeToMultiByteSize +RtlUnicodeToOemN +RtlUniform +RtlUnlockBootStatusData +RtlUnlockHeap +RtlUnwind +RtlUpcaseUnicodeChar +RtlUpcaseUnicodeString +RtlUpcaseUnicodeStringToAnsiString +RtlUpcaseUnicodeStringToCountedOemString +RtlUpcaseUnicodeStringToOemString +RtlUpcaseUnicodeToCustomCPN +RtlUpcaseUnicodeToMultiByteN +RtlUpcaseUnicodeToOemN +RtlUpdateTimer +RtlUpperChar +RtlUpperString +RtlUsageHeap +RtlUshortByteSwap +RtlValidAcl +RtlValidRelativeSecurityDescriptor +RtlValidSecurityDescriptor +RtlValidSid +RtlValidateHeap +RtlValidateProcessHeaps +RtlValidateUnicodeString +RtlVerifyVersionInfo +;RtlWalkHeap +RtlWakeAllConditionVariable +RtlWakeConditionVariable +RtlWriteRegistryValue +;RtlZeroHeap +RtlZeroMemory +RtlpEnsureBufferSize +RtlpNtCreateKey +RtlpNtEnumerateSubKey +RtlpNtMakeTemporaryKey +RtlpNtOpenKey +RtlpNtQueryValueKey +RtlpNtSetValueKey +RtlpUnWaitCriticalSection +RtlpWaitForCriticalSection +RtlxAnsiStringToUnicodeSize +RtlxOemStringToUnicodeSize +RtlxUnicodeStringToAnsiSize +RtlxUnicodeStringToOemSize +;SaveEmContext +VerSetConditionMask +ZwAcceptConnectPort +ZwAccessCheck +ZwAccessCheckAndAuditAlarm +ZwAddAtom +ZwAdjustGroupsToken +ZwAdjustPrivilegesToken +ZwAlertResumeThread +ZwAlertThread +ZwAllocateLocallyUniqueId +ZwAllocateUuids +ZwAllocateVirtualMemory +ZwAssignProcessToJobObject +ZwCallbackReturn +ZwCancelIoFile +ZwCancelTimer +ZwClearEvent +ZwClose +ZwCloseObjectAuditAlarm +ZwCompareTokens +ZwCompleteConnectPort +ZwConnectPort +ZwContinue +ZwCreateDebugObject +ZwCreateDirectoryObject +ZwCreateEvent +ZwCreateEventPair +ZwCreateFile +ZwCreateIoCompletion +ZwCreateJobObject +ZwCreateKey +ZwCreateMailslotFile +ZwCreateMutant +ZwCreateNamedPipeFile +ZwCreatePagingFile +ZwCreatePort +ZwCreateProcess +ZwCreateProfile +ZwCreateSection +ZwCreateSemaphore +ZwCreateSymbolicLinkObject +ZwCreateThread +ZwCreateTimer +ZwCreateToken +ZwCreateWaitablePort +ZwDebugContinue +ZwDelayExecution +ZwDeleteAtom +ZwDeleteFile +ZwDeleteKey +ZwDeleteObjectAuditAlarm +ZwDeleteValueKey +ZwDeviceIoControlFile +ZwDisplayString +ZwDuplicateObject +ZwDuplicateToken +ZwEnumerateKey +ZwEnumerateValueKey +ZwExtendSection +ZwFindAtom +ZwFlushBuffersFile +ZwFlushInstructionCache +ZwFlushKey +ZwFlushVirtualMemory +ZwFlushWriteBuffer +ZwFreeVirtualMemory +ZwFsControlFile +ZwGetContextThread +ZwGetPlugPlayEvent +ZwImpersonateAnonymousToken +ZwImpersonateClientOfPort +ZwImpersonateThread +ZwInitializeRegistry +ZwIsProcessInJob +ZwListenPort +ZwLoadDriver +ZwLoadKey +ZwLoadKey +ZwLockFile +ZwLockVirtualMemory +ZwMakeTemporaryObject +ZwMapViewOfSection +ZwNotifyChangeDirectoryFile +ZwNotifyChangeKey +ZwOpenDirectoryObject +ZwOpenEvent +ZwOpenEventPair +ZwOpenFile +ZwOpenIoCompletion +ZwOpenJobObject +ZwOpenKey +ZwOpenMutant +ZwOpenObjectAuditAlarm +ZwOpenProcess +ZwOpenProcessToken +ZwOpenSection +ZwOpenSemaphore +ZwOpenSymbolicLinkObject +ZwOpenThread +ZwOpenThreadToken +ZwOpenTimer +ZwPlugPlayControl +ZwPowerInformation +ZwPrivilegeCheck +ZwPrivilegedServiceAuditAlarm +ZwPrivilegeObjectAuditAlarm +ZwProtectVirtualMemory +ZwPulseEvent +ZwQueryAttributesFile +ZwQueryDebugFilterState +ZwQueryDefaultLocale +ZwQueryDefaultUILanguage +ZwQueryDirectoryFile +ZwQueryDirectoryObject +ZwQueryEaFile +ZwQueryEvent +ZwQueryFullAttributesFile +ZwQueryInformationAtom +ZwQueryInformationFile +ZwQueryInformationJobObject +ZwQueryInformationPort +ZwQueryInformationProcess +ZwQueryInformationThread +ZwQueryInformationToken +ZwQueryInstallUILanguage +ZwQueryIntervalProfile +ZwQueryIoCompletion +ZwQueryKey +ZwQueryMultipleValueKey +ZwQueryMutant +ZwQueryObject +ZwQueryPerformanceCounter +ZwQuerySection +ZwQuerySecurityObject +ZwQuerySemaphore +ZwQuerySymbolicLinkObject +ZwQuerySystemEnvironmentValue +ZwQuerySystemInformation +ZwQuerySystemTime +ZwQueryTimer +ZwQueryTimerResolution +ZwQueryValueKey +ZwQueryVirtualMemory +ZwQueryVolumeInformationFile +ZwQueueApcThread +ZwRaiseException +ZwRaiseHardError +ZwReadFile +ZwReadFileScatter +ZwReadRequestData +ZwReadVirtualMemory +ZwRegisterThreadTerminatePort +ZwReleaseMutant +ZwReleaseSemaphore +ZwRemoveIoCompletion +ZwReplaceKey +ZwReplyPort +ZwReplyWaitReceivePort +ZwReplyWaitReceivePortEx +ZwReplyWaitReplyPort +ZwRequestPort +ZwRequestWaitReplyPort +ZwResetEvent +ZwRestoreKey +ZwResumeProcess +ZwResumeThread +ZwSaveKey +ZwSecureConnectPort +ZwSetContextThread +ZwSetDebugFilterState +ZwSetDefaultHardErrorPort +ZwSetDefaultLocale +ZwSetDefaultUILanguage +ZwSetEaFile +ZwSetEvent +ZwSetHighEventPair +ZwSetHighWaitLowEventPair +ZwSetInformationDebugObject +ZwSetInformationFile +ZwSetInformationJobObject +ZwSetInformationKey +ZwSetInformationObject +ZwSetInformationProcess +ZwSetInformationThread +ZwSetInformationToken +ZwSetIntervalProfile +ZwSetIoCompletion +ZwSetLdtEntries +ZwSetLowEventPair +ZwSetLowWaitHighEventPair +ZwSetSecurityObject +ZwSetSystemEnvironmentValue +ZwSetSystemInformation +ZwSetSystemPowerState +ZwSetSystemTime +ZwSetTimer +ZwSetTimerResolution +ZwSetUuidSeed +ZwSetValueKey +ZwSetVolumeInformationFile +ZwShutdownSystem +ZwSignalAndWaitForSingleObject +ZwStartProfile +ZwStopProfile +ZwSuspendProcess +ZwSuspendThread +ZwSystemDebugControl +ZwTerminateJobObject +ZwTerminateProcess +ZwTerminateThread +ZwTestAlert +ZwUnloadDriver +ZwUnloadKey +ZwUnlockFile +ZwUnlockVirtualMemory +ZwUnmapViewOfSection +ZwVdmControl +ZwWaitForDebugEvent +ZwWaitForMultipleObjects +ZwWaitForSingleObject +ZwWaitHighEventPair +ZwWaitLowEventPair +ZwWriteFile +ZwWriteFileGather +ZwWriteRequestData +ZwWriteVirtualMemory +ZwYieldExecution +__isascii +__iscsym +__iscsymf +__toascii +_alldiv +_allmul +_alloca_probe +_allrem +_allshl +_allshr +_atoi64 +_aulldiv +_aullrem +_aullshr +_chkstk +_fltused +_ftol +_itoa +_itow +_i64toa +_i64tow +_lfind +_ltoa +_ltow +_memccpy +_memicmp +_snprintf +_snwprintf +_splitpath +_strcmpi +_stricmp +_strlwr +_strnicmp +_strupr +_tolower +_toupper +_ui64toa +_ui64tow +_ultoa +_ultow +_vsnprintf +_vsnwprintf +_wcsicmp +_wcslwr +_wcsnicmp +_wcsupr +_wtoi +_wtoi +_wtol +abs +atan +atoi +atol +bsearch +ceil +cos +fabs +floor +isalnum +isalpha +iscntrl +isdigit +isgraph +islower +isprint +ispunct +isspace +isupper +iswalpha +iswctype +iswdigit +iswlower +iswspace +iswxdigit +isxdigit +labs +log +mbstowcs +memchr +memcmp +memcpy +memmove +memset +pow +qsort +sin +sprintf +sqrt +sscanf +strcat +strchr +strcmp +strcpy +strcspn +strlen +strncat +strncmp +strncpy +strpbrk +strrchr +strspn +strstr +strtol +strtoul +strtoull +swprintf +tan +tolower +toupper +towlower +towupper +vsprintf +vDbgPrintExWithPrefix +wcscat +wcschr +wcscmp +wcscpy +wcscspn +wcslen +wcsncat +wcsncmp +wcsncpy +wcspbrk +wcsrchr +wcsspn +wcsstr +wcstol +wcstombs +wcstoul +; EOF Propchange: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_amd64.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_arm.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/def/ntdll_arm.def [iso-8859-1] Fri Jul 25 18:41:31 2008 @@ -1,3 +1,4 @@ + ; $Id: ntdll.def 34404 2008-07-10 09:46:25Z fireball $ ; ; ReactOS Operating System Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Fri Jul 25 18:41:31 2008 @@ -268,7 +268,7 @@ &Size); ASSERT(Module->TlsIndex < LdrpTlsCount); TlsData = &LdrpTlsArray[Module->TlsIndex]; - TlsData->StartAddressOfRawData = (PVOID)TlsDirectory->StartAddressOfRawData; + TlsData->StartAddressOfRawData = (PVOID)(ULONG_PTR)TlsDirectory->StartAddressOfRawData; TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData; TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill; if (TlsDirectory->AddressOfCallBacks) @@ -471,7 +471,7 @@ ASSERT(Module); memset(Module, 0, sizeof(LDR_DATA_TABLE_ENTRY)); Module->DllBase = (PVOID)ImageBase; - Module->EntryPoint = (PVOID)NTHeaders->OptionalHeader.AddressOfEntryPoint; + Module->EntryPoint = (PVOID)(ULONG_PTR)NTHeaders->OptionalHeader.AddressOfEntryPoint; if (Module->EntryPoint != 0) Module->EntryPoint = (PVOID)((ULONG_PTR)Module->EntryPoint + (ULONG_PTR)Module->DllBase); Module->SizeOfImage = LdrpGetResidentSize(NTHeaders); @@ -1047,8 +1047,8 @@ ? RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base] ) : NULL); - if (((ULONG)Function >= (ULONG)ExportDir) && - ((ULONG)Function < (ULONG)ExportDir + (ULONG)ExportDirSize)) + if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) && + ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + (ULONG_PTR)ExportDirSize)) { DPRINT("Forward: %s\n", (PCHAR)Function); Function = LdrFixupForward((PCHAR)Function); @@ -1132,8 +1132,8 @@ { Ordinal = ExOrdinals[Hint]; Function = RVA(BaseAddress, ExFunctions[Ordinal]); - if (((ULONG)Function >= (ULONG)ExportDir) && - ((ULONG)Function < (ULONG)ExportDir + (ULONG)ExportDirSize)) + if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) && + ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + (ULONG_PTR)ExportDirSize)) { DPRINT("Forward: %s\n", (PCHAR)Function); Function = LdrFixupForward((PCHAR)Function); @@ -1166,8 +1166,8 @@ { Ordinal = ExOrdinals[mid]; Function = RVA(BaseAddress, ExFunctions[Ordinal]); - if (((ULONG)Function >= (ULONG)ExportDir) && - ((ULONG)Function < (ULONG)ExportDir + (ULONG)ExportDirSize)) + if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) && + ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + (ULONG_PTR)ExportDirSize)) { DPRINT("Forward: %s\n", (PCHAR)Function); Function = LdrFixupForward((PCHAR)Function);

1 0

[jimtabor] 34794: - Fix NtUserCallMsgFilter so it initiates the hook call.
by jimtabor＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: jimtabor Date: Fri Jul 25 18:08:50 2008 New Revision: 34794 URL: http://svn.reactos.org/svn/reactos?rev=34794&view=rev Log: - Fix NtUserCallMsgFilter so it initiates the hook call. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Jul 25 18:08:50 2008 @@ -298,17 +298,57 @@ BOOL STDCALL NtUserCallMsgFilter( - LPMSG msg, + LPMSG lpmsg, INT code) { + BOOL BadChk = FALSE; + MSG Msg; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserCallMsgFilter\n"); UserEnterExclusive(); - - if ( UserCallNextHookEx( WH_SYSMSGFILTER, code, 0, (LPARAM)msg, FALSE)) - RETURN( TRUE); - RETURN( UserCallNextHookEx( WH_MSGFILTER, code, 0, (LPARAM)msg, FALSE)); + if (lpmsg) + { + _SEH_TRY + { + ProbeForRead((PVOID)lpmsg, + sizeof(MSG), + 1); + RtlCopyMemory( &Msg, + (PVOID)lpmsg, + sizeof(MSG)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + } + else + RETURN( FALSE); + + if (BadChk) RETURN( FALSE); + + if (!co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) + { + co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); + } + + _SEH_TRY + { + ProbeForWrite((PVOID)lpmsg, + sizeof(MSG), + 1); + RtlCopyMemory((PVOID)lpmsg, + &Msg, + sizeof(MSG)); + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) RETURN( FALSE); CLEANUP: DPRINT("Leave NtUserCallMsgFilter. ret=%i\n", _ret_);

1 0

[hpoussin] 34793: Cleanup code
by hpoussin＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: hpoussin Date: Fri Jul 25 15:28:59 2008 New Revision: 34793 URL: http://svn.reactos.org/svn/reactos?rev=34793&view=rev Log: Cleanup code Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pci.c [iso-8859-1] Fri Jul 25 15:28:59 2008 @@ -233,17 +233,9 @@ PciCreateInstanceIDString(PUNICODE_STRING InstanceID, PPCI_DEVICE Device) { - WCHAR Buffer[32]; - ULONG Index; - - Index = 0; - if (((PPDO_DEVICE_EXTENSION)Device->Pdo->DeviceExtension)->PciDevice->BusNumber != 0) - { - /* FIXME: Copy InstanceID of parent PCI bus to Buffer */ - // Index += swprintf(Buffer, ....); - } - - swprintf(&Buffer[Index], L"%02X", Device->SlotNumber.u.AsULONG & 0xff); + WCHAR Buffer[3]; + + swprintf(Buffer, L"%02X", Device->SlotNumber.u.AsULONG & 0xff); return RtlCreateUnicodeString(InstanceID, Buffer) ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; }

1 0

[hpoussin] 34792: Add comments Better interface declarations
by hpoussin＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: hpoussin Date: Fri Jul 25 15:27:05 2008 New Revision: 34792 URL: http://svn.reactos.org/svn/reactos?rev=34792&view=rev Log: Add comments Better interface declarations Modified: trunk/reactos/lib/recyclebin/recyclebin.h Modified: trunk/reactos/lib/recyclebin/recyclebin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin.… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin.h [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin.h [iso-8859-1] Fri Jul 25 15:27:05 2008 @@ -6,7 +6,10 @@ #endif #include <windows.h> +#include <objbase.h> #define ANY_SIZE 1 + +/* Structures used by the API Interface */ typedef struct _DELETED_FILE_DETAILS_A { @@ -34,12 +37,29 @@ #define PDELETED_FILE_DETAILS PDELETED_FILE_DETAILS_A #endif +/* API Interface */ + +/* Function called for each deleted file in the recycle bin + * Context: value given by the caller of the EnumerateRecycleBin function + * hDeletedFile: a handle to the deleted file + * Returning FALSE stops the enumeration. + * Remarks: the handle must be closed with the CloseRecycleBinHandle function + */ typedef BOOL (WINAPI *PENUMERATE_RECYCLEBIN_CALLBACK)(IN PVOID Context, IN HANDLE hDeletedFile); +/* Closes a file deleted handle. + * hDeletedFile: the handle to close + * Returns TRUE if operation succeeded, FALSE otherwise. + * Remark: The handle is obtained in the PENUMERATE_RECYCLEBIN_CALLBACK callback + */ BOOL WINAPI CloseRecycleBinHandle( IN HANDLE hDeletedFile); +/* Moves a file to the recycle bin. + * FileName: the name of the file to move the recycle bin + * Returns TRUE if operation succeeded, FALSE otherwise. + */ BOOL WINAPI DeleteFileToRecycleBinA( IN LPCSTR FileName); @@ -52,6 +72,11 @@ #define DeleteFileToRecycleBin DeleteFileToRecycleBinA #endif +/* Removes all elements contained in a recycle bin + * pszRoot: the name of the drive containing the recycle bin + * Returns TRUE if operation succeeded, FALSE otherwise. + * Remarks: 'pszRoot' can be NULL to mean 'all recycle bins'. + */ BOOL WINAPI EmptyRecycleBinA( IN LPCSTR pszRoot OPTIONAL); @@ -64,6 +89,13 @@ #define EmptyRecycleBin EmptyRecycleBinA #endif +/* Enumerate contents of a recycle bin. + * pszRoot: the name of the drive containing the recycle bin + * pFnCallback: callback function to be called for each deleted item found + * Context: some value which will be given back in the callback function + * Returns TRUE if operation succeeded, FALSE otherwise. + * Remarks: 'pszRoot' can be NULL to mean 'all recycle bins'. + */ BOOL WINAPI EnumerateRecycleBinA( IN LPCSTR pszRoot OPTIONAL, @@ -80,6 +112,14 @@ #define EnumerateRecycleBin EnumerateRecycleBinA #endif +/* Gets details about a deleted file + * hDeletedFile: handle of the deleted file to get details about + * BufferSize: size of the 'FileDetails' buffer, in bytes + * FileDetails: if the function succeeded, contains details about the deleted file + * RequiredSize: contains the minimal buffer size required to get file information details + * Returns TRUE if operation succeeded, FALSE otherwise. + * Remark: The handle is obtained in the PENUMERATE_RECYCLEBIN_CALLBACK callback + */ BOOL WINAPI GetDeletedFileDetailsA( IN HANDLE hDeletedFile, @@ -98,67 +138,87 @@ #define GetDeletedFileDetails GetDeletedFileDetailsA #endif +/* Restores a deleted file + * hDeletedFile: handle of the deleted file to restore + * Returns TRUE if operation succeeded, FALSE otherwise. + * Remarks: if the function succeeds, the handle is not valid anymore. + */ BOOL WINAPI RestoreFile( IN HANDLE hDeletedFile); /* COM interface */ -typedef interface IRecycleBinFile IRecycleBinFile; +#undef INTERFACE +#define INTERFACE IRecycleBinFile + +DECLARE_INTERFACE_(IRecycleBinFile, IUnknown) +{ + BEGIN_INTERFACE + + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* IRecycleBinFile methods */ + STDMETHOD(GetLastModificationTime)(THIS_ FILETIME *pLastModificationTime) PURE; + STDMETHOD(GetDeletionTime)(THIS_ FILETIME *pDeletionTime) PURE; + STDMETHOD(GetFileSize)(THIS_ ULARGE_INTEGER *pFileSize) PURE; + STDMETHOD(GetPhysicalFileSize)(THIS_ ULARGE_INTEGER *pPhysicalFileSize) PURE; + STDMETHOD(GetAttributes)(THIS_ DWORD *pAttributes) PURE; + STDMETHOD(GetFileName)(THIS_ SIZE_T BufferSize, LPWSTR Buffer, SIZE_T *RequiredSize) PURE; + STDMETHOD(Delete)(THIS) PURE; + STDMETHOD(Restore)(THIS) PURE; + + END_INTERFACE +}; + +#undef INTERFACE +#define INTERFACE IRecycleBinEnumList + +DECLARE_INTERFACE_(IRecycleBinEnumList, IUnknown) +{ + BEGIN_INTERFACE + + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* IRecycleBinEnumList methods */ + STDMETHOD(Next)(THIS_ DWORD celt, IRecycleBinFile **rgelt, DWORD *pceltFetched); + STDMETHOD(Skip)(THIS_ DWORD celt) PURE; + STDMETHOD(Reset)(THIS) PURE; + + END_INTERFACE +}; + +#undef INTERFACE +#define INTERFACE IRecycleBin + +DECLARE_INTERFACE_(IRecycleBin, IUnknown) +{ + BEGIN_INTERFACE + + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppvObject) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + /* IRecycleBin methods */ + STDMETHOD(DeleteFile)(THIS_ LPCWSTR szFileName); + STDMETHOD(EmptyRecycleBin)(THIS); + STDMETHOD(EnumObjects)(THIS_ IRecycleBinEnumList **ppEnumList); + + END_INTERFACE +}; + EXTERN_C const IID IID_IRecycleBinFile; - -typedef struct IRecycleBinFileVtbl -{ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IN IRecycleBinFile *This, - IN REFIID riid, - OUT void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IN IRecycleBinFile *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IN IRecycleBinFile *This); - - HRESULT (STDMETHODCALLTYPE *GetLastModificationTime)( - IN IRecycleBinFile *This, - OUT FILETIME *pLastModificationTime); - - HRESULT (STDMETHODCALLTYPE *GetDeletionTime)( - IN IRecycleBinFile *This, - OUT FILETIME *pDeletionTime); - - HRESULT (STDMETHODCALLTYPE *GetFileSize)( - IN IRecycleBinFile *This, - OUT ULARGE_INTEGER *pFileSize); - - HRESULT (STDMETHODCALLTYPE *GetPhysicalFileSize)( - IN IRecycleBinFile *This, - OUT ULARGE_INTEGER *pPhysicalFileSize); - - HRESULT (STDMETHODCALLTYPE *GetAttributes)( - IN IRecycleBinFile *This, - OUT DWORD *pAttributes); - - HRESULT (STDMETHODCALLTYPE *GetFileName)( - IN IRecycleBinFile *This, - IN SIZE_T BufferSize, - IN OUT LPWSTR Buffer, - OUT SIZE_T *RequiredSize); - - HRESULT (STDMETHODCALLTYPE *Delete)( - IN IRecycleBinFile *This); - - HRESULT (STDMETHODCALLTYPE *Restore)( - IN IRecycleBinFile *This); -} IRecycleBinFileVtbl; - -interface IRecycleBinFile -{ - CONST_VTBL struct IRecycleBinFileVtbl *lpVtbl; -}; - -#ifdef COBJMACROS +EXTERN_C const IID IID_IRecycleBinEnumList; +EXTERN_C const IID IID_IRecycleBin; + +#if (!defined(__cplusplus) || defined(CINTERFACE)) && defined(COBJMACROS) #define IRecycleBinFile_QueryInterface(This, riid, ppvObject) \ (This)->lpVtbl->QueryInterface(This, riid, ppvObject) #define IRecycleBinFile_AddRef(This) \ @@ -181,44 +241,7 @@ (This)->lpVtbl->Delete(This) #define IRecycleBinFile_Restore(This) \ (This)->lpVtbl->Restore(This) -#endif - -typedef interface IRecycleBinEnumList IRecycleBinEnumList; -EXTERN_C const IID IID_IRecycleBinEnumList; - -typedef struct IRecycleBinEnumListVtbl -{ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IN IRecycleBinEnumList *This, - IN REFIID riid, - OUT void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IN IRecycleBinEnumList *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IN IRecycleBinEnumList *This); - - HRESULT (STDMETHODCALLTYPE *Next)( - IN IRecycleBinEnumList *This, - IN DWORD celt, - IN OUT IRecycleBinFile **rgelt, - OUT DWORD *pceltFetched); - - HRESULT (STDMETHODCALLTYPE *Skip)( - IN IRecycleBinEnumList *This, - IN DWORD celt); - - HRESULT (STDMETHODCALLTYPE *Reset)( - IN IRecycleBinEnumList *This); -} IRecycleBinEnumListVtbl; - -interface IRecycleBinEnumList -{ - CONST_VTBL struct IRecycleBinEnumListVtbl *lpVtbl; -}; - -#ifdef COBJMACROS + #define IRecycleBinEnumList_QueryInterface(This, riid, ppvObject) \ (This)->lpVtbl->QueryInterface(This, riid, ppvObject) #define IRecycleBinEnumList_AddRef(This) \ @@ -231,42 +254,7 @@ (This)->lpVtbl->Skip(This, celt) #define IRecycleBinEnumList_Reset(This) \ (This)->lpVtbl->Reset(This) -#endif - -typedef interface IRecycleBin IRecycleBin; -EXTERN_C const IID IID_IRecycleBin; - -typedef struct IRecycleBinVtbl -{ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IN IRecycleBin *This, - IN REFIID riid, - OUT void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IN IRecycleBin *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IN IRecycleBin *This); - - HRESULT (STDMETHODCALLTYPE *DeleteFile)( - IN IRecycleBin *This, - IN LPCWSTR szFileName); - - HRESULT (STDMETHODCALLTYPE *EmptyRecycleBin)( - IN IRecycleBin *This); - - HRESULT (STDMETHODCALLTYPE *EnumObjects)( - IN IRecycleBin *This, - OUT IRecycleBinEnumList **ppEnumList); -} IRecycleBinVtbl; - -interface IRecycleBin -{ - CONST_VTBL struct IRecycleBinVtbl *lpVtbl; -}; - -#ifdef COBJMACROS + #define IRecycleBin_QueryInterface(This, riid, ppvObject) \ (This)->lpVtbl->QueryInterface(This, riid, ppvObject) #define IRecycleBin_AddRef(This) \

1 0

[hpoussin] 34791: Replace DPRINT/DPRINT1 by dynamic traces
by hpoussin＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: hpoussin Date: Fri Jul 25 15:24:46 2008 New Revision: 34791 URL: http://svn.reactos.org/svn/reactos?rev=34791&view=rev Log: Replace DPRINT/DPRINT1 by dynamic traces Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/misc.c trunk/reactos/drivers/input/mouclass/misc.c trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Fri Jul 25 15:24:46 2008 @@ -37,7 +37,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CREATE\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CREATE\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -54,7 +54,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLOSE\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CLOSE\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -71,7 +71,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLEANUP\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CLEANUP\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -92,7 +92,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("IRP_MJ_READ\n"); + TRACE_(CLASS_NAME, "IRP_MJ_READ\n"); ASSERT(DeviceExtension->Common.IsClassDO); @@ -122,7 +122,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status = STATUS_NOT_SUPPORTED; - DPRINT("IRP_MJ_DEVICE_CONTROL\n"); + TRACE_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -170,7 +170,7 @@ break; } default: - DPRINT1("IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", + WARN_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); break; @@ -200,7 +200,7 @@ return ForwardIrpAndForget(DeviceObject, Irp); default: { - DPRINT1("Port DO stub for major function 0x%lx\n", + ERR_(CLASS_NAME, "Port DO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); } @@ -208,7 +208,7 @@ } else { - DPRINT1("Class DO stub for major function 0x%lx\n", + ERR_(CLASS_NAME, "Class DO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); } @@ -236,7 +236,7 @@ ParametersRegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersRegistryKey.MaximumLength, CLASS_TAG); if (!ParametersRegistryKey.Buffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); return STATUS_NO_MEMORY; } RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); @@ -315,7 +315,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("CreateClassDeviceObject(0x%p)\n", DriverObject); + TRACE_(CLASS_NAME, "CreateClassDeviceObject(0x%p)\n", DriverObject); /* Create new device object */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -328,19 +328,19 @@ DeviceNameU.Buffer = ExAllocatePoolWithTag(PagedPool, DeviceNameU.MaximumLength, CLASS_TAG); if (!DeviceNameU.Buffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); return STATUS_NO_MEMORY; } Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); if (!NT_SUCCESS(Status)) { - DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); goto cleanup; } Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->DeviceBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); goto cleanup; } PrefixLength = DeviceNameU.MaximumLength - 4 * sizeof(WCHAR) - sizeof(UNICODE_NULL); @@ -360,12 +360,12 @@ goto cleanup; else if (Status != STATUS_OBJECT_NAME_COLLISION) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } DeviceId++; } - DPRINT("Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); + WARN_(CLASS_NAME, "Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); Status = STATUS_TOO_MANY_NAMES; cleanup: if (!NT_SUCCESS(Status)) @@ -468,7 +468,7 @@ SIZE_T InputCount = DataEnd - DataStart; SIZE_T ReadSize; - DPRINT("ClassCallback()\n"); + TRACE_(CLASS_NAME, "ClassCallback()\n"); ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -506,7 +506,7 @@ } KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql); - DPRINT("Leaving ClassCallback()\n"); + TRACE_(CLASS_NAME, "Leaving ClassCallback()\n"); return TRUE; } @@ -522,7 +522,7 @@ CONNECT_DATA ConnectData; NTSTATUS Status; - DPRINT("Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); + TRACE_(CLASS_NAME, "Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -578,7 +578,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("Destroying PortDO %p\n", PortDO); + TRACE_(CLASS_NAME, "Destroying PortDO %p\n", PortDO); DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; @@ -634,7 +634,7 @@ PPORT_DEVICE_EXTENSION DeviceExtension = NULL; NTSTATUS Status; - DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); + TRACE_(CLASS_NAME, "ClassAddDevice called. Pdo = 0x%p\n", Pdo); DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -653,7 +653,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } IoSetStartIoAttributes(Fdo, TRUE, TRUE); @@ -666,7 +666,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); goto cleanup; } if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) @@ -686,14 +686,14 @@ &DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { - DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "CreateClassDeviceObject() failed with status 0x%08lx\n", Status); goto cleanup; } } Status = ConnectPortDriver(Fdo, DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { - DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ConnectPortDriver() failed with status 0x%08lx\n", Status); goto cleanup; } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -725,7 +725,7 @@ KIRQL OldIrql; BOOLEAN wasQueued = FALSE; - DPRINT("ClassCancelRoutine(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "ClassCancelRoutine(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -762,7 +762,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; - DPRINT("HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -828,7 +828,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; KIRQL OldIrql; - DPRINT("ClassStartIo(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "ClassStartIo(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -854,7 +854,7 @@ ULONG Size, ResultLength; NTSTATUS Status; - DPRINT("SearchForLegacyDrivers(%p %p %lu)\n", + TRACE_(CLASS_NAME, "SearchForLegacyDrivers(%p %p %lu)\n", DriverObject, Context, Count); if (Count != 1) @@ -868,7 +868,7 @@ &PortBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "DuplicateUnicodeString() failed with status 0x%08lx\n", Status); goto cleanup; } PortBaseName.Length -= (sizeof(L"Class") - sizeof(UNICODE_NULL)); @@ -879,7 +879,7 @@ KeyValueInformation = ExAllocatePoolWithTag(PagedPool, Size, CLASS_TAG); if (!KeyValueInformation) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -889,13 +889,13 @@ Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { - DPRINT("HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); + INFO_(CLASS_NAME, "HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); Status = STATUS_SUCCESS; goto cleanup; } else if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -904,13 +904,13 @@ Status = ZwOpenKey(&hPortKey, KEY_QUERY_VALUE, &ObjectAttributes); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { - DPRINT("HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); + INFO_(CLASS_NAME, "HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); Status = STATUS_SUCCESS; goto cleanup; } else if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -928,16 +928,16 @@ Status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); + WARN_(CLASS_NAME, "IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); continue; } - DPRINT("Legacy driver found\n"); + INFO_(CLASS_NAME, "Legacy driver found\n"); Status = ClassAddDevice(DriverObject, PortDeviceObject); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT("ClassAddDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status); } } @@ -969,7 +969,7 @@ (PVOID*)&DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); return Status; } RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); @@ -980,14 +980,14 @@ &DriverExtension->RegistryPath); if (!NT_SUCCESS(Status)) { - DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "DuplicateUnicodeString() failed with status 0x%08lx\n", Status); return Status; } Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("ReadRegistryEntries() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ReadRegistryEntries() failed with status 0x%08lx\n", Status); return Status; } @@ -998,7 +998,7 @@ &DriverExtension->MainClassDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "CreateClassDeviceObject() failed with status 0x%08lx\n", Status); return Status; } } Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Fri Jul 25 15:24:46 2008 @@ -4,7 +4,6 @@ #include <stdio.h> #include <pseh/pseh.h> -#define NDEBUG #include <debug.h> #define MAX_PATH 260 @@ -13,6 +12,7 @@ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define CLASS_TAG TAG('K', 'b', 'd', 'C') +#define DPFLTR_CLASS_NAME_ID DPFLTR_KBDCLASS_ID typedef enum { Modified: trunk/reactos/drivers/input/kbdclass/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/mis… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/misc.c [iso-8859-1] Fri Jul 25 15:24:46 2008 @@ -37,7 +37,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p\n", LowerDevice); + TRACE_(CLASS_NAME, "Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); Modified: trunk/reactos/drivers/input/mouclass/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mis… ============================================================================== --- trunk/reactos/drivers/input/mouclass/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/misc.c [iso-8859-1] Fri Jul 25 15:24:46 2008 @@ -37,7 +37,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p\n", LowerDevice); + TRACE_(CLASS_NAME, "Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Fri Jul 25 15:24:46 2008 @@ -37,7 +37,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CREATE\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CREATE\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -54,7 +54,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLOSE\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CLOSE\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -71,7 +71,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLEANUP\n"); + TRACE_(CLASS_NAME, "IRP_MJ_CLEANUP\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -92,7 +92,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("IRP_MJ_READ\n"); + TRACE_(CLASS_NAME, "IRP_MJ_READ\n"); ASSERT(DeviceExtension->Common.IsClassDO); @@ -122,7 +122,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status = STATUS_NOT_SUPPORTED; - DPRINT("IRP_MJ_DEVICE_CONTROL\n"); + TRACE_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); @@ -147,7 +147,7 @@ break; } default: - DPRINT1("IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", + WARN_(CLASS_NAME, "IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); break; @@ -177,7 +177,7 @@ return ForwardIrpAndForget(DeviceObject, Irp); default: { - DPRINT1("Port DO stub for major function 0x%lx\n", + ERR_(CLASS_NAME, "Port DO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); } @@ -185,7 +185,7 @@ } else { - DPRINT1("Class DO stub for major function 0x%lx\n", + ERR_(CLASS_NAME, "Class DO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); } @@ -213,7 +213,7 @@ ParametersRegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersRegistryKey.MaximumLength, CLASS_TAG); if (!ParametersRegistryKey.Buffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); return STATUS_NO_MEMORY; } RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); @@ -292,7 +292,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("CreateClassDeviceObject(0x%p)\n", DriverObject); + TRACE_(CLASS_NAME, "CreateClassDeviceObject(0x%p)\n", DriverObject); /* Create new device object */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -305,19 +305,19 @@ DeviceNameU.Buffer = ExAllocatePoolWithTag(PagedPool, DeviceNameU.MaximumLength, CLASS_TAG); if (!DeviceNameU.Buffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); return STATUS_NO_MEMORY; } Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); if (!NT_SUCCESS(Status)) { - DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); goto cleanup; } Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->DeviceBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); goto cleanup; } PrefixLength = DeviceNameU.MaximumLength - 4 * sizeof(WCHAR) - sizeof(UNICODE_NULL); @@ -337,12 +337,12 @@ goto cleanup; else if (Status != STATUS_OBJECT_NAME_COLLISION) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } DeviceId++; } - DPRINT("Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); + WARN_(CLASS_NAME, "Too many devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); Status = STATUS_TOO_MANY_NAMES; cleanup: if (!NT_SUCCESS(Status)) @@ -444,7 +444,7 @@ SIZE_T InputCount = DataEnd - DataStart; SIZE_T ReadSize; - DPRINT("ClassCallback()\n"); + TRACE_(CLASS_NAME, "ClassCallback()\n"); ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -482,7 +482,7 @@ } KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql); - DPRINT("Leaving ClassCallback()\n"); + TRACE_(CLASS_NAME, "Leaving ClassCallback()\n"); return TRUE; } @@ -498,7 +498,7 @@ CONNECT_DATA ConnectData; NTSTATUS Status; - DPRINT("Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); + TRACE_(CLASS_NAME, "Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -554,7 +554,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("Destroying PortDO %p\n", PortDO); + TRACE_(CLASS_NAME, "Destroying PortDO %p\n", PortDO); DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; @@ -610,7 +610,7 @@ PPORT_DEVICE_EXTENSION DeviceExtension = NULL; NTSTATUS Status; - DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); + TRACE_(CLASS_NAME, "ClassAddDevice called. Pdo = 0x%p\n", Pdo); DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); @@ -629,7 +629,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } IoSetStartIoAttributes(Fdo, TRUE, TRUE); @@ -642,7 +642,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); goto cleanup; } if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) @@ -662,14 +662,14 @@ &DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { - DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "CreateClassDeviceObject() failed with status 0x%08lx\n", Status); goto cleanup; } } Status = ConnectPortDriver(Fdo, DeviceExtension->ClassDO); if (!NT_SUCCESS(Status)) { - DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ConnectPortDriver() failed with status 0x%08lx\n", Status); goto cleanup; } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -701,7 +701,7 @@ KIRQL OldIrql; BOOLEAN wasQueued = FALSE; - DPRINT("ClassCancelRoutine(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "ClassCancelRoutine(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(ClassDeviceExtension->Common.IsClassDO); @@ -738,7 +738,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; - DPRINT("HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "HandleReadIrp(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -804,7 +804,7 @@ PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; KIRQL OldIrql; - DPRINT("ClassStartIo(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + TRACE_(CLASS_NAME, "ClassStartIo(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -830,7 +830,7 @@ ULONG Size, ResultLength; NTSTATUS Status; - DPRINT("SearchForLegacyDrivers(%p %p %lu)\n", + TRACE_(CLASS_NAME, "SearchForLegacyDrivers(%p %p %lu)\n", DriverObject, Context, Count); if (Count != 1) @@ -844,7 +844,7 @@ &PortBaseName); if (!NT_SUCCESS(Status)) { - DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "DuplicateUnicodeString() failed with status 0x%08lx\n", Status); goto cleanup; } PortBaseName.Length -= (sizeof(L"Class") - sizeof(UNICODE_NULL)); @@ -855,7 +855,7 @@ KeyValueInformation = ExAllocatePoolWithTag(PagedPool, Size, CLASS_TAG); if (!KeyValueInformation) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; goto cleanup; } @@ -865,13 +865,13 @@ Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { - DPRINT("HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); + INFO_(CLASS_NAME, "HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); Status = STATUS_SUCCESS; goto cleanup; } else if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -880,13 +880,13 @@ Status = ZwOpenKey(&hPortKey, KEY_QUERY_VALUE, &ObjectAttributes); if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { - DPRINT("HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); + INFO_(CLASS_NAME, "HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); Status = STATUS_SUCCESS; goto cleanup; } else if (!NT_SUCCESS(Status)) { - DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -904,16 +904,16 @@ Status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); + WARN_(CLASS_NAME, "IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); continue; } - DPRINT("Legacy driver found\n"); + INFO_(CLASS_NAME, "Legacy driver found\n"); Status = ClassAddDevice(DriverObject, PortDeviceObject); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT("ClassAddDevice() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status); } } @@ -945,7 +945,7 @@ (PVOID*)&DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); return Status; } RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); @@ -956,14 +956,14 @@ &DriverExtension->RegistryPath); if (!NT_SUCCESS(Status)) { - DPRINT("DuplicateUnicodeString() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "DuplicateUnicodeString() failed with status 0x%08lx\n", Status); return Status; } Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("ReadRegistryEntries() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "ReadRegistryEntries() failed with status 0x%08lx\n", Status); return Status; } @@ -974,7 +974,7 @@ &DriverExtension->MainClassDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); + WARN_(CLASS_NAME, "CreateClassDeviceObject() failed with status 0x%08lx\n", Status); return Status; } } Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h [iso-8859-1] Fri Jul 25 15:24:46 2008 @@ -4,7 +4,6 @@ #include <stdio.h> #include <pseh/pseh.h> -#define NDEBUG #include <debug.h> #define MAX_PATH 260 @@ -13,6 +12,7 @@ #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define CLASS_TAG TAG('M', 'o', 'u', 'C') +#define DPFLTR_CLASS_NAME_ID DPFLTR_MOUCLASS_ID typedef enum {

1 0

[hpoussin] 34790: Notify kernel when configuration is good
by hpoussin＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: hpoussin Date: Fri Jul 25 15:16:16 2008 New Revision: 34790 URL: http://svn.reactos.org/svn/reactos?rev=34790&view=rev Log: Notify kernel when configuration is good Modified: trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Fri Jul 25 15:16:16 2008 @@ -361,6 +361,10 @@ else PostMessageW(WLSession->SASWindow, WLX_WM_SAS, WLX_SAS_TYPE_TIMEOUT, 0); + /* Tell kernel that CurrentControlSet is good (needed + * to support Last good known configuration boot) */ + NtInitializeRegistry(CM_BOOT_FLAG_ACCEPTED); + /* Message loop for the SAS window */ while (GetMessageW(&Msg, WLSession->SASWindow, 0, 0)) { Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Fri Jul 25 15:16:16 2008 @@ -32,6 +32,7 @@ #include <windows.h> #include <userenv.h> #include <winwlx.h> +#include <cmfuncs.h> #include <rtlfuncs.h> #include <exfuncs.h> #include <setypes.h>

1 0

[hpoussin] 34789: Apply again r34533: rename autogenerated makefile to makefile-$(ARCH).auto, except for i386, due to a bug in RosBE which cleans only makefile.auto and not makefile*.auto
by hpoussin＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: hpoussin Date: Fri Jul 25 14:07:36 2008 New Revision: 34789 URL: http://svn.reactos.org/svn/reactos?rev=34789&view=rev Log: Apply again r34533: rename autogenerated makefile to makefile-$(ARCH).auto, except for i386, due to a bug in RosBE which cleans only makefile.auto and not makefile*.auto Modified: trunk/reactos/Makefile trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-ppc.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=34789&r1=3478… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Fri Jul 25 14:07:36 2008 @@ -38,7 +38,7 @@ # This can require several minutes to complete. If you only need to check # dependencies for a single or few modules then you can use the # module_depends targets instead. This target can also repair a damaged or -# missing makefile-{ROS_ARCH}.auto if needed. +# missing makefile-${ROS_ARCH}.auto if needed. # # module_depends # These targets do a dependency check of individual modules. Replace module @@ -125,7 +125,7 @@ # -r Input XML # # ROS_AUTOMAKE -# Alternate name of makefile.auto +# Alternate name of makefile-${ROS_ARCH}.auto # # ROS_BUILDENGINE # The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET) @@ -158,7 +158,11 @@ endif ifeq ($(ROS_AUTOMAKE),) -ROS_AUTOMAKE=makefile.auto + ifeq ($(ARCH),i386) + ROS_AUTOMAKE=makefile.auto + else + ROS_AUTOMAKE=makefile-$(ARCH).auto + endif endif all: $(ROS_AUTOMAKE) Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=347… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Fri Jul 25 14:07:36 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-arm.rbuild"> <xi:fallback> <xi:include href="config-arm.template.rbuild" /> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=347… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Fri Jul 25 14:07:36 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-ppc.rbuild"> <xi:fallback> <xi:include href="config-ppc.template.rbuild" />

1 0

[hpoussin] 34788: Revert incorrect fix committed in r34077 by cfinck, and replace it by a better one.
by hpoussin＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: hpoussin Date: Fri Jul 25 13:45:54 2008 New Revision: 34788 URL: http://svn.reactos.org/svn/reactos?rev=34788&view=rev Log: Revert incorrect fix committed in r34077 by cfinck, and replace it by a better one. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Fri Jul 25 13:45:54 2008 @@ -51,11 +51,7 @@ if (msg->pTitle) SetWindowTextW(hwndDlg, msg->pTitle); SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, msg->pMessage); - if (!msg->Context->SignaledStatusWindowCreated) - { - msg->Context->SignaledStatusWindowCreated = TRUE; - SetEvent(msg->StartupEvent); - } + SetEvent(msg->StartupEvent); return TRUE; } } @@ -140,7 +136,7 @@ return FALSE; } - if(pTitle) + if (pTitle) SetWindowTextW(pgContext->hStatusWindow, pTitle); SetDlgItemTextW(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage); @@ -155,8 +151,7 @@ if (pgContext->hStatusWindow) { EndDialog(pgContext->hStatusWindow, 0); - pgContext->hStatusWindow = 0; - pgContext->SignaledStatusWindowCreated = FALSE; + pgContext->hStatusWindow = NULL; } return TRUE; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Fri Jul 25 13:45:54 2008 @@ -18,7 +18,6 @@ PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; HWND hStatusWindow; - BOOL SignaledStatusWindowCreated; DWORD AutoLogonState; /* Informations to be filled during logon */

1 0

[sserapion] 34787: Fix Warnings
by sserapion＠svn.reactos.org 25 Jul '08

25 Jul '08

Author: sserapion Date: Fri Jul 25 11:49:23 2008 New Revision: 34787 URL: http://svn.reactos.org/svn/reactos?rev=34787&view=rev Log: Fix Warnings Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -626,7 +626,7 @@ MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -198,7 +198,7 @@ } -BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -356,7 +356,7 @@ } -BOOL CALLBACK CardBackDlgProc(HWND hDlg, +INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -183,7 +183,7 @@ SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - switch (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff) + switch (PtrToLong(hRootKey)) { case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff): _tcscpy(Path, _T("HKLM\\\0")); Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -34,7 +34,7 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* devmgmt.c */ Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -164,7 +164,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateHelpDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -221,7 +221,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -56,7 +56,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -43,10 +43,10 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); /* servman.c */ Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -56,7 +56,7 @@ } } -BOOL CALLBACK +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -1021,7 +1021,7 @@ } -static BOOL CALLBACK +static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="ping" type="win32cui" installbase="system32" installname="ping.exe"> +<module name="ping" type="win32cui" installbase="system32" installname="ping.exe" allowwarnings="true"> <include base="ping">.</include> <define name="__USE_W32_SOCKETS" /> <define name="_WIN32_IE">0x600</define> Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -842,7 +842,7 @@ dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD_PTR)Callbacks, 0); } else WINE_WARN("OOM\n"); } Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -27,6 +27,7 @@ #include <ctype.h> #include <stdio.h> #include <assert.h> +#include <tchar.h> #include <windows.h> #include <richedit.h> @@ -583,7 +584,7 @@ fontinfo.lfPitchAndFamily = 0; EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc, - (LPARAM)hListWnd, 0); + (LPARAM)(UINT_PTR)hListWnd, 0); ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); @@ -1115,7 +1116,7 @@ } if (opt_print) - MessageBox(hMainWnd, "Printing not implemented", "WordPad", MB_OK); + MessageBox(hMainWnd, _T("Printing not implemented"), _T("WordPad"), MB_OK); } static LRESULT handle_findmsg(LPFINDREPLACEW pFr) @@ -1279,7 +1280,7 @@ ZeroMemory(&cbItem, sizeof(cbItem)); cbItem.mask = CBEIF_TEXT; cbItem.iItem = idx; - cbItem.pszText = szBuffer; + cbItem.pszText = (ULONG_PTR)szBuffer; cbItem.cchTextMax = bufferLength-1; result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); if (!result) @@ -1795,7 +1796,7 @@ if (!hEditorWnd) { - fprintf(stderr, "Error code %u\n", GetLastError()); + fprintf(stderr, _T("Error code %d\n"), GetLastError()); return -1; } assert(hEditorWnd); @@ -1987,7 +1988,7 @@ mi.cbSize = sizeof(MENUITEMINFOW); mi.fMask = MIIM_DATA; if(GetMenuItemInfoW(hMenu, LOWORD(wParam), FALSE, &mi)) - DoOpenFile((LPWSTR)mi.dwItemData); + DoOpenFile((LPWSTR)(ULONG_PTR)mi.dwItemData); } 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