Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 07:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync with trunk r63637.

Browse source 
svn path=/branches/shell-experiments/; revision=63640
This commit is contained in:
David Quintana 2014-06-23 23:28:38 +00:00
commit 73d72624b0
410 changed files with 4745 additions and 12328 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/shell/explorer/explorer.cpp
View file

@ -1203,6 +1203,12 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
"ROS Explorer - command line options", MB_OK);
}
/*
* Set our shutdown parameters: we want to shutdown the very last,
* but before any TaskMgr instance (which has a shutdown level of 1).
*/
SetProcessShutdownParameters(2, 0);
Thread* pSSOThread = NULL;
if (startup_desktop) {

14
base/shell/explorer/shell/mainframe.cpp
View file

@ -332,15 +332,8 @@ bool MainFrameBase::ProcessMessage(UINT nmsg, WPARAM wparam, LPARAM lparam, LRES
break;
case WM_SIZE: {
#ifdef __REACTOS__ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed
int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0);
MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE);
#else
resize_frame(LOWORD(lparam), HIWORD(lparam));
SendMessage(_hwndrebar, WM_SIZE, 0, 0);
#endif
resize_frame(LOWORD(lparam), HIWORD(lparam));
SendMessage(_hwndrebar, WM_SIZE, 0, 0);
break;} // do not pass message to DefFrameProc
case WM_GETMINMAXINFO: {
@ -769,13 +762,12 @@ MDIMainFrame::MDIMainFrame(HWND hwnd)
extraBtns.iBitmap = 8;
SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns);
}
#ifndef __REACTOS__ // don't insert reg button for ROS. Regedit should be used.
// insert Registry button
extraBtns.iString = SendMessage(_hextrabar, TB_ADDSTRING, 0, (LPARAM)TEXT("Reg.\0"));
extraBtns.idCommand = ID_DRIVE_REGISTRY;
extraBtns.iBitmap = 9;
SendMessage(_hextrabar, TB_INSERTBUTTON, INT_MAX, (LPARAM)&extraBtns);
#endif
#ifdef _DEBUG
// insert FAT direct file system access button

2
base/shell/explorer/shell/shellfs.cpp
View file

@ -40,7 +40,7 @@ bool ShellDirectory::fill_w32fdata_shell(LPCITEMIDLIST pidl, SFGAOF attribs, WIN
IDataObject* pDataObj;
STGMEDIUM medium = {0, {0}, 0};
FORMATETC fmt = {g_Globals._cfStrFName, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
FORMATETC fmt = {(USHORT)g_Globals._cfStrFName, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
HRESULT hr = _folder->GetUIObjectOf(0, 1, &pidl, IID_IDataObject, 0, (LPVOID*)&pDataObj);

4
base/shell/explorer/taskbar/quicklaunch.cpp
View file

@ -184,7 +184,7 @@ void QuickLaunchBar::AddButton(int id, HBITMAP hbmp, LPCTSTR name, Entry* entry,
_entries[id] = qle;
TBBUTTON btn = {0, 0, flags, BTNS_BUTTON|BTNS_NOPREFIX, {0, 0}, 0, 0};
TBBUTTON btn = {0, 0, (BYTE)flags, BTNS_BUTTON|BTNS_NOPREFIX, {0, 0}, 0, 0};
btn.idCommand = id;
btn.iBitmap = bmp_idx;
@ -195,7 +195,7 @@ void QuickLaunchBar::AddButton(int id, HBITMAP hbmp, LPCTSTR name, Entry* entry,
void QuickLaunchBar::UpdateDesktopButtons(int desktop_idx)
{
for(int i=0; i<DESKTOP_COUNT; ++i) {
TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, desktop_idx==i? TBSTATE_ENABLED|TBSTATE_PRESSED: TBSTATE_ENABLED};
TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0, (BYTE)(desktop_idx==i? TBSTATE_ENABLED|TBSTATE_PRESSED: TBSTATE_ENABLED)};
SendMessage(_hwnd, TB_SETBUTTONINFO, ID_SWITCH_DESKTOP_1+i, (LPARAM)&tbi);
}