Ros-dev

ros-dev@reactos.org

5789 discussions

Re: [ros-dev] [ros-diffs] [akhaldi] 52114: [CMAKE] * Fix several modules to compile with the recent gcc versions. * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. * Dedicated to dreimer.

by Alex Ionescu

Hello, With the move to GCC 4.6.0, please consider using ms_hook_prologue. You will especially need this when synching with Wine, as they have moved to 4.6.0. This will add support for /hotpatch, which is a compatibility requirement. For example, Steam games use this feature. See http://www.mail-archive.com/wine-devel@winehq.org/msg58308.html. -- Best regards, Alex Ionescu On 2011-06-06, at 7:44 AM, akhaldi(a)svn.reactos.org wrote: > Author: akhaldi > Date: Mon Jun 6 11:44:58 2011 > New Revision: 52114 > > URL: http://svn.reactos.org/svn/reactos?rev=52114&view=rev > Log: > [CMAKE] > * Fix several modules to compile with the recent gcc versions. > * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. > * Dedicated to dreimer. > > Modified: > trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > trunk/reactos/dll/win32/kernel32/CMakeLists.txt > trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > trunk/reactos/dll/win32/msports/CMakeLists.txt > trunk/reactos/dll/win32/sti/CMakeLists.txt > trunk/reactos/dll/win32/ufatx/CMakeLists.txt > trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > trunk/reactos/lib/pseh/CMakeLists.txt > > Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -44,6 +44,7 @@ > rpcrt4 > ole32 > oleaut32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -114,7 +114,7 @@ > set_entrypoint(kernel32 DllMain@12) > set_image_base(kernel32 ${baseaddress_kernel32}) > > -target_link_libraries(kernel32 ${PSEH_LIB}) > +target_link_libraries(kernel32 chkstk ${PSEH_LIB}) > > add_importlibs(kernel32 ntdll) > add_pch(kernel32 k32.h) > > Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -28,7 +28,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(lsasrv rpcrt4 kernel32 ntdll) > +add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) > add_dependencies(lsasrv psdk) > add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) > add_importlib_target(lsasrv.spec) > > Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -18,7 +18,7 @@ > > target_link_libraries(msports wine) > > -add_importlibs(msports setupapi comctl32 user32 advapi32 kernel32 ntdll) > +add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) > > add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) > add_importlib_target(msports.spec) > > Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… > ============================================================================== > --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -36,6 +36,7 @@ > oleaut32 > rpcrt4 > advapi32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… > ============================================================================== > --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -9,8 +9,8 @@ > > set_entrypoint(ufatx 0) > > -target_link_libraries(ufatx vfatxlib -lgcc) > -add_importlibs(ufatx kernel32 ntdll) > +target_link_libraries(ufatx vfatxlib) > +add_importlibs(ufatx msvcrt kernel32 ntdll) > add_importlib_target(ufatx.spec) > add_dependencies(ufatx psdk) > add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) > > Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -17,7 +17,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(wlanapi rpcrt4 kernel32 ntdll) > +add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) > add_importlib_target(wlanapi.spec) > > add_dependencies(wlanapi psdk) > > Modified: trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/CMakeLi… > ============================================================================== > --- trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -1,4 +1,8 @@ > > add_library(vfatxlib fatx.c vfatxlib.c) > + > +if(NOT MSVC) > + target_link_libraries(vfatxlib -lgcc) > +endif() > + > add_dependencies(vfatxlib psdk) > - > > Modified: trunk/reactos/lib/pseh/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… > ============================================================================== > --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -14,6 +14,7 @@ > endif() > > add_library(pseh ${SOURCE}) > + target_link_libraries(pseh chkstk) > add_dependencies(pseh psdk) > > else() > >

14 years

Re: [ros-dev] [ros-diffs] [sir_richard] 52098: [FREELDR]: Some ARM architectures do not necessarily have CS0_BASE at 0x00000000, for example, most Ti OMAP Platforms have DDR at 0x80000000. The current FreeLDR algorithms wou...

by Cameron Gutman

> ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] Sun Jun 5 20:48:34 2011 > @@ -30,7 +30,6 @@ > { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER > { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER > { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video > - { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory > #elif __arm__ // This needs to be done per-platform specific way > > #endif This part breaks boot with AC97. > Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sun Jun 5 20:48:34 2011 > @@ -307,9 +322,9 @@ > case MemorySpecialMemory: > { > // > - // Special reserved memory > - // > - MemoryMapPageAllocated = LoaderSpecialMemory; > + // OS Loader Stack > + // > + MemoryMapPageAllocated = LoaderOsloaderStack; > break; > } > default: I assume this is also related. Cameron Gutman

14 years

by Alex Ionescu

Hello, With the move to 4.6.0, please look into building with -Ofast. -- Best regards, Alex Ionescu On 2011-06-06, at 7:44 AM, akhaldi(a)svn.reactos.org wrote: > Author: akhaldi > Date: Mon Jun 6 11:44:58 2011 > New Revision: 52114 > > URL: http://svn.reactos.org/svn/reactos?rev=52114&view=rev > Log: > [CMAKE] > * Fix several modules to compile with the recent gcc versions. > * ReactOS now compiles with mingw-w64 gcc 4.6.0 and boots to shell. > * Dedicated to dreimer. > > Modified: > trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > trunk/reactos/dll/win32/kernel32/CMakeLists.txt > trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > trunk/reactos/dll/win32/msports/CMakeLists.txt > trunk/reactos/dll/win32/sti/CMakeLists.txt > trunk/reactos/dll/win32/ufatx/CMakeLists.txt > trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > trunk/reactos/lib/pseh/CMakeLists.txt > > Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -44,6 +44,7 @@ > rpcrt4 > ole32 > oleaut32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -114,7 +114,7 @@ > set_entrypoint(kernel32 DllMain@12) > set_image_base(kernel32 ${baseaddress_kernel32}) > > -target_link_libraries(kernel32 ${PSEH_LIB}) > +target_link_libraries(kernel32 chkstk ${PSEH_LIB}) > > add_importlibs(kernel32 ntdll) > add_pch(kernel32 k32.h) > > Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… > ============================================================================== > --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -28,7 +28,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(lsasrv rpcrt4 kernel32 ntdll) > +add_importlibs(lsasrv rpcrt4 msvcrt kernel32 ntdll) > add_dependencies(lsasrv psdk) > add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) > add_importlib_target(lsasrv.spec) > > Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -18,7 +18,7 @@ > > target_link_libraries(msports wine) > > -add_importlibs(msports setupapi comctl32 user32 advapi32 kernel32 ntdll) > +add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) > > add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) > add_importlib_target(msports.spec) > > Modified: trunk/reactos/dll/win32/sti/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sti/CMakeLists.t… > ============================================================================== > --- trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/sti/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -36,6 +36,7 @@ > oleaut32 > rpcrt4 > advapi32 > + msvcrt > kernel32 > ntdll) > > > Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… > ============================================================================== > --- trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -9,8 +9,8 @@ > > set_entrypoint(ufatx 0) > > -target_link_libraries(ufatx vfatxlib -lgcc) > -add_importlibs(ufatx kernel32 ntdll) > +target_link_libraries(ufatx vfatxlib) > +add_importlibs(ufatx msvcrt kernel32 ntdll) > add_importlib_target(ufatx.spec) > add_dependencies(ufatx psdk) > add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) > > Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… > ============================================================================== > --- trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -17,7 +17,7 @@ > wine > ${PSEH_LIB}) > > -add_importlibs(wlanapi rpcrt4 kernel32 ntdll) > +add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) > add_importlib_target(wlanapi.spec) > > add_dependencies(wlanapi psdk) > > Modified: trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/CMakeLi… > ============================================================================== > --- trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -1,4 +1,8 @@ > > add_library(vfatxlib fatx.c vfatxlib.c) > + > +if(NOT MSVC) > + target_link_libraries(vfatxlib -lgcc) > +endif() > + > add_dependencies(vfatxlib psdk) > - > > Modified: trunk/reactos/lib/pseh/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… > ============================================================================== > --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Jun 6 11:44:58 2011 > @@ -14,6 +14,7 @@ > endif() > > add_library(pseh ${SOURCE}) > + target_link_libraries(pseh chkstk) > add_dependencies(pseh psdk) > > else() > >

14 years

Problems with unhidden quotes... final

by Olaf Siejka

Yes. You are not, sorry for the outburst. It occurs that my problem was due to GMail scripts targetting Opera specifically. Got an addon for it to pose as Firefox and guess what? Problem's gone. Thank you gmail, i`m moving away. Regards 2011/6/5 Riccardo Bestetti <riccardo.kyogre(a)live.it> > Yes, I probably missed his previous email, but this isn’t a good reason > to say that I am deficient. > Now please, let’s stop to discuss [image: Sorriso] > > *From:* Ameen Ross <a.ross(a)amdev.eu> > *Sent:* Sunday, June 05, 2011 4:04 PM > *To:* ros-dev(a)reactos.org > *Subject:* Re: [ros-dev] 1294 [dreimer] Fix clean for cmake trees. ... > > You missed his previous mail ;) > He said that he emails with lots of replies were almost unreadable and > requested to remove what's not needed. > > On 06/05/2011 03:58 PM, Riccardo Bestetti wrote: > > I wasn’t talking to you, we was talking about browsers and I told what IE > does on my PC. > Here the deficient is you. > > *From:* Olaf Siejka <caemyr(a)gmail.com> > *Sent:* Sunday, June 05, 2011 3:07 PM > *To:* ReactOS Development List <ros-dev(a)reactos.org> > *Subject:* Re: [ros-dev] 1294 [dreimer] Fix clean for cmake trees. ... > > Are you being a person intellectually deficient? Or just provoking me on > any purpose? > > 2011/6/5 Riccardo Bestetti <riccardo.kyogre(a)live.it> > >> I can’t start IE on a Turion X2 @2GHz, 4GB ram (win 7), because it >> literally eats my CPU. >> It crashes my PC. It is terrible. >> Firefox works fine. >> > [whole bunch of trash deleted] > ------------------------------ > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > _______________________________________________ > Ros-dev mailing listRos-dev@reactos.orghttp://www.reactos.org/mailman/listinfo/ros-dev > > ------------------------------ > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

14 years

Sign driver for 64 Bit Build of Virtual Floppy Drive for Windows?

by Carsten Krüger

Hi, I know that for some open source projects React OS sign's windows drivers. Could you please sign the driver for virtual floppy drive? Motivation: Virtual Floppy drive is very helpfull, for example take freedos floppy image, include Samsung SpinPoint F4 EcoGreen HD204UI firmware update into the image and put it with unetbootin on usb stick. Problem: virtual floppy drive didn't run on windows 7 x64 because the need of driver signing. Homepage: http://vfd.sourceforge.net/ Description: >This is a virtual floppy drive for Windows NT / 2000 / XP developed by Ken Kato >(Reported to work also on 2003 Server and Vista). <-- and windows 7 x86, too. > >You can mount a floppy image file as a virtual floppy drive and directly access the contents -- >view, edit, rename, delete or create files on a virtual floppy, format a virtual floppy, >launch a program on a virtual floppy... almost anything you can do with a real floppy. vfdwin x64 driver build (unsigned) from "critical0" http://sourceforge.net/projects/vfd/files/2.1%20(February%2006%2C%202008)/v… vfdwin x64 driver build (unsigned) from "Igor Levicki" http://levicki.net/downloads/sendfile.php?path=vfd_x64/vfd_x64.zip Discussion about the different versions: http://levicki.net/articles/stories/2007/08/17/The_story_of_the_vfdwin_21_6… greetings Carsten

14 years

Re: [ros-dev] 1294 [dreimer] Fix clean for cmake trees. ...

by Colin Finck

dreimer(a)svn.reactos.org wrote: > if not exist "CMakeLists.txt" ( Can we decide on dropping support for rbuild stuff in RosBE 2.0? Reasons: - RosBE 2.0 will certainly come with an updated set of build tools. (GCC 4.6 with mingw-w64 target is planned, maybe even a multilib version) The target change already makes older builds uncompilable with RosBE 2.0. Even if this would be fixed, nobody would guarantee you that a revision built with RosBE 2.0 behaves the same as one compiled with 1.5.x. - Several versions of RosBE can be installed parallely, especially if you're also moving to a Windows Installer for RosBE 2.0, which doesn't care about Uninstall entries of NSIS. So everybody has the option to build older rbuild-powered revisions at any time. - It could make all scripts cleaner again :-) Regards, Colin

14 years

Re: [ros-dev] 1296 [dreimer] Get the cmake path from a system variable called _ROSBE_CMAKEPATH. Hard coding is eeevul!

by Colin Finck

dreimer(a)svn.reactos.org wrote: > Get the cmake path from a system variable called _ROSBE_CMAKEPATH. I hope we're not thinking about requiring the user to install RosBE and CMake separately. This would pretty much kill the point of RosBE if people are forced to get random versions of their build tools from multiple sources again.. - Colin

14 years

Re: [ros-dev] [ros-diffs] [nyadav] 52076: [AUDSRV] finish upto actual mixing functions

by Ged Murphy

Can you use the reactos / ansi coding standard. This code is almost unreadable, which makes it very difficult to review On 3 June 2011 22:41, <nyadav(a)svn.reactos.org> wrote: > Author: nyadav > Date: Fri Jun 3 21:41:26 2011 > New Revision: 52076 > > URL: http://svn.reactos.org/svn/reactos?rev=52076&view=rev > Log: > [AUDSRV] finish upto actual mixing functions > > Added: > branches/nyadav-audio-branch/base/services/audsrv/mixer.c (with props) > Modified: > branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt > branches/nyadav-audio-branch/base/services/audsrv/audsrv.c > branches/nyadav-audio-branch/base/services/audsrv/audsrv.h > branches/nyadav-audio-branch/base/services/audsrv/rpc.c > branches/nyadav-audio-branch/base/services/audsrv/stream.c > branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c > branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec > branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c > branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl > branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h > > Modified: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… > ============================================================================== > --- branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -7,6 +7,7 @@ > audsrv.c > audsrv.rc > rpc.c > + mixer.c > stream.c) > > add_executable(audsrv ${SOURCE}) > > Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… > ============================================================================== > --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -41,6 +41,7 @@ > const GUID KSMEDIUMSETID_Standard = {0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; > const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; > const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; > +const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; > const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; > > MixerEngine engine,*pengine; > @@ -152,24 +153,31 @@ > > > > - > -void fill(MixerEngine * mixer,int buffer) > -{ > - DWORD Length; > - UINT i = 0; > -Sleep(100); > - Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; > - mixer->masterbuf[buffer] = (PSHORT)HeapAlloc(GetProcessHeap(), 0, Length); > - while (i < Length / 2) > - { > - mixer->masterbuf[buffer][i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); > - i++; > - mixer->masterbuf[buffer][i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * _2pi / 48000); > - i++; > - } > - mixer->bytes_to_play = Length; > -} > - > +void mixandfill(MixerEngine * mixer,int buffer) > +{ > + while(WaitForSingleObject(mixer->streampresent,100)!=0){if(mixer->dead) return;} /*Check if there is at least one stream present.*/ > + if(mixer->masterdatatype == 0)/*signed int*/ > + { > + if(mixer->masterbitspersample == 8)mixs8(mixer,buffer);else if(mixer->masterbitspersample == 16) mixs16(mixer,buffer);else if(mixer->masterbitspersample == 32) mixs32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixs64(mixer,buffer); > + } > + else if (mixer->masterdatatype == 1)/*unsigned int*/ > + { > + if(mixer->masterbitspersample == 8)mixu8(mixer,buffer);else if(mixer->masterbitspersample == 16) mixu16(mixer,buffer);else if(mixer->masterbitspersample == 32) mixu32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixu64(mixer,buffer); > + } > + else if(mixer->masterdatatype == 2)/*Float*/ > + { > + if(mixer->masterbitspersample == 32)mixfl32(mixer,buffer);else if(mixer->masterbitspersample == 64) mixfl64(mixer,buffer); > + } > + > + mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); > + CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); > + mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; > +} > +void freebuffer() > +{ > + HeapFree(GetProcessHeap(), 0, pengine->masterbuf[pengine->playcurrent]); > + pengine->masterbuf[pengine->playcurrent] = NULL; > +} > void playbuffer(MixerEngine * mixer,int buffer) > { > SP_DEVICE_INTERFACE_DATA InterfaceData; > @@ -276,7 +284,10 @@ > DataFormat->Flags = 0; > DataFormat->Reserved = 0; > DataFormat->MajorFormat = KSDATAFORMAT_TYPE_AUDIO; > - DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > + if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) > + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > + else > + DataFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > DataFormat->Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; > DataFormat->SampleSize = mixer->masterchannels * mixer->masterbitspersample / 8; > DataFormat->FormatSize = sizeof(KSDATAFORMAT) + sizeof(WAVEFORMATEXTENSIBLE); > @@ -290,9 +301,11 @@ > WaveFormat->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); > WaveFormat->dwChannelMask = mixer->masterchannelmask; > WaveFormat->Samples.wValidBitsPerSample = mixer->masterbitspersample; > - WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > - > - //printf("Creating pin\n"); > + if(mixer->masterdatatype == 0 || mixer->masterdatatype == 1) > + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > + else > + WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > + > > // > // Create the pin > @@ -367,12 +380,9 @@ > SetEvent(mixer->played); > while(1) > { > - while(WaitForSingleObject(mixer->streampresent,100)!=0){if(mixer->dead)goto DEAD;} /*Check if there is at least one stream present.*/ > - > while(WaitForSingleObject(mixer->played,100)!=0){if(mixer->dead)goto DEAD;} > - fill(mixer,1-mixer->playcurrent); > + mixandfill(mixer,1-mixer->playcurrent); > SetEvent(mixer->filled); > - > } > DEAD: > printf("\nMixer Thread Ended\n"); > @@ -386,7 +396,7 @@ > while(WaitForSingleObject(mixer->filled,100)!=0){if(mixer->dead)goto DEAD;} > SetEvent(mixer->played); > playbuffer(mixer,mixer->playcurrent); > - > + freebuffer(); > mixer->playcurrent=1-mixer->playcurrent; > } > > @@ -468,6 +478,7 @@ > pengine->mute=FALSE; > > pengine->dead=0; > + pengine->streamidpool=0; > pengine->playcurrent=1; > pengine->masterbuf[0] = NULL; > pengine->masterbuf[1] = NULL; > @@ -501,6 +512,7 @@ > pengine->mute=FALSE; > > pengine->dead=0; > + pengine->streamidpool=0; > pengine->playcurrent=1; > pengine->masterbuf[0] = NULL; > pengine->masterbuf[1] = NULL; > > Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… > ============================================================================== > --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -29,15 +29,24 @@ > > typedef struct ServerStream > { > + long streamid; > int volume; > LONG freq; > int bitspersample; > + int datatype; /*0=signed int,1=unsigned int,2=float*/ > int channels; > ULONG channelmask; > HANDLE played; > - HANDLE streamready; > + HANDLE threadready; > HANDLE thread; > float balance; > + BOOL ready; > + PVOID genuinebuf; > + int length_genuine; > + PVOID filteredbuf; > + int length_filtered; > + PVOID minsamplevalue; > + PVOID maxsamplevalue; > struct ServerStream * next; > } ServerStream; > > @@ -45,6 +54,7 @@ > { > /*Should be Initialized at Server Start*/ > char dead; > + long streamidpool; > HANDLE played; > HANDLE filled; > HANDLE streampresent; > @@ -60,7 +70,8 @@ > int masterchannels; > unsigned long masterchannelmask; > int masterbitspersample; > - PSHORT masterbuf[2]; > + int masterdatatype; > + PVOID masterbuf[2]; > /*Currently don't know the future of following variables*/ > long bytes_to_play; > HANDLE FilterHandle; > @@ -75,10 +86,22 @@ > /* rpc.c */ > DWORD WINAPI RunRPCThread(LPVOID lpParameter); > /* audsrv.c*/ > -void fill(MixerEngine * mixer,int buffer); > +void mixandfill(MixerEngine * mixer,int buffer); > void playbuffer(MixerEngine * mixer,int buffer); > /*stream.c*/ > -HANDLE addstream(LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance); > +long getnewstreamid(); > +long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance); > +/*mixer.c*/ > +void * mixs8(MixerEngine * mixer,int buffer); > +void * mixs16(MixerEngine * mixer,int buffer); > +void * mixs32(MixerEngine * mixer,int buffer); > +void * mixs64(MixerEngine * mixer,int buffer); > +void * mixu8(MixerEngine * mixer,int buffer); > +void * mixu16(MixerEngine * mixer,int buffer); > +void * mixu32(MixerEngine * mixer,int buffer); > +void * mixu64(MixerEngine * mixer,int buffer); > +void * mixfl32(MixerEngine * mixer,int buffer); > +void * mixfl64(MixerEngine * mixer,int buffer); > /********************************/ > > #endif /* __AUDSRV_H__ */ > > Added: branches/nyadav-audio-branch/base/services/audsrv/mixer.c > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… > ============================================================================== > --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c (added) > +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -1,0 +1,35 @@ > + > +#include "audsrv.h" > +void * mixs8(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixs16(MixerEngine * mixer,int buffer) > +{ > + mixer->masterbuf[buffer] = HeapAlloc(GetProcessHeap(), 0, mixer->serverstreamlist->length_filtered); > + CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); > + mixer->bytes_to_play = mixer->serverstreamlist->length_filtered; > +} > +void * mixs32(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixs64(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixu8(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixu16(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixu32(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixu64(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixfl32(MixerEngine * mixer,int buffer) > +{ > +} > +void * mixfl64(MixerEngine * mixer,int buffer) > +{ > +} > > Propchange: branches/nyadav-audio-branch/base/services/audsrv/mixer.c > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: branches/nyadav-audio-branch/base/services/audsrv/mixer.c > ------------------------------------------------------------------------------ > svn:mime-type = text/plain > > Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… > ============================================================================== > --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -45,13 +45,13 @@ > > /*************************RPC Functions**********************************/ > > -int AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) > +long AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) > { > - HANDLE stream; > - printf("Client Connected and Initiated Stream Freq: %ld,Channle: %d,Bitspersample: %d,Mask: %ld,Volume: %d,Mute: %d,Balance: %f\n",frequency,channels,bitspersample,channelmask,volume,mute,balance); > - stream = addstream(frequency,channels,bitspersample,channelmask,volume,mute,balance); > - if( stream == NULL ){return 0;}else{printf("Stream added\n");} > - return (int)stream; > + long stream; > + printf("Client Connected and Initiated Stream Freq: %ld,Channle: %d,Bitspersample: %d,Datatype: %d,Mask: %ld,Volume: %d,Mute: %d,Balance: %f\n",frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); > + stream = addstream(frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); > + if( stream != 0 ){printf("Stream added\n");} > + return stream; > } > /*************************************************************************/ > void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) > > Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… > ============================================================================== > --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -1,17 +1,40 @@ > #include "audsrv.h" > > +long getnewstreamid() > +{ > + long streamid= pengine->streamidpool; > + pengine->streamidpool+=1; > + return streamid; > +} > DWORD WINAPI RunStreamThread(LPVOID param) > { > + UINT i = 0; > ServerStream * localstream = (ServerStream *) param; > > - SetEvent(localstream->streamready); > + > printf("Signaling Mixer Thread For First Stream\n"); > - SetEvent(pengine->streampresent); > +/*HACK fill filtered buffer (1 second duration in the master stream format) directly until we are in a condition to get buffer directly from the client*/ > +/******************************************************/ > +PSHORT tempbuf; > +localstream->ready =TRUE; > +localstream->length_filtered = localstream->freq * localstream->channels * localstream->bitspersample / 8; > +tempbuf = (PSHORT)HeapAlloc(GetProcessHeap(), 0, localstream->length_filtered); > + while (i < localstream->length_filtered / 2) > + { > + tempbuf[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * 6.28 / 48000); > + i++; > + tempbuf[i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * 6.28 / 48000); > + i++; > + } > +localstream->filteredbuf = tempbuf; > +/******************************************************/ > + SetEvent(localstream->threadready); > + > while (1){OutputDebugStringA("Stream Thread Running.");Sleep(100);}; > /*Clean Stream's data*/ > } > > -HANDLE addstream(LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) > +long addstream(LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) > { > ServerStream * newstream,*localstream; > DWORD dwID; > @@ -23,37 +46,56 @@ > if(volume < 0) {newstream->volume = 0;}else if (volume > 1000) {newstream->volume = 1000;}else {newstream->volume = volume;} > if(volume < -1.0) {newstream->volume = -1.0;}else if (volume > 1.0) {newstream->volume = 1.0;}else {newstream->volume = volume;} > newstream->freq = frequency; /*TODO frequency validation required*/ > + if(datatype==0 || datatype==1 || datatype==2){newstream->datatype=datatype;}else goto error; > + if ((datatype==0 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64 )) || > + (datatype==1 && (bitspersample == 8 || bitspersample == 16 || bitspersample == 32 || bitspersample == 64)) || > + (datatype==2 && (bitspersample == 32 || bitspersample == 64)) ) > newstream->bitspersample = bitspersample; /*TODO bitspersample validation*/ > + else goto error; > + > newstream->channels = channels; /*TODO validation*/ > newstream->channelmask = channelmask; /*TODO validation*/ > > + newstream->ready = FALSE; > + newstream->length_genuine = 0; > + newstream->genuinebuf = NULL; > + newstream->length_filtered = 0; > + newstream->filteredbuf = NULL; > + newstream->minsamplevalue = NULL; > + newstream->maxsamplevalue = NULL; > + > newstream->next = NULL; > newstream->played = CreateEvent(NULL,FALSE,FALSE,NULL); > - newstream->streamready = CreateEvent(NULL,FALSE,FALSE,NULL); > + newstream->threadready = CreateEvent(NULL,FALSE,FALSE,NULL); > > - if(newstream->played == NULL || newstream->streamready == NULL) {goto error;} > + if(newstream->played == NULL || newstream->threadready == NULL) {goto error;} > newstream->thread=CreateThread(NULL,0,RunStreamThread,newstream,0,&dwID); > if(newstream->thread == NULL) {goto error;} > > - WaitForSingleObject(newstream->streamready,INFINITE); > > + WaitForSingleObject(newstream->threadready,INFINITE); > + > + newstream->streamid=getnewstreamid(); > if(localstream == NULL) > { > - pengine->serverstreamlist = localstream; > + pengine->serverstreamlist = newstream; > > pengine->masterfreq=frequency; > pengine->masterchannels=channels; > pengine->masterchannelmask=channelmask; > pengine->masterbitspersample=bitspersample; > + pengine->masterdatatype = datatype; > } > else > { > while(localstream->next != NULL){localstream = localstream->next;} > localstream->next = newstream; > } > - return newstream->thread; > + SetEvent(pengine->streampresent); > + return newstream->streamid; > > error: > + printf("Stream Rejected \n"); > HeapFree(GetProcessHeap(), 0, newstream); > - return NULL; > + return 0; > } > > Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… > ============================================================================== > --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -5,9 +5,9 @@ > /*Initialize an audio stream > *Return -1 if callbacks are NULL pointers > */ > -WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) > +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance) > { > - int streamid; > + long streamid; > if (clientstream == NULL ) return -1; > if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; > /*Validity of all other data will be checked at server*/ > @@ -16,8 +16,9 @@ > > RpcTryExcept > { > - streamid = AUDInitStream (audsrv_v0_0_c_ifspec,frequency,channels,bitspersample,channelmask,volume,mute,balance); > - printf("AUDInitStream Returned %d",streamid); > + streamid = AUDInitStream (audsrv_v0_0_c_ifspec,frequency,channels,bitspersample,datatype,channelmask,volume,mute,balance); > + printf("AUDInitStream Returned %ld",streamid); > + if(streamid != 0) {clientstream->stream = streamid;} > } > RpcExcept(1) > { > @@ -28,8 +29,6 @@ > > /*Analyse the return by the function*/ > /*Currently Suppose the return is 0 and a valid streamid is returned*/ > - clientstream->stream = &status; > - > clientstream->ClientEventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); > clientstream->dead = 0; > > > Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… > ============================================================================== > --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.spec [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -1,4 +1,4 @@ > -@ stdcall initstream (ptr long long long long long long long) > +@ stdcall initstream (ptr long long long long long long long long) > @ stdcall playaudio ( ptr); > @ stdcall stopaudio (ptr ); > @ stdcall Volume(ptr ptr ); > > Modified: branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/drivers/wdm… > ============================================================================== > --- branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/drivers/wdm/audio/backpln/audclient/audclient.c [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -8,7 +8,7 @@ > void buffercopied (int error ); > void playcomplete (int error ); > > -ClientStream clientstream = {NULL,0,{NULL},{opencomplete,buffercopied,playcomplete}};/*This initialization should not be necessary for a typical client*/ > +ClientStream clientstream = {0,0,{NULL},{opencomplete,buffercopied,playcomplete}};/*This initialization should not be necessary for a typical client*/ > > DWORD WINAPI RunAudioThread(LPVOID param) > { > @@ -39,12 +39,12 @@ > char input='\0'; > printf("ReactOS Audio Mixer Sample Client.Enter 'a' to Stop.\n"); > //if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) printf(""); > - error = initstream ( &clientstream , 44100 , 2 , 16 , KSAUDIO_SPEAKER_STEREO , 1000 , 0, 0.0 ); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ > + error = initstream ( &clientstream , 44100 , 2 , 16 ,0, KSAUDIO_SPEAKER_STEREO , 1000 , 0, 0.0 ); /*[out]HANDLE * streamhandle,[in] long frequency,[in] int number of channels,[in] int bitspersample,[in]ULONG channelmask,[in] int volume,[in] int mute,[in] float balance*/ > if ( error ) > printf("Failed to Initialize Stream.Error %d\n", error); > else > { > - printf("StreamID : %d\n",*((int *)clientstream.stream)); > + printf("StreamID : %ld\n",clientstream.stream); > audiothread = CreateThread(NULL,0,RunAudioThread,&clientstream,0,&dwID); > } > while ( input != 'a' ) > > Modified: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… > ============================================================================== > --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -39,6 +39,6 @@ > interface audsrv > { > > - int AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); > + long AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in]int datatype,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); > > } > > Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h > URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… > ============================================================================== > --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) > +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Fri Jun 3 21:41:26 2011 > @@ -17,14 +17,14 @@ > > typedef struct ClientStream > { > -HANDLE stream; > +long stream; > int dead; > HANDLE ClientEventPool[1]; //0]th event is for Activescheduler > struct CallBacks callbacks; > } ClientStream; > > /********************API Functions******************/ > -WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance); > +WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample,int datatype, ULONG channelmask,int volume,int mute,float balance); > WINAPI int playaudio ( ClientStream * clientstream); > WINAPI int stopaudio (ClientStream * clientstream ); > WINAPI int Volume(ClientStream * clientstream, int * volume ); > > >

14 years

Re: [ros-dev] [ros-diffs] [tkreuzer] 52078: [NTOSKRNL/HAL] - Add explicit memory barriers to KxAcquireSpinLock, KxReleaseSpinLock inline functions and KeTryToAcquireQueuedSpinLock, KeTryToAcquireQueuedSpinLockRaiseToSynch i...

by Alex Ionescu

Excellent, thank you! Small nit, KeMemoryBarrierWithoutFence() is the "more correct" way of doing this in kernel code -- it expands to _ReadWriteBarrier(), but it's the "kernel-friendly" macro the WDK suggests. -- Best regards, Alex Ionescu On 2011-06-04, at 8:33 AM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Sat Jun 4 12:33:54 2011 > New Revision: 52078 > > URL: http://svn.reactos.org/svn/reactos?rev=52078&view=rev > Log: > [NTOSKRNL/HAL] > - Add explicit memory barriers to KxAcquireSpinLock, KxReleaseSpinLock inline functions and KeTryToAcquireQueuedSpinLock, KeTryToAcquireQueuedSpinLockRaiseToSynch in the UP case. This will prevent the compiler from reordering memory access instructions across the boundaries of these functions, even when being inlined. > - Use the inline functions in x64 spinlock functions, too > > Modified: > trunk/reactos/hal/halx86/generic/spinlock.c > trunk/reactos/ntoskrnl/include/internal/spinlock.h > trunk/reactos/ntoskrnl/ke/amd64/spinlock.c > > Modified: trunk/reactos/hal/halx86/generic/spinlock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Sat Jun 4 12:33:54 2011 > @@ -188,6 +188,10 @@ > /* Simply raise to synch */ > KeRaiseIrql(SYNCH_LEVEL, OldIrql); > > + /* Add an explicit memory barrier to prevent the compiler from reordering > + memory accesses across the borders of spinlocks */ > + _ReadWriteBarrier(); > + > /* Always return true on UP Machines */ > return TRUE; > } > @@ -208,6 +212,10 @@ > /* Simply raise to dispatch */ > KeRaiseIrql(DISPATCH_LEVEL, OldIrql); > > + /* Add an explicit memory barrier to prevent the compiler from reordering > + memory accesses across the borders of spinlocks */ > + _ReadWriteBarrier(); > + > /* Always return true on UP Machines */ > return TRUE; > } > > Modified: trunk/reactos/ntoskrnl/include/internal/spinlock.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/include/internal/spinlock.h [iso-8859-1] Sat Jun 4 12:33:54 2011 > @@ -21,6 +21,10 @@ > { > /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ > UNREFERENCED_PARAMETER(SpinLock); > + > + /* Add an explicit memory barrier to prevent the compiler from reordering > + memory accesses across the borders of spinlocks */ > + _ReadWriteBarrier(); > } > > // > @@ -32,6 +36,10 @@ > { > /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ > UNREFERENCED_PARAMETER(SpinLock); > + > + /* Add an explicit memory barrier to prevent the compiler from reordering > + memory accesses across the borders of spinlocks */ > + _ReadWriteBarrier(); > } > > #else > > Modified: trunk/reactos/ntoskrnl/ke/amd64/spinlock.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/spinlock… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] Sat Jun 4 12:33:54 2011 > @@ -23,14 +23,14 @@ > KIRQL > KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) > { > -#ifndef CONFIG_SMP > - KIRQL OldIrql; > - /* Simply raise to dispatch */ > - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); > - return OldIrql; > -#else > - UNIMPLEMENTED; > -#endif > + KIRQL OldIrql; > + > + /* Raise to sync */ > + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); > + > + /* Acquire the lock and return */ > + KxAcquireSpinLock(SpinLock); > + return OldIrql; > } > > /* > @@ -40,14 +40,14 @@ > NTAPI > KeAcquireSpinLockRaiseToDpc(PKSPIN_LOCK SpinLock) > { > -#ifndef CONFIG_SMP > - KIRQL OldIrql; > - /* Simply raise to dispatch */ > + KIRQL OldIrql; > + > + /* Raise to dispatch */ > KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); > - return OldIrql; > -#else > - UNIMPLEMENTED; > -#endif > + > + /* Acquire the lock and return */ > + KxAcquireSpinLock(SpinLock); > + return OldIrql; > } > > /* > @@ -58,12 +58,9 @@ > KeReleaseSpinLock(PKSPIN_LOCK SpinLock, > KIRQL OldIrql) > { > -#ifndef CONFIG_SMP > - /* Simply lower IRQL back */ > + /* Release the lock and lower IRQL back */ > + KxReleaseSpinLock(SpinLock); > KeLowerIrql(OldIrql); > -#else > - UNIMPLEMENTED; > -#endif > } > > /* > @@ -72,14 +69,14 @@ > KIRQL > KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) > { > -#ifndef CONFIG_SMP > - KIRQL OldIrql; > - /* Simply raise to dispatch */ > + KIRQL OldIrql; > + > + /* Raise to dispatch */ > KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); > - return OldIrql; > -#else > - UNIMPLEMENTED; > -#endif > + > + /* Acquire the lock */ > + KxAcquireSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK > + return OldIrql; > } > > /* > @@ -88,14 +85,14 @@ > KIRQL > KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) > { > -#ifndef CONFIG_SMP > - KIRQL OldIrql; > - /* Simply raise to dispatch */ > - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); > - return OldIrql; > -#else > - UNIMPLEMENTED; > -#endif > + KIRQL OldIrql; > + > + /* Raise to synch */ > + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); > + > + /* Acquire the lock */ > + KxAcquireSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK > + return OldIrql; > } > > /* > @@ -105,13 +102,17 @@ > KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, > IN PKLOCK_QUEUE_HANDLE LockHandle) > { > -#ifndef CONFIG_SMP > - /* Simply raise to dispatch */ > + /* Set up the lock */ > + LockHandle->LockQueue.Next = NULL; > + LockHandle->LockQueue.Lock = SpinLock; > + > + /* Raise to dispatch */ > KeRaiseIrql(DISPATCH_LEVEL, &LockHandle->OldIrql); > -#else > - UNIMPLEMENTED; > -#endif > -} > + > + /* Acquire the lock */ > + KxAcquireSpinLock(LockHandle->LockQueue.Lock); // HACK > +} > + > > /* > * @implemented > @@ -120,13 +121,17 @@ > KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, > IN PKLOCK_QUEUE_HANDLE LockHandle) > { > -#ifndef CONFIG_SMP > - /* Simply raise to synch */ > + /* Set up the lock */ > + LockHandle->LockQueue.Next = NULL; > + LockHandle->LockQueue.Lock = SpinLock; > + > + /* Raise to synch */ > KeRaiseIrql(SYNCH_LEVEL, &LockHandle->OldIrql); > -#else > - UNIMPLEMENTED; > -#endif > -} > + > + /* Acquire the lock */ > + KxAcquireSpinLock(LockHandle->LockQueue.Lock); // HACK > +} > + > > /* > * @implemented > @@ -135,27 +140,25 @@ > KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, > IN KIRQL OldIrql) > { > -#ifndef CONFIG_SMP > + /* Release the lock */ > + KxReleaseSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK > + > + /* Lower IRQL back */ > + KeLowerIrql(OldIrql); > +} > + > + > +/* > + * @implemented > + */ > +VOID > +KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) > +{ > /* Simply lower IRQL back */ > - KeLowerIrql(OldIrql); > -#else > - UNIMPLEMENTED; > -#endif > -} > - > -/* > - * @implemented > - */ > -VOID > -KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) > -{ > -#ifndef CONFIG_SMP > - /* Simply lower IRQL back */ > + KxReleaseSpinLock(LockHandle->LockQueue.Lock); // HACK > KeLowerIrql(LockHandle->OldIrql); > -#else > - UNIMPLEMENTED; > -#endif > -} > +} > + > > /* > * @implemented > @@ -167,11 +170,16 @@ > #ifndef CONFIG_SMP > /* Simply raise to dispatch */ > KeRaiseIrql(DISPATCH_LEVEL, OldIrql); > + > + /* Add an explicit memory barrier to prevent the compiler from reordering > + memory accesses across the borders of spinlocks */ > + _ReadWriteBarrier(); > > /* Always return true on UP Machines */ > return TRUE; > #else > UNIMPLEMENTED; > + ASSERT(FALSE); > #endif > } > > @@ -185,11 +193,16 @@ > #ifndef CONFIG_SMP > /* Simply raise to dispatch */ > KeRaiseIrql(DISPATCH_LEVEL, OldIrql); > + > + /* Add an explicit memory barrier to prevent the compiler from reordering > + memory accesses across the borders of spinlocks */ > + _ReadWriteBarrier(); > > /* Always return true on UP Machines */ > return TRUE; > #else > UNIMPLEMENTED; > + ASSERT(FALSE); > #endif > } > > >

14 years

Re: [ros-dev] [ros-diffs] [pschweitzer] 52065: [NTOSKRNL] - renamed Io volumes global to match Windows names (in case of debug) - renamed IopDereferenceVpb() to IopDereferenceVpbAndFree(), IopReferenceVpbForVerify() to IopR...

by Alex Ionescu

Same comment as before, resources MUST be acquired within a critical region (as the old code did). -- Best regards, Alex Ionescu On 2011-06-02, at 1:43 PM, pschweitzer(a)svn.reactos.org wrote: > /* Acquire the FS lock */ > - KeEnterCriticalRegion(); > - ExAcquireResourceExclusiveLite(&FileSystemListLock, TRUE); > + ExAcquireResourceExclusiveLite(&IopDatabaseResource, TRUE);

14 years

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-dev