From 7ce0322c85868a985bfd57db7617e9054eb0a672 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sun, 21 Nov 2004 15:35:15 +0000
Subject: [PATCH] decode HTML-encoded bookmark names

svn path=/trunk/; revision=11749
---
 reactos/subsys/system/explorer/Makefile.PCH        |  2 +-
 .../subsys/system/explorer/taskbar/favorites.cpp   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/subsys/system/explorer/Makefile.PCH b/reactos/subsys/system/explorer/Makefile.PCH
index 71a048d8ea8..2d71f5e9feb 100644
--- a/reactos/subsys/system/explorer/Makefile.PCH
+++ b/reactos/subsys/system/explorer/Makefile.PCH
@@ -19,7 +19,7 @@ CFLAGS	+= -D_DEBUG -g
 RCFLAGS	+= -D_DEBUG
 LFLAGS	+= -g
 else
-CFLAGS	+= -DNDEBUG -Os
+CFLAGS	+= -DNDEBUG -Os -march=pentium4
 RCFLAGS	+= -DNDEBUG
 LFLAGS	+= -s
 endif
diff --git a/reactos/subsys/system/explorer/taskbar/favorites.cpp b/reactos/subsys/system/explorer/taskbar/favorites.cpp
index d6a07c1ca0b..dc9ad6d8fdb 100644
--- a/reactos/subsys/system/explorer/taskbar/favorites.cpp
+++ b/reactos/subsys/system/explorer/taskbar/favorites.cpp
@@ -88,12 +88,12 @@ bool Bookmark::read(const_XMLPos& pos)
 	_url = pos.get("href").c_str();
 
 	if (pos.go_down("title")) {
-		_name = pos->get_content().c_str();
+		_name = pos->get_content();
 		pos.back();
 	}
 
 	if (pos.go_down("desc")) {
-		_description = pos->get_content().c_str();
+		_description = pos->get_content();
 		pos.back();
 	}
 
@@ -160,19 +160,19 @@ void Bookmark::write(XMLPos& pos) const
 void BookmarkFolder::read(const_XMLPos& pos)
 {
 	if (pos.go_down("title")) {
-		_name = pos->get_content().c_str();
+		_name = pos->get_content();
 		pos.back();
 	}
 
 	if (pos.go_down("desc")) {
-		_description = pos->get_content().c_str();
+		_description = pos->get_content();
 		pos.back();
 	}
 
 	_bookmarks.read(pos);
 }
 
- /// write bookmark folder conten from XBEL formated XML tree
+ /// write bookmark folder content from XBEL formated XML tree
 void BookmarkFolder::write(XMLPos& pos) const
 {
 	pos.create("folder");
@@ -389,7 +389,7 @@ void BookmarkList::import_IE_favorites(ShellDirectory& dir, HWND hwnd)
 		if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
 			BookmarkFolder new_folder;
 
-			new_folder._name = name;
+			new_folder._name = DecodeXMLString(name);
 
 			if (entry->_etype == ET_SHELL) {
 				ShellDirectory new_dir(dir._folder, static_cast<ShellEntry*>(entry)->_pidl, hwnd);
@@ -404,7 +404,7 @@ void BookmarkList::import_IE_favorites(ShellDirectory& dir, HWND hwnd)
 		} else {
 			Bookmark bookmark;
 
-			bookmark._name = name;
+			bookmark._name = DecodeXMLString(name);
 
 			entry->get_path(path);
 			_tsplitpath(path, NULL, NULL, NULL, ext);