November 2012 - Wine-Commits

Austin English : include: Remove stray linefeeds.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: c540cca987ec56e4212b2a6dda1ea60f9a8c720d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c540cca987ec56e4212b2a6dd… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 19 17:47:11 2012 -0600 include: Remove stray linefeeds. --- include/endpointvolume.idl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/endpointvolume.idl b/include/endpointvolume.idl index f58450a..eaf4f8a 100644 --- a/include/endpointvolume.idl +++ b/include/endpointvolume.idl @@ -30,9 +30,9 @@ typedef struct AUDIO_VOLUME_NOTIFICATION_DATA cpp_quote("typedef struct AUDIO_VOLUME_NOTIFICATION_DATA *PAUDIO_VOLUME_NOTIFICATION_DATA;") -cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_VOLUME 0x1\n") -cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_MUTE 0x2\n") -cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_METER 0x4\n") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_VOLUME 0x1") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_MUTE 0x2") +cpp_quote("#define ENDPOINT_HARDWARE_SUPPORT_METER 0x4") interface IAudioEndpointVolumeCallback; interface IAudioEndpointVolume;

1 0

Nikolay Sivov : xmllite: Implement GetNodeType() for reader.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: befbc8f57dea0dc20d7d61ba90a5b183d8da05ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=befbc8f57dea0dc20d7d61ba9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 18 19:00:24 2012 -0500 xmllite: Implement GetNodeType() for reader. --- dlls/xmllite/reader.c | 8 ++++++-- dlls/xmllite/tests/reader.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 188b419..1970ac8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -87,6 +87,7 @@ typedef struct _xmlreader xmlreaderinput *input; IMalloc *imalloc; XmlReadState state; + XmlNodeType nodetype; DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ } xmlreader; @@ -469,8 +470,10 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) { - FIXME("(%p %p): stub\n", iface, node_type); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, node_type); + *node_type = This->nodetype; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) @@ -725,6 +728,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->line = reader->pos = 0; reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc); + reader->nodetype = XmlNodeType_None; *obj = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f5b7680..7d77fe9 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -351,6 +351,7 @@ static void test_reader_create(void) IXmlReader *reader; IUnknown *input; DtdProcessing dtd; + XmlNodeType nodetype; /* crashes native */ if (0) @@ -364,6 +365,11 @@ static void test_reader_create(void) test_read_state(reader, XmlReadState_Closed, -1, FALSE); + nodetype = XmlNodeType_Element; + hr = IXmlReader_GetNodeType(reader, &nodetype); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + dtd = 2; hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -403,6 +409,7 @@ static void test_readerinput(void) IXmlReader *reader, *reader2; IUnknown *obj, *input; IStream *stream, *stream2; + XmlNodeType nodetype; HRESULT hr; LONG ref; @@ -444,6 +451,11 @@ static void test_readerinput(void) test_read_state(reader, XmlReadState_Initial, -1, FALSE); + nodetype = XmlNodeType_Element; + hr = IXmlReader_GetNodeType(reader, &nodetype); + ok(hr == S_OK, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); ok(ref == 3, "Expected 3, got %d\n", ref);

1 0

Nikolay Sivov : odbc32: Implement SQLDataSourcesA() forward.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: b5ee2079e22d4e2ff4175471e9780b1d88d3f197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ee2079e22d4e2ff4175471e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 22:56:50 2012 -0500 odbc32: Implement SQLDataSourcesA() forward. --- dlls/odbc32/odbc32.spec | 2 +- dlls/odbc32/proxyodbc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec index 8e54e2b..766eec0 100644 --- a/dlls/odbc32/odbc32.spec +++ b/dlls/odbc32/odbc32.spec @@ -150,7 +150,7 @@ 254 stub SQLTablesA 255 stub SQLBrowseConnectA 256 stub SQLColumnPrivilegesA -257 stub SQLDataSourcesA +257 stdcall SQLDataSourcesA(long long str long ptr str long ptr) 260 stub SQLForeignKeysA 262 stub SQLNativeSqlA 265 stub SQLPrimaryKeysA diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 50a2f99..10adf16 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -75,6 +75,7 @@ static SQLRETURN (*pSQLConnect)(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLIN static SQLRETURN (*pSQLConnectW)(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT); static SQLRETURN (*pSQLCopyDesc)(SQLHDESC,SQLHDESC); static SQLRETURN (*pSQLDataSources)(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); +static SQLRETURN (*pSQLDataSourcesA)(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); static SQLRETURN (*pSQLDataSourcesW)(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*); static SQLRETURN (*pSQLDescribeCol)(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLUINTEGER*,SQLSMALLINT*,SQLSMALLINT*); static SQLRETURN (*pSQLDescribeColW)(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*); @@ -584,6 +585,7 @@ static BOOL ODBC_LoadDMFunctions(void) LOAD_FUNC(SQLConnectW); LOAD_FUNC(SQLCopyDesc); LOAD_FUNC(SQLDataSources); + LOAD_FUNC(SQLDataSourcesA); LOAD_FUNC(SQLDataSourcesW); LOAD_FUNC(SQLDescribeCol); LOAD_FUNC(SQLDescribeColW); @@ -969,6 +971,32 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle, return ret; } +SQLRETURN WINAPI SQLDataSourcesA(SQLHENV EnvironmentHandle, + SQLUSMALLINT Direction, SQLCHAR *ServerName, + SQLSMALLINT BufferLength1, SQLSMALLINT *NameLength1, + SQLCHAR *Description, SQLSMALLINT BufferLength2, + SQLSMALLINT *NameLength2) +{ + SQLRETURN ret; + + TRACE("EnvironmentHandle = %p\n", (void*)EnvironmentHandle); + + if (!pSQLDataSourcesA) return SQL_ERROR; + + ret = pSQLDataSourcesA(EnvironmentHandle, Direction, ServerName, + BufferLength1, NameLength1, Description, BufferLength2, NameLength2); + if (TRACE_ON(odbc)) + { + TRACE("returns: %d \t", ret); + if (NameLength1 && *NameLength1 > 0) + TRACE("DataSource = %s,", ServerName); + if (NameLength2 && *NameLength2 > 0) + TRACE(" Description = %s", Description); + TRACE("\n"); + } + + return ret; +} /************************************************************************* * SQLDescribeCol [ODBC32.008]

1 0

André Hentschel : dwrite: Fix possible NULL pointer access in heap_strdup*.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 7e2cac2602e1b7f894ffa7a61b0f8600d4dbddbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e2cac2602e1b7f894ffa7a61… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:26 2012 +0100 dwrite: Fix possible NULL pointer access in heap_strdup*. --- dlls/dwrite/dwrite_private.h | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 54ae0dc..0c2698e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -47,7 +47,8 @@ static inline LPWSTR heap_strdupW(const WCHAR *str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -60,8 +61,11 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) if (len) { ret = heap_alloc((len+1)*sizeof(WCHAR)); - memcpy(ret, str, len*sizeof(WCHAR)); - ret[len] = 0; + if(ret) + { + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } } return ret;

1 0

André Hentschel : msxml3: Fix possible NULL pointer access in heap_strdupW.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: c02b84d3c5f041942a46d5e87d9965a5e86989ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02b84d3c5f041942a46d5e87… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:35 2012 +0100 msxml3: Fix possible NULL pointer access in heap_strdupW. --- dlls/msxml3/msxml_private.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 503a580..66baea8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -194,7 +194,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret;

1 0

André Hentschel : mshtml: Fix possible NULL pointer access in heap_str*.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: e9bfe83683266edcc2917e3d151254aefd4b070d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bfe83683266edcc2917e3d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:32 2012 +0100 mshtml: Fix possible NULL pointer access in heap_str*. --- dlls/mshtml/mshtml_private.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6c7662e..f9c05f0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1033,7 +1033,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -1045,8 +1046,11 @@ static inline LPWSTR heap_strndupW(LPCWSTR str, unsigned len) if(str) { ret = heap_alloc((len+1)*sizeof(WCHAR)); - memcpy(ret, str, len*sizeof(WCHAR)); - ret[len] = 0; + if(ret) + { + memcpy(ret, str, len*sizeof(WCHAR)); + ret[len] = 0; + } } return ret; @@ -1061,7 +1065,8 @@ static inline char *heap_strdupA(const char *str) size = strlen(str)+1; ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -1076,7 +1081,8 @@ static inline WCHAR *heap_strdupAtoW(const char *str) len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); ret = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); } return ret; @@ -1089,7 +1095,8 @@ static inline char *heap_strdupWtoA(LPCWSTR str) if(str) { DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); } return ret;

1 0

André Hentschel : jscript: Fix possible NULL pointer access in heap_strdupW.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 6804ae26fbee19603beb6b310f53eb07c48145cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6804ae26fbee19603beb6b310… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:29 2012 +0100 jscript: Fix possible NULL pointer access in heap_strdupW. --- dlls/jscript/jscript.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 6b7c5a1..0ab2e06 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -84,7 +84,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret;

1 0

André Hentschel : advpack: Fix possible NULL pointer access in heap_strdupWtoA.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: bafe54e7e515d88cd3cd3a7b7cdb64222fe9afd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafe54e7e515d88cd3cd3a7b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:49:49 2012 +0100 advpack: Fix possible NULL pointer access in heap_strdupWtoA. --- dlls/advpack/advpack_private.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index a1bcfe4..5d74897 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -44,7 +44,8 @@ static inline char *heap_strdupWtoA(const WCHAR *str) if(str) { size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); } return ret;

1 0

André Hentschel : urlmon: Fix possible NULL pointer access in heap_strdup*.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: 78b08cdabdc1ef6123d7d21b8d7b84809fb2b8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b08cdabdc1ef6123d7d21b8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:52:38 2012 +0100 urlmon: Fix possible NULL pointer access in heap_strdup*. --- dlls/urlmon/urlmon_main.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 2d51818..01de984 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -261,7 +261,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) size = (strlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); - memcpy(ret, str, size); + if(ret) + memcpy(ret, str, size); } return ret; @@ -289,7 +290,8 @@ static inline LPWSTR heap_strdupAtoW(const char *str) if(str) { DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); ret = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); } return ret; @@ -302,7 +304,8 @@ static inline char *heap_strdupWtoA(const WCHAR *str) if(str) { size_t size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); ret = heap_alloc(size); - WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); } return ret;

1 0

André Hentschel : dmsynth: Fix compilation on systems that don't support nameless structs or unions.
by Alexandre Julliard Nov. 19, 2012

Nov. 19, 2012

Module: wine Branch: master Commit: ac90476211c30a0db5b8c83d5a3279841f4dc119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac90476211c30a0db5b8c83d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 17 22:48:01 2012 +0100 dmsynth: Fix compilation on systems that don't support nameless structs or unions. --- dlls/dmsynth/synth.c | 20 +++++++++++--------- dlls/dmsynth/synthsink.c | 12 +++++++----- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index f34594d..3ca5c53 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -21,6 +21,8 @@ #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "objbase.h" #include "initguid.h" #include "dmksctrl.h" @@ -418,45 +420,45 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR { TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); + TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); - if (Property->Flags != KSPROPERTY_TYPE_GET) + if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %u not yet supported\n", Property->Flags); + FIXME("Property flags %u not yet supported\n", Property->u.s.Flags); return S_FALSE; } if (DataLength < sizeof(DWORD)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_INSTRUMENT2)) + if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_INSTRUMENT2)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_DLS2)) + else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_DLS2)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GM_Hardware)) + else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_GM_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GS_Hardware)) + else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_GS_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_XG_Hardware)) + else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_XG_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } else { - FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); + FIXME("Unknown property %s\n", debugstr_guid(&Property->u.s.Set)); *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 4d2001c..c5a1c7e 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "dmsynth_private.h" #include "initguid.h" #include "uuids.h" @@ -212,25 +214,25 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P { TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); + TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); - if (Property->Flags != KSPROPERTY_TYPE_GET) + if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %u not yet supported\n", Property->Flags); + FIXME("Property flags %u not yet supported\n", Property->u.s.Flags); return S_FALSE; } if (DataLength < sizeof(DWORD)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_SinkUsesDSound)) + if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_SinkUsesDSound)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } else { - FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); + FIXME("Unknown property %s\n", debugstr_guid(&Property->u.s.Set)); *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); }

1 0