Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[tkreuzer] 37884: merge rbuild changes 37270-37632 from trunk
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 03:37:08 2008 New Revision: 37884 URL: http://svn.reactos.org/svn/reactos?rev=37884&view=rev Log: merge rbuild changes 37270-37632 from trunk Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Dec 6 03:37:08 2008 @@ -392,7 +392,7 @@ if ( data.includes.size () > 0 ) fprintf ( fMakefile, - "PROJECT_CFLAGS %s %s\n", + "PROJECT_CINCLUDES %s %s\n", assignmentOperation, MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str ()); @@ -529,19 +529,20 @@ GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data ); GenerateProjectGccOptions ( "=", ProjectNode.non_if_data ); - fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); - fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); + fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)' '$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'\n" ); /* hack to get libgcc_eh.a, should check mingw version or something */ fprintf ( fMakefile, "ifeq ($(ARCH),amd64)\n" ); fprintf ( fMakefile, "PROJECT_LPPFLAGS += '$(shell ${TARGET_CPP} -print-file-name=libgcc_eh.a)'\n" ); fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); + fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); + fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" ); + fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" ); fprintf ( fMakefile, "\n" ); } Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Dec 6 03:37:08 2008 @@ -752,7 +752,7 @@ { fprintf ( fMakefile, "# MACROS\n" ); GenerateMacro ( assignmentOperation, - cflagsMacro, + commonflagsMacro, data, &used_defs, true ); @@ -1096,7 +1096,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", @@ -1107,7 +1107,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o", @@ -1118,7 +1118,7 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", @@ -1141,12 +1141,12 @@ Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" - "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); Rule emptyRule ( "", NULL ); @@ -1658,7 +1658,7 @@ "\t%s -o %s %s %s -g %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), - cflagsMacro.c_str(), + module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), backend->GetFullName ( baseHeaderFile ).c_str() ); delete pchFilename; @@ -1709,13 +1709,6 @@ fprintf ( fMakefile, "\n" ); return archiveFilename; -} - -string -MingwModuleHandler::GetCFlagsMacro () const -{ - return ssprintf ( "$(%s_CFLAGS)", - module.name.c_str () ); } /*static*/ string @@ -1847,7 +1840,9 @@ fprintf ( fMakefile, "# OTHER MACROS\n" ); + commonflagsMacro = ssprintf ("%s_COMMONFLAGS", module.name.c_str ()); cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); + cxxflagsMacro = ssprintf ("%s_CXXFLAGS", module.name.c_str ()); nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ()); @@ -1890,10 +1885,10 @@ fprintf ( fMakefile, "\n" ); } - string globalCflags = ""; + string globalCflags = " "; + globalCflags += ssprintf ("$(%s)", commonflagsMacro.c_str ()); if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { - globalCflags += " $(PROJECT_CFLAGS)"; if ( module.dynamicCRT ) globalCflags += " -D_DLL -D__USE_CRTIMP"; } @@ -1925,14 +1920,20 @@ // (TODO: Move to version-specific once this bug is fixed in GCC) globalCflags += " -fno-optimize-sibling-calls"; - fprintf ( - fMakefile, - "%s +=%s\n", - cflagsMacro.c_str (), - globalCflags.c_str () ); - if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) { + fprintf ( + fMakefile, + "%s +=%s\n", + cflagsMacro.c_str (), + (" $(PROJECT_CFLAGS)" + globalCflags).c_str () ); + + fprintf ( + fMakefile, + "%s +=%s\n", + cxxflagsMacro.c_str (), + (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () ); + fprintf ( fMakefile, "%s += $(PROJECT_RCFLAGS)\n", @@ -1954,6 +1955,18 @@ { fprintf ( fMakefile, + "%s +=%s\n", + cflagsMacro.c_str (), + globalCflags.c_str () ); + + fprintf ( + fMakefile, + "%s +=%s\n", + cxxflagsMacro.c_str (), + globalCflags.c_str () ); + + fprintf ( + fMakefile, "%s_LFLAGS += $(HOST_LFLAGS)\n", module.name.c_str () ); } @@ -1971,6 +1984,10 @@ "%s += %s\n\n", cflagsMacro.c_str (), cflags ); + fprintf ( fMakefile, + "%s += %s\n\n", + cxxflagsMacro.c_str (), + cflags ); } const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags; @@ -1996,12 +2013,17 @@ fprintf ( fMakefile, "%s += -Wno-main\n\n", cflagsMacro.c_str () ); + fprintf ( fMakefile, + "%s += -Wno-main\n\n", + cxxflagsMacro.c_str () ); } fprintf ( fMakefile, "\n\n" ); // future references to the macros will be to get their values + commonflagsMacro = ssprintf ("$(%s)", commonflagsMacro.c_str ()); cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ()); + cxxflagsMacro = ssprintf ("$(%s)", cxxflagsMacro.c_str ()); nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ()); widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ()); } Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sat Dec 6 03:37:08 2008 @@ -98,7 +98,6 @@ const Module& module ) const; std::string GetPreconditionDependenciesName () const; - std::string GetCFlagsMacro () const; static std::string GetObjectsMacro ( const Module& ); std::string GetLinkingDependenciesMacro () const; std::string GetLibsMacro () const; @@ -172,7 +171,9 @@ public: const Module& module; string_list clean_files; + std::string commonflagsMacro; std::string cflagsMacro; + std::string cxxflagsMacro; std::string nasmflagsMacro; std::string windresflagsMacro; std::string widlflagsMacro;

1 0

[dchapyshev] 37883: - Sync gdiplus wine tests
by dchapyshev＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: dchapyshev Date: Sat Dec 6 03:26:52 2008 New Revision: 37883 URL: http://svn.reactos.org/svn/reactos?rev=37883&view=rev Log: - Sync gdiplus wine tests Added: trunk/rostests/winetests/gdiplus/customlinecap.c (with props) Modified: trunk/rostests/winetests/gdiplus/brush.c trunk/rostests/winetests/gdiplus/font.c trunk/rostests/winetests/gdiplus/gdiplus.rbuild trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/graphicspath.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/matrix.c trunk/rostests/winetests/gdiplus/pathiterator.c trunk/rostests/winetests/gdiplus/pen.c trunk/rostests/winetests/gdiplus/region.c trunk/rostests/winetests/gdiplus/stringformat.c trunk/rostests/winetests/gdiplus/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/brush.c… Added: trunk/rostests/winetests/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/customl… Modified: trunk/rostests/winetests/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/font.c?… Modified: trunk/rostests/winetests/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/gdiplus… Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… Modified: trunk/rostests/winetests/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… Modified: trunk/rostests/winetests/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/matrix.… Modified: trunk/rostests/winetests/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pathite… Modified: trunk/rostests/winetests/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/pen.c?r… Modified: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… Modified: trunk/rostests/winetests/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/stringf… Modified: trunk/rostests/winetests/gdiplus/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/testlis…

1 0

[dchapyshev] 37882: - Sync headers with Wine head - Sync gdiplus with Wine head
by dchapyshev＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: dchapyshev Date: Sat Dec 6 03:26:01 2008 New Revision: 37882 URL: http://svn.reactos.org/svn/reactos?rev=37882&view=rev Log: - Sync headers with Wine head - Sync gdiplus with Wine head Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/include/psdk/gdiplusenums.h trunk/reactos/include/psdk/gdiplusflat.h trunk/reactos/include/psdk/gdiplusgpstubs.h trunk/reactos/include/psdk/gdiplusimaging.h trunk/reactos/include/psdk/gdiplusmem.h trunk/reactos/include/psdk/ole2.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c… Modified: trunk/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pen.c?re… Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… Modified: trunk/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusenums.… Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… Modified: trunk/reactos/include/psdk/gdiplusgpstubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusgpstub… Modified: trunk/reactos/include/psdk/gdiplusimaging.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusimagin… Modified: trunk/reactos/include/psdk/gdiplusmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusmem.h?… Modified: trunk/reactos/include/psdk/ole2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ole2.h?rev=37…

1 0

[tkreuzer] 37881: disable build of icu and nls for now (doesn't compile)
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 03:23:40 2008 New Revision: 37881 URL: http://svn.reactos.org/svn/reactos?rev=37881&view=rev Log: disable build of icu and nls for now (doesn't compile) Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sat Dec 6 03:23:40 2008 @@ -245,9 +245,9 @@ <directory name="expat"> <xi:include href="lib/3rdparty/expat/expat.rbuild" /> </directory> - <directory name="icu4ros"> +  <directory name="libwine"> <xi:include href="lib/3rdparty/libwine/libwine.rbuild" /> </directory> @@ -285,9 +285,9 @@ <directory name="inflib"> <xi:include href="lib/inflib/inflib.rbuild" /> </directory> - <directory name="nls"> +  <directory name="ntdllsys"> <xi:include href="lib/ntdllsys/ntdllsys.rbuild" /> </directory>

1 0

[tkreuzer] 37880: Add ExpInterlockedFlushSList stub
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 03:21:46 2008 New Revision: 37880 URL: http://svn.reactos.org/svn/reactos?rev=37880&view=rev Log: Add ExpInterlockedFlushSList stub Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Sat Dec 6 03:21:46 2008 @@ -159,3 +159,12 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } + +NTKERNELAPI +PSLIST_ENTRY +ExpInterlockedFlushSList( + PSLIST_HEADER ListHead) +{ + UNIMPLEMENTED; + return NULL; +}

1 0

[tkreuzer] 37879: add back InterlockedPush/PopEntrySList
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 03:20:54 2008 New Revision: 37879 URL: http://svn.reactos.org/svn/reactos?rev=37879&view=rev Log: add back InterlockedPush/PopEntrySList Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Sat Dec 6 03:20:54 2008 @@ -6123,8 +6123,8 @@ //#define ExInterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) #if !defined(_WINBASE_) -//#define InterlockedPopEntrySList(Head) ExpInterlockedPopEntrySList(Head) -//#define InterlockedPushEntrySList(Head, Entry) ExpInterlockedPushEntrySList(Head, Entry) +#define InterlockedPopEntrySList(Head) ExpInterlockedPopEntrySList(Head) +#define InterlockedPushEntrySList(Head, Entry) ExpInterlockedPushEntrySList(Head, Entry) //#define InterlockedFlushSList(Head) ExpInterlockedFlushSList(Head) //#define QueryDepthSList(Head) ExQueryDepthSList(Head) #endif // !defined(_WINBASE_)

1 0

[tkreuzer] 37878: fix inflib_host build
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 03:16:56 2008 New Revision: 37878 URL: http://svn.reactos.org/svn/reactos?rev=37878&view=rev Log: fix inflib_host build Modified: branches/ros-amd64-bringup/reactos/lib/inflib/builddep.h Modified: branches/ros-amd64-bringup/reactos/lib/inflib/builddep.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/i… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/inflib/builddep.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/inflib/builddep.h [iso-8859-1] Sat Dec 6 03:16:56 2008 @@ -28,6 +28,8 @@ #define INF_SUCCESS(x) (0 == (x)) typedef char TCHAR, *PTCHAR, *PTSTR; +typedef const TCHAR *PCTSTR; + #define _T(x) x #define _tcsicmp strcasecmp #define _tcslen strlen

1 0

[dchapyshev] 37877: - Add CFSTR_SHELLIDLISTA
by dchapyshev＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: dchapyshev Date: Sat Dec 6 03:10:05 2008 New Revision: 37877 URL: http://svn.reactos.org/svn/reactos?rev=37877&view=rev Log: - Add CFSTR_SHELLIDLISTA Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sat Dec 6 03:10:05 2008 @@ -110,6 +110,7 @@ UINT aoffset[1]; } CIDA, *LPIDA; +#define CFSTR_SHELLIDLISTA "Shell IDList Array" /* CF_IDLIST */ #define CFSTR_SHELLIDLISTOFFSET "Shell Object Offsets" /* CF_OBJECTPOSITIONS */ #define CFSTR_NETRESOURCES "Net Resource" /* CF_NETRESOURCE */

1 0

[dchapyshev] 37876: - Implement SetupInstallFileA/W - Stub implement SetupPromptForDiskA/W All from Wine.
by dchapyshev＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: dchapyshev Date: Sat Dec 6 03:07:05 2008 New Revision: 37876 URL: http://svn.reactos.org/svn/reactos?rev=37876&view=rev Log: - Implement SetupInstallFileA/W - Stub implement SetupPromptForDiskA/W All from Wine. Modified: trunk/reactos/dll/win32/setupapi/queue.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Sat Dec 6 03:07:05 2008 @@ -1114,6 +1114,113 @@ } return rc; +} + +/*********************************************************************** + * SetupInstallFileA (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallFileA( HINF hinf, PINFCONTEXT inf_context, PCSTR source, PCSTR root, + PCSTR dest, DWORD style, PSP_FILE_CALLBACK_A handler, PVOID context ) +{ + BOOL ret = FALSE; + struct callback_WtoA_context ctx; + UNICODE_STRING sourceW, rootW, destW; + + TRACE("%p %p %s %s %s %x %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root), + debugstr_a(dest), style, handler, context); + + sourceW.Buffer = rootW.Buffer = destW.Buffer = NULL; + if (source && !RtlCreateUnicodeStringFromAsciiz( &sourceW, source )) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + if (root && !RtlCreateUnicodeStringFromAsciiz( &rootW, root )) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + goto exit; + } + if (dest && !RtlCreateUnicodeStringFromAsciiz( &destW, dest )) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + goto exit; + } + + ctx.orig_context = context; + ctx.orig_handler = handler; + + ret = SetupInstallFileW( hinf, inf_context, sourceW.Buffer, rootW.Buffer, destW.Buffer, style, QUEUE_callback_WtoA, &ctx ); + +exit: + RtlFreeUnicodeString( &sourceW ); + RtlFreeUnicodeString( &rootW ); + RtlFreeUnicodeString( &destW ); + return ret; +} + +/*********************************************************************** + * SetupInstallFileW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallFileW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source, PCWSTR root, + PCWSTR dest, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context ) +{ + static const WCHAR CopyFiles[] = {'C','o','p','y','F','i','l','e','s',0}; + + BOOL ret, absolute = (root && *root && !(style & SP_COPY_SOURCE_ABSOLUTE)); + WCHAR *buffer, *p, *inf_source = NULL; + unsigned int len; + + TRACE("%p %p %s %s %s %x %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), + debugstr_w(dest), style, handler, context); + + if (hinf) + { + INFCONTEXT ctx; + + if (!inf_context) + { + inf_context = &ctx; + if (!SetupFindFirstLineW( hinf, CopyFiles, NULL, inf_context )) return FALSE; + } + if (!SetupGetStringFieldW( inf_context, 1, NULL, 0, (PDWORD) &len )) return FALSE; + if (!(inf_source = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + if (!SetupGetStringFieldW( inf_context, 1, inf_source, len, NULL )) return FALSE; + source = inf_source; + } + else if (!source) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + len = strlenW( source ) + 1; + if (absolute) len += strlenW( root ) + 1; + + if (!(p = buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, inf_source ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + if (absolute) + { + strcpyW( buffer, root ); + p += strlenW( buffer ); + if (p[-1] != '\\') *p++ = '\\'; + } + while (*source == '\\') source++; + strcpyW( p, source ); + + ret = do_file_copyW( buffer, dest, style, handler, context ); + + HeapFree( GetProcessHeap(), 0, inf_source ); + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; } /*********************************************************************** Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sat Dec 6 03:07:05 2008 @@ -439,10 +439,10 @@ @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr) @ stdcall SetupInitializeFileLogA(str long) @ stdcall SetupInitializeFileLogW(wstr long) -@ stub SetupInstallFileA +@ stdcall SetupInstallFileA(ptr ptr str str str long ptr ptr) @ stub SetupInstallFileExA @ stub SetupInstallFileExW -@ stub SetupInstallFileW +@ stdcall SetupInstallFileW(ptr ptr wstr wstr wstr long ptr ptr) @ stdcall SetupInstallFilesFromInfSectionA(long long long str str long) @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long) @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr) @@ -464,8 +464,8 @@ @ stdcall SetupOpenInfFileW(wstr wstr long ptr) @ stdcall SetupOpenLog(long) @ stdcall SetupOpenMasterInf() -@ stub SetupPromptForDiskA -@ stub SetupPromptForDiskW +@ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) +@ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) @ stub SetupQueryDrivesInDiskSpaceListA @ stub SetupQueryDrivesInDiskSpaceListW Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sat Dec 6 03:07:05 2008 @@ -131,6 +131,34 @@ } /*********************************************************************** + * SetupPromptForDiskA (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskName, + PCSTR PathToSource, PCSTR FileSought, PCSTR TagFile, DWORD DiskPromptStyle, + PSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_a(DialogTitle), + debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought), + debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + return 0; +} + +/*********************************************************************** + * SetupPromptForDiskW (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR DiskName, + PCWSTR PathToSource, PCWSTR FileSought, PCWSTR TagFile, DWORD DiskPromptStyle, + PWSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_w(DialogTitle), + debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought), + debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + return 0; +} + +/*********************************************************************** * SetupDiRemoveDevice(SETUPAPI.@) */ BOOL WINAPI

1 0

[tkreuzer] 37875: inlcude excpt.h in winnt.h
by tkreuzer＠svn.reactos.org 06 Dec '08

06 Dec '08

Author: tkreuzer Date: Sat Dec 6 02:46:08 2008 New Revision: 37875 URL: http://svn.reactos.org/svn/reactos?rev=37875&view=rev Log: inlcude excpt.h in winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winnt.h [iso-8859-1] Sat Dec 6 02:46:08 2008 @@ -35,6 +35,7 @@ extern "C" { #endif +#include <excpt.h> #include <basetsd.h> #include <guiddef.h>

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008