mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-15 06:21:15 +00:00
msxml3: Use nameless unions/structs.
This commit is contained in:
parent
8de0a9dc74
commit
194b4025b0
|
@ -17,7 +17,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
#define NONAMELESSUNION
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
@ -206,7 +205,7 @@ static HRESULT WINAPI bsc_OnDataAvailable(
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
hr = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read);
|
hr = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &read);
|
||||||
if(FAILED(hr))
|
if(FAILED(hr))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
#define NONAMELESSUNION
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
@ -375,7 +374,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface,
|
||||||
if (This->request->verb != BINDVERB_GET && This->body)
|
if (This->request->verb != BINDVERB_GET && This->body)
|
||||||
{
|
{
|
||||||
pbindinfo->stgmedData.tymed = TYMED_HGLOBAL;
|
pbindinfo->stgmedData.tymed = TYMED_HGLOBAL;
|
||||||
pbindinfo->stgmedData.u.hGlobal = This->body;
|
pbindinfo->stgmedData.hGlobal = This->body;
|
||||||
pbindinfo->cbstgmedData = GlobalSize(This->body);
|
pbindinfo->cbstgmedData = GlobalSize(This->body);
|
||||||
/* callback owns passed body pointer */
|
/* callback owns passed body pointer */
|
||||||
IBindStatusCallback_QueryInterface(iface, &IID_IUnknown, (void**)&pbindinfo->stgmedData.pUnkForRelease);
|
IBindStatusCallback_QueryInterface(iface, &IID_IUnknown, (void**)&pbindinfo->stgmedData.pUnkForRelease);
|
||||||
|
@ -403,7 +402,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
hr = IStream_Read(stgmed->u.pstm, buf, sizeof(buf), &read);
|
hr = IStream_Read(stgmed->pstm, buf, sizeof(buf), &read);
|
||||||
if (hr != S_OK) break;
|
if (hr != S_OK) break;
|
||||||
|
|
||||||
hr = IStream_Write(This->stream, buf, read, &written);
|
hr = IStream_Write(This->stream, buf, read, &written);
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#define COBJMACROS
|
#define COBJMACROS
|
||||||
#define NONAMELESSUNION
|
|
||||||
|
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "ole2.h"
|
#include "ole2.h"
|
||||||
|
@ -348,7 +346,7 @@ static inline HRESULT report_data(BindStatusCallback *This)
|
||||||
return hres;
|
return hres;
|
||||||
|
|
||||||
stgmedium.tymed = TYMED_ISTREAM;
|
stgmedium.tymed = TYMED_ISTREAM;
|
||||||
stgmedium.u.pstm = This->stream;
|
stgmedium.pstm = This->stream;
|
||||||
stgmedium.pUnkForRelease = NULL;
|
stgmedium.pUnkForRelease = NULL;
|
||||||
|
|
||||||
hres = IBindStatusCallback_OnDataAvailable(This->bsc,
|
hres = IBindStatusCallback_OnDataAvailable(This->bsc,
|
||||||
|
@ -518,7 +516,7 @@ static HRESULT WINAPI XMLView_BindStatusCallback_OnDataAvailable(
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &size);
|
hres = IStream_Read(pstgmed->pstm, buf, sizeof(buf), &size);
|
||||||
IStream_Write(This->stream, buf, size, &size);
|
IStream_Write(This->stream, buf, size, &size);
|
||||||
} while(hres==S_OK && size);
|
} while(hres==S_OK && size);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue