September 2018 - Wine-commits

Gabriel Ivăncescu : shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 2964b975ac4fedce1c05bf984d0784b14fd95a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2964b975ac4fedce1c05bf98… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 6 21:26:11 2018 +0300 shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust. Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 81 +++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index cf8da50..b2c388e 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,57 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + static const HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; + WCHAR *key, *value; + DWORD type, sz; + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + UINT i; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) + { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + for (i = 0; i < ARRAY_SIZE(roots); i++) + { + if (RegOpenKeyExW(roots[i], key, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + continue; + sz = MAX_PATH * sizeof(WCHAR); + + while ((qc = heap_alloc(sz)) != NULL) + { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + if (res == ERROR_SUCCESS && type == REG_SZ) + { + This->quickComplete = heap_realloc(qc, sz); + i = ARRAY_SIZE(roots); + break; + } + heap_free(qc); + if (res != ERROR_MORE_DATA || type != REG_SZ) + break; + } + RegCloseKey(hKey); + } + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Fix handling of Backspace and Delete.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 0c049b6791e731c443317ce40d83e4a22b4f55a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c049b6791e731c443317ce4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 6 21:26:12 2018 +0300 shell32/autocomplete: Fix handling of Backspace and Delete. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22255 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index b2c388e..4ec7387 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -199,19 +199,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ShowWindow(This->hwndListBox, SW_HIDE); return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } - if (This->options & ACO_AUTOAPPEND) { - DWORD b; - SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, 0); - if (b>1) { - hwndText[b-1] = '\0'; - } else { - hwndText[0] = '\0'; - SetWindowTextW(hwnd, hwndText); - } - } break; - default: - ; } SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0);

1 0

Jactry Zeng : riched20: Handle NULL in ITextServices::{TxGetHScroll, TxGetVScroll}.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 563bfdfc18605f4c1c43964378cf21d416426ab8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=563bfdfc18605f4c1c439643… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 7 16:01:26 2018 +0800 riched20: Handle NULL in ITextServices::{TxGetHScroll, TxGetVScroll}. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43488 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 20 ++++++++++++++++++++ dlls/riched20/txtsrv.c | 30 ++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 4dee5fd..a8cf6ff 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -990,6 +990,25 @@ static void test_default_format(void) ITextHost_Release(host); } +static void test_TxGetScroll(void) +{ + ITextServices *txtserv; + ITextHost *host; + HRESULT ret; + + if (!init_texthost(&txtserv, &host)) + return; + + ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + + ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); + ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); + + ITextServices_Release(txtserv); + ITextHost_Release(host); +} + START_TEST( txtsrv ) { ITextServices *txtserv; @@ -1021,6 +1040,7 @@ START_TEST( txtsrv ) test_TxDraw(); test_QueryInterface(); test_default_format(); + test_TxGetScroll(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eb61e4e..ee65621 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -182,11 +182,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetHScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->horz_si.nMin; - *plMax = This->editor->horz_si.nMax; - *plPos = This->editor->horz_si.nPos; - *plPage = This->editor->horz_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; + if (plMin) + *plMin = This->editor->horz_si.nMin; + if (plMax) + *plMax = This->editor->horz_si.nMax; + if (plPos) + *plPos = This->editor->horz_si.nPos; + if (plPage) + *plPage = This->editor->horz_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_HSCROLL) != 0; return S_OK; } @@ -195,11 +200,16 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetVScroll(ITextServices *iface, LONG { ITextServicesImpl *This = impl_from_ITextServices(iface); - *plMin = This->editor->vert_si.nMin; - *plMax = This->editor->vert_si.nMax; - *plPos = This->editor->vert_si.nPos; - *plPage = This->editor->vert_si.nPage; - *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; + if (plMin) + *plMin = This->editor->vert_si.nMin; + if (plMax) + *plMax = This->editor->vert_si.nMax; + if (plPos) + *plPos = This->editor->vert_si.nPos; + if (plPage) + *plPage = This->editor->vert_si.nPage; + if (pfEnabled) + *pfEnabled = (This->editor->styleFlags & WS_VSCROLL) != 0; return S_OK; }

1 0

André Hentschel : ntdll: Bump Win 10 version to 17134.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 6a3d2cb2f369c3809f8a8d1ceaaa6bb5b5978d1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a3d2cb2f369c3809f8a8d1c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 7 12:50:49 2018 +0200 ntdll: Bump Win 10 version to 17134. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1674261..9c9f2cc 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x42EE, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d598fd4..6c4e6a4 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x42EE,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Nikolay Sivov : opcservices: Implement relationships parts uri support.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 390847214b938dad1068d997e1b7cc70218f4131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=390847214b938dad1068d997… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 13:56:12 2018 +0300 opcservices: Implement relationships parts uri support. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/factory.c | 19 ++-- dlls/opcservices/opc_private.h | 15 ++- dlls/opcservices/tests/opcservices.c | 167 ++++++++++++++++++++++++++++++++ dlls/opcservices/uri.c | 179 +++++++++++++++++++++++++++++------ include/opcbase.idl | 2 + 6 files changed, 347 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=390847214b938dad1068…

1 0

Nikolay Sivov : opcservices: Fix argument handling in CreatePackageRootUri ().
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: 5a6cb3818d997facda046d2eed331f3c7790d913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6cb3818d997facda046d2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 13:56:13 2018 +0300 opcservices: Fix argument handling in CreatePackageRootUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 3 +++ dlls/opcservices/tests/opcservices.c | 21 +++++++++++++++++---- dlls/opcservices/uri.c | 2 ++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 2ecd5ad..9036141 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -312,6 +312,9 @@ static HRESULT WINAPI opc_factory_CreatePackageRootUri(IOpcFactory *iface, IOpcU { TRACE("iface %p, uri %p.\n", iface, uri); + if (!uri) + return E_POINTER; + return opc_root_uri_create(uri); } diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 63932fe..84a8c12 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -41,16 +41,18 @@ static void test_package(void) static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; static const WCHAR uriW[] = {'/','u','r','i',0}; + static const WCHAR rootW[] = {'/',0}; IOpcRelationshipSet *relset, *relset2; IOpcPartSet *partset, *partset2; IOpcRelationship *rel; IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; - IOpcUri *source_uri; IUri *target_uri; IOpcPart *part; + IOpcUri *uri; HRESULT hr; + BSTR str; BOOL ret; factory = create_factory(); @@ -93,11 +95,11 @@ static void test_package(void) hr = IOpcRelationshipSet_CreateRelationship(relset, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); - hr = IOpcRelationship_GetSourceUri(rel, &source_uri); + hr = IOpcRelationship_GetSourceUri(rel, &uri); ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); - ok(source_uri == (IOpcUri *)part_uri, "Unexpected source uri.\n"); + ok(uri == (IOpcUri *)part_uri, "Unexpected source uri.\n"); - IOpcUri_Release(source_uri); + IOpcUri_Release(uri); IOpcRelationship_Release(rel); IUri_Release(target_uri); @@ -126,6 +128,17 @@ todo_wine { IOpcPackage_Release(package); + /* Root uri */ + hr = IOpcFactory_CreatePackageRootUri(factory, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IOpcFactory_CreatePackageRootUri(factory, &uri); + ok(SUCCEEDED(hr), "Failed to create root uri, hr %#x.\n", hr); + hr = IOpcUri_GetRawUri(uri, &str); + ok(SUCCEEDED(hr), "Failed to get raw uri, hr %#x.\n", hr); + ok(!lstrcmpW(str, rootW), "Unexpected uri %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + IOpcUri_Release(uri); + IOpcFactory_Release(factory); } diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index 0c5afa9..e461eba 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -552,6 +552,8 @@ HRESULT opc_root_uri_create(IOpcUri **out) HRESULT hr; IUri *uri; + *out = NULL; + if (!(obj = heap_alloc_zero(sizeof(*obj)))) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : opcservices: Fix a typo.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: ce11b1bf62a80d55a5a487a4f2e399c2f6d36d8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce11b1bf62a80d55a5a487a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 7 13:56:14 2018 +0300 opcservices: Fix a typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 370b42e..2c2ef7c 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -352,7 +352,7 @@ static HRESULT WINAPI opc_part_set_PartExists(IOpcPartSet *iface, IOpcPartUri *n return E_NOTIMPL; } -static HRESULT WINAPI opc_part_set_GtEnumerator(IOpcPartSet *iface, IOpcPartEnumerator **enumerator) +static HRESULT WINAPI opc_part_set_GetEnumerator(IOpcPartSet *iface, IOpcPartEnumerator **enumerator) { FIXME("iface %p, enumerator %p stub!\n", iface, enumerator); @@ -368,7 +368,7 @@ static const IOpcPartSetVtbl opc_part_set_vtbl = opc_part_set_CreatePart, opc_part_set_DeletePart, opc_part_set_PartExists, - opc_part_set_GtEnumerator, + opc_part_set_GetEnumerator, }; static HRESULT WINAPI opc_relationship_QueryInterface(IOpcRelationship *iface, REFIID iid, void **out)

1 0

Gabriel Ivăncescu : comctl32/listbox: Update the size in SetColumnWidth before calling UpdatePage.
by Alexandre Julliard 07 Sep '18

07 Sep '18

Module: wine Branch: master Commit: bb116577a3d28e9063102fb6484e6947913002ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb116577a3d28e9063102fb6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 5 18:51:50 2018 +0300 comctl32/listbox: Update the size in SetColumnWidth before calling UpdatePage. Some applications don't forward WM_SIZE from DefWindowProc to the control, but instead only send a LB_SETCOLUMNWIDTH message, even when the column width doesn't change (but the listbox size does). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22440 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 252844e..2137ef8 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1257,12 +1257,19 @@ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) /*********************************************************************** * LISTBOX_SetColumnWidth */ -static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT width) +static LRESULT LISTBOX_SetColumnWidth( LB_DESCR *descr, INT column_width) { - if (width == descr->column_width) return LB_OKAY; - TRACE("[%p]: new column width = %d\n", descr->self, width ); - descr->column_width = width; - LISTBOX_UpdatePage( descr ); + RECT rect; + + TRACE("[%p]: new column width = %d\n", descr->self, column_width); + + GetClientRect(descr->self, &rect); + descr->width = rect.right - rect.left; + descr->height = rect.bottom - rect.top; + descr->column_width = column_width; + + LISTBOX_UpdatePage(descr); + LISTBOX_UpdateScroll(descr); return LB_OKAY; }

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: opacity property implementation.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 042fbbc5f36f55a8bda79c53b141df40521a1e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=042fbbc5f36f55a8bda79c53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 16:15:11 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::opacity property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6f59250..a467d2e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -156,6 +156,8 @@ static const WCHAR min_heightW[] = {'m','i','n','-','h','e','i','g','h','t',0}; static const WCHAR min_widthW[] = {'m','i','n','-','w','i','d','t','h',0}; +static const WCHAR opacityW[] = + {'o','p','a','c','i','t','y',0}; static const WCHAR outlineW[] = {'o','u','t','l','i','n','e',0}; static const WCHAR overflowW[] = @@ -393,6 +395,7 @@ static const style_tbl_entry_t style_tbl[] = { {max_widthW, DISPID_IHTMLSTYLE5_MAXWIDTH, ATTR_FIX_PX}, {min_heightW, DISPID_IHTMLSTYLE4_MINHEIGHT}, {min_widthW, DISPID_IHTMLSTYLE5_MINWIDTH, ATTR_FIX_PX}, + {opacityW, DISPID_UNKNOWN}, {outlineW, DISPID_IHTMLSTYLE6_OUTLINE, ATTR_NO_NULL}, {overflowW, DISPID_IHTMLSTYLE_OVERFLOW, 0, overflow_values}, {overflow_xW, DISPID_IHTMLSTYLE2_OVERFLOWX}, @@ -6796,15 +6799,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_fontStretch(IHTMLCSSStyleDecla static HRESULT WINAPI HTMLCSSStyleDeclaration_put_opacity(IHTMLCSSStyleDeclaration *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return set_style_property_var(This, STYLEID_OPACITY, &v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_opacity(IHTMLCSSStyleDeclaration *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property_var(This, STYLEID_OPACITY, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_clipPath(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 1a83d4f..2e5cb27 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -94,6 +94,7 @@ typedef enum { STYLEID_MAX_WIDTH, STYLEID_MIN_HEIGHT, STYLEID_MIN_WIDTH, + STYLEID_OPACITY, STYLEID_OUTLINE, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 309ca40..72f3690 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -738,6 +738,7 @@ static void test_style6(IHTMLStyle6 *style) static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) { + VARIANT v; BSTR str; HRESULT hres; @@ -754,6 +755,31 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) ok(hres == S_OK, "get_backgroundClip failed: %08x\n", hres); ok(!strcmp_wa(str, "border-box"), "backgroundClip = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, NULL); + + V_VT(&v) = VT_I4; + V_I4(&v) = 0; + hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); + ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, "0"); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("1"); + hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); + ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, "1"); + VariantClear(&v); } static void test_body_style(IHTMLStyle *style) @@ -1790,6 +1816,14 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "put_filter failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLStyle_put_filter(style, NULL); + ok(hres == S_OK, "put_filter failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_filter(style, &str); + ok(hres == S_OK, "get_filter failed: %08x\n", hres); + ok(!str, "filter != NULL\n"); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_zIndex(style, &v); ok(hres == S_OK, "get_zIndex failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: zoom property implementation.
by Alexandre Julliard 06 Sep '18

06 Sep '18

Module: wine Branch: master Commit: 619e15a3e6553f8093db07c4152343e9acec5fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=619e15a3e6553f8093db07c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 16:15:19 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::zoom property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a467d2e..2bc7f9e 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -6225,15 +6225,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_layoutFlow(IHTMLCSSStyleDeclar static HRESULT WINAPI HTMLCSSStyleDeclaration_put_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + return IHTMLStyle3_put_zoom(&This->IHTMLStyle3_iface, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_zoom(IHTMLCSSStyleDeclaration *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return IHTMLStyle3_get_zoom(&This->IHTMLStyle3_iface, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_wordWrap(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 72f3690..8594363 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -488,7 +488,7 @@ static void test_style2(IHTMLStyle2 *style2) SysFreeString(str); } -static void test_style3(IHTMLStyle3 *style3) +static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style) { VARIANT v; BSTR str; @@ -521,6 +521,7 @@ static void test_style3(IHTMLStyle3 *style3) V_BSTR(&v) = a2bstr("100%"); hres = IHTMLStyle3_put_zoom(style3, v); ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + VariantClear(&v); V_VT(&v) = VT_ERROR; hres = IHTMLStyle3_get_zoom(style3, &v); @@ -529,6 +530,13 @@ static void test_style3(IHTMLStyle3 *style3) ok(!strcmp_wa(V_BSTR(&v), "100%"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + if(css_style) { + hres = IHTMLCSSStyleDeclaration_get_zoom(css_style, &v); + ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + test_var_bstr(&v, "100%"); + VariantClear(&v); + } + V_VT(&v) = VT_I4; V_I4(&v) = 1; hres = IHTMLStyle3_put_zoom(style3, v); @@ -540,6 +548,19 @@ static void test_style3(IHTMLStyle3 *style3) ok(V_VT(&v) == VT_BSTR, "V_VT(zoom) = %d\n", V_VT(&v)); ok(!strcmp_wa(V_BSTR(&v), "1"), "V_BSTR(zoom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + + if(css_style) { + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("100%"); + hres = IHTMLCSSStyleDeclaration_put_zoom(css_style, v); + ok(hres == S_OK, "put_zoom failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLCSSStyleDeclaration_get_zoom(css_style, &v); + ok(hres == S_OK, "get_zoom failed: %08x\n", hres); + test_var_bstr(&v, "100%"); + VariantClear(&v); + } } static void test_style4(IHTMLStyle4 *style4) @@ -2844,7 +2865,7 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle3, (void**)&style3); ok(hres == S_OK, "Could not get IHTMLStyle3 iface: %08x\n", hres); if(SUCCEEDED(hres)) { - test_style3(style3); + test_style3(style3, css_style); IHTMLStyle3_Release(style3); }

1 0