Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[fireball] 38530: - Check if CompletionFilter has a valid value too.
by fireball＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: fireball Date: Sat Jan 3 06:42:29 2009 New Revision: 38530 URL: http://svn.reactos.org/svn/reactos?rev=38530&view=rev Log: - Check if CompletionFilter has a valid value too. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Jan 3 06:42:29 2009 @@ -1122,8 +1122,8 @@ /* Check if probing failed */ if (!NT_SUCCESS(Status)) return Status; - /* Check if we have an correct parameter */ - if (!CompletionFilter) + /* Check if CompletionFilter is valid */ + if (!CompletionFilter || (CompletionFilter & ~FILE_NOTIFY_VALID_MASK)) { return STATUS_INVALID_PARAMETER; }

1 0

[dchapyshev] 38529: - Add checking of CompletionFilter parameter. This is fixed 3 wine tests for kernel32
by dchapyshev＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: dchapyshev Date: Sat Jan 3 06:22:14 2009 New Revision: 38529 URL: http://svn.reactos.org/svn/reactos?rev=38529&view=rev Log: - Add checking of CompletionFilter parameter. This is fixed 3 wine tests for kernel32 Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Jan 3 06:22:14 2009 @@ -1121,6 +1121,12 @@ /* Check if probing failed */ if (!NT_SUCCESS(Status)) return Status; + + /* Check if we have an correct parameter */ + if (!CompletionFilter) + { + return STATUS_INVALID_PARAMETER; + } } /* Get File Object */

1 0

[silverblade] 38528: Amendments to file headings (corrected paths mainly). No code changes.
by silverblade＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: silverblade Date: Sat Jan 3 05:19:21 2009 New Revision: 38528 URL: http://svn.reactos.org/svn/reactos?rev=38528&view=rev Log: Amendments to file headings (corrected paths mainly). No code changes. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/include/reactos/libs/sound/mment4.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/silverblade-audio/lib/drivers/sound/mment4/control.c branches/silverblade-audio/lib/drivers/sound/mment4/detect.c branches/silverblade-audio/lib/drivers/sound/mment4/registry.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,17 +1,15 @@ /* - ReactOS Sound System - Sound Blaster MME Driver - - Purpose: - MME driver entry-point - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 6 July 2008 - Created - - TODO: Adhere to maximum device name length! + * PROJECT: ReactOS Sound System + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/sndblst/sndblst.c + * + * PURPOSE: Sound Blaster MME User-Mode Driver + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) + * + * NOTES: Currently very experimental and being used as a guinea-pig for + * changes to the MME-Buddy libraries. + * TODO: Adhere to maximum device name length! */ #include <windows.h> Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,19 +1,19 @@ /* - ReactOS Sound System - MME Support Helper - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 4 July 2008 - Created - 31 Dec 2008 - Split off NT4-specific code into a separate library - - Notes: - MME Buddy was the best name I could come up with... - - The structures etc. here should be treated as internal to the - library so should not be directly accessed elsewhere. + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: include/reactos/libs/sound/mmebuddy.h + * + * PURPOSE: Header for the "MME Buddy" helper library (located in + * lib/drivers/sound/mmebuddy) + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) + * + * HISTORY: 4 July 2008 - Created + * 31 Dec 2008 - Split off NT4-specific code into a separate library + * + * NOTES: MME Buddy was the best name I could come up with... + * The structures etc. here should be treated as internal to the + * library so should not be directly accessed elsewhere. */ #ifndef ROS_AUDIO_MMEBUDDY_H Modified: branches/silverblade-audio/include/reactos/libs/sound/mment4.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mment4.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mment4.h [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,16 +1,17 @@ /* - ReactOS Sound System - MME Support Helper (NT4 Specific Parts) - - Author: - Andrew Greenwood (silverblade(a)reactos.org) - - History: - 31 December 2008 - Created - - Notes: - This is intended for use in building NT4 compatible audio device - drivers. Include mmebuddy.h first. + * PROJECT: ReactOS Sound System "MME Buddy" Library (NT4 Helpers) + * LICENSE: GPL - See COPYING in the top level directory + * FILE: include/reactos/libs/sound/mment4.h + * + * PURPOSE: Header for the NT4 part of the "MME Buddy" helper library + * (located in lib/drivers/sound/mment4) + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) + * + * 31 Dec 2008 - Created + * + * NOTES: This is intended for use in building NT4 compatible audio device + * drivers. Include mmebuddy.h first. */ #ifndef ROS_AUDIO_MMENT4_H Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/capabilities.c + * FILE: lib/drivers/sound/mmebuddy/capabilities.c * * PURPOSE: Queries sound devices for their capabilities. * Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/deviceinstance.c + * FILE: lib/drivers/sound/mmebuddy/deviceinstance.c * * PURPOSE: Manages instances of sound devices. * Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/devicelist.c + * FILE: lib/drivers/sound/mmebuddy/devicelist.c * * PURPOSE: Manages lists of sound devices. * Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/functiontable.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/functiontable.c + * FILE: lib/drivers/sound/mmebuddy/functiontable.c * * PURPOSE: Routes function calls through a function table, calling * implementation-defined routines or a default function, depending Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/kernel.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/kernel.c + * FILE: lib/drivers/sound/mmebuddy/kernel.c * * PURPOSE: Routines assisting with device I/O between user-mode and * kernel-mode. Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/mmewrap.c + * FILE: lib/drivers/sound/mmebuddy/mmewrap.c * * PURPOSE: Interface between MME functions and MME Buddy's own. * Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/thread.c + * FILE: lib/drivers/sound/mmebuddy/thread.c * * PURPOSE: Multimedia thread management * Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/wave/format.c + * FILE: lib/drivers/sound/mmebuddy/wave/format.c * * PURPOSE: Queries and sets wave device format (sample rate, etc.) * Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/header.c + * FILE: lib/drivers/sound/mmebuddy/header.c * * PURPOSE: Wave header preparation routines * Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mmebuddy/wave/wodMessage.c + * FILE: lib/drivers/sound/mmebuddy/wave/wodMessage.c * * PURPOSE: Provides the wodMessage exported function, as required by * the MME API, for wave output device support. Modified: branches/silverblade-audio/lib/drivers/sound/mment4/control.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mment4/control.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mment4/control.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" NT4 Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mment4/control.c + * FILE: lib/drivers/sound/mment4/control.c * * PURPOSE: Device control for NT4 audio devices * Modified: branches/silverblade-audio/lib/drivers/sound/mment4/detect.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mment4/detect.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mment4/detect.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" NT4 Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mment4/detect.c + * FILE: lib/drivers/sound/mment4/detect.c * * PURPOSE: Assists in locating Windows NT4 compatible sound devices, * which mostly use the same device naming convention and/or Modified: branches/silverblade-audio/lib/drivers/sound/mment4/registry.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mment4/registry.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mment4/registry.c [iso-8859-1] Sat Jan 3 05:19:21 2009 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System "MME Buddy" NT4 Library * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/sound/mment4/registry.c + * FILE: lib/drivers/sound/mment4/registry.c * * PURPOSE: Registry operation helper for audio device drivers. *

1 0

[dchapyshev] 38527: - Add spoolss from Wine
by dchapyshev＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: dchapyshev Date: Sat Jan 3 05:18:58 2009 New Revision: 38527 URL: http://svn.reactos.org/svn/reactos?rev=38527&view=rev Log: - Add spoolss from Wine Added: trunk/reactos/dll/win32/spoolss/ (with props) trunk/reactos/dll/win32/spoolss/spoolss.rbuild (with props) trunk/reactos/dll/win32/spoolss/spoolss.spec (with props) trunk/reactos/dll/win32/spoolss/spoolss_main.c (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 Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=385… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Sat Jan 3 05:18:58 2009 @@ -110,6 +110,7 @@ <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> <property name="BASEADDRESS_KSUSER" value="0x73ea0000" /> <property name="BASEADDRESS_ICMP" value="0x741f0000" /> + <property name="BASEADDRESS_SPOOLSS" value="0x742a0000" /> <property name="BASEADDRESS_QUARTZ" value="0x747d0000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 3 05:18:58 2009 @@ -341,6 +341,7 @@ dll\win32\shlwapi\shlwapi.dll 1 dll\win32\smdll\smdll.dll 1 dll\win32\snmpapi\snmpapi.dll 1 +dll\win32\spoolss\spoolss.dll 1 dll\win32\stdole2.tlb\stdole2.tlb 1 dll\win32\stdole32.tlb\stdole32.tlb 1 dll\win32\sxs\sxs.dll 1 Propchange: trunk/reactos/dll/win32/spoolss/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Jan 3 05:18:58 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/spoolss/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/spoolss/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/spoolss/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/spoolss/spoolss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.rbuild (added) +++ trunk/reactos/dll/win32/spoolss/spoolss.rbuild [iso-8859-1] Sat Jan 3 05:18:58 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="spoolss" type="win32dll" baseaddress="${BASEADDRESS_SPOOLSS}" installbase="system32" installname="spoolss.dll" allowwarnings="true"> + <importlibrary definition="spoolss.spec" /> + <include base="spoolss">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <file>spoolss_main.c</file> + <library>wine</library> + <library>winspool</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group> Propchange: trunk/reactos/dll/win32/spoolss/spoolss.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss.… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss.spec (added) +++ trunk/reactos/dll/win32/spoolss/spoolss.spec [iso-8859-1] Sat Jan 3 05:18:58 2009 @@ -1,0 +1,151 @@ +@ stub AbortPrinter +@ stub AddFormW +@ stub AddJobW +@ stub AddMonitorW +@ stub AddPerMachineConnectionW +@ stub AddPortExW +@ stub AddPortW +@ stub AddPrintProcessorW +@ stub AddPrintProvidorW +@ stub AddPrinterConnectionW +@ stub AddPrinterDriverExW +@ stub AddPrinterDriverW +@ stub AddPrinterExW +@ stub AddPrinterW +@ stdcall AllocSplStr(wstr) +@ stub AppendPrinterNotifyInfoData +@ stdcall BuildOtherNamesFromMachineName(ptr ptr) +@ stub CallDrvDevModeConversion +@ stub CallRouterFindFirstPrinterChangeNotification +@ stub ClosePrinter +@ stub ClusterSplClose +@ stub ClusterSplIsAlive +@ stub ClusterSplOpen +@ stub ConfigurePortW +@ stub CreatePrinterIC +@ stub DbgGetPointers +@ stub DeleteFormW +@ stub DeleteMonitorW +@ stub DeletePerMachineConnectionW +@ stub DeletePortW +@ stub DeletePrintProcessorW +@ stub DeletePrintProvidorW +@ stub DeletePrinter +@ stub DeletePrinterConnectionW +@ stub DeletePrinterDataExW +@ stub DeletePrinterDataW +@ stub DeletePrinterDriverExW +@ stub DeletePrinterDriverW +@ stub DeletePrinterIC +@ stub DeletePrinterKeyW +@ stdcall DllAllocSplMem(long) +@ stdcall DllFreeSplMem(ptr) +@ stdcall DllFreeSplStr(wstr) +@ stub EndDocPrinter +@ stub EndPagePrinter +@ stub EnumFormsW +@ stub EnumJobsW +@ stub EnumMonitorsW +@ stub EnumPerMachineConnectionsW +@ stdcall EnumPortsW(wstr long ptr ptr ptr ptr) winspool.drv.EnumPortsW +@ stub EnumPrintProcessorDatatypesW +@ stub EnumPrintProcessorsW +@ stub EnumPrinterDataExW +@ stub EnumPrinterDataW +@ stub EnumPrinterDriversW +@ stub EnumPrinterKeyW +@ stub EnumPrintersW +@ stub FindClosePrinterChangeNotification +@ stub FlushPrinter +@ stub FormatPrinterForRegistryKey +@ stub FormatRegistryKeyForPrinter +@ stub FreeOtherNames +@ stub GetClientUserHandle +@ stub GetFormW +@ stub GetJobAttributes +@ stub GetJobW +@ stub GetNetworkId +@ stub GetPrintProcessorDirectoryW +@ stub GetPrinterDataExW +@ stub GetPrinterDataW +@ stub GetPrinterDriverDirectoryW +@ stub GetPrinterDriverExW +@ stub GetPrinterDriverW +@ stub GetPrinterW +@ stdcall ImpersonatePrinterClient(long) +@ stdcall InitializeRouter() +@ stdcall IsLocalCall() +@ stub IsNamedPipeRpcCall +@ stub LoadDriver +@ stub LoadDriverFiletoConvertDevmode +@ stub MIDL_user_allocate1 +@ stub MIDL_user_free1 +@ stub MarshallDownStructure +@ stub MarshallUpStructure +@ stub OldGetPrinterDriverW +@ stub OpenPrinterExW +@ stub OpenPrinterPortW +@ stub OpenPrinterW +@ stub PackStrings +@ stub PartialReplyPrinterChangeNotification +@ stub PlayGdiScriptOnPrinterIC +@ stub PrinterHandleRundown +@ stub PrinterMessageBoxW +@ stub ProvidorFindClosePrinterChangeNotification +@ stub ProvidorFindFirstPrinterChangeNotification +@ stub ReadPrinter +@ stub ReallocSplMem +@ stub ReallocSplStr +@ stub RemoteFindFirstPrinterChangeNotification +@ stub ReplyClosePrinter +@ stub ReplyOpenPrinter +@ stub ReplyPrinterChangeNotification +@ stub ResetPrinterW +@ stdcall RevertToPrinterSelf() +@ stub RouterAllocPrinterNotifyInfo +@ stub RouterFindFirstPrinterChangeNotification +@ stub RouterFindNextPrinterChangeNotification +@ stub RouterFreePrinterNotifyInfo +@ stub RouterRefreshPrinterChangeNotification +@ stub RouterReplyPrinter +@ stub ScheduleJob +@ stub SeekPrinter +@ stub SetAllocFailCount +@ stub SetFormW +@ stub SetJobW +@ stub SetPortW +@ stub SetPrinterDataExW +@ stub SetPrinterDataW +@ stub SetPrinterW +@ stub SplCloseSpoolFileHandle +@ stub SplCommitSpoolData +@ stub SplDriverUnloadComplete +@ stub SplGetSpoolFileInfo +@ stdcall SplInitializeWinSpoolDrv(ptr) +@ stdcall SplIsUpgrade() +@ stub SplProcessPnPEvent +@ stub SplReadPrinter +@ stub SplRegisterForDeviceEvents +@ stub SplStartPhase2Init +@ stub SplUnregisterForDeviceEvents +@ stub SpoolerFindClosePrinterChangeNotification +@ stub SpoolerFindFirstPrinterChangeNotification +@ stub SpoolerFindNextPrinterChangeNotification +@ stub SpoolerFreePrinterNotifyInfo +@ stdcall SpoolerHasInitialized() +@ stdcall SpoolerInit() +@ stub StartDocPrinterW +@ stub StartPagePrinter +@ stub UnloadDriver +@ stub UnloadDriverFile +@ stub UpdateBufferSize +@ stub UpdatePrinterRegAll +@ stub UpdatePrinterRegUser +@ stub WaitForPrinterChange +@ stdcall WaitForSpoolerInitialization() +@ stub WritePrinter +@ stub XcvDataW +@ stub bGetDevModePerUser +@ stub bSetDevModePerUser +@ stub pszDbgAllocMsgA +@ stub vDbgLogError Propchange: trunk/reactos/dll/win32/spoolss/spoolss.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/spoolss/spoolss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/spoolss_… ============================================================================== --- trunk/reactos/dll/win32/spoolss/spoolss_main.c (added) +++ trunk/reactos/dll/win32/spoolss/spoolss_main.c [iso-8859-1] Sat Jan 3 05:18:58 2009 @@ -1,0 +1,369 @@ +/* + * Implementation of the Spooler-Service helper DLL + * + * Copyright 2006 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winreg.h" + +#include "wingdi.h" +#include "winspool.h" +#include "ddk/winsplp.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(spoolss); + +/* ################################ */ + +static CRITICAL_SECTION backend_cs; +static CRITICAL_SECTION_DEBUG backend_cs_debug = +{ + 0, 0, &backend_cs, + { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") } +}; +static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; + +/* ################################ */ + +static HMODULE hwinspool; +static HMODULE hlocalspl; +static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR); + +static PRINTPROVIDOR * backend; + +/* ################################ */ + +static const WCHAR localspldllW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; +static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; + +/****************************************************************************** + * backend_load [internal] + * + * load and init our backend (the local printprovider: "localspl.dll") + * + * PARAMS + * + * RETURNS + * Success: TRUE + * Failure: FALSE and RPC_S_SERVER_UNAVAILABLE + * + * NOTES + * In windows, the spooler router (spoolss.dll) support multiple + * printprovider (localspl.dll for the local system) + * + */ +static BOOL backend_load(void) +{ + static PRINTPROVIDOR mybackend; + DWORD res; + + if (backend) return TRUE; + + EnterCriticalSection(&backend_cs); + hlocalspl = LoadLibraryW(localspldllW); + if (hlocalspl) { + pInitializePrintProvidor = (void *) GetProcAddress(hlocalspl, "InitializePrintProvidor"); + if (pInitializePrintProvidor) { + + /* native localspl does not clear unused entries */ + memset(&mybackend, 0, sizeof(mybackend)); + res = pInitializePrintProvidor(&mybackend, sizeof(mybackend), NULL); + if (res) { + backend = &mybackend; + LeaveCriticalSection(&backend_cs); + TRACE("backend: %p (%p)\n", backend, hlocalspl); + return TRUE; + } + } + FreeLibrary(hlocalspl); + } + + LeaveCriticalSection(&backend_cs); + + WARN("failed to load the backend: %u\n", GetLastError()); + SetLastError(RPC_S_SERVER_UNAVAILABLE); + return FALSE; +} + +/****************************************************************** + * unload_backend [internal] + * + */ +static void backend_unload(void) +{ + EnterCriticalSection(&backend_cs); + if (backend) { + backend = NULL; + FreeLibrary(hlocalspl); + } + LeaveCriticalSection(&backend_cs); +} + +/****************************************************************************** + * + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: { + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + backend_unload(); + break; + } + } + return TRUE; +} + +/****************************************************************** + * AllocSplStr [SPOOLSS.@] + * + * Create a copy from the String on the Spooler-Heap + * + * PARAMS + * pwstr [I] PTR to the String to copy + * + * RETURNS + * Failure: NULL + * Success: PTR to the copied String + * + */ +LPWSTR WINAPI AllocSplStr(LPCWSTR pwstr) +{ + LPWSTR res = NULL; + DWORD len; + + TRACE("(%s)\n", debugstr_w(pwstr)); + if (!pwstr) return NULL; + + len = (lstrlenW(pwstr) + 1) * sizeof(WCHAR); + res = HeapAlloc(GetProcessHeap(), 0, len); + if (res) lstrcpyW(res, pwstr); + + TRACE("returning %p\n", res); + return res; +} + +/****************************************************************** + * BuildOtherNamesFromMachineName [SPOOLSS.@] + */ +BOOL WINAPI BuildOtherNamesFromMachineName(LPVOID * ptr1, LPVOID * ptr2) +{ + FIXME("(%p, %p) stub\n", ptr1, ptr2); + + *ptr1 = NULL; + *ptr2 = NULL; + return FALSE; +} + +/****************************************************************** + * DllAllocSplMem [SPOOLSS.@] + * + * Allocate cleared memory from the spooler heap + * + * PARAMS + * size [I] Number of bytes to allocate + * + * RETURNS + * Failure: NULL + * Success: PTR to the allocated memory + * + * NOTES + * We use the process heap (Windows use a separate spooler heap) + * + */ +LPVOID WINAPI DllAllocSplMem(DWORD size) +{ + LPVOID res; + + res = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + TRACE("(%d) => %p\n", size, res); + return res; +} + +/****************************************************************** + * DllFreeSplMem [SPOOLSS.@] + * + * Free the allocated spooler memory + * + * PARAMS + * memory [I] PTR to the memory allocated by DllAllocSplMem + * + * RETURNS + * Failure: FALSE + * Success: TRUE + * + * NOTES + * We use the process heap (Windows use a separate spooler heap) + * + */ + +BOOL WINAPI DllFreeSplMem(LPBYTE memory) +{ + TRACE("(%p)\n", memory); + return HeapFree(GetProcessHeap(), 0, memory); +} + +/****************************************************************** + * DllFreeSplStr [SPOOLSS.@] + * + * Free the allocated Spooler-String + * + * PARAMS + * pwstr [I] PTR to the WSTR, allocated by AllocSplStr + * + * RETURNS + * Failure: FALSE + * Success: TRUE + * + */ + +BOOL WINAPI DllFreeSplStr(LPWSTR pwstr) +{ + TRACE("(%s) PTR: %p\n", debugstr_w(pwstr), pwstr); + return HeapFree(GetProcessHeap(), 0, pwstr); +} + + +/****************************************************************** + * ImpersonatePrinterClient [SPOOLSS.@] + */ +BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken) +{ + FIXME("(%p) stub\n", hToken); + return TRUE; +} + +/****************************************************************** + * InitializeRouter [SPOOLSS.@] + */ +BOOL WINAPI InitializeRouter(void) +{ + TRACE("()\n"); + return backend_load(); +} + +/****************************************************************** + * IsLocalCall [SPOOLSS.@] + */ +BOOL WINAPI IsLocalCall(void) +{ + FIXME("() stub\n"); + return TRUE; +} + +/****************************************************************** + * RevertToPrinterSelf [SPOOLSS.@] + */ +HANDLE WINAPI RevertToPrinterSelf(void) +{ + FIXME("() stub\n"); + return (HANDLE) 0xdead0947; +} + +/****************************************************************** + * SplInitializeWinSpoolDrv [SPOOLSS.@] + * + * Dynamic load "winspool.drv" and fill an array with some function-pointer + * + * PARAMS + * table [I] array of function-pointer to fill + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * Native "spoolss.dll" from w2k fill the table with 11 Function-Pointer. + * We implement the XP-Version (The table has only 9 Pointer) + * + */ +BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) +{ + DWORD res; + + TRACE("(%p)\n", table); + + hwinspool = LoadLibraryW(winspooldrvW); + if (!hwinspool) return FALSE; + + table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW"); + table[1] = (void *) GetProcAddress(hwinspool, "ClosePrinter"); + table[2] = (void *) GetProcAddress(hwinspool, "SpoolerDevQueryPrintW"); + table[3] = (void *) GetProcAddress(hwinspool, "SpoolerPrinterEvent"); + table[4] = (void *) GetProcAddress(hwinspool, "DocumentPropertiesW"); + table[5] = (void *) GetProcAddress(hwinspool, (LPSTR) 212); /* LoadPrinterDriver */ + table[6] = (void *) GetProcAddress(hwinspool, (LPSTR) 213); /* RefCntLoadDriver */ + table[7] = (void *) GetProcAddress(hwinspool, (LPSTR) 214); /* RefCntUnloadDriver */ + table[8] = (void *) GetProcAddress(hwinspool, (LPSTR) 215); /* ForceUnloadDriver */ + + for (res = 0; res < 9; res++) { + if (table[res] == NULL) return FALSE; + } + + return TRUE; + +} + +/****************************************************************** + * SplIsUpgrade [SPOOLSS.@] + */ +BOOL WINAPI SplIsUpgrade(void) +{ + FIXME("() stub\n"); + return FALSE; +} + +/****************************************************************** + * SpoolerHasInitialized [SPOOLSS.@] + */ +BOOL WINAPI SpoolerHasInitialized(void) +{ + FIXME("() stub\n"); + return TRUE; +} + +/****************************************************************** + * SpoolerInit [SPOOLSS.@] + */ +BOOL WINAPI SpoolerInit(void) +{ + FIXME("() stub\n"); + return TRUE; +} + +/****************************************************************** + * WaitForSpoolerInitialization [SPOOLSS.@] + */ +BOOL WINAPI WaitForSpoolerInitialization(void) +{ + FIXME("() stub\n"); + return TRUE; +} Propchange: trunk/reactos/dll/win32/spoolss/spoolss_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Sat Jan 3 05:18:58 2009 @@ -355,6 +355,9 @@ <directory name="snmpapi"> <xi:include href="snmpapi/snmpapi.rbuild" /> </directory> +<directory name="spoolss"> + <xi:include href="spoolss/spoolss.rbuild" /> +</directory> <directory name="stdole2.tlb"> <xi:include href="stdole2.tlb/stdole2.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jan 3 05:18:58 2009 @@ -98,6 +98,7 @@ reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync +reactos/dll/win32/spoolss # Autosync reactos/dll/win32/stdole2.tlb # Autosync reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync

1 0

[silverblade] 38526: Removed duplicate (and incorrectly-typed) return statement. Thanks to GedMurphy for spotting this.
by silverblade＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: silverblade Date: Sat Jan 3 05:06:56 2009 New Revision: 38526 URL: http://svn.reactos.org/svn/reactos?rev=38526&view=rev Log: Removed duplicate (and incorrectly-typed) return statement. Thanks to GedMurphy for spotting this. Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sat Jan 3 05:06:56 2009 @@ -91,10 +91,7 @@ Result = ListSoundDevice(DeviceType, (PVOID) PathCopy, &SoundDevice); if ( ! MMSUCCESS(Result) ) - { - return TranslateInternalMmResult(Result); return FALSE; - } /* Set up our function table */ FuncTable.GetCapabilities = GetSoundBlasterDeviceCapabilities;

1 0

[pschweitzer] 38525: Fixed comments... Spotted by Aleksey, what else?
by pschweitzer＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: pschweitzer Date: Sat Jan 3 04:15:30 2009 New Revision: 38525 URL: http://svn.reactos.org/svn/reactos?rev=38525&view=rev Log: Fixed comments... Spotted by Aleksey, what else? Modified: branches/pierre-fsd/ntoskrnl/io/iomgr/device.c Modified: branches/pierre-fsd/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/io/iomgr/de… ============================================================================== --- branches/pierre-fsd/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sat Jan 3 04:15:30 2009 @@ -572,7 +572,7 @@ return STATUS_NO_SUCH_DEVICE; } - /* We define input parameters */ + /* Define input parameters */ Stack.Parameters.QueryDeviceRelations.Type = TargetDeviceRelation; Stack.FileObject = FileObject; @@ -592,7 +592,7 @@ Status = STATUS_NO_SUCH_DEVICE; } - /* Free the DEVICE_RELATIONS structure, we don't need it anymore */ + /* Free the DEVICE_RELATIONS structure, it's not needed it anymore */ ExFreePool(DeviceRelations); }

1 0

[pschweitzer] 38523: - Implemeted Io(p)GetRelatedTargetDevice - Fixed FsRtlNotifyVolumeEvent
by pschweitzer＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: pschweitzer Date: Sat Jan 3 03:35:10 2009 New Revision: 38523 URL: http://svn.reactos.org/svn/reactos?rev=38523&view=rev Log: - Implemeted Io(p)GetRelatedTargetDevice - Fixed FsRtlNotifyVolumeEvent Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c branches/pierre-fsd/ntoskrnl/include/internal/io.h branches/pierre-fsd/ntoskrnl/io/iomgr/device.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/pnp.c [iso-8859-1] Sat Jan 3 03:35:10 2009 @@ -43,8 +43,7 @@ PDEVICE_OBJECT DeviceObject = NULL; TARGET_DEVICE_CUSTOM_NOTIFICATION Notification; - /* FIXME: We should call IoGetRelatedTargetDevice here */ - DeviceObject = IoGetRelatedDeviceObject(FileObject); + IoGetRelatedTargetDevice(FileObject, &DeviceObject); if (DeviceObject) { Notification.Version = 1; Modified: branches/pierre-fsd/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/include/int… ============================================================================== --- branches/pierre-fsd/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Jan 3 03:35:10 2009 @@ -669,6 +669,12 @@ IN BOOLEAN ForceUnload ); +NTSTATUS +NTAPI +IoGetRelatedTargetDevice(IN PFILE_OBJECT FileObject, + OUT PDEVICE_OBJECT *DeviceObject +); + // // IRP Routines // Modified: branches/pierre-fsd/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/io/iomgr/de… ============================================================================== --- branches/pierre-fsd/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sat Jan 3 03:35:10 2009 @@ -552,6 +552,49 @@ } } +NTSTATUS +NTAPI +IopGetRelatedTargetDevice(IN PFILE_OBJECT FileObject, + OUT PDEVICE_NODE *DeviceNode) +{ + NTSTATUS Status; + IO_STACK_LOCATION Stack; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_RELATIONS DeviceRelations; + PDEVICE_OBJECT DeviceObject = NULL; + + ASSERT(FileObject); + + /* Get DeviceObject related to given FileObject */ + DeviceObject = IoGetRelatedDeviceObject(FileObject); + if (!DeviceObject) + { + return STATUS_NO_SUCH_DEVICE; + } + + /* Call the driver to query all the relations (IRP_MJ_PNP) */ + Status = IopInitiatePnpIrp(DeviceObject, &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, &Stack); + if (NT_SUCCESS(Status)) + { + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + ASSERT(DeviceRelations); + ASSERT(DeviceRelations->Count == 1); + + /* We finally get the device node */ + *DeviceNode = (PDEVICE_NODE)((PEXTENDED_DEVOBJ_EXTENSION)DeviceRelations->Objects[0]->DeviceObjectExtension)->DeviceNode; + if (!*DeviceNode) + { + Status = STATUS_NO_SUCH_DEVICE; + } + + /* Free the DEVICE_RELATIONS structure, we don't need it anymore */ + ExFreePool(DeviceRelations); + } + + return Status; +} + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -1205,6 +1248,26 @@ /* Return the DO we found */ return DeviceObject; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoGetRelatedTargetDevice(IN PFILE_OBJECT FileObject, + OUT PDEVICE_OBJECT *DeviceObject) +{ + NTSTATUS Status; + PDEVICE_NODE DeviceNode = NULL; + + /* We call the internal function to do all the work */ + Status = IopGetRelatedTargetDevice(FileObject, &DeviceNode); + if (NT_SUCCESS(Status) && DeviceNode) + { + *DeviceObject = DeviceNode->PhysicalDeviceObject; + } + return Status; } /*

1 0

[mjmartin] 38522: - PeekNamedPipe: Fixed BufferSize calculation, as it is the size of the FILE_PIPE_PEEK_BUFFER struct + the nBufferSize parameter passed from caller.
by mjmartin＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: mjmartin Date: Sat Jan 3 03:24:44 2009 New Revision: 38522 URL: http://svn.reactos.org/svn/reactos?rev=38522&view=rev Log: - PeekNamedPipe: Fixed BufferSize calculation, as it is the size of the FILE_PIPE_PEEK_BUFFER struct + the nBufferSize parameter passed from caller. Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/np… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Sat Jan 3 03:24:44 2009 @@ -1069,7 +1069,7 @@ NTSTATUS Status; /* Calculate the buffer space that we'll need and allocate it */ - BufferSize = nBufferSize + FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[0]); + BufferSize = nBufferSize + sizeof(FILE_PIPE_PEEK_BUFFER); Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize); if (Buffer == NULL) {

1 0

[fireball] 38521: - Add a missing EA buffer validation. - Free an EA buffer if it was allocated and error/exception happened.
by fireball＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: fireball Date: Sat Jan 3 03:18:55 2009 New Revision: 38521 URL: http://svn.reactos.org/svn/reactos?rev=38521&view=rev Log: - Add a missing EA buffer validation. - Free an EA buffer if it was allocated and error/exception happened. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sat Jan 3 03:18:55 2009 @@ -1700,6 +1700,16 @@ } RtlCopyMemory(SystemEaBuffer, EaBuffer, EaLength); + + /* Validate the buffer */ + Status = IoCheckEaBufferValidity(SystemEaBuffer, + EaLength, + &EaErrorOffset); + if (!NT_SUCCESS(Status)) + { + DPRINT1("FIXME: IoCheckEaBufferValidity() failed with " + "Status: %lx\n",Status); + } } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1708,7 +1718,14 @@ } _SEH2_END; - if(!NT_SUCCESS(Status)) return Status; + if(!NT_SUCCESS(Status)) + { + /* Free SystemEaBuffer if needed */ + if (SystemEaBuffer) ExFreePoolWithTag(SystemEaBuffer, TAG_EA); + + /* Return failure status */ + return Status; + } } else {

1 0

[silverblade] 38520: Started implementing WAVEHDR prepare/unprepare/submit routines (they call the function table entries, nothing is on the other end). Also re-worked my previous streaming thread code to operate on a per-device-instance basis and tested the new implementation is capable of dispatching requests properly.
by silverblade＠svn.reactos.org 03 Jan '09

03 Jan '09

Author: silverblade Date: Sat Jan 3 01:15:48 2009 New Revision: 38520 URL: http://svn.reactos.org/svn/reactos?rev=38520&view=rev Log: Started implementing WAVEHDR prepare/unprepare/submit routines (they call the function table entries, nothing is on the other end). Also re-worked my previous streaming thread code to operate on a per-device-instance basis and tested the new implementation is capable of dispatching requests properly. Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c (with props) branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c (with props) Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/silverblade-audio/lib/drivers/sound/mment4/control.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -47,7 +47,7 @@ Capabilities, CapabilitiesSize); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return Result; /* Inject the appropriate device name */ @@ -90,7 +90,7 @@ Result = ListSoundDevice(DeviceType, (PVOID) PathCopy, &SoundDevice); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { return TranslateInternalMmResult(Result); return FALSE; @@ -102,6 +102,9 @@ FuncTable.SetWaveFormat = SetNt4WaveDeviceFormat; FuncTable.Open = OpenNt4SoundDevice; FuncTable.Close = CloseNt4SoundDevice; + FuncTable.PrepareWaveHeader = NULL; + FuncTable.UnprepareWaveHeader = NULL; + FuncTable.SubmitWaveHeader = NULL; SetSoundDeviceFunctionTable(SoundDevice, &FuncTable); @@ -126,14 +129,14 @@ Result = InitEntrypointMutexes(); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return 0L; Result = EnumerateNt4ServiceSoundDevices(L"sndblst", 0, FoundDevice); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { CleanupEntrypointMutexes(); Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -153,6 +153,9 @@ DEFINE_GETCAPS_FUNCTYPE(MMGETMIDIOUTCAPS_FUNC, LPMIDIOUTCAPS); DEFINE_GETCAPS_FUNCTYPE(MMGETMIDIINCAPS_FUNC, LPMIDIINCAPS ); +struct _SOUND_DEVICE; +struct _SOUND_DEVICE_INSTANCE; + typedef MMRESULT (*MMWAVEQUERYFORMATSUPPORT_FUNC)( IN struct _SOUND_DEVICE* Device, IN PWAVEFORMATEX WaveFormat, @@ -170,6 +173,10 @@ typedef MMRESULT (*MMCLOSE_FUNC)( IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, IN PVOID Handle); /* not sure about this */ + +typedef MMRESULT (*MMWAVEHEADER_FUNC)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PWAVEHDR WaveHeader); typedef struct _MMFUNCTION_TABLE { @@ -187,7 +194,36 @@ MMWAVEQUERYFORMATSUPPORT_FUNC QueryWaveFormatSupport; MMWAVESETFORMAT_FUNC SetWaveFormat; + + MMWAVEHEADER_FUNC PrepareWaveHeader; + MMWAVEHEADER_FUNC UnprepareWaveHeader; + MMWAVEHEADER_FUNC SubmitWaveHeader; } MMFUNCTION_TABLE, *PMMFUNCTION_TABLE; + +typedef MMRESULT (*SOUND_THREAD_REQUEST_HANDLER)( + IN struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance, + IN PVOID Parameter); + +typedef struct _SOUND_THREAD +{ + HANDLE Handle; + BOOL Running; + + struct + { + HANDLE Ready; + HANDLE Request; + HANDLE Done; + } Events; + + struct + { + SOUND_THREAD_REQUEST_HANDLER Handler; + struct _SOUND_DEVICE_INSTANCE* SoundDeviceInstance; + PVOID Parameter; + MMRESULT Result; + } Request; +} SOUND_THREAD, *PSOUND_THREAD; typedef struct _SOUND_DEVICE { @@ -205,6 +241,7 @@ struct _SOUND_DEVICE_INSTANCE* Next; struct _SOUND_DEVICE* Device; PVOID Handle; + struct _SOUND_THREAD* Thread; /* Stuff generously donated to us from WinMM */ struct @@ -216,7 +253,6 @@ } WinMM; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; - /* reentrancy.c */ @@ -265,6 +301,15 @@ MmeCloseDevice( IN DWORD PrivateHandle); +#define MmePrepareWaveHeader(private_handle, header) \ + PrepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) + +#define MmeUnprepareWaveHeader(private_handle, header) \ + UnprepareWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) + +#define MmeSubmitWaveHeader(private_handle, header) \ + SubmitWaveHeader((PSOUND_DEVICE_INSTANCE)private_handle, (PWAVEHDR)header) + /* capabilities.c @@ -380,6 +425,26 @@ /* + thread.c +*/ + +MMRESULT +CreateSoundThread( + OUT PSOUND_THREAD* Thread); + +MMRESULT +DestroySoundThread( + IN PSOUND_THREAD Thread); + +MMRESULT +CallSoundThread( + IN PSOUND_THREAD Thread, + IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, + IN PVOID Parameter OPTIONAL); + + +/* utility.c */ @@ -422,6 +487,26 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN LPWAVEFORMATEX Format, IN DWORD FormatSize); + + +/* + wave/header.c +*/ + +MMRESULT +PrepareWaveHeader( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR Header); + +MMRESULT +UnprepareWaveHeader( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR Header); + +MMRESULT +SubmitWaveHeader( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR Header); /* Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -44,14 +44,14 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); /* Obtain the function table */ Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); SND_ASSERT( Result == MMSYSERR_NOERROR ); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); /* Check that the capabilities structure is of a valid size */ Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/deviceinstance.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -158,12 +158,12 @@ Result = AllocateSoundDeviceInstance(SoundDeviceInstance); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); /* Get the "open" routine from the function table, and validate it */ Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { FreeSoundDeviceInstance(*SoundDeviceInstance); return TranslateInternalMmResult(Result); @@ -179,11 +179,20 @@ (*SoundDeviceInstance)->Next = NULL; (*SoundDeviceInstance)->Device = SoundDevice; (*SoundDeviceInstance)->Handle = NULL; - - (*SoundDeviceInstance)->WinMM.Handle = NULL; + (*SoundDeviceInstance)->Thread = NULL; + + (*SoundDeviceInstance)->WinMM.Handle = INVALID_HANDLE_VALUE; (*SoundDeviceInstance)->WinMM.ClientCallback = 0; (*SoundDeviceInstance)->WinMM.ClientCallbackInstanceData = 0; (*SoundDeviceInstance)->WinMM.Flags = 0; + + /* Create the streaming thread (TODO - is this for wave only?) */ + Result = CreateSoundThread(&(*SoundDeviceInstance)->Thread); + if ( ! MMSUCCESS(Result) ) + { + FreeSoundDeviceInstance(*SoundDeviceInstance); + return TranslateInternalMmResult(Result); + } /* Add the instance to the list */ Result = ListSoundDeviceInstance(SoundDevice, *SoundDeviceInstance); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/devicelist.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -145,7 +145,7 @@ Result = AllocateSoundDevice(DeviceType, &NewDevice); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { SND_ERR(L"Failed to allocate SOUND_DEVICE structure\n"); return Result; Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmebuddy.rbuild [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -11,10 +11,12 @@ <file>reentrancy.c</file> <file>utility.c</file> <file>kernel.c</file> + <file>thread.c</file> <directory name="wave"> <file>widMessage.c</file> <file>wodMessage.c</file> <file>format.c</file> + <file>header.c</file> </directory> <directory name="midi"> <file>midMessage.c</file> Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -67,7 +67,7 @@ /* Our parameter checks are done elsewhere */ Result = GetSoundDevice(DeviceType, DeviceId, &SoundDevice); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return Result; return GetSoundDeviceCapabilities(SoundDevice, @@ -97,12 +97,12 @@ Format = OpenParameters->lpFormat; Result = GetSoundDevice(DeviceType, DeviceId, &SoundDevice); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); /* Does this device support the format? */ Result = QueryWaveDeviceFormatSupport(SoundDevice, Format, sizeof(WAVEFORMATEX)); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { SND_ERR(L"Format not supported\n"); return TranslateInternalMmResult(Result); @@ -117,11 +117,11 @@ /* Create a sound device instance and open the sound device */ Result = CreateSoundDeviceInstance(SoundDevice, &SoundDeviceInstance); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); Result = SetWaveDeviceFormat(SoundDeviceInstance, Format, sizeof(WAVEFORMATEX)); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { /* TODO: Destroy sound instance */ return TranslateInternalMmResult(Result); @@ -154,7 +154,6 @@ MmeCloseDevice( IN DWORD PrivateHandle) { - /* FIXME - Where do we call the callback?? */ MMRESULT Result; PSOUND_DEVICE_INSTANCE SoundDeviceInstance; PSOUND_DEVICE SoundDevice; @@ -166,11 +165,11 @@ SoundDeviceInstance = (PSOUND_DEVICE_INSTANCE) PrivateHandle; Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); Result = GetSoundDeviceType(SoundDevice, &DeviceType); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); ReleaseEntrypointMutex(DeviceType); Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -1,0 +1,228 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/thread.c + * + * PURPOSE: Multimedia thread management + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <ntddk.h> +#include <ntddsnd.h> +#include <mmebuddy.h> + +DWORD WINAPI +SoundThreadMain( + IN LPVOID lpParameter OPTIONAL) +{ + PSOUND_THREAD Thread = (PSOUND_THREAD) lpParameter; + + SND_TRACE(L"SoundThread running :)\n"); + + /* Callers will wait for us to be ready */ + Thread->Running = TRUE; + SetEvent(Thread->Events.Ready); + + while ( Thread->Running ) + { + DWORD WaitResult; + + /* Wait for a request, or an I/O completion */ + WaitResult = WaitForSingleObjectEx(Thread->Events.Request, INFINITE, TRUE); + SND_TRACE(L"SoundThread - Came out of waiting\n"); + + if ( WaitResult == WAIT_OBJECT_0 ) + { + SND_TRACE(L"SoundThread - Processing request\n"); + + if ( Thread->Request.Handler ) + { + Thread->Request.Result = Thread->Request.Handler(Thread->Request.SoundDeviceInstance, + Thread->Request.Parameter); + } + else + { + Thread->Request.Result = MMSYSERR_ERROR; + } + + /* Announce completion of the request */ + SetEvent(Thread->Events.Done); + /* Accept new requests */ + SetEvent(Thread->Events.Ready); + } + else if ( WaitResult == WAIT_IO_COMPLETION ) + { + SND_TRACE(L"SoundThread - Processing IO completion\n"); + /* TODO */ + } + else + { + /* This should not happen! */ + SND_ASSERT(FALSE); + } + + } + + return 0; +} + +MMRESULT +CreateSoundThreadEvents( + OUT HANDLE* ReadyEvent, + OUT HANDLE* RequestEvent, + OUT HANDLE* DoneEvent) +{ + BOOL ok; + + VALIDATE_MMSYS_PARAMETER( ReadyEvent ); + VALIDATE_MMSYS_PARAMETER( RequestEvent ); + VALIDATE_MMSYS_PARAMETER( DoneEvent ); + + SND_TRACE(L"Creating thread events\n"); + + /* Initialise these so we can identify them upon failure */ + *ReadyEvent = *RequestEvent = *DoneEvent = INVALID_HANDLE_VALUE; + + ok = (*ReadyEvent = CreateEvent(NULL, FALSE, FALSE, NULL)) != INVALID_HANDLE_VALUE; + ok &= (*RequestEvent = CreateEvent(NULL, FALSE, FALSE, NULL)) != INVALID_HANDLE_VALUE; + ok &= (*DoneEvent = CreateEvent(NULL, FALSE, FALSE, NULL)) != INVALID_HANDLE_VALUE; + + /* If something went wrong, clean up */ + if ( ! ok ) + { + if ( *ReadyEvent != INVALID_HANDLE_VALUE ) + CloseHandle(*ReadyEvent); + + if ( *RequestEvent != INVALID_HANDLE_VALUE ) + CloseHandle(*RequestEvent); + + if ( *DoneEvent != INVALID_HANDLE_VALUE ) + CloseHandle(*DoneEvent); + + return MMSYSERR_NOMEM; + } + + return MMSYSERR_NOERROR; +} + +MMRESULT +DestroySoundThreadEvents( + IN HANDLE ReadyEvent, + IN HANDLE RequestEvent, + IN HANDLE DoneEvent) +{ + VALIDATE_MMSYS_PARAMETER( ReadyEvent != INVALID_HANDLE_VALUE ); + VALIDATE_MMSYS_PARAMETER( RequestEvent != INVALID_HANDLE_VALUE ); + VALIDATE_MMSYS_PARAMETER( DoneEvent != INVALID_HANDLE_VALUE ); + + SND_TRACE(L"Destroying thread events\n"); + + CloseHandle(ReadyEvent); + CloseHandle(RequestEvent); + CloseHandle(DoneEvent); + + return MMSYSERR_NOERROR; +} + +MMRESULT +CreateSoundThread( + OUT PSOUND_THREAD* Thread) +{ + MMRESULT Result; + PSOUND_THREAD NewThread; + + VALIDATE_MMSYS_PARAMETER( Thread ); + + NewThread = AllocateStruct(SOUND_THREAD); + if ( ! NewThread ) + return MMSYSERR_NOMEM; + + /* Prepare the events we'll be using to sync. everything */ + Result = CreateSoundThreadEvents(&NewThread->Events.Ready, + &NewThread->Events.Request, + &NewThread->Events.Done); + + if ( ! MMSUCCESS(Result) ) + { + FreeMemory(NewThread); + return TranslateInternalMmResult(Result); + } + + SND_TRACE(L"Creating a sound thread\n"); + NewThread->Handle = CreateThread(NULL, + 0, + &SoundThreadMain, + (LPVOID) NewThread, + CREATE_SUSPENDED, + NULL); + + /* Something went wrong, bail out! */ + if ( NewThread->Handle == INVALID_HANDLE_VALUE ) + { + SND_ERR(L"Sound thread creation failed!\n"); + DestroySoundThreadEvents(NewThread->Events.Ready, + NewThread->Events.Request, + NewThread->Events.Done); + + FreeMemory(NewThread); + + return Win32ErrorToMmResult(GetLastError()); + } + + /* Wake the thread up */ + if ( ResumeThread(NewThread->Handle) == -1 ) + { + CloseHandle(NewThread->Handle); + DestroySoundThreadEvents(NewThread->Events.Ready, + NewThread->Events.Request, + NewThread->Events.Done); + + FreeMemory(NewThread); + return Win32ErrorToMmResult(GetLastError()); + } + + /* If all is well we can now give the thread to the caller */ + *Thread = NewThread; + return MMSYSERR_NOERROR; +} + +MMRESULT +DestroySoundThread( + IN PSOUND_THREAD Thread) +{ + /* TODO: Implement me! */ + return MMSYSERR_NOTSUPPORTED; +} + +MMRESULT +CallSoundThread( + IN PSOUND_THREAD Thread, + IN SOUND_THREAD_REQUEST_HANDLER RequestHandler, + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance OPTIONAL, + IN PVOID Parameter OPTIONAL) +{ + VALIDATE_MMSYS_PARAMETER( Thread ); + VALIDATE_MMSYS_PARAMETER( RequestHandler ); + + SND_TRACE(L"Waiting for READY event\n"); + WaitForSingleObject(Thread->Events.Ready, INFINITE); + + Thread->Request.Result = MMSYSERR_NOTSUPPORTED; + Thread->Request.Handler = RequestHandler; + Thread->Request.SoundDeviceInstance = SoundDeviceInstance; + Thread->Request.Parameter = Parameter; + + /* Notify the thread it has work to do */ + SND_TRACE(L"Setting REQUEST event\n"); + SetEvent(Thread->Events.Request); + + /* Wait for the work to be done */ + SND_TRACE(L"Waiting for DONE event\n"); + WaitForSingleObject(Thread->Events.Done, INFINITE); + + return Thread->Request.Result; +} Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/format.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -41,7 +41,7 @@ Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); SND_ASSERT( Result == MMSYSERR_NOERROR ); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); if ( ! FunctionTable->QueryWaveFormatSupport ) @@ -68,7 +68,7 @@ VALIDATE_MMSYS_PARAMETER( FormatSize >= sizeof(WAVEFORMATEX) ); Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); Result = GetSoundDeviceType(SoundDevice, &DeviceType); @@ -81,7 +81,7 @@ Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); SND_ASSERT( Result == MMSYSERR_NOERROR ); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); if ( ! FunctionTable->SetWaveFormat ) Added: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c (added) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -1,0 +1,101 @@ +/* + * PROJECT: ReactOS Sound System "MME Buddy" Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/sound/mmebuddy/header.c + * + * PURPOSE: Wave header preparation routines + * + * PROGRAMMERS: Andrew Greenwood (silverblade(a)reactos.org) +*/ + +#include <windows.h> +#include <mmsystem.h> +#include <mmddk.h> +#include <ntddk.h> +#include <ntddsnd.h> +#include <mmebuddy.h> + +MMRESULT +PrepareWaveHeader( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR Header) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE FunctionTable; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( Header ); + + SND_TRACE(L"Preparing wave header\n"); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + if ( ! FunctionTable->PrepareWaveHeader ) + return MMSYSERR_NOTSUPPORTED; + + return FunctionTable->PrepareWaveHeader(SoundDeviceInstance, Header); +} + +MMRESULT +UnprepareWaveHeader( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR Header) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE FunctionTable; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( Header ); + + SND_TRACE(L"Un-preparing wave header\n"); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + if ( ! FunctionTable->UnprepareWaveHeader ) + return MMSYSERR_NOTSUPPORTED; + + return FunctionTable->UnprepareWaveHeader(SoundDeviceInstance, Header); +} + +MMRESULT +SubmitWaveHeader( + IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, + IN PWAVEHDR Header) +{ + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE FunctionTable; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + VALIDATE_MMSYS_PARAMETER( Header ); + + SND_TRACE(L"Submitting wave header\n"); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, &SoundDevice); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + Result = GetSoundDeviceFunctionTable(SoundDevice, &FunctionTable); + if ( ! MMSUCCESS(Result) ) + return TranslateInternalMmResult(Result); + + if ( ! FunctionTable->SubmitWaveHeader ) + return MMSYSERR_NOTSUPPORTED; + + return FunctionTable->SubmitWaveHeader(SoundDeviceInstance, Header); +} + Propchange: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/header.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -16,6 +16,15 @@ #include <ntddsnd.h> #include <mmebuddy.h> + +#if 0 +MMRESULT HelloWorld(PSOUND_DEVICE_INSTANCE Instance, PVOID String) +{ + PWSTR WString = (PWSTR) String; + SND_TRACE(WString); + return MMSYSERR_NOTSUPPORTED; +} +#endif /* Standard MME driver entry-point for messages relating to wave audio @@ -71,11 +80,32 @@ case WODM_PREPARE : { - /*Result = MmeWavePrepare(*/ + /* TODO: Do we need to pass 2nd parameter? */ + Result = MmePrepareWaveHeader(PrivateHandle, Parameter1); + break; } case WODM_UNPREPARE : { + Result = MmeUnprepareWaveHeader(PrivateHandle, Parameter1); + break; + } + + case WODM_WRITE : + { + Result = MmeSubmitWaveHeader(PrivateHandle, Parameter1); + break; + } + + case WODM_GETPOS : + { +#if 0 + /* Hacky code to test the threading */ + PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)PrivateHandle; + CallSoundThread(Instance->Thread, HelloWorld, Instance, L"Hello World!"); + CallSoundThread(Instance->Thread, HelloWorld, Instance, L"Hello Universe!"); +#endif + break; } } Modified: branches/silverblade-audio/lib/drivers/sound/mment4/control.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mment4/control.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mment4/control.c [iso-8859-1] Sat Jan 3 01:15:48 2009 @@ -32,7 +32,7 @@ VALIDATE_MMSYS_PARAMETER( Handle ); Result = GetSoundDeviceIdentifier(SoundDevice, (PVOID*) &Path); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { SND_ERR(L"Unable to get sound device path"); return TranslateInternalMmResult(Result); @@ -99,7 +99,7 @@ Result = GetSoundDeviceType(SoundDevice, &DeviceType); SND_ASSERT( Result == MMSYSERR_NOERROR ); - if ( Result != MMSYSERR_NOERROR ); + if ( ! MMSUCCESS(Result) ); return TranslateInternalMmResult(Result); /* Choose the appropriate IOCTL */ @@ -120,7 +120,7 @@ /* Get the capabilities information from the driver */ Result = OpenNt4KernelSoundDevice(SoundDevice, TRUE, &DeviceHandle); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { SND_ERR(L"Failed to open device"); return TranslateInternalMmResult(Result); @@ -136,7 +136,7 @@ CloseKernelSoundDevice(DeviceHandle); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { SND_ERR(L"Retrieval of capabilities information failed\n"); Result = TranslateInternalMmResult(Result); @@ -170,7 +170,7 @@ FALSE, &Handle); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { SND_ERR(L"Unable to open kernel sound device\n"); return TranslateInternalMmResult(Result); @@ -184,7 +184,7 @@ 0, NULL); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) { SND_ERR(L"Sync overlapped I/O failed - MMSYS_ERROR %d\n", Result); Result = TranslateInternalMmResult(Result); @@ -210,7 +210,7 @@ Result = GetSoundDeviceInstanceHandle(SoundDeviceInstance, &Handle); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); SND_TRACE(L"Setting wave device format on handle %x\n", Handle); @@ -223,7 +223,7 @@ 0, NULL); - if ( Result != MMSYSERR_NOERROR ) + if ( ! MMSUCCESS(Result) ) return TranslateInternalMmResult(Result); return MMSYSERR_NOERROR;

1 0

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 January 2009