April 2012 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Allow more tests to be ran in non-administrator mode.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 120962b30e397fad64f94e51cfa6e3b9a4d12ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=120962b30e397fad64f94e51c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 15:26:03 2012 +0200 mshtml: Allow more tests to be ran in non-administrator mode. --- dlls/mshtml/tests/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index df391d6..0457029 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2791,11 +2791,11 @@ START_TEST(script) if(winetest_interactive || ! is_ie_hardened()) { if(register_script_engine()) { test_simple_script(); - run_js_tests(); init_registry(FALSE); }else { skip("Could not register TestScript engine\n"); } + run_js_tests(); }else { skip("IE running in Enhanced Security Configuration\n"); }

1 0

Jacek Caban : mshtml: Copy filter value in HTMLElement_clone.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: d66dacce6847cd80091cd87038d3fde30eeb5cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66dacce6847cd80091cd8703… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 15:26:12 2012 +0200 mshtml: Copy filter value in HTMLElement_clone. --- dlls/mshtml/htmlelem.c | 10 +++++++++- dlls/mshtml/tests/jstest.html | 12 ++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 02a49d2..9184b9b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -269,7 +269,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr DISPPARAMS dispParams; EXCEPINFO excep; - TRACE("(%p)->(%s . %08x)\n", This, debugstr_w(strAttributeName), lFlags); + TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, fdexNameCaseInsensitive | fdexNameEnsure, &dispid); @@ -1627,6 +1627,14 @@ HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode ** if(FAILED(hres)) return hres; + if(This->filter) { + new_elem->filter = heap_strdupW(This->filter); + if(!new_elem->filter) { + IHTMLElement_Release(&This->IHTMLElement_iface); + return E_OUTOFMEMORY; + } + } + IHTMLElement_AddRef(&new_elem->IHTMLElement_iface); *ret = &new_elem->node; return S_OK; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 10863f4..e61ee85 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -80,6 +80,17 @@ function test_remove_style_attribute() { ok(b === false, "removeAttribute returned " + b + " expected false"); } +function test_clone_node() { + var elem, cloned; + + elem = document.getElementById("divid"); + elem.style.filter = "alpha(opacity=50)"; + ok(elem.style.filter === "alpha(opacity=50)", "elem.style.filter = " + elem.style.filter); + + cloned = elem.cloneNode(true); + ok(cloned.style.filter === "alpha(opacity=50)", "cloned.style.filter = " + cloned.style.filter); +} + var globalVar = false; function runTest() { @@ -91,6 +102,7 @@ function runTest() { test_removeAttribute(document.getElementById("divid")); test_removeAttribute(document.body); test_select_index(); + test_clone_node(); test_createDocumentFragment(); test_document_name_as_index(); test_remove_style_attribute();

1 0

André Hentschel : comctl32: Remove unneeded shadow variables for comboex.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 4598c48041970d48abbe7231c825369d5783075a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4598c48041970d48abbe7231c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:01 2012 +0200 comctl32: Remove unneeded shadow variables for comboex. --- dlls/comctl32/comboex.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a1b6cff..710ef79 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1381,8 +1381,6 @@ static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT con item = infoPtr->edit; if (infoPtr->hwndEdit) { - INT len; - /* free previous text of edit item */ COMBOEX_FreeText(item); item->mask &= ~CBEIF_TEXT; @@ -2076,7 +2074,6 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, * For EN_CHANGE this issues the same calls and messages * as the native seems to do. */ - WCHAR edit_text[260]; LPCWSTR lastwrk; cmp_func_t cmptext = get_cmp_func(infoPtr);

1 0

André Hentschel : devenum: Remove unneeded shadow variables.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 8ef61a98f061942c4f9fff33edb27c22013c05ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef61a98f061942c4f9fff33e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:08 2012 +0200 devenum: Remove unneeded shadow variables. --- dlls/devenum/createdevenum.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index fad1325..f4e8727 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -171,10 +171,10 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS *rgPin) for (i1 = 0; i1 < dwMinorTypes; i1++) { WCHAR wszMinorTypeName[64]; - DWORD cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); CLSID *clsMajorType = NULL, *clsMinorType = NULL; HRESULT hr; + cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; clsMinorType = CoTaskMemAlloc(sizeof(CLSID)); @@ -349,7 +349,6 @@ static HRESULT DEVENUM_RegisterLegacyAmFilters(void) HKEY hkeyCategoryBaseKey; WCHAR wszRegKey[MAX_PATH]; HKEY hkeyInstance = NULL; - HRESULT hr; if (RegEnumKeyExW(hkeyFilter, i, wszFilterSubkeyName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue;

1 0

André Hentschel : gdi32: Remove unneeded shadow variable.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 9cf97e18b437a6e349409edeecbac8004edfc07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf97e18b437a6e349409edee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:15 2012 +0200 gdi32: Remove unneeded shadow variable. --- dlls/gdi32/bidi.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 9b8f758..0354996 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -592,7 +592,6 @@ BOOL BIDI_Reorder( if (lpGlyphs && doGlyphs) { - int j; BYTE runOrder[maxItems]; int visOrder[maxItems]; SCRIPT_ITEM *curItem;

1 0

André Hentschel : mscms: Remove unneeded shadow variable.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: f796f967e2897c528304fe9efe869b391ba7f84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f796f967e2897c528304fe9ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:28 2012 +0200 mscms: Remove unneeded shadow variable. --- dlls/mscms/profile.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 54e4afd..b0ffce4 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1473,7 +1473,6 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); else { - DWORD size; WCHAR *path; if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA)

1 0

André Hentschel : netapi32: Remove unneeded shadow variables.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 7aa160a98eb908a3168f548d5748100ecf7ba1b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aa160a98eb908a3168f548d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:33 2012 +0200 netapi32: Remove unneeded shadow variables. --- dlls/netapi32/access.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 6750a11..09b5b63 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -294,7 +294,6 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, { PUSER_INFO_10 ui; PUSER_INFO_0 ui0; - NET_API_STATUS status; /* sizes of the field buffers in WCHARS */ int name_sz, comment_sz, usr_comment_sz, full_name_sz; @@ -339,7 +338,6 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, static const WCHAR homedirW[] = {'H','O','M','E',0}; PUSER_INFO_1 ui; PUSER_INFO_0 ui0; - NET_API_STATUS status; /* sizes of the field buffers in WCHARS */ int name_sz, password_sz, home_dir_sz, comment_sz, script_path_sz;

1 0

André Hentschel : winhlp32: Remove unneeded shadow variables.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: d1a5ce537d42a0ea666cfe063f31f9ebd221b7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a5ce537d42a0ea666cfe063… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:12:07 2012 +0200 winhlp32: Remove unneeded shadow variables. --- programs/winhlp32/hlpfile.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 5f54bd3..b34c42f 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -1527,7 +1527,6 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0x88: { BYTE type = format[1]; - LONG size; /* FIXME: we don't use 'BYTE pos = (*format - 0x86);' for the image position */ format += 2; @@ -2078,9 +2077,9 @@ static BOOL HLPFILE_SystemCommands(HLPFILE* hlpfile) if (hlpfile->windows) { - unsigned flags = GET_USHORT(ptr, 4); HLPFILE_WINDOWINFO* wi = &hlpfile->windows[hlpfile->numWindows - 1]; + flags = GET_USHORT(ptr, 4); if (flags & 0x0001) strcpy(wi->type, &str[2]); else wi->type[0] = '\0'; if (flags & 0x0002) strcpy(wi->name, &str[12]);

1 0

André Hentschel : jscript: Remove unneeded shadow variable.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 6677982728239867c8d99c441f50a55de11bad14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6677982728239867c8d99c441… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:22 2012 +0200 jscript: Remove unneeded shadow variable. --- dlls/jscript/regexp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index b54348b..0cf1270 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -2307,8 +2307,6 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) } if (inRange) { if (gData->regexp->flags & JSREG_FOLD) { - int i; - assert(rangeStart <= thisCh); for (i = rangeStart; i <= thisCh; i++) { WCHAR uch, dch;

1 0

André Hentschel : services: Remove unneeded shadow variable.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: e7f414556e1f2e4c22b8cc06c004fb7bb7817f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f414556e1f2e4c22b8cc06c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:11:37 2012 +0200 services: Remove unneeded shadow variable. --- programs/services/utils.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/services/utils.c b/programs/services/utils.c index 920b6da..aead38a 100644 --- a/programs/services/utils.c +++ b/programs/services/utils.c @@ -82,8 +82,7 @@ DWORD load_reg_string(HKEY hKey, LPCWSTR szValue, BOOL bExpand, LPWSTR *output) if (type == REG_EXPAND_SZ) { LPWSTR str; - DWORD size = ExpandEnvironmentStringsW(buf, NULL, 0); - if (size == 0) + if (!(size = ExpandEnvironmentStringsW(buf, NULL, 0))) { err = GetLastError(); goto failed;

1 0