November 2021 - Wine-Commits

Eric Pouech : winedump: Add some missing next record computation for type leaf.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 1131b3268551058e19f073e48bd06d9c67df591c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1131b3268551058e19f073e4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:31:30 2021 +0100 winedump: Add some missing next record computation for type leaf. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 12d1a9e62ab..18c591f44ef 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -675,12 +675,14 @@ static void do_field(const unsigned char* start, const unsigned char* end) printf("\t\tFriend function V1: '%s' type:%x\n", p_string(&fieldtype->friendfcn_v1.p_name), fieldtype->friendfcn_v1.type); + ptr += 2 + 2 + (1 + fieldtype->stmember_v2.p_name.namelen); break; case LF_FRIENDFCN_V2: printf("\t\tFriend function V2: '%s' type:%x\n", p_string(&fieldtype->friendfcn_v2.p_name), fieldtype->friendfcn_v2.type); + ptr += 2 + 2 + 4 + (1 + fieldtype->stmember_v2.p_name.namelen); break; #if 0 @@ -735,10 +737,12 @@ static void do_field(const unsigned char* start, const unsigned char* end) case LF_FRIENDCLS_V1: printf("\t\tFriend class V1: type:%x\n", fieldtype->friendcls_v1.type); + ptr += 2 + 2; break; case LF_FRIENDCLS_V2: printf("\t\tFriend class V2: type:%x\n", fieldtype->friendcls_v2.type); + ptr += 2 + 2 + 4; break; case LF_NESTTYPE_V1: @@ -777,11 +781,13 @@ static void do_field(const unsigned char* start, const unsigned char* end) case LF_VFUNCOFF_V1: printf("\t\tVirtual function table offset V1: type:%x offset:%x\n", fieldtype->vfuncoff_v1.type, fieldtype->vfuncoff_v1.offset); + ptr += 2 + 2 + 4; break; case LF_VFUNCOFF_V2: printf("\t\tVirtual function table offset V2: type:%x offset:%x\n", fieldtype->vfuncoff_v2.type, fieldtype->vfuncoff_v2.offset); + ptr += 2 + 2 + 4 + 4; break; default:

1 0

Alexandre Julliard : dnsapi: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: da65aa5b747dc0dce707cf958a81be6f1fdd9b77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da65aa5b747dc0dce707cf95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 16:54:28 2021 +0100 dnsapi: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/Makefile.in | 1 + dlls/dnsapi/dnsapi.h | 46 +++++++++++++++--- dlls/dnsapi/libresolv.c | 125 +++++++++++++++--------------------------------- dlls/dnsapi/main.c | 6 ++- dlls/dnsapi/query.c | 32 +++++++++---- 5 files changed, 106 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da65aa5b747dc0dce707…

1 0

Alexandre Julliard : dnsapi: Fix the DNS_KEY_DATA and DNS_SIG_DATA structure definitions.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 0b7dba8c71ea5d9808d2108e29719328b40e6b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7dba8c71ea5d9808d2108e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:46:28 2021 +0100 dnsapi: Fix the DNS_KEY_DATA and DNS_SIG_DATA structure definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/libresolv.c | 2 ++ dlls/dnsapi/record.c | 12 ++++++------ include/windns.h | 10 ++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index 197ca84aeae..e5c520a0a32 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -581,6 +581,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD r->Data.KEY.chAlgorithm = *pos++; size = rr->rdata + rr->rdlength - pos; + r->Data.KEY.wKeyLength = size; for (i = 0; i < size; i++) r->Data.KEY.Key[i] = *pos++; @@ -668,6 +669,7 @@ static DNS_STATUS copy_rdata( ns_msg msg, const ns_rr *rr, DNS_RECORDA *r, WORD r->Data.SIG.wKeyTag = *(const WORD *)pos; size = rr->rdata + rr->rdlength - pos; + r->Data.SIG.wSignatureLength = size; for (i = 0; i < size; i++) r->Data.SIG.Signature[i] = *pos++; diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 5a75503d892..014d788cf5e 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -221,10 +221,10 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) { if (r1->Data.KEY.wFlags != r2->Data.KEY.wFlags || r1->Data.KEY.chProtocol != r2->Data.KEY.chProtocol || - r1->Data.KEY.chAlgorithm != r2->Data.KEY.chAlgorithm) + r1->Data.KEY.chAlgorithm != r2->Data.KEY.chAlgorithm || + r1->Data.KEY.wKeyLength != r2->Data.KEY.wKeyLength) return FALSE; - if (memcmp( r1->Data.KEY.Key, r2->Data.KEY.Key, - r1->wDataLength - sizeof(DNS_KEY_DATA) + 1 )) + if (memcmp( r1->Data.KEY.Key, r2->Data.KEY.Key, r1->Data.KEY.wKeyLength )) return FALSE; break; } @@ -238,10 +238,10 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) r1->Data.SIG.dwOriginalTtl != r2->Data.SIG.dwOriginalTtl || r1->Data.SIG.dwExpiration != r2->Data.SIG.dwExpiration || r1->Data.SIG.dwTimeSigned != r2->Data.SIG.dwTimeSigned || - r1->Data.SIG.wKeyTag != r2->Data.SIG.wKeyTag) + r1->Data.SIG.wKeyTag != r2->Data.SIG.wKeyTag || + r1->Data.SIG.wSignatureLength != r2->Data.SIG.wSignatureLength) return FALSE; - if (memcmp( r1->Data.SIG.Signature, r2->Data.SIG.Signature, - r1->wDataLength - sizeof(DNS_SIG_DATAA) + 1 )) + if (memcmp( r1->Data.SIG.Signature, r2->Data.SIG.Signature, r1->Data.SIG.wSignatureLength )) return FALSE; break; } diff --git a/include/windns.h b/include/windns.h index f1f2184281c..9796a299d04 100644 --- a/include/windns.h +++ b/include/windns.h @@ -339,6 +339,8 @@ typedef struct WORD wFlags; BYTE chProtocol; BYTE chAlgorithm; + WORD wKeyLength; + WORD wPad; BYTE Key[1]; } DNS_KEY_DATA, *PDNS_KEY_DATA; @@ -355,7 +357,6 @@ typedef struct typedef struct { - PSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -363,13 +364,13 @@ typedef struct DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PSTR pNameSigner; BYTE Signature[1]; } DNS_SIG_DATAA, *PDNS_SIG_DATAA; typedef struct { - PWSTR pNameSigner; WORD wTypeCovered; BYTE chAlgorithm; BYTE chLabelCount; @@ -377,7 +378,8 @@ typedef struct DWORD dwExpiration; DWORD dwTimeSigned; WORD wKeyTag; - WORD Pad; + WORD wSignatureLength; + PWSTR pNameSigner; BYTE Signature[1]; } DNS_SIG_DATAW, *PDNS_SIG_DATAW;

1 0

Eric Pouech : mscvpdb.h: Update some line number oriented definitions.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: d33ff5d8885a8b5907c6d03f86d3dcf8c6946477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d33ff5d8885a8b5907c6d03f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:32:23 2021 +0100 mscvpdb.h: Update some line number oriented definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 103 ++++++++++++++++++++++++++++++++++ tools/winedump/msc.c | 148 ++++++++++++++++++++++++++++++++++--------------- 2 files changed, 206 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d33ff5d8885a8b5907c6…

1 0

Alistair Leslie-Hughes : msdasql: Support IRowsetInfo in IRowset interface.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 3c34f073c0d80099a992ceeabb644a4738728dea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c34f073c0d80099a992ceea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:22 2021 +1100 msdasql: Support IRowsetInfo in IRowset interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 63 +++++++++++++++++++++++++++++++++++++++++++ dlls/msdasql/tests/provider.c | 12 +++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 6a1e6bb8e0d..85b11670687 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -412,6 +412,7 @@ static HRESULT WINAPI command_Cancel(ICommandText *iface) struct msdasql_rowset { IRowset IRowset_iface; + IRowsetInfo IRowsetInfo_iface; LONG refs; }; @@ -420,6 +421,11 @@ static inline struct msdasql_rowset *impl_from_IRowset( IRowset *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowset_iface ); } +static inline struct msdasql_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowsetInfo_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -432,6 +438,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IRowset_iface; } + else if (IsEqualGUID(&IID_IRowsetInfo, riid)) + { + *ppv = &rowset->IRowsetInfo_iface; + } if(*ppv) { @@ -515,6 +525,58 @@ static const struct IRowsetVtbl msdasql_rowset_vtbl = msdasql_rowset_RestartPosition }; +static HRESULT WINAPI rowset_info_QueryInterface(IRowsetInfo *iface, REFIID riid, void **ppv) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, ppv); +} + +static ULONG WINAPI rowset_info_AddRef(IRowsetInfo *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_info_Release(IRowsetInfo *iface) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG count, + const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %ld, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL ordinal, + REFIID riid, IUnknown **unk) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %ld, %s, %p\n", rowset, ordinal, debugstr_guid(riid), unk); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_info_GetSpecification(IRowsetInfo *iface, REFIID riid, + IUnknown **specification) +{ + struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); + FIXME("%p, %s, %p\n", rowset, debugstr_guid(riid), specification); + return E_NOTIMPL; +} + +struct IRowsetInfoVtbl rowset_info_vtbl = +{ + rowset_info_QueryInterface, + rowset_info_AddRef, + rowset_info_Release, + rowset_info_GetProperties, + rowset_info_GetReferencedRowset, + rowset_info_GetSpecification +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -529,6 +591,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI return E_OUTOFMEMORY; msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; + msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 8b8d8e4b494..604815b1ee5 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -222,6 +222,16 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) ICommandText_Release(comand_text); } +static void test_rowset_interfaces(IRowset *rowset) +{ + IRowsetInfo *info; + HRESULT hr; + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); + ok(hr == S_OK, "got 0x%08x\n", hr); + IRowsetInfo_Release(info); +} + static void test_command_rowset(IUnknown *cmd) { ICommandText *comand_text; @@ -258,6 +268,8 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); + test_rowset_interfaces(rowset); + IRowset_Release(rowset); IUnknown_Release(unk); }

1 0

Alistair Leslie-Hughes : msdasql: Support IColumnsInfo in Rowset.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 60c97a57c2fd5e576cf9ffa0587447b6c9d304b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60c97a57c2fd5e576cf9ffa0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:23 2021 +1100 msdasql: Support IColumnsInfo in Rowset. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/session.c | 56 ++++++++++++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 5 ++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 85b11670687..898cf6fa864 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -413,6 +413,7 @@ struct msdasql_rowset { IRowset IRowset_iface; IRowsetInfo IRowsetInfo_iface; + IColumnsInfo IColumnsInfo_iface; LONG refs; }; @@ -426,6 +427,11 @@ static inline struct msdasql_rowset *impl_from_IRowsetInfo( IRowsetInfo *iface ) return CONTAINING_RECORD( iface, struct msdasql_rowset, IRowsetInfo_iface ); } +static inline struct msdasql_rowset *rowset_impl_from_IColumnsInfo( IColumnsInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsInfo_iface ); +} + static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -442,6 +448,10 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IRowsetInfo_iface; } + else if (IsEqualGUID(&IID_IColumnsInfo, riid)) + { + *ppv = &rowset->IColumnsInfo_iface; + } if(*ppv) { @@ -547,7 +557,7 @@ static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %ld, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + FIXME("%p, %d, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); return E_NOTIMPL; } @@ -577,6 +587,49 @@ struct IRowsetInfoVtbl rowset_info_vtbl = rowset_info_GetSpecification }; +static HRESULT WINAPI rowset_colsinfo_QueryInterface(IColumnsInfo *iface, REFIID riid, void **out) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); +} + +static ULONG WINAPI rowset_colsinfo_AddRef(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_AddRef(&rowset->IRowset_iface); +} + +static ULONG WINAPI rowset_colsinfo_Release(IColumnsInfo *iface) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + return IRowset_Release(&rowset->IRowset_iface); +} + +static HRESULT WINAPI rowset_colsinfo_GetColumnInfo(IColumnsInfo *iface, DBORDINAL *columns, + DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %p, %p, %p\n", rowset, columns, colinfo, stringsbuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowset_colsinfo_MapColumnIDs(IColumnsInfo *iface, DBORDINAL column_ids, + const DBID *dbids, DBORDINAL *columns) +{ + struct msdasql_rowset *rowset = rowset_impl_from_IColumnsInfo( iface ); + FIXME("%p, %lu, %p, %p\n", rowset, column_ids, dbids, columns); + return E_NOTIMPL; +} + +static struct IColumnsInfoVtbl rowset_columninfo_vtbll = +{ + rowset_colsinfo_QueryInterface, + rowset_colsinfo_AddRef, + rowset_colsinfo_Release, + rowset_colsinfo_GetColumnInfo, + rowset_colsinfo_MapColumnIDs +}; + static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -592,6 +645,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IRowset_iface.lpVtbl = &msdasql_rowset_vtbl; msrowset->IRowsetInfo_iface.lpVtbl = &rowset_info_vtbl; + msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->refs = 1; if (affected) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 604815b1ee5..708d6d22ed3 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -225,11 +225,16 @@ static void test_command_dbsession(IUnknown *cmd, IUnknown *session) static void test_rowset_interfaces(IRowset *rowset) { IRowsetInfo *info; + IColumnsInfo *col_info; HRESULT hr; hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); ok(hr == S_OK, "got 0x%08x\n", hr); IRowsetInfo_Release(info); + + hr = IRowset_QueryInterface(rowset, &IID_IColumnsInfo, (void**)&col_info); + ok(hr == S_OK, "got 0x%08x\n", hr); + IColumnsInfo_Release(col_info); } static void test_command_rowset(IUnknown *cmd)

1 0

Alistair Leslie-Hughes : msdasql: Correct ICommandText Execute test.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 6649396abe04a0630c7d5450f49607235f041aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=6649396abe04a0630c7d5450… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 2 13:21:21 2021 +1100 msdasql: Correct ICommandText Execute test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/tests/provider.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index df642a6a637..8b8d8e4b494 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -244,12 +244,16 @@ static void test_command_rowset(IUnknown *cmd) if (unk) IUnknown_Release(unk); - affected = 9999; hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK && unk) + + affected = 9999; + hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != NULL, "Unexepcted value\n"); + if (hr == S_OK) { - ok(affected == 0, "wrong affected value\n"); + ok(affected == -1, "wrong affected value\n"); hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Zhiyi Zhang : uxtheme: Implement GetThemeTransitionDuration().
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: c90edc19bba34612180d754c07597f1893d2fec9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90edc19bba34612180d754c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 2 14:28:08 2021 +0800 uxtheme: Implement GetThemeTransitionDuration(). Fix Nokia SDK 2.0 for Java installer buttons not changing state after clicking. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/metric.c | 30 +++++++++++++++++++++++++++--- dlls/uxtheme/tests/system.c | 22 ++++------------------ 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index b7c173740d7..3ef199bcca7 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -228,8 +228,32 @@ HRESULT WINAPI GetThemeSysString(HTHEME hTheme, int iStringID, HRESULT WINAPI GetThemeTransitionDuration(HTHEME hTheme, int iPartId, int iStateIdFrom, int iStateIdTo, int iPropId, DWORD *pdwDuration) { - FIXME("(%p, %u, %u, %u, %u, %p) stub\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, - iPropId, pdwDuration); + INTLIST intlist; + HRESULT hr; + + TRACE("(%p, %d, %d, %d, %d, %p)\n", hTheme, iPartId, iStateIdFrom, iStateIdTo, iPropId, + pdwDuration); + + if (!pdwDuration || iStateIdFrom < 1 || iStateIdTo < 1) + return E_INVALIDARG; + + hr = GetThemeIntList(hTheme, iPartId, 0, iPropId, &intlist); + if (FAILED(hr)) + { + if (hr == E_PROP_ID_UNSUPPORTED) + *pdwDuration = 0; + + return hr; + } + + if (intlist.iValueCount < 1 || iStateIdFrom > intlist.iValues[0] + || iStateIdTo > intlist.iValues[0] + || intlist.iValueCount != 1 + intlist.iValues[0] * intlist.iValues[0]) + { + *pdwDuration = 0; + return E_INVALIDARG; + } - return E_NOTIMPL; + *pdwDuration = intlist.iValues[1 + intlist.iValues[0] * (iStateIdFrom - 1) + (iStateIdTo - 1)]; + return S_OK; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 57901e6affb..10857115061 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1329,74 +1329,64 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(NULL, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + /* Crash on Wine. HTHEME is not a pointer that can be directly referenced. */ + if (strcmp(winetest_platform, "wine")) + { duration = 0xdeadbeef; hr = pGetThemeTransitionDuration((HTHEME)0xdeadbeef, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); todo_wine ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + } duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, 0xdeadbeef, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL - 1, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_NORMAL - 1, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING + 1, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_BACKGROUND, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, 0xdeadbeef, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, NULL); - todo_wine ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); /* Parts that don't have TMT_TRANSITIONDURATIONS */ @@ -1406,9 +1396,7 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_GROUPBOX, GBS_NORMAL, GBS_DISABLED, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); - todo_wine ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); /* Test parsing TMT_TRANSITIONDURATIONS property. TMT_TRANSITIONDURATIONS is a vista+ property */ @@ -1436,10 +1424,8 @@ static void test_GetThemeTransitionDuration(void) duration = 0xdeadbeef; hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, from_state, to_state, TMT_TRANSITIONDURATIONS, &duration); - todo_wine ok(hr == S_OK, "GetThemeTransitionDuration failed, hr %#x.\n", hr); expected = intlist.iValues[1 + intlist.iValues[0] * (from_state - 1) + (to_state - 1)]; - todo_wine ok(duration == expected, "Expected duration %d, got %d.\n", expected, duration); winetest_pop_context();

1 0

Zhiyi Zhang : uxtheme/tests: Add GetThemeTransitionDuration() tests.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 59007aaeef4ae39ed04b358aafeef2004ecd3522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59007aaeef4ae39ed04b358a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 2 14:27:59 2021 +0800 uxtheme/tests: Add GetThemeTransitionDuration() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 154 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 541d46deeaa..57901e6affb 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -43,6 +43,7 @@ static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static HRESULT (WINAPI *pGetThemeIntList)(HTHEME, int, int, int, INTLIST *); +static HRESULT (WINAPI *pGetThemeTransitionDuration)(HTHEME, int, int, int, int, DWORD *); static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); static LONG (WINAPI *pDisplayConfigSetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER *); @@ -81,6 +82,7 @@ static void init_funcs(void) GET_PROC(uxtheme, GetBufferedPaintTargetDC) GET_PROC(uxtheme, GetBufferedPaintTargetRect) GET_PROC(uxtheme, GetThemeIntList) + GET_PROC(uxtheme, GetThemeTransitionDuration) GET_PROC(uxtheme, OpenThemeDataEx) GET_PROC(uxtheme, OpenThemeDataForDpi) @@ -1299,6 +1301,157 @@ static void test_GetThemeIntList(void) DestroyWindow(hwnd); } +static void test_GetThemeTransitionDuration(void) +{ + int from_state, to_state, expected; + INTLIST intlist; + DWORD duration; + HTHEME theme; + HRESULT hr; + HWND hwnd; + + if (!pGetThemeTransitionDuration || !pGetThemeIntList) + { + win_skip("GetThemeTransitionDuration or GetThemeIntList is unavailable.\n"); + return; + } + + hwnd = CreateWindowA("static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); + theme = OpenThemeData(hwnd, L"Button"); + if (!theme) + { + skip("Theming is not active.\n"); + DestroyWindow(hwnd); + return; + } + + /* Invalid parameter tests */ + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(NULL, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration((HTHEME)0xdeadbeef, BP_PUSHBUTTON, PBS_NORMAL, + PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_HANDLE, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, 0xdeadbeef, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL - 1, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_DEFAULTED_ANIMATING + 1, + PBS_DEFAULTED_ANIMATING, TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_NORMAL - 1, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + ok(duration == 0xdeadbeef, "Expected duration %#x, got %#x.\n", 0xdeadbeef, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING + 1, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_BACKGROUND, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + 0xdeadbeef, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, PBS_NORMAL, PBS_DEFAULTED_ANIMATING, + TMT_TRANSITIONDURATIONS, NULL); + todo_wine + ok(hr == E_INVALIDARG, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + + /* Parts that don't have TMT_TRANSITIONDURATIONS */ + hr = GetThemeIntList(theme, BP_GROUPBOX, GBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeIntList failed, hr %#x.\n", hr); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_GROUPBOX, GBS_NORMAL, GBS_DISABLED, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == E_PROP_ID_UNSUPPORTED, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + todo_wine + ok(duration == 0, "Expected duration %#x, got %#x.\n", 0, duration); + + /* Test parsing TMT_TRANSITIONDURATIONS property. TMT_TRANSITIONDURATIONS is a vista+ property */ + if (LOBYTE(LOWORD(GetVersion())) < 6) + goto done; + + hr = pGetThemeIntList(theme, BP_PUSHBUTTON, PBS_NORMAL, TMT_TRANSITIONDURATIONS, &intlist); + ok(hr == S_OK, "GetThemeIntList failed, hr %#x.\n", hr); + /* The first value is the theme part state count. The following are the values from every state + * to every state. So the total value count should be 1 + state ^ 2 */ + expected = PBS_DEFAULTED_ANIMATING - PBS_NORMAL + 1; + ok(intlist.iValues[0] == expected, "Expected the first value %d, got %d.\n", expected, + intlist.iValues[0]); + expected = 1 + intlist.iValues[0] * intlist.iValues[0]; + ok(intlist.iValueCount == expected, "Expected value count %d, got %d.\n", expected, + intlist.iValueCount); + if (hr == S_OK) + { + for (from_state = PBS_NORMAL; from_state <= PBS_DEFAULTED_ANIMATING; ++from_state) + { + for (to_state = PBS_NORMAL; to_state <= PBS_DEFAULTED_ANIMATING; ++to_state) + { + winetest_push_context("from state %d to %d", from_state, to_state); + + duration = 0xdeadbeef; + hr = pGetThemeTransitionDuration(theme, BP_PUSHBUTTON, from_state, to_state, + TMT_TRANSITIONDURATIONS, &duration); + todo_wine + ok(hr == S_OK, "GetThemeTransitionDuration failed, hr %#x.\n", hr); + expected = intlist.iValues[1 + intlist.iValues[0] * (from_state - 1) + (to_state - 1)]; + todo_wine + ok(duration == expected, "Expected duration %d, got %d.\n", expected, duration); + + winetest_pop_context(); + } + } + } + +done: + CloseThemeData(theme); + DestroyWindow(hwnd); +} + START_TEST(system) { init_funcs(); @@ -1319,6 +1472,7 @@ START_TEST(system) test_CloseThemeData(); test_buffered_paint(); test_GetThemeIntList(); + test_GetThemeTransitionDuration(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming();

1 0

Zhiyi Zhang : uxtheme: Use vssym32.h instead of tmschema.h.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 18eacc6dc760f86eda543e682496ca37abc86fb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18eacc6dc760f86eda543e68… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 2 14:27:31 2021 +0800 uxtheme: Use vssym32.h instead of tmschema.h. tmschema.h is obsolete and missing some definitions. The deleted global and menu classes are not used anywhere and not in Windows headers. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 2 +- dlls/uxtheme/metric.c | 2 +- dlls/uxtheme/msstyles.c | 2 +- dlls/uxtheme/property.c | 2 +- dlls/uxtheme/stylemap.c | 62 +++++++------------------------------------------ dlls/uxtheme/system.c | 2 +- include/tmschema.h | 28 ---------------------- include/vsstyle.h | 7 ++++++ 8 files changed, 20 insertions(+), 87 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index a03217b65cf..bf294ed3cc8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -32,7 +32,7 @@ #include "commoncontrols.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" #include "uxthemedll.h" diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 2d5a09d0256..b7c173740d7 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -26,7 +26,7 @@ #include "winuser.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index f129d998d65..c0f626d54aa 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -28,7 +28,7 @@ #include "winnls.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 93a72ab9189..188f13836e2 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -26,7 +26,7 @@ #include "wingdi.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "msstyles.h" diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 4fe254c1e7a..a7928348304 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -23,9 +23,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "tmschema.h" +#include "vssym32.h" #define TMT_ENUM 200 +#define TMT_STOCKIMAGEFILE 3007 typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; @@ -332,24 +333,6 @@ static const MSSTYLES_ENUM_MAP mapEnum[] = { * Defined as PartID,StateID,TextName * If StateID == 0 then its a part being defined */ - -/* These are globals to all classes, but its treated as a separate class */ -static const MSSTYLES_CLASS_MAP classGlobals[] = { - {GP_BORDER, 0, L"BORDER"}, - {GP_BORDER, BSS_FLAT, L"FLAT"}, - {GP_BORDER, BSS_RAISED, L"RAISED"}, - {GP_BORDER, BSS_SUNKEN, L"SUNKEN"}, - {GP_LINEHORZ, 0, L"LINEHORZ"}, - {GP_LINEHORZ, LHS_FLAT, L"FLAT"}, - {GP_LINEHORZ, LHS_RAISED, L"RAISED"}, - {GP_LINEHORZ, LHS_SUNKEN, L"SUNKEN"}, - {GP_LINEVERT, 0, L"LINEVERT"}, - {GP_LINEVERT, LVS_FLAT, L"FLAT"}, - {GP_LINEVERT, LVS_RAISED, L"RAISED"}, - {GP_LINEVERT, LVS_SUNKEN, L"SUNKEN"}, - {0, 0, L""} -}; - static const MSSTYLES_CLASS_MAP classButton[] = { {BP_PUSHBUTTON, 0, L"PUSHBUTTON"}, {BP_PUSHBUTTON, PBS_NORMAL, L"NORMAL"}, @@ -488,11 +471,12 @@ static const MSSTYLES_CLASS_MAP classHeader[] = { static const MSSTYLES_CLASS_MAP classListview[] = { {LVP_LISTITEM, 0, L"LISTITEM"}, - {LVP_LISTITEM, LIS_NORMAL, L"NORMAL"}, - {LVP_LISTITEM, LIS_HOT, L"HOT"}, - {LVP_LISTITEM, LIS_SELECTED, L"SELECTED"}, - {LVP_LISTITEM, LIS_DISABLED, L"DISABLED"}, - {LVP_LISTITEM, LIS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {LVP_LISTITEM, LISS_NORMAL, L"NORMAL"}, + {LVP_LISTITEM, LISS_HOT, L"HOT"}, + {LVP_LISTITEM, LISS_SELECTED, L"SELECTED"}, + {LVP_LISTITEM, LISS_DISABLED, L"DISABLED"}, + {LVP_LISTITEM, LISS_SELECTEDNOTFOCUS, L"SELECTEDNOTFOCUS"}, + {LVP_LISTITEM, LISS_HOTSELECTED, L"HOTSELECTED"}, {LVP_LISTGROUP, 0, L"LISTGROUP"}, {LVP_LISTDETAIL, 0, L"LISTDETAIL"}, {LVP_LISTSORTEDDETAIL, 0, L"LISTSORTEDDETAIL"}, @@ -500,34 +484,6 @@ static const MSSTYLES_CLASS_MAP classListview[] = { {0, 0, L""} }; -static const MSSTYLES_CLASS_MAP classMenu[] = { - {MP_MENUITEM, 0, L"MENUITEM"}, - {MP_MENUITEM, MS_NORMAL, L"NORMAL"}, - {MP_MENUITEM, MS_SELECTED, L"SELECTED"}, - {MP_MENUITEM, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUDROPDOWN, 0, L"MENUDROPDOWN"}, - {MP_MENUDROPDOWN, MS_NORMAL, L"NORMAL"}, - {MP_MENUDROPDOWN, MS_SELECTED, L"SELECTED"}, - {MP_MENUDROPDOWN, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUBARITEM, 0, L"MENUBARITEM"}, - {MP_MENUBARITEM, MS_NORMAL, L"NORMAL"}, - {MP_MENUBARITEM, MS_SELECTED, L"SELECTED"}, - {MP_MENUBARITEM, MS_DEMOTED, L"DEMOTED"}, - {MP_MENUBARDROPDOWN, 0, L"MENUBARDROPDOWN"}, - {MP_MENUBARDROPDOWN, MS_NORMAL, L"NORMAL"}, - {MP_MENUBARDROPDOWN, MS_SELECTED, L"SELECTED"}, - {MP_MENUBARDROPDOWN, MS_DEMOTED, L"DEMOTED"}, - {MP_CHEVRON, 0, L"CHEVRON"}, - {MP_CHEVRON, MS_NORMAL, L"NORMAL"}, - {MP_CHEVRON, MS_SELECTED, L"SELECTED"}, - {MP_CHEVRON, MS_DEMOTED, L"DEMOTED"}, - {MP_SEPARATOR, 0, L"SEPARATOR"}, - {MP_SEPARATOR, MS_NORMAL, L"NORMAL"}, - {MP_SEPARATOR, MS_SELECTED, L"SELECTED"}, - {MP_SEPARATOR, MS_DEMOTED, L"DEMOTED"}, - {0, 0, L""} -}; - static const MSSTYLES_CLASS_MAP classMenuband[] = { {MDP_NEWAPPBUTTON, 0, L"NEWAPPBUTTON"}, {MDP_NEWAPPBUTTON, MDS_NORMAL, L"NORMAL"}, @@ -1036,7 +992,6 @@ static const MSSTYLES_CLASS_MAP classWindow[] = { /* Map class names to part/state maps */ static const MSSTYLES_CLASS_NAME mapClass[] = { - {classGlobals, L"GLOBALS"}, {classButton, L"BUTTON"}, {classClock, L"CLOCK"}, {classCombobox, L"COMBOBOX"}, @@ -1044,7 +999,6 @@ static const MSSTYLES_CLASS_NAME mapClass[] = { {classExplorerbar, L"EXPLORERBAR"}, {classHeader, L"HEADER"}, {classListview, L"LISTVIEW"}, - {classMenu, L"MENU"}, {classMenuband, L"MENUBAND"}, {classPage, L"PAGE"}, {classProgress, L"PROGRESS"}, diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 0298fe61d4a..ba579a02edc 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -28,7 +28,7 @@ #include "winreg.h" #include "vfwmsgs.h" #include "uxtheme.h" -#include "tmschema.h" +#include "vssym32.h" #include "uxthemedll.h" #include "msstyles.h" diff --git a/include/tmschema.h b/include/tmschema.h index 47eb146ebdc..81bd606d11b 100644 --- a/include/tmschema.h +++ b/include/tmschema.h @@ -594,34 +594,6 @@ BEGIN_TM_PART_STATES(SPECIALGROUPEXPAND) TM_STATE(3, EBSGE, PRESSED) END_TM_PART_STATES() -/* GLOBALS parts */ -BEGIN_TM_CLASS_PARTS(GLOBALS) - TM_PART(1, GP, BORDER) - TM_PART(2, GP, LINEHORZ) - TM_PART(3, GP, LINEVERT) -END_TM_CLASS_PARTS() - -/* GLOBALS - BORDER states */ -BEGIN_TM_PART_STATES(BORDER) - TM_STATE(1, BSS, FLAT) - TM_STATE(2, BSS, RAISED) - TM_STATE(3, BSS, SUNKEN) -END_TM_PART_STATES() - -/* GLOBALS - LINEHORZ states */ -BEGIN_TM_PART_STATES(LINEHORZ) - TM_STATE(1, LHS, FLAT) - TM_STATE(2, LHS, RAISED) - TM_STATE(3, LHS, SUNKEN) -END_TM_PART_STATES() - -/* GLOBAL - LINEVERT states */ -BEGIN_TM_PART_STATES(LINEVERT) - TM_STATE(1, LVS, FLAT) - TM_STATE(2, LVS, RAISED) - TM_STATE(3, LVS, SUNKEN) -END_TM_PART_STATES() - /* HEADER parts */ BEGIN_TM_CLASS_PARTS(HEADER) TM_PART(1, HP, HEADERITEM) diff --git a/include/vsstyle.h b/include/vsstyle.h index c5850111fb3..d6ea9071f64 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1632,6 +1632,13 @@ enum MINBUTTONSTATES { MINBS_DISABLED = 4, }; +enum MAXBUTTONSTATES { + MAXBS_NORMAL = 1, + MAXBS_HOT = 2, + MAXBS_PUSHED = 3, + MAXBS_DISABLED = 4, +}; + enum RESTOREBUTTONSTATES { RBS_NORMAL = 1, RBS_HOT = 2,

1 0