Modified: trunk/reactos/subsys/system/explorer/explorer.cpp
Modified: trunk/reactos/subsys/system/explorer/explorer.dsp
Modified: trunk/reactos/subsys/system/explorer/explorer.vcproj
Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc
Modified: trunk/reactos/subsys/system/explorer/globals.h
Modified: trunk/reactos/subsys/system/explorer/resource.h
Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp
--- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-14 08:49:10 UTC (rev 20846)
+++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-14 09:04:42 UTC (rev 20847)
@@ -478,9 +478,9 @@
return _icons[ICID_NONE];
}
-const Icon& IconCache::extract(LPCTSTR path, int idx, ICONCACHE_FLAGS flags)
+const Icon& IconCache::extract(LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags)
{
- IdxCacheKey key(path, make_pair(idx, (flags|ICF_HICON)&~ICF_SYSCACHE));
+ IdxCacheKey key(path, make_pair(icon_idx, (flags|ICF_HICON)&~ICF_SYSCACHE));
key.first.toLower();
@@ -491,7 +491,7 @@
HICON hIcon;
- if ((int)ExtractIconEx(path, idx, NULL, &hIcon, 1) > 0) {
+ if ((int)ExtractIconEx(path, icon_idx, NULL, &hIcon, 1) > 0) {
const Icon& icon = add(hIcon, IT_CACHED);
_idxCache[key] = icon;
@@ -505,13 +505,13 @@
}
}
-const Icon& IconCache::extract(IExtractIcon* pExtract, LPCTSTR path, int idx, ICONCACHE_FLAGS flags)
+const Icon& IconCache::extract(IExtractIcon* pExtract, LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags)
{
HICON hIconLarge = 0;
HICON hIcon;
bool large_icons = flags & ICF_LARGE;
- HRESULT hr = pExtract->Extract(path, idx, &hIconLarge, &hIcon, MAKELONG(GetSystemMetrics(SM_CXICON), ICON_SIZE_X));
+ HRESULT hr = pExtract->Extract(path, icon_idx, &hIconLarge, &hIcon, MAKELONG(GetSystemMetrics(SM_CXICON), ICON_SIZE_X));
if (hr == NOERROR) { //@@ oder SUCCEEDED(hr) ?
if (large_icons) { //@@ OK?
--- trunk/reactos/subsys/system/explorer/explorer.dsp 2006-01-14 08:49:10 UTC (rev 20846)
+++ trunk/reactos/subsys/system/explorer/explorer.dsp 2006-01-14 09:04:42 UTC (rev 20847)
@@ -320,6 +320,10 @@
# End Source File
# Begin Source File
+SOURCE=.\res\administration.ico
+# End Source File
+# Begin Source File
+
SOURCE=.\res\appicon.ico
# End Source File
# Begin Source File
@@ -352,6 +356,14 @@
# End Source File
# Begin Source File
+SOURCE=".\res\control-panel.ico"
+# End Source File
+# Begin Source File
+
+SOURCE=".\res\desktop-settings.ico"
+# End Source File
+# Begin Source File
+
SOURCE=.\res\documents.ico
# End Source File
# Begin Source File
@@ -432,6 +444,11 @@
# End Source File
# Begin Source File
+SOURCE=".\explorer-uk.rc"
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
SOURCE=.\explorer.exe.manifest
# End Source File
# Begin Source File
@@ -532,6 +549,10 @@
# End Source File
# Begin Source File
+SOURCE=".\res\network-conns.ico"
+# End Source File
+# Begin Source File
+
SOURCE=.\res\network.ico
# End Source File
# Begin Source File
@@ -552,6 +573,10 @@
# End Source File
# Begin Source File
+SOURCE=".\res\recent-documents.ico"
+# End Source File
+# Begin Source File
+
SOURCE=.\resource.h
# End Source File
# Begin Source File
@@ -572,6 +597,10 @@
# End Source File
# Begin Source File
+SOURCE=.\res\shutdown.ico
+# End Source File
+# Begin Source File
+
SOURCE=.\res\speaker.ico
# End Source File
# Begin Source File
--- trunk/reactos/subsys/system/explorer/explorer.vcproj 2006-01-14 08:49:10 UTC (rev 20846)
+++ trunk/reactos/subsys/system/explorer/explorer.vcproj 2006-01-14 09:04:42 UTC (rev 20847)
@@ -1088,6 +1088,10 @@
>
</File>
<File
+ RelativePath=".\res\administration.ico"
+ >
+ </File>
+ <File
RelativePath="res\appicon.ico"
>
</File>
@@ -1120,6 +1124,14 @@
>
</File>
<File
+ RelativePath=".\res\control-panel.ico"
+ >
+ </File>
+ <File
+ RelativePath=".\res\desktop-settings.ico"
+ >
+ </File>
+ <File
RelativePath="res\documents.ico"
>
</File>
@@ -1958,6 +1970,14 @@
>
</File>
<File
+ RelativePath=".\res\minimize.ico"
+ >
+ </File>
+ <File
+ RelativePath=".\res\network-conns.ico"
+ >
+ </File>
+ <File
RelativePath="res\network.ico"
>
</File>
@@ -1978,6 +1998,10 @@
>
</File>
<File
+ RelativePath=".\res\recent-documents.ico"
+ >
+ </File>
+ <File
RelativePath="resource.h"
>
</File>
@@ -1998,6 +2022,10 @@
>
</File>
<File
+ RelativePath=".\res\shutdown.ico"
+ >
+ </File>
+ <File
RelativePath="res\speaker.ico"
>
</File>
@@ -2009,6 +2037,10 @@
RelativePath="res\toolbar.bmp"
>
</File>
+ <File
+ RelativePath=".\res\winefile.ico"
+ >
+ </File>
</Filter>
<Filter
Name="taskbar"
--- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-14 08:49:10 UTC (rev 20846)
+++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-14 09:04:42 UTC (rev 20847)
@@ -102,7 +102,7 @@
"#endif\r\n"
"END\r\n"
"#endif\r\n"
- "#ifndef _DEBUG\r\n"
+ "#ifndef _DEBUG\r\n"
"CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.manifest""\r\n"
"#endif\r\n"
"\r\n"
@@ -165,13 +165,12 @@
IDI_ARROW_DOWN ICON DISCARDABLE "res/arrow_dwn.ico"
IDI_NOTIFY_L ICON DISCARDABLE "res/notify_l.ico"
IDI_NOTIFY_R ICON DISCARDABLE "res/notify_r.ico"
-IDI_MINIMIZE ICON DISCARDABLE "res/minimize.ico"
+IDI_MINIMIZE ICON DISCARDABLE "res/minimize.ico"
IDI_CONTROLPAN ICON DISCARDABLE "res/control-panel.ico"
IDI_DESKSETTING ICON DISCARDABLE "res/desktop-settings.ico"
IDI_NETCONNS ICON DISCARDABLE "res/network-conns.ico"
IDI_ADMINISTRATION ICON DISCARDABLE "res/administration.ico"
IDI_RECENT ICON DISCARDABLE "res/recent-documents.ico"
-
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
--- trunk/reactos/subsys/system/explorer/globals.h 2006-01-14 08:49:10 UTC (rev 20846)
+++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-14 09:04:42 UTC (rev 20847)
@@ -127,8 +127,8 @@
void init();
const Icon& extract(LPCTSTR path, ICONCACHE_FLAGS flags=ICF_NORMAL);
- const Icon& extract(LPCTSTR path, int idx, ICONCACHE_FLAGS flags=ICF_HICON);
- const Icon& extract(IExtractIcon* pExtract, LPCTSTR path, int idx, ICONCACHE_FLAGS flags=ICF_HICON);
+ const Icon& extract(LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags=ICF_HICON);
+ const Icon& extract(IExtractIcon* pExtract, LPCTSTR path, int icon_idx, ICONCACHE_FLAGS flags=ICF_HICON);
const Icon& add(HICON hIcon, ICON_TYPE type=IT_DYNAMIC);
const Icon& add(int sys_idx/*, ICON_TYPE type=IT_SYSCACHE*/);
--- trunk/reactos/subsys/system/explorer/resource.h 2006-01-14 08:49:10 UTC (rev 20846)
+++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-14 09:04:42 UTC (rev 20847)
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
-// Used by explorer-hu.rc
+// Used by explorer_intres.rc
//
#define IDS_TITLE 1
#define MANIFEST_RESOURCE_ID 1
--- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-14 08:49:10 UTC (rev 20846)
+++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-14 09:04:42 UTC (rev 20847)
@@ -293,7 +293,6 @@
int ShellBrowser::InsertSubitems(HTREEITEM hParentItem, Entry* entry, IShellFolder* pParentFolder)
{
- HTREEITEM hchild, hnext;
CONTEXT("ShellBrowser::InsertSubitems()");
WaitCursor wait;
@@ -309,8 +308,11 @@
}
// remove old children items
- hnext = hchild = TreeView_GetChild(_left_hwnd, hParentItem);
- while((hchild=hnext) != NULL) {
+ HTREEITEM hchild, hnext;
+
+ hnext = TreeView_GetChild(_left_hwnd, hParentItem);
+
+ while((hchild=hnext) != 0) {
hnext = TreeView_GetNextSibling(_left_hwnd, hchild);
TreeView_DeleteItem(_left_hwnd, hchild);
}