September 2018 - Wine-Commits

Alexandre Julliard : shell32: Avoid infinite loop in _SHExpandEnvironmentStrings.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: ceea5bda14ecf4c8ce262fc7ab88df49e500bc38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceea5bda14ecf4c8ce262fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:59:45 2018 +0200 shell32: Avoid infinite loop in _SHExpandEnvironmentStrings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index afd6340..dccfbba 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3855,22 +3855,15 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) } else { - DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); + DWORD ret = ExpandEnvironmentStringsW(szTemp, szDest, MAX_PATH); if (ret > MAX_PATH) hr = E_NOT_SUFFICIENT_BUFFER; else if (ret == 0) hr = HRESULT_FROM_WIN32(GetLastError()); - else - hr = S_OK; - } - if (SUCCEEDED(hr) && szDest[0] == '%') - strcpyW(szTemp, szDest); - else - { - /* terminate loop */ - szTemp[0] = '\0'; + else if (!strcmpW( szTemp, szDest )) break; /* nothing expanded */ } + if (SUCCEEDED(hr)) strcpyW(szTemp, szDest); } end: if (key)

1 0

Alexandre Julliard : shell32: Assume that system directory always contains a drive letter.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 54530bc4933ae1014c3697c95e22b8ca5a275bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54530bc4933ae1014c3697c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:48:49 2018 +0200 shell32: Assume that system directory always contains a drive letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index fd375a3..afd6340 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3792,8 +3792,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) /* get the system drive */ GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, szDefaultProfileDirW ); hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val ); } @@ -3807,8 +3806,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, UsersPublicW ); hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); @@ -3833,8 +3831,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) if (!in_registry) { GetSystemDirectoryW(def_val, MAX_PATH); - if (def_val[1] == ':') strcpyW( def_val + 3, ProgramDataW ); - else FIXME("non-drive system paths unsupported\n"); + strcpyW( def_val + 3, ProgramDataW ); } hr = _SHGetProfilesValue(key, ProgramDataW, szProgramData, def_val); @@ -3854,16 +3851,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) else if (!strncmpiW(szTemp, SystemDriveW, strlenW(SystemDriveW))) { GetSystemDirectoryW(szDest, MAX_PATH); - if (szDest[1] != ':') - { - FIXME("non-drive system paths unsupported\n"); - hr = E_FAIL; - } - else - { - strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); - hr = S_OK; - } + strcpyW(szDest + 3, szTemp + strlenW(SystemDriveW) + 1); } else {

1 0

Nikolay Sivov : opcservices: Implement GetSourceUri().
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 951741e649dad4728cf95383022a0c01df528c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=951741e649dad4728cf95383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:11 2018 +0300 opcservices: Implement GetSourceUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 2 +- dlls/opcservices/opc_private.h | 2 +- dlls/opcservices/package.c | 40 ++++++++++++++++++++++++++------ dlls/opcservices/tests/opcservices.c | 45 ++++++++++++++++++++++++++++++++---- 4 files changed, 76 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=951741e649dad4728cf9…

1 0

Dmitry Timoshkov : ntoskrnl.exe: Add a stub for MmCreateSection.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 847fb84d816cfaf9b671b2d859d025181fbfcdde URL: https://source.winehq.org/git/wine.git/?a=commit;h=847fb84d816cfaf9b671b2d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 6 17:01:20 2018 +0800 ntoskrnl.exe: Add a stub for MmCreateSection. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 577f5b3..292f89c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2358,6 +2358,18 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS } /*********************************************************************** + * MmCreateSection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + LARGE_INTEGER *size, ULONG protect, ULONG alloc_attr, + HANDLE file, FILE_OBJECT *file_obj ) +{ + FIXME("%p %#x %p %s %#x %#x %p %p: stub\n", handle, access, attr, + wine_dbgstr_longlong(size->QuadPart), protect, alloc_attr, file, file_obj); + return STATUS_NOT_IMPLEMENTED; +} + +/*********************************************************************** * MmFreeNonCachedMemory (NTOSKRNL.EXE.@) */ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8079114..e867dbe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -669,7 +669,7 @@ @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stub MmCreateMdl -@ stub MmCreateSection +@ stdcall MmCreateSection(ptr long ptr ptr long long long ptr) @ stub MmDisableModifiedWriteOfSection @ stub MmFlushImageSection @ stub MmForceSectionClosed

1 0

Nikolay Sivov : opcservices: Implement RelationshipExists().
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 89c2553503bae0539530fc13e37a96dd4e65a39f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89c2553503bae0539530fc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:15 2018 +0300 opcservices: Implement RelationshipExists(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 37 ++++++++++++++++++++++++++---------- dlls/opcservices/tests/opcservices.c | 19 ++++++++++++++++++ 2 files changed, 46 insertions(+), 10 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index d0d39a9..370b42e 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -580,11 +580,25 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) return refcount; } +static struct opc_relationship *opc_relationshipset_get_item(struct opc_relationship_set *relationship_set, + const WCHAR *id) +{ + size_t i; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + return relationship_set->relationships[i]; + } + + return NULL; +} + static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); - size_t i; + struct opc_relationship *ret; TRACE("iface %p, id %s, relationship %p.\n", iface, debugstr_w(id), relationship); @@ -596,14 +610,10 @@ static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet * if (!id) return E_POINTER; - for (i = 0; i < relationship_set->count; i++) + if ((ret = opc_relationshipset_get_item(relationship_set, id))) { - if (!strcmpW(id, relationship_set->relationships[i]->id)) - { - *relationship = &relationship_set->relationships[i]->IOpcRelationship_iface; - IOpcRelationship_AddRef(*relationship); - break; - } + *relationship = &ret->IOpcRelationship_iface; + IOpcRelationship_AddRef(*relationship); } return *relationship ? S_OK : OPC_E_NO_SUCH_RELATIONSHIP; @@ -632,9 +642,16 @@ static HRESULT WINAPI opc_relationship_set_DeleteRelationship(IOpcRelationshipSe static HRESULT WINAPI opc_relationship_set_RelationshipExists(IOpcRelationshipSet *iface, const WCHAR *id, BOOL *exists) { - FIXME("iface %p, id %s, exists %p stub!\n", iface, debugstr_w(id), exists); + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); - return E_NOTIMPL; + TRACE("iface %p, id %s, exists %p.\n", iface, debugstr_w(id), exists); + + if (!id || !exists) + return E_POINTER; + + *exists = opc_relationshipset_get_item(relationship_set, id) != NULL; + + return S_OK; } static HRESULT WINAPI opc_relationship_set_GetEnumerator(IOpcRelationshipSet *iface, diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 63809aa..4bb3d64 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -241,6 +241,7 @@ static void test_relationship(void) DWORD mode; HRESULT hr; WCHAR *id; + BOOL ret; BSTR str; factory = create_factory(); @@ -284,6 +285,19 @@ todo_wine ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + ret = 123; + hr = IOpcRelationshipSet_RelationshipExists(rels, NULL, &ret); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(ret == 123, "Unexpected result %d.\n", ret); + + hr = IOpcRelationshipSet_RelationshipExists(rels, id, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + ret = FALSE; + hr = IOpcRelationshipSet_RelationshipExists(rels, id, &ret); + ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); + ok(ret, "Unexpected result %d.\n", ret); + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); IOpcRelationship_Release(rel3); @@ -302,6 +316,11 @@ todo_wine ok(hr == OPC_E_NO_SUCH_RELATIONSHIP, "Unexpected hr %#x.\n", hr); ok(rel3 == NULL, "Expected null pointer.\n"); + ret = TRUE; + hr = IOpcRelationshipSet_RelationshipExists(rels, id, &ret); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(!ret, "Unexpected result %d.\n", ret); + CoTaskMemFree(id); hr = IOpcRelationship_GetTargetUri(rel, &uri);

1 0

Nikolay Sivov : opcservices: Implement writing stub compressed package.
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 80579d63444a7a10d68a5e0c9660862d7c456f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80579d63444a7a10d68a5e0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:12 2018 +0300 opcservices: Implement writing stub compressed package. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 4 +- dlls/opcservices/compress.c | 366 +++++++++++++++++++++++++++++++++++++++++ dlls/opcservices/factory.c | 5 +- dlls/opcservices/opc_private.h | 8 + dlls/opcservices/package.c | 55 +++++++ 5 files changed, 435 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=80579d63444a7a10d68a…

1 0

Nikolay Sivov : opcservices: Implement GetCompressionOptions().
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: c2d8323f2318903848e67a63e36a33560ac0770f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2d8323f2318903848e67a63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:13 2018 +0300 opcservices: Implement GetCompressionOptions(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 20d7b4e..00f4a4f 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -221,9 +221,12 @@ static HRESULT WINAPI opc_part_GetContentType(IOpcPart *iface, LPWSTR *type) static HRESULT WINAPI opc_part_GetCompressionOptions(IOpcPart *iface, OPC_COMPRESSION_OPTIONS *options) { - FIXME("iface %p, options %p stub!\n", iface, options); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, options %p.\n", iface, options); + + *options = part->compression_options; + return S_OK; } static const IOpcPartVtbl opc_part_vtbl =

1 0

Nikolay Sivov : opcservices: Implement GetRelationship().
by Alexandre Julliard Sept. 6, 2018

Sept. 6, 2018

Module: wine Branch: master Commit: 7e310f87fe1c781dcdbba854df84db29c86d1238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e310f87fe1c781dcdbba854… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 6 06:37:14 2018 +0300 opcservices: Implement GetRelationship(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 25 +++++++++++++++++++++++-- dlls/opcservices/tests/opcservices.c | 21 ++++++++++++++++++++- include/opcbase.idl | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 00f4a4f..d0d39a9 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -583,9 +583,30 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) static HRESULT WINAPI opc_relationship_set_GetRelationship(IOpcRelationshipSet *iface, const WCHAR *id, IOpcRelationship **relationship) { - FIXME("iface %p, id %s, relationship %p stub!\n", iface, debugstr_w(id), relationship); + struct opc_relationship_set *relationship_set = impl_from_IOpcRelationshipSet(iface); + size_t i; - return E_NOTIMPL; + TRACE("iface %p, id %s, relationship %p.\n", iface, debugstr_w(id), relationship); + + if (!relationship) + return E_POINTER; + + *relationship = NULL; + + if (!id) + return E_POINTER; + + for (i = 0; i < relationship_set->count; i++) + { + if (!strcmpW(id, relationship_set->relationships[i]->id)) + { + *relationship = &relationship_set->relationships[i]->IOpcRelationship_iface; + IOpcRelationship_AddRef(*relationship); + break; + } + } + + return *relationship ? S_OK : OPC_E_NO_SUCH_RELATIONSHIP; } static HRESULT WINAPI opc_relationship_set_CreateRelationship(IOpcRelationshipSet *iface, const WCHAR *id, diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index a2a032f..63809aa 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -232,8 +232,8 @@ static void test_relationship(void) static const WCHAR typeW[] = {'t','y','p','e',0}; static const WCHAR rootW[] = {'/',0}; IUri *target_uri, *target_uri2, *uri; + IOpcRelationship *rel, *rel2, *rel3; IOpcUri *source_uri, *source_uri2; - IOpcRelationship *rel, *rel2; IOpcRelationshipSet *rels; IOpcFactory *factory; IOpcPackage *package; @@ -283,6 +283,25 @@ todo_wine hr = IOpcRelationship_GetId(rel, &id); ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); ok(lstrlenW(id) == 9 && *id == 'R', "Unexpected relationship id %s.\n", wine_dbgstr_w(id)); + + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); + ok(SUCCEEDED(hr), "Failed to get relationship, hr %#x.\n", hr); + IOpcRelationship_Release(rel3); + + hr = IOpcRelationshipSet_GetRelationship(rels, id, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + rel3 = (void *)0xdeadbeef; + hr = IOpcRelationshipSet_GetRelationship(rels, NULL, &rel3); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(rel3 == NULL, "Expected null pointer.\n"); + + *id = 'r'; + rel3 = (void *)0xdeadbeef; + hr = IOpcRelationshipSet_GetRelationship(rels, id, &rel3); + ok(hr == OPC_E_NO_SUCH_RELATIONSHIP, "Unexpected hr %#x.\n", hr); + ok(rel3 == NULL, "Expected null pointer.\n"); + CoTaskMemFree(id); hr = IOpcRelationship_GetTargetUri(rel, &uri); diff --git a/include/opcbase.idl b/include/opcbase.idl index 80f459f..ca42ceb 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -42,3 +42,4 @@ typedef [v1_enum] enum } OPC_URI_TARGET_MODE; cpp_quote("#define OPC_E_INVALID_RELATIONSHIP_TARGET MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x12)") +cpp_quote("#define OPC_E_NO_SUCH_RELATIONSHIP MAKE_HRESULT(SEVERITY_ERROR, FACILITY_OPC, 0x48)")

1 0

Zhiyi Zhang : comctl32/button: Support displaying both image and text.
by Alexandre Julliard Sept. 5, 2018

Sept. 5, 2018

Module: wine Branch: master Commit: 1f323f31d6311fe3c3a33f237583afe489325265 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f323f31d6311fe3c3a33f23… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 5 22:57:39 2018 +0800 comctl32/button: Support displaying both image and text. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45727 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 421 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 295 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1f323f31d6311fe3c3a3…

1 0

Zhiyi Zhang : comctl32/button: Use get_draw_state() helper.
by Alexandre Julliard Sept. 5, 2018

Sept. 5, 2018

Module: wine Branch: master Commit: fa4183ef848fd53b492440f99a975e5e9ace86cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa4183ef848fd53b492440f9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 5 22:57:18 2018 +0800 comctl32/button: Use get_draw_state() helper. Use a helper so that the get draw state routine can be shared by later code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 118 +++++++++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 56968f9..6f9bc39 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -128,15 +128,16 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BST_UNCHECKED /* BS_DEFCOMMANDLINK */ }; -/* These are indices into a states array to determine the theme state for a given theme part. */ -typedef enum +/* Generic draw states, use get_draw_state() to get specific state for button type */ +enum draw_state { STATE_NORMAL, STATE_DISABLED, STATE_HOT, STATE_PRESSED, - STATE_DEFAULTED -} ButtonState; + STATE_DEFAULTED, + DRAW_STATE_COUNT +}; typedef void (*pfPaint)( const BUTTON_INFO *infoPtr, HDC hdc, UINT action ); @@ -160,11 +161,11 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = PB_Paint /* BS_DEFCOMMANDLINK */ }; -typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); +typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); -static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); -static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); -static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); +static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = { @@ -286,6 +287,63 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) return dtStyle; } +static int get_draw_state(const BUTTON_INFO *infoPtr) +{ + static const int pb_states[DRAW_STATE_COUNT] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; + static const int cb_states[3][DRAW_STATE_COUNT] = + { + { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, + { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, + { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } + }; + static const int rb_states[2][DRAW_STATE_COUNT] = + { + { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, + { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } + }; + static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + UINT type = get_button_type(style); + int check_state = infoPtr->state & 3; + enum draw_state state; + + if (!IsWindowEnabled(infoPtr->hwnd)) + state = STATE_DISABLED; + else if (infoPtr->state & BST_PUSHED) + state = STATE_PRESSED; + else if (infoPtr->state & BST_HOT) + state = STATE_HOT; + else if (infoPtr->state & BST_FOCUS) + state = STATE_DEFAULTED; + else + state = STATE_NORMAL; + + switch (type) + { + case BS_PUSHBUTTON: + case BS_DEFPUSHBUTTON: + case BS_USERBUTTON: + case BS_SPLITBUTTON: + case BS_DEFSPLITBUTTON: + case BS_COMMANDLINK: + case BS_DEFCOMMANDLINK: + return pb_states[state]; + case BS_CHECKBOX: + case BS_AUTOCHECKBOX: + return cb_states[check_state][state]; + case BS_RADIOBUTTON: + case BS_3STATE: + case BS_AUTO3STATE: + case BS_AUTORADIOBUTTON: + return rb_states[check_state][state]; + case BS_GROUPBOX: + return gb_states[state]; + default: + WARN("Unsupported button type 0x%08x\n", type); + return PBS_NORMAL; + } +} + static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { BUTTON_INFO *infoPtr = (BUTTON_INFO *)GetWindowLongPtrW(hWnd, 0); @@ -402,20 +460,9 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L if (theme && btnThemedPaintFunc[btn_type]) { - ButtonState drawState; - UINT dtflags; + int drawState = get_draw_state(infoPtr); + UINT dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE)); - if (IsWindowEnabled( hWnd )) - { - if (infoPtr->state & BST_PUSHED) drawState = STATE_PRESSED; - else if (infoPtr->state & BST_HOT) drawState = STATE_HOT; - else if (infoPtr->state & BST_FOCUS) drawState = STATE_DEFAULTED; - else drawState = STATE_NORMAL; - } - else - drawState = STATE_DISABLED; - - dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE)); btnThemedPaintFunc[btn_type](theme, infoPtr, hdc, drawState, dtflags, infoPtr->state & BST_FOCUS); } else if (btnPaintFunc[btn_type]) @@ -1352,14 +1399,11 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (hrgn) DeleteObject( hrgn ); } -static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; - RECT bgRect, textRect; HFONT font = infoPtr->font; HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - int state = states[ drawState ]; WCHAR *text = get_button_text(infoPtr); GetClientRect(infoPtr->hwnd, &bgRect); @@ -1392,31 +1436,14 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int cb_states[3][5] = - { - { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, - { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, - { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } - }; - - static const int rb_states[2][5] = - { - { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, - { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } - }; - SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; - int checkState = infoPtr->state & 3; DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; - int state = (part == BP_CHECKBOX) - ? cb_states[ checkState ][ drawState ] - : rb_states[ checkState ][ drawState ]; WCHAR *text = get_button_text(infoPtr); LOGFONTW lf; BOOL created_font = FALSE; @@ -1478,12 +1505,9 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; - RECT bgRect, textRect, contentRect; - int state = states[ drawState ]; WCHAR *text = get_button_text(infoPtr); LOGFONTW lf; HFONT font, hPrevFont = NULL;

1 0