[ros-diffs] [mf] 13434: prevent crash related to unsupported context menu types

[mf at svn.reactos.com]

prevent crash related to unsupported context menu types
Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp
  _____  

Modified: trunk/reactos/subsys/system/explorer/shell/pane.cpp
--- trunk/reactos/subsys/system/explorer/shell/pane.cpp	2005-02-06
10:38:51 UTC (rev 13433)
+++ trunk/reactos/subsys/system/explorer/shell/pane.cpp	2005-02-06
10:50:50 UTC (rev 13434)
@@ -491,9 +491,9 @@

 	 // output type/class name
 	if (visible_cols & COL_TYPE) {
 		if (calcWidthCol == -1)
-			_out_wrkr.output_text(dis, _positions, col,
entry->_type_name? entry->_type_name: TEXT(""), 0);
+			_out_wrkr.output_text(dis, _positions, col,
entry->_type_name&&entry->_type_name!=LPSTR_TEXTCALLBACK?
entry->_type_name: TEXT(""), 0);
 		else if (calcWidthCol==col || calcWidthCol==COLUMNS)
-			calc_width(dis, col, entry->_type_name?
entry->_type_name: TEXT(""));
+			calc_width(dis, col,
entry->_type_name&&entry->_type_name!=LPSTR_TEXTCALLBACK?
entry->_type_name: TEXT(""));
 	}
 	++col;
 
@@ -623,9 +623,9 @@
 	 // output content / symbolic link target / comment
 	if (visible_cols & COL_CONTENT) {
 		if (calcWidthCol == -1)
-			_out_wrkr.output_text(dis, _positions, col,
entry->_content? entry->_content: TEXT(""), 0);
+			_out_wrkr.output_text(dis, _positions, col,
entry->_content&&entry->_content!=LPSTR_TEXTCALLBACK? entry->_content:
TEXT(""), 0);
 		else if (calcWidthCol==col || calcWidthCol==COLUMNS)
-			calc_width(dis, col, entry->_content?
entry->_content: TEXT(""));
+			calc_width(dis, col,
entry->_content&&entry->_content!=LPSTR_TEXTCALLBACK? entry->_content:
TEXT(""));
 	}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050206/4e6862c6/attachment.html