Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 01:40:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/reactos/reactos

Browse source
This commit is contained in:
Alex Ionescu 2018-02-04 09:34:27 -08:00
commit 1683934cd8
14 changed files with 1073 additions and 473 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
base/setup/usetup/CMakeLists.txt
View file

@ -40,7 +40,7 @@ if(USE_CLANG_CL)
add_target_compile_flags(usetup "-Wno-invalid-source-encoding") add_target_compile_flags(usetup "-Wno-invalid-source-encoding")
endif() endif()
target_link_libraries(usetup zlib inflib ext2lib vfatlib) target_link_libraries(usetup zlib_solo inflib ext2lib vfatlib)
set_module_type(usetup nativecui) set_module_type(usetup nativecui)
add_importlibs(usetup ntdll) add_importlibs(usetup ntdll)
add_pch(usetup usetup.h SOURCE) add_pch(usetup usetup.h SOURCE)

1
base/setup/usetup/cabinet.c
View file

@ -10,6 +10,7 @@
#include "usetup.h" #include "usetup.h"
#define Z_SOLO
#include <zlib.h> #include <zlib.h>
#define NDEBUG #define NDEBUG

57
base/shell/explorer/syspager.cpp
View file

@ -21,14 +21,6 @@
#include "precomp.h" #include "precomp.h"
// Data comes from shell32/systray.cpp -> TrayNotifyCDS_Dummy
typedef struct _SYS_PAGER_COPY_DATA
{
DWORD cookie;
DWORD notify_code;
NOTIFYICONDATA nicon_data;
} SYS_PAGER_COPY_DATA, *PSYS_PAGER_COPY_DATA;
struct InternalIconData : NOTIFYICONDATA struct InternalIconData : NOTIFYICONDATA
{ {
// Must keep a separate copy since the original is unioned with uTimeout. // Must keep a separate copy since the original is unioned with uTimeout.
@ -107,8 +99,8 @@ private:
Info(InternalIconData * source) Info(InternalIconData * source)
{ {
pSource = source; pSource = source;
StrNCpy(szInfo, source->szInfo, _countof(szInfo)); StringCchCopy(szInfo, _countof(szInfo), source->szInfo);
StrNCpy(szInfoTitle, source->szInfoTitle, _countof(szInfoTitle)); StringCchCopy(szInfoTitle, _countof(szInfoTitle), source->szInfoTitle);
uIcon = source->dwInfoFlags & NIIF_ICON_MASK; uIcon = source->dwInfoFlags & NIIF_ICON_MASK;
if (source->dwInfoFlags == NIIF_USER) if (source->dwInfoFlags == NIIF_USER)
uIcon = reinterpret_cast<WPARAM>(source->hIcon); uIcon = reinterpret_cast<WPARAM>(source->hIcon);
@ -236,7 +228,7 @@ public:
COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
END_COM_MAP() END_COM_MAP()
BOOL NotifyIcon(DWORD notify_code, _In_ CONST NOTIFYICONDATA *iconData); BOOL NotifyIcon(DWORD dwMessage, _In_ CONST NOTIFYICONDATA *iconData);
void GetSize(IN BOOL IsHorizontal, IN PSIZE size); void GetSize(IN BOOL IsHorizontal, IN PSIZE size);
DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE)
@ -454,22 +446,18 @@ UINT WINAPI CIconWatcher::WatcherThread(_In_opt_ LPVOID lpParam)
TRACE("Pid %lu owns a notification icon and has stopped without deleting it. We'll cleanup on its behalf", Icon->ProcessId); TRACE("Pid %lu owns a notification icon and has stopped without deleting it. We'll cleanup on its behalf", Icon->ProcessId);
int len = FIELD_OFFSET(SYS_PAGER_COPY_DATA, nicon_data) + Icon->IconData.cbSize; TRAYNOTIFYDATAW tnid = {0};
PSYS_PAGER_COPY_DATA pnotify_data = (PSYS_PAGER_COPY_DATA)new BYTE[len]; tnid.dwSignature = NI_NOTIFY_SIG;
pnotify_data->cookie = 1; tnid.dwMessage = NIM_DELETE;
pnotify_data->notify_code = NIM_DELETE; CopyMemory(&tnid.nid, &Icon->IconData, Icon->IconData.cbSize);
memcpy(&pnotify_data->nicon_data, &Icon->IconData, Icon->IconData.cbSize);
COPYDATASTRUCT data; COPYDATASTRUCT data;
data.dwData = 1; data.dwData = 1;
data.cbData = len; data.cbData = sizeof(tnid);
data.lpData = pnotify_data; data.lpData = &tnid;
BOOL Success = FALSE;
::SendMessage(This->m_hwndSysTray, WM_COPYDATA, (WPARAM)&Icon->IconData, (LPARAM)&data);
delete pnotify_data;
BOOL Success = ::SendMessage(This->m_hwndSysTray, WM_COPYDATA,
(WPARAM)&Icon->IconData, (LPARAM)&data);
if (!Success) if (!Success)
{ {
// If we failed to handle the delete message, forcibly remove it // If we failed to handle the delete message, forcibly remove it
@ -775,8 +763,8 @@ BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData)
if (iconData->uFlags & NIF_INFO) if (iconData->uFlags & NIF_INFO)
{ {
// NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always.
StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo);
StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle);
notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->dwInfoFlags = iconData->dwInfoFlags;
notifyItem->uTimeout = iconData->uTimeout; notifyItem->uTimeout = iconData->uTimeout;
} }
@ -913,8 +901,8 @@ BOOL CNotifyToolbar::UpdateButton(_In_ CONST NOTIFYICONDATA *iconData)
if (iconData->uFlags & NIF_INFO) if (iconData->uFlags & NIF_INFO)
{ {
// NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always. // NOTE: In Vista+, the uTimeout value is disregarded, and the accessibility settings are used always.
StrNCpy(notifyItem->szInfo, iconData->szInfo, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfo, _countof(notifyItem->szInfo), iconData->szInfo);
StrNCpy(notifyItem->szInfoTitle, iconData->szInfoTitle, _countof(notifyItem->szInfo)); StringCchCopy(notifyItem->szInfoTitle, _countof(notifyItem->szInfoTitle), iconData->szInfoTitle);
notifyItem->dwInfoFlags = iconData->dwInfoFlags; notifyItem->dwInfoFlags = iconData->dwInfoFlags;
notifyItem->uTimeout = iconData->uTimeout; notifyItem->uTimeout = iconData->uTimeout;
} }
@ -1263,14 +1251,14 @@ LRESULT CSysPagerWnd::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b
return TRUE; return TRUE;
} }
BOOL CSysPagerWnd::NotifyIcon(DWORD notify_code, _In_ CONST NOTIFYICONDATA *iconData) BOOL CSysPagerWnd::NotifyIcon(DWORD dwMessage, _In_ CONST NOTIFYICONDATA *iconData)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
int VisibleButtonCount = Toolbar.GetVisibleButtonCount(); int VisibleButtonCount = Toolbar.GetVisibleButtonCount();
TRACE("NotifyIcon received. Code=%d\n", notify_code); TRACE("NotifyIcon received. Code=%d\n", dwMessage);
switch (notify_code) switch (dwMessage)
{ {
case NIM_ADD: case NIM_ADD:
ret = Toolbar.AddButton(iconData); ret = Toolbar.AddButton(iconData);
@ -1295,7 +1283,7 @@ BOOL CSysPagerWnd::NotifyIcon(DWORD notify_code, _In_ CONST NOTIFYICONDATA *icon
case NIM_SETVERSION: case NIM_SETVERSION:
ret = Toolbar.SwitchVersion(iconData); ret = Toolbar.SwitchVersion(iconData);
default: default:
TRACE("NotifyIcon received with unknown code %d.\n", notify_code); TRACE("NotifyIcon received with unknown code %d.\n", dwMessage);
return FALSE; return FALSE;
} }
@ -1420,9 +1408,12 @@ LRESULT CSysPagerWnd::OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam;
if (cpData->dwData == 1) if (cpData->dwData == 1)
{ {
PSYS_PAGER_COPY_DATA pData = (PSYS_PAGER_COPY_DATA)cpData->lpData; /* A taskbar NotifyIcon notification */
return NotifyIcon(pData->notify_code, &pData->nicon_data); PTRAYNOTIFYDATAW pData = (PTRAYNOTIFYDATAW)cpData->lpData;
if (pData->dwSignature == NI_NOTIFY_SIG)
return NotifyIcon(pData->dwMessage, &pData->nid);
} }
// TODO: Handle other types of taskbar notifications
return FALSE; return FALSE;
} }

2
boot/environ/app/rosload/rosload.c
View file

@ -344,7 +344,7 @@ ArchRestoreProcessorFeatures (
if (ArchXCr0BitsToClear) if (ArchXCr0BitsToClear)
{ {
/* Clear them */ /* Clear them */
#ifdef _MSC_VER #if defined(_MSC_VER) && !defined(__clang__)
__xsetbv(0, __xgetbv(0) & ~ArchXCr0BitsToClear); __xsetbv(0, __xgetbv(0) & ~ArchXCr0BitsToClear);
#endif #endif
ArchXCr0BitsToClear = 0; ArchXCr0BitsToClear = 0;

1
dll/3rdparty/mbedtls/CMakeLists.txt vendored
View file

@ -84,7 +84,6 @@ add_library(mbedtls SHARED
${CMAKE_CURRENT_BINARY_DIR}/mbedtls.def) ${CMAKE_CURRENT_BINARY_DIR}/mbedtls.def)
set_module_type(mbedtls win32dll) set_module_type(mbedtls win32dll)
target_link_libraries(mbedtls zlib)
add_importlibs(mbedtls advapi32 msvcrt kernel32 ntdll) add_importlibs(mbedtls advapi32 msvcrt kernel32 ntdll)
# to use `_vsnprintf_s` looks like we have to define MINGW_HAS_SECURE_API # to use `_vsnprintf_s` looks like we have to define MINGW_HAS_SECURE_API

4
dll/shellext/netshell/lanstatusui.cpp
View file

@ -232,7 +232,7 @@ UpdateLanStatus(HWND hwndDlg, LANSTATUSUI_CONTEXT * pContext)
nid.cbSize = sizeof(nid); nid.cbSize = sizeof(nid);
nid.uID = pContext->uID; nid.uID = pContext->uID;
nid.hWnd = pContext->hwndStatusDlg; nid.hWnd = pContext->hwndStatusDlg;
nid.uVersion = 3; nid.uVersion = NOTIFYICON_VERSION;
if (pContext->pNet->GetProperties(&pProperties) == S_OK) if (pContext->pNet->GetProperties(&pProperties) == S_OK)
{ {
@ -1041,7 +1041,7 @@ CLanStatus::InitializeNetTaskbarNotifications()
nid.cbSize = sizeof(nid); nid.cbSize = sizeof(nid);
nid.uID = Index++; nid.uID = Index++;
nid.uFlags = NIF_MESSAGE; nid.uFlags = NIF_MESSAGE;
nid.uVersion = 3; nid.uVersion = NOTIFYICON_VERSION;
nid.uCallbackMessage = WM_SHOWSTATUSDLG; nid.uCallbackMessage = WM_SHOWSTATUSDLG;
nid.hWnd = hwndDlg; nid.hWnd = hwndDlg;

2
dll/shellext/stobject/csystray.cpp
View file

@ -125,7 +125,7 @@ HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWO
TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip); TRACE("NotifyIcon code=%d, uId=%d, hIcon=%p, szTip=%S\n", code, uId, hIcon, szTip);
nim.cbSize = sizeof(NOTIFYICONDATA); nim.cbSize = sizeof(nim);
nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP; nim.uFlags = NIF_MESSAGE | NIF_ICON | NIF_STATE | NIF_TIP;
nim.hIcon = hIcon; nim.hIcon = hIcon;
nim.uID = uId; nim.uID = uId;

3
dll/shellext/stobject/hotplug.cpp
View file

@ -101,7 +101,8 @@ HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList)
HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG) HRESULT NotifyBalloon(CSysTray* pSysTray, LPCWSTR szTitle = NULL, LPCWSTR szInfo = NULL, UINT uId = ID_ICON_HOTPLUG)
{ {
NOTIFYICONDATA nim = { 0 }; NOTIFYICONDATA nim = { 0 };
nim.cbSize = sizeof(NOTIFYICONDATA);
nim.cbSize = sizeof(nim);
nim.uID = uId; nim.uID = uId;
nim.hWnd = pSysTray->GetHWnd(); nim.hWnd = pSysTray->GetHWnd();

1
dll/win32/browseui/browseui.rc
View file

@ -22,6 +22,7 @@
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <shlobj.h> #include <shlobj.h>
#undef DECLSPEC_IMPORT
#include "resource.h" #include "resource.h"

1201
dll/win32/setupapi/cfgmgr.c
View file

File diff suppressed because it is too large Load diff

5
dll/win32/shell32/precomp.h
View file

@ -17,6 +17,7 @@
#include <wincon.h> #include <wincon.h>
#include <commdlg.h> #include <commdlg.h>
#include <ddeml.h> #include <ddeml.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <shlobj.h> #include <shlobj.h>
#include <shobjidl.h> #include <shobjidl.h>
@ -36,7 +37,11 @@
#include <shlguid_undoc.h> #include <shlguid_undoc.h>
#include <shlobj_undoc.h> #include <shlobj_undoc.h>
#include <shlwapi_undoc.h> #include <shlwapi_undoc.h>
#include <shellapi.h>
#undef ShellExecute
#include <undocshell.h> #include <undocshell.h>
#include <browseui_undoc.h> #include <browseui_undoc.h>
#include <shellutils.h> #include <shellutils.h>

221
dll/win32/shell32/systray.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Copyright 2004 Martin Fuchs * Copyright 2004 Martin Fuchs
* Copyright 2018 Hermes Belusca-Maito
* *
* Pass on icon notification messages to the systray implementation * Pass on icon notification messages to the systray implementation
* in the currently running shell. * in the currently running shell.
@ -23,91 +24,101 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* copy data structure for tray notifications */
typedef struct TrayNotifyCDS_Dummy {
DWORD cookie;
DWORD notify_code;
DWORD nicon_data[1]; // placeholder for NOTIFYICONDATA structure
} TrayNotifyCDS_Dummy;
/* The only difference between Shell_NotifyIconA and Shell_NotifyIconW is the call to SendMessageA/W. */
static BOOL SHELL_NotifyIcon(DWORD dwMessage, void* pnid, HWND nid_hwnd, DWORD nid_size, BOOL unicode)
{
HWND hwnd;
COPYDATASTRUCT data;
BOOL ret = FALSE;
int len = FIELD_OFFSET(TrayNotifyCDS_Dummy, nicon_data) + nid_size;
TrayNotifyCDS_Dummy* pnotify_data = (TrayNotifyCDS_Dummy*) alloca(len);
pnotify_data->cookie = 1;
pnotify_data->notify_code = dwMessage;
memcpy(&pnotify_data->nicon_data, pnid, nid_size);
data.dwData = 1;
data.cbData = len;
data.lpData = pnotify_data;
for(hwnd = 0; (hwnd = FindWindowExW(0, hwnd, L"Shell_TrayWnd", NULL)); )
if ((unicode ? SendMessageW : SendMessageA)(hwnd, WM_COPYDATA, (WPARAM)nid_hwnd, (LPARAM)&data))
ret = TRUE;
return ret;
}
/************************************************************************* /*************************************************************************
* Shell_NotifyIcon [SHELL32.296] * Shell_NotifyIcon [SHELL32.296]
* Shell_NotifyIconA [SHELL32.297] * Shell_NotifyIconA [SHELL32.297]
*/ */
BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid)
{ {
NOTIFYICONDATAW nidW; NOTIFYICONDATAW nidW;
DWORD cbSize; DWORD cbSize, dwValidFlags;
/* Validate the cbSize as Windows XP does */
if (pnid->cbSize != NOTIFYICONDATAA_V1_SIZE &&
pnid->cbSize != NOTIFYICONDATAA_V2_SIZE &&
pnid->cbSize != sizeof(NOTIFYICONDATAA))
{
WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n",
pnid->cbSize, NOTIFYICONDATAA_V1_SIZE);
cbSize = NOTIFYICONDATAA_V1_SIZE;
}
else
cbSize = pnid->cbSize;
/* Initialize and capture the basic data fields */
ZeroMemory(&nidW, sizeof(nidW)); ZeroMemory(&nidW, sizeof(nidW));
nidW.cbSize = sizeof(nidW); nidW.cbSize = sizeof(nidW); // Use a default size for the moment
nidW.hWnd = pnid->hWnd; nidW.hWnd = pnid->hWnd;
nidW.uID = pnid->uID; nidW.uID = pnid->uID;
nidW.uFlags = pnid->uFlags; nidW.uFlags = pnid->uFlags;
nidW.uCallbackMessage = pnid->uCallbackMessage; nidW.uCallbackMessage = pnid->uCallbackMessage;
nidW.hIcon = pnid->hIcon; nidW.hIcon = pnid->hIcon;
/* szTip */ /* Validate the structure size and the flags */
if (pnid->uFlags & NIF_TIP) cbSize = pnid->cbSize;
MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, _countof(nidW.szTip)); dwValidFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
if (cbSize == sizeof(NOTIFYICONDATAA))
{
nidW.cbSize = sizeof(nidW);
dwValidFlags |= NIF_STATE | NIF_INFO | NIF_GUID /* | NIF_REALTIME | NIF_SHOWTIP */;
}
else if (cbSize == NOTIFYICONDATAA_V3_SIZE)
{
nidW.cbSize = NOTIFYICONDATAW_V3_SIZE;
dwValidFlags |= NIF_STATE | NIF_INFO | NIF_GUID;
}
else if (cbSize == NOTIFYICONDATAA_V2_SIZE)
{
nidW.cbSize = NOTIFYICONDATAW_V2_SIZE;
dwValidFlags |= NIF_STATE | NIF_INFO;
}
else // if cbSize == NOTIFYICONDATAA_V1_SIZE or something else
{
if (cbSize != NOTIFYICONDATAA_V1_SIZE)
{
WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n",
cbSize, NOTIFYICONDATAA_V1_SIZE);
cbSize = NOTIFYICONDATAA_V1_SIZE;
}
nidW.cbSize = NOTIFYICONDATAW_V1_SIZE;
}
nidW.uFlags &= dwValidFlags;
/* Capture the other data fields */
if (nidW.uFlags & NIF_TIP)
{
/*
* Depending on the size of the NOTIFYICONDATA structure
* we should convert part of, or all the szTip string.
*/
if (cbSize <= NOTIFYICONDATAA_V1_SIZE)
{
#define NIDV1_TIP_SIZE_A (NOTIFYICONDATAA_V1_SIZE - FIELD_OFFSET(NOTIFYICONDATAA, szTip))/sizeof(CHAR)
MultiByteToWideChar(CP_ACP, 0, pnid->szTip, NIDV1_TIP_SIZE_A,
nidW.szTip, _countof(nidW.szTip));
/* Truncate the string */
nidW.szTip[NIDV1_TIP_SIZE_A - 1] = 0;
#undef NIDV1_TIP_SIZE_A
}
else
{
MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1,
nidW.szTip, _countof(nidW.szTip));
}
}
if (cbSize >= NOTIFYICONDATAA_V2_SIZE) if (cbSize >= NOTIFYICONDATAA_V2_SIZE)
{ {
nidW.dwState = pnid->dwState; nidW.dwState = pnid->dwState;
nidW.dwStateMask = pnid->dwStateMask; nidW.dwStateMask = pnid->dwStateMask;
nidW.uTimeout = pnid->uTimeout;
/* szInfo, szInfoTitle */
if (pnid->uFlags & NIF_INFO)
{
MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, _countof(nidW.szInfo));
MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, _countof(nidW.szInfoTitle));
}
nidW.uTimeout = pnid->uTimeout;
nidW.dwInfoFlags = pnid->dwInfoFlags; nidW.dwInfoFlags = pnid->dwInfoFlags;
if (nidW.uFlags & NIF_INFO)
{
MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1,
nidW.szInfo, _countof(nidW.szInfo));
MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1,
nidW.szInfoTitle, _countof(nidW.szInfoTitle));
}
} }
if ((cbSize >= NOTIFYICONDATAA_V3_SIZE) && (nidW.uFlags & NIF_GUID))
nidW.guidItem = pnid->guidItem;
if (cbSize >= sizeof(NOTIFYICONDATAA)) if (cbSize >= sizeof(NOTIFYICONDATAA))
nidW.hBalloonIcon = pnid->hBalloonIcon; nidW.hBalloonIcon = pnid->hBalloonIcon;
/* Call the unicode function */
return Shell_NotifyIconW(dwMessage, &nidW); return Shell_NotifyIconW(dwMessage, &nidW);
} }
@ -116,19 +127,81 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid)
*/ */
BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid) BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW pnid)
{ {
DWORD cbSize; BOOL ret = FALSE;
HWND hShellTrayWnd;
DWORD cbSize, dwValidFlags;
TRAYNOTIFYDATAW tnid;
COPYDATASTRUCT data;
/* Validate the cbSize so that WM_COPYDATA doesn't crash the application */ /* Find a handle to the shell tray window */
if (pnid->cbSize != NOTIFYICONDATAW_V1_SIZE && hShellTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL);
pnid->cbSize != NOTIFYICONDATAW_V2_SIZE && if (!hShellTrayWnd)
pnid->cbSize != sizeof(NOTIFYICONDATAW)) return FALSE; // None found, bail out
/* Validate the structure size and the flags */
cbSize = pnid->cbSize;
dwValidFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
if (cbSize == sizeof(NOTIFYICONDATAW))
{ {
WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", dwValidFlags |= NIF_STATE | NIF_INFO | NIF_GUID /* | NIF_REALTIME | NIF_SHOWTIP */;
pnid->cbSize, NOTIFYICONDATAW_V1_SIZE); }
cbSize = NOTIFYICONDATAA_V1_SIZE; else if (cbSize == NOTIFYICONDATAW_V3_SIZE)
{
dwValidFlags |= NIF_STATE | NIF_INFO | NIF_GUID;
}
else if (cbSize == NOTIFYICONDATAW_V2_SIZE)
{
dwValidFlags |= NIF_STATE | NIF_INFO;
}
else // if cbSize == NOTIFYICONDATAW_V1_SIZE or something else
{
if (cbSize != NOTIFYICONDATAW_V1_SIZE)
{
WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n",
cbSize, NOTIFYICONDATAW_V1_SIZE);
cbSize = NOTIFYICONDATAW_V1_SIZE;
}
} }
else
cbSize = pnid->cbSize;
return SHELL_NotifyIcon(dwMessage, pnid, pnid->hWnd, cbSize, TRUE); /* Build the data structure */
ZeroMemory(&tnid, sizeof(tnid));
tnid.dwSignature = NI_NOTIFY_SIG;
tnid.dwMessage = dwMessage;
/* Copy only the needed data, everything else is zeroed out */
CopyMemory(&tnid.nid, pnid, cbSize);
/* Adjust the size (the NOTIFYICONDATA structure is the full-fledged one) and the flags */
tnid.nid.cbSize = sizeof(tnid.nid);
tnid.nid.uFlags &= dwValidFlags;
/* Be sure the szTip member (that could be cut-off) is correctly NULL-terminated */
if (tnid.nid.uFlags & NIF_TIP)
{
if (cbSize <= NOTIFYICONDATAW_V1_SIZE)
{
#define NIDV1_TIP_SIZE_W (NOTIFYICONDATAW_V1_SIZE - FIELD_OFFSET(NOTIFYICONDATAW, szTip))/sizeof(WCHAR)
tnid.nid.szTip[NIDV1_TIP_SIZE_W - 1] = 0;
#undef NIDV1_TIP_SIZE_W
}
else
{
tnid.nid.szTip[_countof(tnid.nid.szTip) - 1] = 0;
}
}
/* Be sure the info strings are correctly NULL-terminated */
if (tnid.nid.uFlags & NIF_INFO)
{
tnid.nid.szInfo[_countof(tnid.nid.szInfo) - 1] = 0;
tnid.nid.szInfoTitle[_countof(tnid.nid.szInfoTitle) - 1] = 0;
}
/* Send the data */
data.dwData = 1;
data.cbData = sizeof(tnid);
data.lpData = &tnid;
if (SendMessageW(hShellTrayWnd, WM_COPYDATA, (WPARAM)pnid->hWnd, (LPARAM)&data))
ret = TRUE;
return ret;
} }

15
sdk/include/psdk/shellapi.h
View file

@ -81,8 +81,8 @@ extern "C" {
#define NIF_MESSAGE 1 #define NIF_MESSAGE 1
#define NIF_ICON 2 #define NIF_ICON 2
#define NIF_TIP 4 #define NIF_TIP 4
#define NIF_STATE 8
#if _WIN32_IE >= 0x0500 #if _WIN32_IE >= 0x0500
#define NIF_STATE 8
#define NIF_INFO 16 #define NIF_INFO 16
#define NIS_HIDDEN 1 #define NIS_HIDDEN 1
#define NIS_SHAREDICON 2 #define NIS_SHAREDICON 2
@ -92,6 +92,7 @@ extern "C" {
#define NIIF_ERROR 3 #define NIIF_ERROR 3
#define NIIF_USER 4 #define NIIF_USER 4
#if _WIN32_IE >= 0x0600 #if _WIN32_IE >= 0x0600
#define NIF_GUID 32
#define NIIF_ICON_MASK 0xf #define NIIF_ICON_MASK 0xf
#define NIIF_NOSOUND 0x10 #define NIIF_NOSOUND 0x10
#endif /* _WIN32_IE >= 0x0600 */ #endif /* _WIN32_IE >= 0x0600 */
@ -217,8 +218,6 @@ typedef struct _NOTIFYICONDATAA {
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
CHAR szInfoTitle[64]; CHAR szInfoTitle[64];
DWORD dwInfoFlags; DWORD dwInfoFlags;
#else
CHAR szTip[64];
#endif #endif
#if (NTDDI_VERSION >= NTDDI_WINXP) #if (NTDDI_VERSION >= NTDDI_WINXP)
GUID guidItem; GUID guidItem;
@ -236,7 +235,7 @@ typedef struct _NOTIFYICONDATAW {
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; HICON hIcon;
#if (NTDDI_VERSION < NTDDI_WIN2K) #if (NTDDI_VERSION < NTDDI_WIN2K)
CHAR szTip[64]; WCHAR szTip[64];
#endif #endif
#if (NTDDI_VERSION >= NTDDI_WIN2K) #if (NTDDI_VERSION >= NTDDI_WIN2K)
WCHAR szTip[128]; WCHAR szTip[128];
@ -249,14 +248,12 @@ typedef struct _NOTIFYICONDATAW {
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
WCHAR szInfoTitle[64]; WCHAR szInfoTitle[64];
DWORD dwInfoFlags; DWORD dwInfoFlags;
#else
WCHAR szTip[64];
#endif #endif
#if (NTDDI_VERSION >= NTDDI_WINXP) #if (NTDDI_VERSION >= NTDDI_WINXP)
GUID guidItem; GUID guidItem;
#endif #endif
#if (NTDDI_VERSION >= NTDDI_VISTA) #if (NTDDI_VERSION >= NTDDI_VISTA)
HICON hBalloonIcon; HICON hBalloonIcon;
#endif #endif
} NOTIFYICONDATAW,*PNOTIFYICONDATAW; } NOTIFYICONDATAW,*PNOTIFYICONDATAW;
@ -264,6 +261,8 @@ typedef struct _NOTIFYICONDATAW {
#define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64]) #define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64])
#define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem) #define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem)
#define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem) #define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem)
#define NOTIFYICONDATAA_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAA, hBalloonIcon)
#define NOTIFYICONDATAW_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAW, hBalloonIcon)
#if WINVER >= 0x400 #if WINVER >= 0x400
typedef struct _DRAGINFOA { typedef struct _DRAGINFOA {
@ -612,6 +611,7 @@ DoEnvironmentSubstW(
#ifdef UNICODE #ifdef UNICODE
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE
#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAW_V3_SIZE
typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA;
typedef DRAGINFOW DRAGINFO,*LPDRAGINFO; typedef DRAGINFOW DRAGINFO,*LPDRAGINFO;
typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
@ -639,6 +639,7 @@ typedef LPSHNAMEMAPPINGW LPSHNAMEMAPPING;
#else #else
#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE #define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE
#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE #define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE
#define NOTIFYICONDATA_V3_SIZE NOTIFYICONDATAA_V3_SIZE
typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA;
typedef DRAGINFOA DRAGINFO,*LPDRAGINFO; typedef DRAGINFOA DRAGINFO,*LPDRAGINFO;
typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;

31
sdk/include/reactos/undocshell.h
View file

@ -30,10 +30,29 @@ extern "C" {
#define DBIMF_NOMARGINS 0x2000 #define DBIMF_NOMARGINS 0x2000
#endif // NTDDI_LONGHORN #endif // NTDDI_LONGHORN
#if defined (_SHELLAPI_H) || defined (_INC_SHELLAPI)
/****************************************************************************
* Taskbar interface WM_COPYDATA structures
* See http://www.geoffchappell.com/studies/windows/shell/shell32/api/shlnot/copydata.htm
*/
/* Data structure for Shell_NotifyIcon messages */
typedef struct _TRAYNOTIFYDATAW
{
DWORD dwSignature;
DWORD dwMessage;
NOTIFYICONDATAW nid; // Always use the latest NOTIFYICONDATAW structure version.
} TRAYNOTIFYDATAW, *PTRAYNOTIFYDATAW;
// Note: One could also introduce TRAYNOTIFYDATAA
#define NI_NOTIFY_SIG 0x34753423 /* TRAYNOTIFYDATA */
#endif /* defined (_SHELLAPI_H) || defined (_INC_SHELLAPI) */
/**************************************************************************** /****************************************************************************
* Taskbar WM_COMMAND identifiers * Taskbar WM_COMMAND identifiers
*/ */
#define TWM_DOEXITWINDOWS (WM_USER + 342) #define TWM_DOEXITWINDOWS (WM_USER + 342)
#define TWM_CYCLEFOCUS (WM_USER + 348) #define TWM_CYCLEFOCUS (WM_USER + 348)
@ -79,8 +98,8 @@ BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*);
/**************************************************************************** /****************************************************************************
* SHChangeNotifyRegister API * SHChangeNotifyRegister API
*/ */
#define SHCNRF_InterruptLevel 0x0001 #define SHCNRF_InterruptLevel 0x0001
#define SHCNRF_ShellLevel 0x0002 #define SHCNRF_ShellLevel 0x0002
#define SHCNRF_RecursiveInterrupt 0x1000 /* Must be combined with SHCNRF_InterruptLevel */ #define SHCNRF_RecursiveInterrupt 0x1000 /* Must be combined with SHCNRF_InterruptLevel */
@ -580,7 +599,7 @@ BOOL WINAPI GUIDFromStringW(
_In_ PCWSTR psz, _In_ PCWSTR psz,
_Out_ LPGUID pguid _Out_ LPGUID pguid
); );
static inline ULONG static inline ULONG
Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...)
{ {
@ -838,7 +857,7 @@ typedef struct tagSHELL_LINK_INFOW
/***************************************************************************** /*****************************************************************************
* SHELL_LINK_INFO_VOLUME_IDA/W * SHELL_LINK_INFO_VOLUME_IDA/W
* If cbVolumeLabelOffset != 0x00000014 (should be 0x00000010) then use * If cbVolumeLabelOffset != 0x00000014 (should be 0x00000010) then use
* SHELL_LINK_INFO_VOLUME_IDA * SHELL_LINK_INFO_VOLUME_IDA
* If cbVolumeLabelOffset == 0x00000014 then use SHELL_LINK_INFO_VOLUME_IDW * If cbVolumeLabelOffset == 0x00000014 then use SHELL_LINK_INFO_VOLUME_IDW
*/ */
@ -958,7 +977,7 @@ typedef struct tagEXP_VISTA_ID_LIST
{ {
/* .cbSize >= 0x0000000a, .dwSignature = 0xa000000c */ /* .cbSize >= 0x0000000a, .dwSignature = 0xa000000c */
DATABLOCK_HEADER dbh; DATABLOCK_HEADER dbh;
/* Specifies an alternate IDList that can be used instead /* Specifies an alternate IDList that can be used instead
of the "normal" IDList (SLDF_HAS_ID_LIST) */ of the "normal" IDList (SLDF_HAS_ID_LIST) */
/* LPITEMIDLIST pIDList; (variable) */ /* LPITEMIDLIST pIDList; (variable) */
} EXP_VISTA_ID_LIST, *LPEXP_VISTA_ID_LIST; } EXP_VISTA_ID_LIST, *LPEXP_VISTA_ID_LIST;