Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[hpoussin] 29180: Do not use host headers anymore when building target executables/libraries

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 24 15:43:38 2007 New Revision: 29180 URL: http://svn.reactos.org/svn/reactos?rev=29180&view=rev Log: Do not use host headers anymore when building target executables/libraries Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/lib/sdk/crt/signal/signal.c trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Mon Sep 24 15:43:38 2007 @@ -24,6 +24,7 @@ <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> <include>include/crt</include> + <include>include/crt/mingw32</include> <include>include/ddk</include> <include>include/GL</include> <include>include/ndk</include> Modified: trunk/reactos/lib/sdk/crt/signal/signal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/signal/signal.… ============================================================================== --- trunk/reactos/lib/sdk/crt/signal/signal.c (original) +++ trunk/reactos/lib/sdk/crt/signal/signal.c Mon Sep 24 15:43:38 2007 @@ -5,9 +5,6 @@ #include <string.h> void _default_handler(int signal); - -typedef void (*__p_sig_fn_t)(int); - typedef struct _sig_element { 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 (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 24 15:43:38 2007 @@ -1945,7 +1945,21 @@ if ( !module.allowWarnings ) globalCflags += " -Werror"; if ( module.host == HostTrue ) - globalCflags += " $(HOST_CFLAGS)"; + { + if ( module.cplusplus ) + globalCflags += " $(HOST_CPPFLAGS)"; + else + globalCflags += " $(HOST_CFLAGS)"; + } + else + { + globalCflags += " -nostdinc"; + if ( module.cplusplus ) + { + // HACK: use host headers when building C++ + globalCflags += " $(HOST_CPPFLAGS)"; + } + } // Always force disabling of sibling calls optimisation for GCC // (TODO: Move to version-specific once this bug is fixed in GCC)

16 years, 12 months

[hpoussin] 29179: Remove this headers set, as they already exist in include/crt

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 24 15:42:04 2007 New Revision: 29179 URL: http://svn.reactos.org/svn/reactos?rev=29179&view=rev Log: Remove this headers set, as they already exist in include/crt Removed: trunk/reactos/lib/3rdparty/mingw/include/

16 years, 12 months

[hpoussin] 29178: Copy some headers from RosBE to our include directory. These files are now considered as target headers, whereas those in RosBE are host headers.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 24 15:40:54 2007 New Revision: 29178 URL: http://svn.reactos.org/svn/reactos?rev=29178&view=rev Log: Copy some headers from RosBE to our include directory. These files are now considered as target headers, whereas those in RosBE are host headers. Added: trunk/reactos/include/crt/_mingw.h (with props) trunk/reactos/include/crt/assert.h (with props) trunk/reactos/include/crt/conio.h (with props) trunk/reactos/include/crt/ctype.h (with props) trunk/reactos/include/crt/direct.h (with props) trunk/reactos/include/crt/dos.h (with props) trunk/reactos/include/crt/errno.h (with props) trunk/reactos/include/crt/fcntl.h (with props) trunk/reactos/include/crt/float.h (with props) trunk/reactos/include/crt/getopt.h (with props) trunk/reactos/include/crt/inttypes.h (with props) trunk/reactos/include/crt/io.h (with props) trunk/reactos/include/crt/limits.h (with props) trunk/reactos/include/crt/locale.h (with props) trunk/reactos/include/crt/malloc.h (with props) trunk/reactos/include/crt/math.h (with props) trunk/reactos/include/crt/mbctype.h (with props) trunk/reactos/include/crt/mbstring.h (with props) trunk/reactos/include/crt/memory.h (with props) trunk/reactos/include/crt/mingw32/ trunk/reactos/include/crt/mingw32/float.h (with props) trunk/reactos/include/crt/mingw32/stdarg.h (with props) trunk/reactos/include/crt/mingw32/stdbool.h (with props) trunk/reactos/include/crt/mingw32/stddef.h (with props) trunk/reactos/include/crt/process.h (with props) trunk/reactos/include/crt/search.h (with props) trunk/reactos/include/crt/setjmp.h (with props) trunk/reactos/include/crt/share.h (with props) trunk/reactos/include/crt/signal.h (with props) trunk/reactos/include/crt/stdint.h (with props) trunk/reactos/include/crt/stdio.h (with props) trunk/reactos/include/crt/stdlib.h (with props) trunk/reactos/include/crt/string.h (with props) trunk/reactos/include/crt/strings.h (with props) trunk/reactos/include/crt/sys/ trunk/reactos/include/crt/sys/fcntl.h (with props) trunk/reactos/include/crt/sys/stat.h (with props) trunk/reactos/include/crt/sys/time.h (with props) trunk/reactos/include/crt/sys/timeb.h (with props) trunk/reactos/include/crt/sys/types.h (with props) trunk/reactos/include/crt/sys/utime.h (with props) trunk/reactos/include/crt/time.h (with props) trunk/reactos/include/crt/unistd.h (with props) trunk/reactos/include/crt/wchar.h (with props) trunk/reactos/include/crt/wctype.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=2… Added: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=2… Added: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=29… Added: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=29… Added: trunk/reactos/include/crt/direct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/direct.h?rev=2… Added: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=2917… Added: trunk/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/errno.h?rev=29… Added: trunk/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fcntl.h?rev=29… Added: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=29… Added: trunk/reactos/include/crt/getopt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/getopt.h?rev=2… Added: trunk/reactos/include/crt/inttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/inttypes.h?rev… Added: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=29178… Added: trunk/reactos/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/limits.h?rev=2… Added: trunk/reactos/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/locale.h?rev=2… Added: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=2… Added: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=291… Added: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… Added: trunk/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbstring.h?rev… Added: trunk/reactos/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/memory.h?rev=2… Added: trunk/reactos/include/crt/mingw32/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/float.… Added: trunk/reactos/include/crt/mingw32/stdarg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/stdarg… Added: trunk/reactos/include/crt/mingw32/stdbool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/stdboo… Added: trunk/reactos/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/stddef… Added: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… Added: trunk/reactos/include/crt/search.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/search.h?rev=2… Added: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=2… Added: trunk/reactos/include/crt/share.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/share.h?rev=29… Added: trunk/reactos/include/crt/signal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/signal.h?rev=2… Added: trunk/reactos/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdint.h?rev=2… Added: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=29… Added: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=2… Added: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=2… Added: trunk/reactos/include/crt/strings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/strings.h?rev=… Added: trunk/reactos/include/crt/sys/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/fcntl.h?re… Added: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… Added: trunk/reactos/include/crt/sys/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/time.h?rev… Added: trunk/reactos/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/timeb.h?re… Added: trunk/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/types.h?re… Added: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… Added: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=291… Added: trunk/reactos/include/crt/unistd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/unistd.h?rev=2… Added: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=29… Added: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=2…

16 years, 12 months

[hpoussin] 29177: Use user flags when building host tools

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 24 15:28:52 2007 New Revision: 29177 URL: http://svn.reactos.org/svn/reactos?rev=29177&view=rev Log: Use user flags when building host tools Modified: trunk/reactos/lib/3rdparty/zlib/zlib.mak trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/lib/inflib/inflib.mak trunk/reactos/tools/cabman/cabman.mak trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/tools.mak trunk/reactos/tools/widl/widl.mak Modified: trunk/reactos/lib/3rdparty/zlib/zlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.mak… ============================================================================== --- trunk/reactos/lib/3rdparty/zlib/zlib.mak (original) +++ trunk/reactos/lib/3rdparty/zlib/zlib.mak Mon Sep 24 15:28:52 2007 @@ -33,7 +33,7 @@ $(addprefix $(INTERMEDIATE_), $(ZLIB_HOST_SOURCES:.c=.host.o)) ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ - -Wstrict-prototypes -Wmissing-prototypes + -Wstrict-prototypes -Wmissing-prototypes $(TOOLS_CPPFLAGS) $(ZLIB_HOST_TARGET): $(ZLIB_HOST_OBJECTS) | $(ZLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?rev=29… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak Mon Sep 24 15:28:52 2007 @@ -32,7 +32,7 @@ CMLIB_HOST_CFLAGS = -O3 -Wall -Wwrite-strings -Wpointer-arith \ -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \ - -DCMLIB_HOST + -DCMLIB_HOST $(HOST_CFLAGS) $(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/lib/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.mak?rev=… ============================================================================== --- trunk/reactos/lib/inflib/inflib.mak (original) +++ trunk/reactos/lib/inflib/inflib.mak Mon Sep 24 15:28:52 2007 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude + -Iinclude/reactos -Iinclude $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_AR) Modified: trunk/reactos/tools/cabman/cabman.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.mak?re… ============================================================================== --- trunk/reactos/tools/cabman/cabman.mak (original) +++ trunk/reactos/tools/cabman/cabman.mak Mon Sep 24 15:28:52 2007 @@ -29,7 +29,7 @@ CABMAN_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=.o)) -CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CXXFLAGS) +CABMAN_HOST_CXXFLAGS = -Iinclude/reactos -Ilib/3rdparty/zlib $(TOOLS_CPPFLAGS) CABMAN_HOST_LIBS = $(ZLIB_HOST_TARGET) Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Mon Sep 24 15:28:52 2007 @@ -30,10 +30,10 @@ MKHIVE_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) -MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3 +MKHIVE_HOST_CFLAGS = -fshort-wchar -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ + -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3 $(HOST_CFLAGS) -MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3 +MKHIVE_HOST_LFLAGS = $(TOOLS_LFLAGS) -g3 .PHONY: mkhive mkhive: $(MKHIVE_TARGET) Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=29177&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Mon Sep 24 15:28:52 2007 @@ -5,8 +5,8 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = $(HOST_CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = $(HOST_CPPFLAGS) -Wall -Wpointer-arith +TOOLS_CFLAGS = -Wall -Wpointer-arith -Wno-strict-aliasing $(HOST_CFLAGS) +TOOLS_CPPFLAGS = -Wall -Wpointer-arith $(HOST_CPPFLAGS) TOOLS_LFLAGS = $(HOST_LFLAGS) # HACK: Remove those lines once host tools don't use target headers anymore Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=29… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Mon Sep 24 15:28:52 2007 @@ -56,11 +56,11 @@ WIDL_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(WIDL_SOURCES:.c=.o)) -WIDL_HOST_CFLAGS = $(TOOLS_CFLAGS) \ +WIDL_HOST_CFLAGS = \ -DINT16=SHORT -D__USE_W32API -DYYDEBUG=1 -D__REACTOS__=1 \ -I$(WIDL_BASE) -I$(WPP_BASE) \ -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ - -I$(INTERMEDIATE_)include + -I$(INTERMEDIATE_)include $(TOOLS_CFLAGS) WIDL_HOST_LFLAGS = $(TOOLS_LFLAGS)

16 years, 12 months

[hpoussin] 29176: Do not put .h files in object files, it causes problems at link time

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 24 15:00:17 2007 New Revision: 29176 URL: http://svn.reactos.org/svn/reactos?rev=29176&view=rev Log: Do not put .h files in object files, it causes problems at link time Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 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 (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 24 15:00:17 2007 @@ -500,7 +500,7 @@ else if ( module.type == RpcClient ) newExtension = "_c.o"; else - newExtension = ".h"; + return NULL; } else newExtension = ".o"; @@ -913,11 +913,13 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( !compilationUnit.IsFirstFile () ) { - fprintf ( - fMakefile, - "%s%s", - ( i%10 == 9 ? " \\\n\t" : " " ), - backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str () ); + const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL ); + if ( objectFilename ) + fprintf ( + fMakefile, + "%s%s", + ( i%10 == 9 ? " \\\n\t" : " " ), + backend->GetFullName ( *objectFilename ).c_str () ); } } fprintf ( fMakefile, "\n" );

16 years, 12 months

[hpoussin] 29175: Display a message when a module has been disabled Support variables in aliased module names

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 24 13:15:49 2007 New Revision: 29175 URL: http://svn.reactos.org/svn/reactos?rev=29175&view=rev Log: Display a message when a module has been disabled Support variables in aliased module names Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Sep 24 13:15:49 2007 @@ -251,9 +251,13 @@ xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () ); + const XMLAttribute* att = moduleNode.GetAttribute ( "name", true ); + assert(att); + name = att->value; + enabled = true; - const XMLAttribute* att = moduleNode.GetAttribute ( "if", false ); + att = moduleNode.GetAttribute ( "if", false ); if ( att != NULL ) enabled = GetBooleanValue ( project.ResolveProperties ( att->value ) ); @@ -261,9 +265,8 @@ if ( att != NULL ) enabled = !GetBooleanValue ( project.ResolveProperties ( att->value ) ); - att = moduleNode.GetAttribute ( "name", true ); - assert(att); - name = att->value; + if ( !enabled && project.configuration.Verbose ) + printf("Module '%s' has been disabled.\n", name.c_str () ); att = moduleNode.GetAttribute ( "type", true ); assert(att); @@ -483,6 +486,7 @@ { if ( type == Alias ) { + aliasedModuleName = project.ResolveProperties ( aliasedModuleName ); if ( aliasedModuleName == name ) { throw XMLInvalidBuildFileException ( @@ -491,7 +495,7 @@ name.c_str() ); } const Module* m = project.LocateModule ( aliasedModuleName ); - if ( !m ) + if ( !m && enabled ) { throw XMLInvalidBuildFileException ( node.location, @@ -1602,7 +1606,7 @@ att = node_.GetAttribute ( "name", true ); assert(att); - name = att->value; + name = project.ResolveProperties ( att->value ); att = node_.GetAttribute ( "value", true ); assert(att);

16 years, 12 months

[hpoussin] 29174: Never call TdiCloseDevice when warming up a socket

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 24 12:39:23 2007 New Revision: 29174 URL: http://svn.reactos.org/svn/reactos?rev=29174&view=rev Log: Never call TdiCloseDevice when warming up a socket Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c Mon Sep 24 12:39:23 2007 @@ -14,29 +14,24 @@ #include "debug.h" NTSTATUS WarmSocketForBind( PAFD_FCB FCB ) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; + NTSTATUS Status; AFD_DbgPrint(MID_TRACE,("Called (AF %d)\n", - FCB->LocalAddress->Address[0].AddressType)); + FCB->LocalAddress->Address[0].AddressType)); if( !FCB->TdiDeviceName.Length || !FCB->TdiDeviceName.Buffer ) { - AFD_DbgPrint(MID_TRACE,("Null Device\n")); - return STATUS_NO_SUCH_DEVICE; + AFD_DbgPrint(MID_TRACE,("Null Device\n")); + return STATUS_NO_SUCH_DEVICE; + } + if( !FCB->LocalAddress ) { + AFD_DbgPrint(MID_TRACE,("No local address\n")); + return STATUS_UNSUCCESSFUL; } - if( FCB->LocalAddress ) { - Status = TdiOpenAddressFile - ( &FCB->TdiDeviceName, - FCB->LocalAddress, - &FCB->AddressFile.Handle, - &FCB->AddressFile.Object ); - } - - if( !NT_SUCCESS(Status) ) { - TdiCloseDevice( &FCB->AddressFile.Handle, - FCB->AddressFile.Object ); - RtlZeroMemory( &FCB->AddressFile, sizeof( FCB->AddressFile ) ); - } + Status = TdiOpenAddressFile(&FCB->TdiDeviceName, + FCB->LocalAddress, + &FCB->AddressFile.Handle, + &FCB->AddressFile.Object ); AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c Mon Sep 24 12:39:23 2007 @@ -16,25 +16,17 @@ NTSTATUS Status; if( !FCB->TdiDeviceName.Length || !FCB->TdiDeviceName.Buffer ) { - AFD_DbgPrint(MID_TRACE,("Null Device\n")); - return STATUS_NO_SUCH_DEVICE; - } - - Status = TdiOpenConnectionEndpointFile - ( &FCB->TdiDeviceName, - &FCB->Connection.Handle, - &FCB->Connection.Object ); + AFD_DbgPrint(MID_TRACE,("Null Device\n")); + return STATUS_NO_SUCH_DEVICE; + } + + Status = TdiOpenConnectionEndpointFile(&FCB->TdiDeviceName, + &FCB->Connection.Handle, + &FCB->Connection.Object ); if( NT_SUCCESS(Status) ) { - Status = TdiAssociateAddressFile - ( FCB->AddressFile.Handle, - FCB->Connection.Object ); - } - - if( !NT_SUCCESS(Status) ) { - TdiCloseDevice( &FCB->Connection.Handle, - FCB->Connection.Object ); - RtlZeroMemory( &FCB->Connection, sizeof(FCB->Connection) ); + Status = TdiAssociateAddressFile( FCB->AddressFile.Handle, + FCB->Connection.Object ); } return Status;

16 years, 12 months

[jimtabor] 29173: Turn off DcAttr updates for now.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 24 08:05:24 2007 New Revision: 29173 URL: http://svn.reactos.org/svn/reactos?rev=29173&view=rev Log: Turn off DcAttr updates for now. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Sep 24 08:05:24 2007 @@ -1491,7 +1491,7 @@ newdc->hSelf = hnewdc; IntGdiCopyToSaveState( dc, newdc); - DCU_SyncDcAttrtoUser(newdc, -1); +// DCU_SyncDcAttrtoUser(newdc, -1); DC_UnlockDc( newdc ); DC_UnlockDc( dc ); return hnewdc; @@ -2145,7 +2145,7 @@ default: break; } - DCU_SyncDcAttrtoUser(dc, -1); +// DCU_SyncDcAttrtoUser(dc, -1); DC_UnlockDc( dc ); return objOrg; }

16 years, 12 months

[jimtabor] 29172: Make sure it is non zero.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 24 06:58:22 2007 New Revision: 29172 URL: http://svn.reactos.org/svn/reactos?rev=29172&view=rev Log: Make sure it is non zero. Modified: trunk/reactos/dll/win32/user32/misc/misc.c Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Mon Sep 24 06:58:22 2007 @@ -282,7 +282,8 @@ { if(bConvert) { - if (NtUserGetThreadState(THREADSTATE_GETTHREADINFO)) return TRUE; + NtUserGetThreadState(THREADSTATE_GETTHREADINFO); + if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; else SetLastError(ERROR_NOT_ENOUGH_MEMORY); }

16 years, 12 months

[jimtabor] 29171: Implement IsGUIThread.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 24 06:42:17 2007 New Revision: 29171 URL: http://svn.reactos.org/svn/reactos?rev=29171&view=rev Log: Implement IsGUIThread. Modified: trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/stubs.c Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Mon Sep 24 06:42:17 2007 @@ -269,6 +269,29 @@ return TRUE; } +/* + * @implemented + */ +BOOL +STDCALL +IsGUIThread( + BOOL bConvert) +{ + PW32THREADINFO ti = (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo; + if (ti == NULL) + { + if(bConvert) + { + if (NtUserGetThreadState(THREADSTATE_GETTHREADINFO)) return TRUE; + else + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + return FALSE; + } + else + return TRUE; +} + PUSER_HANDLE_ENTRY FASTCALL GetUser32Handle(HANDLE handle) Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Mon Sep 24 06:42:17 2007 @@ -544,18 +544,6 @@ */ BOOL STDCALL -IsGUIThread( - BOOL bConvert) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -STDCALL PrintWindow( HWND hwnd, HDC hdcBlt,

16 years, 12 months

← Newer
1
...
12
13
14
15
16
17
18
...
59
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 September 2007