[ros-diffs] [tkreuzer] 60148: [EXPLORER] Fix x64 build

Author: tkreuzer
Date: Sun Sep 15 18:39:50 2013
New Revision: 60148

URL: http://svn.reactos.org/svn/reactos?rev=60148&view=rev
Log:
[EXPLORER]
Fix x64 build

Modified:
    trunk/reactos/base/shell/explorer/CMakeLists.txt
    trunk/reactos/base/shell/explorer/explorer.cpp
    trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp

Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL…
==============================================================================
--- trunk/reactos/base/shell/explorer/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/CMakeLists.txt	[iso-8859-1] Sun Sep 15 18:39:50
2013
@@ -26,7 +26,6 @@
     shell/winfs.cpp
     dialogs/searchprogram.cpp
     dialogs/settings.cpp
-    i386-stub-win32.c
     taskbar/taskbar.cpp
     taskbar/favorites.cpp
     taskbar/quicklaunch.cpp
@@ -47,6 +46,11 @@
     utility/window.cpp
     utility/shellbrowserimpl.cpp) #    utility/shelltests.cpp
 
+if(ARCH MATCHES i386)
+    list(APPEND SOURCE
+        i386-stub-win32.c)
+endif()
+
 add_executable(explorer ${SOURCE})
 target_link_libraries(explorer comsupp wine uuid)
 set_module_type(explorer win32gui UNICODE)

Modified: trunk/reactos/base/shell/explorer/explorer.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/explorer.cpp	[iso-8859-1] Sun Sep 15 18:39:50 2013
@@ -1186,19 +1186,17 @@
 
     if (_tcsstr(ext_options,TEXT("-break"))) {
         LOG(TEXT("debugger breakpoint"));
-#ifdef _MSC_VER
-        __asm int 3
-#else
-        asm("int3");
-#endif
-    }
-
+        __debugbreak();
+    }
+
+#ifdef _M_IX86
     // activate GDB remote debugging stub if no other debugger is running
     if (use_gdb_stub) {
         LOG(TEXT("waiting for debugger connection...\n"));
 
         initialize_gdb_stub();
     }
+#endif
 
     g_Globals.init(hInstance);
 

Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba…
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp	[iso-8859-1] Sun Sep 15 18:39:50
2013
@@ -328,13 +328,13 @@
 {
 	HICON hIcon = 0;
 
-	SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000,
(LPDWORD)&hIcon);
-
-	if (!hIcon)
-		SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000,
(LPDWORD)&hIcon);
-
-	if (!hIcon)
-		SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000,
(LPDWORD)&hIcon);
+	SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR)&hIcon);
+
+	if (!hIcon)
+		SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR)&hIcon);
+
+	if (!hIcon)
+		SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR)&hIcon);
 
 	if (!hIcon)
 		hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM);
@@ -343,7 +343,7 @@
 		hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON);
 
 	if (!hIcon)
-		SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon);
+		SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon);
 
 	return hIcon;
 }
@@ -352,13 +352,13 @@
 {
 	HICON hIcon = 0;
 
-	SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000,
(LPDWORD)&hIcon);
-
-	if (!hIcon)
-		SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000,
(LPDWORD)&hIcon);
-
-	if (!hIcon)
-		SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000,
(LPDWORD)&hIcon);
+	SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR)&hIcon);
+
+	if (!hIcon)
+		SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR)&hIcon);
+
+	if (!hIcon)
+		SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000,
(PDWORD_PTR)&hIcon);
 
 	if (allow_from_class) {
 		if (!hIcon)
@@ -369,7 +369,7 @@
 	}
 
 	if (!hIcon)
-		SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon);
+		SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon);
 
 	return hIcon;
 }
@@ -519,7 +519,7 @@
 			if (!SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0))
 				MessageBoxW(NULL, L"failed to delete button", NULL, MB_OK);
 
-			
+
 			for(TaskBarMap::iterator it2=_map.begin(); it2!=_map.end(); ++it2) {
 				TaskBarEntry& entry = it2->second;
 
@@ -528,7 +528,7 @@
 					--entry._btn_idx;
 #if 0
 					--entry._bmp_idx;
-					
+
 					TBBUTTONINFO info;
 
 					info.cbSize = sizeof(TBBUTTONINFO);
@@ -540,7 +540,7 @@
 #endif
 				}
 			}
-			
+
 		}
 
 		for(set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end();
++it) {