<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194535] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194535">194535</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 10:10:06 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Clean up some Windows WebCore files
https://bugs.webkit.org/show_bug.cgi?id=148275
Reviewed by Dean Jackson.
No new tests because there is no behavior change.
Update a handful of Windows-specific WebCore files to use
the proper method signatures for our updated interfaces,
get rid of cruft in the COM bindings, and use proper C++14
initializers.
* accessibility/win/AccessibilityObjectWrapperWin.h:
* platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
* platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
* platform/win/PopupMenuWin.cpp:
* platform/win/PopupMenuWin.h:
* platform/win/WCDataObject.cpp:
* platform/win/WCDataObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitywinAccessibilityObjectWrapperWinh">trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp">trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationh">trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWincpp">trunk/Source/WebCore/platform/win/PopupMenuWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWinh">trunk/Source/WebCore/platform/win/PopupMenuWin.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWCDataObjectcpp">trunk/Source/WebCore/platform/win/WCDataObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWCDataObjecth">trunk/Source/WebCore/platform/win/WCDataObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/ChangeLog 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-01-04 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Clean up some Windows WebCore files
+ https://bugs.webkit.org/show_bug.cgi?id=148275
+
+ Reviewed by Dean Jackson.
+
+ No new tests because there is no behavior change.
+
+ Update a handful of Windows-specific WebCore files to use
+ the proper method signatures for our updated interfaces,
+ get rid of cruft in the COM bindings, and use proper C++14
+ initializers.
+
+ * accessibility/win/AccessibilityObjectWrapperWin.h:
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
+ * platform/win/PopupMenuWin.cpp:
+ * platform/win/PopupMenuWin.h:
+ * platform/win/WCDataObject.cpp:
+ * platform/win/WCDataObject.h:
+
</ins><span class="cx"> 2016-01-04 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify the CachedScript ASCII optimization.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitywinAccessibilityObjectWrapperWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.h 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> class AccessibilityObjectWrapper : public IUnknown {
</span><span class="cx"> public:
</span><span class="cx"> // IUnknown
</span><del>- virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) = 0;
- virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject) = 0;
+ virtual ULONG STDMETHODCALLTYPE AddRef() = 0;
</ins><span class="cx"> virtual ULONG STDMETHODCALLTYPE Release(void) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void detach() = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -749,8 +749,10 @@
</span><span class="cx"> m_mediaPlayer->removeListener(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT MediaPlayerPrivateMediaFoundation::AsyncCallback::QueryInterface(REFIID riid, __RPC__deref_out void __RPC_FAR *__RPC_FAR *ppvObject)
</del><ins>+HRESULT MediaPlayerPrivateMediaFoundation::AsyncCallback::QueryInterface(_In_ REFIID riid, __RPC__deref_out void __RPC_FAR *__RPC_FAR *ppvObject)
</ins><span class="cx"> {
</span><ins>+ if (!ppvObject)
+ return E_POINTER;
</ins><span class="cx"> if (!IsEqualGUID(riid, IID_IMFAsyncCallback)) {
</span><span class="cx"> *ppvObject = nullptr;
</span><span class="cx"> return E_NOINTERFACE;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> AsyncCallback(MediaPlayerPrivateMediaFoundation*, bool event);
</span><span class="cx"> ~AsyncCallback();
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, __RPC__deref_out void __RPC_FAR *__RPC_FAR *ppvObject) override;
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, __RPC__deref_out void __RPC_FAR *__RPC_FAR *ppvObject) override;
</ins><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef() override;
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE Release() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.cpp (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.cpp 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2011, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2008, 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2007-2009 Torch Mobile Inc.
</span><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "HWndDC.h"
</span><span class="cx"> #include "HostWindow.h"
</span><span class="cx"> #include "LengthFunctions.h"
</span><ins>+#include "NotImplemented.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PlatformMouseEvent.h"
</span><span class="cx"> #include "PlatformScreen.h"
</span><span class="lines">@@ -103,16 +104,6 @@
</span><span class="cx">
</span><span class="cx"> PopupMenuWin::PopupMenuWin(PopupMenuClient* client)
</span><span class="cx"> : m_popupClient(client)
</span><del>- , m_scrollbar(0)
- , m_popup(0)
- , m_wasClicked(false)
- , m_itemHeight(0)
- , m_scrollOffset(0)
- , m_wheelDelta(0)
- , m_focusedIndex(0)
- , m_hoveredIndex(0)
- , m_scrollbarCapturingMouse(false)
- , m_showPopup(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1091,8 +1082,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccessiblePopupMenu::AccessiblePopupMenu(const PopupMenuWin& popupMenu)
</span><del>- : m_refCount(0)
- , m_popupMenu(popupMenu)
</del><ins>+ : m_popupMenu(popupMenu)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1100,8 +1090,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::QueryInterface(REFIID riid, __RPC__deref_out void __RPC_FAR *__RPC_FAR *ppvObject)
</del><ins>+HRESULT AccessiblePopupMenu::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</ins><span class="cx"> {
</span><ins>+ if (!ppvObject)
+ return E_POINTER;
</ins><span class="cx"> if (IsEqualGUID(riid, __uuidof(IAccessible)))
</span><span class="cx"> *ppvObject = static_cast<IAccessible*>(this);
</span><span class="cx"> else if (IsEqualGUID(riid, __uuidof(IDispatch)))
</span><span class="lines">@@ -1109,7 +1101,7 @@
</span><span class="cx"> else if (IsEqualGUID(riid, __uuidof(IUnknown)))
</span><span class="cx"> *ppvObject = static_cast<IAccessible*>(this);
</span><span class="cx"> else {
</span><del>- *ppvObject = 0;
</del><ins>+ *ppvObject = nullptr;
</ins><span class="cx"> return E_NOINTERFACE;
</span><span class="cx"> }
</span><span class="cx"> AddRef();
</span><span class="lines">@@ -1129,32 +1121,46 @@
</span><span class="cx"> return refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::GetTypeInfoCount(UINT* count)
</del><ins>+HRESULT AccessiblePopupMenu::GetTypeInfoCount(_Out_ UINT* count)
</ins><span class="cx"> {
</span><ins>+ if (!count)
+ return E_POINTER;
+ *count = 0;
+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::GetTypeInfo(UINT, LCID, ITypeInfo** ppTInfo)
</del><ins>+HRESULT AccessiblePopupMenu::GetTypeInfo(UINT, LCID, _COM_Outptr_opt_ ITypeInfo** ppTInfo)
</ins><span class="cx"> {
</span><ins>+ if (!ppTInfo)
+ return E_POINTER;
+ *ppTInfo = nullptr;
+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::GetIDsOfNames(REFIID, LPOLESTR*, UINT, LCID, DISPID*)
</del><ins>+HRESULT AccessiblePopupMenu::GetIDsOfNames(_In_ REFIID, __in_ecount(cNames) LPOLESTR*, UINT cNames, LCID, __out_ecount_full(cNames) DISPID*)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT AccessiblePopupMenu::Invoke(DISPID, REFIID, LCID, WORD, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*)
</span><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accParent(IDispatch**)
</del><ins>+HRESULT AccessiblePopupMenu::get_accParent(_COM_Outptr_opt_ IDispatch** parent)
</ins><span class="cx"> {
</span><ins>+ if (!parent)
+ return E_POINTER;
+ *parent = nullptr;
+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accChildCount(long* count)
</del><ins>+HRESULT AccessiblePopupMenu::get_accChildCount(_Out_ long* count)
</ins><span class="cx"> {
</span><span class="cx"> if (!count)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -1163,29 +1169,32 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accChild(VARIANT vChild, IDispatch** ppChild)
</del><ins>+HRESULT AccessiblePopupMenu::get_accChild(VARIANT vChild, _COM_Outptr_opt_ IDispatch** ppChild)
</ins><span class="cx"> {
</span><span class="cx"> if (!ppChild)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- if (vChild.vt != VT_I4) {
- *ppChild = nullptr;
</del><ins>+ *ppChild = nullptr;
+
+ if (vChild.vt != VT_I4)
</ins><span class="cx"> return E_INVALIDARG;
</span><del>- }
- *ppChild = nullptr;
</del><ins>+
+ notImplemented();
</ins><span class="cx"> return S_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accName(VARIANT vChild, BSTR* name)
</del><ins>+HRESULT AccessiblePopupMenu::get_accName(VARIANT vChild, __deref_out_opt BSTR* name)
</ins><span class="cx"> {
</span><span class="cx"> return get_accValue(vChild, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accValue(VARIANT vChild, BSTR* value)
</del><ins>+HRESULT AccessiblePopupMenu::get_accValue(VARIANT vChild, __deref_out_opt BSTR* value)
</ins><span class="cx"> {
</span><span class="cx"> if (!value)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><ins>+ *value = nullptr;
+
</ins><span class="cx"> if (vChild.vt != VT_I4)
</span><span class="cx"> return E_INVALIDARG;
</span><span class="cx">
</span><span class="lines">@@ -1200,16 +1209,16 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accDescription(VARIANT, BSTR*)
</del><ins>+HRESULT AccessiblePopupMenu::get_accDescription(VARIANT, __deref_out_opt BSTR*)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accRole(VARIANT vChild, VARIANT* pvRole)
</del><ins>+HRESULT AccessiblePopupMenu::get_accRole(VARIANT vChild, _Out_ VARIANT* pvRole)
</ins><span class="cx"> {
</span><span class="cx"> if (!pvRole)
</span><span class="cx"> return E_POINTER;
</span><del>-
</del><span class="cx"> if (vChild.vt != VT_I4)
</span><span class="cx"> return E_INVALIDARG;
</span><span class="cx">
</span><span class="lines">@@ -1225,7 +1234,7 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accState(VARIANT vChild, VARIANT* pvState)
</del><ins>+HRESULT AccessiblePopupMenu::get_accState(VARIANT vChild, _Out_ VARIANT* pvState)
</ins><span class="cx"> {
</span><span class="cx"> if (!pvState)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -1239,37 +1248,43 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accHelp(VARIANT vChild, BSTR* helpText)
</del><ins>+HRESULT AccessiblePopupMenu::get_accHelp(VARIANT vChild, __deref_out_opt BSTR* helpText)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accKeyboardShortcut(VARIANT vChild, BSTR*)
</del><ins>+HRESULT AccessiblePopupMenu::get_accKeyboardShortcut(VARIANT vChild, __deref_out_opt BSTR*)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accFocus(VARIANT* pvFocusedChild)
</del><ins>+HRESULT AccessiblePopupMenu::get_accFocus(_Out_ VARIANT* pvFocusedChild)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accSelection(VARIANT* pvSelectedChild)
</del><ins>+HRESULT AccessiblePopupMenu::get_accSelection(_Out_ VARIANT* pvSelectedChild)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accDefaultAction(VARIANT vChild, BSTR* actionDescription)
</del><ins>+HRESULT AccessiblePopupMenu::get_accDefaultAction(VARIANT vChild, __deref_out_opt BSTR* actionDescription)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT AccessiblePopupMenu::accSelect(long selectionFlags, VARIANT vChild)
</span><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::accLocation(long* left, long* top, long* width, long* height, VARIANT vChild)
</del><ins>+HRESULT AccessiblePopupMenu::accLocation(_Out_ long* left, _Out_ long* top, _Out_ long* width, _Out_ long* height, VARIANT vChild)
</ins><span class="cx"> {
</span><span class="cx"> if (!left || !top || !width || !height)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -1333,12 +1348,13 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::accNavigate(long direction, VARIANT vFromChild, VARIANT* pvNavigatedTo)
</del><ins>+HRESULT AccessiblePopupMenu::accNavigate(long direction, VARIANT vFromChild, _Out_ VARIANT* pvNavigatedTo)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::accHitTest(long x, long y, VARIANT* pvChildAtPoint)
</del><ins>+HRESULT AccessiblePopupMenu::accHitTest(long x, long y, _Out_ VARIANT* pvChildAtPoint)
</ins><span class="cx"> {
</span><span class="cx"> if (!pvChildAtPoint)
</span><span class="cx"> return E_POINTER;
</span><span class="lines">@@ -1381,21 +1397,25 @@
</span><span class="cx">
</span><span class="cx"> HRESULT AccessiblePopupMenu::accDoDefaultAction(VARIANT vChild)
</span><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT AccessiblePopupMenu::put_accName(VARIANT, BSTR)
</span><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT AccessiblePopupMenu::put_accValue(VARIANT, BSTR)
</span><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT AccessiblePopupMenu::get_accHelpTopic(BSTR* helpFile, VARIANT, long* topicID)
</del><ins>+HRESULT AccessiblePopupMenu::get_accHelpTopic(BSTR* helpFile, VARIANT, _Out_ long* topicID)
</ins><span class="cx"> {
</span><ins>+ notImplemented();
</ins><span class="cx"> return E_NOTIMPL;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.h (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.h 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.h 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -121,21 +121,21 @@
</span><span class="cx"> LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
</span><span class="cx"> static void registerClass();
</span><span class="cx">
</span><del>- PopupMenuClient* m_popupClient;
</del><span class="cx"> RefPtr<Scrollbar> m_scrollbar;
</span><del>- HWND m_popup;
</del><ins>+ COMPtr<IAccessible> m_accessiblePopupMenu;
</ins><span class="cx"> GDIObject<HDC> m_DC;
</span><span class="cx"> GDIObject<HBITMAP> m_bmp;
</span><del>- bool m_wasClicked;
</del><ins>+ PopupMenuClient* m_popupClient;
+ HWND m_popup { nullptr };
</ins><span class="cx"> IntRect m_windowRect;
</span><del>- int m_itemHeight;
- int m_scrollOffset;
- int m_wheelDelta;
- int m_focusedIndex;
- int m_hoveredIndex;
- bool m_scrollbarCapturingMouse;
- bool m_showPopup;
- COMPtr<IAccessible> m_accessiblePopupMenu;
</del><ins>+ int m_itemHeight { 0 };
+ int m_scrollOffset { 0 };
+ int m_wheelDelta { 0 };
+ int m_focusedIndex { 0 };
+ int m_hoveredIndex { 0 };
+ bool m_wasClicked { false };
+ bool m_scrollbarCapturingMouse { false };
+ bool m_showPopup { false };
</ins><span class="cx">
</span><span class="cx"> friend class AccessiblePopupMenu;
</span><span class="cx"> };
</span><span class="lines">@@ -146,41 +146,41 @@
</span><span class="cx"> ~AccessiblePopupMenu();
</span><span class="cx">
</span><span class="cx"> // IUnknown
</span><del>- virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, __RPC__deref_out void __RPC_FAR *__RPC_FAR *ppvObject);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID, _COM_Outptr_ void**);
</ins><span class="cx"> virtual ULONG STDMETHODCALLTYPE AddRef();
</span><span class="cx"> virtual ULONG STDMETHODCALLTYPE Release();
</span><span class="cx">
</span><span class="cx"> // IDispatch - Not to be implemented.
</span><del>- virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT* count);
- virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT, LCID, ITypeInfo** ppTInfo);
- virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID, LPOLESTR*, UINT, LCID, DISPID*);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(_Out_ UINT* count);
+ virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT, LCID, _COM_Outptr_opt_ ITypeInfo**);
+ virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(_In_ REFIID, __in_ecount(cNames) LPOLESTR*, UINT cNames, LCID, __out_ecount_full(cNames) DISPID*);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID, REFIID, LCID, WORD, DISPPARAMS*, VARIANT*, EXCEPINFO*, UINT*);
</span><span class="cx">
</span><span class="cx"> // IAccessible
</span><del>- virtual HRESULT STDMETHODCALLTYPE get_accParent(IDispatch**);
- virtual HRESULT STDMETHODCALLTYPE get_accChildCount(long*);
- virtual HRESULT STDMETHODCALLTYPE get_accChild(VARIANT vChild, IDispatch** ppChild);
- virtual HRESULT STDMETHODCALLTYPE get_accName(VARIANT vChild, BSTR*);
- virtual HRESULT STDMETHODCALLTYPE get_accValue(VARIANT vChild, BSTR*);
- virtual HRESULT STDMETHODCALLTYPE get_accDescription(VARIANT, BSTR*);
- virtual HRESULT STDMETHODCALLTYPE get_accRole(VARIANT vChild, VARIANT* pvRole);
- virtual HRESULT STDMETHODCALLTYPE get_accState(VARIANT vChild, VARIANT* pvState);
- virtual HRESULT STDMETHODCALLTYPE get_accHelp(VARIANT vChild, BSTR* helpText);
- virtual HRESULT STDMETHODCALLTYPE get_accKeyboardShortcut(VARIANT vChild, BSTR*);
- virtual HRESULT STDMETHODCALLTYPE get_accFocus(VARIANT* pvFocusedChild);
- virtual HRESULT STDMETHODCALLTYPE get_accSelection(VARIANT* pvSelectedChild);
- virtual HRESULT STDMETHODCALLTYPE get_accDefaultAction(VARIANT vChild, BSTR* actionDescription);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE get_accParent(_COM_Outptr_opt_ IDispatch**);
+ virtual HRESULT STDMETHODCALLTYPE get_accChildCount(_Out_ long*);
+ virtual HRESULT STDMETHODCALLTYPE get_accChild(VARIANT vChild, _COM_Outptr_opt_ IDispatch** ppChild);
+ virtual HRESULT STDMETHODCALLTYPE get_accName(VARIANT vChild, __deref_out_opt BSTR*);
+ virtual HRESULT STDMETHODCALLTYPE get_accValue(VARIANT vChild, __deref_out_opt BSTR*);
+ virtual HRESULT STDMETHODCALLTYPE get_accDescription(VARIANT, __deref_out_opt BSTR*);
+ virtual HRESULT STDMETHODCALLTYPE get_accRole(VARIANT vChild, _Out_ VARIANT* pvRole);
+ virtual HRESULT STDMETHODCALLTYPE get_accState(VARIANT vChild, _Out_ VARIANT* pvState);
+ virtual HRESULT STDMETHODCALLTYPE get_accHelp(VARIANT vChild, __deref_out_opt BSTR* helpText);
+ virtual HRESULT STDMETHODCALLTYPE get_accKeyboardShortcut(VARIANT vChild, __deref_out_opt BSTR*);
+ virtual HRESULT STDMETHODCALLTYPE get_accFocus(_Out_ VARIANT* pvFocusedChild);
+ virtual HRESULT STDMETHODCALLTYPE get_accSelection(_Out_ VARIANT* pvSelectedChild);
+ virtual HRESULT STDMETHODCALLTYPE get_accDefaultAction(VARIANT vChild, __deref_out_opt BSTR* actionDescription);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE accSelect(long selectionFlags, VARIANT vChild);
</span><del>- virtual HRESULT STDMETHODCALLTYPE accLocation(long* left, long* top, long* width, long* height, VARIANT vChild);
- virtual HRESULT STDMETHODCALLTYPE accNavigate(long direction, VARIANT vFromChild, VARIANT* pvNavigatedTo);
- virtual HRESULT STDMETHODCALLTYPE accHitTest(long x, long y, VARIANT* pvChildAtPoint);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE accLocation(_Out_ long* left, _Out_ long* top, _Out_ long* width, _Out_ long* height, VARIANT vChild);
+ virtual HRESULT STDMETHODCALLTYPE accNavigate(long direction, VARIANT vFromChild, _Out_ VARIANT* pvNavigatedTo);
+ virtual HRESULT STDMETHODCALLTYPE accHitTest(long x, long y, _Out_ VARIANT* pvChildAtPoint);
</ins><span class="cx"> virtual HRESULT STDMETHODCALLTYPE accDoDefaultAction(VARIANT vChild);
</span><del>- virtual HRESULT STDMETHODCALLTYPE put_accName(VARIANT, BSTR);
- virtual HRESULT STDMETHODCALLTYPE put_accValue(VARIANT, BSTR);
- virtual HRESULT STDMETHODCALLTYPE get_accHelpTopic(BSTR* helpFile, VARIANT, long* topicID);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE put_accName(VARIANT, _In_ BSTR);
+ virtual HRESULT STDMETHODCALLTYPE put_accValue(VARIANT, _In_ BSTR);
+ virtual HRESULT STDMETHODCALLTYPE get_accHelpTopic(BSTR* helpFile, VARIANT, _Out_ long* topicID);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- int m_refCount;
</del><ins>+ int m_refCount { 0 };
</ins><span class="cx"> const PopupMenuWin& m_popupMenu;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWCDataObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WCDataObject.cpp (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WCDataObject.cpp 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/platform/win/WCDataObject.cpp 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> WCEnumFormatEtc(const Vector<std::unique_ptr<FORMATETC>>& formats);
</span><span class="cx">
</span><span class="cx"> //IUnknown members
</span><del>- STDMETHOD(QueryInterface)(REFIID, void**);
</del><ins>+ STDMETHOD(QueryInterface)(_In_ REFIID, _COM_Outptr_ void**);
</ins><span class="cx"> STDMETHOD_(ULONG, AddRef)(void);
</span><span class="cx"> STDMETHOD_(ULONG, Release)(void);
</span><span class="cx">
</span><span class="lines">@@ -50,30 +50,28 @@
</span><span class="cx"> STDMETHOD(Clone)(IEnumFORMATETC**);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- long m_ref;
- Vector<FORMATETC> m_formats;
- size_t m_current;
</del><ins>+ Vector<FORMATETC> m_formats;
+ size_t m_current { 0 };
+ long m_ref { 1 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WCEnumFormatEtc::WCEnumFormatEtc(const Vector<FORMATETC>& formats)
</span><del>-: m_ref(1)
-, m_current(0)
</del><span class="cx"> {
</span><del>- for(size_t i = 0; i < formats.size(); ++i)
- m_formats.append(formats[i]);
</del><ins>+ for (const auto& format : formats)
+ m_formats.append(format);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WCEnumFormatEtc::WCEnumFormatEtc(const Vector<std::unique_ptr<FORMATETC>>& formats)
</span><del>- : m_ref(1)
- , m_current(0)
</del><span class="cx"> {
</span><span class="cx"> for (auto& format : formats)
</span><span class="cx"> m_formats.append(*format);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-STDMETHODIMP WCEnumFormatEtc::QueryInterface(REFIID riid, void** ppvObject)
</del><ins>+STDMETHODIMP WCEnumFormatEtc::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</ins><span class="cx"> {
</span><del>- *ppvObject = 0;
</del><ins>+ if (!ppvObject)
+ return E_POINTER;
+ *ppvObject = nullptr;
</ins><span class="cx"> if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_IEnumFORMATETC)) {
</span><span class="cx"> *ppvObject = this;
</span><span class="cx"> AddRef();
</span><span class="lines">@@ -83,12 +81,12 @@
</span><span class="cx"> return E_NOINTERFACE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-STDMETHODIMP_(ULONG) WCEnumFormatEtc::AddRef(void)
</del><ins>+STDMETHODIMP_(ULONG) WCEnumFormatEtc::AddRef()
</ins><span class="cx"> {
</span><span class="cx"> return InterlockedIncrement(&m_ref);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-STDMETHODIMP_(ULONG) WCEnumFormatEtc::Release(void)
</del><ins>+STDMETHODIMP_(ULONG) WCEnumFormatEtc::Release()
</ins><span class="cx"> {
</span><span class="cx"> long c = InterlockedDecrement(&m_ref);
</span><span class="cx"> if (c == 0)
</span><span class="lines">@@ -103,10 +101,10 @@
</span><span class="cx">
</span><span class="cx"> ULONG cReturn = celt;
</span><span class="cx">
</span><del>- if(celt <= 0 || lpFormatEtc == 0 || m_current >= m_formats.size())
</del><ins>+ if (celt <= 0 || !lpFormatEtc || m_current >= m_formats.size())
</ins><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><del>- if(pceltFetched == 0 && celt != 1) // pceltFetched can be 0 only for 1 item request
</del><ins>+ if (!pceltFetched && celt != 1) // pceltFetched can be 0 only for 1 item request
</ins><span class="cx"> return S_FALSE;
</span><span class="cx">
</span><span class="cx"> while (m_current < m_formats.size() && cReturn > 0) {
</span><span class="lines">@@ -121,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> STDMETHODIMP WCEnumFormatEtc::Skip(ULONG celt)
</span><span class="cx"> {
</span><del>- if((m_current + int(celt)) >= m_formats.size())
</del><ins>+ if ((m_current + int(celt)) >= m_formats.size())
</ins><span class="cx"> return S_FALSE;
</span><span class="cx"> m_current += celt;
</span><span class="cx"> return S_OK;
</span><span class="lines">@@ -135,11 +133,11 @@
</span><span class="cx">
</span><span class="cx"> STDMETHODIMP WCEnumFormatEtc::Clone(IEnumFORMATETC** ppCloneEnumFormatEtc)
</span><span class="cx"> {
</span><del>- if(!ppCloneEnumFormatEtc)
</del><ins>+ if (!ppCloneEnumFormatEtc)
</ins><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> WCEnumFormatEtc *newEnum = new WCEnumFormatEtc(m_formats);
</span><del>- if(!newEnum)
</del><ins>+ if (!newEnum)
</ins><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx">
</span><span class="cx"> newEnum->AddRef();
</span><span class="lines">@@ -172,13 +170,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WCDataObject::WCDataObject()
</span><del>-: m_ref(1)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-STDMETHODIMP WCDataObject::QueryInterface(REFIID riid,void** ppvObject)
</del><ins>+STDMETHODIMP WCDataObject::QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject)
</ins><span class="cx"> {
</span><del>- *ppvObject = 0;
</del><ins>+ if (!ppvObject)
+ return E_POINTER;
+ *ppvObject = nullptr;
</ins><span class="cx"> if (IsEqualIID(riid, IID_IUnknown) ||
</span><span class="cx"> IsEqualIID(riid, IID_IDataObject)) {
</span><span class="cx"> *ppvObject=this;
</span><span class="lines">@@ -205,15 +204,15 @@
</span><span class="cx">
</span><span class="cx"> STDMETHODIMP WCDataObject::GetData(FORMATETC* pformatetcIn, STGMEDIUM* pmedium)
</span><span class="cx"> {
</span><del>- if(!pformatetcIn || !pmedium)
</del><ins>+ if (!pformatetcIn || !pmedium)
</ins><span class="cx"> return E_POINTER;
</span><del>- pmedium->hGlobal = 0;
</del><ins>+ pmedium->hGlobal = nullptr;
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < m_formats.size(); ++i) {
</span><del>- if(/*pformatetcIn->tymed & m_formats[i]->tymed &&*/ // tymed can be 0 (TYMED_NULL) - but it can have a medium that contains an pUnkForRelease
- pformatetcIn->lindex == m_formats[i]->lindex &&
- pformatetcIn->dwAspect == m_formats[i]->dwAspect &&
- pformatetcIn->cfFormat == m_formats[i]->cfFormat) {
</del><ins>+ if (/*pformatetcIn->tymed & m_formats[i]->tymed &&*/ // tymed can be 0 (TYMED_NULL) - but it can have a medium that contains an pUnkForRelease
+ pformatetcIn->lindex == m_formats[i]->lindex
+ && pformatetcIn->dwAspect == m_formats[i]->dwAspect
+ && pformatetcIn->cfFormat == m_formats[i]->cfFormat) {
</ins><span class="cx"> CopyMedium(pmedium, m_medium[i].get(), m_formats[i].get());
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="lines">@@ -228,7 +227,7 @@
</span><span class="cx">
</span><span class="cx"> STDMETHODIMP WCDataObject::QueryGetData(FORMATETC* pformatetc)
</span><span class="cx"> {
</span><del>- if(!pformatetc)
</del><ins>+ if (!pformatetc)
</ins><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> if (!(DVASPECT_CONTENT & pformatetc->dwAspect))
</span><span class="lines">@@ -254,7 +253,7 @@
</span><span class="cx">
</span><span class="cx"> STDMETHODIMP WCDataObject::SetData(FORMATETC* pformatetc, STGMEDIUM* pmedium, BOOL fRelease)
</span><span class="cx"> {
</span><del>- if(!pformatetc || !pmedium)
</del><ins>+ if (!pformatetc || !pmedium)
</ins><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> auto fetc = std::make_unique<FORMATETC>();
</span><span class="lines">@@ -307,14 +306,14 @@
</span><span class="cx"> }
</span><span class="cx"> pMedDest->tymed = pMedSrc->tymed;
</span><span class="cx"> pMedDest->pUnkForRelease = 0;
</span><del>- if(pMedSrc->pUnkForRelease != 0) {
</del><ins>+ if (pMedSrc->pUnkForRelease) {
</ins><span class="cx"> pMedDest->pUnkForRelease = pMedSrc->pUnkForRelease;
</span><span class="cx"> pMedSrc->pUnkForRelease->AddRef();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> STDMETHODIMP WCDataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC** ppenumFormatEtc)
</span><span class="cx"> {
</span><del>- if(!ppenumFormatEtc)
</del><ins>+ if (!ppenumFormatEtc)
</ins><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><span class="cx"> *ppenumFormatEtc=0;
</span><span class="lines">@@ -322,7 +321,7 @@
</span><span class="cx"> {
</span><span class="cx"> case DATADIR_GET:
</span><span class="cx"> *ppenumFormatEtc= new WCEnumFormatEtc(m_formats);
</span><del>- if(!(*ppenumFormatEtc))
</del><ins>+ if (!(*ppenumFormatEtc))
</ins><span class="cx"> return E_OUTOFMEMORY;
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWCDataObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WCDataObject.h (194534 => 194535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WCDataObject.h 2016-01-04 17:43:25 UTC (rev 194534)
+++ trunk/Source/WebCore/platform/win/WCDataObject.h 2016-01-04 18:10:06 UTC (rev 194535)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> void CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC* pFmtSrc);
</span><span class="cx">
</span><span class="cx"> //IUnknown
</span><del>- virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
- virtual ULONG STDMETHODCALLTYPE AddRef(void);
- virtual ULONG STDMETHODCALLTYPE Release(void);
</del><ins>+ virtual HRESULT STDMETHODCALLTYPE QueryInterface(_In_ REFIID riid, _COM_Outptr_ void** ppvObject);
+ virtual ULONG STDMETHODCALLTYPE AddRef();
+ virtual ULONG STDMETHODCALLTYPE Release();
</ins><span class="cx">
</span><span class="cx"> //IDataObject
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE GetData(FORMATETC* pformatIn, STGMEDIUM* pmedium);
</span><span class="lines">@@ -67,9 +67,10 @@
</span><span class="cx"> static HRESULT createInstance(WCDataObject**, const DragDataMap&);
</span><span class="cx"> private:
</span><span class="cx"> WCDataObject();
</span><del>- long m_ref;
</del><ins>+
</ins><span class="cx"> Vector<std::unique_ptr<FORMATETC>> m_formats;
</span><span class="cx"> Vector<std::unique_ptr<STGMEDIUM, StgMediumDeleter>> m_medium;
</span><ins>+ long m_ref { 1 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>