ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
April 2005
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
26 participants
477 discussions
Start a n
N
ew thread
[sedwards] 14522: remove the use of windows.h in some places where it is not needed
by sedwards@svn.reactos.com
remove the use of windows.h in some places where it is not needed Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c _____ Modified: trunk/reactos/lib/rtl/ppb.c --- trunk/reactos/lib/rtl/ppb.c 2005-04-05 21:41:03 UTC (rev 14521) +++ trunk/reactos/lib/rtl/ppb.c 2005-04-05 23:04:24 UTC (rev 14522) @@ -12,7 +12,6 @@ /* INCLUDES ****************************************************************/ #include <ddk/ntddk.h> -#include <windows.h> #include <ntdll/ldr.h> #include <napi/teb.h> #include <ntdll/base.h> _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-04-05 21:41:03 UTC (rev 14521) +++ trunk/reactos/lib/rtl/process.c 2005-04-05 23:04:24 UTC (rev 14522) @@ -12,7 +12,6 @@ /* INCLUDES ****************************************************************/ #include <ddk/ntddk.h> -#include <windows.h> #include <napi/i386/segment.h> #include <ntdll/ldr.h> #include <ntdll/base.h>
19 years, 8 months
1
0
0
0
[ion] 14521: Use w32api... hope this does something? Just trying to help steven.
by ion@svn.reactos.com
Use w32api... hope this does something? Just trying to help steven. Modified: trunk/reactos/lib/string/Makefile _____ Modified: trunk/reactos/lib/string/Makefile --- trunk/reactos/lib/string/Makefile 2005-04-05 20:24:26 UTC (rev 14520) +++ trunk/reactos/lib/string/Makefile 2005-04-05 21:41:03 UTC (rev 14521) @@ -13,7 +13,7 @@ TARGET_CFLAGS = -Wall -Werror # require os code to explicitly request A/W version of structs/functions -TARGET_CFLAGS += -D_DISABLE_TIDENTS +TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API ifeq ($(DBG), 1) TARGET_CFLAGS += -g
19 years, 8 months
1
0
0
0
[chorns] 14520: Accept ROS_INSTALL environment variable
by chorns@svn.reactos.com
Accept ROS_INSTALL environment variable Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-05 19:42:40 UTC (rev 14519) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-05 20:24:26 UTC (rev 14520) @@ -178,6 +178,13 @@ endif OUTPUT_ := $(OUTPUT)$(SEP) +ifneq ($(ROS_INSTALL),) + INSTALL := $(ROS_INSTALL) +else + INSTALL := reactos +endif +INSTALL_ := $(INSTALL)$(SEP) + $(INTERMEDIATE): ${mkdir} $@ @@ -186,6 +193,7 @@ ${mkdir} $@ endif + NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc KERNEL32_MC = lib$(SEP)kernel32$(SEP)kernel32.mc BUILDNO_H = include$(SEP)reactos$(SEP)buildno.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-05 19:42:40 UTC (rev 14519) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-04-05 20:24:26 UTC (rev 14520) @@ -120,6 +120,28 @@ } string +Directory::GetEnvironmentVariable ( const string& name ) +{ + char* value = getenv ( name.c_str () ); + if ( value != NULL && strlen ( value ) > 0 ) + return ssprintf ( "%s", + value ); + else + return ""; +} + +string +Directory::GetEnvironmentVariablePathOrDefault ( const string& name, + const string& defaultValue ) +{ + const string& environmentVariableValue = GetEnvironmentVariable ( name ); + if ( environmentVariableValue.length () > 0 ) + return NormalizeFilename ( environmentVariableValue ); + else + return defaultValue; +} + +string Directory::GetIntermediatePath () { return "obj-i386"; @@ -131,12 +153,20 @@ return "output-i386"; } +string +Directory::GetInstallPath () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", + "reactos" ); +} + void Directory::ResolveVariablesInPath ( char* buf, string path ) { string s = ReplaceVariable ( "$(INTERMEDIATE)", GetIntermediatePath (), path ); s = ReplaceVariable ( "$(OUTPUT)", GetOutputPath (), s ); + s = ReplaceVariable ( "$(INSTALL)", GetInstallPath (), s ); strcpy ( buf, s.c_str () ); } @@ -181,7 +211,8 @@ MingwBackend::MingwBackend ( Project& project, bool verbose ) : Backend ( project, verbose ), intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ), - outputDirectory ( new Directory ( "$(OUTPUT)" ) ) + outputDirectory ( new Directory ( "$(OUTPUT)" ) ), + installDirectory ( new Directory ( "$(INSTALL)" ) ) { } @@ -189,6 +220,7 @@ { delete intermediateDirectory; delete outputDirectory; + delete installDirectory; } string @@ -514,15 +546,10 @@ printf ( "Creating directories..." ); intermediateDirectory->GenerateTree ( "", verbose ); outputDirectory->GenerateTree ( "", verbose ); + installDirectory->GenerateTree ( "", verbose ); printf ( "done\n" ); } -string -FixupTargetFilename ( const string& targetFilename ) -{ - return NormalizeFilename ( targetFilename ); -} - void MingwBackend::DetectPipeSupport () { @@ -551,9 +578,6 @@ printf ( "detected\n" ); else printf ( "not detected\n" ); - - // TODO FIXME - eventually check for ROS_USE_PCH env var and - // allow that to override use_pch if true } void @@ -583,30 +607,25 @@ printf ( "detected\n" ); else printf ( "not detected\n" ); - - // TODO FIXME - eventually check for ROS_USE_PCH env var and - // allow that to override use_pch if true } void MingwBackend::GetNonModuleInstallTargetFiles ( - string installDirectory, vector<string>& out ) const { for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) { const InstallFile& installfile = *ProjectNode.installfiles[i]; - string targetFilenameNoFixup = installDirectory + SSEP + installfile.base + SSEP + installfile.newname; + string targetFilenameNoFixup = installfile.base + SSEP + installfile.newname; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), - outputDirectory ); + installDirectory ); out.push_back ( targetFilename ); } } void MingwBackend::GetModuleInstallTargetFiles ( - string installDirectory, vector<string>& out ) const { for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) @@ -614,10 +633,10 @@ const Module& module = *ProjectNode.modules[i]; if ( module.installName.length () > 0 ) { - string targetFilenameNoFixup = installDirectory + SSEP + module.installBase + SSEP + module.installName; + string targetFilenameNoFixup = module.installBase + SSEP + module.installName; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), - outputDirectory ); + installDirectory ); out.push_back ( targetFilename ); } } @@ -625,27 +644,23 @@ void MingwBackend::GetInstallTargetFiles ( - string installDirectory, vector<string>& out ) const { - GetNonModuleInstallTargetFiles ( installDirectory, - out ); - GetModuleInstallTargetFiles ( installDirectory, - out ); + GetNonModuleInstallTargetFiles ( out ); + GetModuleInstallTargetFiles ( out ); } void -MingwBackend::OutputInstallTarget ( const string& installDirectory, - const string& sourceFilename, +MingwBackend::OutputInstallTarget ( const string& sourceFilename, const string& targetFilename, const string& targetDirectory ) { string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( installDirectory + SSEP + targetDirectory + SSEP + targetFilename ), - outputDirectory ); + NormalizeFilename ( targetDirectory + SSEP + targetFilename ), + installDirectory ); string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( installDirectory + SSEP + targetDirectory ), - outputDirectory ); + NormalizeFilename ( targetDirectory ), + installDirectory ); fprintf ( fMakefile, "%s: %s %s\n", normalizedTargetFilename.c_str (), @@ -660,20 +675,19 @@ } void -MingwBackend::OutputNonModuleInstallTargets ( const string& installDirectory ) +MingwBackend::OutputNonModuleInstallTargets () { for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) { const InstallFile& installfile = *ProjectNode.installfiles[i]; - OutputInstallTarget ( installDirectory, - installfile.GetPath (), + OutputInstallTarget ( installfile.GetPath (), installfile.newname, installfile.base ); } } void -MingwBackend::OutputModuleInstallTargets ( const string& installDirectory ) +MingwBackend::OutputModuleInstallTargets () { for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { @@ -683,8 +697,7 @@ string sourceFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( module.GetPath () ), outputDirectory ); - OutputInstallTarget ( installDirectory, - sourceFilename, + OutputInstallTarget ( sourceFilename, module.installName, module.installBase ); } @@ -702,11 +715,12 @@ } string -MingwBackend::GetRegistryTargetFiles ( const string& installDirectory ) +MingwBackend::GetRegistryTargetFiles () { - string system32ConfigDirectory = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( installDirectory + SSEP + "system32" + SSEP "config" ), - outputDirectory ); + string system32ConfigDirectory = NormalizeFilename ( + MingwModuleHandler::PassThruCacheDirectory ( + "system32" SSEP "config" SSEP, + installDirectory ) ); return system32ConfigDirectory + SSEP "default " + system32ConfigDirectory + SSEP "sam " + system32ConfigDirectory + SSEP "security " + @@ -715,14 +729,15 @@ } void -MingwBackend::OutputRegistryInstallTarget ( const string& installDirectory ) +MingwBackend::OutputRegistryInstallTarget () { - string system32ConfigDirectory = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( installDirectory + SSEP + "system32" + SSEP "config" ), - outputDirectory ); + string system32ConfigDirectory = NormalizeFilename ( + MingwModuleHandler::PassThruCacheDirectory ( + "system32" SSEP "config" SSEP, + installDirectory ) ); string registrySourceFiles = GetRegistrySourceFiles (); - string registryTargetFiles = GetRegistryTargetFiles ( installDirectory ); + string registryTargetFiles = GetRegistryTargetFiles (); fprintf ( fMakefile, "install_registry: %s\n", registryTargetFiles.c_str () ); @@ -743,22 +758,16 @@ void MingwBackend::GenerateInstallTarget () { - string installDirectoryNoFixup = "reactos"; - string installDirectory = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( installDirectoryNoFixup ), - outputDirectory ); vector<string> vInstallTargetFiles; - GetInstallTargetFiles ( installDirectoryNoFixup, - vInstallTargetFiles ); + GetInstallTargetFiles ( vInstallTargetFiles ); string installTargetFiles = v2s ( vInstallTargetFiles, 5 ); fprintf ( fMakefile, - "install: %s %s install_registry\n", - installDirectory.c_str (), + "install: %s install_registry\n", installTargetFiles.c_str () ); - OutputNonModuleInstallTargets ( installDirectoryNoFixup ); - OutputModuleInstallTargets ( installDirectoryNoFixup ); - OutputRegistryInstallTarget ( installDirectoryNoFixup ); + OutputNonModuleInstallTargets (); + OutputModuleInstallTargets (); + OutputRegistryInstallTarget (); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-05 19:42:40 UTC (rev 14519) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-04-05 20:24:26 UTC (rev 14520) @@ -31,8 +31,12 @@ std::string ReplaceVariable ( std::string name, std::string value, std::string path ); + std::string GetEnvironmentVariable ( const std::string& name ); + std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, + const std::string& defaultValue ); std::string GetIntermediatePath (); std::string GetOutputPath (); + std::string GetInstallPath (); void ResolveVariablesInPath ( char* buf, std::string path ); bool CreateDirectory ( std::string path ); @@ -50,6 +54,7 @@ bool usePipe; Directory* intermediateDirectory; Directory* outputDirectory; + Directory* installDirectory; private: void CreateMakefile (); void CloseMakefile () const; @@ -75,26 +80,20 @@ std::string GetInstallDirectories ( const std::string& installDirectory ); void GetNonModuleInstallFiles ( std::vector<std::string>& out ) const; void GetInstallFiles ( std::vector<std::string>& out ) const; - void GetNonModuleInstallTargetFiles ( std::string installDirectory, - std::vector<std::string>& out ) const; - void GetModuleInstallTargetFiles ( std::string installDirectory, - std::vector<std::string>& out ) const; - void GetInstallTargetFiles ( std::string installDirectory, - std::vector<std::string>& out ) const; - void OutputInstallTarget ( const std::string& installDirectory, - const std::string& sourceFilename, + void GetNonModuleInstallTargetFiles ( std::vector<std::string>& out ) const; + void GetModuleInstallTargetFiles ( std::vector<std::string>& out ) const; + void GetInstallTargetFiles ( std::vector<std::string>& out ) const; + void OutputInstallTarget ( const std::string& sourceFilename, const std::string& targetFilename, const std::string& targetDirectory ); - void OutputNonModuleInstallTargets ( const std::string& installDirectory ); - void OutputModuleInstallTargets ( const std::string& installDirectory ); + void OutputNonModuleInstallTargets (); + void OutputModuleInstallTargets (); std::string GetRegistrySourceFiles (); - std::string GetRegistryTargetFiles ( const std::string& installDirectory ); - void OutputRegistryInstallTarget ( const std::string& installDirectory ); + std::string GetRegistryTargetFiles (); + void OutputRegistryInstallTarget (); void GenerateInstallTarget (); FILE* fMakefile; bool use_pch; }; -std::string FixupTargetFilename ( const std::string& targetFilename ); - #endif /* MINGW_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-05 19:42:40 UTC (rev 14519) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-05 20:24:26 UTC (rev 14520) @@ -119,7 +119,7 @@ string_list* pclean_files ) { string target = PassThruCacheDirectory ( - FixupTargetFilename ( module.GetPath () ), + NormalizeFilename ( module.GetPath () ), backend->outputDirectory ); if ( pclean_files ) { @@ -135,7 +135,7 @@ string_list* pclean_files ) { string target = PassThruCacheDirectory ( - FixupTargetFilename ( module.GetDependencyPath () ), + NormalizeFilename ( module.GetDependencyPath () ), backend->outputDirectory ); if ( pclean_files ) { @@ -1402,11 +1402,11 @@ invoke_targets[i].c_str () ); fprintf ( fMakefile, ": %s\n", - FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str () ); + NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" ); fprintf ( fMakefile, "\t%s %s\n\n", - FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str (), + NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str (), invoke.GetParameters ().c_str () ); } } @@ -1932,7 +1932,7 @@ string extension = GetExtension ( file.name ); if ( extension == ".rc" || extension == ".RC" ) { - string resource = FixupTargetFilename ( file.name ); + string resource = NormalizeFilename ( file.name ); fprintf ( fMakefile, "\t$(ECHO_BIN2RES)\n" ); fprintf ( fMakefile, "\t@:echo ${bin2res} -f -x %s\n", resource.c_str () ); @@ -2272,7 +2272,7 @@ { const Module& m = *module.project.modules[i]; if ( m.bootstrap != NULL ) - out.push_back ( FixupTargetFilename ( m.GetPath () ) ); + out.push_back ( NormalizeFilename ( m.GetPath () ) ); } } @@ -2299,13 +2299,13 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; - string isoboot = FixupTargetFilename ( "boot/freeldr/bootsect/isoboot.o" ); + string isoboot = NormalizeFilename ( "boot/freeldr/bootsect/isoboot.o" ); string bootcdReactosNoFixup = bootcdDirectory + "/reactos"; string bootcdReactos = PassThruCacheDirectory ( NormalizeFilename ( bootcdReactosNoFixup ), backend->outputDirectory ); CLEAN_FILE ( bootcdReactos ); - string reactosInf = ros_temp + FixupTargetFilename ( bootcdReactosNoFixup + "/reactos.inf" ); + string reactosInf = ros_temp + NormalizeFilename ( bootcdReactosNoFixup + "/reactos.inf" ); string reactosDff = NormalizeFilename ( "bootdata/packages/reactos.dff" ); string cdDirectories = GetCdDirectories ( bootcdDirectory ); vector<string> vCdFiles; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-04-05 19:42:40 UTC (rev 14519) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-04-05 20:24:26 UTC (rev 14520) @@ -4,6 +4,6 @@ void FunctionTest::Run () { - string fixedupFilename = FixupTargetFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" ); + string fixedupFilename = NormalizeFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" ); ARE_EQUAL ( "dir1" SSEP "filename.txt", fixedupFilename ); }
19 years, 8 months
1
0
0
0
[sedwards] 14519: fixed rosapps a bit. disabled tests for now. will fix them tonight
by sedwards@svn.reactos.com
fixed rosapps a bit. disabled tests for now. will fix them tonight Modified: trunk/rosapps/Makefile Modified: trunk/rosapps/net/niclist/makefile Modified: trunk/rosapps/sysutils/ctm/Makefile Modified: trunk/rosapps/tests/accelerator/Makefile _____ Modified: trunk/rosapps/Makefile --- trunk/rosapps/Makefile 2005-04-05 19:30:34 UTC (rev 14518) +++ trunk/rosapps/Makefile 2005-04-05 19:42:40 UTC (rev 14519) @@ -16,9 +16,11 @@ devutils$(SEP)zoomin \ dflat32 \ games$(SEP)winemine \ + games$(SEP)solitaire \ hcalc \ mc \ notevil \ + packmgr \ sysutils \ sysutils$(SEP)ctm \ sysutils$(SEP)kill \ @@ -27,7 +29,6 @@ net$(SEP)niclist \ net$(SEP)ncftp \ sysutils$(SEP)regexpl \ - tests \ welcome \ winfile _____ Modified: trunk/rosapps/net/niclist/makefile --- trunk/rosapps/net/niclist/makefile 2005-04-05 19:30:34 UTC (rev 14518) +++ trunk/rosapps/net/niclist/makefile 2005-04-05 19:42:40 UTC (rev 14519) @@ -11,7 +11,7 @@ TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_GCCLIBS = +TARGET_CFLAGS = -D__USE_W32API include $(PATH_TO_TOP)/rules.mak _____ Modified: trunk/rosapps/sysutils/ctm/Makefile --- trunk/rosapps/sysutils/ctm/Makefile 2005-04-05 19:30:34 UTC (rev 14518) +++ trunk/rosapps/sysutils/ctm/Makefile 2005-04-05 19:42:40 UTC (rev 14519) @@ -16,7 +16,7 @@ TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_CFLAGS = -DUNICODE -D_UNICODE +TARGET_CFLAGS = -D__USE_W32API -DUNICODE -D_UNICODE include $(PATH_TO_TOP)/rules.mak _____ Modified: trunk/rosapps/tests/accelerator/Makefile --- trunk/rosapps/tests/accelerator/Makefile 2005-04-05 19:30:34 UTC (rev 14518) +++ trunk/rosapps/tests/accelerator/Makefile 2005-04-05 19:42:40 UTC (rev 14519) @@ -12,7 +12,7 @@ TARGET_OBJECTS = accelerator.o -TARGET_CFLAGS = -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror include $(PATH_TO_TOP)/rules.mak
19 years, 8 months
1
0
0
0
[sedwards] 14518: more w32api conversion. Send errors.h to the Trash Can
by sedwards@svn.reactos.com
more w32api conversion. Send errors.h to the Trash Can Modified: trunk/reactos/apps/utils/net/route/makefile Deleted: trunk/reactos/include/errors.h Modified: trunk/reactos/include/windows.h Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/samlib/samlib.c Modified: trunk/reactos/lib/wininet/stubs.c Modified: trunk/reactos/lib/winspool/stubs.c _____ Modified: trunk/reactos/apps/utils/net/route/makefile --- trunk/reactos/apps/utils/net/route/makefile 2005-04-05 19:22:30 UTC (rev 14517) +++ trunk/reactos/apps/utils/net/route/makefile 2005-04-05 19:30:34 UTC (rev 14518) @@ -12,7 +12,7 @@ TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_GCCLIBS = +TARGET_CFLAGS = -D__USE_W32API include $(PATH_TO_TOP)/rules.mak _____ Deleted: trunk/reactos/include/errors.h --- trunk/reactos/include/errors.h 2005-04-05 19:22:30 UTC (rev 14517) +++ trunk/reactos/include/errors.h 2005-04-05 19:30:34 UTC (rev 14518) @@ -1,1189 +0,0 @@ -/* - Errors.h - - Windows32 API error codes - - Copyright (C) 1996 Free Software Foundation, Inc. - - Author: Scott Christley <scottc(a)net-community.com> - - This file is part of the Windows32 API Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - If you are interested in a warranty or support for this source code, - contact Scott Christley <scottc(a)net-community.com> for more information. - - You should have received a copy of the GNU Library General Public - License along with this library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef _GNU_H_WINDOWS32_ERROR -#define _GNU_H_WINDOWS32_ERROR - -#ifdef __USE_W32API - -#include_next <windows.h> - -#else /* !__USE_W32API */ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* - * Return Code macros - */ -#define SUCCEEDED(Status) ((HRESULT)(Status) >= 0) -#define FAILED(Status) ((HRESULT)(Status)<0) - -/* - * Success Codes - */ -#define S_OK 0x00000000L -#define S_FALSE 0x00000001L - -/* Numerical order */ - -#define LZERROR_UNKNOWNALG (-8) -#define LZERROR_BADVALUE (-7) -#define LZERROR_GLOBLOCK (-6) -#define LZERROR_GLOBALLOC (-5) -#define LZERROR_WRITE (-4) -#define LZERROR_READ (-3) -#define LZERROR_BADOUTHANDLE (-2) -#define LZERROR_BADINHANDLE (-1) -#define NO_ERROR 0L - -#if 0 -#include "../reactos/errcodes.h" -#else -#define ERROR_SUCCESS 0L -#define ERROR_INVALID_FUNCTION 1L -#define ERROR_FILE_NOT_FOUND 2L -#define ERROR_PATH_NOT_FOUND 3L -#define ERROR_TOO_MANY_OPEN_FILES 4L -#define ERROR_ACCESS_DENIED 5L -#define ERROR_INVALID_HANDLE 6L -#define ERROR_ARENA_TRASHED 7L -#define ERROR_NOT_ENOUGH_MEMORY 8L -#define ERROR_INVALID_BLOCK 9L -#define ERROR_BAD_ENVIRONMENT 10L -#define ERROR_BAD_FORMAT 11L -#define ERROR_INVALID_ACCESS 12L -#define ERROR_INVALID_DATA 13L -#define ERROR_OUTOFMEMORY 14L -#define ERROR_INVALID_DRIVE 15L -#define ERROR_CURRENT_DIRECTORY 16L -#define ERROR_NOT_SAME_DEVICE 17L -#define ERROR_NO_MORE_FILES 18L -#define ERROR_WRITE_PROTECT 19L -#define ERROR_BAD_UNIT 20L -#define ERROR_NOT_READY 21L -#define ERROR_BAD_COMMAND 22L -#define ERROR_CRC 23L -#define ERROR_BAD_LENGTH 24L -#define ERROR_SEEK 25L -#define ERROR_NOT_DOS_DISK 26L -#define ERROR_SECTOR_NOT_FOUND 27L -#define ERROR_OUT_OF_PAPER 28L -#define ERROR_WRITE_FAULT 29L -#define ERROR_READ_FAULT 30L -#define ERROR_GEN_FAILURE 31L -#define ERROR_SHARING_VIOLATION 32L -#define ERROR_LOCK_VIOLATION 33L -#define ERROR_WRONG_DISK 34L -#define ERROR_SHARING_BUFFER_EXCEEDED 36L -#define ERROR_HANDLE_EOF 38L -#define ERROR_HANDLE_DISK_FULL 39L -#define ERROR_NOT_SUPPORTED 50L -#define ERROR_REM_NOT_LIST 51L -#define ERROR_DUP_NAME 52L -#define ERROR_BAD_NETPATH 53L -#define ERROR_NETWORK_BUSY 54L -#define ERROR_DEV_NOT_EXIST 55L -#define ERROR_TOO_MANY_CMDS 56L -#define ERROR_ADAP_HDW_ERR 57L -#define ERROR_BAD_NET_RESP 58L -#define ERROR_UNEXP_NET_ERR 59L -#define ERROR_BAD_REM_ADAP 60L -#define ERROR_PRINTQ_FULL 61L -#define ERROR_NO_SPOOL_SPACE 62L -#define ERROR_PRINT_CANCELLED 63L -#define ERROR_NETNAME_DELETED 64L -#define ERROR_NETWORK_ACCESS_DENIED 65L -#define ERROR_BAD_DEV_TYPE 66L -#define ERROR_BAD_NET_NAME 67L -#define ERROR_TOO_MANY_NAMES 68L -#define ERROR_TOO_MANY_SESS 69L -#define ERROR_SHARING_PAUSED 70L -#define ERROR_REQ_NOT_ACCEP 71L -#define ERROR_REDIR_PAUSED 72L -#define ERROR_FILE_EXISTS 80L -#define ERROR_CANNOT_MAKE 82L -#define ERROR_FAIL_I24 83L -#define ERROR_OUT_OF_STRUCTURES 84L -#define ERROR_ALREADY_ASSIGNED 85L -#define ERROR_INVALID_PASSWORD 86L -#define ERROR_INVALID_PARAMETER 87L -#define ERROR_NET_WRITE_FAULT 88L -#define ERROR_NO_PROC_SLOTS 89L -#define ERROR_TOO_MANY_SEMAPHORES 100L -#define ERROR_EXCL_SEM_ALREADY_OWNED 101L -#define ERROR_SEM_IS_SET 102L -#define ERROR_TOO_MANY_SEM_REQUESTS 103L -#define ERROR_INVALID_AT_INTERRUPT_TIME 104L -#define ERROR_SEM_OWNER_DIED 105L -#define ERROR_SEM_USER_LIMIT 106L -#define ERROR_DISK_CHANGE 107L -#define ERROR_DRIVE_LOCKED 108L -#define ERROR_BROKEN_PIPE 109L -#define ERROR_OPEN_FAILED 110L -#define ERROR_BUFFER_OVERFLOW 111L -#define ERROR_DISK_FULL 112L -#define ERROR_NO_MORE_SEARCH_HANDLES 113L -#define ERROR_INVALID_TARGET_HANDLE 114L -#define ERROR_INVALID_CATEGORY 117L -#define ERROR_INVALID_VERIFY_SWITCH 118L -#define ERROR_BAD_DRIVER_LEVEL 119L -#define ERROR_CALL_NOT_IMPLEMENTED 120L -#define ERROR_SEM_TIMEOUT 121L -#define ERROR_INSUFFICIENT_BUFFER 122L -#define ERROR_INVALID_NAME 123L -#define ERROR_INVALID_LEVEL 124L -#define ERROR_NO_VOLUME_LABEL 125L -#define ERROR_MOD_NOT_FOUND 126L -#define ERROR_PROC_NOT_FOUND 127L -#define ERROR_WAIT_NO_CHILDREN 128L -#define ERROR_CHILD_NOT_COMPLETE 129L -#define ERROR_DIRECT_ACCESS_HANDLE 130L -#define ERROR_NEGATIVE_SEEK 131L -#define ERROR_SEEK_ON_DEVICE 132L -#define ERROR_IS_JOIN_TARGET 133L -#define ERROR_IS_JOINED 134L -#define ERROR_IS_SUBSTED 135L -#define ERROR_NOT_JOINED 136L -#define ERROR_NOT_SUBSTED 137L -#define ERROR_JOIN_TO_JOIN 138L -#define ERROR_SUBST_TO_SUBST 139L -#define ERROR_JOIN_TO_SUBST 140L -#define ERROR_SUBST_TO_JOIN 141L -#define ERROR_BUSY_DRIVE 142L -#define ERROR_SAME_DRIVE 143L -#define ERROR_DIR_NOT_ROOT 144L -#define ERROR_DIR_NOT_EMPTY 145L -#define ERROR_IS_SUBST_PATH 146L -#define ERROR_IS_JOIN_PATH 147L -#define ERROR_PATH_BUSY 148L -#define ERROR_IS_SUBST_TARGET 149L -#define ERROR_SYSTEM_TRACE 150L -#define ERROR_INVALID_EVENT_COUNT 151L -#define ERROR_TOO_MANY_MUXWAITERS 152L -#define ERROR_INVALID_LIST_FORMAT 153L -#define ERROR_LABEL_TOO_LONG 154L -#define ERROR_TOO_MANY_TCBS 155L -#define ERROR_SIGNAL_REFUSED 156L -#define ERROR_DISCARDED 157L -#define ERROR_NOT_LOCKED 158L -#define ERROR_BAD_THREADID_ADDR 159L -#define ERROR_BAD_ARGUMENTS 160L -#define ERROR_BAD_PATHNAME 161L -#define ERROR_SIGNAL_PENDING 162L -#define ERROR_MAX_THRDS_REACHED 164L -#define ERROR_LOCK_FAILED 167L -#define ERROR_BUSY 170L -#define ERROR_CANCEL_VIOLATION 173L -#define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174L -#define ERROR_INVALID_SEGMENT_NUMBER 180L -#define ERROR_INVALID_ORDINAL 182L -#define ERROR_ALREADY_EXISTS 183L -#define ERROR_INVALID_FLAG_NUMBER 186L -#define ERROR_SEM_NOT_FOUND 187L -#define ERROR_INVALID_STARTING_CODESEG 188L -#define ERROR_INVALID_STACKSEG 189L -#define ERROR_INVALID_MODULETYPE 190L -#define ERROR_INVALID_EXE_SIGNATURE 191L -#define ERROR_EXE_MARKED_INVALID 192L -#define ERROR_BAD_EXE_FORMAT 193L -#define ERROR_ITERATED_DATA_EXCEEDS_64k 194L -#define ERROR_INVALID_MINALLOCSIZE 195L -#define ERROR_DYNLINK_FROM_INVALID_RING 196L -#define ERROR_IOPL_NOT_ENABLED 197L -#define ERROR_INVALID_SEGDPL 198L -#define ERROR_AUTODATASEG_EXCEEDS_64k 199L -#define ERROR_RING2SEG_MUST_BE_MOVABLE 200L -#define ERROR_RELOC_CHAIN_XEEDS_SEGLIM 201L -#define ERROR_INFLOOP_IN_RELOC_CHAIN 202L -#define ERROR_ENVVAR_NOT_FOUND 203L -#define ERROR_NO_SIGNAL_SENT 205L -#define ERROR_FILENAME_EXCED_RANGE 206L -#define ERROR_RING2_STACK_IN_USE 207L -#define ERROR_META_EXPANSION_TOO_LONG 208L -#define ERROR_INVALID_SIGNAL_NUMBER 209L -#define ERROR_THREAD_1_INACTIVE 210L -#define ERROR_LOCKED 212L -#define ERROR_TOO_MANY_MODULES 214L -#define ERROR_NESTING_NOT_ALLOWED 215L -#define ERROR_CANNOT_SHRINK 216L -#define ERROR_ZOMBIE_PROCESS 217L -#define ERROR_STACK_IN_HIGH_MEMORY 218L -#define ERROR_INVALID_EXITROUTINE_RING 219L -#define ERROR_GETBUF_FAILED 220L -#define ERROR_FLUSHBUF_FAILED 221L -#define ERROR_TRANSFER_TOO_LONG 222L -#define ERROR_FORCENOSWAP_FAILED 223L -#define ERROR_SMG_NO_TARGET_WINDOW 224L -#define ERROR_NO_CHILDREN 228L -#define ERROR_INVALID_SCREEN_GROUP 229L -#define ERROR_BAD_PIPE 230L -#define ERROR_PIPE_BUSY 231L -#define ERROR_NO_DATA 232L -#define ERROR_PIPE_NOT_CONNECTED 233L -#define ERROR_MORE_DATA 234L -#define ERROR_VC_DISCONNECTED 240L -#define ERROR_INVALID_EA_NAME 254L -#define ERROR_EA_LIST_INCONSISTENT 255L -#define ERROR_NO_MORE_ITEMS 259L -#define ERROR_CANNOT_COPY 266L -#define ERROR_DIRECTORY 267L -#define ERROR_EAS_DIDNT_FIT 275L -#define ERROR_EA_FILE_CORRUPT 276L -#define ERROR_EA_TABLE_FULL 277L -#define ERROR_INVALID_EA_HANDLE 278L -#define ERROR_EAS_NOT_SUPPORTED 282L -#define ERROR_NOT_OWNER 288L -#define ERROR_TOO_MANY_POSTS 298L -#define ERROR_PARTIAL_COPY 299L -#define ERROR_MR_MID_NOT_FOUND 317L -#define ERROR_INVALID_ADDRESS 487L -#define ERROR_ARITHMETIC_OVERFLOW 534L -#define ERROR_PIPE_CONNECTED 535L -#define ERROR_PIPE_LISTENING 536L -#define ERROR_EA_ACCESS_DENIED 994L -#define ERROR_OPERATION_ABORTED 995L -#define ERROR_IO_INCOMPLETE 996L -#define ERROR_IO_PENDING 997L -#define ERROR_NOACCESS 998L -#define ERROR_SWAPERROR 999L -#define ERROR_STACK_OVERFLOW 1001L -#define ERROR_INVALID_MESSAGE 1002L -#define ERROR_CAN_NOT_COMPLETE 1003L -#define ERROR_INVALID_FLAGS 1004L -#define ERROR_UNRECOGNIZED_VOLUME 1005L -#define ERROR_FILE_INVALID 1006L -#define ERROR_FULLSCREEN_MODE 1007L -#define ERROR_NO_TOKEN 1008L -#define ERROR_BADDB 1009L -#define ERROR_BADKEY 1010L -#define ERROR_CANTOPEN 1011L -#define ERROR_CANTREAD 1012L -#define ERROR_CANTWRITE 1013L -#define ERROR_REGISTRY_RECOVERED 1014L -#define ERROR_REGISTRY_CORRUPT 1015L -#define ERROR_REGISTRY_IO_FAILED 1016L -#define ERROR_NOT_REGISTRY_FILE 1017L -#define ERROR_KEY_DELETED 1018L -#define ERROR_NO_LOG_SPACE 1019L -#define ERROR_KEY_HAS_CHILDREN 1020L -#define ERROR_CHILD_MUST_BE_VOLATILE 1021L -#define ERROR_NOTIFY_ENUM_DIR 1022L -#define ERROR_DEPENDENT_SERVICES_RUNNING 1051L -#define ERROR_INVALID_SERVICE_CONTROL 1052L -#define ERROR_SERVICE_REQUEST_TIMEOUT 1053L -#define ERROR_SERVICE_NO_THREAD 1054L -#define ERROR_SERVICE_DATABASE_LOCKED 1055L -#define ERROR_SERVICE_ALREADY_RUNNING 1056L -#define ERROR_INVALID_SERVICE_ACCOUNT 1057L -#define ERROR_SERVICE_DISABLED 1058L -#define ERROR_CIRCULAR_DEPENDENCY 1059L -#define ERROR_SERVICE_DOES_NOT_EXIST 1060L -#define ERROR_SERVICE_CANNOT_ACCEPT_CTRL 1061L -#define ERROR_SERVICE_NOT_ACTIVE 1062L -#define ERROR_FAILED_SERVICE_CONTROLLER_CONNECT 1063L -#define ERROR_EXCEPTION_IN_SERVICE 1064L -#define ERROR_DATABASE_DOES_NOT_EXIST 1065L -#define ERROR_SERVICE_SPECIFIC_ERROR 1066L -#define ERROR_PROCESS_ABORTED 1067L -#define ERROR_SERVICE_DEPENDENCY_FAIL 1068L -#define ERROR_SERVICE_LOGON_FAILED 1069L -#define ERROR_SERVICE_START_HANG 1070L -#define ERROR_INVALID_SERVICE_LOCK 1071L -#define ERROR_SERVICE_MARKED_FOR_DELETE 1072L -#define ERROR_SERVICE_EXISTS 1073L -#define ERROR_ALREADY_RUNNING_LKG 1074L -#define ERROR_SERVICE_DEPENDENCY_DELETED 1075L -#define ERROR_BOOT_ALREADY_ACCEPTED 1076L -#define ERROR_SERVICE_NEVER_STARTED 1077L -#define ERROR_DUPLICATE_SERVICE_NAME 1078L -#define ERROR_END_OF_MEDIA 1100L -#define ERROR_FILEMARK_DETECTED 1101L -#define ERROR_BEGINNING_OF_MEDIA 1102L -#define ERROR_SETMARK_DETECTED 1103L -#define ERROR_NO_DATA_DETECTED 1104L -#define ERROR_PARTITION_FAILURE 1105L -#define ERROR_INVALID_BLOCK_LENGTH 1106L -#define ERROR_DEVICE_NOT_PARTITIONED 1107L -#define ERROR_UNABLE_TO_LOCK_MEDIA 1108L -#define ERROR_UNABLE_TO_UNLOAD_MEDIA 1109L -#define ERROR_MEDIA_CHANGED 1110L -#define ERROR_BUS_RESET 1111L -#define ERROR_NO_MEDIA_IN_DRIVE 1112L -#define ERROR_NO_UNICODE_TRANSLATION 1113L -#define ERROR_DLL_INIT_FAILED 1114L -#define ERROR_SHUTDOWN_IN_PROGRESS 1115L -#define ERROR_NO_SHUTDOWN_IN_PROGRESS 1116L -#define ERROR_IO_DEVICE 1117L -#define ERROR_SERIAL_NO_DEVICE 1118L -#define ERROR_IRQ_BUSY 1119L -#define ERROR_MORE_WRITES 1120L -#define ERROR_COUNTER_TIMEOUT 1121L -#define ERROR_FLOPPY_ID_MARK_NOT_FOUND 1122L -#define ERROR_FLOPPY_WRONG_CYLINDER 1123L -#define ERROR_FLOPPY_UNKNOWN_ERROR 1124L -#define ERROR_FLOPPY_BAD_REGISTERS 1125L -#define ERROR_DISK_RECALIBRATE_FAILED 1126L -#define ERROR_DISK_OPERATION_FAILED 1127L -#define ERROR_DISK_RESET_FAILED 1128L -#define ERROR_EOM_OVERFLOW 1129L -#define ERROR_NOT_ENOUGH_SERVER_MEMORY 1130L -#define ERROR_POSSIBLE_DEADLOCK 1131L -#define ERROR_MAPPED_ALIGNMENT 1132L -#define ERROR_SET_POWER_STATE_VETOED 1140L -#define ERROR_SET_POWER_STATE_FAILED 1141L -#define ERROR_TOO_MANY_LINKS 1142L -#define ERROR_OLD_WIN_VERSION 1150L -#define ERROR_APP_WRONG_OS 1151L -#define ERROR_SINGLE_INSTANCE_APP 1152L -#define ERROR_RMODE_APP 1153L -#define ERROR_INVALID_DLL 1154L -#define ERROR_NO_ASSOCIATION 1155L -#define ERROR_DDE_FAIL 1156L -#define ERROR_DLL_NOT_FOUND 1157L -#define ERROR_BAD_DEVICE 1200L -#define ERROR_CONNECTION_UNAVAIL 1201L -#define ERROR_DEVICE_ALREADY_REMEMBERED 1202L -#define ERROR_NO_NET_OR_BAD_PATH 1203L -#define ERROR_BAD_PROVIDER 1204L -#define ERROR_CANNOT_OPEN_PROFILE 1205L -#define ERROR_BAD_PROFILE 1206L -#define ERROR_NOT_CONTAINER 1207L -#define ERROR_EXTENDED_ERROR 1208L -#define ERROR_INVALID_GROUPNAME 1209L -#define ERROR_INVALID_COMPUTERNAME 1210L -#define ERROR_INVALID_EVENTNAME 1211L -#define ERROR_INVALID_DOMAINNAME 1212L -#define ERROR_INVALID_SERVICENAME 1213L -#define ERROR_INVALID_NETNAME 1214L -#define ERROR_INVALID_SHARENAME 1215L -#define ERROR_INVALID_PASSWORDNAME 1216L -#define ERROR_INVALID_MESSAGENAME 1217L -#define ERROR_INVALID_MESSAGEDEST 1218L -#define ERROR_SESSION_CREDENTIAL_CONFLICT 1219L -#define ERROR_REMOTE_SESSION_LIMIT_EXCEEDED 1220L -#define ERROR_DUP_DOMAINNAME 1221L -#define ERROR_NO_NETWORK 1222L -#define ERROR_CANCELLED 1223L -#define ERROR_USER_MAPPED_FILE 1224L -#define ERROR_CONNECTION_REFUSED 1225L -#define ERROR_GRACEFUL_DISCONNECT 1226L -#define ERROR_ADDRESS_ALREADY_ASSOCIATED 1227L -#define ERROR_ADDRESS_NOT_ASSOCIATED 1228L -#define ERROR_CONNECTION_INVALID 1229L -#define ERROR_CONNECTION_ACTIVE 1230L -#define ERROR_NETWORK_UNREACHABLE 1231L -#define ERROR_HOST_UNREACHABLE 1232L -#define ERROR_PROTOCOL_UNREACHABLE 1233L -#define ERROR_PORT_UNREACHABLE 1234L -#define ERROR_REQUEST_ABORTED 1235L -#define ERROR_CONNECTION_ABORTED 1236L -#define ERROR_RETRY 1237L -#define ERROR_CONNECTION_COUNT_LIMIT 1238L -#define ERROR_LOGIN_TIME_RESTRICTION 1239L -#define ERROR_LOGIN_WKSTA_RESTRICTION 1240L -#define ERROR_INCORRECT_ADDRESS 1241L -#define ERROR_ALREADY_REGISTERED 1242L -#define ERROR_SERVICE_NOT_FOUND 1243L -#define ERROR_NOT_AUTHENTICATED 1244L -#define ERROR_NOT_LOGGED_ON 1245L -#define ERROR_CONTINUE 1246L -#define ERROR_ALREADY_INITIALIZED 1247L -#define ERROR_NO_MORE_DEVICES 1248L -#define ERROR_NOT_ALL_ASSIGNED 1300L -#define ERROR_SOME_NOT_MAPPED 1301L -#define ERROR_NO_QUOTAS_FOR_ACCOUNT 1302L -#define ERROR_LOCAL_USER_SESSION_KEY 1303L -#define ERROR_NULL_LM_PASSWORD 1304L -#define ERROR_UNKNOWN_REVISION 1305L -#define ERROR_REVISION_MISMATCH 1306L -#define ERROR_INVALID_OWNER 1307L -#define ERROR_INVALID_PRIMARY_GROUP 1308L -#define ERROR_NO_IMPERSONATION_TOKEN 1309L -#define ERROR_CANT_DISABLE_MANDATORY 1310L -#define ERROR_NO_LOGON_SERVERS 1311L -#define ERROR_NO_SUCH_LOGON_SESSION 1312L -#define ERROR_NO_SUCH_PRIVILEGE 1313L -#define ERROR_PRIVILEGE_NOT_HELD 1314L -#define ERROR_INVALID_ACCOUNT_NAME 1315L -#define ERROR_USER_EXISTS 1316L -#define ERROR_NO_SUCH_USER 1317L -#define ERROR_GROUP_EXISTS 1318L -#define ERROR_NO_SUCH_GROUP 1319L -#define ERROR_MEMBER_IN_GROUP 1320L -#define ERROR_MEMBER_NOT_IN_GROUP 1321L -#define ERROR_LAST_ADMIN 1322L -#define ERROR_WRONG_PASSWORD 1323L -#define ERROR_ILL_FORMED_PASSWORD 1324L -#define ERROR_PASSWORD_RESTRICTION 1325L -#define ERROR_LOGON_FAILURE 1326L -#define ERROR_ACCOUNT_RESTRICTION 1327L -#define ERROR_INVALID_LOGON_HOURS 1328L -#define ERROR_INVALID_WORKSTATION 1329L -#define ERROR_PASSWORD_EXPIRED 1330L -#define ERROR_ACCOUNT_DISABLED 1331L -#define ERROR_NONE_MAPPED 1332L -#define ERROR_TOO_MANY_LUIDS_REQUESTED 1333L -#define ERROR_LUIDS_EXHAUSTED 1334L -#define ERROR_INVALID_SUB_AUTHORITY 1335L -#define ERROR_INVALID_ACL 1336L -#define ERROR_INVALID_SID 1337L -#define ERROR_INVALID_SECURITY_DESCR 1338L -#define ERROR_BAD_INHERITANCE_ACL 1340L -#define ERROR_SERVER_DISABLED 1341L -#define ERROR_SERVER_NOT_DISABLED 1342L -#define ERROR_INVALID_ID_AUTHORITY 1343L -#define ERROR_ALLOTTED_SPACE_EXCEEDED 1344L -#define ERROR_INVALID_GROUP_ATTRIBUTES 1345L -#define ERROR_BAD_IMPERSONATION_LEVEL 1346L -#define ERROR_CANT_OPEN_ANONYMOUS 1347L -#define ERROR_BAD_VALIDATION_CLASS 1348L -#define ERROR_BAD_TOKEN_TYPE 1349L -#define ERROR_NO_SECURITY_ON_OBJECT 1350L -#define ERROR_CANT_ACCESS_DOMAIN_INFO 1351L -#define ERROR_INVALID_SERVER_STATE 1352L -#define ERROR_INVALID_DOMAIN_STATE 1353L -#define ERROR_INVALID_DOMAIN_ROLE 1354L -#define ERROR_NO_SUCH_DOMAIN 1355L -#define ERROR_DOMAIN_EXISTS 1356L -#define ERROR_DOMAIN_LIMIT_EXCEEDED 1357L -#define ERROR_INTERNAL_DB_CORRUPTION 1358L -#define ERROR_INTERNAL_ERROR 1359L -#define ERROR_GENERIC_NOT_MAPPED 1360L -#define ERROR_BAD_DESCRIPTOR_FORMAT 1361L -#define ERROR_NOT_LOGON_PROCESS 1362L -#define ERROR_LOGON_SESSION_EXISTS 1363L -#define ERROR_NO_SUCH_PACKAGE 1364L -#define ERROR_BAD_LOGON_SESSION_STATE 1365L -#define ERROR_LOGON_SESSION_COLLISION 1366L -#define ERROR_INVALID_LOGON_TYPE 1367L -#define ERROR_CANNOT_IMPERSONATE 1368L -#define ERROR_RXACT_INVALID_STATE 1369L -#define ERROR_RXACT_COMMIT_FAILURE 1370L -#define ERROR_SPECIAL_ACCOUNT 1371L -#define ERROR_SPECIAL_GROUP 1372L -#define ERROR_SPECIAL_USER 1373L -#define ERROR_MEMBERS_PRIMARY_GROUP 1374L -#define ERROR_TOKEN_ALREADY_IN_USE 1375L -#define ERROR_NO_SUCH_ALIAS 1376L -#define ERROR_MEMBER_NOT_IN_ALIAS 1377L -#define ERROR_MEMBER_IN_ALIAS 1378L -#define ERROR_ALIAS_EXISTS 1379L -#define ERROR_LOGON_NOT_GRANTED 1380L -#define ERROR_TOO_MANY_SECRETS 1381L -#define ERROR_SECRET_TOO_LONG 1382L -#define ERROR_INTERNAL_DB_ERROR 1383L -#define ERROR_TOO_MANY_CONTEXT_IDS 1384L -#define ERROR_LOGON_TYPE_NOT_GRANTED 1385L -#define ERROR_NT_CROSS_ENCRYPTION_REQUIRED 1386L -#define ERROR_NO_SUCH_MEMBER 1387L -#define ERROR_INVALID_MEMBER 1388L -#define ERROR_TOO_MANY_SIDS 1389L -#define ERROR_LM_CROSS_ENCRYPTION_REQUIRED 1390L -#define ERROR_NO_INHERITANCE 1391L -#define ERROR_FILE_CORRUPT 1392L -#define ERROR_DISK_CORRUPT 1393L -#define ERROR_NO_USER_SESSION_KEY 1394L -#define ERROR_LICENSE_QUOTA_EXCEEDED 1395L -#define ERROR_INVALID_WINDOW_HANDLE 1400L -#define ERROR_INVALID_MENU_HANDLE 1401L -#define ERROR_INVALID_CURSOR_HANDLE 1402L -#define ERROR_INVALID_ACCEL_HANDLE 1403L -#define ERROR_INVALID_HOOK_HANDLE 1404L -#define ERROR_INVALID_DWP_HANDLE 1405L -#define ERROR_TLW_WITH_WSCHILD 1406L -#define ERROR_CANNOT_FIND_WND_CLASS 1407L -#define ERROR_WINDOW_OF_OTHER_THREAD 1408L -#define ERROR_HOTKEY_ALREADY_REGISTERED 1409L -#define ERROR_CLASS_ALREADY_EXISTS 1410L -#define ERROR_CLASS_DOES_NOT_EXIST 1411L -#define ERROR_CLASS_HAS_WINDOWS 1412L -#define ERROR_INVALID_INDEX 1413L -#define ERROR_INVALID_ICON_HANDLE 1414L -#define ERROR_PRIVATE_DIALOG_INDEX 1415L -#define ERROR_LISTBOX_ID_NOT_FOUND 1416L -#define ERROR_NO_WILDCARD_CHARACTERS 1417L -#define ERROR_CLIPBOARD_NOT_OPEN 1418L -#define ERROR_HOTKEY_NOT_REGISTERED 1419L -#define ERROR_WINDOW_NOT_DIALOG 1420L -#define ERROR_CONTROL_ID_NOT_FOUND 1421L -#define ERROR_INVALID_COMBOBOX_MESSAGE 1422L -#define ERROR_WINDOW_NOT_COMBOBOX 1423L -#define ERROR_INVALID_EDIT_HEIGHT 1424L -#define ERROR_DC_NOT_FOUND 1425L -#define ERROR_INVALID_HOOK_FILTER 1426L -#define ERROR_INVALID_FILTER_PROC 1427L -#define ERROR_HOOK_NEEDS_HMOD 1428L -#define ERROR_GLOBAL_ONLY_HOOK 1429L -#define ERROR_JOURNAL_HOOK_SET 1430L -#define ERROR_HOOK_NOT_INSTALLED 1431L -#define ERROR_INVALID_LB_MESSAGE 1432L -#define ERROR_SETCOUNT_ON_BAD_LB 1433L -#define ERROR_LB_WITHOUT_TABSTOPS 1434L -#define ERROR_DESTROY_OBJECT_OF_OTHER_THREAD 1435L -#define ERROR_CHILD_WINDOW_MENU 1436L -#define ERROR_NO_SYSTEM_MENU 1437L -#define ERROR_INVALID_MSGBOX_STYLE 1438L -#define ERROR_INVALID_SPI_VALUE 1439L -#define ERROR_SCREEN_ALREADY_LOCKED 1440L -#define ERROR_HWNDS_HAVE_DIFF_PARENT 1441L -#define ERROR_NOT_CHILD_WINDOW 1442L -#define ERROR_INVALID_GW_COMMAND 1443L -#define ERROR_INVALID_THREAD_ID 1444L -#define ERROR_NON_MDICHILD_WINDOW 1445L -#define ERROR_POPUP_ALREADY_ACTIVE 1446L -#define ERROR_NO_SCROLLBARS 1447L -#define ERROR_INVALID_SCROLLBAR_RANGE 1448L -#define ERROR_INVALID_SHOWWIN_COMMAND 1449L -#define ERROR_NO_SYSTEM_RESOURCES 1450L -#define ERROR_NONPAGED_SYSTEM_RESOURCES 1451L -#define ERROR_PAGED_SYSTEM_RESOURCES 1452L -#define ERROR_WORKING_SET_QUOTA 1453L -#define ERROR_PAGEFILE_QUOTA 1454L -#define ERROR_COMMITMENT_LIMIT 1455L -#define ERROR_MENU_ITEM_NOT_FOUND 1456L -#define ERROR_TIMEOUT 1460L -#define ERROR_INVALID_MONITOR_HANDLE 1461L -#define ERROR_EVENTLOG_FILE_CORRUPT 1500L -#define ERROR_EVENTLOG_CANT_START 1501L -#define ERROR_LOG_FILE_FULL 1502L -#define ERROR_EVENTLOG_FILE_CHANGED 1503L -#define RPC_S_INVALID_STRING_BINDING 1700L -#define RPC_S_WRONG_KIND_OF_BINDING 1701L -#define RPC_S_INVALID_BINDING 1702L -#define RPC_S_PROTSEQ_NOT_SUPPORTED 1703L -#define RPC_S_INVALID_RPC_PROTSEQ 1704L -#define RPC_S_INVALID_STRING_UUID 1705L -#define RPC_S_INVALID_ENDPOINT_FORMAT 1706L -#define RPC_S_INVALID_NET_ADDR 1707L -#define RPC_S_NO_ENDPOINT_FOUND 1708L -#define RPC_S_INVALID_TIMEOUT 1709L -#define RPC_S_OBJECT_NOT_FOUND 1710L -#define RPC_S_ALREADY_REGISTERED 1711L -#define RPC_S_TYPE_ALREADY_REGISTERED 1712L -#define RPC_S_ALREADY_LISTENING 1713L -#define RPC_S_NO_PROTSEQS_REGISTERED 1714L -#define RPC_S_NOT_LISTENING 1715L -#define RPC_S_UNKNOWN_MGR_TYPE 1716L -#define RPC_S_UNKNOWN_IF 1717L -#define RPC_S_NO_BINDINGS 1718L -#define RPC_S_NO_PROTSEQS 1719L -#define RPC_S_CANT_CREATE_ENDPOINT 1720L -#define RPC_S_OUT_OF_RESOURCES 1721L -#define RPC_S_SERVER_UNAVAILABLE 1722L -#define RPC_S_SERVER_TOO_BUSY 1723L -#define RPC_S_INVALID_NETWORK_OPTIONS 1724L -#define RPC_S_NO_CALL_ACTIVE 1725L -#define RPC_S_CALL_FAILED 1726L -#define RPC_S_CALL_FAILED_DNE 1727L -#define RPC_S_PROTOCOL_ERROR 1728L -#define RPC_S_UNSUPPORTED_TRANS_SYN 1730L -#define RPC_S_UNSUPPORTED_TYPE 1732L -#define RPC_S_INVALID_TAG 1733L -#define RPC_S_INVALID_BOUND 1734L -#define RPC_S_NO_ENTRY_NAME 1735L -#define RPC_S_INVALID_NAME_SYNTAX 1736L -#define RPC_S_UNSUPPORTED_NAME_SYNTAX 1737L -#define RPC_S_UUID_NO_ADDRESS 1739L -#define RPC_S_DUPLICATE_ENDPOINT 1740L -#define RPC_S_UNKNOWN_AUTHN_TYPE 1741L -#define RPC_S_MAX_CALLS_TOO_SMALL 1742L -#define RPC_S_STRING_TOO_LONG 1743L -#define RPC_S_PROTSEQ_NOT_FOUND 1744L -#define RPC_S_PROCNUM_OUT_OF_RANGE 1745L -#define RPC_S_BINDING_HAS_NO_AUTH 1746L -#define RPC_S_UNKNOWN_AUTHN_SERVICE 1747L -#define RPC_S_UNKNOWN_AUTHN_LEVEL 1748L -#define RPC_S_INVALID_AUTH_IDENTITY 1749L -#define RPC_S_UNKNOWN_AUTHZ_SERVICE 1750L -#define EPT_S_INVALID_ENTRY 1751L -#define EPT_S_CANT_PERFORM_OP 1752L -#define EPT_S_NOT_REGISTERED 1753L -#define RPC_S_NOTHING_TO_EXPORT 1754L -#define RPC_S_INCOMPLETE_NAME 1755L -#define RPC_S_INVALID_VERS_OPTION 1756L -#define RPC_S_NO_MORE_MEMBERS 1757L -#define RPC_S_NOT_ALL_OBJS_UNEXPORTED 1758L -#define RPC_S_INTERFACE_NOT_FOUND 1759L -#define RPC_S_ENTRY_ALREADY_EXISTS 1760L -#define RPC_S_ENTRY_NOT_FOUND 1761L -#define RPC_S_NAME_SERVICE_UNAVAILABLE 1762L -#define RPC_S_INVALID_NAF_ID 1763L -#define RPC_S_CANNOT_SUPPORT 1764L -#define RPC_S_NO_CONTEXT_AVAILABLE 1765L -#define RPC_S_INTERNAL_ERROR 1766L -#define RPC_S_ZERO_DIVIDE 1767L -#define RPC_S_ADDRESS_ERROR 1768L -#define RPC_S_FP_DIV_ZERO 1769L -#define RPC_S_FP_UNDERFLOW 1770L -#define RPC_S_FP_OVERFLOW 1771L -#define RPC_X_NO_MORE_ENTRIES 1772L -#define RPC_X_SS_CHAR_TRANS_OPEN_FAIL 1773L -#define RPC_X_SS_CHAR_TRANS_SHORT_FILE 1774L -#define RPC_X_SS_IN_NULL_CONTEXT 1775L -#define RPC_X_SS_CONTEXT_DAMAGED 1777L -#define RPC_X_SS_HANDLES_MISMATCH 1778L -#define RPC_X_SS_CANNOT_GET_CALL_HANDLE 1779L -#define RPC_X_NULL_REF_POINTER 1780L -#define RPC_X_ENUM_VALUE_OUT_OF_RANGE 1781L -#define RPC_X_BYTE_COUNT_TOO_SMALL 1782L -#define RPC_X_BAD_STUB_DATA 1783L -#define ERROR_INVALID_USER_BUFFER 1784L -#define ERROR_UNRECOGNIZED_MEDIA 1785L -#define ERROR_NO_TRUST_LSA_SECRET 1786L -#define ERROR_NO_TRUST_SAM_ACCOUNT 1787L -#define ERROR_TRUSTED_DOMAIN_FAILURE 1788L -#define ERROR_TRUSTED_RELATIONSHIP_FAILURE 1789L -#define ERROR_TRUST_FAILURE 1790L -#define RPC_S_CALL_IN_PROGRESS 1791L -#define ERROR_NETLOGON_NOT_STARTED 1792L -#define ERROR_ACCOUNT_EXPIRED 1793L -#define ERROR_REDIRECTOR_HAS_OPEN_HANDLES 1794L -#define ERROR_PRINTER_DRIVER_ALREADY_INSTALLED 1795L -#define ERROR_UNKNOWN_PORT 1796L -#define ERROR_UNKNOWN_PRINTER_DRIVER 1797L -#define ERROR_UNKNOWN_PRINTPROCESSOR 1798L -#define ERROR_INVALID_SEPARATOR_FILE 1799L -#define ERROR_INVALID_PRIORITY 1800L -#define ERROR_INVALID_PRINTER_NAME 1801L -#define ERROR_PRINTER_ALREADY_EXISTS 1802L -#define ERROR_INVALID_PRINTER_COMMAND 1803L -#define ERROR_INVALID_DATATYPE 1804L -#define ERROR_INVALID_ENVIRONMENT 1805L -#define RPC_S_NO_MORE_BINDINGS 1806L -#define ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 1807L -#define ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT 1808L -#define ERROR_NOLOGON_SERVER_TRUST_ACCOUNT 1809L -#define ERROR_DOMAIN_TRUST_INCONSISTENT 1810L -#define ERROR_SERVER_HAS_OPEN_HANDLES 1811L -#define ERROR_RESOURCE_DATA_NOT_FOUND 1812L -#define ERROR_RESOURCE_TYPE_NOT_FOUND 1813L -#define ERROR_RESOURCE_NAME_NOT_FOUND 1814L -#define ERROR_RESOURCE_LANG_NOT_FOUND 1815L -#define ERROR_NOT_ENOUGH_QUOTA 1816L -#define RPC_S_NO_INTERFACES 1817L -#define RPC_S_CALL_CANCELLED 1818L -#define RPC_S_BINDING_INCOMPLETE 1819L -#define RPC_S_COMM_FAILURE 1820L -#define RPC_S_UNSUPPORTED_AUTHN_LEVEL 1821L -#define RPC_S_NO_PRINC_NAME 1822L -#define RPC_S_NOT_RPC_ERROR 1823L -#define RPC_S_UUID_LOCAL_ONLY 1824L -#define RPC_S_SEC_PKG_ERROR 1825L -#define RPC_S_NOT_CANCELLED 1826L -#define RPC_X_INVALID_ES_ACTION 1827L -#define RPC_X_WRONG_ES_VERSION 1828L -#define RPC_X_WRONG_STUB_VERSION 1829L -#define RPC_X_INVALID_PIPE_OBJECT 1830L -#define RPC_X_WRONG_PIPE_ORDER 1831L -#define RPC_X_WRONG_PIPE_VERSION 1832L -#define RPC_S_GROUP_MEMBER_NOT_FOUND 1898L -#define EPT_S_CANT_CREATE 1899L -#define RPC_S_INVALID_OBJECT 1900L -#define ERROR_INVALID_TIME 1901L -#define ERROR_INVALID_FORM_NAME 1902L -#define ERROR_INVALID_FORM_SIZE 1903L -#define ERROR_ALREADY_WAITING 1904L -#define ERROR_PRINTER_DELETED 1905L -#define ERROR_INVALID_PRINTER_STATE 1906L -#define ERROR_PASSWORD_MUST_CHANGE 1907L -#define ERROR_DOMAIN_CONTROLLER_NOT_FOUND 1908L -#define ERROR_ACCOUNT_LOCKED_OUT 1909L -#define OR_INVALID_OXID 1910L -#define OR_INVALID_OID 1911L -#define OR_INVALID_SET 1912L -#define RPC_S_SEND_INCOMPLETE 1913L -#define ERROR_INVALID_PIXEL_FORMAT 2000L -#define ERROR_BAD_DRIVER 2001L -#define ERROR_INVALID_WINDOW_STYLE 2002L -#define ERROR_METAFILE_NOT_SUPPORTED 2003L -#define ERROR_TRANSFORM_NOT_SUPPORTED 2004L -#define ERROR_CLIPPING_NOT_SUPPORTED 2005L -#define ERROR_BAD_USERNAME 2202L -#define ERROR_NOT_CONNECTED 2250L -#define ERROR_OPEN_FILES 2401L -#define ERROR_ACTIVE_CONNECTIONS 2402L -#define ERROR_DEVICE_IN_USE 2404L -#define ERROR_UNKNOWN_PRINT_MONITOR 3000L -#define ERROR_PRINTER_DRIVER_IN_USE 3001L -#define ERROR_SPOOL_FILE_NOT_FOUND 3002L -#define ERROR_SPL_NO_STARTDOC 3003L -#define ERROR_SPL_NO_ADDJOB 3004L -#define ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED 3005L -#define ERROR_PRINT_MONITOR_ALREADY_INSTALLED 3006L -#define ERROR_WINS_INTERNAL 4000L -#define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001L -#define ERROR_STATIC_INIT 4002L -#define ERROR_INC_BACKUP 4003L -#define ERROR_FULL_BACKUP 4004L -#define ERROR_REC_NON_EXISTENT 4005L -#define ERROR_RPL_NOT_ALLOWED 4006L -#define ERROR_NO_BROWSER_SERVERS_FOUND 6118L -#endif - - -/* HRESULT values for OLE, SHELL and other Interface stuff */ -/* the codes 4000-40ff are reserved for OLE */ -#define NOERROR 0L - -#define E_PENDING 0x8000000AL - - -#define E_NOTIMPL 0x80004001L -#define E_NOINTERFACE 0x80004002L -#define E_POINTER 0x80004003L -#define E_ABORT 0x80004004L -#define E_FAIL 0x80004005L -/* FIXME: E_UNSPEC is not a standard value but it is used by - * FileMoniker, IOleLink and DoDragDrop as a return value. - */ -#define E_UNSPEC E_FAIL - - -#define CO_E_INIT_TLS 0x80004006L -#define CO_E_INIT_SHARED_ALLOCATOR 0x80004007L -#define CO_E_INIT_MEMORY_ALLOCATOR 0x80004008L -#define CO_E_INIT_CLASS_CACHE 0x80004009L -#define CO_E_INIT_RPC_CHANNEL 0x8000400AL -#define CO_E_INIT_TLS_SET_CHANNEL_CONTROL 0x8000400BL -#define CO_E_INIT_TLS_CHANNEL_CONTROL 0x8000400CL -#define CO_E_INIT_UNACCEPTED_USER_ALLOCATOR 0x8000400DL -#define CO_E_INIT_SCM_MUTEX_EXISTS 0x8000400EL -#define CO_E_INIT_SCM_FILE_MAPPING_EXISTS 0x8000400FL -#define CO_E_INIT_SCM_MAP_VIEW_OF_FILE 0x80004010L -#define CO_E_INIT_SCM_EXEC_FAILURE 0x80004011L -#define CO_E_INIT_ONLY_SINGLE_THREADED 0x80004012L - -#define E_UNEXPECTED 0x8000FFFFL - -#define RPC_E_CALL_REJECTED 0x80010001L -#define RPC_E_CALL_CANCELED 0x80010002L -#define RPC_E_CANTPOST_INSENDCALL 0x80010003L -#define RPC_E_CANTCALLOUT_INASYNCCALL 0x80010004L -#define RPC_E_CANTCALLOUT_INEXTERNALCALL 0x80010005L -#define RPC_E_CONNECTION_TERMINATED 0x80010006L -#define RPC_E_SERVER_DIED 0x80010007L -#define RPC_E_CLIENT_DIED 0x80010008L -#define RPC_E_INVALID_DATAPACKET 0x80010009L -#define RPC_E_CANTTRANSMIT_CALL 0x8001000AL -#define RPC_E_CLIENT_CANTMARSHAL_DATA 0x8001000BL -#define RPC_E_CLIENT_CANTUNMARSHAL_DATA 0x8001000CL -#define RPC_E_SERVER_CANTMARSHAL_DATA 0x8001000DL -#define RPC_E_SERVER_CANTUNMARSHAL_DATA 0x8001000EL -#define RPC_E_INVALID_DATA 0x8001000FL -#define RPC_E_INVALID_PARAMETER 0x80010010L -#define RPC_E_CANTCALLOUT_AGAIN 0x80010011L -#define RPC_E_SERVER_DIED_DNE 0x80010012L -#define RPC_E_SYS_CALL_FAILED 0x80010100L -#define RPC_E_OUT_OF_RESOURCES 0x80010101L -#define RPC_E_ATTEMPTED_MULTITHREAD 0x80010102L -#define RPC_E_NOT_REGISTERED 0x80010103L -#define RPC_E_FAULT 0x80010104L -#define RPC_E_SERVERFAULT 0x80010105L -#define RPC_E_CHANGED_MODE 0x80010106L -#define RPC_E_INVALIDMETHOD 0x80010107L -#define RPC_E_DISCONNECTED 0x80010108L -#define RPC_E_RETRY 0x80010109L -#define RPC_E_SERVERCALL_RETRYLATER 0x8001010AL -#define RPC_E_SERVERCALL_REJECTED 0x8001010BL -#define RPC_E_INVALID_CALLDATA 0x8001010CL -#define RPC_E_CANTCALLOUT_ININPUTSYNCCALL 0x8001010DL -#define RPC_E_WRONG_THREAD 0x8001010EL -#define RPC_E_THREAD_NOT_INIT 0x8001010FL -#define RPC_E_VERSION_MISMATCH 0x80010110L -#define RPC_E_INVALID_HEADER 0x80010111L -#define RPC_E_INVALID_EXTENSION 0x80010112L -#define RPC_E_INVALID_IPID 0x80010113L -#define RPC_E_INVALID_OBJECT 0x80010114L -#define RPC_S_CALLPENDING 0x80010115L -#define RPC_S_WAITONTIMER 0x80010116L -#define RPC_E_CALL_COMPLETE 0x80010117L -#define RPC_E_UNSECURE_CALL 0x80010118L -#define RPC_E_TOO_LATE 0x80010119L -#define RPC_E_NO_GOOD_SECURITY_PACKAGES 0x8001011AL -#define RPC_E_ACCESS_DENIED 0x8001011BL -#define RPC_E_REMOTE_DISABLED 0x8001011CL -#define RPC_E_INVALID_OBJREF 0x8001011DL -#define RPC_E_NO_CONTEXT 0x8001011EL -#define RPC_E_TIMEOUT 0x8001011FL -#define RPC_E_NO_SYNC 0x80010120L -#define RPC_E_UNEXPECTED 0x8001FFFFL - -#define DISP_E_UNKNOWNINTERFACE 0x80020001L -#define DISP_E_MEMBERNOTFOUND 0x80020003L -#define DISP_E_PARAMNOTFOUND 0x80020004L -#define DISP_E_TYPEMISMATCH 0x80020005L -#define DISP_E_UNKNOWNNAME 0x80020006L -#define DISP_E_NONAMEDARGS 0x80020007L -#define DISP_E_BADVARTYPE 0x80020008L -#define DISP_E_EXCEPTION 0x80020009L -#define DISP_E_OVERFLOW 0x8002000AL -#define DISP_E_BADINDEX 0x8002000BL -#define DISP_E_UNKNOWNLCID 0x8002000CL -#define DISP_E_ARRAYISLOCKED 0x8002000DL -#define DISP_E_BADPARAMCOUNT 0x8002000EL -#define DISP_E_PARAMNOTOPTIONAL 0x8002000FL -#define DISP_E_BADCALLEE 0x80020010L -#define DISP_E_NOTACOLLECTION 0x80020011L -#define DISP_E_DIVBYZERO 0x80020012L - -#define TYPE_E_BUFFERTOOSMALL 0x80028016L -#define TYPE_E_FIELDNOTFOUND 0x80028017L -#define TYPE_E_INVDATAREAD 0x80028018L -#define TYPE_E_UNSUPFORMAT 0x80028019L -#define TYPE_E_REGISTRYACCESS 0x8002801CL -#define TYPE_E_LIBNOTREGISTERED 0x8002801DL -#define TYPE_E_UNDEFINEDTYPE 0x80028027L -#define TYPE_E_QUALIFIEDNAMEDISALLOWED 0x80028028L -#define TYPE_E_INVALIDSTATE 0x80028029L -#define TYPE_E_WRONGTYPEKIND 0x8002802AL -#define TYPE_E_ELEMENTNOTFOUND 0x8002802BL -#define TYPE_E_AMBIGUOUSNAME 0x8002802CL -#define TYPE_E_NAMECONFLICT 0x8002802DL -#define TYPE_E_UNKNOWNLCID 0x8002802EL -#define TYPE_E_DLLFUNCTIONNOTFOUND 0x8002802FL -#define TYPE_E_BADMODULEKIND 0x800288BDL -#define TYPE_E_SIZETOOBIG 0x800288C5L -#define TYPE_E_DUPLICATEID 0x800288C6L -#define TYPE_E_INVALIDID 0x800288CFL -#define TYPE_E_TYPEMISMATCH 0x80028CA0L -#define TYPE_E_OUTOFBOUNDS 0x80028CA1L -#define TYPE_E_IOERROR 0x80028CA2L -#define TYPE_E_CANTCREATETMPFILE 0x80028CA3L -#define TYPE_E_CANTLOADLIBRARY 0x80029C4AL -#define TYPE_E_INCONSISTENTPROPFUNCS 0x80029C83L -#define TYPE_E_CIRCULARTYPE 0x80029C84L - -#define STG_S_CONVERTED 0x00030200L -#define STG_S_BLOCK 0x00030201L -#define STG_S_RETRYNOW 0x00030202L -#define STG_S_MONITORING 0x00030203L -#define STG_S_MULTIPLEOPENS 0x00030204L -#define STG_S_CONSOLIDATIONFAILED 0x00030205L -#define STG_S_CANNOTCONSOLIDATE 0x00030206L - -#define STG_E_INVALIDFUNCTION 0x80030001L -#define STG_E_FILENOTFOUND 0x80030002L -#define STG_E_PATHNOTFOUND 0x80030003L -#define STG_E_TOOMANYOPENFILES 0x80030004L -#define STG_E_ACCESSDENIED 0x80030005L -#define STG_E_INVALIDHANDLE 0x80030006L -#define STG_E_INSUFFICIENTMEMORY 0x80030008L -#define STG_E_INVALIDPOINTER 0x80030009L -#define STG_E_NOMOREFILES 0x80030012L -#define STG_E_DISKISWRITEPROTECTED 0x80030013L -#define STG_E_SEEKERROR 0x80030019L -#define STG_E_WRITEFAULT 0x8003001DL -#define STG_E_READFAULT 0x8003001EL -#define STG_E_SHAREVIOLATION 0x80030020L -#define STG_E_LOCKVIOLATION 0x80030021L -#define STG_E_FILEALREADYEXISTS 0x80030050L -#define STG_E_INVALIDPARAMETER 0x80030057L -#define STG_E_MEDIUMFULL 0x80030070L -#define STG_E_ABNORMALAPIEXIT 0x800300FAL -#define STG_E_INVALIDHEADER 0x800300FBL -#define STG_E_INVALIDNAME 0x800300FCL -#define STG_E_UNKNOWN 0x800300FDL -#define STG_E_UNIMPLEMENTEDFUNCTION 0x800300FEL -#define STG_E_INVALIDFLAG 0x800300FFL -#define STG_E_INUSE 0x80030100L -#define STG_E_NOTCURRENT 0x80030101L -#define STG_E_REVERTED 0x80030102L -#define STG_E_CANTSAVE 0x80030103L -#define STG_E_OLDFORMAT 0x80030104L -#define STG_E_OLDDLL 0x80030105L -#define STG_E_SHAREREQUIRED 0x80030106L -#define STG_E_NOTFILEBASEDSTORAGE 0x80030107L -#define STG_E_EXTANTMARSHALLINGS 0x80030108L - -#define OLE_S_FIRST 0x00040000L -#define OLE_S_USEREG 0x00040000L -#define OLE_S_STATIC 0x00040001L -#define OLE_S_MAC_CLIPFORMAT 0x00040002L -#define OLE_S_LAST 0x000400FFL - -#define OLE_E_FIRST 0x80040000L -#define OLE_E_OLEVERB 0x80040000L -#define OLE_E_ADVF 0x80040001L -#define OLE_E_ENUM_NOMORE 0x80040002L -#define OLE_E_ADVISENOTSUPPORTED 0x80040003L -#define OLE_E_NOCONNECTION 0x80040004L -#define OLE_E_NOTRUNNING 0x80040005L -#define OLE_E_NOCACHE 0x80040006L -#define OLE_E_BLANK 0x80040007L -#define OLE_E_CLASSDIFF 0x80040008L -#define OLE_E_CANT_GETMONIKER 0x80040009L -#define OLE_E_CANT_BINDTOSOURCE 0x8004000AL -#define OLE_E_STATIC 0x8004000BL -#define OLE_E_PROMPTSAVECANCELLED 0x8004000CL -#define OLE_E_INVALIDRECT 0x8004000DL -#define OLE_E_WRONGCOMPOBJ 0x8004000EL -#define OLE_E_INVALIDHWND 0x8004000FL -#define OLE_E_NOT_INPLACEACTIVE 0x80040010L -#define OLE_E_CANTCONVERT 0x80040011L -#define OLE_E_NOSTORAGE 0x80040012L -#define DV_E_FORMATETC 0x80040064L -#define DV_E_DVTARGETDEVICE 0x80040065L -#define DV_E_STGMEDIUM 0x80040066L -#define DV_E_STATDATA 0x80040067L -#define DV_E_LINDEX 0x80040068L -#define DV_E_TYMED 0x80040069L -#define DV_E_CLIPFORMAT 0x8004006AL -#define DV_E_DVASPECT 0x8004006BL -#define DV_E_DVTARGETDEVICE_SIZE 0x8004006CL -#define DV_E_NOIVIEWOBJECT 0x8004006DL -#define OLE_E_LAST 0x800400FFL - -#define DRAGDROP_S_FIRST 0x00040100L -#define DRAGDROP_S_DROP 0x00040100L -#define DRAGDROP_S_CANCEL 0x00040101L -#define DRAGDROP_S_USEDEFAULTCURSORS 0x00040102L -#define DRAGDROP_S_LAST 0x0004010FL - -#define DRAGDROP_E_FIRST 0x80040100L -#define DRAGDROP_E_NOTREGISTERED 0x80040100L -#define DRAGDROP_E_ALREADYREGISTERED 0x80040101L -#define DRAGDROP_E_INVALIDHWND 0x80040102L -#define DRAGDROP_E_LAST 0x8004010FL - - -#define CLASSFACTORY_S_FIRST 0x00040110L -#define CLASSFACTORY_S_LAST 0x0004011FL - -#define CLASSFACTORY_E_FIRST 0x80040110L -#define CLASS_E_NOAGGREGATION 0x80040110L [truncated at 1000 lines; 293 more skipped]
19 years, 8 months
1
0
0
0
[sedwards] 14517: fixed header usage. Please avoid using windows.h
by sedwards@svn.reactos.com
fixed header usage. Please avoid using windows.h Modified: trunk/rosapps/sysutils/chklib.c Modified: trunk/rosapps/sysutils/ldd.c Modified: trunk/rosapps/sysutils/wmain.c _____ Modified: trunk/rosapps/sysutils/chklib.c --- trunk/rosapps/sysutils/chklib.c 2005-04-05 19:19:44 UTC (rev 14516) +++ trunk/rosapps/sysutils/chklib.c 2005-04-05 19:22:30 UTC (rev 14517) @@ -1,4 +1,4 @@ -/* $Id: chklib.c,v 1.2 2000/02/29 23:57:46 ea Exp $ +/* $Id$ * * chklib.c * @@ -27,10 +27,14 @@ * */ //#define UNICODE -#include <windows.h> #include <stdio.h> #include <stdlib.h> #include <assert.h> + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> + #include "win32err.h" #ifdef DISPLAY_VERSION _____ Modified: trunk/rosapps/sysutils/ldd.c --- trunk/rosapps/sysutils/ldd.c 2005-04-05 19:19:44 UTC (rev 14516) +++ trunk/rosapps/sysutils/ldd.c 2005-04-05 19:22:30 UTC (rev 14517) @@ -1,4 +1,4 @@ -/* $Id: ldd.c,v 1.3 2001/01/13 18:17:17 ea Exp $ +/* $Id$ * * FILE : ldd.c * AUTHOR: Emanuele ALIBERTI @@ -6,10 +6,14 @@ * DESC : List DOS devices, i.e. symbolic links created * in the \?? object manager's name space. */ -#include <windows.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> + + #include <reactos/buildno.h> #include "win32err.h" _____ Modified: trunk/rosapps/sysutils/wmain.c --- trunk/rosapps/sysutils/wmain.c 2005-04-05 19:19:44 UTC (rev 14516) +++ trunk/rosapps/sysutils/wmain.c 2005-04-05 19:22:30 UTC (rev 14517) @@ -1,10 +1,13 @@ -/* $Id: wmain.c,v 1.1 1999/05/16 07:27:35 ea Exp $ +/* $Id$ * * Entry point for programs that use wmain() */ -#include <windows.h> #include <stdio.h> +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> + int wmain(int argc,wchar_t *argv[]); wchar_t *
19 years, 8 months
1
0
0
0
[sedwards] 14516: remove windows.h
by sedwards@svn.reactos.com
remove windows.h Modified: trunk/rosapps/sysutils/win32err.h _____ Modified: trunk/rosapps/sysutils/win32err.h --- trunk/rosapps/sysutils/win32err.h 2005-04-05 19:17:21 UTC (rev 14515) +++ trunk/rosapps/sysutils/win32err.h 2005-04-05 19:19:44 UTC (rev 14516) @@ -1,9 +1,6 @@ #ifndef _INC_WIN32ERR_H #define _INC_WIN32ERR_H -/* $Id: win32err.h,v 1.1 1999/05/16 07:27:35 ea Exp $ */ -#ifndef _GNU_H_WINDOWS_H -#include <windows.h> -#endif /* ndef _GNU_H_WINDOWS_H */ +/* $Id$ */ VOID PrintWin32Error( PWCHAR Message,
19 years, 8 months
1
0
0
0
[sedwards] 14515: __USE_W32API
by sedwards@svn.reactos.com
__USE_W32API Modified: trunk/rosapps/notevil/makefile _____ Modified: trunk/rosapps/notevil/makefile --- trunk/rosapps/notevil/makefile 2005-04-05 19:14:37 UTC (rev 14514) +++ trunk/rosapps/notevil/makefile 2005-04-05 19:17:21 UTC (rev 14515) @@ -12,7 +12,7 @@ TARGET_NAME = notevil -#TARGET_CFLAGS = -DUNICODE -D_UNICODE +TARGET_CFLAGS = -D__USE_W32API #-DUNICODE -D_UNICODE TARGET_SDKLIBS = \ kernel32.a \
19 years, 8 months
1
0
0
0
[sedwards] 14514: __USE_W32API
by sedwards@svn.reactos.com
__USE_W32API Modified: trunk/rosapps/games/winemine/Makefile _____ Modified: trunk/rosapps/games/winemine/Makefile --- trunk/rosapps/games/winemine/Makefile 2005-04-05 19:13:51 UTC (rev 14513) +++ trunk/rosapps/games/winemine/Makefile 2005-04-05 19:14:37 UTC (rev 14514) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2003/03/07 00:13:22 gvg Exp $ +# $Id$ PATH_TO_TOP = ../../../reactos @@ -12,6 +12,8 @@ TARGET_OBJECTS = main.o dialog.o +TARGET_CFLAGS = -D__USE_W32API + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk
19 years, 8 months
1
0
0
0
[sedwards] 14513: use -D__USE_W32API
by sedwards@svn.reactos.com
use -D__USE_W32API Modified: trunk/rosapps/demos/maze/Makefile _____ Modified: trunk/rosapps/demos/maze/Makefile --- trunk/rosapps/demos/maze/Makefile 2005-04-05 19:04:07 UTC (rev 14512) +++ trunk/rosapps/demos/maze/Makefile 2005-04-05 19:13:51 UTC (rev 14513) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 2003/08/15 17:06:49 gvg Exp $ +# $Id$ PATH_TO_TOP = ../../../reactos @@ -12,7 +12,7 @@ TARGET_OBJECTS = maze.o -TARGET_CFLAGS = -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror include $(PATH_TO_TOP)/rules.mak
19 years, 8 months
1
0
0
0
← Newer
1
...
33
34
35
36
37
38
39
...
48
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
Results per page:
10
25
50
100
200