ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-29 04:13:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[EXPLORER]

Browse Source 
Fix x64 build

svn path=/trunk/; revision=60148
This commit is contained in:
Timo Kreuzer
2013-09-15 18:39:50 +00:00
parent 8e06e32a8f
commit 79a6e21446
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/shell/explorer/CMakeLists.txt
+5 -1
View File
@@ -26,7 +26,6 @@ list(APPEND SOURCE
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 @@ list(APPEND SOURCE
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)
reactos/base/shell/explorer/explorer.cpp
+3 -5
View File
@@ -1186,19 +1186,17 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
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);
reactos/base/shell/explorer/taskbar/taskbar.cpp
+11 -11
View File
@@ -328,13 +328,13 @@ HICON get_window_icon_small(HWND hwnd)
{
HICON hIcon = 0;
SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 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, (LPDWORD)&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, (LPDWORD)&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 get_window_icon_small(HWND hwnd)
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 get_window_icon_big(HWND hwnd, bool allow_from_class)
{
HICON hIcon = 0;
SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 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, (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, (LPDWORD)&hIcon);
SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon);
if (allow_from_class) {
if (!hIcon)
@@ -369,7 +369,7 @@ HICON get_window_icon_big(HWND hwnd, bool allow_from_class)
}
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 @@ void TaskBar::Refresh()
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 @@ void TaskBar::Refresh()
--entry._btn_idx;
#if 0
--entry._bmp_idx;
TBBUTTONINFO info;
info.cbSize = sizeof(TBBUTTONINFO);
@@ -540,7 +540,7 @@ void TaskBar::Refresh()
#endif
}
}
}
for(set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end(); ++it) {