Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 44005: - Change version to 1.5-RC1 - Handle unknown RosBE-Unix versions in the installation script - Update tool version information
by cfinck＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: cfinck Date: Sat Nov 7 18:16:41 2009 New Revision: 44005 URL: http://svn.reactos.org/svn/reactos?rev=44005&view=rev Log: - Change version to 1.5-RC1 - Handle unknown RosBE-Unix versions in the installation script - Update tool version information Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] Sat Nov 7 18:16:41 2009 @@ -1,7 +1,7 @@ ReactOS Build Environment - Version 1.4.2 for Unix-based operating systems + Version 1.5-RC1 for Unix-based operating systems Base package and i386 build tools - by Colin Finck (mail(a)colinfinck.de) + by Colin Finck (colin(a)reactos.org) Introduction ------------- @@ -103,28 +103,21 @@ This version of RosBE for Unix-based operating systems uses the following components: - * GNU Binutils v2.19.51-20090127 (snapshot) + * GNU Binutils v2.20-20091017 (snapshot) + compiled for mingw32 + + * GCC, The GNU Compiler Collection v4.4.2 compiled for mingw32 patched with: - - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/binutils-2.18.…) - - * GCC, The GNU Compiler Collection v4.1.3-20071015 (snapshot) - compiled for mingw32 - patched with: - - GCC-v4.1-r129382-prerelease-w3seek.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) - - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) - - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch - (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1294…) + - http://gcc.gnu.org/bugzilla/attachment.cgi?id=18882&action=view + (committed in GCC r153606) NOTE: This GCC version only supports C and C++ * Make 20071219 (CVS version) - * MinGW-Runtime 3.13 - * NASM, The Netwide assembler v2.05.01 - * W32api 3.10 + * MinGW-Runtime 3.16 + * NASM, The Netwide assembler v2.07 + * W32api 3.13 Tested Operating Systems @@ -132,7 +125,7 @@ The Build Environment was designed to work on all Unix-based operating systems. Nevertheless, it is impossible to test it on all possible systems out there. - The current primary development and test system is Ubuntu 8.10. But users + The current primary development and test system is Ubuntu 9.10. But users also reported that it works well under other Linux systems such as Fedora or openSUSE and Unix derivates like FreeBSD or Mac OS X. You should be able to compile the build tools on both i386 (32-bit) and @@ -159,7 +152,7 @@ Credits -------- -Colin Finck (mail(a)colinfinck.de) +Colin Finck (colin(a)reactos.org) Thanks go also to the members of the RosBE-Windows team, namely: Daniel Reimer (reimer.daniel(a)freenet.de) @@ -175,3 +168,4 @@ Environment v0.2-3.4.4. Inspired by Dazzle from TinyKRNL (http://tinykrnl.org/). + Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Sat Nov 7 18:16:41 2009 @@ -21,8 +21,8 @@ # RosBE-Unix Constants DEFAULT_INSTALL_DIR="/usr/local/RosBE" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5" -ROSBE_VERSION="1.5" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5-RC1" +ROSBE_VERSION="1.5-RC1" TARGET_ARCH="i386" source "$rs_scriptdir/scripts/rosbelibrary.sh" @@ -90,6 +90,8 @@ # Check if the directory is empty if [ ! "`ls $installdir`" = "" ]; then if [ -f "$installdir/RosBE-Version" ]; then + choice="" + # Allow the user to update an already installed RosBE version installed_version=`cat "$installdir/RosBE-Version"` @@ -115,10 +117,22 @@ rs_showchoice "U" "u U r R c C" fi - echo break fi done + + if [ "$choice" = "" ]; then + # We found no known version, so this could be for example a Release Candidate. + # Only offer the reinstallation option. + echo "Another version of the Build Environment is already installed in this directory." + echo "Please choose one of the following options:" + echo + echo " (R)einstall all components of the Build Environment" + echo " (C)hoose a different installation directory" + echo + + rs_showchoice "R" "r R c C" + fi case "$choice" in "U"|"u") Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/setuplibrary.sh [iso-8859-1] Sat Nov 7 18:16:41 2009 @@ -227,4 +227,6 @@ fi done done -} + + echo +} Modified: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/scripts/setuplibrary.sh [iso-8859-1] Sat Nov 7 18:16:41 2009 @@ -227,4 +227,6 @@ fi done done -} + + echo +}

1 0

[cfinck] 44004: Fix updated tools again :-)
by cfinck＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: cfinck Date: Sat Nov 7 18:11:58 2009 New Revision: 44004 URL: http://svn.reactos.org/svn/reactos?rev=44004&view=rev Log: Fix updated tools again :-) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[hyperion] 44003: globally-defined CFLAGS, CXXFLAGS, etc. will now work, and override C compiler flags, C++ compiler flags, etc. for all modules. Our makefile build system now a little closer to a real makefile build system
by hyperion＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: hyperion Date: Sat Nov 7 17:56:52 2009 New Revision: 44003 URL: http://svn.reactos.org/svn/reactos?rev=44003&view=rev Log: globally-defined CFLAGS, CXXFLAGS, etc. will now work, and override C compiler flags, C++ compiler flags, etc. for all modules. Our makefile build system now a little closer to a real makefile build system Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: 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 [iso-8859-1] Sat Nov 7 17:56:52 2009 @@ -23,8 +23,6 @@ #(source) RBUILD_dir=${call RBUILD_fullpath,$(dir ${call RBUILD_compress_prefixes,$(1)})} - -# FIXME: when RosBE stops hijacking HOST_CFLAGS etc., add CFLAGS etc. #(module, flags, includes, compiler, prefix) RBUILD_compiler_flags=\ @@ -32,10 +30,12 @@ $$(PROJECT_$(5)$(4)FLAGS) \ $$(MODULETYPE$($(1)_TYPE)_$(4)FLAGS) \ $$($(1)_$(4)FLAGS) \ -$(2) +$(2) \ +$$($(5)$(4)FLAGS) #(module, flags, includes, compiler, prefix) RBUILD_compiler_flags_with_cpp=\ +$$($(5)$(4)INCLUDES) $$(CPPINCLUDES) \ $(3) \ $$($(1)_$(4)INCLUDES) $$($(1)_CPPINCLUDES) \ $$(MODULETYPE$($(1)_TYPE)_$(4)INCLUDES) $$(MODULETYPE$($(1)_TYPE)_CPPINCLUDES) \ @@ -45,10 +45,12 @@ $$(PROJECT_$(5)CPPDEFINES) $$(PROJECT_$(5)CPPFLAGS) $$(PROJECT_$(5)$(4)DEFINES) $$(PROJECT_$(5)$(4)FLAGS) \ $$(MODULETYPE$($(1)_TYPE)_CPPDEFINES) $$(MODULETYPE$($(1)_TYPE)_CPPFLAGS) $$(MODULETYPE$($(1)_TYPE)_$(4)DEFINES) $$(MODULETYPE$($(1)_TYPE)_$(4)FLAGS) \ $$($(1)_CPPDEFINES) $$($(1)_CPPFLAGS) $$($(1)_$(4)DEFINES) $$($(1)_$(4)FLAGS) \ -$(2) +$(2) \ +$$(CPPDEFINES) $$(CPPFLAGS) $$($(5)$(4)DEFINES) $$($(5)$(4)FLAGS) #(module, flags, includes, compiler, prefix) RBUILD_compiler_flags_builtin_cpp=\ +$$($(5)$(4)INCLUDES) $$(CPPINCLUDES) \ $(3) \ $$($(1)_$(4)INCLUDES) $$($(1)_CPPINCLUDES) \ $$(MODULETYPE$($(1)_TYPE)_$(4)INCLUDES) $$(MODULETYPE$($(1)_TYPE)_CPPINCLUDES) \ @@ -58,10 +60,12 @@ $$(PROJECT_$(5)CPPDEFINES) $$(PROJECT_$(5)$(4)DEFINES) $$(PROJECT_$(5)$(4)FLAGS) \ $$(MODULETYPE$($(1)_TYPE)_CPPDEFINES) $$(MODULETYPE$($(1)_TYPE)_$(4)DEFINES) $$(MODULETYPE$($(1)_TYPE)_$(4)FLAGS) \ $$($(1)_CPPDEFINES) $$($(1)_$(4)DEFINES) $$($(1)_$(4)FLAGS) \ -$(2) +$(2) \ +$$(CPPDEFINES) $$($(5)$(4)DEFINES) $$($(5)$(4)FLAGS) #(module, flags, includes, compiler, prefix) RBUILD_compiler_flags_with_includes=\ +$$($(5)$(4)INCLUDES) $(3) \ $$($(1)_$(4)INCLUDES) $$($(1)_CPPINCLUDES) \ $$(MODULETYPE$($(1)_TYPE)_$(4)INCLUDES) \ @@ -71,10 +75,12 @@ $$(PROJECT_$(5)$(4)FLAGS) \ $$(MODULETYPE$($(1)_TYPE)_$(4)FLAGS) \ $$($(1)_$(4)FLAGS) \ -$(2) +$(2) \ +$$($(5)$(4)FLAGS) #(module, flags, includes, compiler, prefix) RBUILD_compiler_flags_cpp=\ +$$($(5)$(4)INCLUDES) $$(CPPINCLUDES) $(3) \ $$($(1)_$(4)INCLUDES) $$($(1)_CPPINCLUDES) \ $$(MODULETYPE$($(1)_TYPE)_$(4)INCLUDES) $$(MODULETYPE$($(1)_TYPE)_CPPINCLUDES) \ @@ -84,7 +90,8 @@ $$(PROJECT_$(5)CPPFLAGS) $$(PROJECT_$(5)CPPDEFINES) $$(PROJECT_$(5)$(4)DEFINES) \ $$(MODULETYPE$($(1)_TYPE)_CPPFLAGS) $$(MODULETYPE$($(1)_TYPE)_CPPDEFINES) $$(MODULETYPE$($(1)_TYPE)_$(4)DEFINES) \ $$($(1)_CPPFLAGS) $$($(1)_CPPDEFINES) $$($(1)_$(4)DEFINES) \ -$(2) +$(2) \ +$$(CPPFLAGS) $$(CPPDEFINES) $$($(5)$(4)DEFINES) #(module, flags, includes) RBUILD_cflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),C}

1 0

[sserapion] 44002: Fix spider build.
by sserapion＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: sserapion Date: Sat Nov 7 17:39:44 2009 New Revision: 44002 URL: http://svn.reactos.org/svn/reactos?rev=44002&view=rev Log: Fix spider build. Modified: branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp Modified: branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/spider/spider.cpp [iso-8859-1] Sat Nov 7 17:39:44 2009 @@ -50,7 +50,7 @@ lstrcpy(ptr + 1, szExt); } -BOOL CALLBACK DifficultyDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DifficultyDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -239,7 +239,7 @@ } -BOOL CALLBACK CardBackDlgProc(HWND hDlg, +INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

1 0

[tkreuzer] 44001: [RTL] - Implement RtlRaiseException
by tkreuzer＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: tkreuzer Date: Sat Nov 7 16:26:12 2009 New Revision: 44001 URL: http://svn.reactos.org/svn/reactos?rev=44001&view=rev Log: [RTL] - Implement RtlRaiseException Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c branches/ros-amd64-bringup/reactos/lib/rtl/exception.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Sat Nov 7 16:26:12 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * PURPOSE: Exception related functions + * PURPOSE: Unwinding related functions * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -27,6 +27,11 @@ #define UWOP_SAVE_XMM128 8 #define UWOP_SAVE_XMM128_FAR 9 #define UWOP_PUSH_MACHFRAME 10 + +#define UNW_FLAG_NHANDLER 0 +#define UNW_FLAG_EHANDLER 1 +#define UNW_FLAG_UHANDLER 2 +#define UNW_FLAG_CHAININFO 4 typedef unsigned char UBYTE; @@ -611,3 +616,69 @@ return; } + +// FIXME: move to different file +VOID +NTAPI +RtlRaiseException(IN PEXCEPTION_RECORD ExceptionRecord) +{ + CONTEXT Context; + NTSTATUS Status; + ULONG64 ImageBase; + PRUNTIME_FUNCTION FunctionEntry; + PVOID HandlerData; + ULONG64 EstablisherFrame; + + /* Capture the context */ + RtlCaptureContext(&Context); + + /* Get the function entry for this function */ + FunctionEntry = RtlLookupFunctionEntry(Context.Rip, + &ImageBase, + NULL); + + /* Check if we found it */ + if (FunctionEntry) + { + /* Unwind to the caller of this function */ + RtlVirtualUnwind(UNW_FLAG_NHANDLER, + ImageBase, + Context.Rip, + FunctionEntry, + &Context, + &HandlerData, + &EstablisherFrame, + NULL); + + /* Save the exception address */ + ExceptionRecord->ExceptionAddress = (PVOID)Context.Rip; + + /* Write the context flag */ + Context.ContextFlags = CONTEXT_FULL; + + /* Check if user mode debugger is active */ + if (RtlpCheckForActiveDebugger()) + { + /* Raise an exception immediately */ + Status = ZwRaiseException(ExceptionRecord, &Context, TRUE); + } + else + { + /* Dispatch the exception and check if we should continue */ + if (!RtlDispatchException(ExceptionRecord, &Context)) + { + /* Raise the exception */ + Status = ZwRaiseException(ExceptionRecord, &Context, FALSE); + } + else + { + /* Continue, go back to previous context */ + Status = ZwContinue(&Context, FALSE); + } + } + } + + /* If we returned, raise a status */ + RtlRaiseStatus(Status); +} + Modified: branches/ros-amd64-bringup/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/exception.c [iso-8859-1] Sat Nov 7 16:26:12 2009 @@ -17,7 +17,7 @@ /* FUNCTIONS ***************************************************************/ -#if !defined(_M_IX86) +#if !defined(_M_IX86) && !defined(_M_AMD64) /* * @implemented @@ -62,6 +62,10 @@ /* If we returned, raise a status */ RtlRaiseStatus(Status); } + +#endif + +#if !defined(_M_IX86) #ifdef _MSC_VER #pragma warning(push)

1 0

[hyperion] 44000: Don't uppercase module name in _TARGET macros. This commit will amazingly not trigger a full rebuild
by hyperion＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: hyperion Date: Sat Nov 7 16:20:45 2009 New Revision: 44000 URL: http://svn.reactos.org/svn/reactos?rev=44000&view=rev Log: Don't uppercase module name in _TARGET macros. This commit will amazingly not trigger a full rebuild Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/rules.mak 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] Sat Nov 7 16:20:45 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 @@ -31,7 +31,7 @@ #(module, source, dependencies, cflags, output) define RBUILD_CL_CPP -$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} +$(5): $(2) $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) ${call RBUILD_PIPE_CL_CPP,$$<,$(4)} > $$@ @@ -50,13 +50,13 @@ ${call RBUILD_DEPENDS,$(1),$(2),,${call RBUILD_cflags,$(1),$(4)},$(5).d} -include $(5).d -$(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} +$(5): $(2) $(5).d $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) $${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$< else -$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} +$(5): $(2) $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) $${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$< @@ -74,13 +74,13 @@ ${call RBUILD_CXX_DEPENDS,$(1),$(2),,${call RBUILD_cflags,$(1),$(4)},$(5).d} -include $(5).d -$(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} +$(5): $(2) $(5).d $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) $${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$< else -$(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} +$(5): $(2) $(3) $$(rbuild_helper_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) $${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$< Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Sat Nov 7 16:20:45 2009 @@ -1,1 +1,32 @@ -# TODO +#~ #(module, objs, deps, ldflags, output, libs, subsys, entry, base, falign, salign) +#~ define RBUILD_LINK + +#~ $(5) ${call RBUILD_output_dir,$(5)}$$(SEP)$(basename $(notdir $(5))).map: $(2) $(3) $(6) | ${call RBUILD_dir,$(5)} + #~ $$(ECHO_CC) + #~ $${ld} -subsystem=$(7) -entry=$(8) -base=$(9) -file-alignment=$(10) -section-alignment=$(11) $(2) $(6) ${call RBUILD_ldflags,$(1),$(4)} -o $(5) +#~ ifeq ($(ROS_BUILDMAP),full) + #~ $$(ECHO_OBJDUMP) + #~ $${objdump} -d -S $$@ > ${call RBUILD_output_dir,$(5)}$$(SEP)$(basename $(notdir $(5))).map +#~ else +#~ ifeq ($(ROS_BUILDMAP),yes) + #~ $$(ECHO_NM) + #~ $${nm} --numeric-sort $$@ > ${call RBUILD_output_dir,$(5)}$$(SEP)$(basename $(notdir $(5))).map +#~ endif +#~ endif +#~ ifeq ($(ROS_BUILDNOSTRIP),yes) + #~ $$(ECHO_CP) + #~ $${cp} $(5) $(basename $(5)).nostrip$(suffix $(5)) 1>$(NUL) +#~ endif +#~ ifneq ($(ROS_GENERATE_RSYM),no) + #~ $$(ECHO_RSYM) + #~ $$(Q)$$(rsym_TARGET) $$@ $$@ +#~ endif +#~ ifeq ($(ROS_LEAN_AND_MEAN),yes) + #~ $$(ECHO_STRIP) + #~ $${strip} -s -x -X $$@ +#~ endif + +#~ endef + +#~ #(module, dependencies, ldflags, subsys, entry, base, falign, salign) +#~ RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(1)_OBJS,$(2),$(3),$(1)_TARGET,$(1)_LIBS,$(4),$(5),$(6),$(7),$(8)} 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] Sat Nov 7 16:20:45 2009 @@ -63,7 +63,6 @@ GetTargetMacro ( const Module& module, bool with_dollar ) { string s ( module.name ); - strupr ( &s[0] ); s += "_TARGET"; if ( with_dollar ) return ssprintf ( "$(%s)", s.c_str() ); @@ -1157,9 +1156,9 @@ "$(intermediate_dir)$(SEP)", NULL ); /* TODO: move these to rules.mak */ -Rule wmcRule ( "$(intermediate_path_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET) $(source) | $(intermediate_dir)\n" +Rule wmcRule ( "$(intermediate_path_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(wmc_TARGET) $(source) | $(intermediate_dir)\n" "\t$(ECHO_WMC)\n" - "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o $(intermediate_path_noext).rc $(source)\n", + "\t$(Q)$(wmc_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h -o $(intermediate_path_noext).rc $(source)\n", "$(intermediate_path_noext).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h", "$(intermediate_dir)$(SEP)", NULL ); @@ -1485,8 +1484,8 @@ string linkerScriptArgument; if ( module.linkerScript != NULL ) - linkerScriptArgument = ssprintf ( " -T %s", backend->GetFullName ( *module.linkerScript->file ).c_str () ); - else + linkerScriptArgument = ssprintf ( " -T %s", backend->GetFullName ( *module.linkerScript->file ).c_str () ); + else linkerScriptArgument = ""; /* check if we need to add default C++ libraries, ie if we have @@ -1944,7 +1943,7 @@ module.name.c_str () ); string dependencies = GetTargetMacro ( module ); if ( module.type == Test ) - dependencies += " $(REGTESTS_RUN_TARGET)"; + dependencies += " $(regtests_run_TARGET)"; fprintf ( fMakefile, "%s: %s\n\n", module.name.c_str (), dependencies.c_str () ); @@ -2064,17 +2063,17 @@ if (module.name != "psdk" && module.name != "dxsdk") { - dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" ); - dependencies.push_back ( "$(DXSDK_TARGET) $(dxsdk_HEADERS)" ); + dependencies.push_back ( "$(psdk_TARGET) $(psdk_HEADERS)" ); + dependencies.push_back ( "$(dxsdk_TARGET) $(dxsdk_HEADERS)" ); } if (module.name != "errcodes" && module.name != "bugcodes" && module.name != "ntstatus") { - dependencies.push_back ( "$(ERRCODES_TARGET) $(ERRCODES_MCHEADERS)" ); - dependencies.push_back ( "$(BUGCODES_TARGET) $(BUGCODES_MCHEADERS)" ); - dependencies.push_back ( "$(NTSTATUS_TARGET) $(NTSTATUS_MCHEADERS)" ); + dependencies.push_back ( "$(errcodes_TARGET) $(ERRCODES_MCHEADERS)" ); + dependencies.push_back ( "$(bugcodes_TARGET) $(BUGCODES_MCHEADERS)" ); + dependencies.push_back ( "$(ntstatus_TARGET) $(NTSTATUS_MCHEADERS)" ); } ///* Check if any dependent library relies on the generated headers */ @@ -3138,16 +3137,16 @@ fprintf ( fMakefile, ".PHONY: %s_CABINET\n\n", module.name.c_str () ); - fprintf ( fMakefile, "%s_CABINET: all $(CABMAN_TARGET) %s | %s\n", + fprintf ( fMakefile, "%s_CABINET: all $(cabman_TARGET) %s | %s\n", module.name.c_str (), backend->GetFullName ( reactosDff ).c_str (), backend->GetFullPath ( bootcdReactos ).c_str () ); fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", + "\t$(Q)$(cabman_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (), backend->GetFullPath ( bootcdReactos ).c_str () ); fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n", + "\t$(Q)$(cabman_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (), backend->GetFullName ( reactosInf ).c_str (), backend->GetFullPath ( bootcdReactos ).c_str ()); @@ -3167,7 +3166,7 @@ fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, - "%s: $(%s_OBJS) %s_CABINET %s $(CDMAKE_TARGET) | %s\n", + "%s: $(%s_OBJS) %s_CABINET %s $(cdmake_TARGET) | %s\n", module.name.c_str (), module.name.c_str (), module.name.c_str (), @@ -3178,7 +3177,7 @@ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, - "\t$(Q)$(CDMAKE_TARGET) -v -j -m -b %s %s REACTOS %s\n", + "\t$(Q)$(cdmake_TARGET) -v -j -m -b %s %s REACTOS %s\n", backend->GetFullName ( *isoboot ).c_str (), backend->GetFullPath ( bootcd ).c_str (), IsoName.c_str() ); @@ -3299,7 +3298,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst_$(ARCH).inf\n", + "\t$(mkhive_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, backend->GetFullPath ( reactosSystem32ConfigDirectory ).c_str (), cSep, cSep, cSep, cSep ); } @@ -3357,7 +3356,7 @@ fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, - "%s : $(%s_OBJS) %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", + "%s : $(%s_OBJS) %s %s $(mkhive_TARGET) $(cdmake_TARGET)\n", module.name.c_str (), module.name.c_str (), backend->GetFullName ( *isoboot) .c_str (), @@ -3367,7 +3366,7 @@ OutputRegistryCommands ( livecdDirectory ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, - "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS %s\n", + "\t$(Q)$(cdmake_TARGET) -v -m -j -b %s %s REACTOS %s\n", backend->GetFullName( *isoboot ).c_str (), backend->GetFullPath ( livecd ).c_str (), IsoName.c_str() ); @@ -3456,13 +3455,13 @@ GenerateRules (); const FileLocation *target_file = GetTargetFilename ( module, NULL ); - fprintf ( fMakefile, "%s: $(CABMAN_TARGET) | %s\n", + fprintf ( fMakefile, "%s: $(cabman_TARGET) | %s\n", targetMacro.c_str (), backend->GetFullPath ( *target_file ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -M raw -S %s $(%s_SOURCES)\n", // Escape the asterisk for Make + "\t$(Q)$(cabman_TARGET) -M raw -S %s $(%s_SOURCES)\n", // Escape the asterisk for Make targetMacro.c_str (), module.name.c_str()); } Modified: 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 [iso-8859-1] Sat Nov 7 16:20:45 2009 @@ -8,12 +8,15 @@ #(source) RBUILD_intermediate_path_noext=${call RBUILD_intermediate_dir,$(1)}$(SEP)$(basename $(notdir $(1))) +RBUILD_output_path_noext=${call RBUILD_output_dir,$(1)}$(SEP)$(basename $(notdir $(1))) #(module, source) RBUILD_intermediate_path_unique=${call RBUILD_intermediate_path_noext,$(2)}_$(1) +RBUILD_output_dir=${call RBUILD_output_path_noext,$(2)}_$(1) #(source) RBUILD_intermediate_dir=${call RBUILD_fullpath,$(value INTERMEDIATE)$(SEP)$(dir ${call RBUILD_strip_prefixes,$(1)})} +RBUILD_output_dir=${call RBUILD_fullpath,$(value OUTPUT)$(SEP)$(dir ${call RBUILD_strip_prefixes,$(1)})} #(source) RBUILD_source_name=$(basename $(notdir $(1))) @@ -150,18 +153,18 @@ #(module, source, dependencies, cflags, module_dllname, output) define RBUILD_WINEBUILD_DEF -$(6): $(2) $$(WINEBUILD_TARGET) | ${call RBUILD_intermediate_dir,$(6)} +$(6): $(2) $$(winebuild_TARGET) | ${call RBUILD_intermediate_dir,$(6)} $$(ECHO_WINEBLD) - $$(Q)$$(WINEBUILD_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --def -E $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} + $$(Q)$$(winebuild_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --def -E $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} endef #(module, source, dependencies, cflags, module_dllname, output) define RBUILD_WINEBUILD_STUBS -$(6): $(2) $$(WINEBUILD_TARGET) | ${call RBUILD_intermediate_dir,$(6)} +$(6): $(2) $$(winebuild_TARGET) | ${call RBUILD_intermediate_dir,$(6)} $$(ECHO_WINEBLD) - $$(Q)$$(WINEBUILD_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --pedll $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} + $$(Q)$$(winebuild_TARGET) $$(WINEBUILD_FLAGS) -o $$@ --pedll $$< --filename $(5) ${call RBUILD_spec_flags,$(1),$(4)} endef @@ -207,15 +210,15 @@ ${call RBUILD_DEPENDS,$(1),$(2),,${call RBUILD_rc_pp_flags,$(1),$(4)},${call RBUILD_intermediate_path_unique,$(1),$(2)}.res.d} -include ${call RBUILD_intermediate_path_unique,$(1),$(2)}.coff.d -${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res.d $(3) $$(WRC_TARGET) | ${call RBUILD_intermediate_dir,$(2)} +${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res.d $(3) $$(wrc_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_RC) - ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} + ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(wrc_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} else -${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(WRC_TARGET) | ${call RBUILD_intermediate_dir,$(2)} +${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(wrc_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_RC) - ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} + ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(wrc_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} endif @@ -233,9 +236,9 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}.h: $(2) $(3) $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) - $$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H $$@ $$< +${call RBUILD_intermediate_path_noext,$(2)}.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H $$@ $$< endef @@ -244,9 +247,9 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call RBUILD_intermediate_path_noext,$(2)}_c.h: $(2) $(3) $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) - $$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) +${call RBUILD_intermediate_path_noext,$(2)}_c.c ${call RBUILD_intermediate_path_noext,$(2)}_c.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_c.h -c -C ${call RBUILD_intermediate_path_noext,$(2)}_c.c $(2) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_c.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_c.o} @@ -257,9 +260,9 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call RBUILD_intermediate_path_noext,$(2)}_s.h: $(2) $(3) $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) - $$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) +${call RBUILD_intermediate_path_noext,$(2)}_s.c ${call RBUILD_intermediate_path_noext,$(2)}_s.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_s.h -s -S ${call RBUILD_intermediate_path_noext,$(2)}_s.c $(2) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_s.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_s.o} @@ -270,9 +273,9 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call RBUILD_intermediate_path_noext,$(2)}_p.h: $(2) $(3) $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) - $$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) +${call RBUILD_intermediate_path_noext,$(2)}_p.c ${call RBUILD_intermediate_path_noext,$(2)}_p.h: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -h -H ${call RBUILD_intermediate_path_noext,$(2)}_p.h -p -P ${call RBUILD_intermediate_path_noext,$(2)}_p.c $(2) ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_p.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_p.o} @@ -283,9 +286,9 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_path_noext,$(2)}_i.c: $(2) $(3) $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) - $$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -u -U $$@ $$< +${call RBUILD_intermediate_path_noext,$(2)}_i.c: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -u -U $$@ $$< ${call RBUILD_CC,$(1),${call RBUILD_intermediate_path_noext,$(2)}_i.c,,-fno-unit-at-a-time,${call RBUILD_intermediate_path_noext,$(2)}_i.o} @@ -295,9 +298,9 @@ #(module, source, dependencies, cflags, bare_dependencies) define RBUILD_WIDL_DLLDATA_RULE -$(2): $(3) ${$(1)_precondition} $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) - $$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4)} --dlldata-only --dlldata=$(2) $(5) +$(2): $(3) ${$(1)_precondition} $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4)} --dlldata-only --dlldata=$(2) $(5) ${call RBUILD_CC,$(1),$(2),,,${call RBUILD_intermediate_path_noext,$(2)}.o} @@ -308,9 +311,9 @@ $(2): $${$(1)_precondition} -${call RBUILD_intermediate_dir,$(2)}$$(SEP)$(1).tlb: $(2) $(3) $$(WIDL_TARGET) | ${call RBUILD_intermediate_dir,$(2)} - $$(ECHO_WIDL) - $$(Q)$$(WIDL_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -t -T $$@ $$< +${call RBUILD_intermediate_dir,$(2)}$$(SEP)$(1).tlb: $(2) $(3) $$(widl_TARGET) | ${call RBUILD_intermediate_dir,$(2)} + $$(ECHO_WIDL) + $$(Q)$$(widl_TARGET) ${call RBUILD_midlflags,$(1),$(4),-I${call RBUILD_dir,$(2)}} -t -T $$@ $$< endef

1 0

[fireball] 43999: - Satisfy only one thread waiting on message queue at a time as expected by the original implementation.
by fireball＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: fireball Date: Sat Nov 7 16:06:32 2009 New Revision: 43999 URL: http://svn.reactos.org/svn/reactos?rev=43999&view=rev Log: - Satisfy only one thread waiting on message queue at a time as expected by the original implementation. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Sat Nov 7 16:06:32 2009 @@ -253,7 +253,7 @@ if ((queue = alloc_object( &msg_queue_ops ))) { queue->fd = NULL; - ZwCreateEvent(&queue->wake_event, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE); + ZwCreateEvent(&queue->wake_event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); /* Get a pointer to the object itself */ ObReferenceObjectByHandle(queue->wake_event, EVENT_ALL_ACCESS, @@ -338,7 +338,7 @@ queue->changed_bits |= bits; if (is_signaled( queue )) { - KePulseEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); + KeSetEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); } } @@ -914,7 +914,7 @@ if (event & (POLLERR | POLLHUP)) set_fd_events( fd, -1 ); else set_fd_events( queue->fd, 0 ); - KePulseEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); + KeSetEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); } static void thread_input_dump( struct object *obj, int verbose ) @@ -1686,7 +1686,7 @@ } else { - KePulseEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); + KeSetEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); } } }

1 0

[dreimer] 43998: Updated Installer, Readme and changelog for RosBE 1.5 RC1
by dreimer＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: dreimer Date: Sat Nov 7 16:00:12 2009 New Revision: 43998 URL: http://svn.reactos.org/svn/reactos?rev=43998&view=rev Log: Updated Installer, Readme and changelog for RosBE 1.5 RC1 Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat Nov 7 16:00:12 2009 @@ -4,6 +4,8 @@ - Updated GCC to 4.4.2 (including backported GCC r153606) - Updated MinGW Runtime to 3.16 - Updated w32api to 3.13 +- Added Remake command (Daniel Reimer) +- Fixed a few renaming bugs (Daniel Reimer) *** Oct 26th, 2009 - RosBE 1.4.5 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sat Nov 7 16:00:12 2009 @@ -124,6 +124,7 @@ File /r Components\Powershell\chdefgcc.ps1 File /r Components\Powershell\Clean.ps1 File /r Components\Powershell\Help.ps1 + File /r Components\Powershell\Remake.ps1 File /r Components\Powershell\RosBE.ps1 File /r Components\Powershell\rosbe-gcc-env.ps1 File /r Components\Powershell\version.ps1 @@ -137,6 +138,7 @@ File /r Root\Help.cmd File /r Root\Make.cmd File /r Root\Makex.cmd + File /r Root\Remake.cmd File /r Root\Renv.cmd File /r Root\RosBE.cmd File /r Root\rosbe-gcc-env.cmd @@ -323,6 +325,7 @@ File /r Root\chdefdir.cmd File /r Root\Config.cmd File /r Root\options.cmd + File /r Root\Remake.cmd File /r Root\raddr2line.cmd File /r Root\scut.cmd File /r Root\sSVN.cmd @@ -351,6 +354,7 @@ File /r Components\Powershell\chdefdir.ps1 File /r Components\Powershell\Config.ps1 File /r Components\Powershell\options.ps1 + File /r Components\Powershell\Remake.ps1 File /r Components\Powershell\reladdr2line.ps1 File /r Components\Powershell\scut.ps1 File /r Components\Powershell\sSVN.ps1 @@ -485,6 +489,8 @@ Delete /REBOOTOK "$INSTDIR\raddr2line.cmd" Delete /REBOOTOK "$INSTDIR\reladdr2line.ps1" Delete /REBOOTOK "$INSTDIR\Renv.cmd" + Delete /REBOOTOK "$INSTDIR\Remake.cmd" + Delete /REBOOTOK "$INSTDIR\Remake.ps1" Delete /REBOOTOK "$INSTDIR\RosBE.cmd" Delete /REBOOTOK "$INSTDIR\RosBE.ps1" Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.cmd"

1 0

[janderwald] 43997: [DSOUND] - Add more checks IDirectSoundCapture::CreateCaptureBuffer - Implement IDirectSoundNotify interface - Needs work from ks / portcls to work on formats supported natively by the driver
by janderwald＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: janderwald Date: Sat Nov 7 14:49:01 2009 New Revision: 43997 URL: http://svn.reactos.org/svn/reactos?rev=43997&view=rev Log: [DSOUND] - Add more checks IDirectSoundCapture::CreateCaptureBuffer - Implement IDirectSoundNotify interface - Needs work from ks / portcls to work on formats supported natively by the driver Added: trunk/reactos/dll/directx/dsound_new/notify.c (with props) Modified: trunk/reactos/dll/directx/dsound_new/capture.c trunk/reactos/dll/directx/dsound_new/capturebuffer.c trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild trunk/reactos/dll/directx/dsound_new/precomp.h Modified: trunk/reactos/dll/directx/dsound_new/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/capture.c [iso-8859-1] Sat Nov 7 14:49:01 2009 @@ -18,7 +18,6 @@ LPFILTERINFO Filter; }CDirectSoundCaptureImpl, *LPCDirectSoundCaptureImpl; - HRESULT WINAPI CDirectSoundCapture_fnQueryInterface( @@ -100,25 +99,20 @@ if (!lpcDSBufferDesc || !ppDSCBuffer || pUnkOuter != NULL) { - DPRINT("Invalid parameter %p %p %p\n", lpcDSBufferDesc, ppDSCBuffer, pUnkOuter); + /* invalid param */ return DSERR_INVALIDPARAM; } /* check buffer description */ - if ((lpcDSBufferDesc->dwSize != sizeof(DSCBUFFERDESC) && lpcDSBufferDesc->dwSize != sizeof(DSCBUFFERDESC1)) || lpcDSBufferDesc->dwReserved != 0) - { - DPRINT("Invalid buffer description size %u expected %u or %u dwReserved %u\n", lpcDSBufferDesc->dwSize, sizeof(DSBUFFERDESC1), sizeof(DSBUFFERDESC), lpcDSBufferDesc->dwReserved); - return DSERR_INVALIDPARAM; - } - - /* sanity check */ - ASSERT(lpcDSBufferDesc->lpwfxFormat); - - if (lpcDSBufferDesc->lpwfxFormat) - { - DPRINT("This %p wFormatTag %x nChannels %u nSamplesPerSec %u nAvgBytesPerSec %u NBlockAlign %u wBitsPerSample %u cbSize %u\n", - This, lpcDSBufferDesc->lpwfxFormat->wFormatTag, lpcDSBufferDesc->lpwfxFormat->nChannels, lpcDSBufferDesc->lpwfxFormat->nSamplesPerSec, lpcDSBufferDesc->lpwfxFormat->nAvgBytesPerSec, lpcDSBufferDesc->lpwfxFormat->nBlockAlign, lpcDSBufferDesc->lpwfxFormat->wBitsPerSample, lpcDSBufferDesc->lpwfxFormat->cbSize); - } + if ((lpcDSBufferDesc->dwSize != sizeof(DSCBUFFERDESC) && lpcDSBufferDesc->dwSize != sizeof(DSCBUFFERDESC1)) || + lpcDSBufferDesc->dwReserved != 0 || lpcDSBufferDesc->dwBufferBytes == 0 || lpcDSBufferDesc->lpwfxFormat == NULL) + { + /* invalid buffer description */ + return DSERR_INVALIDPARAM; + } + + DPRINT("This %p wFormatTag %x nChannels %u nSamplesPerSec %u nAvgBytesPerSec %u NBlockAlign %u wBitsPerSample %u cbSize %u\n", + This, lpcDSBufferDesc->lpwfxFormat->wFormatTag, lpcDSBufferDesc->lpwfxFormat->nChannels, lpcDSBufferDesc->lpwfxFormat->nSamplesPerSec, lpcDSBufferDesc->lpwfxFormat->nAvgBytesPerSec, lpcDSBufferDesc->lpwfxFormat->nBlockAlign, lpcDSBufferDesc->lpwfxFormat->wBitsPerSample, lpcDSBufferDesc->lpwfxFormat->cbSize); hResult = NewDirectSoundCaptureBuffer((LPDIRECTSOUNDCAPTUREBUFFER8*)ppDSCBuffer, This->Filter, lpcDSBufferDesc); return hResult; Modified: trunk/reactos/dll/directx/dsound_new/capturebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cap… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/capturebuffer.c [iso-8859-1] Sat Nov 7 14:49:01 2009 @@ -15,11 +15,14 @@ const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSEVENTSETID_LoopedStreaming = {0x4682B940L, 0xC6EF, 0x11D0, {0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D}}; + typedef struct { IDirectSoundCaptureBuffer8Vtbl *lpVtbl; + LONG ref; LPFILTERINFO Filter; HANDLE hPin; @@ -36,6 +39,8 @@ volatile LONG StopMixerThread; volatile LONG CurrentMixPosition; + LPDIRECTSOUNDNOTIFY Notify; + }CDirectSoundCaptureBufferImpl, *LPCDirectSoundCaptureBufferImpl; DWORD @@ -108,6 +113,13 @@ BufferPosition += BytesWritten; DPRINT("MixPosition %u BufferPosition %u BytesRead %u BytesWritten %u MixLength %u BufferLength %u\n", MixPosition, BufferPosition, BytesRead, BytesWritten, MixLength, BufferLength); } + + /* Notify Events */ + if (This->Notify) + { + DoNotifyPositionEvents(This->Notify, This->CurrentMixPosition, BufferPosition); + } + /* update offset */ InterlockedExchange(&This->CurrentMixPosition, (LONG)BufferPosition); @@ -143,6 +155,25 @@ { *ppobj = (LPVOID)&This->lpVtbl; InterlockedIncrement(&This->ref); + return S_OK; + } + + /* check if the interface is supported */ + if (IsEqualIID(riid, &IID_IDirectSoundNotify)) + { + if (!This->Notify) + { + HRESULT hr = NewDirectSoundNotify(&This->Notify, This->bLoop, This->bMix, This->hPin, This->BufferSize); + if (FAILED(hr)) + return hr; + + *ppobj = (LPVOID)This->Notify; + return S_OK; + } + + /* increment reference count on existing notify object */ + IDirectSoundNotify_AddRef(This->Notify); + *ppobj = (LPVOID)This->Notify; return S_OK; } @@ -650,6 +681,8 @@ }; + + HRESULT NewDirectSoundCaptureBuffer( LPDIRECTSOUNDCAPTUREBUFFER8 *OutBuffer, Modified: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild [iso-8859-1] Sat Nov 7 14:49:01 2009 @@ -22,6 +22,7 @@ <file>dsound.c</file> <file>enum.c</file> <file>misc.c</file> + <file>notify.c</file> <file>primary.c</file> <file>property.c</file> <file>regsvr.c</file> Added: trunk/reactos/dll/directx/dsound_new/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/not… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/notify.c (added) +++ trunk/reactos/dll/directx/dsound_new/notify.c [iso-8859-1] Sat Nov 7 14:49:01 2009 @@ -1,0 +1,256 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/directx/dsound_new/notify.c + * PURPOSE: IDirectSoundNotify implementation + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + + +#include "precomp.h" + +typedef struct tagNOTIFYEVENT +{ + DWORD NotifyCount; + PLOOPEDSTREAMING_POSITION_EVENT_DATA Notify; + struct tagNOTIFYEVENT *lpNext; +}NOTIFYEVENT, *LPNOTIFYEVENT; + +typedef struct +{ + IDirectSoundNotifyVtbl * lpVtbl; + LONG ref; + + LPNOTIFYEVENT EventListHead; + BOOL bLoop; + BOOL bMix; + HANDLE hPin; + DWORD BufferSize; + +}CDirectSoundNotifyImpl, *LPCDirectSoundNotifyImpl; + +static +ULONG +WINAPI +IDirectSoundNotify_fnAddRef( + LPDIRECTSOUNDNOTIFY iface) +{ + ULONG ref; + LPCDirectSoundNotifyImpl This = (LPCDirectSoundNotifyImpl)CONTAINING_RECORD(iface, CDirectSoundNotifyImpl, lpVtbl); + + /* increment reference count */ + ref = InterlockedIncrement(&This->ref); + + return ref; +} + +static +ULONG +WINAPI +IDirectSoundNotify_fnRelease( + LPDIRECTSOUNDNOTIFY iface) +{ + ULONG ref; + LPCDirectSoundNotifyImpl This = (LPCDirectSoundNotifyImpl)CONTAINING_RECORD(iface, CDirectSoundNotifyImpl, lpVtbl); + + ref = InterlockedDecrement(&(This->ref)); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +HRESULT +WINAPI +IDirectSoundNotify_fnQueryInterface( + LPDIRECTSOUNDNOTIFY iface, + IN REFIID riid, + LPVOID* ppobj) +{ + LPCDirectSoundNotifyImpl This = (LPCDirectSoundNotifyImpl)CONTAINING_RECORD(iface, CDirectSoundNotifyImpl, lpVtbl); + + /* check if the interface is supported */ + if (IsEqualIID(riid, &IID_IDirectSoundNotify) || IsEqualIID(riid, &IID_IUnknown)) + { + *ppobj = (LPVOID)&This->lpVtbl; + InterlockedIncrement(&This->ref); + return S_OK; + } + + return E_NOINTERFACE; +} + +HRESULT +WINAPI +IDirectSoundNotify_fnSetNotificationPositions( + LPDIRECTSOUNDNOTIFY iface, + DWORD dwPositionNotifies, + LPCDSBPOSITIONNOTIFY pcPositionNotifies) +{ + DWORD Index; + LPNOTIFYEVENT Notify; + DWORD Result; + KSEVENT Request; + + LPCDirectSoundNotifyImpl This = (LPCDirectSoundNotifyImpl)CONTAINING_RECORD(iface, CDirectSoundNotifyImpl, lpVtbl); + + if (dwPositionNotifies > DSBNOTIFICATIONS_MAX) + { + /* invalid param */ + return DSERR_INVALIDPARAM; + } + + /* verify notification event handles */ + for(Index = 0; Index < dwPositionNotifies; Index++) + { + ASSERT(pcPositionNotifies[Index].hEventNotify); + ASSERT(pcPositionNotifies[Index].dwOffset < This->BufferSize || pcPositionNotifies[Index].dwOffset != DSBPN_OFFSETSTOP); + + if (pcPositionNotifies[Index].hEventNotify == NULL) + return DSERR_INVALIDPARAM; + + if (pcPositionNotifies[Index].dwOffset > This->BufferSize && pcPositionNotifies[Index].dwOffset != DSBPN_OFFSETSTOP) + return DSERR_INVALIDPARAM; + } + + /* allocate new array */ + Notify = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NOTIFYEVENT)); + if (!Notify) + { + /* not enough memory */ + return DSERR_OUTOFMEMORY; + } + + /* allocate new array */ + Notify->Notify = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwPositionNotifies * sizeof(LOOPEDSTREAMING_POSITION_EVENT_DATA)); + if (!Notify->Notify) + { + /* not enough memory */ + HeapFree(GetProcessHeap(), 0, Notify); + return DSERR_OUTOFMEMORY; + } + + /* FIXME support non-looped streaming */ + ASSERT(This->bLoop); + + /* prepare request */ + Request.Set = KSEVENTSETID_LoopedStreaming; + Request.Id = KSEVENT_LOOPEDSTREAMING_POSITION; + Request.Flags = KSEVENT_TYPE_ENABLE; + + for(Index = 0; Index < dwPositionNotifies; Index++) + { + /* initialize event entries */ + Notify->Notify[Index].Position = pcPositionNotifies[Index].dwOffset; + Notify->Notify[Index].KsEventData.EventHandle.Event = pcPositionNotifies[Index].hEventNotify; + Notify->Notify[Index].KsEventData.NotificationType = KSEVENTF_EVENT_HANDLE; + + if (This->bMix == FALSE) + { + /* format is supported natively */ + Result = SyncOverlappedDeviceIoControl(This->hPin, IOCTL_KS_ENABLE_EVENT, (PVOID)&Request, sizeof(KSEVENT), (PVOID)&Notify->Notify[Index], sizeof(LOOPEDSTREAMING_POSITION_EVENT_DATA), NULL); + + if (Result != ERROR_SUCCESS) + { + DPRINT1("Failed to enable event %p Position %u\n", pcPositionNotifies[Index].hEventNotify, pcPositionNotifies[Index].dwOffset); + return DSERR_GENERIC; + } + } + } + + /* enlarge notify count */ + Notify->NotifyCount = dwPositionNotifies; + + if (This->EventListHead) + { + Notify->lpNext = This->EventListHead; + } + + /* insert at front */ + (void)InterlockedExchangePointer((LPVOID*)&This->EventListHead, Notify); + + return DS_OK; +} + +static IDirectSoundNotifyVtbl vt_DirectSoundNotify = +{ + /* IUnknown methods */ + IDirectSoundNotify_fnQueryInterface, + IDirectSoundNotify_fnAddRef, + IDirectSoundNotify_fnRelease, + /* IDirectSoundNotify */ + IDirectSoundNotify_fnSetNotificationPositions +}; + + +VOID +DoNotifyPositionEvents( + LPDIRECTSOUNDNOTIFY iface, + DWORD OldPosition, + DWORD NewPosition) +{ + DWORD Index; + LPNOTIFYEVENT CurEventList; + + LPCDirectSoundNotifyImpl This = (LPCDirectSoundNotifyImpl)CONTAINING_RECORD(iface, CDirectSoundNotifyImpl, lpVtbl); + + CurEventList = This->EventListHead; + + while(CurEventList) + { + for(Index = 0; Index < CurEventList->NotifyCount; Index++) + { + if (NewPosition > OldPosition) + { + /* buffer progress no overlap */ + if (OldPosition < CurEventList->Notify[Index].Position && CurEventList->Notify[Index].Position <= NewPosition) + { + /* process event */ + SetEvent(CurEventList->Notify[Index].KsEventData.EventHandle.Event); + } + } + else + { + /* buffer wrap-arround */ + if (OldPosition < CurEventList->Notify[Index].Position || NewPosition > CurEventList->Notify[Index].Position) + { + /* process event */ + SetEvent(CurEventList->Notify[Index].KsEventData.EventHandle.Event); + } + } + } + + /* iterate to next event list */ + CurEventList = CurEventList->lpNext; + } +} + +HRESULT +NewDirectSoundNotify( + LPDIRECTSOUNDNOTIFY * Notify, + BOOL bLoop, + BOOL bMix, + HANDLE hPin, + DWORD BufferSize) +{ + LPCDirectSoundNotifyImpl This = HeapAlloc(GetProcessHeap(), 0, sizeof(CDirectSoundNotifyImpl)); + + if (!This) + return DSERR_OUTOFMEMORY; + + This->lpVtbl = &vt_DirectSoundNotify; + This->bLoop = bLoop; + This->bMix = bMix; + This->hPin = hPin; + This->ref = 1; + This->EventListHead = NULL; + This->BufferSize = BufferSize; + + *Notify = (LPDIRECTSOUNDNOTIFY)&This->lpVtbl; + return DS_OK; + +} Propchange: trunk/reactos/dll/directx/dsound_new/notify.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/dsound_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Sat Nov 7 14:49:01 2009 @@ -252,4 +252,19 @@ LPFILTERINFO Filter, LPCDSCBUFFERDESC lpcDSBufferDesc); +/* notify.c */ +VOID +DoNotifyPositionEvents( + LPDIRECTSOUNDNOTIFY iface, + DWORD OldPosition, + DWORD NewPosition); + +HRESULT +NewDirectSoundNotify( + LPDIRECTSOUNDNOTIFY * Notify, + BOOL bLoop, + BOOL bMix, + HANDLE hPin, + DWORD BufferSize); + #endif

1 0

[janderwald] 43996: - Add a few constants and types required event handling
by janderwald＠svn.reactos.org 07 Nov '09

07 Nov '09

Author: janderwald Date: Sat Nov 7 13:57:07 2009 New Revision: 43996 URL: http://svn.reactos.org/svn/reactos?rev=43996&view=rev Log: - Add a few constants and types required event handling Modified: trunk/reactos/include/psdk/dsound.h trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dsound.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dsound.h [iso-8859-1] Sat Nov 7 13:57:07 2009 @@ -873,6 +873,7 @@ #define WINE_NOBUFFER 0x80000000 #define DSBPN_OFFSETSTOP -1 +#define DSBNOTIFICATIONS_MAX 100000UL #define INTERFACE IDirectSoundNotify DECLARE_INTERFACE_(IDirectSoundNotify,IUnknown) Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4399… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Nov 7 13:57:07 2009 @@ -312,6 +312,8 @@ 0x8C6F932CL, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 DEFINE_GUIDSTRUCT("8C6F932C-E771-11D0-B8FF-00A0C9223196", KSINTERFACESETID_FileIo); #define KSINTERFACESETID_FileIo DEFINE_GUIDNAMED(KSINTERFACESETID_FileIo) + + /* =============================================================== @@ -1723,6 +1725,26 @@ }; } KSEVENTDATA, *PKSEVENTDATA; +#define KSEVENTF_EVENT_HANDLE 0x00000001 +#define KSEVENTF_SEMAPHORE_HANDLE 0x00000002 +#if defined(_NTDDK_) +#define KSEVENTF_EVENT_OBJECT 0x00000004 +#define KSEVENTF_SEMAPHORE_OBJECT 0x00000008 +#define KSEVENTF_DPC 0x00000010 +#define KSEVENTF_WORKITEM 0x00000020 +#define KSEVENTF_KSWORKITEM 0x00000080 +#endif + + +#define KSEVENT_TYPE_ENABLE 0x00000001 +#define KSEVENT_TYPE_ONESHOT 0x00000002 +#define KSEVENT_TYPE_ENABLEBUFFERED 0x00000004 +#define KSEVENT_TYPE_SETSUPPORT 0x00000100 +#define KSEVENT_TYPE_BASICSUPPORT 0x00000200 +#define KSEVENT_TYPE_QUERYBUFFER 0x00000400 + +#define KSEVENT_TYPE_TOPOLOGY 0x10000000 + typedef struct { ULONG Size; 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] Sat Nov 7 13:57:07 2009 @@ -529,6 +529,24 @@ } KSPROPERTY_AUDIO; +#define STATIC_KSEVENTSETID_LoopedStreaming\ + 0x4682B940L, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D +DEFINE_GUIDSTRUCT("4682B940-C6EF-11D0-96D8-00AA0051E51D", KSEVENTSETID_LoopedStreaming); +#define KSEVENTSETID_LoopedStreaming DEFINE_GUIDNAMED(KSEVENTSETID_LoopedStreaming) + +typedef enum { + KSEVENT_LOOPEDSTREAMING_POSITION, +} KSEVENT_LOOPEDSTREAMING; + +typedef struct { + KSEVENTDATA KsEventData; +#if defined(_NTDDK_) + ULONGLONG Position; +#else // !_NTDDK_ + DWORDLONG Position; +#endif // !_NTDDK_ +} LOOPEDSTREAMING_POSITION_EVENT_DATA, *PLOOPEDSTREAMING_POSITION_EVENT_DATA ; + /* SysAudio Properties

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