From 9f87be3ed2ddf7db63e7b5d554df84122e2b21bb Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Mon, 31 Aug 2015 20:02:32 +0000 Subject: Toaster: removed ugly xml api (thx to MikalaiR) git-svn-id: http://svn.miranda-ng.org/main/trunk@15130 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Toaster/src/stdafx.h | 1 + plugins/Toaster/src/toast_notification.cpp | 194 ++++------------------------- plugins/Toaster/src/toast_notification.h | 6 - 3 files changed, 23 insertions(+), 178 deletions(-) diff --git a/plugins/Toaster/src/stdafx.h b/plugins/Toaster/src/stdafx.h index d470f9f43d..34c53b55fc 100644 --- a/plugins/Toaster/src/stdafx.h +++ b/plugins/Toaster/src/stdafx.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "version.h" #include "resource.h" diff --git a/plugins/Toaster/src/toast_notification.cpp b/plugins/Toaster/src/toast_notification.cpp index 5a17833102..af89e779d1 100644 --- a/plugins/Toaster/src/toast_notification.cpp +++ b/plugins/Toaster/src/toast_notification.cpp @@ -23,147 +23,6 @@ HRESULT ToastNotification::Initialize() return hr; } -HRESULT ToastNotification::GetNodeByTag(_In_ HSTRING tagName, _Outptr_ ABI::Windows::Data::Xml::Dom::IXmlNode **node, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml) -{ - Microsoft::WRL::ComPtr nodeList; - HRESULT hr = xml->GetElementsByTagName(tagName, &nodeList); - if (SUCCEEDED(hr)) - { - UINT32 length; - hr = nodeList->get_Length(&length); - if (SUCCEEDED(hr)) - { - if (length) - hr = nodeList->Item(0, node); - else - hr = E_INVALIDARG; - } - } - return hr; -} - -HRESULT ToastNotification::AddNode(_In_ HSTRING name, _Outptr_ ABI::Windows::Data::Xml::Dom::IXmlNode **node, _In_ ABI::Windows::Data::Xml::Dom::IXmlNode *rootNode, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml) -{ - Microsoft::WRL::ComPtr element; - HRESULT hr = xml->CreateElement(name, &element); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr tempNode; - hr = element.As(&tempNode); - if (FAILED(hr)) - return hr; - - return rootNode->AppendChild(tempNode.Get(), node); -} - -HRESULT ToastNotification::SetNodeValueString(_In_ HSTRING inputString, _In_ ABI::Windows::Data::Xml::Dom::IXmlNode* node, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml) -{ - Microsoft::WRL::ComPtr inputText; - HRESULT hr = xml->CreateTextNode(inputString, &inputText); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr inputTextNode; - hr = inputText.As(&inputTextNode); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr pAppendedChild; - return hr = node->AppendChild(inputTextNode.Get(), &pAppendedChild); -} - -HRESULT ToastNotification::SetTextValues(_In_reads_(textValuesCount) wchar_t** textValues, _In_ UINT32 textValuesCount, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml) -{ - HRESULT hr = textValues != nullptr && textValuesCount > 0 ? S_OK : E_INVALIDARG; - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr nodeList; - hr = xml->GetElementsByTagName(StringReferenceWrapper(L"text").Get(), &nodeList); - if (FAILED(hr)) - return hr; - - UINT32 nodeListLength; - hr = nodeList->get_Length(&nodeListLength); - if (FAILED(hr)) - return hr; - - hr = textValuesCount <= nodeListLength ? S_OK : E_INVALIDARG; - if (FAILED(hr)) - return hr; - - for (UINT i = 0; i < textValuesCount; i++) - { - Microsoft::WRL::ComPtr textNode; - hr = nodeList->Item(i, &textNode); - if (FAILED(hr)) - return hr; - - hr = SetNodeValueString(StringReferenceWrapper(textValues[i], (UINT32)(mir_wstrlen(textValues[i]))).Get(), textNode.Get(), xml); - if (FAILED(hr)) - return hr; - } - - return S_OK; -} - -HRESULT ToastNotification::SetImageSrc(_In_z_ wchar_t* imagePath, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml) -{ - wchar_t imageSrc[MAX_PATH]; - mir_snwprintf(imageSrc, _T("file:///%s"), imagePath); - - Microsoft::WRL::ComPtr imageNode; - HRESULT hr = GetNodeByTag(StringReferenceWrapper(L"image").Get(), &imageNode, xml); - - Microsoft::WRL::ComPtr attributes; - hr = imageNode->get_Attributes(&attributes); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr srcAttribute; - hr = attributes->GetNamedItem(StringReferenceWrapper(L"src").Get(), &srcAttribute); - if (FAILED(hr)) - return hr; - - return hr = SetNodeValueString(StringReferenceWrapper(imageSrc).Get(), srcAttribute.Get(), xml); -} - -HRESULT ToastNotification::Setup(_In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml) -{ - Microsoft::WRL::ComPtr toastNode; - HRESULT hr = GetNodeByTag(StringReferenceWrapper(L"toast").Get(), &toastNode, xml); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr audioNode; - hr = AddNode(StringReferenceWrapper(L"audio").Get(), &audioNode, toastNode.Get(), xml); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr attributes; - hr = audioNode->get_Attributes(&attributes); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr silentAttribute; - hr = xml->CreateAttribute(StringReferenceWrapper(L"silent").Get(), &silentAttribute); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr silentAttributeNode; - hr = silentAttribute.As(&silentAttributeNode); - if (FAILED(hr)) - return hr; - - Microsoft::WRL::ComPtr tempNode; - hr = attributes->SetNamedItem(silentAttributeNode.Get(), &tempNode); - if (FAILED(hr)) - return hr; - - return SetNodeValueString(StringReferenceWrapper(L"true").Get(), silentAttributeNode.Get(), xml); -} - HRESULT ToastNotification::CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXmlDocument** xml) { Microsoft::WRL::ComPtr xmlDocument; @@ -171,47 +30,38 @@ HRESULT ToastNotification::CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXml if (FAILED(hr)) return hr; - if(_imagePath == nullptr) + HXML xmlToast = xmlCreateNode(L"toast", NULL, 0); + HXML xmlAudioNode = xmlAddChild(xmlToast, L"audio", NULL); + xmlAddAttr(xmlAudioNode, L"silent", L"true"); + HXML xmlVisualNode = xmlAddChild(xmlToast, L"visual", NULL); + HXML xmlBindingNode = xmlAddChild(xmlVisualNode, L"binding", NULL); + if (_imagePath) { - hr = xmlDocument->LoadXml(StringReferenceWrapper(L"").Get()); + xmlAddAttr(xmlBindingNode, L"template", L"ToastImageAndText02"); + HXML xmlImageNode = xmlAddChild(xmlBindingNode, L"image", NULL); + xmlAddAttr(xmlImageNode, L"id", L"1"); + xmlAddAttr(xmlImageNode, L"src", CMStringW(FORMAT, L"file:///%s", _imagePath)); } else { - hr = xmlDocument->LoadXml(StringReferenceWrapper(L"").Get()); + xmlAddAttr(xmlBindingNode, L"template", L"ToastText02"); + } + HXML xmlTitleNode = xmlAddChild(xmlBindingNode, L"text", _caption != NULL ? _caption : L"Miranda NG"); + xmlAddAttr(xmlTitleNode, L"id", L"1"); + if (_text) + { + HXML xmlTextNode = xmlAddChild(xmlBindingNode, L"text", _text); + xmlAddAttr(xmlTextNode, L"id", L"2"); } - if (FAILED(hr)) - return hr; - - hr = xmlDocument.CopyTo(xml); - if (FAILED(hr)) - return hr; - - /*ABI::Windows::UI::Notifications::ToastTemplateType templateId = _imagePath == nullptr - ? ABI::Windows::UI::Notifications::ToastTemplateType_ToastText02 - : ABI::Windows::UI::Notifications::ToastTemplateType_ToastImageAndText02; - HRESULT hr = notificationManager->GetTemplateContent(templateId, xml); - if (FAILED(hr)) - return hr;*/ + TCHAR *xtmp = xmlToString(xmlToast, NULL); + size_t xlen = mir_tstrlen(xtmp); - hr = Setup(*xml); + hr = xmlDocument->LoadXml(StringReferenceWrapper(xtmp, xlen).Get()); if (FAILED(hr)) return hr; - if (_imagePath) - { - hr = SetImageSrc(_imagePath, *xml); - if (FAILED(hr)) - return hr; - } - - wchar_t* textValues[] = - { - _caption == nullptr ? L"Miranda NG" : _caption, - _text - }; - - return SetTextValues(textValues, _countof(textValues), *xml); + return xmlDocument.CopyTo(xml); } HRESULT ToastNotification::Create(_Outptr_ ABI::Windows::UI::Notifications::IToastNotification** _notification) diff --git a/plugins/Toaster/src/toast_notification.h b/plugins/Toaster/src/toast_notification.h index 1f688744bd..6a83da5da4 100644 --- a/plugins/Toaster/src/toast_notification.h +++ b/plugins/Toaster/src/toast_notification.h @@ -12,12 +12,6 @@ private: Microsoft::WRL::ComPtr notifier; Microsoft::WRL::ComPtr notification; - HRESULT GetNodeByTag(_In_ HSTRING tagName, _Outptr_ ABI::Windows::Data::Xml::Dom::IXmlNode **node, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml); - HRESULT AddNode(_In_ HSTRING name, _Outptr_ ABI::Windows::Data::Xml::Dom::IXmlNode **node, _In_ ABI::Windows::Data::Xml::Dom::IXmlNode *rootNode, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml); - HRESULT SetNodeValueString(_In_ HSTRING inputString, _In_ ABI::Windows::Data::Xml::Dom::IXmlNode* node, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml); - HRESULT SetTextValues(_In_reads_(textValuesCount) wchar_t** textValues, _In_ UINT32 textValuesCount, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml); - HRESULT SetImageSrc(_In_z_ wchar_t* imagePath, _In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml); - HRESULT Setup(_In_ ABI::Windows::Data::Xml::Dom::IXmlDocument* xml); HRESULT CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXmlDocument** xml); HRESULT Create(_Outptr_ ABI::Windows::UI::Notifications::IToastNotification** notification); -- cgit v1.2.3