wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

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 : 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 : 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

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

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 : jscript: Correctly handle empty matches in String.replace.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: c1cb8f29b022ca1a1cf9da560f70d4b83337a9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cb8f29b022ca1a1cf9da560… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 13:50:19 2012 +0200 jscript: Correctly handle empty matches in String.replace. --- dlls/jscript/string.c | 3 +++ dlls/jscript/tests/regexp.js | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 17f6c2f..e8b279c 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -868,6 +868,9 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } if(FAILED(hres)) break; + + if(!match.len) + cp++; }else { match.str = strstrW(cp, match_str); if(!match.str) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index c7f9363..d553bb6 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -583,4 +583,13 @@ ok(i === null, "' undefined '.search() = " + i); tmp = "=)".replace(/=/, "?"); ok(tmp === "?)", "'=)'.replace(/=/, '?') = " + tmp); +tmp = " ".replace(/^\s*|\s*$/g, "y"); +ok(tmp === "yy", '" ".replace(/^\s*|\s*$/g, "y") = ' + tmp); + +tmp = "xxx".replace(/^\s*|\s*$/g, ""); +ok(tmp === "xxx", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); + +tmp = "xxx".replace(/^\s*|\s*$/g, "y"); +ok(tmp === "yxxxy", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); + reportSuccess();

1 0

Jacek Caban : jscript: Pass correct cpbegin to InitMatch.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: e21588aef7a12c04e817735d2f298c9a5a357c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21588aef7a12c04e817735d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 18 13:50:08 2012 +0200 jscript: Pass correct cpbegin to InitMatch. --- dlls/jscript/regexp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 94f3f6b..b54348b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3322,7 +3322,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D REGlobalData gData; DWORD matchlen; - gData.cpbegin = *cp; + gData.cpbegin = str; gData.cpend = str + len; gData.start = *cp-str; gData.skipped = 0; @@ -3384,7 +3384,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D (*parens)[i].str = NULL; (*parens)[i].len = 0; }else { - (*parens)[i].str = *cp + result->parens[i].index; + (*parens)[i].str = str + result->parens[i].index; (*parens)[i].len = result->parens[i].length; } }

1 0

Dmitry Timoshkov : include: Add some missing FILE_FLAG_xxx definitions.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 492732aa32009c0031851e40d6b07183bdd826a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=492732aa32009c0031851e40d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:29:35 2012 +0900 include: Add some missing FILE_FLAG_xxx definitions. --- include/winbase.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index b87114f..2cb3d1a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -707,6 +707,9 @@ typedef struct _TIME_ZONE_INFORMATION{ #define FILE_FLAG_BACKUP_SEMANTICS 0x02000000 #define FILE_FLAG_POSIX_SEMANTICS 0x01000000 #define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000 +#define FILE_FLAG_OPEN_NO_RECALL 0x00100000 +#define FILE_FLAG_FIRST_PIPE_INSTANCE 0x00080000 + #define CREATE_NEW 1 #define CREATE_ALWAYS 2 #define OPEN_EXISTING 3

1 0

Dmitry Timoshkov : include: Define MUTEX_ALL_ACCESS in a PSDK compatible way.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 64cf2db9a69ad08252acdd5896714338e336a79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cf2db9a69ad08252acdd589… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 18 16:29:16 2012 +0900 include: Define MUTEX_ALL_ACCESS in a PSDK compatible way. --- include/winbase.h | 3 +++ include/winnt.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 492c63b..b87114f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -885,6 +885,9 @@ typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); #define FS_VOL_IS_COMPRESSED FILE_VOLUME_IS_COMPRESSED #define FS_FILE_COMPRESSION FILE_FILE_COMPRESSION +#define MUTEX_MODIFY_STATE MUTANT_QUERY_STATE +#define MUTEX_ALL_ACCESS MUTANT_ALL_ACCESS + #define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION #define EXCEPTION_DATATYPE_MISALIGNMENT STATUS_DATATYPE_MISALIGNMENT #define EXCEPTION_BREAKPOINT STATUS_BREAKPOINT diff --git a/include/winnt.h b/include/winnt.h index a6b0cf2..ecac448 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4247,8 +4247,8 @@ typedef enum tagSID_NAME_USE { #define SEMAPHORE_MODIFY_STATE 0x0002 #define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#define MUTEX_MODIFY_STATE 0x0001 -#define MUTEX_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x1) +#define MUTANT_QUERY_STATE 0x0001 +#define MUTANT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE) #define JOB_OBJECT_ASSIGN_PROCESS 0x0001 #define JOB_OBJECT_SET_ATTRIBUTES 0x0002

1 0

André Hentschel : winedbg: Add shift operators to ARM disassembler.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 6235e6fd44ca42f39ca85e80f4c1c886bb5ff7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6235e6fd44ca42f39ca85e80f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 18 00:01:57 2012 +0200 winedbg: Add shift operators to ARM disassembler. --- programs/winedbg/be_arm.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 93f12d6..670fd8a 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -62,6 +62,10 @@ static char const tbl_dataops[][4] = { "mov", "bic", "mvn" }; +static char const tbl_shifts[][4] = { + "lsl", "lsr", "asr", "ror" +}; + static char const tbl_hiops_t[][4] = { "add", "cmp", "mov", "bx" }; @@ -140,8 +144,16 @@ static UINT arm_disasm_dataprocessing(UINT inst) if (immediate) dbg_printf("%s, #%u", tbl_regs[get_nibble(inst, 4)], ROR32(inst & 0xff, 2 * get_nibble(inst, 2))); - else + else if (((inst >> 4) & 0xff) == 0x00) /* no shift */ dbg_printf("%s, %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else if (((inst >> 4) & 0x09) == 0x01) /* register shift */ + dbg_printf("%s, %s, %s %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], tbl_regs[(inst >> 8) & 0x0f]); + else if (((inst >> 4) & 0x01) == 0x00) /* immediate shift */ + dbg_printf("%s, %s, %s #%d", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], (inst >> 7) & 0x1f); + else + return inst; } return 0; } @@ -165,15 +177,25 @@ static UINT arm_disasm_singletrans(UINT inst) { if (immediate) dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); - else + else if (((inst >> 4) & 0xff) == 0x00) /* no shift */ dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else if (((inst >> 4) & 0x01) == 0x00) /* immediate shift (there's no register shift) */ + dbg_printf("[%s, %s, %s #%d]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], (inst >> 7) & 0x1f); + else + return inst; } else { if (immediate) dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); - else + else if (((inst >> 4) & 0xff) == 0x00) /* no shift */ dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + else if (((inst >> 4) & 0x01) == 0x00) /* immediate shift (there's no register shift) */ + dbg_printf("[%s], %s, %s #%d", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)], + tbl_shifts[(inst >> 5) & 0x03], (inst >> 7) & 0x1f); + else + return inst; } return 0; }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012