From ffce6d13d016b5829013a2adc0f096c4f38ec281 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sun, 25 Jan 2004 11:55:59 +0000
Subject: [PATCH] fixed Doxygen Generation

svn path=/trunk/; revision=7873
---
 reactos/subsys/system/explorer/Doxyfile-all        |  3 ++-
 reactos/subsys/system/explorer/Makefile.MinGW      | 14 ++++++++++++++
 reactos/subsys/system/explorer/doxy-footer.html    |  2 +-
 reactos/subsys/system/explorer/taskbar/taskbar.cpp |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/system/explorer/Doxyfile-all b/reactos/subsys/system/explorer/Doxyfile-all
index b1d582fc713..a229763e4f4 100644
--- a/reactos/subsys/system/explorer/Doxyfile-all
+++ b/reactos/subsys/system/explorer/Doxyfile-all
@@ -115,7 +115,8 @@ TOC_EXPAND             = NO
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 240#---------------------------------------------------------------------------
+TREEVIEW_WIDTH         = 240
+#---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 GENERATE_LATEX         = NO
diff --git a/reactos/subsys/system/explorer/Makefile.MinGW b/reactos/subsys/system/explorer/Makefile.MinGW
index 2f13d6aeca3..be537ca952a 100644
--- a/reactos/subsys/system/explorer/Makefile.MinGW
+++ b/reactos/subsys/system/explorer/Makefile.MinGW
@@ -81,3 +81,17 @@ explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico
 clean:
 	rm -f $(TARGET) $(OBJECTS) $(PROGRAM)$(RES_SUFFIX)
 
+docu: doxy-footer.html
+	doxygen Doxyfile
+
+full-docu: docu
+	-cmd /c start /b /low /wait hhc doxy-doc\html\index.hhp
+	cmd /c move /y doxy-doc\html\index.chm ros-explorer.chm
+	doxygen Doxyfile-all
+	-cmd /c start /b /low /wait hhc doxy-doc\html\index.hhp
+	cmd /c move /y doxy-doc\html\index.chm ros-explorer-full.chm
+
+doxy-footer.html: ever
+	updatefooter
+
+ever:
diff --git a/reactos/subsys/system/explorer/doxy-footer.html b/reactos/subsys/system/explorer/doxy-footer.html
index 0a370768ed5..d2ff7f41d11 100644
--- a/reactos/subsys/system/explorer/doxy-footer.html
+++ b/reactos/subsys/system/explorer/doxy-footer.html
@@ -3,7 +3,7 @@
   <tr>
     <td><address style="align: right;"><small>
 ROS Explorer Source Code Documentation
-<br>generated on 17.01.2004 by <a href="http://www.doxygen.org/index.html">
+<br>generated on 25.01.2004 by <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border=0>
 	</small></address>
 	</td>
diff --git a/reactos/subsys/system/explorer/taskbar/taskbar.cpp b/reactos/subsys/system/explorer/taskbar/taskbar.cpp
index 7110966448d..0f8b3c7e64c 100644
--- a/reactos/subsys/system/explorer/taskbar/taskbar.cpp
+++ b/reactos/subsys/system/explorer/taskbar/taskbar.cpp
@@ -275,7 +275,7 @@ BOOL CALLBACK TaskBar::EnumWndProc(HWND hwnd, LPARAM lparam)
 				found->second._id = pThis->_next_id++;
 		} else {
 			HICON hIcon = get_window_icon(hwnd);
-			HBITMAP hbmp = create_bitmap_from_icon(hIcon, GetSysColorBrush(COLOR_BTNFACE), WindowCanvas(pThis->_htoolbar));
+			HBITMAP hbmp = hIcon? create_bitmap_from_icon(hIcon, GetSysColorBrush(COLOR_BTNFACE), WindowCanvas(pThis->_htoolbar)): 0;
 
 			TBADDBITMAP ab = {0, (UINT_PTR)hbmp};
 			int bmp_idx = SendMessage(pThis->_htoolbar, TB_ADDBITMAP, 1, (LPARAM)&ab);