Commit d52b9ddd authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

mshtml: Assign to structs instead of using memcpy.

parent 5f160e56
...@@ -110,7 +110,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i ...@@ -110,7 +110,7 @@ static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *i
if(!pIID) if(!pIID)
return E_POINTER; return E_POINTER;
memcpy(pIID, This->iid, sizeof(IID)); *pIID = *This->iid;
return S_OK; return S_OK;
} }
......
...@@ -103,7 +103,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite ...@@ -103,7 +103,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite
TRACE("hostinfo = {%u %08x %08x %s %s}\n", TRACE("hostinfo = {%u %08x %08x %s %s}\n",
hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
memcpy(&This->hostinfo, &hostinfo, sizeof(DOCHOSTUIINFO)); This->hostinfo = hostinfo;
} }
if(!This->has_key_path) { if(!This->has_key_path) {
...@@ -285,7 +285,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms ...@@ -285,7 +285,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
if(lprcPosRect) { if(lprcPosRect) {
RECT rect; /* We need to pass rect as not const pointer */ RECT rect; /* We need to pass rect as not const pointer */
memcpy(&rect, lprcPosRect, sizeof(RECT)); rect = *lprcPosRect;
IOleDocumentView_SetRect(DOCVIEW(This), &rect); IOleDocumentView_SetRect(DOCVIEW(This), &rect);
} }
IOleDocumentView_Show(DOCVIEW(This), TRUE); IOleDocumentView_Show(DOCVIEW(This), TRUE);
...@@ -325,7 +325,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) ...@@ -325,7 +325,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid)
if(!pClsid) if(!pClsid)
return E_INVALIDARG; return E_INVALIDARG;
memcpy(pClsid, &CLSID_HTMLDocument, sizeof(GUID)); *pClsid = CLSID_HTMLDocument;
return S_OK; return S_OK;
} }
......
...@@ -577,7 +577,7 @@ static HRESULT WINAPI PersistFile_GetClassID(IPersistFile *iface, CLSID *pClassI ...@@ -577,7 +577,7 @@ static HRESULT WINAPI PersistFile_GetClassID(IPersistFile *iface, CLSID *pClassI
if(!pClassID) if(!pClassID)
return E_INVALIDARG; return E_INVALIDARG;
memcpy(pClassID, &CLSID_HTMLDocument, sizeof(CLSID)); *pClassID = CLSID_HTMLDocument;
return S_OK; return S_OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment