Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 39739: - Explictly use unicode structures

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 24 21:05:07 2009 New Revision: 39739 URL: http://svn.reactos.org/svn/reactos?rev=39739&view=rev Log: - Explictly use unicode structures Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Tue Feb 24 21:05:07 2009 @@ -39,9 +39,9 @@ union { WAVEFORMATEX WaveFormatEx; - WAVEOUTCAPS WaveOutCaps; - AUXCAPS AuxCaps; - WAVEINCAPS WaveInCaps; + WAVEOUTCAPSW WaveOutCaps; + AUXCAPSW AuxCaps; + WAVEINCAPSW WaveInCaps; }u; }WDMAUD_DEVICE_INFO, *PWDMAUD_DEVICE_INFO;

16 years, 4 months

[fireball] 39738: - Make SystemProcessInformation return required size if buffer is too small. Matches Windows XP behavior. See issue #4087 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Feb 24 17:02:39 2009 New Revision: 39738 URL: http://svn.reactos.org/svn/reactos?rev=39738&view=rev Log: - Make SystemProcessInformation return required size if buffer is too small. Matches Windows XP behavior. See issue #4087 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Feb 24 17:02:39 2009 @@ -716,6 +716,7 @@ NTSTATUS Status = STATUS_SUCCESS; PUNICODE_STRING ProcessImageName; PWCHAR szSrc; + BOOLEAN Overflow = FALSE; _SEH2_TRY { @@ -726,11 +727,12 @@ *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); + /* Check for overflow */ if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) - { - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } - RtlZeroMemory(Spi, Size); + Overflow = TRUE; + + /* Zero user's buffer */ + if (!Overflow) RtlZeroMemory(Spi, Size); SystemProcess = PsIdleProcess; Process = SystemProcess; @@ -784,90 +786,86 @@ TotalSize += CurrentSize + ImageNameMaximumLength; + /* Check for overflow */ if (TotalSize > Size) + Overflow = TRUE; + + /* Fill system information */ + if (!Overflow) { - *ReqSize = TotalSize; - ObDereferenceObject(Process); - - /* Release the memory allocated by SeLocateProcessImageName */ - if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName); - - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure + SpiCurrent->NumberOfThreads = ThreadsCount; + SpiCurrent->CreateTime = Process->CreateTime; + SpiCurrent->ImageName.Length = ImageNameLength; + SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; + SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); + + /* Copy name to the end of the struct */ + if(Process != PsIdleProcess) + { + if (szSrc) + { + RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); + + /* Release the memory allocated by SeLocateProcessImageName */ + ExFreePool(ProcessImageName); + } + else if (Process->ImageFileName) + { + RtlInitAnsiString(&ImageName, Process->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); + } + } + else + { + RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); + } + + SpiCurrent->BasePriority = Process->Pcb.BasePriority; + SpiCurrent->UniqueProcessId = Process->UniqueProcessId; + SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; + SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); + SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; + SpiCurrent->VirtualSize = Process->VirtualSize; + SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; + SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; + SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; + SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; + SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; + SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; + SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; + SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; + SpiCurrent->PrivatePageCount = Process->CommitCharge; + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); + + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) + { + CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, + ThreadListEntry); + + ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); + ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); + ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; + ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; + ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; + ThreadInfo->ClientId = CurrentThread->Cid; + ThreadInfo->Priority = CurrentThread->Tcb.Priority; + ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; + ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; + ThreadInfo->ThreadState = CurrentThread->Tcb.State; + ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; + + ThreadInfo++; + CurrentEntry = CurrentEntry->Flink; + } + + /* Query total user/kernel times of a process */ + TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); + SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); + SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); } - - /* Fill system information */ - SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure - SpiCurrent->NumberOfThreads = ThreadsCount; - SpiCurrent->CreateTime = Process->CreateTime; - SpiCurrent->ImageName.Length = ImageNameLength; - SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; - SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); - - /* Copy name to the end of the struct */ - if(Process != PsIdleProcess) - { - if (szSrc) - { - RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); - - /* Release the memory allocated by SeLocateProcessImageName */ - ExFreePool(ProcessImageName); - } - else if (Process->ImageFileName) - { - RtlInitAnsiString(&ImageName, Process->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); - } - } - else - { - RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); - } - - SpiCurrent->BasePriority = Process->Pcb.BasePriority; - SpiCurrent->UniqueProcessId = Process->UniqueProcessId; - SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; - SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); - SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; - SpiCurrent->VirtualSize = Process->VirtualSize; - SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; - SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; - SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; - SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; - SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; - SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; - SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; - SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; - SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; - SpiCurrent->PrivatePageCount = Process->CommitCharge; - ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); - - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) - { - CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, - ThreadListEntry); - - ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); - ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); - ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; - ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; - ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; - ThreadInfo->ClientId = CurrentThread->Cid; - ThreadInfo->Priority = CurrentThread->Tcb.Priority; - ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; - ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; - ThreadInfo->ThreadState = CurrentThread->Tcb.State; - ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; - - ThreadInfo++; - CurrentEntry = CurrentEntry->Flink; - } - - /* Query total user/kernel times of a process */ - TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); - SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); - SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); /* Handle idle process entry */ if (Process == PsIdleProcess) Process = NULL; @@ -876,7 +874,8 @@ ThreadsCount = 0; if ((Process == SystemProcess) || (Process == NULL)) { - SpiCurrent->NextEntryOffset = 0; + if (!Overflow) + SpiCurrent->NextEntryOffset = 0; break; } else @@ -894,6 +893,9 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END + + if (Overflow) + Status = STATUS_INFO_LENGTH_MISMATCH; *ReqSize = TotalSize; return Status;

16 years, 4 months

[fireball] 39737: - If looking up a long name for a process failed, use short one. This fixes the issue with "System" not being displayed correctly. - Round up process name length more correctly, as suggested by Evgeniy Boltik. See issue #4087 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Feb 24 14:34:08 2009 New Revision: 39737 URL: http://svn.reactos.org/svn/reactos?rev=39737&view=rev Log: - If looking up a long name for a process failed, use short one. This fixes the issue with "System" not being displayed correctly. - Round up process name length more correctly, as suggested by Evgeniy Boltik. See issue #4087 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Tue Feb 24 14:34:08 2009 @@ -753,7 +753,7 @@ ImageNameLength = 0; Status = SeLocateProcessImageName(Process, &ProcessImageName); szSrc = NULL; - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) && (ProcessImageName->Length > 0)) { szSrc = (PWCHAR)((PCHAR)ProcessImageName->Buffer + ProcessImageName->Length); /* Loop the file name*/ @@ -777,7 +777,10 @@ } /* Round up the image name length as NT does */ - ImageNameMaximumLength = ROUND_UP(ImageNameLength, 8); + if (ImageNameLength > 0) + ImageNameMaximumLength = ROUND_UP(ImageNameLength + sizeof(WCHAR), 8); + else + ImageNameMaximumLength = 0; TotalSize += CurrentSize + ImageNameMaximumLength;

16 years, 4 months

[fireball] 39736: - Fix freed memory usage in SeLocateProcessImageName, spotted by Jan Roeloffzen. - Use a correct structure member in SeAuditProcessCreationInfo (but it's still the same pointer). - Rewrite bottom part of the function to better match ReactOS coding style. See issue #4087 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Feb 24 14:06:13 2009 New Revision: 39736 URL: http://svn.reactos.org/svn/reactos?rev=39736&view=rev Log: - Fix freed memory usage in SeLocateProcessImageName, spotted by Jan Roeloffzen. - Use a correct structure member in SeAuditProcessCreationInfo (but it's still the same pointer). - Rewrite bottom part of the function to better match ReactOS coding style. See issue #4087 for more details. Modified: trunk/reactos/ntoskrnl/se/audit.c Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=39… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Tue Feb 24 14:06:13 2009 @@ -139,7 +139,7 @@ { /* Set it */ if (InterlockedCompareExchangePointer(&Process-> - SeAuditProcessCreationInfo, + SeAuditProcessCreationInfo.ImageFileName, AuditName, NULL)) { @@ -153,29 +153,26 @@ if (!NT_SUCCESS(Status)) return Status; } + /* Get audit info again, now we have it for sure */ + AuditName = Process->SeAuditProcessCreationInfo.ImageFileName; + /* Allocate the output string */ ImageName = ExAllocatePoolWithTag(NonPagedPool, AuditName->Name.MaximumLength + sizeof(UNICODE_STRING), TAG_SEPA); - if (ImageName) - { - /* Make a copy of it */ - RtlCopyMemory(ImageName, - &AuditName->Name, - AuditName->Name.MaximumLength + sizeof(UNICODE_STRING)); - - /* Fix up the buffer */ - ImageName->Buffer = (PWSTR)(ImageName + 1); - - /* Return it */ - *ProcessImageName = ImageName; - } - else - { - /* Otherwise, fail */ - Status = STATUS_NO_MEMORY; - } + if (!ImageName) return STATUS_NO_MEMORY; + + /* Make a copy of it */ + RtlCopyMemory(ImageName, + &AuditName->Name, + AuditName->Name.MaximumLength + sizeof(UNICODE_STRING)); + + /* Fix up the buffer */ + ImageName->Buffer = (PWSTR)(ImageName + 1); + + /* Return it */ + *ProcessImageName = ImageName; /* Return status */ return Status;

16 years, 4 months

[dchapyshev] 39735: - Sync Tahoma fonts with Wine head

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Feb 24 14:04:53 2009 New Revision: 39735 URL: http://svn.reactos.org/svn/reactos?rev=39735&view=rev Log: - Sync Tahoma fonts with Wine head Modified: trunk/reactos/media/fonts/tahoma.ttf trunk/reactos/media/fonts/tahomabd.ttf Modified: trunk/reactos/media/fonts/tahoma.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahoma.ttf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/fonts/tahomabd.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/tahomabd.ttf?r… ============================================================================== Binary files - no diff available.

16 years, 4 months

[dchapyshev] 39734: - Add mscms, msftedit, msrle32 from Wine

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Feb 24 12:59:50 2009 New Revision: 39734 URL: http://svn.reactos.org/svn/reactos?rev=39734&view=rev Log: - Add mscms, msftedit, msrle32 from Wine Added: trunk/reactos/dll/win32/mscms/ (with props) trunk/reactos/dll/win32/mscms/handle.c (with props) trunk/reactos/dll/win32/mscms/icc.c (with props) trunk/reactos/dll/win32/mscms/mscms.rbuild (with props) trunk/reactos/dll/win32/mscms/mscms.spec (with props) trunk/reactos/dll/win32/mscms/mscms_main.c (with props) trunk/reactos/dll/win32/mscms/mscms_priv.h (with props) trunk/reactos/dll/win32/mscms/profile.c (with props) trunk/reactos/dll/win32/mscms/stub.c (with props) trunk/reactos/dll/win32/mscms/transform.c (with props) trunk/reactos/dll/win32/mscms/version.rc (with props) trunk/reactos/dll/win32/msftedit/ (with props) trunk/reactos/dll/win32/msftedit/msftedit.rbuild (with props) trunk/reactos/dll/win32/msftedit/msftedit.spec (with props) trunk/reactos/dll/win32/msftedit/msftedit_main.c (with props) trunk/reactos/dll/win32/msftedit/version.rc (with props) trunk/reactos/dll/win32/msrle32/ (with props) trunk/reactos/dll/win32/msrle32/msrle32.c (with props) trunk/reactos/dll/win32/msrle32/msrle32.rbuild (with props) trunk/reactos/dll/win32/msrle32/msrle32.spec (with props) trunk/reactos/dll/win32/msrle32/msrle_Bg.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Cs.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Da.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_De.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_En.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Es.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Fr.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Hu.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_It.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Ja.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Ko.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Nl.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_No.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Pl.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Pt.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Ro.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Ru.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Si.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Sv.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_Tr.rc (with props) trunk/reactos/dll/win32/msrle32/msrle_private.h (with props) trunk/reactos/dll/win32/msrle32/rsrc.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=397… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/mscms/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/handle.c?r… Added: trunk/reactos/dll/win32/mscms/icc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/icc.c?rev=… Added: trunk/reactos/dll/win32/mscms/mscms.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms.rbui… Added: trunk/reactos/dll/win32/mscms/mscms.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms.spec… Added: trunk/reactos/dll/win32/mscms/mscms_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms_main… Added: trunk/reactos/dll/win32/mscms/mscms_priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/mscms_priv… Added: trunk/reactos/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?… Added: trunk/reactos/dll/win32/mscms/stub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/stub.c?rev… Added: trunk/reactos/dll/win32/mscms/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/transform.… Added: trunk/reactos/dll/win32/mscms/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/version.rc… Added: trunk/reactos/dll/win32/msftedit/msftedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msftedit/msftedi… Added: trunk/reactos/dll/win32/msftedit/msftedit.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msftedit/msftedi… Added: trunk/reactos/dll/win32/msftedit/msftedit_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msftedit/msftedi… Added: trunk/reactos/dll/win32/msftedit/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msftedit/version… Added: trunk/reactos/dll/win32/msrle32/msrle32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… Added: trunk/reactos/dll/win32/msrle32/msrle32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… Added: trunk/reactos/dll/win32/msrle32/msrle32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… Added: trunk/reactos/dll/win32/msrle32/msrle_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Bg… Added: trunk/reactos/dll/win32/msrle32/msrle_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Cs… Added: trunk/reactos/dll/win32/msrle32/msrle_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Da… Added: trunk/reactos/dll/win32/msrle32/msrle_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_De… Added: trunk/reactos/dll/win32/msrle32/msrle_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_En… Added: trunk/reactos/dll/win32/msrle32/msrle_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Es… Added: trunk/reactos/dll/win32/msrle32/msrle_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Fr… Added: trunk/reactos/dll/win32/msrle32/msrle_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Hu… Added: trunk/reactos/dll/win32/msrle32/msrle_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_It… Added: trunk/reactos/dll/win32/msrle32/msrle_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ja… Added: trunk/reactos/dll/win32/msrle32/msrle_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ko… Added: trunk/reactos/dll/win32/msrle32/msrle_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Nl… Added: trunk/reactos/dll/win32/msrle32/msrle_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_No… Added: trunk/reactos/dll/win32/msrle32/msrle_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pl… Added: trunk/reactos/dll/win32/msrle32/msrle_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Pt… Added: trunk/reactos/dll/win32/msrle32/msrle_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ro… Added: trunk/reactos/dll/win32/msrle32/msrle_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Ru… Added: trunk/reactos/dll/win32/msrle32/msrle_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Si… Added: trunk/reactos/dll/win32/msrle32/msrle_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Sv… Added: trunk/reactos/dll/win32/msrle32/msrle_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_Tr… Added: trunk/reactos/dll/win32/msrle32/msrle_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle_pr… Added: trunk/reactos/dll/win32/msrle32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/rsrc.rc?… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

16 years, 4 months

[sginsberg] 39733: - Fix an assembler warning on release build

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Feb 24 03:48:11 2009 New Revision: 39733 URL: http://svn.reactos.org/svn/reactos?rev=39733&view=rev Log: - Fix an assembler warning on release build Modified: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] Tue Feb 24 03:48:11 2009 @@ -81,8 +81,8 @@ #if DBG .rept 172 .long InvalidIRQ /* IRQ 36-207 */ -#endif .endr +#endif SoftIntByteTable: .byte PASSIVE_LEVEL /* IRR 0 */

16 years, 4 months

[tkreuzer] 39732: Add DbgPrint stub. Fixes release build of setupldr.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 24 03:21:08 2009 New Revision: 39732 URL: http://svn.reactos.org/svn/reactos?rev=39732&view=rev Log: Add DbgPrint stub. Fixes release build of setupldr. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Tue Feb 24 03:21:08 2009 @@ -292,6 +292,11 @@ { } +ULONG DbgPrint(PCCH Format, ...) +{ + return 0; +} + #endif // defined DBG ULONG

16 years, 4 months

[janderwald] 39731: - Fix release build - Complete irps which were forgotten

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 24 02:24:58 2009 New Revision: 39731 URL: http://svn.reactos.org/svn/reactos?rev=39731&view=rev Log: - Fix release build - Complete irps which were forgotten Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -1146,6 +1146,9 @@ IN PIRP Irp) { UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -38,6 +38,7 @@ case IRP_MN_QUERY_DEVICE_RELATIONS: Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INSUFFICIENT_RESOURCES; case IRP_MN_REMOVE_DEVICE: // FIXME @@ -48,10 +49,12 @@ case IRP_MN_SURPRISE_REMOVAL: Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; default: Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); //Status = IoCallDriver(NULL /* PnpBaseObject */, Irp); } @@ -79,6 +82,10 @@ IN PIRP Irp) { UNIMPLEMENTED; + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -144,7 +144,7 @@ { PIO_STACK_LOCATION IoStack; ISubdevice *SubDevice = NULL; - SUBDEVICE_DESCRIPTOR * Descriptor; + SUBDEVICE_DESCRIPTOR * Descriptor = NULL; NTSTATUS Status; #if defined(DBG) IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -131,6 +131,7 @@ /* Do not complete? */ Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; case IRP_MN_QUERY_INTERFACE: @@ -138,15 +139,24 @@ /* FIXME * call next lower device object */ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - return Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; case IRP_MN_QUERY_DEVICE_RELATIONS: Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - return Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; } DPRINT1("unhandled function %u\n", IoStack->MinorFunction); - return STATUS_SUCCESS; + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } /* @@ -254,19 +264,6 @@ return STATUS_UNSUCCESSFUL; } -static -NTSTATUS -NTAPI -IrpCompletionRoutine( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_SUCCESS; -} - - /* * @implemented */ @@ -285,9 +282,6 @@ return STATUS_SUCCESS; /* initialize the notification event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* setup a completion routine */ - IoSetCompletionRoutine(Irp, IrpCompletionRoutine, (PVOID)&Event, TRUE, FALSE, FALSE); /* copy the current stack location */ IoCopyCurrentIrpStackLocationToNext(Irp); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -165,12 +165,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status = STATUS_SUCCESS; - PWDMAUD_DEVICE_EXTENSION DeviceExtension; - DPRINT1("WdmAudClose\n"); - - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; #if KS_IMPLEMENTED Status = KsDereferenceSoftwareBusObject(DeviceExtension->DeviceHeader); @@ -182,11 +177,11 @@ } #endif - Irp->IoStatus.Status = Status; + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -137,18 +137,18 @@ /* copy device count array */ if (ClientInfo->NumDevices) - { + { RtlMoveMemory(Index, ClientInfo->Devices, ClientInfo->NumDevices * sizeof(ULONG)); RtlMoveMemory(Handle, ClientInfo->Handels, ClientInfo->NumDevices * sizeof(HANDLE)); - } + } Index[ClientInfo->NumDevices] = DeviceNumber; Handle[ClientInfo->NumDevices] = NULL; - ExFreePool(ClientInfo->Handels); + ExFreePool(ClientInfo->Handels); ExFreePool(ClientInfo->Devices); ClientInfo->NumDevices++; ClientInfo->Devices = Index; - ClientInfo->Handels = Handle; + ClientInfo->Handels = Handle; return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); } @@ -662,6 +662,5 @@ DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); DbgBreakPoint(); RtlFreeUnicodeString(&GuidString); - - return Status; + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -24,7 +24,7 @@ { PIO_STACK_LOCATION IoStack; - DPRINT1("Dispatch_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + DPRINT("Dispatch_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); IoStack = IoGetCurrentIrpStackLocation(Irp); if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) @@ -32,7 +32,13 @@ return SysAudioHandleProperty(DeviceObject, Irp); } - return STATUS_SUCCESS; + DPRINT1("Dispatch_fnDeviceIoControl Unhandeled %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + DbgBreakPoint(); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -43,7 +49,10 @@ { DPRINT1("Dispatch_fnRead called DeviceObject %p Irp %p\n", DeviceObject); - return STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -54,7 +63,10 @@ { DPRINT1("Dispatch_fnWrite called DeviceObject %p Irp %p\n", DeviceObject); - return STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -122,8 +134,10 @@ { DPRINT1("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); - - return STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -135,7 +149,10 @@ DPRINT1("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); - return STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } BOOLEAN Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -48,19 +48,9 @@ IrpStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("SysAudio_Pnp called for func %x\n", IrpStack->MinorFunction); + DPRINT("SysAudio_Pnp called for func %x\n", IrpStack->MinorFunction); DeviceExtension = (SYSAUDIODEVEXT*)DeviceObject->DeviceExtension; - - - if (IrpStack->MinorFunction == IRP_MN_START_DEVICE) - { - DPRINT1("SysAudio_Pnp called for func IRP_MN_START_DEVICE\n"); - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } if (IrpStack->MinorFunction == IRP_MN_REMOVE_DEVICE) { Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Tue Feb 24 02:24:58 2009 @@ -57,7 +57,10 @@ { DPRINT1("Pin_fnRead called DeviceObject %p Irp %p\n", DeviceObject); - return STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -114,31 +117,38 @@ { DPRINT1("Pin_fnFlush called DeviceObject %p Irp %p\n", DeviceObject); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Pin_fnClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } NTSTATUS NTAPI -Pin_fnClose( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); - - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI Pin_fnQuerySecurity( PDEVICE_OBJECT DeviceObject, PIRP Irp) { DPRINT1("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); - - return STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } NTSTATUS @@ -150,7 +160,10 @@ DPRINT1("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); - return STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } BOOLEAN

16 years, 4 months

[sginsberg] 39730: - Fix another issue with Portcls release build -- move an assignment outside ASSERT, and ASSERTify the return value by using a local variable

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Feb 24 01:40:53 2009 New Revision: 39730 URL: http://svn.reactos.org/svn/reactos?rev=39730&view=rev Log: - Fix another issue with Portcls release build -- move an assignment outside ASSERT, and ASSERTify the return value by using a local variable Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue Feb 24 01:40:53 2009 @@ -145,6 +145,7 @@ PIO_STACK_LOCATION IoStack; ISubdevice *SubDevice = NULL; SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; #if defined(DBG) IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; #endif @@ -154,7 +155,8 @@ ASSERT(This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice) == STATUS_SUCCESS); ASSERT(SubDevice != NULL); - ASSERT(SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor) == STATUS_SUCCESS); + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); + ASSERT(Status == STATUS_SUCCESS); ASSERT(Descriptor != NULL); SubDevice->lpVtbl->Release(SubDevice);

16 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs