Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-14 00:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Don't lookup DrawCaptionTempA/W by ordinal but rather by name

Browse source 
- Various minor fixes

svn path=/trunk/; revision=33914
This commit is contained in:
Thomas Bluemel 2008-06-10 02:58:13 +00:00
parent f1d9b70f81
commit 561efe278f
4 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/base/shell/explorer-new/precomp.h
View file

@ -26,7 +26,13 @@
/* dynamic imports due to lack of support in msvc linker libs */
typedef INT (STDCALL *REGSHELLHOOK)(HWND, DWORD);
#ifdef UNICODE
#define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempW"
typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCWSTR, UINT);
#else
#define PROC_NAME_DRAWCAPTIONTEMP "DrawCaptionTempA"
typedef BOOL (STDCALL *DRAWCAPTEMP)(HWND, HDC, const RECT*, HFONT, HICON, LPCSTR, UINT);
#endif
typedef HRESULT (STDCALL *SHINVDEFCMD)(HWND, IShellFolder*, LPCITEMIDLIST);
static ULONG __inline

27
reactos/base/shell/explorer-new/taskswnd.c
View file

@ -26,7 +26,7 @@
/* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every
5 seconds */
#define DUMP_TASKS 1
#define DUMP_TASKS 0
static const TCHAR szTaskSwitchWndClass[] = TEXT("MSTaskSwWClass");
static const TCHAR szRunningApps[] = TEXT("Running Applications");
@ -1169,19 +1169,25 @@ TaskSwitchWnd_RedrawTask(IN OUT PTASK_SWITCH_WND This,
static INT
TaskSwitchWnd_UpdateTbButtonSpacing(IN OUT PTASK_SWITCH_WND This,
IN BOOL bHorizontal,
IN UINT uiRows,
IN UINT uiBtnsPerLine)
{
TBMETRICS tbm;
tbm.cbSize = sizeof(tbm);
tbm.dwMask = TBMF_BUTTONSPACING;
tbm.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING;
tbm.cxBarPad = tbm.cyBarPad = 0;
if (bHorizontal || uiBtnsPerLine > 1)
tbm.cxButtonSpacing = (3 * GetSystemMetrics(SM_CXEDGE) / 2);
else
tbm.cxButtonSpacing = 0;
tbm.cyButtonSpacing = (3 * GetSystemMetrics(SM_CYEDGE) / 2);
if (!bHorizontal || uiRows > 1)
tbm.cyButtonSpacing = (3 * GetSystemMetrics(SM_CYEDGE) / 2);
else
tbm.cyButtonSpacing = 0;
SendMessage(This->hWndToolbar,
TB_SETMETRICS,
@ -1209,8 +1215,9 @@ TaskSwitchWnd_UpdateButtonsSize(IN OUT PTASK_SWITCH_WND This,
{
if (This->ToolbarBtnCount > 0)
{
ZeroMemory (&tbm, sizeof (tbm));
tbm.cbSize = sizeof(tbm);
tbm.dwMask = TBMF_PAD | TBMF_BUTTONSPACING;
tbm.dwMask = TBMF_BUTTONSPACING;
SendMessage(This->hWndToolbar,
TB_GETMETRICS,
0,
@ -1230,6 +1237,7 @@ TaskSwitchWnd_UpdateButtonsSize(IN OUT PTASK_SWITCH_WND This,
/* We might need to update the button spacing */
tbm.cxButtonSpacing = TaskSwitchWnd_UpdateTbButtonSpacing(This,
Horizontal,
uiRows,
uiBtnsPerLine);
/* Calculate the ideal width and make sure it's within the allowed range */
@ -1410,7 +1418,7 @@ TaskSwitchWnd_Create(IN OUT PTASK_SWITCH_WND This)
BtnSize.cy));
/* We don't want to see partially clipped buttons...not that we could see them... */
#if 1
#if 0
SendMessage(This->hWndToolbar,
TB_SETEXTENDEDSTYLE,
0,
@ -1420,6 +1428,7 @@ TaskSwitchWnd_Create(IN OUT PTASK_SWITCH_WND This)
/* Set proper spacing between buttons */
TaskSwitchWnd_UpdateTbButtonSpacing(This,
ITrayWindow_IsHorizontal(This->Tray),
0,
0);
/* Register the shell hook */
@ -1899,6 +1908,7 @@ TaskSwitchWndProc(IN HWND hwnd,
/* Update the button spacing */
TaskSwitchWnd_UpdateTbButtonSpacing(This,
ITrayWindow_IsHorizontal(This->Tray),
0,
0);
break;
}
@ -2026,6 +2036,13 @@ ForwardContextMenuMsg:
break;
}
}
else
{
Ret = DefWindowProc(hwnd,
uMsg,
wParam,
lParam);
}
return Ret;
}

3
reactos/base/shell/explorer-new/tbsite.c
View file

@ -332,7 +332,8 @@ ITrayBandSiteImpl_ProcessMessage(IN OUT ITrayBandSite *iface,
{
LPNMMOUSE nmm = (LPNMMOUSE)lParam;
if (nmm->dwHitInfo == RBHT_CLIENT || nmm->dwItemSpec == (DWORD_PTR)-1)
if (nmm->dwHitInfo == RBHT_CLIENT || nmm->dwHitInfo == RBHT_NOWHERE ||
nmm->dwItemSpec == (DWORD_PTR)-1)
{
/* Make the rebar control appear transparent so the user
can drag the tray window */

13
reactos/base/shell/explorer-new/traywnd.c
View file

@ -1294,17 +1294,14 @@ ITrayWindowImpl_CreateStartButtonBitmap(IN OUT ITrayWindowImpl *This)
if (hIconStart != NULL)
Flags |= DC_ICON;
hUser32 = LoadLibrary(TEXT("USER32.DLL"));
hUser32 = GetModuleHandle(TEXT("USER32.DLL"));
if (hUser32 != NULL)
{
DRAWCAPTEMP DrawCapTemp;
LONG ord = 187;
#ifndef UNICODE
ord = 186;
#endif
/* DrawCaptionTemp */
DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32,
(LPCSTR)ord);
PROC_NAME_DRAWCAPTIONTEMP);
if (DrawCapTemp != NULL)
{
Ret = DrawCapTemp(NULL,
@ -1315,8 +1312,6 @@ ITrayWindowImpl_CreateStartButtonBitmap(IN OUT ITrayWindowImpl *This)
szStartCaption,
Flags);
}
FreeLibrary(hUser32);
}
SelectObject(hDC,
@ -1761,7 +1756,7 @@ ITrayWindowImpl_Lock(IN OUT ITrayWindow *iface,
bLock)))
{
/* Reset?? */
This->Locked = bLock;
This->Locked = bPrevLock;
}
}
}