Author: dreimer
Date: Tue Mar 17 18:08:06 2015
New Revision: 66759
URL: http://svn.reactos.org/svn/reactos?rev=66759&view=rev
Log:
[WDMAUD.DRV]
Hack around a ASSERT which can be cont'ed and makes using VLC a mess from time to time.
Modified:
branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/wdmaud.drv/legacy.c
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/wdmaud.drv/legacy.c
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Tue Mar 17 18:08:06 2015
@@ -896,7 +896,7 @@
SND_TRACE(L"uMsg %x Flags %x\n", uMsg, Flags);
Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle);
- SND_ASSERT( Result == MMSYSERR_NOERROR );
+ // SND_ASSERT( Result == MMSYSERR_NOERROR );
ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO));
DeviceInfo.hDevice = Handle;
Author: dreimer
Date: Tue Mar 17 18:06:57 2015
New Revision: 66758
URL: http://svn.reactos.org/svn/reactos?rev=66758&view=rev
Log:
[CMAKE]
Enable NSWPAT to build dxtn.dll for DX compression. We have no problem in Germany with that.
Modified:
branches/ReactOS-0.3.17-CLT2015/reactos/cmake/config.cmake
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/cmake/config.cmake
URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/…
==============================================================================
--- branches/ReactOS-0.3.17-CLT2015/reactos/cmake/config.cmake [iso-8859-1] (original)
+++ branches/ReactOS-0.3.17-CLT2015/reactos/cmake/config.cmake [iso-8859-1] Tue Mar 17 18:06:57 2015
@@ -58,7 +58,7 @@
"Whether to compile support for ELF files.
Do not enable unless you know what you're doing.")
-set(NSWPAT FALSE CACHE BOOL
+set(NSWPAT TRUE CACHE BOOL
"Whether to build apps/libs with features covered by software patents.
If you live in a country where software patents are valid/apply, don't
enable this (except they/you purchased a license from the patent owner).
Author: hbelusca
Date: Tue Mar 17 03:04:20 2015
New Revision: 66753
URL: http://svn.reactos.org/svn/reactos?rev=66753&view=rev
Log:
[NTOS]: Addendum to r66735: move the code that prints our revision number in the SOS banner to a different place, in order to remain NT-compatible (that is, the CSDVersion string should only contain "Service Pack ###" or "Service Pack ###, v.###" according to the value of the CSDReleaseType registry value).
Modified:
trunk/reactos/ntoskrnl/ex/init.c
Modified: trunk/reactos/ntoskrnl/ex/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=667…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Mar 17 03:04:20 2015
@@ -1217,13 +1217,10 @@
}
/* Add the version format string */
- /* ReactOS specific: Append also the revision number */
Status = RtlStringCbPrintfA(RcEnd,
Remaining,
- "v.%u"
- " r%u",
- (CmNtCSDVersion & 0xFFFF0000) >> 16,
- KERNEL_VERSION_BUILD_HEX);
+ "v.%u",
+ (CmNtCSDVersion & 0xFFFF0000) >> 16);
if (!NT_SUCCESS(Status))
{
/* Fail */
@@ -1429,12 +1426,15 @@
if (CmCSDVersionString.Length)
{
/* Print the version string */
+ /* ReactOS specific: Append also the revision number */
Status = RtlStringCbPrintfExA(StringBuffer,
Remaining,
&EndBuffer,
&Remaining,
0,
+ " r%u"
": %wZ",
+ KERNEL_VERSION_BUILD_HEX,
&CmCSDVersionString);
if (!NT_SUCCESS(Status))
{