Author: dreimer Date: Sun Dec 2 21:25:06 2007 New Revision: 30964
URL: http://svn.reactos.org/svn/reactos?rev=30964&view=rev Log: Remove Trailing spaces.
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.h trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp trunk/tools/RosBE/RosBE-PPC/ovr/make trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/argpars... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.cpp Sun Dec 2 21:25:06 2007 @@ -23,7 +23,7 @@ for(size_t i = 0; i < arguments.size(); i++) { const std::string arg = arguments[i]; - + // Find -Wl and parse if (arg.size() > 3 && arg.substr(0,3) == "-Wl") { @@ -68,7 +68,7 @@ return true; } // Catch --entry=foo@12 - else if (arg.size() > longName.size() && + else if (arg.size() > longName.size() && arg.substr(0,longName.size()) == longName && arg[longName.size()] == '=') {
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/argpars... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/argparse.h Sun Dec 2 21:25:06 2007 @@ -5,7 +5,7 @@ #include <string>
bool getarg -(const std::string &shortName, +(const std::string &shortName, const std::string &longName, bool remove, std::vectorstd::string &arguments,
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.c... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp Sun Dec 2 21:25:06 2007 @@ -38,7 +38,7 @@ }
void possibly_define -(std::vectorstd::string &args, +(std::vectorstd::string &args, std::string label, std::string body = "1") { @@ -58,12 +58,12 @@ }
int main( int argc, char **argv ) { - bool verbose = false, nostdlib = false, + bool verbose = false, nostdlib = false, nostartfiles = false, compile_only = false, is_dll = false, entry, mkheader = true; int status = 0; - std::string gcc_name, gcc_hash_output, gcc_line, - mingw_lib_dir, output_file, entry_point = "", + std::string gcc_name, gcc_hash_output, gcc_line, + mingw_lib_dir, output_file, entry_point = "", image_base = "0x400000", section_align = "0x1000", file_align = "0x1000", subsystem = "cui", result; @@ -97,8 +97,8 @@
if( entry ) { - if(entry_point.size() && entry_point[0] == '_') - { + if(entry_point.size() && entry_point[0] == '_') + { entry_point = entry_point.substr(1); } if( !compile_only ) @@ -140,7 +140,7 @@
// Stack on driver name and dump commands flag if( verbose ) gcc_args_str.insert(gcc_args_str.begin(),"-v"); - if (!compile_only) + if (!compile_only) { if( is_dll ) gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-r"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-q"); @@ -165,9 +165,9 @@ /* Ok fixup the elf object file */ ElfObjectFile eof(output_file); const ElfObjectFile::Symbol *entry_sym; - - if(!eof) exit(1); - + + if(!eof) exit(1); + entry_sym = eof.getNamedSymbol(entry_point);
ElfPeHeader header @@ -182,7 +182,7 @@ atoi(subsystem.c_str()), is_dll, &eof); - + eof.addSection(".peheader", header.getData(), TYPE_PEHEADER); }
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/header.... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp Sun Dec 2 21:25:06 2007 @@ -3,7 +3,7 @@ #include "header.h"
ElfPeHeader::ElfPeHeader - (uint32_t imagebase, + (uint32_t imagebase, uint32_t filealign, uint32_t sectionalign, const ElfObjectFile::Symbol *entry, @@ -33,7 +33,7 @@ return sectionalign; /* We'll compute it for real later */ }
-void ElfPeHeader::createHeaderSection() +void ElfPeHeader::createHeaderSection() { std::vector<section_mapping_t> sectionRvaSet; uint32_t imageSize = getSectionRvas(sectionRvaSet); @@ -95,11 +95,11 @@ le32pwrite_postinc(dataptr, getTlsInfo()); // Fixup size of optional header le16write - (&data[0] + optHeaderSizeMember, + (&data[0] + optHeaderSizeMember, (dataptr - &data[0]) - coffHeaderSize); // Here, we store references to the sections, filling in the RVA and // size, but leaving out the other info. We write the section name - // truncated into the name field and leave the section id in the + // truncated into the name field and leave the section id in the // physical address bit for (int i = 0; i < sectionRvaSet.size(); i++) { @@ -115,7 +115,7 @@ le32write_postinc(dataptr, size); le32write_postinc(dataptr, rva); le32write_postinc(dataptr, size); - // Note: we put the index in the offset slot so we can find the + // Note: we put the index in the offset slot so we can find the // real offset later in the loader le32write_postinc(dataptr, sectionRvaSet[i].index); le32write_postinc(dataptr, 0); @@ -133,7 +133,7 @@ uint32_t start = computeSize(); uint32_t limit = start; for(int i = 0; i < eof->getNumSections(); i++) { - { + { const ElfObjectFile::Section § = eof->getSection(i); if(sect.getFlags() & SHF_ALLOC) { limit = roundup(start + sect.logicalSize(), sectionalign); @@ -155,7 +155,7 @@ return IMAGE_FILE_MACHINE_POWERPCBE; /* for now */ }
-u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::vector<section_mapping_t> &mapping, const std::string &name) +u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::vector<section_mapping_t> &mapping, const std::string &name) { const ElfObjectFile::Section *sect = eof->getNamedSection(name); uint32_t sectaddr; @@ -188,7 +188,7 @@ return getNamedSectionInfo(eof, mapping, ".rsrc"); }
-u32pair_t ElfPeHeader::getExceptionInfo() const +u32pair_t ElfPeHeader::getExceptionInfo() const { return std::make_pair(0,0); } @@ -224,12 +224,12 @@ }
uint32_t ElfPeHeader::getEntryPoint -(const std::vector<section_mapping_t> &secmap, +(const std::vector<section_mapping_t> &secmap, const ElfObjectFile::Symbol *entry) const { if(entry == NULL) return computeSize(); for(int i = 0; i < secmap.size(); i++) { - if(secmap[i].index == entry->section) + if(secmap[i].index == entry->section) return secmap[i].rva + entry->offset; } return computeSize();
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/header.... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/header.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.h Sun Dec 2 21:25:06 2007 @@ -11,7 +11,7 @@ const ElfObjectFile::Section *section; uint32_t rva; int index; - + section_mapping_t (const ElfObjectFile::Section *sect, uint32_t rva, int index) : section(sect), rva(rva), index(index) { } @@ -22,7 +22,7 @@ class ElfPeHeader { public: ElfPeHeader - (uint32_t imagebase, + (uint32_t imagebase, uint32_t imagealign, uint32_t filealign, const ElfObjectFile::Symbol *entry, @@ -56,9 +56,9 @@ uint32_t saToRva(int section, uint32_t offset) const; uint32_t vaToRva(uint32_t source_addr) const;
- uint32_t + uint32_t imagebase, filealign, sectionalign, - stackreserve, stackcommit, + stackreserve, stackcommit, heapreserve, heapcommit; bool dll; int subsysid;
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/objectf... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp Sun Dec 2 21:25:06 2007 @@ -79,7 +79,7 @@
void ElfObjectFile::addSection(const std::string &name, const secdata_t &data, int type) { - Elf_Scn *newsect = elf_newscn(elfHeader), + Elf_Scn *newsect = elf_newscn(elfHeader), *strsect = elf_getscn(elfHeader, shstrndx); Elf32_Shdr *shdr = elf32_getshdr(newsect); /* Create data for the new section */
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/objectf... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h Sun Dec 2 21:25:06 2007 @@ -12,8 +12,8 @@
class Symbol { public: - Symbol(const std::string &name, uint32_t offset, - int section, int flags) : + Symbol(const std::string &name, uint32_t offset, + int section, int flags) : name(name), offset(offset), section(section), flags(flags) { } std::string name; uint32_t offset; @@ -23,12 +23,12 @@
class Section { public: - Section(const Section &other) : - obj(other.obj), section(other.section), have_data(false), - number(other.number) { + Section(const Section &other) : + obj(other.obj), section(other.section), have_data(false), + number(other.number) { e32shdr = elf32_getshdr(section); } - Section(ElfObjectFile &obj, int number, Elf_Scn *sechdr) : + Section(ElfObjectFile &obj, int number, Elf_Scn *sechdr) : obj(&obj), section(sechdr), have_data(false), number(number) { e32shdr = elf32_getshdr(section); } @@ -40,7 +40,7 @@ number = other.number; } operator bool () { return !!section; } - std::string getName() const { + std::string getName() const { return obj->getString(e32shdr->sh_name); }
@@ -100,7 +100,7 @@ bool operator ! () const { return fd == -1 ? true : false; } int getNumSections() const { return sections.size(); } uint32_t getEntryPoint() const; - std::string getString(int offset) const { + std::string getString(int offset) const { return elf_strptr(elfHeader, shstrndx, offset); } void addSection
Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/util.cp... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp Sun Dec 2 21:25:06 2007 @@ -34,7 +34,7 @@ le32write_postinc(dataptr, value.second); }
-uint16_t be16read(uint8_t *dataptr) +uint16_t be16read(uint8_t *dataptr) { return dataptr[0] << 8 | dataptr[1]; } @@ -46,7 +46,7 @@ return res; }
-uint32_t be32read(uint8_t *dataptr) +uint32_t be32read(uint8_t *dataptr) { return be16read(dataptr) << 16 | be16read(dataptr+2); }
Modified: trunk/tools/RosBE/RosBE-PPC/ovr/make URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/ovr/make?rev=... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/ovr/make (original) +++ trunk/tools/RosBE/RosBE-PPC/ovr/make Sun Dec 2 21:25:06 2007 @@ -3,7 +3,7 @@ export PATH=tools/ppc.lost+found:$PATH
if [ ! -d tmp-ppc ] ; then - mkdir tmp-ppc || echo "Could not make temp dir" + mkdir tmp-ppc || echo "Could not make temp dir" fi
$OLDMAKE \
Modified: trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b?... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b (original) +++ trunk/tools/RosBE/RosBE-PPC/ovr/ofboot.b Sun Dec 2 21:25:06 2007 @@ -1,64 +1,64 @@ -<CHRP-BOOT> -<COMPATIBLE> -MacRISC MacRISC3 MacRISC4 -</COMPATIBLE> -<DESCRIPTION> -GNU/Linux PPC bootloader -</DESCRIPTION> -<BOOT-SCRIPT> -" screen" output -load-base release-load-area -boot cd:,\install\yaboot -</BOOT-SCRIPT> -<OS-BADGE-ICONS> -1010 -000000000000F8FEACF6000000000000 -0000000000F5FFFFFEFEF50000000000 -00000000002BFAFEFAFCF70000000000 -0000000000F65D5857812B0000000000 -0000000000F5350B2F88560000000000 -0000000000F6335708F8FE0000000000 -00000000005600F600F5FD8100000000 -00000000F9F8000000F5FAFFF8000000 -000000008100F5F50000F6FEFE000000 -000000F8F700F500F50000FCFFF70000 -00000088F70000F50000F5FCFF2B0000 -0000002F582A00F5000008ADE02C0000 -00090B0A35A62B0000002D3B350A0000 -000A0A0B0B3BF60000505E0B0A0B0A00 -002E350B0B2F87FAFCF45F0B2E090000 -00000007335FF82BF72B575907000000 -000000000000ACFFFF81000000000000 -000000000081FFFFFFFF810000000000 -0000000000FBFFFFFFFFAC0000000000 -000000000081DFDFDFFFFB0000000000 -000000000081DD5F83FFFD0000000000 -000000000081DDDF5EACFF0000000000 -0000000000FDF981F981FFFF00000000 -00000000FFACF9F9F981FFFFAC000000 -00000000FFF98181F9F981FFFF000000 -000000ACACF981F981F9F9FFFFAC0000 -000000FFACF9F981F9F981FFFFFB0000 -00000083DFFBF981F9F95EFFFFFC0000 -005F5F5FDDFFFBF9F9F983DDDD5F0000 -005F5F5F5FDD81F9F9E7DF5F5F5F5F00 -0083DD5F5F83FFFFFFFFDF5F835F0000 -000000FBDDDFACFBACFBDFDFFB000000 -000000000000FFFFFFFF000000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFFFF00000000 -00000000FFFFFFFFFFFFFFFFFF000000 -00000000FFFFFFFFFFFFFFFFFF000000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFF000000 -</OS-BADGE-ICONS> -</CHRP-BOOT> +<CHRP-BOOT> +<COMPATIBLE> +MacRISC MacRISC3 MacRISC4 +</COMPATIBLE> +<DESCRIPTION> +GNU/Linux PPC bootloader +</DESCRIPTION> +<BOOT-SCRIPT> +" screen" output +load-base release-load-area +boot cd:,\install\yaboot +</BOOT-SCRIPT> +<OS-BADGE-ICONS> +1010 +000000000000F8FEACF6000000000000 +0000000000F5FFFFFEFEF50000000000 +00000000002BFAFEFAFCF70000000000 +0000000000F65D5857812B0000000000 +0000000000F5350B2F88560000000000 +0000000000F6335708F8FE0000000000 +00000000005600F600F5FD8100000000 +00000000F9F8000000F5FAFFF8000000 +000000008100F5F50000F6FEFE000000 +000000F8F700F500F50000FCFFF70000 +00000088F70000F50000F5FCFF2B0000 +0000002F582A00F5000008ADE02C0000 +00090B0A35A62B0000002D3B350A0000 +000A0A0B0B3BF60000505E0B0A0B0A00 +002E350B0B2F87FAFCF45F0B2E090000 +00000007335FF82BF72B575907000000 +000000000000ACFFFF81000000000000 +000000000081FFFFFFFF810000000000 +0000000000FBFFFFFFFFAC0000000000 +000000000081DFDFDFFFFB0000000000 +000000000081DD5F83FFFD0000000000 +000000000081DDDF5EACFF0000000000 +0000000000FDF981F981FFFF00000000 +00000000FFACF9F9F981FFFFAC000000 +00000000FFF98181F9F981FFFF000000 +000000ACACF981F981F9F9FFFFAC0000 +000000FFACF9F981F9F981FFFFFB0000 +00000083DFFBF981F9F95EFFFFFC0000 +005F5F5FDDFFFBF9F9F983DDDD5F0000 +005F5F5F5FDD81F9F9E7DF5F5F5F5F00 +0083DD5F5F83FFFFFFFFDF5F835F0000 +000000FBDDDFACFBACFBDFDFFB000000 +000000000000FFFFFFFF000000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFFFF00000000 +00000000FFFFFFFFFFFFFFFFFF000000 +00000000FFFFFFFFFFFFFFFFFF000000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFF000000 +</OS-BADGE-ICONS> +</CHRP-BOOT>
Modified: trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.p... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pyhive/hbin.py Sun Dec 2 21:25:06 2007 @@ -124,7 +124,7 @@ return result + \ round_pad(self.name,4) + \ round_pad(self.classname,4) - + def size_header(self): return len(self.encode_header())
@@ -143,16 +143,16 @@ data = struct.pack(">"+str(len(valuecells))+"I",*valuecells) regf.write(cellid, data) return cellid - + def makecell(self,regf): valcells = [] keycells = [] - + mycell = regf.claim(self.size_header()) - + for val in self.values: valcells.append(val.makecell(regf)) - + for key in self.subkeys: key.parentcell = mycell keycells.append((key.name,key.makecell(regf))) @@ -160,7 +160,7 @@ self.keylist = self.make_key_list_cell(regf, keycells) self.valuelist = self.make_value_list_cell(regf, valcells) regf.write(mycell,self.encode_header()) - + return mycell
class hbin: @@ -264,7 +264,7 @@ outf.write(pad(header,self.blocksize)) for hbin in self.bins: hbin.export(outf) - + def alloc_hbin(self): self.thebin = hbin(len(self.bins)) self.bins.append(self.thebin)
Modified: trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pyhive/mkhive.py Sun Dec 2 21:25:06 2007 @@ -21,7 +21,7 @@ hivedir = sys.argv[2]
ri = reginf.reginf() - + for file in ["hivesys.inf","hivecls.inf","hivesft.inf","hivedef.inf"]: lines = open(os.path.join(infdir,file)).read().split('\n') curline = 0 @@ -53,4 +53,4 @@ thehive.export(outf) outf.close()
- +
Modified: trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pyhive/reginf... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pyhive/reginf.py Sun Dec 2 21:25:06 2007 @@ -1,5 +1,5 @@ import hbin -import struct +import struct
FLG_ADDREG_BINVALUETYPE = 1 FLG_ADDREG_NOCLOBBER = 2 @@ -38,7 +38,7 @@ (len(stripcomment(linelist[curline]).strip()) == 0 or \ linelist[curline] == '['): curline = curline + 1 - + while not stop and curline < len(linelist): theline = linelist[curline] if len(theline) and theline[-1] == '\': @@ -138,7 +138,7 @@ else: result = self.parsed[4:] return result - + class reginf: def __init__(self): self.content = []
Modified: trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap... ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py (original) +++ trunk/tools/RosBE/RosBE-PPC/pynls/nlsswap.py Sun Dec 2 21:25:06 2007 @@ -15,7 +15,7 @@ for i in xrange(0,narrow_size): result = result + struct.pack(">H",*struct.unpack("<H",nlsbuf[start:start+2])) start = start + 2 - + # Optional OEM table nextlen = struct.unpack("<H",nlsbuf[start:start+2])[0] result = result + struct.pack(">H",nextlen) @@ -27,13 +27,13 @@ start = start + 2 else: result = result + struct.pack(">H",nextlen) - + dbcs_ranges = struct.unpack("<H",nlsbuf[start:start+2])[0] if (dbcs_ranges & 0x8000) != 0: for i in xrange(start/2,len(nlsbuf)/2): result = result + struct.pack(">H",*struct.unpack("<H",nlsbuf[start:start+2])) start = start + 2 - + result = result + nlsbuf[len(result):]
return result