Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[cfinck] 32397: Fix 64-bit build (again.. :-/)
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sun Feb 17 01:49:52 2008 New Revision: 32397 URL: http://svn.reactos.org/svn/reactos?rev=32397&view=rev Log: Fix 64-bit build (again.. :-/) Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun Feb 17 01:49:52 2008 @@ -1210,8 +1210,8 @@ BytesToRead = CFData.CompSize; - DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n", - (UINT)CurrentBuffer, (UINT)Buffer)); + DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", + (unsigned long)CurrentBuffer, (unsigned long)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead))

1 0

[cfinck] 32395: /Wp64 and __w64 are deprecated beginning with Visual C++ 2008. Remove the /Wp64 switch from the cabman project file (no idea why it was enabled anyway ; -) and the _W64 macros from the code.
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sun Feb 17 01:21:59 2008 New Revision: 32395 URL: http://svn.reactos.org/svn/reactos?rev=32395&view=rev Log: /Wp64 and __w64 are deprecated beginning with Visual C++ 2008. Remove the /Wp64 switch from the cabman project file (no idea why it was enabled anyway ;-) and the _W64 macros from the code. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.vcproj trunk/reactos/tools/cabman/mszip.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun Feb 17 01:21:59 2008 @@ -1210,8 +1210,8 @@ BytesToRead = CFData.CompSize; - DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", - (_W64 unsigned long)CurrentBuffer, (_W64 unsigned long)Buffer)); + DPRINT(MAX_TRACE, ("Read: (0x%X,0x%X).\n", + (UINT)CurrentBuffer, (UINT)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sun Feb 17 01:21:59 2008 @@ -19,10 +19,6 @@ #ifndef MAX_PATH #define MAX_PATH 260 #endif -#endif - -#ifndef _W64 -#define _W64 #endif #include <stdlib.h> Modified: trunk/reactos/tools/cabman/cabman.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.vcproj… ============================================================================== --- trunk/reactos/tools/cabman/cabman.vcproj (original) +++ trunk/reactos/tools/cabman/cabman.vcproj Sun Feb 17 01:21:59 2008 @@ -48,7 +48,7 @@ RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="4" /> <Tool Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… ============================================================================== --- trunk/reactos/tools/cabman/mszip.cxx (original) +++ trunk/reactos/tools/cabman/mszip.cxx Sun Feb 17 01:21:59 2008 @@ -74,7 +74,7 @@ ZStream.next_in = (unsigned char*)InputBuffer; ZStream.avail_in = InputLength; - ZStream.next_out = (unsigned char*)((_W64 unsigned long)OutputBuffer + 2); + ZStream.next_out = (unsigned char*)((unsigned long)OutputBuffer + 2); ZStream.avail_out = CAB_BLOCKSIZE + 12; /* WindowBits is passed < 0 to tell that there is no zlib header */ @@ -137,7 +137,7 @@ return CS_BADSTREAM; } - ZStream.next_in = (unsigned char*)((_W64 unsigned long)InputBuffer + 2); + ZStream.next_in = (unsigned char*)((unsigned long)InputBuffer + 2); ZStream.avail_in = InputLength - 2; ZStream.next_out = (unsigned char*)OutputBuffer; ZStream.avail_out = CAB_BLOCKSIZE + 12;

1 0

[cfinck] 32394: - Autogenerate the "architecture.h" header file, so we don't need to keep the same information up to date in two places. - Rename GetArchCdPath to GetArchCdRoot to be consistent with the name of the define in "architecture.h". - Add ARM to the rbuild architecture list (needed when the branch will be merged back to trunk).
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sun Feb 17 00:08:03 2008 New Revision: 32394 URL: http://svn.reactos.org/svn/reactos?rev=32394&view=rev Log: - Autogenerate the "architecture.h" header file, so we don't need to keep the same information up to date in two places. - Rename GetArchCdPath to GetArchCdRoot to be consistent with the name of the define in "architecture.h". - Add ARM to the rbuild architecture list (needed when the branch will be merged back to trunk). Added: branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp (with props) Removed: branches/rbuild/reactos/include/reactos/architecture.h Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h branches/rbuild/reactos/tools/rbuild/rbuild.mak branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Removed: branches/rbuild/reactos/include/reactos/architecture.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/include/reactos/… ============================================================================== --- branches/rbuild/reactos/include/reactos/architecture.h (original) +++ branches/rbuild/reactos/include/reactos/architecture.h (removed) @@ -1,14 +1,0 @@ -// Simple header for defining architecture-dependent settings - -#ifndef _REACTOS_ARCHITECTURE_H -#define _REACTOS_ARCHITECTURE_H - -#if defined(_M_IX86) -# define ARCH_CD_ROOT "I386" -#elif defined(_M_PPC) -# define ARCH_CD_ROOT "PPC" -#else -# error Unsupported architecture -#endif - -#endif Added: branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/arc… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp (added) +++ branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp Sun Feb 17 00:08:03 2008 @@ -1,0 +1,54 @@ +/* + * Copyright (C) 2008 Colin Finck + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include "rbuild.h" + +ArchitectureHeaderGenerator::ArchitectureHeaderGenerator ( const Project& project ) + : project ( project ) +{ +} + +ArchitectureHeaderGenerator::~ArchitectureHeaderGenerator () +{ +} + +void +ArchitectureHeaderGenerator::Generate () +{ + char* buf; + char* s; + + buf = (char*)malloc ( 32*1024 ); + if(!buf) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* Auto generated by rbuild */\n"); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#ifndef _REACTOS_ARCHITECTURE_H\n" ); + s = s + sprintf ( s, "#define _REACTOS_ARCHITECTURE_H\n" ); + s = s + sprintf ( s, "\n" ); + + s = s + sprintf ( s, "#define ARCH_CD_ROOT \"%s\"", Environment::GetArchCdRoot(project).c_str() ); + + s = s + sprintf ( s, "\n\n" ); + s = s + sprintf ( s, "#endif\n" ); + + FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "include" + sSep + "reactos" + sSep + "architecture.h" ) ); + + free ( s ); +} Propchange: branches/rbuild/reactos/tools/rbuild/architectureheadergenerator.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp Sun Feb 17 00:08:03 2008 @@ -349,6 +349,7 @@ GenerateModulesManifests(); GenerateProxyMakefiles (); GenerateCreditsFile(); + GenerateArchitectureHeader(); CheckAutomaticDependencies (); CloseMakefile (); } @@ -783,6 +784,15 @@ printf ( "done\n" ); } +void +MingwBackend::GenerateArchitectureHeader () +{ + printf ( "Generating architecture header file..." ); + ArchitectureHeaderGenerator archHeaderGenerator ( ProjectNode ); + archHeaderGenerator.Generate (); + printf ( "done\n" ); +} + string MingwBackend::GetProxyMakefileTree () const { Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h Sun Feb 17 00:08:03 2008 @@ -88,6 +88,7 @@ void GenerateModulesResources(); void GenerateModulesManifests(); void GenerateCreditsFile (); + void GenerateArchitectureHeader (); std::string GetProxyMakefileTree () const; void GenerateProxyMakefiles (); void CheckAutomaticDependencies (); Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Feb 17 00:08:03 2008 @@ -3698,7 +3698,7 @@ MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget () { string livecdRootDirectory = module.name; - string livecdArchDirectory = module.name + sSep + Environment::GetArchCdPath( module.project ); + string livecdArchDirectory = module.name + sSep + Environment::GetArchCdRoot( module.project ); FileLocation livecd ( OutputDirectory, livecdRootDirectory, "" ); string bootloader; Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Sun Feb 17 00:08:03 2008 @@ -78,10 +78,11 @@ } string -Environment::GetArchCdPath ( const Project& project ) +Environment::GetArchCdRoot ( const Project& project ) { switch( project.architectureType ) { + case ARM: return "ARM"; case I386: return "I386"; case PowerPC: return "PPC"; } @@ -149,7 +150,7 @@ Environment::GetBootstrapCdOutputPath ( const Project& project ) { return GetEnvironmentVariablePathOrDefault ( "ROS_CDBOOTSTRAPOUTPUT", - GetArchCdPath(project) ); + GetArchCdRoot(project) ); } /* static */ string Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sun Feb 17 00:08:03 2008 @@ -211,7 +211,7 @@ public: static std::string GetVariable ( const std::string& name ); static std::string GetArchName (); - static std::string GetArchCdPath ( const Project& project ); + static std::string GetArchCdRoot ( const Project& project ); static std::string GetIntermediatePath (); static std::string GetOutputPath (); static std::string GetCdOutputPath (); @@ -266,6 +266,7 @@ enum ArchitectureType { + ARM, I386, PowerPC }; @@ -1258,6 +1259,16 @@ private: }; +class ArchitectureHeaderGenerator +{ +public: + const Project& project; + ArchitectureHeaderGenerator ( const Project& project ); + ~ArchitectureHeaderGenerator (); + void Generate(); +private: +}; + extern void InitializeEnvironment (); Modified: branches/rbuild/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.mak (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.mak Sun Feb 17 00:08:03 2008 @@ -267,6 +267,7 @@ modulesmanifestgenerator.cpp \ modulesresourcegenerator.cpp \ creditsgenerator.cpp \ + architectureheadergenerator.cpp \ wineresource.cpp \ xmlnode.cpp \ ) @@ -463,6 +464,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_INT_)architectureheadergenerator.o: $(RBUILD_BASE_)architectureheadergenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_INT_)modulesmanifestgenerator.o: $(RBUILD_BASE_)modulesmanifestgenerator.cpp $(RBUILD_HEADERS) | $(RBUILD_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ Modified: branches/rbuild/reactos/tools/rbuild/rbuild.vcproj URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.vcproj (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.vcproj Sun Feb 17 00:08:03 2008 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8.00" + Version="8,00" Name="rbuild" ProjectGUID="{D9305AFB-499E-49F1-A865-99DD7E19E762}" RootNamespace="rbuild" @@ -512,6 +512,10 @@ Name="rbuild_sources" > <File + RelativePath=".\architectureheadergenerator.cpp" + > + </File> + <File RelativePath="automaticdependency.cpp" > <FileConfiguration

1 0

[cfinck] 32393: Fix a CSS typo
by cfinck＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: cfinck Date: Sat Feb 16 22:09:10 2008 New Revision: 32393 URL: http://svn.reactos.org/svn/reactos?rev=32393&view=rev Log: Fix a CSS typo Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/p… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/paste.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/paste.php Sat Feb 16 22:09:10 2008 @@ -343,7 +343,7 @@ <td bgcolor="#E2E2E2"><input type="text" size="50" maxlength="50" name="desc" id="desc"/></td> </tr> <tr> - <td valign="top" bgcolor="#EEEEEE" style="paddiong-left: 0px; padding-right: 5px;">Convert tabs:</td> + <td valign="top" bgcolor="#EEEEEE" style="padding-left: 0px; padding-right: 5px;">Convert tabs:</td> <td bgcolor="#EEEEEE"> <select name="cvt_tabs" id="cvt_tabs"> <option value="0" selected="selected">No</option> @@ -358,7 +358,7 @@ </td> </tr> <tr> - <td valign="top" bgcolor="#E2E2E2" style="paddiong-left: 0px; padding-right: 5px;">Expire after: </td> + <td valign="top" bgcolor="#E2E2E2" style="padding-left: 0px; padding-right: 5px;">Expire after: </td> <td bgcolor="#E2E2E2"> <input name="optday" type="radio" value="1" checked="checked" /> 7 days

1 0

[dreimer] 32392: Once more... make it possible to translate usetup COMPLETELY. (I hope this time I am right....)
by dreimer＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dreimer Date: Sat Feb 16 21:58:05 2008 New Revision: 32392 URL: http://svn.reactos.org/svn/reactos?rev=32392&view=rev Log: Once more... make it possible to translate usetup COMPLETELY. (I hope this time I am right....) Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Sat Feb 16 21:58:05 2008 @@ -1628,7 +1628,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 10, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", + MUIGetString(STRING_HDDINFO1), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1640,7 +1640,7 @@ else { CONSOLE_PrintTextXY(6, 10, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", + MUIGetString(STRING_HDDINFO2), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1798,7 +1798,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(6, 10, - " %c%c Type %lu %I64u %s", + MUIGetString(STRING_HDDINFO3), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1836,7 +1836,7 @@ if (DiskEntry->DriverName.Length > 0) { CONSOLE_PrintTextXY(6, 12, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ.", + MUIGetString(STRING_HDDINFO4), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1848,7 +1848,7 @@ else { CONSOLE_PrintTextXY(6, 12, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu).", + MUIGetString(STRING_HDDINFO5), DiskSize, Unit, DiskEntry->DiskNumber, @@ -1965,7 +1965,7 @@ if (PartEntry->AutoCreate == TRUE) { - CONSOLE_SetTextXY(6, 8, "Setup created a new partition on"); + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION)); #if 0 CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of", @@ -1975,7 +1975,7 @@ PartType); #endif - CONSOLE_PrintTextXY(8, 10, "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ).", + CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDDINFO6), DiskEntry->DiskNumber, DiskSize, DiskUnit, @@ -2001,7 +2001,7 @@ if (PartType == NULL) { CONSOLE_PrintTextXY(8, 10, - "%c%c Type %lu %I64u %s", + MUIGetString(STRING_HDDINFO7), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -2019,7 +2019,7 @@ PartUnit); } - CONSOLE_PrintTextXY(6, 12, "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ).", + CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDDINFO8), DiskEntry->DiskNumber, DiskSize, DiskUnit, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Sat Feb 16 21:58:05 2008 @@ -1646,6 +1646,32 @@ " Formatiere Partition als %S Dateisystem "}, {STRING_KEEPFORMAT, " Dateisystem beibehalten (Keine Vernderungen) "}, + {STRING_HDDINFO1, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Typ %lu %I64u %s"}, + {STRING_HDDINFO4, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ."}, + {STRING_HDDINFO5, + "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Typ %lu %I64u %s"}, + {STRING_HDDINFO8, + "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Typ %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %S"}, + {STRING_HDDINFO11, + "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup erstellte eine neue Partition auf"}, + {STRING_UNPSPACE, + " Unpartitionierter Speicher %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Sat Feb 16 21:58:05 2008 @@ -1640,6 +1640,32 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Sat Feb 16 21:58:05 2008 @@ -1568,8 +1568,3 @@ }; #endif - - - - - Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sat Feb 16 21:58:05 2008 @@ -1652,6 +1652,32 @@ " Format partition as %S file system "}, {STRING_KEEPFORMAT, " Keep current file system (no changes) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Sat Feb 16 21:58:05 2008 @@ -1574,9 +1574,3 @@ }; #endif - - - - - - Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Sat Feb 16 21:58:05 2008 @@ -1648,6 +1648,32 @@ " Sformatuj partycj© z systemem plik¢w %S "}, {STRING_KEEPFORMAT, " Zachowaj obecny system plik¢w (bez zmian) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Sat Feb 16 21:58:05 2008 @@ -1640,6 +1640,32 @@ " ®à¬ â¨à®¢ ¨¥ à §¤¥« ¢ ä ©«®¢®© á¨áâ¥¬¥ %S "}, {STRING_KEEPFORMAT, " áâ ¢¨âì áãé¥áâ¢ãîéãî ä ©«®¢ãî á¨áâ¥¬ã (¡¥§ ¨§¬¥¥¨©) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Sat Feb 16 21:58:05 2008 @@ -1645,6 +1645,32 @@ " Naform tova oblas ako systm s£borov %S "}, {STRING_KEEPFORMAT, " Ponecha s£asnì systm s£borov (bez zmeny) "}, + {STRING_HDDINFO1, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO2, + "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO3, + " %c%c Type %lu %I64u %s"}, + {STRING_HDDINFO4, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + {STRING_HDDINFO5, + "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + {STRING_HDDINFO6, + "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO7, + "%c%c Type %lu %I64u %s"}, + {STRING_HDDINFO8, + "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + {STRING_HDDINFO9, + "%c%c Type %-3u %6lu %s"}, + {STRING_HDDINFO10, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + {STRING_HDDINFO11, + "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + {STRING_NEWPARTITION, + "Setup created a new partition on"}, + {STRING_UNPSPACE, + " Unpartitioned space %6lu %s"}, {0, 0} }; Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Sat Feb 16 21:58:05 2008 @@ -104,5 +104,17 @@ #define STRING_FORMATDISK1 33 #define STRING_FORMATDISK2 34 #define STRING_KEEPFORMAT 35 - +#define STRING_HDDINFO1 36 +#define STRING_HDDINFO2 37 +#define STRING_HDDINFO3 38 +#define STRING_HDDINFO4 39 +#define STRING_HDDINFO5 40 +#define STRING_HDDINFO6 41 +#define STRING_HDDINFO7 42 +#define STRING_HDDINFO8 43 +#define STRING_HDDINFO9 44 +#define STRING_HDDINFO10 45 +#define STRING_HDDINFO11 46 +#define STRING_NEWPARTITION 47 +#define STRING_UNPSPACE 48 #endif Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sat Feb 16 21:58:05 2008 @@ -1136,7 +1136,7 @@ } sprintf (LineBuffer, - " Unpartitioned space %6lu %s", + MUIGetString(STRING_UNPSPACE), PartSize.u.LowPart, Unit); } @@ -1194,7 +1194,7 @@ if (PartType == NULL) { sprintf (LineBuffer, - "%c%c Type %-3u %6lu %s", + MUIGetString(STRING_HDDINFO9), (PartEntry->DriveLetter == 0) ? '-' : PartEntry->DriveLetter, (PartEntry->DriveLetter == 0) ? '-' : ':', PartEntry->PartInfo[0].PartitionType, @@ -1288,7 +1288,7 @@ if (DiskEntry->DriverName.Length > 0) { sprintf (LineBuffer, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S", + MUIGetString(STRING_HDDINFO10), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber, @@ -1300,7 +1300,7 @@ else { sprintf (LineBuffer, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)", + MUIGetString(STRING_HDDINFO11), DiskSize.u.LowPart, Unit, DiskEntry->DiskNumber,

1 0

[jimtabor] 32391: - Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Removed NtGdiStretchDIBits and NtGdiAddFontResource. Replaced with correct API.
by jimtabor＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: jimtabor Date: Sat Feb 16 21:14:36 2008 New Revision: 32391 URL: http://svn.reactos.org/svn/reactos?rev=32391&view=rev Log: - Patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): Removed NtGdiStretchDIBits and NtGdiAddFontResource. Replaced with correct API. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/misc/stubsw.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Feb 16 21:14:36 2008 @@ -42,8 +42,8 @@ { /* FIXME share memory */ - return NtGdiStretchDIBits(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, - nSrcWidth, nSrcHeight, lpBits, lpBitsInfo, iUsage, dwRop); + return NtGdiStretchDIBitsInternal(hdc, XDest, YDest, nDestWidth, nDestHeight, XSrc, YSrc, + nSrcWidth, nSrcHeight, (LPBYTE)lpBits, (LPBITMAPINFO)lpBitsInfo, (DWORD)iUsage, dwRop, 0, 0, NULL); } /* Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Sat Feb 16 21:14:36 2008 @@ -215,18 +215,13 @@ */ int STDCALL -GdiAddFontResourceW(LPCWSTR lpszFilename,FLONG fl,DESIGNVECTOR *pdv) -{ - UNICODE_STRING Filename; - //UNIMPLEMENTED; - //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - //return 0; - - /* FIXME handle fl parameter */ - RtlInitUnicodeString(&Filename, lpszFilename); - return NtGdiAddFontResource ( &Filename, fl ); -} - +GdiAddFontResourceW( + LPCWSTR lpszFilename, + FLONG fl, + DESIGNVECTOR *pdv) +{ + return NtGdiAddFontResourceW((PWSTR)lpszFilename, 0, 0, fl, 0, pdv); +} /* * @implemented Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Feb 16 21:14:36 2008 @@ -58,14 +58,6 @@ PFONTFAMILYINFO Info, DWORD Size ); - - -/* Use NtGdiAddFontResourceW */ -int -STDCALL -NtGdiAddFontResource(PUNICODE_STRING Filename, - DWORD fl); - /* Use NtGdiCreateDIBitmapInternal */ HBITMAP @@ -170,25 +162,6 @@ LPPOINT Point ); -/* Use NtGdiStretchDIBitsInternal. */ -INT -STDCALL -NtGdiStretchDIBits ( - HDC hDC, - INT XDest, - INT YDest, - INT DestWidth, - INT DestHeight, - INT XSrc, - INT YSrc, - INT SrcWidth, - INT SrcHeight, - CONST VOID * Bits, - CONST BITMAPINFO * BitsInfo, - UINT Usage, - DWORD ROP - ); - #endif /* WIN32K_NTGDI_BAD_INCLUDED */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sat Feb 16 21:14:36 2008 @@ -722,19 +722,25 @@ return Result; } -INT STDCALL NtGdiStretchDIBits(HDC hDC, - INT XDest, - INT YDest, - INT DestWidth, - INT DestHeight, - INT XSrc, - INT YSrc, - INT SrcWidth, - INT SrcHeight, - CONST VOID *Bits, - CONST BITMAPINFO *BitsInfo, - UINT Usage, - DWORD ROP) +INT +APIENTRY +NtGdiStretchDIBitsInternal( + HDC hDC, + INT XDest, + INT YDest, + INT DestWidth, + INT DestHeight, + INT XSrc, + INT YSrc, + INT SrcWidth, + INT SrcHeight, + LPBYTE Bits, + LPBITMAPINFO BitsInfo, + DWORD Usage, + DWORD ROP, + UINT cjMaxInfo, + UINT cjMaxBits, + HANDLE hcmXform) { HBITMAP hBitmap, hOldBitmap; HDC hdcMem; @@ -771,7 +777,7 @@ } NtGdiSetDIBits(hdcMem, hBitmap, 0, BitsInfo->bmiHeader.biHeight, Bits, - BitsInfo, Usage); + BitsInfo, (UINT)Usage); /* Origin for DIBitmap may be bottom left (positive biHeight) or top left (negative biHeight) */ Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sat Feb 16 21:14:36 2008 @@ -436,22 +436,23 @@ return FT_RENDER_MODE_NORMAL; } -int -STDCALL -NtGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl) +INT +APIENTRY +NtGdiAddFontResourceW( + IN WCHAR *pwszFiles, + IN ULONG cwc, + IN ULONG cFiles, + IN FLONG fl, + IN DWORD dwPidTid, + IN OPTIONAL DESIGNVECTOR *pdv) { UNICODE_STRING SafeFileName; PWSTR src; NTSTATUS Status; int Ret; - /* Copy the UNICODE_STRING structure */ - Status = MmCopyFromCaller(&SafeFileName, Filename, sizeof(UNICODE_STRING)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } + /* FIXME - Protect with SEH? */ + RtlInitUnicodeString(&SafeFileName, pwszFiles); /* Reserve for prepending '\??\' */ SafeFileName.Length += 4 * sizeof(WCHAR); @@ -476,7 +477,7 @@ return 0; } - Ret = IntGdiAddFontResource(&SafeFileName, fl); + Ret = IntGdiAddFontResource(&SafeFileName, (DWORD)fl); ExFreePool(SafeFileName.Buffer); return Ret; Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Feb 16 21:14:36 2008 @@ -1558,26 +1558,6 @@ return 0; } - - -/* - * @unimplemented - */ -INT -APIENTRY -NtGdiAddFontResourceW( - IN WCHAR *pwszFiles, - IN ULONG cwc, - IN ULONG cFiles, - IN FLONG f, - IN DWORD dwPidTid, - IN OPTIONAL DESIGNVECTOR *pdv) -{ - UNIMPLEMENTED; - return 0; -} - - /* * @unimplemented */ @@ -2984,33 +2964,6 @@ /* * @unimplemented */ -INT -APIENTRY -NtGdiStretchDIBitsInternal( - IN HDC hdc, - IN INT xDst, - IN INT yDst, - IN INT cxDst, - IN INT cyDst, - IN INT xSrc, - IN INT ySrc, - IN INT cxSrc, - IN INT cySrc, - IN OPTIONAL LPBYTE pjInit, - IN LPBITMAPINFO pbmi, - IN DWORD dwUsage, - IN DWORD dwRop4, - IN UINT cjMaxInfo, - IN UINT cjMaxBits, - IN HANDLE hcmXform) -{ - UNIMPLEMENTED; - return 0; -} - - /* - * @unimplemented - */ BOOL APIENTRY NtGdiUnloadPrinterDriver( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Feb 16 21:14:36 2008 @@ -679,7 +679,6 @@ NtGdiSetViewportOrgEx 4 NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 -NtGdiStretchDIBits 13 NtUserAcquireOrReleaseInputOwnership 1 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 @@ -719,7 +718,6 @@ NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 -NtGdiAddFontResource 2 NtGdiCreateDIBitmap 6 NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4

1 0

[dchapyshev] 32390: - Add Arabic and Czech languages to list
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 20:36:34 2008 New Revision: 32390 URL: http://svn.reactos.org/svn/reactos?rev=32390&view=rev Log: - Add Arabic and Czech languages to list Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Sat Feb 16 20:36:34 2008 @@ -47,11 +47,13 @@ static const MUI_LANGUAGE LanguageList[] = { - /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings */ + /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000401", L"00000401", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, enUSStrings }, {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000405", L"00000405", L"1250", L"852", L"10029", L"Czech", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, @@ -65,7 +67,7 @@ {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, enUSStrings }, {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, enUSStrings }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries, ruRUStrings }, {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, enUSStrings }, {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Sat Feb 16 20:36:34 2008 @@ -100,9 +100,11 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" [Language] +00000401 = "Arabic" 00000402 = "Bulgarian" 00000403 = "Catalan" 00000804 = "Chinese (PRC)" +00000405 = "Czech" 00000406 = "Danish" 00000413 = "Dutch" 00000409 = "English"

1 0

[dchapyshev] 32389: - Add small checking - Fix formating
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 20:28:58 2008 New Revision: 32389 URL: http://svn.reactos.org/svn/reactos?rev=32389&view=rev Log: - Add small checking - Fix formating Modified: trunk/reactos/base/system/rundll32/lang/bg-BG.rc trunk/reactos/base/system/rundll32/lang/de-DE.rc trunk/reactos/base/system/rundll32/lang/el-GR.rc trunk/reactos/base/system/rundll32/lang/en-US.rc trunk/reactos/base/system/rundll32/lang/es-ES.rc trunk/reactos/base/system/rundll32/lang/fr-FR.rc trunk/reactos/base/system/rundll32/lang/hu-HU.rc trunk/reactos/base/system/rundll32/lang/id-ID.rc trunk/reactos/base/system/rundll32/lang/it-IT.rc trunk/reactos/base/system/rundll32/lang/ja-JP.rc trunk/reactos/base/system/rundll32/lang/lt-LT.rc trunk/reactos/base/system/rundll32/lang/nb-NO.rc trunk/reactos/base/system/rundll32/lang/nl-NL.rc trunk/reactos/base/system/rundll32/lang/pl-PL.rc trunk/reactos/base/system/rundll32/lang/pt-BR.rc trunk/reactos/base/system/rundll32/lang/ru-RU.rc trunk/reactos/base/system/rundll32/lang/sk-SK.rc trunk/reactos/base/system/rundll32/lang/th-TH.rc trunk/reactos/base/system/rundll32/lang/uk-UA.rc trunk/reactos/base/system/rundll32/rundll32.c Modified: trunk/reactos/base/system/rundll32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/bg-BG.rc (original) +++ trunk/reactos/base/system/rundll32/lang/bg-BG.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Íåóñïåøíî çàðåæäàíå íà áèáëèîòåêà '%s'" -IDS_MissingEntry, "Ëèïñâàùà âõîäíà òî÷êà:%s\nâ %s" + IDS_DllNotLoaded, "Íåóñïåøíî çàðåæäàíå íà áèáëèîòåêà '%s'" + IDS_MissingEntry, "Ëèïñâàùà âõîäíà òî÷êà:%s\nâ %s" END Modified: trunk/reactos/base/system/rundll32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/de-DE.rc (original) +++ trunk/reactos/base/system/rundll32/lang/de-DE.rc Sat Feb 16 20:28:58 2008 @@ -7,6 +7,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary laden von '%s' fehlgeschlagen" -IDS_MissingEntry, "Fehlender Eintrag:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary laden von '%s' fehlgeschlagen" + IDS_MissingEntry, "Fehlender Eintrag:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/el-GR.rc (original) +++ trunk/reactos/base/system/rundll32/lang/el-GR.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Gr.rc by Dj Apal® */ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary äåí êáôÜöåñå íá öïñôþóåé '%s'" -IDS_MissingEntry, "Ëåßðåé ôï óçìåßï åêêßíçóçò:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary äåí êáôÜöåñå íá öïñôþóåé '%s'" + IDS_MissingEntry, "Ëåßðåé ôï óçìåßï åêêßíçóçò:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/en-US.rc (original) +++ trunk/reactos/base/system/rundll32/lang/en-US.rc Sat Feb 16 20:28:58 2008 @@ -7,6 +7,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary failed to load '%s'" -IDS_MissingEntry, "Missing entry point:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary failed to load '%s'" + IDS_MissingEntry, "Missing entry point:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/es-ES.rc (original) +++ trunk/reactos/base/system/rundll32/lang/es-ES.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "El cargador de Librerias falló al cargar '%s'" -IDS_MissingEntry, "Punto de entrada perdido:%s\nIn %s" + IDS_DllNotLoaded, "El cargador de Librerias falló al cargar '%s'" + IDS_MissingEntry, "Punto de entrada perdido:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/fr-FR.rc (original) +++ trunk/reactos/base/system/rundll32/lang/fr-FR.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary a échoué lors du chargement de '%s'" -IDS_MissingEntry, "Point d'entrée manquant:%s\ndans %s" + IDS_DllNotLoaded, "LoadLibrary a échoué lors du chargement de '%s'" + IDS_MissingEntry, "Point d'entrée manquant:%s\ndans %s" END Modified: trunk/reactos/base/system/rundll32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/hu-HU.rc (original) +++ trunk/reactos/base/system/rundll32/lang/hu-HU.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Hungarian version is Copyright 2005 - Peter Nagy <nagylakas(a)gmail.com> */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "A(z) '%s' állományt, vagy valamelyik összetevõjét nem sikerült megnyitni" -IDS_MissingEntry, "Hiányzó bejegyzés: %s\nIn A Következõ állomány nem tölthetõ be: %s" + IDS_DllNotLoaded, "A(z) '%s' állományt, vagy valamelyik összetevõjét nem sikerült megnyitni" + IDS_MissingEntry, "Hiányzó bejegyzés: %s\nIn A Következõ állomány nem tölthetõ be: %s" END Modified: trunk/reactos/base/system/rundll32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/id-ID.rc (original) +++ trunk/reactos/base/system/rundll32/lang/id-ID.rc Sat Feb 16 20:28:58 2008 @@ -4,6 +4,6 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary gagal untuk mengambil '%s'" -IDS_MissingEntry, "entry point hilang:%s\nDalam %s" + IDS_DllNotLoaded, "LoadLibrary gagal untuk mengambil '%s'" + IDS_MissingEntry, "entry point hilang:%s\nDalam %s" END Modified: trunk/reactos/base/system/rundll32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/it-IT.rc (original) +++ trunk/reactos/base/system/rundll32/lang/it-IT.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary fallita '%s'" -IDS_MissingEntry, "Manca:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary fallita '%s'" + IDS_MissingEntry, "Manca:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/ja-JP.rc (original) +++ trunk/reactos/base/system/rundll32/lang/ja-JP.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary Í '%s' ÌÇÝÝÉ¸sµÜµ½B" -IDS_MissingEntry, "Gg |Cgª èÜ¹ñ:%s\n( %s )" + IDS_DllNotLoaded, "LoadLibrary Í '%s' ÌÇÝÝÉ¸sµÜµ½B" + IDS_MissingEntry, "Gg |Cgª èÜ¹ñ:%s\n( %s )" END Modified: trunk/reactos/base/system/rundll32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/lt-LT.rc (original) +++ trunk/reactos/base/system/rundll32/lang/lt-LT.rc Sat Feb 16 20:28:58 2008 @@ -5,6 +5,6 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary nepavyko paleisti '%s'" -IDS_MissingEntry, "Trûksta áëjimo taðko:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary nepavyko paleisti '%s'" + IDS_MissingEntry, "Trûksta áëjimo taðko:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/nb-NO.rc (original) +++ trunk/reactos/base/system/rundll32/lang/nb-NO.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary mislykket å laste '%s'" -IDS_MissingEntry, "Mistet oppføring moment:%s\nIn %s" + IDS_DllNotLoaded, "LoadLibrary mislykket å laste '%s'" + IDS_MissingEntry, "Mistet oppføring moment:%s\nIn %s" END Modified: trunk/reactos/base/system/rundll32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/nl-NL.rc (original) +++ trunk/reactos/base/system/rundll32/lang/nl-NL.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Translation done by Vertaald door Eric Janssen */ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary kon '%s' niet laden" -IDS_MissingEntry, "Entry point:%s\n niet gevonden In %s" + IDS_DllNotLoaded, "LoadLibrary kon '%s' niet laden" + IDS_MissingEntry, "Entry point:%s\n niet gevonden In %s" END Modified: trunk/reactos/base/system/rundll32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/pl-PL.rc (original) +++ trunk/reactos/base/system/rundll32/lang/pl-PL.rc Sat Feb 16 20:28:58 2008 @@ -8,6 +8,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary nie móg³ za³adowaæ '%s'" -IDS_MissingEntry, "Brakuj¹cy punkt wejcia:%s\nW %s" + IDS_DllNotLoaded, "LoadLibrary nie móg³ za³adowaæ '%s'" + IDS_MissingEntry, "Brakuj¹cy punkt wejcia:%s\nW %s" END Modified: trunk/reactos/base/system/rundll32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/pt-BR.rc (original) +++ trunk/reactos/base/system/rundll32/lang/pt-BR.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Erro ao carregar '%s'" -IDS_MissingEntry, "Está faltando a entrada:%s\nem %s" + IDS_DllNotLoaded, "Erro ao carregar '%s'" + IDS_MissingEntry, "Está faltando a entrada:%s\nem %s" END Modified: trunk/reactos/base/system/rundll32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/ru-RU.rc (original) +++ trunk/reactos/base/system/rundll32/lang/ru-RU.rc Sat Feb 16 20:28:58 2008 @@ -1,12 +1,8 @@ #include "resource.h" -/* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com - */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó '%s'" -IDS_MissingEntry, "Íåâîçìîæíî íàéòè òî÷êó âõîäà: %s\nâ áèáëèîòåêå %s" + IDS_DllNotLoaded, "Íåâîçìîæíî çàãðóçèòü áèáëèîòåêó '%s'" + IDS_MissingEntry, "Íåâîçìîæíî íàéòè òî÷êó âõîäà: %s\nâ áèáëèîòåêå %s" END Modified: trunk/reactos/base/system/rundll32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/sk-SK.rc (original) +++ trunk/reactos/base/system/rundll32/lang/sk-SK.rc Sat Feb 16 20:28:58 2008 @@ -1,13 +1,11 @@ #include "resource.h" /* - * Moved all hardcoded strings to En.rc. - * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com * Slovak translation by Kario 2007 <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "Naèítanie kninice zlyhalo pri pokus naèíta '%s'" -IDS_MissingEntry, "Chybný vstupný bod:%s\nv %s" + IDS_DllNotLoaded, "Naèítanie kninice zlyhalo pri pokus naèíta '%s'" + IDS_MissingEntry, "Chybný vstupný bod:%s\nv %s" END Modified: trunk/reactos/base/system/rundll32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/th-TH.rc (original) +++ trunk/reactos/base/system/rundll32/lang/th-TH.rc Sat Feb 16 20:28:58 2008 @@ -9,6 +9,6 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "¡ÒÃºÃÃ¨Ø¤èÒÃÐººà¡Ô´¼Ô´¾ÅÒ´ '%s'" -IDS_MissingEntry, "¡ÒÃà¢éÒËÒµÓáË¹è§¼Ô´¾ÅÒ´: %s\n%s" + IDS_DllNotLoaded, "¡ÒÃºÃÃ¨Ø¤èÒÃÐººà¡Ô´¼Ô´¾ÅÒ´ '%s'" + IDS_MissingEntry, "¡ÒÃà¢éÒËÒµÓáË¹è§¼Ô´¾ÅÒ´: %s\n%s" END Modified: trunk/reactos/base/system/rundll32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/uk-UA.rc (original) +++ trunk/reactos/base/system/rundll32/lang/uk-UA.rc Sat Feb 16 20:28:58 2008 @@ -12,6 +12,6 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_DllNotLoaded, "LoadLibrary íå âäàëîñÿ çàâàíòàæèòè '%s'" -IDS_MissingEntry, "Íåìîæëèâî çíàéòè òî÷êó âõîäó:%s\nÂ á³áë³îòåö³ %s" + IDS_DllNotLoaded, "LoadLibrary íå âäàëîñÿ çàâàíòàæèòè '%s'" + IDS_MissingEntry, "Íåìîæëèâî çíàéòè òî÷êó âõîäó:%s\nÂ á³áë³îòåö³ %s" END Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.c (original) +++ trunk/reactos/base/system/rundll32/rundll32.c Sat Feb 16 20:28:58 2008 @@ -60,176 +60,176 @@ // and is not intended to be used in any other program. LPTSTR *WINAPI CommandLineToArgv(LPCTSTR lpCmdLine, int *lpArgc) { - LPTSTR *argv, lpSrc, lpDest, lpArg; - int argc, nBSlash, nNames; - BOOL bInQuotes, bFirstChar; - - // If null was passed in for lpCmdLine, there are no arguments - if (!lpCmdLine) { - if (lpArgc) - *lpArgc = 0; - return 0; - } - - lpSrc = (LPTSTR)lpCmdLine; - // Skip spaces at beginning - while (*lpSrc == _T(' ') || *lpSrc == _T('\t')) - lpSrc++; - - // If command-line starts with null, there are no arguments - if (*lpSrc == 0) { - if (lpArgc) - *lpArgc = 0; - return 0; - } - - lpArg = lpSrc; - argc = 0; - nBSlash = 0; - bInQuotes = FALSE; - bFirstChar = TRUE; - nNames = 0; - - // Count the number of arguments - while (nNames < 4) { - if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { - // Whitespace not enclosed in quotes signals the start of another argument - argc++; - - // Skip whitespace between arguments - while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) - lpSrc++; - if (*lpSrc == 0) - break; - if (nNames >= 3) { - // Increment the count for the last argument - argc++; - break; - } - nBSlash = 0; - bFirstChar = TRUE; - continue; - } - else if (*lpSrc == _T('\\')) { - // Count consecutive backslashes - nBSlash++; - bFirstChar = FALSE; - } - else if (*lpSrc == _T('\"') && !(nBSlash & 1)) { - // Open or close quotes - bInQuotes = !bInQuotes; - nBSlash = 0; - } - else { - // Some other character - nBSlash = 0; - if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) - nNames++; - bFirstChar = FALSE; - } - lpSrc++; - } - - // Allocate space for the pointers in argv and the strings in one block - argv = (LPTSTR *)malloc(argc * sizeof(LPTSTR) + (_tcslen(lpArg) + 1) * sizeof(TCHAR)); - - if (!argv) { - // Memory allocation failed - if (lpArgc) - *lpArgc = 0; - return 0; - } - - lpSrc = lpArg; - lpDest = lpArg = (LPTSTR)(argv + argc); - argc = 0; - nBSlash = 0; - bInQuotes = FALSE; - bFirstChar = TRUE; - nNames = 0; - - // Fill the argument array - while (nNames < 4) { - if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { - // Whitespace not enclosed in quotes signals the start of another argument - // Null-terminate argument - *lpDest++ = 0; - argv[argc++] = lpArg; - - // Skip whitespace between arguments - while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) - lpSrc++; - if (*lpSrc == 0) - break; - lpArg = lpDest; - if (nNames >= 3) { - // Copy the rest of the command-line to the last argument - argv[argc++] = lpArg; - _tcscpy(lpArg,lpSrc); - break; - } - nBSlash = 0; - bFirstChar = TRUE; - continue; - } - else if (*lpSrc == _T('\\')) { - *lpDest++ = _T('\\'); - lpSrc++; - - // Count consecutive backslashes - nBSlash++; - bFirstChar = FALSE; - } - else if (*lpSrc == _T('\"')) { - if (!(nBSlash & 1)) { - // If an even number of backslashes are before the quotes, - // the quotes don't go in the output - lpDest -= nBSlash / 2; - bInQuotes = !bInQuotes; - } - else { - // If an odd number of backslashes are before the quotes, - // output a quote - lpDest -= (nBSlash + 1) / 2; - *lpDest++ = _T('\"'); - bFirstChar = FALSE; - } - lpSrc++; - nBSlash = 0; - } - else { - // Copy other characters - if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) - nNames++; - *lpDest++ = *lpSrc++; - nBSlash = 0; - bFirstChar = FALSE; - } - } - - if (lpArgc) - *lpArgc = argc; - return argv; + LPTSTR *argv, lpSrc, lpDest, lpArg; + int argc, nBSlash, nNames; + BOOL bInQuotes, bFirstChar; + + // If null was passed in for lpCmdLine, there are no arguments + if (!lpCmdLine) { + if (lpArgc) + *lpArgc = 0; + return 0; + } + + lpSrc = (LPTSTR)lpCmdLine; + // Skip spaces at beginning + while (*lpSrc == _T(' ') || *lpSrc == _T('\t')) + lpSrc++; + + // If command-line starts with null, there are no arguments + if (*lpSrc == 0) { + if (lpArgc) + *lpArgc = 0; + return 0; + } + + lpArg = lpSrc; + argc = 0; + nBSlash = 0; + bInQuotes = FALSE; + bFirstChar = TRUE; + nNames = 0; + + // Count the number of arguments + while (nNames < 4) { + if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { + // Whitespace not enclosed in quotes signals the start of another argument + argc++; + + // Skip whitespace between arguments + while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) + lpSrc++; + if (*lpSrc == 0) + break; + if (nNames >= 3) { + // Increment the count for the last argument + argc++; + break; + } + nBSlash = 0; + bFirstChar = TRUE; + continue; + } + else if (*lpSrc == _T('\\')) { + // Count consecutive backslashes + nBSlash++; + bFirstChar = FALSE; + } + else if (*lpSrc == _T('\"') && !(nBSlash & 1)) { + // Open or close quotes + bInQuotes = !bInQuotes; + nBSlash = 0; + } + else { + // Some other character + nBSlash = 0; + if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) + nNames++; + bFirstChar = FALSE; + } + lpSrc++; + } + + // Allocate space for the pointers in argv and the strings in one block + argv = (LPTSTR *)malloc(argc * sizeof(LPTSTR) + (_tcslen(lpArg) + 1) * sizeof(TCHAR)); + + if (!argv) { + // Memory allocation failed + if (lpArgc) + *lpArgc = 0; + return 0; + } + + lpSrc = lpArg; + lpDest = lpArg = (LPTSTR)(argv + argc); + argc = 0; + nBSlash = 0; + bInQuotes = FALSE; + bFirstChar = TRUE; + nNames = 0; + + // Fill the argument array + while (nNames < 4) { + if (*lpSrc == 0 || (*lpSrc == _T(',') && nNames == 2) || ((*lpSrc == _T(' ') || *lpSrc == _T('\t')) && !bInQuotes)) { + // Whitespace not enclosed in quotes signals the start of another argument + // Null-terminate argument + *lpDest++ = 0; + argv[argc++] = lpArg; + + // Skip whitespace between arguments + while (*lpSrc == _T(' ') || *lpSrc == _T('\t') || (*lpSrc == _T(',') && nNames == 2)) + lpSrc++; + if (*lpSrc == 0) + break; + lpArg = lpDest; + if (nNames >= 3) { + // Copy the rest of the command-line to the last argument + argv[argc++] = lpArg; + _tcscpy(lpArg,lpSrc); + break; + } + nBSlash = 0; + bFirstChar = TRUE; + continue; + } + else if (*lpSrc == _T('\\')) { + *lpDest++ = _T('\\'); + lpSrc++; + + // Count consecutive backslashes + nBSlash++; + bFirstChar = FALSE; + } + else if (*lpSrc == _T('\"')) { + if (!(nBSlash & 1)) { + // If an even number of backslashes are before the quotes, + // the quotes don't go in the output + lpDest -= nBSlash / 2; + bInQuotes = !bInQuotes; + } + else { + // If an odd number of backslashes are before the quotes, + // output a quote + lpDest -= (nBSlash + 1) / 2; + *lpDest++ = _T('\"'); + bFirstChar = FALSE; + } + lpSrc++; + nBSlash = 0; + } + else { + // Copy other characters + if (bFirstChar && ((*lpSrc != _T('/') && nNames <= 1) || nNames > 1)) + nNames++; + *lpDest++ = *lpSrc++; + nBSlash = 0; + bFirstChar = FALSE; + } + } + + if (lpArgc) + *lpArgc = argc; + return argv; } void GetModuleTitle(void) { - LPTSTR lpStr; - - GetModuleFileName(0,ModuleFileName,MAX_PATH); - ModuleTitle = ModuleFileName; - - for (lpStr = ModuleFileName;*lpStr;lpStr++) { - if (*lpStr == _T('\\')) - ModuleTitle = lpStr+1; - } - - for (lpStr = ModuleTitle;*lpStr;lpStr++) { - if (_tcsicmp(lpStr,_T(".exe"))==0) - break; - } - - *lpStr = 0; + LPTSTR lpStr; + + GetModuleFileName(0,ModuleFileName,MAX_PATH); + ModuleTitle = ModuleFileName; + + for (lpStr = ModuleFileName;*lpStr;lpStr++) { + if (*lpStr == _T('\\')) + ModuleTitle = lpStr+1; + } + + for (lpStr = ModuleTitle;*lpStr;lpStr++) { + if (_tcsicmp(lpStr,_T(".exe"))==0) + break; + } + + *lpStr = 0; } // The macro ConvertToWideChar takes a tstring parameter and returns @@ -245,15 +245,15 @@ LPWSTR ConvertToWideChar(LPCSTR lpString) { - LPWSTR lpwString; - size_t nStrLen; - - nStrLen = strlen(lpString) + 1; - - lpwString = (LPWSTR)malloc(nStrLen * sizeof(WCHAR)); - MultiByteToWideChar(0,0,lpString,nStrLen,lpwString,nStrLen); - - return lpwString; + LPWSTR lpwString; + size_t nStrLen; + + nStrLen = strlen(lpString) + 1; + + lpwString = (LPWSTR)malloc(nStrLen * sizeof(WCHAR)); + MultiByteToWideChar(0,0,lpString,nStrLen,lpwString,nStrLen); + + return lpwString; } #define FreeConvertedWideChar(lpwString) free(lpwString) @@ -281,47 +281,54 @@ // for the returned string when it is no longer needed. LPSTR DuplicateToMultiByte(LPCTSTR lptString, size_t nBufferSize) { - LPSTR lpString; - size_t nStrLen; - - nStrLen = _tcslen(lptString) + 1; - if (nBufferSize == 0) nBufferSize = nStrLen; - - lpString = (LPSTR)malloc(nBufferSize); + LPSTR lpString; + size_t nStrLen; + + nStrLen = _tcslen(lptString) + 1; + if (nBufferSize == 0) nBufferSize = nStrLen; + + lpString = (LPSTR)malloc(nBufferSize); #ifdef UNICODE - WideCharToMultiByte(0,0,lptString,nStrLen,lpString,nBufferSize,0,0); + WideCharToMultiByte(0,0,lptString,nStrLen,lpString,nBufferSize,0,0); #else - strncpy(lpString,lptString,nBufferSize); -#endif - - return lpString; + strncpy(lpString,lptString,nBufferSize); +#endif + + return lpString; } LRESULT CALLBACK EmptyWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return DefWindowProc(hWnd, uMsg, wParam, lParam); + return DefWindowProc(hWnd, uMsg, wParam, lParam); } // Registers a minimal window class for passing to the dll function -ATOM RegisterBlankClass(HINSTANCE hInstance) -{ - WNDCLASSEX wcex; - - wcex.cbSize = sizeof(WNDCLASSEX); - - wcex.style = 0; - wcex.lpfnWndProc = EmptyWindowProc; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; - wcex.hIcon = 0; - wcex.hCursor = 0; - wcex.hbrBackground = 0; - wcex.lpszMenuName = 0; - wcex.lpszClassName = rundll32_wclass; - wcex.hIconSm = 0; - - return RegisterClassEx(&wcex); +ATOM RegisterBlankClass(HINSTANCE hInstance, HINSTANCE hPrevInstance) +{ + WNDCLASSEX wcex; + ATOM Ret; + + if (!hPrevInstance) + { + wcex.cbSize = sizeof(WNDCLASSEX); + + wcex.style = 0; + wcex.lpfnWndProc = EmptyWindowProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = 0; + wcex.hCursor = 0; + wcex.hbrBackground = 0; + wcex.lpszMenuName = 0; + wcex.lpszClassName = rundll32_wclass; + wcex.hIconSm = 0; + } + + Ret = RegisterClassEx(&wcex); + if (!Ret) return FALSE; + + return Ret; } int WINAPI WinMain( @@ -331,149 +338,152 @@ int nCmdShow ) { - int argc; - TCHAR szMsg[RC_STRING_MAX_SIZE]; - - LPTSTR *argv; - LPTSTR lptCmdLine,lptDllName,lptFuncName,lptMsgBuffer; - LPSTR lpFuncName,lpaCmdLine; - LPWSTR lpwCmdLine; - HMODULE hDll; - DllWinMainW fnDllWinMainW; - DllWinMainA fnDllWinMainA; - HWND hWindow; - int nRetVal,i; - size_t nStrLen; - - // Get command-line in argc-argv format - argv = CommandLineToArgv(GetCommandLine(),&argc); - - // Skip all beginning arguments starting with a slash (/) - for (i = 1; i < argc; i++) - if (*argv[i] != _T('/')) break; - - // If no dll was specified, there is nothing to do - if (i >= argc) { - if (argv) free(argv); - return 0; - } - - lptDllName = argv[i++]; - - // The next argument, which specifies the name of the dll function, - // can either have a comma between it and the dll filename or a space. - // Using a comma here is the preferred method - if (i < argc) - lptFuncName = argv[i++]; - else - lptFuncName = _T(""); - - // If no function name was specified, nothing needs to be done - if (!*lptFuncName) { - if (argv) free(argv); - return 0; - } - - // The rest of the arguments will be passed to dll function - if (i < argc) - lptCmdLine = argv[i]; - else - lptCmdLine = _T(""); - - nRetVal = 0; - - // Everything is all setup, so load the dll now - hDll = LoadLibrary(lptDllName); - if (hDll) { - nStrLen = _tcslen(lptFuncName); - // Make a non-unicode version of the function name, - // since that is all GetProcAddress accepts - lpFuncName = DuplicateToMultiByte(lptFuncName,nStrLen + 2); + int argc; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + + LPTSTR *argv; + LPTSTR lptCmdLine,lptDllName,lptFuncName,lptMsgBuffer; + LPSTR lpFuncName,lpaCmdLine; + LPWSTR lpwCmdLine; + HMODULE hDll; + DllWinMainW fnDllWinMainW; + DllWinMainA fnDllWinMainA; + HWND hWindow; + int nRetVal,i; + size_t nStrLen; + + // Get command-line in argc-argv format + argv = CommandLineToArgv(GetCommandLine(),&argc); + + // Skip all beginning arguments starting with a slash (/) + for (i = 1; i < argc; i++) + if (*argv[i] != _T('/')) break; + + // If no dll was specified, there is nothing to do + if (i >= argc) { + if (argv) free(argv); + return 0; + } + + lptDllName = argv[i++]; + + // The next argument, which specifies the name of the dll function, + // can either have a comma between it and the dll filename or a space. + // Using a comma here is the preferred method + if (i < argc) + lptFuncName = argv[i++]; + else + lptFuncName = _T(""); + + // If no function name was specified, nothing needs to be done + if (!*lptFuncName) { + if (argv) free(argv); + return 0; + } + + // The rest of the arguments will be passed to dll function + if (i < argc) + lptCmdLine = argv[i]; + else + lptCmdLine = _T(""); + + nRetVal = 0; + + // Everything is all setup, so load the dll now + hDll = LoadLibrary(lptDllName); + if (hDll) { + nStrLen = _tcslen(lptFuncName); + // Make a non-unicode version of the function name, + // since that is all GetProcAddress accepts + lpFuncName = DuplicateToMultiByte(lptFuncName,nStrLen + 2); #ifdef UNICODE - lpFuncName[nStrLen] = 'W'; - lpFuncName[nStrLen+1] = 0; - // Get address of unicode version of the dll function if it exists - fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); - fnDllWinMainA = 0; - if (!fnDllWinMainW) { - // If no unicode function was found, get the address of the non-unicode function - lpFuncName[nStrLen] = 'A'; - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - if (!fnDllWinMainA) { - // If first non-unicode function was not found, get the address - // of the other non-unicode function - lpFuncName[nStrLen] = 0; - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - } - } + lpFuncName[nStrLen] = 'W'; + lpFuncName[nStrLen+1] = 0; + // Get address of unicode version of the dll function if it exists + fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); + fnDllWinMainA = 0; + if (!fnDllWinMainW) { + // If no unicode function was found, get the address of the non-unicode function + lpFuncName[nStrLen] = 'A'; + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + if (!fnDllWinMainA) { + // If first non-unicode function was not found, get the address + // of the other non-unicode function + lpFuncName[nStrLen] = 0; + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + } + } #else - // Get address of non-unicode version of the dll function if it exists - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - fnDllWinMainW = 0; - if (!fnDllWinMainA) { - // If first non-unicode function was not found, get the address - // of the other non-unicode function - lpFuncName[nStrLen] = 'A'; - lpFuncName[nStrLen+1] = 0; - fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); - if (!fnDllWinMainA) { - // If non-unicode function was not found, get the address of the unicode function - lpFuncName[nStrLen] = 'W'; - fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); - } - } -#endif - - free(lpFuncName); - - RegisterBlankClass(hInstance); - // Create a window so we can pass a window handle to - // the dll function; this is required - hWindow = CreateWindowEx(0,rundll32_wclass,rundll32_wtitle,0,CW_USEDEFAULT,0,CW_USEDEFAULT,0,0,0,hInstance,0); - - if (fnDllWinMainW) { - // Convert the command-line string to unicode and call the dll function - lpwCmdLine = ConvertToWideChar(lptCmdLine); - nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); - FreeConvertedWideChar(lpwCmdLine); - } - else if (fnDllWinMainA) { - // Convert the command-line string to ansi and call the dll function - lpaCmdLine = ConvertToMultiByte(lptCmdLine); - nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); - FreeConvertedMultiByte(lpaCmdLine); - } - else { - // The specified dll function was not found; display an error message - GetModuleTitle(); + // Get address of non-unicode version of the dll function if it exists + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + fnDllWinMainW = 0; + if (!fnDllWinMainA) { + // If first non-unicode function was not found, get the address + // of the other non-unicode function + lpFuncName[nStrLen] = 'A'; + lpFuncName[nStrLen+1] = 0; + fnDllWinMainA = (DllWinMainA)GetProcAddress(hDll,lpFuncName); + if (!fnDllWinMainA) { + // If non-unicode function was not found, get the address of the unicode function + lpFuncName[nStrLen] = 'W'; + fnDllWinMainW = (DllWinMainW)GetProcAddress(hDll,lpFuncName); + } + } +#endif + + free(lpFuncName); + + if (!RegisterBlankClass(hInstance, hPrevInstance)) + { + return 0; + } + // Create a window so we can pass a window handle to + // the dll function; this is required + hWindow = CreateWindowEx(0,rundll32_wclass,rundll32_wtitle,0,CW_USEDEFAULT,0,CW_USEDEFAULT,0,0,0,hInstance,0); + + if (fnDllWinMainW) { + // Convert the command-line string to unicode and call the dll function + lpwCmdLine = ConvertToWideChar(lptCmdLine); + nRetVal = fnDllWinMainW(hWindow,hInstance,lpwCmdLine,nCmdShow); + FreeConvertedWideChar(lpwCmdLine); + } + else if (fnDllWinMainA) { + // Convert the command-line string to ansi and call the dll function + lpaCmdLine = ConvertToMultiByte(lptCmdLine); + nRetVal = fnDllWinMainA(hWindow,hInstance,lpaCmdLine,nCmdShow); + FreeConvertedMultiByte(lpaCmdLine); + } + else { + // The specified dll function was not found; display an error message + GetModuleTitle(); LoadString( GetModuleHandle(NULL), IDS_MissingEntry, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 4 + _tcslen(lptFuncName) + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); - _stprintf(lptMsgBuffer,szMsg,lptFuncName,lptDllName); - MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); - free(lptMsgBuffer); - } - - DestroyWindow(hWindow); - UnregisterClass(rundll32_wclass,hInstance); - - // The dll function has finished executing, so unload it - FreeLibrary(hDll); - } - else { - // The dll could not be loaded; display an error message - GetModuleTitle(); - LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - - lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); - _stprintf(lptMsgBuffer,szMsg,lptDllName); - - MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); - free(lptMsgBuffer); - } - - if (argv) free(argv); - return nRetVal; -} - + lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 4 + _tcslen(lptFuncName) + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); + _stprintf(lptMsgBuffer,szMsg,lptFuncName,lptDllName); + MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); + free(lptMsgBuffer); + } + + DestroyWindow(hWindow); + UnregisterClass(rundll32_wclass,hInstance); + + // The dll function has finished executing, so unload it + FreeLibrary(hDll); + } + else { + // The dll could not be loaded; display an error message + GetModuleTitle(); + LoadString( GetModuleHandle(NULL), IDS_DllNotLoaded, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); + + lptMsgBuffer = (LPTSTR)malloc((_tcslen(szMsg) - 2 + _tcslen(lptDllName) + 1) * sizeof(TCHAR)); + _stprintf(lptMsgBuffer,szMsg,lptDllName); + + MessageBox(0,lptMsgBuffer,ModuleTitle,MB_ICONERROR); + free(lptMsgBuffer); + } + + if (argv) free(argv); + return nRetVal; +} +

1 0

[dchapyshev] 32388: - Add libpng 1.2.24 (from libpng.org)
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 19:23:33 2008 New Revision: 32388 URL: http://svn.reactos.org/svn/reactos?rev=32388&view=rev Log: - Add libpng 1.2.24 (from libpng.org) Added: trunk/rosapps/lib/libpng/ trunk/rosapps/lib/libpng/docs/ trunk/rosapps/lib/libpng/docs/ANNOUNCE (with props) trunk/rosapps/lib/libpng/docs/CHANGES (with props) trunk/rosapps/lib/libpng/docs/INSTALL (with props) trunk/rosapps/lib/libpng/docs/KNOWNBUG (with props) trunk/rosapps/lib/libpng/docs/LICENSE (with props) trunk/rosapps/lib/libpng/docs/README (with props) trunk/rosapps/lib/libpng/docs/TODO (with props) trunk/rosapps/lib/libpng/docs/Y2KINFO (with props) trunk/rosapps/lib/libpng/docs/example.c (with props) trunk/rosapps/lib/libpng/docs/libpng-1.2.24.txt (with props) trunk/rosapps/lib/libpng/libpng.rbuild (with props) trunk/rosapps/lib/libpng/png.c (with props) trunk/rosapps/lib/libpng/png.h (with props) trunk/rosapps/lib/libpng/pngconf.h (with props) trunk/rosapps/lib/libpng/pngerror.c (with props) trunk/rosapps/lib/libpng/pnggccrd.c (with props) trunk/rosapps/lib/libpng/pngget.c (with props) trunk/rosapps/lib/libpng/pngmem.c (with props) trunk/rosapps/lib/libpng/pngpread.c (with props) trunk/rosapps/lib/libpng/pngread.c (with props) trunk/rosapps/lib/libpng/pngrio.c (with props) trunk/rosapps/lib/libpng/pngrtran.c (with props) trunk/rosapps/lib/libpng/pngrutil.c (with props) trunk/rosapps/lib/libpng/pngset.c (with props) trunk/rosapps/lib/libpng/pngtest.c (with props) trunk/rosapps/lib/libpng/pngtrans.c (with props) trunk/rosapps/lib/libpng/pngvcrd.c (with props) trunk/rosapps/lib/libpng/pngwio.c (with props) trunk/rosapps/lib/libpng/pngwrite.c (with props) trunk/rosapps/lib/libpng/pngwtran.c (with props) trunk/rosapps/lib/libpng/pngwutil.c (with props) Modified: trunk/rosapps/lib/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rosapps/lib/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/directory.rbuild?rev=3… Added: trunk/rosapps/lib/libpng/docs/ANNOUNCE URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/ANNOUNCE?r… Added: trunk/rosapps/lib/libpng/docs/CHANGES URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/CHANGES?re… Added: trunk/rosapps/lib/libpng/docs/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/INSTALL?re… Added: trunk/rosapps/lib/libpng/docs/KNOWNBUG URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/KNOWNBUG?r… Added: trunk/rosapps/lib/libpng/docs/LICENSE URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/LICENSE?re… Added: trunk/rosapps/lib/libpng/docs/README URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/README?rev… Added: trunk/rosapps/lib/libpng/docs/TODO URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/TODO?rev=3… Added: trunk/rosapps/lib/libpng/docs/Y2KINFO URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/Y2KINFO?re… Added: trunk/rosapps/lib/libpng/docs/example.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/example.c?… Added: trunk/rosapps/lib/libpng/docs/libpng-1.2.24.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/docs/libpng-1.2… Added: trunk/rosapps/lib/libpng/libpng.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/libpng.rbuild?r… Added: trunk/rosapps/lib/libpng/png.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/png.c?rev=32388… Added: trunk/rosapps/lib/libpng/png.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/png.h?rev=32388… Added: trunk/rosapps/lib/libpng/pngconf.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngconf.h?rev=3… Added: trunk/rosapps/lib/libpng/pngerror.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngerror.c?rev=… Added: trunk/rosapps/lib/libpng/pnggccrd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pnggccrd.c?rev=… Added: trunk/rosapps/lib/libpng/pngget.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngget.c?rev=32… Added: trunk/rosapps/lib/libpng/pngmem.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngmem.c?rev=32… Added: trunk/rosapps/lib/libpng/pngpread.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngpread.c?rev=… Added: trunk/rosapps/lib/libpng/pngread.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngread.c?rev=3… Added: trunk/rosapps/lib/libpng/pngrio.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngrio.c?rev=32… Added: trunk/rosapps/lib/libpng/pngrtran.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngrtran.c?rev=… Added: trunk/rosapps/lib/libpng/pngrutil.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngrutil.c?rev=… Added: trunk/rosapps/lib/libpng/pngset.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngset.c?rev=32… Added: trunk/rosapps/lib/libpng/pngtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngtest.c?rev=3… Added: trunk/rosapps/lib/libpng/pngtrans.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngtrans.c?rev=… Added: trunk/rosapps/lib/libpng/pngvcrd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngvcrd.c?rev=3… Added: trunk/rosapps/lib/libpng/pngwio.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwio.c?rev=32… Added: trunk/rosapps/lib/libpng/pngwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwrite.c?rev=… Added: trunk/rosapps/lib/libpng/pngwtran.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwtran.c?rev=… Added: trunk/rosapps/lib/libpng/pngwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/libpng/pngwutil.c?rev=…

1 0

[dchapyshev] 32387: - Update Russian translation
by dchapyshev＠svn.reactos.org 16 Feb '08

16 Feb '08

Author: dchapyshev Date: Sat Feb 16 18:26:00 2008 New Revision: 32387 URL: http://svn.reactos.org/svn/reactos?rev=32387&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc Sat Feb 16 18:26:00 2008 @@ -256,7 +256,7 @@ EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER GROUPBOX "Õðîíîëîãèÿ çàãðóçêè ÖÏ",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT - GROUPBOX "Õðîíîëîãèÿ èñïîëüçîâàíèÿ ïàìÿòè",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Õðîíîëîãèÿ èñïîëüçîâàíèÿ ôàéëà ïîäêà÷êè",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT PUSHBUTTON "Îòîáðàæåíèå çàãðóçêè ÖÏ",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, WS_EX_CLIENTEDGE PUSHBUTTON "Îòîáðàæåíèå èñïîëüçîâàíèÿ ïàìÿòè",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, @@ -609,16 +609,16 @@ BEGIN IDS_TAB_APPS "Ïðèëîæåíèÿ" IDS_TAB_PROCESSES "Ïðîöåññû" - IDS_TAB_PERFORMANCE "Ïðîèçâîäèòåëüíîñòü" + IDS_TAB_PERFORMANCE "Áûñòðîäåéñòâèå" IDS_TAB_TASK "Çàäà÷à" - IDS_TAB_STATUS "Ñòàòóñ" + IDS_TAB_STATUS "Ñîñòîÿíèå" IDS_TAB_IMAGENAME "Èìÿ îáðàçà" IDS_TAB_PID "PID" IDS_TAB_USERNAME "Èìÿ ïîëüçîâàòåëÿ" IDS_TAB_SESSIONID "Êîä ñåàíñà" IDS_TAB_CPU "ÖÏ" IDS_TAB_CPUTIME "Âðåìÿ ÖÏ" - IDS_TAB_MEMUSAGE "Èñïîëüçîâàíèå ïàìÿòè" + IDS_TAB_MEMUSAGE "Ïàìÿòü" IDS_TAB_PEAKMEMUSAGE "Ïàìÿòü - ìàêñèìóì" IDS_TAB_MEMDELTA "Ïàìÿòü - èçìåíåíèå" IDS_TAB_PAGEFAULT "Îøèáîê ñòðàíèöû" @@ -659,9 +659,9 @@ IDS_MSG_UNABLETERMINATEPRO "Íå óäàëîñü çàâåðøèòü ïðîöåññ" IDS_MSG_UNABLECHANGEPRIORITY "Íå óäàëîñü èçìåíèòü ïðèîðèòåò" IDS_MSG_WARNINGCHANGEPRIORITY "ÂÍÈÌÀÍÈÅ: Èçìåíåíèå ïðèîðèòåòà ìîæåò ïîâëå÷ íåóñòîé÷èâóþ ðàáîòó è ïîòåðþ äàííûõ.\nÂû óâåðåíû, ÷òî ìîæíî ïðîäîëæàòü?" - IDS_MSG_TRAYICONCPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %d%%" - IDS_STATUS_MEMUSAGE "Èñïîëüçîâàíèå ïàìÿòè: %dK / %dK" - IDS_STATUS_CPUUSAGE "Èñïîëüçîâàíèå ÖÏ: %3d%%" + IDS_MSG_TRAYICONCPUUSAGE "Çàãðóçêà ÖÏ: %d%%" + IDS_STATUS_MEMUSAGE "Âûäåëåíèå ïàìÿòè: %dK / %dK" + IDS_STATUS_CPUUSAGE "Çàãðóçêà ÖÏ: %3d%%" IDS_STATUS_PROCESSES "Ïðîöåññîâ: %d" IDS_Not_Responding "Íå îòâå÷àåò" IDS_Running "Ðàáîòàåò"

1 0

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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008