Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[fireball] 39113: - Silence debuglog spam from msimtf.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 26 10:56:11 2009 New Revision: 39113 URL: http://svn.reactos.org/svn/reactos?rev=39113&view=rev Log: - Silence debuglog spam from msimtf. Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… ============================================================================== --- trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] Mon Jan 26 10:56:11 2009 @@ -642,27 +642,27 @@ static HRESULT WINAPI ActiveIMMApp_Activate(IActiveIMMApp* This, BOOL fRestoreLayout) { - FIXME("Stub\n"); + //FIXME("Stub\n"); return S_OK; } static HRESULT WINAPI ActiveIMMApp_Deactivate(IActiveIMMApp* This) { - FIXME("Stub\n"); + //FIXME("Stub\n"); return S_OK; } static HRESULT WINAPI ActiveIMMApp_OnDefWindowProc(IActiveIMMApp* This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { - FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); + //FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); return E_FAIL; } static HRESULT WINAPI ActiveIMMApp_FilterClientWindows(IActiveIMMApp* This, ATOM *aaClassList, UINT uSize) { - FIXME("Stub\n"); + //FIXME("Stub\n"); return S_OK; }

15 years, 7 months

[fireball] 39112: - Revert 39111: "Begin moving rules out of modulehandler.cpp and into makefile include rules.mak, where they will be more readable and manageable. Currently implemented: target C compiler and target C++ compiler rules. Please do a clean build if possible. Testing with unusual output paths appreciated"

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jan 26 10:55:20 2009 New Revision: 39112 URL: http://svn.reactos.org/svn/reactos?rev=39112&view=rev Log: - Revert 39111: "Begin moving rules out of modulehandler.cpp and into makefile include rules.mak, where they will be more readable and manageable. Currently implemented: target C compiler and target C++ compiler rules. Please do a clean build if possible. Testing with unusual output paths appreciated" Removed: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.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] Mon Jan 26 10:55:20 2009 @@ -519,8 +519,6 @@ void MingwBackend::GenerateGlobalVariables () const { - fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); - if ( configuration.Dependencies == FullDependencies ) { fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Jan 26 10:55:20 2009 @@ -1239,7 +1239,16 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(intermediate_path_noext).tlb $(source)\n", "$(intermediate_dir)$(SEP)", NULL ); -Rule gccRule ( "$(eval $(call RBUILD_GCC_RULE,$(module_name),$(source),$(dependencies),$(compiler_flags)))\n", +Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" + "ifeq ($(ROS_BUILDDEPS),full)\n" + "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" + "\t$(ECHO_DEPENDS)\n" + "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" + "-include $(intermediate_path_unique).o.d\n" + "endif\n" + "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" + "\t$(ECHO_CC)\n" + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" @@ -1247,7 +1256,16 @@ "\t$(ECHO_HOSTCC)\n" "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", NULL ); -Rule gppRule ( "$(eval $(call RBUILD_GPP_RULE,$(module_name),$(source),$(dependencies),$(compiler_flags)))\n", +Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" + "ifeq ($(ROS_BUILDDEPS),full)\n" + "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" + "\t$(ECHO_DEPENDS)\n" + "\t${gpp} -MF $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" + "-include $(intermediate_path_unique).o.d\n" + "endif\n" + "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" + "\t$(ECHO_CC)\n" + "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" Removed: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak (removed) @@ -1,67 +1,0 @@ -RBUILD_fullpath=${subst <<<,,${subst $(SEP)<<<,,${subst /,$(SEP),${subst \\,$(SEP),$(1)}}<<<}} - -RBUILD_compress_prefix=${subst >>>,,${subst >>>$($(2)),$$($(2)),>>>$(1)}} - -RBUILD_compress_prefixes=${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,$(1),INTERMEDIATE},OUTPUT},CDOUTPUT},TEMPORARY},INSTALL} - -#(module, source) -RBUILD_intermediate_path_unique=${call RBUILD_intermediate_dir,$(2)}$(SEP)$(basename $(notdir $(2)))_$(1) - -#(source) -RBUILD_intermediate_dir=${call RBUILD_fullpath,$(value INTERMEDIATE)$(SEP)$(dir ${call RBUILD_compress_prefixes,$(1)})} - -#(module, source, dependencies, cflags) -define RBUILD_GCC_RULE - -$(2): $${$(1)_precondition} - -ifeq ($(ROS_BUILDDEPS),full) - -${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d: $(2) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_DEPENDS) - $${gcc} -MF $$@ $$($(1)_CFLAGS) $(4) -M -MP -MT $$@ $$< - --include ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d - -${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d $(3) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_CC) - $${gcc} -o $$@ $$($(1)_CFLAGS) $(4) -c $$< - -else - -${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) $(3) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_CC) - $${gcc} -o $$@ $$($(1)_CFLAGS) $(4) -c $$< - -endif - -endef - -#(module, source, dependencies, cflags) -define RBUILD_GPP_RULE - -$(2): $${$(1)_precondition} - -ifeq ($(ROS_BUILDDEPS),full) - -${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d: $(2) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_DEPENDS) - $${gpp} -MF $$@ $$($(1)_CXXFLAGS) $(4) -M -MP -MT $$@ $$< - --include ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d - -${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d $(3) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_CC) - $${gpp} -o $$@ $$($(1)_CXXFLAGS) $(4) -c $$< - -else - -${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) $(3) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_CC) - $${gpp} -o $$@ $$($(1)_CXXFLAGS) $(4) -c $$< - -endif - -endef - -# EOF

15 years, 7 months

[hyperion] 39111: Begin moving rules out of modulehandler.cpp and into makefile include rules.mak, where they will be more readable and manageable. Currently implemented: target C compiler and target C++ compiler rules. Please do a clean build if possible. Testing with unusual output paths appreciated

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Jan 26 08:26:15 2009 New Revision: 39111 URL: http://svn.reactos.org/svn/reactos?rev=39111&view=rev Log: Begin moving rules out of modulehandler.cpp and into makefile include rules.mak, where they will be more readable and manageable. Currently implemented: target C compiler and target C++ compiler rules. Please do a clean build if possible. Testing with unusual output paths appreciated Added: trunk/reactos/tools/rbuild/backend/mingw/rules.mak (with props) Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.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] Mon Jan 26 08:26:15 2009 @@ -519,6 +519,8 @@ void MingwBackend::GenerateGlobalVariables () const { + fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); + if ( configuration.Dependencies == FullDependencies ) { fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Jan 26 08:26:15 2009 @@ -1239,16 +1239,7 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(intermediate_path_noext).tlb $(source)\n", "$(intermediate_dir)$(SEP)", NULL ); -Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" - "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" - "\t$(ECHO_DEPENDS)\n" - "\t${gcc} -MF $@ $($(module_name)_CFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" - "-include $(intermediate_path_unique).o.d\n" - "endif\n" - "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", +Rule gccRule ( "$(eval $(call RBUILD_GCC_RULE,$(module_name),$(source),$(dependencies),$(compiler_flags)))\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" @@ -1256,16 +1247,7 @@ "\t$(ECHO_HOSTCC)\n" "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", NULL ); -Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" - "ifeq ($(ROS_BUILDDEPS),full)\n" - "$(intermediate_path_unique).o.d: $(source) | $(intermediate_dir)\n" - "\t$(ECHO_DEPENDS)\n" - "\t${gpp} -MF $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -M -MP -MT $@ $<\n" - "-include $(intermediate_path_unique).o.d\n" - "endif\n" - "$(intermediate_path_unique).o: $(source)$(if $(subst _full,,_$(ROS_BUILDDEPS)),, $(intermediate_path_unique).o.d) $(dependencies) | $(intermediate_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", +Rule gppRule ( "$(eval $(call RBUILD_GPP_RULE,$(module_name),$(source),$(dependencies),$(compiler_flags)))\n", "$(intermediate_path_unique).o", "$(intermediate_path_unique).o.d", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" Added: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak (added) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Mon Jan 26 08:26:15 2009 @@ -1,0 +1,67 @@ +RBUILD_fullpath=${subst <<<,,${subst $(SEP)<<<,,${subst /,$(SEP),${subst \\,$(SEP),$(1)}}<<<}} + +RBUILD_compress_prefix=${subst >>>,,${subst >>>$($(2)),$$($(2)),>>>$(1)}} + +RBUILD_compress_prefixes=${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,${call RBUILD_compress_prefix,$(1),INTERMEDIATE},OUTPUT},CDOUTPUT},TEMPORARY},INSTALL} + +#(module, source) +RBUILD_intermediate_path_unique=${call RBUILD_intermediate_dir,$(2)}$(SEP)$(basename $(notdir $(2)))_$(1) + +#(source) +RBUILD_intermediate_dir=${call RBUILD_fullpath,$(value INTERMEDIATE)$(SEP)$(dir ${call RBUILD_compress_prefixes,$(1)})} + +#(module, source, dependencies, cflags) +define RBUILD_GCC_RULE + +$(2): $${$(1)_precondition} + +ifeq ($(ROS_BUILDDEPS),full) + +${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d: $(2) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_DEPENDS) + $${gcc} -MF $$@ $$($(1)_CFLAGS) $(4) -M -MP -MT $$@ $$< + +-include ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d + +${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d $(3) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_CC) + $${gcc} -o $$@ $$($(1)_CFLAGS) $(4) -c $$< + +else + +${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) $(3) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_CC) + $${gcc} -o $$@ $$($(1)_CFLAGS) $(4) -c $$< + +endif + +endef + +#(module, source, dependencies, cflags) +define RBUILD_GPP_RULE + +$(2): $${$(1)_precondition} + +ifeq ($(ROS_BUILDDEPS),full) + +${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d: $(2) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_DEPENDS) + $${gpp} -MF $$@ $$($(1)_CXXFLAGS) $(4) -M -MP -MT $$@ $$< + +-include ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d + +${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.o.d $(3) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_CC) + $${gpp} -o $$@ $$($(1)_CXXFLAGS) $(4) -c $$< + +else + +${call RBUILD_intermediate_path_unique,$(1),$(2)}.o: $(2) $(3) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_CC) + $${gpp} -o $$@ $$($(1)_CXXFLAGS) $(4) -c $$< + +endif + +endef + +# EOF Propchange: trunk/reactos/tools/rbuild/backend/mingw/rules.mak ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 7 months

[dreimer] 39110: Apply this to PS too

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jan 26 06:37:25 2009 New Revision: 39110 URL: http://svn.reactos.org/svn/reactos?rev=39110&view=rev Log: Apply this to PS too Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Mon Jan 26 06:37:25 2009 @@ -61,6 +61,10 @@ $ENV:ROS_ARCH = "i386" } + if (Test-Path "$_ROSBE_MAKEFILE") { + $null = (Remove-Item "$_ROSBE_MAKEFILE" -force) + } + if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { "Cleaning ReactOS $ENV:ROS_ARCH source directory..." if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { @@ -68,9 +72,6 @@ } if (Test-Path "$_ROSBE_OUTCLEANPATH\.") { $null = (Remove-Item "$_ROSBE_OUTCLEANPATH" -recurse -force) - } - if (Test-Path "$_ROSBE_MAKEFILE") { - $null = (Remove-Item "$_ROSBE_MAKEFILE" -force) } "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else {

15 years, 7 months

[cwittich] 39109: fix deletion of makefile.auto when there is no obj and output for real now

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 26 05:35:19 2009 New Revision: 39109 URL: http://svn.reactos.org/svn/reactos?rev=39109&view=rev Log: fix deletion of makefile.auto when there is no obj and output for real now Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon Jan 26 05:35:19 2009 @@ -84,7 +84,7 @@ echo WARNING: The Object-Path specified doesn't seem to exist. Creating... if exist "makefile*.auto" ( echo WARNING: makefile.auto exists. Deleting... - "%_ROSBE_BASEDIR%\Clean.cmd" + call "%_ROSBE_BASEDIR%\Clean.cmd" ) ) set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% @@ -94,7 +94,7 @@ echo WARNING: The Output-Path specified doesn't seem to exist. Creating... if exist "makefile*.auto" ( echo WARNING: makefile.auto exists. Deleting... - "%_ROSBE_BASEDIR%\Clean.cmd" + call "%_ROSBE_BASEDIR%\Clean.cmd" ) ) set ROS_OUTPUT=%_ROSBE_OUTPATH% Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Mon Jan 26 05:35:19 2009 @@ -84,6 +84,10 @@ set _ROSBE_MAKEFILE=makefile.auto ) +if exist "%_ROSBE_MAKEFILE%" ( + del "%_ROSBE_MAKEFILE%" 1> NUL 2> NUL +) + if "%ROS_ARCH%" == "" ( set ROS_ARCH=i386 ) @@ -95,9 +99,6 @@ ) if exist "%_ROSBE_OUTCLEANPATH%\." ( rd /s /q "%_ROSBE_OUTCLEANPATH%" 1> NUL 2> NUL - ) - if exist "%_ROSBE_MAKEFILE%" ( - del "%_ROSBE_MAKEFILE%" 1> NUL 2> NUL ) echo Done cleaning ReactOS %ROS_ARCH% source directory. ) else (

15 years, 7 months

[dreimer] 39108: Delete makefile.auto of the active arch if OBJ or OUT Folder became empty, eg on a RAMDisk after restart. This fixes many problems caused otherwise. Thx to Christoph_vW for spotting.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Jan 26 05:14:02 2009 New Revision: 39108 URL: http://svn.reactos.org/svn/reactos?rev=39108&view=rev Log: Delete makefile.auto of the active arch if OBJ or OUT Folder became empty, eg on a RAMDisk after restart. This fixes many problems caused otherwise. Thx to Christoph_vW for spotting. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon Jan 26 05:14:02 2009 @@ -75,12 +75,20 @@ if ($_ROSBE_OBJPATH -ne $null) { if (Test-Path "$_ROSBE_OBJPATH") { "WARNING: The Object-Path specified doesn't seem to exist. Creating..." + if (Test-Path "makefile*.auto") { + "WARNING: makefile.auto exists. Deleting..." + clean + } } $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" } if ($_ROSBE_OUTPATH -ne $null) { if (Test-Path "$_ROSBE_OUTPATH") { "WARNING: The Output-Path specified doesn't seem to exist. Creating..." + if (Test-Path "makefile*.auto") { + "WARNING: makefile.auto exists. Deleting..." + clean + } } $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH" Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon Jan 26 05:14:02 2009 @@ -82,12 +82,20 @@ if defined _ROSBE_OBJPATH ( if not exist "%_ROSBE_OBJPATH%\." ( echo WARNING: The Object-Path specified doesn't seem to exist. Creating... + if exist "makefile*.auto" ( + echo WARNING: makefile.auto exists. Deleting... + "%_ROSBE_BASEDIR%\Clean.cmd" + ) ) set ROS_INTERMEDIATE=%_ROSBE_OBJPATH% ) if defined _ROSBE_OUTPATH ( if not exist "%_ROSBE_OUTPATH%\." ( echo WARNING: The Output-Path specified doesn't seem to exist. Creating... + if exist "makefile*.auto" ( + echo WARNING: makefile.auto exists. Deleting... + "%_ROSBE_BASEDIR%\Clean.cmd" + ) ) set ROS_OUTPUT=%_ROSBE_OUTPATH% set ROS_TEMPORARY=%_ROSBE_OUTPATH%

15 years, 7 months

[janderwald] 39107: - Fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 26 04:41:59 2009 New Revision: 39107 URL: http://svn.reactos.org/svn/reactos?rev=39107&view=rev Log: - Fix build Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3910… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Jan 26 04:41:59 2009 @@ -1309,6 +1309,7 @@ { } KSOBJECT_CREATE, *PKSOBJECT_CREATE; +#if defined(__NTDDK_H) typedef struct { PDRIVER_DISPATCH Create; @@ -1318,8 +1319,11 @@ ULONG Flags; } KSOBJECT_CREATE_ITEM, *PKSOBJECT_CREATE_ITEM; + typedef VOID (*PFNKSITEMFREECALLBACK)( IN PKSOBJECT_CREATE_ITEM CreateItem); + +#endif typedef struct { ULONG Size;

15 years, 7 months

[janderwald] 39106: - Include mmreg.h for portcls.h - Add KsDefaultForwardIrp prototype - Fix KSPROPSETID_Connection - Fix KSOBJECT_CREATE_ITEM struct - Add KSDATAFORMAT_WAVEFORMATEX - Add KSDATAFORMAT_SUBTYPE_PCM, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX - Add WAVE_FORMAT_PCM define

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 26 04:18:53 2009 New Revision: 39106 URL: http://svn.reactos.org/svn/reactos?rev=39106&view=rev Log: - Include mmreg.h for portcls.h - Add KsDefaultForwardIrp prototype - Fix KSPROPSETID_Connection - Fix KSOBJECT_CREATE_ITEM struct - Add KSDATAFORMAT_WAVEFORMATEX - Add KSDATAFORMAT_SUBTYPE_PCM, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX - Add WAVE_FORMAT_PCM define Modified: trunk/reactos/include/ddk/portcls.h trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h trunk/reactos/include/psdk/mmreg.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Mon Jan 26 04:18:53 2009 @@ -134,6 +134,10 @@ #include <windef.h> +#define NOBITMAP +#include <mmreg.h> +#undef NOBITMAP + #include <ks.h> #include <ksmedia.h> #include <punknown.h> @@ -793,9 +797,9 @@ DECLARE_INTERFACE_(IDmaChannelSlave, IDmaChannel) { - DEFINE_ABSTRACT_UNKNOWN(); - DEFINE_ABSTRACT_DMACHANNEL(); - DEFINE_ABSTRACT_DMACHANNELSLAVE(); + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_DMACHANNEL() + DEFINE_ABSTRACT_DMACHANNELSLAVE() }; typedef IDmaChannelSlave *PDMACHANNELSLAVE; @@ -1183,6 +1187,8 @@ }; typedef IPortWavePci *PPORTWAVEPCI; +#undef INTERFACE + /* =============================================================== IMiniPort Interface @@ -1227,21 +1233,44 @@ /* =============================================================== IMiniportMidiStream Interface */ +#undef INTERFACE +#define INTERFACE IMiniportMidiStream DECLARE_INTERFACE_(IMiniportMidiStream, IUnknown) { - /* TODO - Read, SetFormat, SetState, Write */ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS,SetFormat)(THIS_ + IN PKSDATAFORMAT DataFormat)PURE; + + STDMETHOD_(NTSTATUS,SetState)(THIS_ + IN KSSTATE State)PURE; + + STDMETHOD_(NTSTATUS,Read)(THIS_ + IN PVOID BufferAddress, + IN ULONG BufferLength, + OUT PULONG BytesRead)PURE; + + STDMETHOD_(NTSTATUS,Write)(THIS_ + IN PVOID BufferAddress, + IN ULONG BytesToWrite, + OUT PULONG BytesWritten)PURE; }; typedef IMiniportMidiStream* PMINIPORTMIDISTREAM; - +#undef INTERFACE /* =============================================================== IMiniportMidi Interface */ +#undef INTERFACE +#define INTERFACE IMiniportMidi DECLARE_INTERFACE_(IMiniportMidi, IMiniport) { + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_MINIPORT() + STDMETHOD_(NTSTATUS, Init)(THIS_ IN PUNKNOWN UnknownAdapter, IN PRESOURCELIST ResourceList, @@ -1260,8 +1289,8 @@ STDMETHOD_(void, Service)(THIS) PURE; }; -/* TODO ... */ - +typedef IMiniportMidi *PMINIPORTMIDI; +#undef INTERFACE /* =============================================================== IMiniportDriverUart Interface @@ -1330,7 +1359,7 @@ DECLARE_INTERFACE_(IMiniportWaveCyclicStream,IUnknown) { - DEFINE_ABSTRACT_UNKNOWN() // For IUnknown + DEFINE_ABSTRACT_UNKNOWN() STDMETHOD_(NTSTATUS,SetFormat)(THIS_ IN PKSDATAFORMAT DataFormat)PURE; @@ -1367,14 +1396,7 @@ DECLARE_INTERFACE_(IMiniportWaveCyclic, IMiniport) { - STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ - REFIID InterfaceId, - PVOID* Interface - ) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - - + DEFINE_ABSTRACT_UNKNOWN() DEFINE_ABSTRACT_MINIPORT() STDMETHOD_(NTSTATUS, Init)(THIS_ Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3910… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Jan 26 04:18:53 2009 @@ -344,8 +344,11 @@ Connection Properties/Methods/Events */ -#define KSPROPSETID_Connection \ - 0x1D58C920L, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +#define STATIC_KSPROPSETID_Connection \ + 0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} +DEFINE_GUIDSTRUCT("1D58C920-AC9B-11CF-A5D6-28DB04C10000", KSPROPSETID_Connection); +#define KSPROPSETID_Connection DEFINE_GUIDNAMED(KSPROPSETID_Connection) + typedef enum { @@ -1308,6 +1311,11 @@ typedef struct { + PDRIVER_DISPATCH Create; + PVOID Context; + UNICODE_STRING ObjectClass; + PSECURITY_DESCRIPTOR SecurityDescriptor; + ULONG Flags; } KSOBJECT_CREATE_ITEM, *PKSOBJECT_CREATE_ITEM; typedef VOID (*PFNKSITEMFREECALLBACK)( @@ -2349,6 +2357,11 @@ IN KPROCESSOR_MODE RequestorMode); +KSDDKAPI NTSTATUS NTAPI + KsDefaultForwardIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + /* =============================================================== Worker Management Functions */ Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Mon Jan 26 04:18:53 2009 @@ -126,6 +126,14 @@ /* Formats */ + +//#if defined(_INC_MMREG) +typedef struct { + KSDATAFORMAT DataFormat; + WAVEFORMATEX WaveFormatEx; +} KSDATAFORMAT_WAVEFORMATEX, *PKSDATAFORMAT_WAVEFORMATEX; + +//#endif // 'vids' #define STATIC_KSDATAFORMAT_TYPE_VIDEO \ @@ -139,6 +147,9 @@ DEFINE_GUIDSTRUCT("73647561-0000-0010-8000-00aa00389b71", KSDATAFORMAT_TYPE_AUDIO); #define KSDATAFORMAT_TYPE_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_AUDIO) + + + // 'txts' #define STATIC_KSDATAFORMAT_TYPE_TEXT \ 0x73747874L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} @@ -161,6 +172,16 @@ DEFINE_GUIDSTRUCT("1D262760-E957-11CF-A5D6-28DB04C10000", KSDATAFORMAT_SUBTYPE_MIDI); #define KSDATAFORMAT_SUBTYPE_MIDI DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI) +#define STATIC_KSDATAFORMAT_SUBTYPE_PCM\ + 0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +DEFINE_GUIDSTRUCT("00000001-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_PCM); +#define KSDATAFORMAT_SUBTYPE_PCM DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_PCM) + + +#define STATIC_KSDATAFORMAT_SPECIFIER_WAVEFORMATEX\ + 0x05589f81L, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a +DEFINE_GUIDSTRUCT("05589f81-c356-11ce-bf01-00aa0055595a", KSDATAFORMAT_SPECIFIER_WAVEFORMATEX); +#define KSDATAFORMAT_SPECIFIER_WAVEFORMATEX DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) /* SysAudio Properties Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Mon Jan 26 04:18:53 2009 @@ -77,6 +77,10 @@ WORD cbSize; } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ + +#ifndef WAVE_FORMAT_PCM +#define WAVE_FORMAT_PCM 0x0001 +#endif /* WAVE form wFormatTag IDs */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */

15 years, 7 months

[janderwald] 39105: - Reimplement SysAudio device initilization - Register Plug&Play notification for KS_CATEGORY_AUDIO events

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 26 04:08:17 2009 New Revision: 39105 URL: http://svn.reactos.org/svn/reactos?rev=39105&view=rev Log: - Reimplement SysAudio device initilization - Register Plug&Play notification for KS_CATEGORY_AUDIO events Added: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h (with props) Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Mon Jan 26 04:08:17 2009 @@ -10,100 +10,181 @@ */ #include <ntddk.h> -/* #include <ks.h> */ +#include <ks.h> #include <debug.h> - -NTSTATUS -NTAPI -SysAudio_Create( +//#include <dxsdk/mediaobj.h> +#include "sysaudio.h" + +const GUID KS_CATEGORY_AUDIO = {0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; + +VOID +NTAPI +SysAudio_Unload(IN PDRIVER_OBJECT DriverObject) +{ + DPRINT("SysAudio_Unload called\n"); +} + +NTSTATUS +NTAPI +SysAudio_Pnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("SysAudio_Create called\n"); - - /* TODO */ - - /* Complete the request */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + PIO_STACK_LOCATION IrpStack; + UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\sysaudio"); + SYSAUDIODEVEXT *DeviceExtension; + + DPRINT1("SysAudio_Pnp called\n"); + + + IrpStack = IoGetCurrentIrpStackLocation(Irp); + + DeviceExtension = (SYSAUDIODEVEXT*)DeviceObject->DeviceExtension; + + if (IrpStack->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + if (DeviceExtension->EchoCancelNotificationEntry) + IoUnregisterPlugPlayNotification(DeviceExtension->EchoCancelNotificationEntry); + + if (DeviceExtension->KsAudioNotificationEntry) + IoUnregisterPlugPlayNotification(DeviceExtension->KsAudioNotificationEntry); + + IoDeleteSymbolicLink(&SymlinkName); + } + + return KsDefaultDispatchPnp(DeviceObject, Irp); +} + +NTSTATUS +NTAPI +DeviceInterfaceChangeCallback( + IN PVOID NotificationStructure, + IN PVOID Context) +{ + DEVICE_INTERFACE_CHANGE_NOTIFICATION * Event = (DEVICE_INTERFACE_CHANGE_NOTIFICATION*)NotificationStructure; + + DPRINT1("DeviceInterfaceChangeCallback called %p\n", Event); return STATUS_SUCCESS; } -VOID -NTAPI -SysAudio_Unload(IN PDRIVER_OBJECT DriverObject) -{ - PDEVICE_OBJECT DeviceObject; - - DPRINT("SysAudio_Unload called\n"); - - /* Get DO and DE */ - DeviceObject = DriverObject->DeviceObject; -/* DeviceExtension = DeviceObject->DeviceExtension;*/ - - /* Delete the object */ - IoDeleteDevice(DeviceObject); -} - -#if 0 -VOID -NTAPI -SysAudio_StartIo( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - /* TODO */ - - DPRINT("SysAudio_StartIo called\n"); - - /* Complete the request and start the next packet */ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoStartNextPacket(DeviceObject, TRUE); - IoCompleteRequest(Irp, IO_NO_INCREMENT); -} -#endif - -NTSTATUS NTAPI +NTSTATUS +NTAPI +DispatchCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT1("DispatchCreate\n"); + + return STATUS_SUCCESS; +} +NTSTATUS +NTAPI SysAudio_AddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - NTSTATUS status; + NTSTATUS Status; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\sysaudio"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\sysaudio"); PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT NextDeviceObject; + KSOBJECT_CREATE_ITEM CreateItem; + SYSAUDIODEVEXT *DeviceExtension; DPRINT("SysAudio_AddDevice called\n"); - status = IoCreateDevice(DriverObject, - 0, /* Extension size */ + /* create the device */ + Status = IoCreateDevice(DriverObject, + sizeof(SYSAUDIODEVEXT), &DeviceName, - FILE_DEVICE_SOUND, /* is this right? */ - 0, /* Characteristics */ + FILE_DEVICE_KS, + 0, FALSE, &DeviceObject); - if ( ! NT_SUCCESS(status) ) + /* check for success */ + if (!NT_SUCCESS(Status)) { DPRINT("Failed to create \\Device\\sysaudio !\n"); - return status; - } - - status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); - - if ( ! NT_SUCCESS(status) ) + return Status; + } + + /* create the symbolic link */ + Status = IoCreateSymbolicLink(&SymlinkName, &DeviceName); + if (!NT_SUCCESS(Status)) { IoDeleteDevice(DeviceObject); - DPRINT("Failed to create \\DosDevices\\sysaudio symlink!\n"); - return status; - } - - DPRINT("Device created successfully\n"); - - return STATUS_SUCCESS; + return Status; + } + + + DeviceExtension = (SYSAUDIODEVEXT*)DeviceObject->DeviceExtension; + /* initialize device extension */ + RtlZeroMemory(DeviceExtension, sizeof(SYSAUDIODEVEXT)); + + KeInitializeMutex(&DeviceExtension->Mutex, 0); + + DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + + /* initialize create item struct */ + RtlZeroMemory(&CreateItem, sizeof(KSOBJECT_CREATE_ITEM)); + CreateItem.Create = DispatchCreate; + + Status = KsAllocateDeviceHeader(&DeviceExtension->KsDeviceHeader, + 1, + &CreateItem); + + if (NT_SUCCESS(Status)) + { + NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + if (NextDeviceObject) + { + /// FIXME + /// KsSetDevicePnpAndBaseObject(DeviceExtension->KsDeviceHeader, NextDeviceObject, DeviceObject); + /// + + DeviceExtension->NextDeviceObject = NextDeviceObject; + + Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, + PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, + (PVOID)&KS_CATEGORY_AUDIO, + DriverObject, + DeviceInterfaceChangeCallback, + (PVOID)DeviceExtension, + (PVOID*)&DeviceExtension->KsAudioNotificationEntry); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); + return Status; + } +#if 0 + Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, + PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, + &DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, + DriverObject, + DeviceInterfaceChangeCallback, + (PVOID)DeviceExtension, + &DeviceExtension->EchoCancelNotificationEntry); +#endif + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoRegisterPlugPlayNotification failed with %x\n", Status); + return Status; + } + + /* set io flags */ + DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + /* clear initializing flag */ + DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + } + } + + + + DPRINT("Device SysAudio_AddDevice result %x\n", Status); + + return Status; } NTSTATUS NTAPI @@ -113,20 +194,19 @@ { DPRINT("System audio graph builder (sysaudio) started\n"); + + + DPRINT1("Setting KS function handlers\n"); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CREATE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_WRITE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); + + DriverObject->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; + DriverObject->MajorFunction[IRP_MJ_PNP] = SysAudio_Pnp; + DriverObject->DriverUnload = SysAudio_Unload; DriverObject->DriverExtension->AddDevice = SysAudio_AddDevice; - DriverObject->MajorFunction[IRP_MJ_CREATE] = SysAudio_Create; - -/* We'd want to handle this but does KS need to know? */ -/* DriverObject->MajorFunction[IRP_MJ_PNP] = KsDefaultDispatchPnp;*/ - -/* We don't want to handle this though - pass to KS */ -/* DriverObject->MajorFunction[IRP_MJ_POWER] = KsDefaultDispatchPower;*/ - - DriverObject->DriverUnload = SysAudio_Unload; -/* DriverObject->DriverStartIo = SysAudio_StartIo; */ - - /* Hmm, shouldn't KS.SYS be involved in some way? */ - return STATUS_SUCCESS; } Added: 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 (added) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Mon Jan 26 04:08:17 2009 @@ -1,0 +1,20 @@ +#ifndef SYSAUDIO_H__ +#define SYSAUDIO_H__ + + + +typedef struct +{ + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + KSDEVICE_HEADER KsDeviceHeader; + PVOID KsAudioNotificationEntry; + PVOID EchoCancelNotificationEntry; + KMUTEX Mutex; +}SYSAUDIODEVEXT; + + + + + +#endif Propchange: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.rbuild [iso-8859-1] Mon Jan 26 04:08:17 2009 @@ -3,10 +3,9 @@ <module name="sysaudio" type="kernelmodedriver" installbase="system32/drivers" installname="sysaudio.sys"> <include base="sysaudio">.</include> <library>ntoskrnl</library> + <library>ks</library> <define name="_NTDDK_" /> <define name="_COMDDK_" /> - <file>main.c</file> - <file>sysaudio.rc</file> </module>

15 years, 7 months

[janderwald] 39104: - Start implementing object bag support functions - Implement KsCreateDevice, KsAddDevice, KsInitializeDriver - Add KsDefaultForwardIrp stub

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 26 04:05:46 2009 New Revision: 39104 URL: http://svn.reactos.org/svn/reactos?rev=39104&view=rev Log: - Start implementing object bag support functions - Implement KsCreateDevice, KsAddDevice, KsInitializeDriver - Add KsDefaultForwardIrp stub Added: trunk/reactos/drivers/ksfilter/ks/bag.c (with props) trunk/reactos/drivers/ksfilter/ks/device.c (with props) trunk/reactos/drivers/ksfilter/ks/driver.c (with props) trunk/reactos/drivers/ksfilter/ks/ksfunc.h (with props) trunk/reactos/drivers/ksfilter/ks/ksiface.h (with props) Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/ks.spec trunk/reactos/drivers/ksfilter/ks/misc.c Added: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c (added) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,58 @@ +#include <ntddk.h> +#include <debug.h> +#include <ks.h> +#if 0 +typedef struct +{ + LIST_ENTRY Entry; + PVOID Item; + PFNKSFREE Free; + LONG ReferenceCount; +}KSOBJECT_BAG_ENTRY; + +typedef struct +{ + LIST_ENTRY ListHead; + KMUTEX Lock; +}KSOBJECT_BAG_IMPL; + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsAddItemToObjectBag( + IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN PFNKSFREE Free OPTIONAL) +{ + KSOBJECT_BAG_ENTRY * Entry; + KSOBJECT_BAG_IMPL * Bag = (KSOBJECT_BAG_IMPL)ObjectBag; + + Entry = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_BAG_ENTRY)); + if (!Entry) + return STATUS_INSUFFICIENT_RESOURCES; + + Entry->Free = Free; + Entry->Item = Item; + + InsertTailList(&Bag->ListHead, &Entry->Entry); + return STATUS_SUCCESS; +} + +KSDDKAPI +ULONG +NTAPI +KsRemoveItemFromObjectBag( + IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN BOOLEAN Free) +{ + KSOBJECT_BAG_IMPL * Bag = (KSOBJECT_BAG_IMPL)ObjectBag; + + + + +} +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/bag.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -5,6 +5,11 @@ #include <ntddk.h> #include <debug.h> #include <ks.h> + +typedef struct +{ + +}KS_DEFAULT_CLOCK; /* @unimplemented @@ -27,19 +32,28 @@ IN PIRP Irp, IN PKSDEFAULTCLOCK DefaultClock) { - UNIMPLEMENTED; + NTSTATUS Status; + PKSCLOCK_CREATE ClockCreate; + + Status = KsValidateClockCreateRequest(Irp, &ClockCreate); + if (!NT_SUCCESS(Status)) + return Status; + +// ExAllocatePoolWithTag(NonPagedPool, sizeof(KS_DEFAULT_CLOCK), 0); + + + return STATUS_UNSUCCESSFUL; } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS NTAPI KsAllocateDefaultClock( OUT PKSDEFAULTCLOCK* DefaultClock) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + return KsAllocateDefaultClockEx(DefaultClock, NULL, NULL, NULL, NULL, NULL, 0); } /* Added: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c (added) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,34 @@ +#include <ntddk.h> +#include <debug.h> +#include <ks.h> + +#include "ksiface.h" +#include "ksfunc.h" + +typedef struct +{ + IKsDeviceVtbl *lpVtbl; + + LONG ref; + + +}IKsDeviceImpl; + + +NTSTATUS +NTAPI +NewIKsDevice(IKsDevice** OutDevice) +{ + IKsDeviceImpl * This; + + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IKsDeviceImpl), 0x12345678); //FIX TAG + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->ref = 1; + //This->lpVtbl = &vt_IKsDevice; + + *OutDevice = (IKsDevice*)This; + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/ksfilter/ks/device.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c (added) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,143 @@ +#include <ntddk.h> +#include <debug.h> +#include <ks.h> + +#include "ksfunc.h" + + +/* + @unimplemented +*/ +KSDDKAPI +PKSDEVICE +NTAPI +KsGetDeviceForDeviceObject( + IN PDEVICE_OBJECT FunctionalDeviceObject) +{ + + return NULL; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsInitializeDevice( + IN PDEVICE_OBJECT FunctionalDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT NextDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL) +{ + return STATUS_UNSUCCESSFUL; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCreateDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL, + IN ULONG ExtensionSize OPTIONAL, + OUT PKSDEVICE* Device OPTIONAL) +{ + NTSTATUS Status = STATUS_DEVICE_REMOVED; + PDEVICE_OBJECT FunctionalDeviceObject= NULL; + PDEVICE_OBJECT OldHighestDeviceObject; + + if (!ExtensionSize) + ExtensionSize = sizeof(PVOID); + + Status = IoCreateDevice(DriverObject, ExtensionSize, NULL, FILE_DEVICE_KS, FILE_DEVICE_SECURE_OPEN, FALSE, &FunctionalDeviceObject); + if (!NT_SUCCESS(Status)) + return Status; + + OldHighestDeviceObject = IoAttachDeviceToDeviceStack(FunctionalDeviceObject, PhysicalDeviceObject); + if (OldHighestDeviceObject) + { + Status = KsInitializeDevice(FunctionalDeviceObject, PhysicalDeviceObject, OldHighestDeviceObject, Descriptor); + } + + if (!NT_SUCCESS(Status)) + { + if (OldHighestDeviceObject) + IoDetachDevice(OldHighestDeviceObject); + + IoDeleteDevice(FunctionalDeviceObject); + return Status; + } + + if (Device) + { + *Device = KsGetDeviceForDeviceObject(FunctionalDeviceObject); + } + + return Status; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + PKSDEVICE_DESCRIPTOR *DriverObjectExtension; + PKSDEVICE_DESCRIPTOR Descriptor = NULL; + + DriverObjectExtension = IoGetDriverObjectExtension(DriverObject, (PVOID)KsAddDevice); + if (DriverObjectExtension) + { + Descriptor = *DriverObjectExtension; + } + + return KsCreateDevice(DriverObject, PhysicalDeviceObject, Descriptor, 0, NULL); +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsInitializeDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath, + IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL +) +{ + PKSDEVICE_DESCRIPTOR *DriverObjectExtension; + NTSTATUS Status; + + if (Descriptor) + { + Status = IoAllocateDriverObjectExtension(DriverObject, (PVOID)KsAddDevice, sizeof(PKSDEVICE_DESCRIPTOR), (PVOID*)&DriverObjectExtension); + if (NT_SUCCESS(Status)) + { + *DriverObjectExtension = (KSDEVICE_DESCRIPTOR*)Descriptor; + } + } + /* Setting our IRP handlers */ + //DriverObject->MajorFunction[IRP_MJ_CREATE] = KspDispatch; + //DriverObject->MajorFunction[IRP_MJ_PNP] = KspDispatch; + //DriverObject->MajorFunction[IRP_MJ_POWER] = KspDispatch; + + /* The driver-supplied AddDevice */ + DriverObject->DriverExtension->AddDevice = KsAddDevice; + + /* KS handles these */ + DPRINT1("Setting KS function handlers\n"); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_CLOSE); + KsSetMajorFunctionHandler(DriverObject, IRP_MJ_DEVICE_CONTROL); + + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/ksfilter/ks/driver.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -678,3 +678,16 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } + +/* + @unimplemented +*/ +KSDDKAPI NTSTATUS NTAPI +KsDefaultForwardIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -12,6 +12,9 @@ <define name="_COMDDK_" /> <file>ks.rc</file> <file>allocators.c</file> + <file>bag.c</file> + <file>device.c</file> + <file>driver.c</file> <file>clocks.c</file> <file>connectivity.c</file> <file>events.c</file> Modified: trunk/reactos/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.spe… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.spec [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -44,6 +44,7 @@ @ stdcall KsHandleSizedListQuery(ptr long long ptr) @ stdcall KsAcquireResetValue(ptr ptr) +@ stdcall KsDefaultForwardIrp(ptr ptr) @ stdcall KsAddIrpToCancelableQueue(ptr ptr ptr long ptr) @ stdcall KsAddObjectCreateItemToDeviceHeader(ptr ptr ptr wstr ptr) @ stdcall KsAddObjectCreateItemToObjectHeader(ptr ptr ptr wstr ptr) Added: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksfunc.h (added) +++ trunk/reactos/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,17 @@ +#ifndef KSFUNC_H__ +#define KSFUNC_H__ + +#include "ksiface.h" + +NTSTATUS +NTAPI +NewIKsDevice(IKsDevice** OutDevice); + + + + + + + + +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/ksfunc.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksifac… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksiface.h (added) +++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -1,0 +1,101 @@ +#ifndef KSIFACE_H__ +#define KSIFACE_H__ + +#include <ntddk.h> +#include <ks.h> + + + +/***************************************************************************** + * IKsFilterFactory + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IKsFilterFactory + +struct KSFILTERFACTORY; + +DECLARE_INTERFACE_(IKsFilterFactory, IUnknown) +{ + //DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(struct KSFILTERFACTORY*,GetStruct)(THIS) PURE; + + STDMETHOD_(NTSTATUS,SetDeviceClassesState)(THIS_ + IN ULONG Unknown1, + IN BOOLEAN Enable)PURE; +}; + + +/***************************************************************************** + * IKsPowerNotify + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IKsPowerNotify + +DECLARE_INTERFACE_(IKsPowerNotify, IUnknown) +{ + //DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(ULONG,Sleep)(THIS_ + IN DEVICE_POWER_STATE State) PURE; + + STDMETHOD_(ULONG,Wake)(THIS) PURE; +}; + + +/***************************************************************************** + * IKsDevice + ***************************************************************************** + */ + +#undef INTERFACE +#define INTERFACE IKsDevice + +struct KSIOBJECTBAG; +struct KSPOWER_ENTRY; + +DECLARE_INTERFACE_(IKsDevice, IUnknown) +{ + //DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(struct KSDEVICE*,GetStruct)(THIS) PURE; + + STDMETHOD_(NTSTATUS, InitializeObjectBag)(THIS_ + IN struct KSIOBJECTBAG *Bag, + IN KMUTANT * Mutant) PURE; + + STDMETHOD_(ULONG,AcquireDevice)(THIS) PURE; + STDMETHOD_(ULONG,ReleaseDevice)(THIS) PURE; + + STDMETHOD_(VOID, GetAdapterObject)(THIS_ + IN PADAPTER_OBJECT Object, + IN PULONG Unknown1, + IN PULONG Unknown2) PURE; + + STDMETHOD_(VOID, AddPowerEntry)(THIS_ + IN struct KSPOWER_ENTRY * Entry, + IN struct IKsPowerNotify* Notify)PURE; + + STDMETHOD_(VOID, RemovePowerEntry)(THIS_ + IN struct KSPOWER_ENTRY * Entry)PURE; + + STDMETHOD_(NTSTATUS, PinStateChange)(THIS_ + IN KSPIN Pin, + IN PIRP Irp, + IN KSSTATE OldState, + IN KSSTATE NewState)PURE; + + STDMETHOD_(NTSTATUS, ArbitrateAdapterChannel)(THIS_ + IN ULONG ControlCode, + IN IO_ALLOCATION_ACTION Action, + IN PVOID Context)PURE; + + STDMETHOD_(NTSTATUS, CheckIoCapability)(THIS_ + IN ULONG Unknown)PURE; +}; + +#endif Propchange: trunk/reactos/drivers/ksfilter/ks/ksiface.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Mon Jan 26 04:05:46 2009 @@ -218,17 +218,5 @@ return STATUS_UNSUCCESSFUL; } -/* - @unimplemented -*/ -KSDDKAPI NTSTATUS NTAPI -KsInitializeDriver( - IN PDRIVER_OBJECT DriverObject, - IN PUNICODE_STRING RegistryPath, - IN const KSDEVICE_DESCRIPTOR *Descriptor OPTIONAL -) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - + +

15 years, 7 months

← Newer
1
...
12
13
14
15
16
17
18
...
76
Older →

Jump to page:

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