Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 429: Upgrade phpBB to 3.0.5
by cfinck＠svn.reactos.org 10 Jun '09

10 Jun '09

1 0

[hyperion] 41377: Fix Visual C++ build
by hyperion＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: hyperion Date: Thu Jun 11 00:09:03 2009 New Revision: 41377 URL: http://svn.reactos.org/svn/reactos?rev=41377&view=rev Log: Fix Visual C++ build Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Thu Jun 11 00:09:03 2009 @@ -477,14 +477,14 @@ fprintf ( fMakefile, "PROJECT_ASFLAGS += -pipe\n" ); } - // Because RosBE gcc is built to suck - fputs ( "BUILTIN_HOST_CINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); - fputs ( "BUILTIN_HOST_CPPINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); - fputs ( "BUILTIN_HOST_CXXINCLUDES+= $(HOST_CPPFLAGS)\n", fMakefile ); - // Would be nice to have our own C++ runtime fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); } + + // Because RosBE gcc is built to suck + fputs ( "BUILTIN_HOST_CINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); + fputs ( "BUILTIN_HOST_CPPINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); + fputs ( "BUILTIN_HOST_CXXINCLUDES+= $(HOST_CPPFLAGS)\n", fMakefile ); MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data ); MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data );

1 0

[fireball] 41376: - Implement ProcessPriorityClass case for NtSetInformationProcess(). Based on Dmitry Chapyshev's work and testing.
by fireball＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: fireball Date: Wed Jun 10 23:31:54 2009 New Revision: 41376 URL: http://svn.reactos.org/svn/reactos?rev=41376&view=rev Log: - Implement ProcessPriorityClass case for NtSetInformationProcess(). Based on Dmitry Chapyshev's work and testing. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Jun 10 23:31:54 2009 @@ -739,6 +739,7 @@ HANDLE PortHandle = NULL; HANDLE TokenHandle = NULL; PROCESS_SESSION_INFORMATION SessionInfo = {0}; + PROCESS_PRIORITY_CLASS PriorityClass = {0}; PVOID ExceptionPort; PAGED_CODE(); @@ -924,8 +925,53 @@ //PsUnlockProcess(Process); break; - /* Priority class: HACK! */ case ProcessPriorityClass: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(PROCESS_PRIORITY_CLASS)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for capture */ + _SEH2_TRY + { + /* Capture the caller's buffer */ + PriorityClass = *(PPROCESS_PRIORITY_CLASS)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) break; + + /* Check for invalid PriorityClass value */ + if (PriorityClass.PriorityClass > PROCESS_PRIORITY_CLASS_ABOVE_NORMAL) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* TODO: Check privileges */ + + /* Check if we have a job */ + if (Process->Job) + { + DPRINT1("Jobs not yet supported\n"); + } + + /* Set process priority class */ + Process->PriorityClass = PriorityClass.PriorityClass; + + /* Set process priority mode (foreground or background) */ + PsSetProcessPriorityByClass(Process, + !PriorityClass.Foreground ? PsProcessPriorityBackground : + PsProcessPriorityForeground); + + Status = STATUS_SUCCESS; break; /* We currently don't implement any of these */

1 0

[fireball] 41375: - Add PsSetProcessPriorityByClass() declaration to NDK.
by fireball＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: fireball Date: Wed Jun 10 23:24:38 2009 New Revision: 41375 URL: http://svn.reactos.org/svn/reactos?rev=41375&view=rev Log: - Add PsSetProcessPriorityByClass() declaration to NDK. Modified: trunk/reactos/include/ndk/psfuncs.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Wed Jun 10 23:24:38 2009 @@ -148,6 +148,13 @@ NTAPI PsIsSystemProcess( IN PEPROCESS Process +); + +VOID +NTAPI +PsSetProcessPriorityByClass( + IN PEPROCESS Process, + IN PSPROCESSPRIORITYMODE Type ); //

1 0

[hyperion] 41374: modified ReactOS-generic.rbuild modified ReactOS-i386.rbuild modified tools/rbuild/backend/mingw/mingw.cpp Don't feed GCC options in MSC Minor detection fixes Support for the Microsoft compiler is now fully functional: now get off your grotesquely fat asses and start fixing code so that it compiles with it TODO: make it fully functional for real (PCH, full dependencies); Microsoft linker support
by hyperion＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: hyperion Date: Wed Jun 10 23:12:18 2009 New Revision: 41374 URL: http://svn.reactos.org/svn/reactos?rev=41374&view=rev Log: modified ReactOS-generic.rbuild modified ReactOS-i386.rbuild modified tools/rbuild/backend/mingw/mingw.cpp Don't feed GCC options in MSC Minor detection fixes Support for the Microsoft compiler is now fully functional: now get off your grotesquely fat asses and start fixing code so that it compiles with it TODO: make it fully functional for real (PCH, full dependencies); Microsoft linker support Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Wed Jun 10 23:12:18 2009 @@ -121,5 +121,5 @@ <xi:include href="tools/tools.rbuild" /> </directory> - <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> + <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> </group> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=41… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Wed Jun 10 23:12:18 2009 @@ -19,30 +19,64 @@ <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> <property name="PLATFORM" value="PC"/> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - </if> + <group compilerset="gcc"> + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + </if> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - <compilerflag>-fno-strict-aliasing</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - <compilerflag>-Wno-multichar</compilerflag> -  - <linkerflag>-disable-stdcall-fixup</linkerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + <compilerflag>-fno-strict-aliasing</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wno-multichar</compilerflag> +  + </group> + + <group compilerset="msc"> + <if property="OPTIMIZE" value="1"> + <compilerflag>/O1</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>/O2</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>/Ox /GS-</compilerflag> + <compilerflag>/Ot</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>/Ox /GS-</compilerflag> + <compilerflag>/Os</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>/Ox /GS-</compilerflag> + <compilerflag>/Os</compilerflag> + <compilerflag>/Ob2</compilerflag> + <compilerflag>/GF</compilerflag> + <compilerflag>/Gy</compilerflag> + </if> + + <compilerflag>/GS-</compilerflag> + <compilerflag>/Zl</compilerflag> + <compilerflag>/Zi</compilerflag> + <compilerflag>/Wall</compilerflag> + </group> + + <group linkerset="ld"> + <linkerflag>-disable-stdcall-fixup</linkerflag> + </group> </project> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Jun 10 23:12:18 2009 @@ -453,38 +453,41 @@ GenerateGlobalProperties ( "=", ProjectNode.non_if_data ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" ); - fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" ); - fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "ifneq ($(TUNE),)\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -mtune=$(TUNE)\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" ); - fprintf ( fMakefile, "endif\n" ); - - fprintf ( fMakefile, "PROJECT_CFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); - fprintf ( fMakefile, "PROJECT_ASFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); + if ( ProjectNode.configuration.Compiler == GnuGcc ) + { + fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" ); + fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "endif\n" ); + fprintf ( fMakefile, "ifneq ($(TUNE),)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -mtune=$(TUNE)\n" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" ); + fprintf ( fMakefile, "endif\n" ); + + fprintf ( fMakefile, "PROJECT_CFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); + fprintf ( fMakefile, "PROJECT_ASFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); + + if ( usePipe ) + { + fprintf ( fMakefile, "PROJECT_CFLAGS += -pipe\n" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS += -pipe\n" ); + fprintf ( fMakefile, "PROJECT_ASFLAGS += -pipe\n" ); + } + + // Because RosBE gcc is built to suck + fputs ( "BUILTIN_HOST_CINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); + fputs ( "BUILTIN_HOST_CPPINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); + fputs ( "BUILTIN_HOST_CXXINCLUDES+= $(HOST_CPPFLAGS)\n", fMakefile ); + + // Would be nice to have our own C++ runtime + fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); + } MingwModuleHandler::GenerateParameters ( "PROJECT", "+=", ProjectNode.non_if_data ); MingwModuleHandler::GenerateParameters ( "PROJECT_HOST", "+=", ProjectNode.host_non_if_data ); - - if ( usePipe ) - { - fprintf ( fMakefile, "PROJECT_CFLAGS += -pipe\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -pipe\n" ); - fprintf ( fMakefile, "PROJECT_ASFLAGS += -pipe\n" ); - } - - // Because RosBE gcc is built to suck - fputs ( "BUILTIN_HOST_CINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); - fputs ( "BUILTIN_HOST_CPPINCLUDES+= $(HOST_CFLAGS)\n", fMakefile ); - fputs ( "BUILTIN_HOST_CXXINCLUDES+= $(HOST_CPPFLAGS)\n", fMakefile ); - - // Would be nice to have our own C++ runtime - fputs ( "BUILTIN_CXXINCLUDES+= $(TARGET_CPPFLAGS)\n", fMakefile ); // TODO: linker flags fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); @@ -771,6 +774,7 @@ } else if ( ProjectNode.configuration.Compiler == MicrosoftC ) { + compilerCommand = "cl"; detectedCompiler = DetectMicrosoftCompiler ( compilerVersion, mscPath ); supportedCompiler = true; // TODO } @@ -1015,6 +1019,7 @@ } else if ( ProjectNode.configuration.Linker == MicrosoftLink ) { + compilerCommand = "link"; detectedBinutils = DetectMicrosoftLinker ( binutilsVersion, mslinkPath ); supportedBinutils = true; // TODO } @@ -1094,6 +1099,8 @@ else printf ( "not detected\n" ); } + else + usePipe = false; } void

1 0

[dchapyshev] 41373: - Fix Firefox 1.0/1.5 minimisation to taskbar Patch by Mikhail Denisenko (denisenkom@gmail.com) See issue #2451 for more details.
by dchapyshev＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: dchapyshev Date: Wed Jun 10 22:44:31 2009 New Revision: 41373 URL: http://svn.reactos.org/svn/reactos?rev=41373&view=rev Log: - Fix Firefox 1.0/1.5 minimisation to taskbar Patch by Mikhail Denisenko (denisenkom(a)gmail.com) See issue #2451 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jun 10 22:44:31 2009 @@ -3997,14 +3997,15 @@ { Safepl.showCmd = SW_HIDE; } - else if (0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) || - 0 != (Wnd->Style & WS_MAXIMIZE)) - { - Safepl.showCmd = SW_MAXIMIZE; + else if ((0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) || + 0 != (Wnd->Style & WS_MAXIMIZE)) && + 0 == (Wnd->Style & WS_MINIMIZE)) + { + Safepl.showCmd = SW_SHOWMAXIMIZED; } else if (0 != (Wnd->Style & WS_MINIMIZE)) { - Safepl.showCmd = SW_MINIMIZE; + Safepl.showCmd = SW_SHOWMINIMIZED; } else if (0 != (Wnd->Style & WS_VISIBLE)) {

1 0

[hyperion] 41372: Fix the cheerleader, fix the build
by hyperion＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: hyperion Date: Wed Jun 10 22:41:50 2009 New Revision: 41372 URL: http://svn.reactos.org/svn/reactos?rev=41372&view=rev Log: Fix the cheerleader, fix the build Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Wed Jun 10 22:41:50 2009 @@ -15,7 +15,7 @@ #(module, source, dependencies, cflags, output) define RBUILD_DEPENDS -$(5): $(2) $(3) | ${call RBUILD_dir,$(2)} +$(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_DEPENDS) $${gcc} -xc -MF $$@ $(4) -M -MP -MT $$@ $$< @@ -24,7 +24,7 @@ #(module, source, dependencies, cflags, output) define RBUILD_CXX_DEPENDS -$(5): $(2) $(3) | ${call RBUILD_dir,$(2)} +$(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_DEPENDS) $${gpp} -MF $$@ $(4) -M -MP -MT $$@ $$< @@ -33,7 +33,7 @@ #(module, source, dependencies, cflags, output) define RBUILD_CPP -$(5): $(2) $(3) | ${call RBUILD_dir,$(2)} +$(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) $${gcc} -xc -E $(4) $$< > $$@ @@ -42,7 +42,7 @@ #(module, source, dependencies, cflags, output) define RBUILD_CXX_CPP -$(5): $(2) $(3) | ${call RBUILD_dir,$(2)} +$(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) $${gpp} -E $(4) $$< > $$@ Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] Wed Jun 10 22:41:50 2009 @@ -26,7 +26,7 @@ #(module, source, dependencies, cflags, output) define RBUILD_CL_CPP -$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(2)} +$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) $${cl} /E $(4) $$< > $$@

1 0

[janderwald] 41371: - Check in wdmaud if a pin with the specified filter id and pin id has been opened - Partly rewrite SysAudio as it is no longer required to store client specific information per connection since wdmaud just opens one connection - Verify all audio handles at incoming irp
by janderwald＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: janderwald Date: Wed Jun 10 22:28:15 2009 New Revision: 41371 URL: http://svn.reactos.org/svn/reactos?rev=41371&view=rev Log: - Check in wdmaud if a pin with the specified filter id and pin id has been opened - Partly rewrite SysAudio as it is no longer required to store client specific information per connection since wdmaud just opens one connection - Verify all audio handles at incoming irp Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Wed Jun 10 22:28:15 2009 @@ -165,6 +165,17 @@ return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } + /* close pin handle which uses same virtual audio device id and pin id */ + for(Index = 0; Index < ClientInfo->NumPins; Index++) + { + if (ClientInfo->hPins[Index].FilterId == FilterId && ClientInfo->hPins[Index].PinId == PinId && ClientInfo->hPins[Index].Handle) + { + ZwClose(ClientInfo->hPins[Index].Handle); + ClientInfo->hPins[Index].Handle = NULL; + } + } + + Length = sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); InstanceInfo = ExAllocatePool(NonPagedPool, Length); if (!InstanceInfo) @@ -272,6 +283,8 @@ ClientInfo->hPins = Handels; ClientInfo->hPins[ClientInfo->NumPins].Handle = PinHandle; ClientInfo->hPins[ClientInfo->NumPins].Type = DeviceInfo->DeviceType; + ClientInfo->hPins[ClientInfo->NumPins].FilterId = FilterId; + ClientInfo->hPins[ClientInfo->NumPins].PinId = PinId; ClientInfo->NumPins++; } DeviceInfo->hDevice = PinHandle; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Wed Jun 10 22:28:15 2009 @@ -16,6 +16,8 @@ { HANDLE Handle; SOUND_DEVICE_TYPE Type; + ULONG FilterId; + ULONG PinId; }WDMAUD_HANDLE, *PWDMAUD_HANDLE; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Wed Jun 10 22:28:15 2009 @@ -169,7 +169,6 @@ IN ULONG DeviceNumber, PSYSAUDIODEVEXT DeviceExtension) { - PSYSAUDIO_CLIENT ClientInfo; PKSAUDIO_SUBDEVICE_ENTRY Entry; PKSOBJECT_CREATE_ITEM CreateItem; @@ -178,19 +177,6 @@ ASSERT(CreateItem); if (DeviceNumber >= DeviceExtension->NumberOfKsAudioDevices) - { - /* invalid device index */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - /* get client context */ - ClientInfo = (PSYSAUDIO_CLIENT)CreateItem->Context; - - /* sanity check */ - ASSERT(ClientInfo); - - /* check for valid device index */ - if (DeviceNumber >= ClientInfo->NumDevices) { /* invalid device index */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); @@ -249,8 +235,7 @@ IN KSPIN_CONNECT *PinConnect, IN PKSDATAFORMAT InputFormat, IN PKSDATAFORMAT OutputFormat, - OUT PHANDLE MixerPinHandle, - OUT PFILE_OBJECT *MixerFileObject) + OUT PHANDLE MixerPinHandle) { NTSTATUS Status; HANDLE PinHandle; @@ -281,8 +266,9 @@ ZwClose(PinHandle); } + ObDereferenceObject(FileObject); + *MixerPinHandle = PinHandle; - *MixerFileObject = FileObject; return Status; } @@ -294,11 +280,8 @@ IN PVOID Context) { NTSTATUS Status; - ULONG NumHandels; HANDLE RealPinHandle = NULL, VirtualPinHandle = NULL, Filter; - PFILE_OBJECT RealFileObject = NULL, VirtualFileObject = NULL; - PSYSAUDIO_CLIENT AudioClient; - PSYSAUDIO_PIN_HANDLE ClientPinHandle; + PFILE_OBJECT VirtualFileObject = NULL; PKSDATAFORMAT_WAVEFORMATEX InputFormat; PKSDATAFORMAT_WAVEFORMATEX OutputFormat = NULL; PKSPIN_CONNECT MixerPinConnect = NULL; @@ -374,28 +357,12 @@ } } - /* get pin file object */ - Status = ObReferenceObjectByHandle(RealPinHandle, - GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get file object with %x\n", Status); - goto cleanup; - } - - if (WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount == 1) - { - /* store the pin handle there if the pin can only be instantiated once*/ - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle = RealPinHandle; - } + ASSERT(WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount); WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 0; WorkerContext->DispatchContext->Handle = RealPinHandle; WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; WorkerContext->DispatchContext->AudioEntry = WorkerContext->Entry; - WorkerContext->DispatchContext->FileObject = RealFileObject; /* Do we need to transform the audio stream */ if (OutputFormat != NULL) @@ -405,8 +372,7 @@ MixerPinConnect, (PKSDATAFORMAT)InputFormat, (PKSDATAFORMAT)OutputFormat, - &WorkerContext->DispatchContext->hMixerPin, - &WorkerContext->DispatchContext->MixerFileObject); + &WorkerContext->DispatchContext->hMixerPin); if (!NT_SUCCESS(Status)) @@ -438,60 +404,20 @@ goto cleanup; } - ASSERT(WorkerContext->AudioClient); - ASSERT(WorkerContext->AudioClient->NumDevices > 0); - ASSERT(WorkerContext->AudioClient->Devs != NULL); ASSERT(WorkerContext->Entry->Pins != NULL); - - AudioClient = WorkerContext->AudioClient; - NumHandels = AudioClient->Devs[AudioClient->NumDevices -1].ClientHandlesCount; - - ClientPinHandle = ExAllocatePool(NonPagedPool, sizeof(SYSAUDIO_PIN_HANDLE) * (NumHandels+1)); - if (ClientPinHandle) - { - if (NumHandels) - { - ASSERT(AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles != NULL); - RtlMoveMemory(ClientPinHandle, - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles, - sizeof(SYSAUDIO_PIN_HANDLE) * NumHandels); - ExFreePool(AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles); - } - - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles = ClientPinHandle; - - /// if the pin can be instantiated more than once - /// then store the real pin handle in the client context - /// otherwise just the pin id of the available pin - if (WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount > 1) - { - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].bHandle = TRUE; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].hPin = RealPinHandle; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].PinId = WorkerContext->PinConnect->PinId; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].hMixer = WorkerContext->DispatchContext->hMixerPin; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].DispatchContext = WorkerContext->DispatchContext; - } - else - { - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].bHandle = FALSE; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].hPin = VirtualPinHandle; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].PinId = WorkerContext->PinConnect->PinId; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].hMixer = WorkerContext->DispatchContext->hMixerPin; - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandles[NumHandels].DispatchContext = WorkerContext->DispatchContext; - } - - /// increase reference count - AudioClient->Devs[AudioClient->NumDevices -1].ClientHandlesCount++; - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References++; - } - else - { - /* no memory */ - goto cleanup; - } + ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); + + /* increment reference count */ + WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References++; + + /* store the pin handle there if the pin can only be instantiated once*/ + WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle = VirtualPinHandle; /* store pin context */ VirtualFileObject->FsContext2 = (PVOID)WorkerContext->DispatchContext; + + /* release virtual file object */ + ObDereferenceObject(VirtualFileObject); DPRINT("Successfully created virtual pin %p\n", VirtualPinHandle); *((PHANDLE)WorkerContext->Irp->UserBuffer) = VirtualPinHandle; @@ -502,14 +428,8 @@ return; cleanup: - if (RealFileObject) - ObDereferenceObject(RealFileObject); - if (RealPinHandle) ZwClose(RealPinHandle); - - if (WorkerContext->DispatchContext->MixerFileObject) - ObDereferenceObject(WorkerContext->DispatchContext->MixerFileObject); if (WorkerContext->DispatchContext->hMixerPin) ZwClose(WorkerContext->DispatchContext->hMixerPin); @@ -767,51 +687,6 @@ } -VOID -CloseExistingPin( - PSYSAUDIO_CLIENT ClientInfo, - PSYSAUDIO_INSTANCE_INFO InstanceInfo, - PKSPIN_CONNECT PinConnect) -{ - ULONG Index, SubIndex; - PDISPATCH_CONTEXT DispatchContext; - - /* scan the clientinfo if the client has already opened device with the specified pin */ - for (Index = 0; Index < ClientInfo->NumDevices; Index++) - { - if (ClientInfo->Devs[Index].DeviceId == InstanceInfo->DeviceNumber) - { - if (ClientInfo->Devs[Index].ClientHandlesCount) - { - for(SubIndex = 0; SubIndex < ClientInfo->Devs[Index].ClientHandlesCount; SubIndex++) - { - if (ClientInfo->Devs[Index].ClientHandles[SubIndex].PinId == PinConnect->PinId) - { - /* the pin has been already opened by the client, re-use it */ - ASSERT(ClientInfo->Devs[Index].ClientHandles[SubIndex].bHandle == FALSE); - - DispatchContext = ClientInfo->Devs[Index].ClientHandles[SubIndex].DispatchContext; - - if (DispatchContext->MixerFileObject) - ObDereferenceObject(DispatchContext->MixerFileObject); - - if (DispatchContext->hMixerPin) - ZwClose(DispatchContext->hMixerPin); - - if (DispatchContext->FileObject) - ObDereferenceObject(DispatchContext->FileObject); - - if (DispatchContext->Handle) - ZwClose(DispatchContext->Handle); - ClientInfo->Devs[Index].ClientHandles[SubIndex].PinId = (ULONG)-1; - } - } - } - } - } - -} - NTSTATUS HandleSysAudioFilterPinCreation( PIRP Irp, @@ -824,7 +699,6 @@ KSPIN_CONNECT * PinConnect; PIO_STACK_LOCATION IoStack; PSYSAUDIO_INSTANCE_INFO InstanceInfo; - PSYSAUDIO_CLIENT ClientInfo; PKSOBJECT_CREATE_ITEM CreateItem; NTSTATUS Status; KSPIN_CINSTANCES PinInstances; @@ -853,14 +727,6 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - /* get client context */ - ClientInfo = (PSYSAUDIO_CLIENT)CreateItem->Context; - if (!ClientInfo || !ClientInfo->NumDevices || !ClientInfo->Devs) - { - /* we have a problem */ - KeBugCheckEx(0, 0, 0, 0, 0); - } - /* get sysaudio entry */ Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, InstanceInfo->DeviceNumber); if (!Entry) @@ -884,9 +750,6 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - /* close existing pin first */ - CloseExistingPin(ClientInfo, InstanceInfo, PinConnect); - /* query instance count */ Status = GetPinInstanceCount(Entry, &PinInstances, PinConnect); if (!NT_SUCCESS(Status)) @@ -905,14 +768,11 @@ { /* pin already exists */ ASSERT(Entry->Pins[PinConnect->PinId].PinHandle != NULL); - if (Entry->Pins[PinConnect->PinId].References) - { - /* FIXME need ksmixer */ - DPRINT1("Device %u Pin %u References %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId, Entry->Pins[PinConnect->PinId].References); - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - } - + ASSERT(Entry->Pins[PinConnect->PinId].References); + + DPRINT1("Device %u Pin %u References %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId, Entry->Pins[PinConnect->PinId].References); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } /* create dispatch pin context */ DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); if (!DispatchContext) @@ -956,7 +816,6 @@ WorkerContext->Entry = Entry; WorkerContext->Irp = Irp; WorkerContext->PinConnect = PinConnect; - WorkerContext->AudioClient = ClientInfo; WorkerContext->DeviceExtension = DeviceExtension; WorkerContext->WorkItem = WorkItem; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Wed Jun 10 22:28:15 2009 @@ -73,79 +73,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PSYSAUDIO_CLIENT Client; - PKSAUDIO_SUBDEVICE_ENTRY Entry; - PIO_STACK_LOCATION IoStatus; - ULONG Index, SubIndex; - PSYSAUDIODEVEXT DeviceExtension; - PDISPATCH_CONTEXT DispatchContext; - - - IoStatus = IoGetCurrentIrpStackLocation(Irp); - - Client = (PSYSAUDIO_CLIENT)IoStatus->FileObject->FsContext2; - DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; - - - DPRINT("Client %p NumDevices %u\n", Client, Client->NumDevices); - for(Index = 0; Index < Client->NumDevices; Index++) - { - DPRINT("Index %u Device %u Handels Count %u\n", Index, Client->Devs[Index].DeviceId, Client->Devs[Index].ClientHandlesCount); - if (Client->Devs[Index].ClientHandlesCount) - { - Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, Client->Devs[Index].DeviceId); - ASSERT(Entry != NULL); - - for(SubIndex = 0; SubIndex < Client->Devs[Index].ClientHandlesCount; SubIndex++) - { - if (Client->Devs[Index].ClientHandles[SubIndex].PinId == (ULONG)-1) - continue; - - if (Client->Devs[Index].ClientHandles[SubIndex].bHandle) - { - DPRINT("Closing handle %p\n", Client->Devs[Index].ClientHandles[SubIndex].hPin); - - ZwClose(Client->Devs[Index].ClientHandles[SubIndex].hPin); - Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References--; - } - else - { - /* this is a pin which can only be instantiated once - * so we just need to release the reference count on that pin - */ - Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References--; - - DispatchContext = (PDISPATCH_CONTEXT)Client->Devs[Index].ClientHandles[SubIndex].DispatchContext; - - if (DispatchContext->MixerFileObject) - ObDereferenceObject(DispatchContext->MixerFileObject); - - if (DispatchContext->hMixerPin) - ZwClose(DispatchContext->hMixerPin); - - if (DispatchContext->FileObject) - ObDereferenceObject(DispatchContext->FileObject); - - ExFreePool(DispatchContext); - - DPRINT("Index %u DeviceIndex %u Pin %u References %u\n", Index, Client->Devs[Index].DeviceId, SubIndex, Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References); - if (!Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].References) - { - DPRINT("Closing pin %p\n", Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].PinHandle); - - ZwClose(Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].PinHandle); - Entry->Pins[Client->Devs[Index].ClientHandles[SubIndex].PinId].PinHandle = NULL; - } - } - } - ExFreePool(Client->Devs[Index].ClientHandles); - } - } - - if (Client->Devs) - ExFreePool(Client->Devs); - - ExFreePool(Client); + DPRINT("Dispatch_fnClose called DeviceObject %p Irp %p\n", DeviceObject); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -259,13 +187,10 @@ { NTSTATUS Status; KSOBJECT_HEADER ObjectHeader; - PSYSAUDIO_CLIENT Client; PKSOBJECT_CREATE_ITEM CreateItem; PIO_STACK_LOCATION IoStatus; LPWSTR Buffer; PSYSAUDIODEVEXT DeviceExtension; - ULONG Index; - static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; IoStatus = IoGetCurrentIrpStackLocation(Irp); @@ -298,58 +223,14 @@ return STATUS_INSUFFICIENT_RESOURCES; } - Client = ExAllocatePool(NonPagedPool, sizeof(SYSAUDIO_CLIENT)); - if (!Client) - { - ExFreePool(CreateItem); - - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - /* get device extension */ DeviceExtension = (PSYSAUDIODEVEXT) DeviceObject->DeviceExtension; - Client->NumDevices = DeviceExtension->NumberOfKsAudioDevices; - /* has sysaudio found any devices */ - if (Client->NumDevices) - { - Client->Devs = ExAllocatePool(NonPagedPool, sizeof(SYSAUDIO_CLIENT_HANDELS) * Client->NumDevices); - if (!Client->Devs) - { - ExFreePool(CreateItem); - ExFreePool(Client); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INSUFFICIENT_RESOURCES; - } - } - else - { - /* no devices yet available */ - Client->Devs = NULL; - } - - /* Initialize devs array */ - for(Index = 0; Index < Client->NumDevices; Index++) - { - Client->Devs[Index].DeviceId = Index; - Client->Devs[Index].ClientHandles = NULL; - Client->Devs[Index].ClientHandlesCount = 0; - } - /* zero create struct */ RtlZeroMemory(CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); /* store create context */ - CreateItem->Context = (PVOID)Client; RtlInitUnicodeString(&CreateItem->ObjectClass, L"SysAudio"); - - /* store the object in FsContext */ - IoStatus->FileObject->FsContext2 = (PVOID)Client; /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Wed Jun 10 22:28:15 2009 @@ -17,6 +17,7 @@ PDISPATCH_CONTEXT Context; NTSTATUS Status; ULONG BytesReturned; + PFILE_OBJECT FileObject; PIO_STACK_LOCATION IoStack; DPRINT("Pin_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); @@ -29,15 +30,27 @@ /* Sanity check */ ASSERT(Context); - ASSERT(Context->FileObject != NULL); + + /* acquire real pin file object */ + Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + /* Complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } /* Re-dispatch the request to the real target pin */ - Status = KsSynchronousIoControlDevice(Context->FileObject, KernelMode, IoStack->Parameters.DeviceIoControl.IoControlCode, + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.Type3InputBuffer, IoStack->Parameters.DeviceIoControl.InputBufferLength, Irp->UserBuffer, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &BytesReturned); + /* release file object */ + ObDereferenceObject(FileObject); /* Save status and information */ Irp->IoStatus.Information = BytesReturned; @@ -57,6 +70,7 @@ PDISPATCH_CONTEXT Context; PIO_STACK_LOCATION IoStack; ULONG BytesReturned; + PFILE_OBJECT FileObject; NTSTATUS Status; /* Get current stack location */ @@ -67,17 +81,30 @@ /* Sanity check */ ASSERT(Context); - ASSERT(Context->FileObject != NULL); + + /* acquire real pin file object */ + Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + /* Complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } /* Re-dispatch the request to the real target pin */ - Status = KsSynchronousIoControlDevice(Context->FileObject, KernelMode, IOCTL_KS_READ_STREAM, + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_READ_STREAM, MmGetMdlVirtualAddress(Irp->MdlAddress), IoStack->Parameters.Read.Length, NULL, 0, &BytesReturned); - if (Context->hMixerPin && Context->MixerFileObject) + /* release file object */ + ObDereferenceObject(FileObject); + + if (Context->hMixerPin) { // FIXME // call kmixer to convert stream @@ -102,6 +129,7 @@ PDISPATCH_CONTEXT Context; PIO_STACK_LOCATION IoStack; ULONG BytesReturned; + PFILE_OBJECT FileObject; NTSTATUS Status; /* Get current stack location */ @@ -112,24 +140,36 @@ /* Sanity check */ ASSERT(Context); - ASSERT(Context->FileObject != NULL); - - if (Context->hMixerPin && Context->MixerFileObject) + + if (Context->hMixerPin) { // FIXME // call kmixer to convert stream UNIMPLEMENTED } + /* acquire real pin file object */ + Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + /* Complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } /* Re-dispatch the request to the real target pin */ - Status = KsSynchronousIoControlDevice(Context->FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, MmGetMdlVirtualAddress(Irp->MdlAddress), IoStack->Parameters.Read.Length, NULL, 0, &BytesReturned); + /* release file object */ + ObDereferenceObject(FileObject); + /* Save status and information */ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; @@ -149,6 +189,7 @@ PIO_STACK_LOCATION IoStack; PDEVICE_OBJECT PinDeviceObject; PIRP PinIrp; + PFILE_OBJECT FileObject; IO_STATUS_BLOCK IoStatus; KEVENT Event; NTSTATUS Status = STATUS_UNSUCCESSFUL; @@ -161,10 +202,24 @@ /* Sanity check */ ASSERT(Context); - ASSERT(Context->FileObject != NULL); + + + /* acquire real pin file object */ + Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + /* Complete the irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } /* Get Pin's device object */ - PinDeviceObject = IoGetRelatedDeviceObject(Context->FileObject); + PinDeviceObject = IoGetRelatedDeviceObject(FileObject); + + /* release file object */ + ObDereferenceObject(FileObject); /* Initialize notification event */ KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -177,7 +232,7 @@ /* Get the next stack location */ IoStack = IoGetNextIrpStackLocation(PinIrp); /* The file object must be present in the irp as it contains the KSOBJECT_HEADER */ - IoStack->FileObject = Context->FileObject; + IoStack->FileObject = FileObject; /* call the driver */ Status = IoCallDriver(PinDeviceObject, PinIrp); @@ -206,7 +261,24 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { + PDISPATCH_CONTEXT Context; + PIO_STACK_LOCATION IoStack; + DPRINT("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + + /* Get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* The dispatch context is stored in the FsContext2 member */ + Context = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext2; + + if (Context->Handle) + { + ZwClose(Context->Handle); + } + ZwClose(Context->hMixerPin); + + ExFreePool(Context); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -294,15 +366,22 @@ PDEVICE_OBJECT DeviceObject) { PDISPATCH_CONTEXT Context; + PFILE_OBJECT RealFileObject; NTSTATUS Status; DPRINT("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); Context = (PDISPATCH_CONTEXT)FileObject->FsContext2; - if (Context->hMixerPin && Context->MixerFileObject) - { - Status = KsStreamIo(Context->MixerFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + if (Context->hMixerPin) + { + Status = ObReferenceObjectByHandle(Context->hMixerPin, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); + if (NT_SUCCESS(Status)) + { + Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + ObDereferenceObject(RealFileObject); + } + if (!NT_SUCCESS(Status)) { DPRINT1("Mixing stream failed with %lx\n", Status); @@ -310,7 +389,14 @@ } } - Status = KsStreamIo(Context->FileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + Status = ObReferenceObjectByHandle(Context->Handle, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); + if (!NT_SUCCESS(Status)) + return FALSE; + + Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + + ObDereferenceObject(RealFileObject); + if (Status == STATUS_SUCCESS) return TRUE; else Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Wed Jun 10 22:28:15 2009 @@ -10,30 +10,6 @@ #define NDEBUG #include <debug.h> #include <stdio.h> - -typedef struct -{ - BOOL bHandle; // indicates if an audio pin can be instantated more than once - ULONG PinId; // specifies the pin id - HANDLE hPin; // handle to audio irp pin - HANDLE hMixer; // handle to mixer pin - PVOID DispatchContext; // pointer to dispatch context -}SYSAUDIO_PIN_HANDLE, *PSYSAUDIO_PIN_HANDLE; - - -typedef struct -{ - ULONG DeviceId; //specifies the device id - ULONG ClientHandlesCount; // number of client handles - PSYSAUDIO_PIN_HANDLE ClientHandles; // array of client handles -}SYSAUDIO_CLIENT_HANDELS, *PSYSAUDIO_CLIENT_HANDELS; - -typedef struct -{ - ULONG NumDevices; // number of devices in Devs array - PSYSAUDIO_CLIENT_HANDELS Devs; // array of client handles - -}SYSAUDIO_CLIENT, *PSYSAUDIO_CLIENT; typedef struct { @@ -94,12 +70,10 @@ typedef struct { HANDLE Handle; // audio irp pin handle - PFILE_OBJECT FileObject; // audio irp pin file object ULONG PinId; // pin id of device PKSAUDIO_SUBDEVICE_ENTRY AudioEntry; // pointer to audio device entry HANDLE hMixerPin; // handle to mixer pin - PFILE_OBJECT MixerFileObject; // mixer file object }DISPATCH_CONTEXT, *PDISPATCH_CONTEXT; // struct PIN_WORKER_CONTEXT @@ -115,7 +89,6 @@ PKSAUDIO_SUBDEVICE_ENTRY Entry; KSPIN_CONNECT * PinConnect; PDISPATCH_CONTEXT DispatchContext; - PSYSAUDIO_CLIENT AudioClient; PSYSAUDIODEVEXT DeviceExtension; PKSDATAFORMAT_WAVEFORMATEX MixerFormat; PIO_WORKITEM WorkItem;

1 0

[hyperion] 41370: modified tools/rbuild/backend/mingw/compilers/msc.mak Fix definition of cl Fix definition of RBUILD_CXX modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/mingw.h modified tools/rbuild/backend/mingw/mstools_detection.cpp Actually set RBUILD_CL_PATH and RBUILD_LINK_PATH
by hyperion＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: hyperion Date: Wed Jun 10 22:24:33 2009 New Revision: 41370 URL: http://svn.reactos.org/svn/reactos?rev=41370&view=rev Log: modified tools/rbuild/backend/mingw/compilers/msc.mak Fix definition of cl Fix definition of RBUILD_CXX modified tools/rbuild/backend/mingw/mingw.cpp modified tools/rbuild/backend/mingw/mingw.h modified tools/rbuild/backend/mingw/mstools_detection.cpp Actually set RBUILD_CL_PATH and RBUILD_LINK_PATH Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.h trunk/reactos/tools/rbuild/backend/mingw/mstools_detection.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] Wed Jun 10 22:24:33 2009 @@ -15,7 +15,7 @@ BUILTIN_CPPFLAGS+= /X -cl=$$(Q)$$(RBUILD_HELPER_TARGET) "RBUILD_CL_" "$(notdir $<<)" cl /nologo +cl=$(Q)$(RBUILD_HELPER_TARGET) "RBUILD_CL_" "$(notdir $<)" cl /nologo #(module, source, dependencies, cflags, output) #TODO @@ -79,6 +79,8 @@ $$(ECHO_CC) $${cl} /TP /Fo$$@ ${call RBUILD_cxxflags,$(1),$(4)} /c $$< +endif + endef #(module, source, dependencies, cflags) Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed Jun 10 22:24:33 2009 @@ -70,6 +70,9 @@ { HostFalse, "", "", "" }, // MessageHeader }; +static std::string mscPath; +static std::string mslinkPath; + string MingwBackend::GetFullPath ( const FileLocation& file ) const { @@ -426,6 +429,12 @@ fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", ProjectNode.GetLinkerSet ().c_str () ); fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", ProjectNode.GetCompilerSet ().c_str () ); + if ( mscPath.length() ) + fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () ); + + if ( mslinkPath.length() ) + fprintf ( fMakefile, "export RBUILD_LINK_PATH=%s\n", mslinkPath.c_str () ); + if ( configuration.Dependencies == FullDependencies ) { fprintf ( fMakefile, @@ -762,7 +771,7 @@ } else if ( ProjectNode.configuration.Compiler == MicrosoftC ) { - detectedCompiler = DetectMicrosoftCompiler ( compilerVersion ); + detectedCompiler = DetectMicrosoftCompiler ( compilerVersion, mscPath ); supportedCompiler = true; // TODO } @@ -1006,7 +1015,7 @@ } else if ( ProjectNode.configuration.Linker == MicrosoftLink ) { - detectedBinutils = DetectMicrosoftLinker ( binutilsVersion ); + detectedBinutils = DetectMicrosoftLinker ( binutilsVersion, mslinkPath ); supportedBinutils = true; // TODO } Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Wed Jun 10 22:24:33 2009 @@ -117,8 +117,8 @@ void GenerateDirectoryTargets (); FILE* fMakefile; bool use_pch; - bool DetectMicrosoftCompiler ( std::string& version ); - bool DetectMicrosoftLinker ( std::string& version ); + bool DetectMicrosoftCompiler ( std::string& version, std::string& path ); + bool DetectMicrosoftLinker ( std::string& version, std::string& path ); }; Modified: trunk/reactos/tools/rbuild/backend/mingw/mstools_detection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mstools_detection.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mstools_detection.cpp [iso-8859-1] Wed Jun 10 22:24:33 2009 @@ -2216,7 +2216,7 @@ } bool -MingwBackend::DetectMicrosoftCompiler ( std::string& version ) +MingwBackend::DetectMicrosoftCompiler ( std::string& version, std::string& path ) { bool wantCompiler = ProjectNode.configuration.Compiler == MicrosoftC; bool wantLinker = ProjectNode.configuration.Linker == MicrosoftLink; @@ -2234,13 +2234,14 @@ std::ostringstream compilerVersion; compilerVersion << msCompilerVersion; version = compilerVersion.str(); + path = msCompilerPath; } return ret; } bool -MingwBackend::DetectMicrosoftLinker ( std::string& version ) +MingwBackend::DetectMicrosoftLinker ( std::string& version, std::string& path ) { bool wantCompiler = ProjectNode.configuration.Compiler == MicrosoftC; bool wantLinker = ProjectNode.configuration.Linker == MicrosoftLink; @@ -2258,6 +2259,7 @@ std::ostringstream linkerVersion; linkerVersion << msLinkerVersion; version = linkerVersion.str(); + path = msLinkerPath; } return ret; @@ -2273,13 +2275,13 @@ #include "mingw.h" bool -MingwBackend::DetectMicrosoftCompiler ( std::string& ) +MingwBackend::DetectMicrosoftCompiler ( std::string&, std::string& ) { return false; } bool -MingwBackend::DetectMicrosoftLinker ( std::string& ) +MingwBackend::DetectMicrosoftLinker ( std::string&, std::string& ) { return false; }

1 0

[dchapyshev] 41369: - Fix typo
by dchapyshev＠svn.reactos.org 10 Jun '09

10 Jun '09

Author: dchapyshev Date: Wed Jun 10 22:09:15 2009 New Revision: 41369 URL: http://svn.reactos.org/svn/reactos?rev=41369&view=rev Log: - Fix typo Modified: trunk/reactos/ntoskrnl/ke/procobj.c Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Wed Jun 10 22:09:15 2009 @@ -278,7 +278,7 @@ if (Process->BasePriority == Priority) return Process->BasePriority; /* If the caller gave priority 0, normalize to 1 */ - if (!LOW_PRIORITY) Priority = LOW_PRIORITY + 1; + if (!Priority) Priority = LOW_PRIORITY + 1; /* Lock the process */ KiAcquireProcessLock(Process, &ProcessLock);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs