December 2009 - Wine-Commits

Jacek Caban : jscript: Correctly handle -1 index in regexp match result.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 9ac79498103624695f9226b3abb4ffbb7c0c5b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ac79498103624695f9226b3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 01:13:27 2009 +0100 jscript: Correctly handle -1 index in regexp match result. --- dlls/jscript/regexp.c | 9 +++++++-- dlls/jscript/tests/regexp.js | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 0c8a419..bcc1665 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3349,8 +3349,13 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, c *parens_cnt = regexp->jsregexp->parenCount; for(i=0; i < regexp->jsregexp->parenCount; i++) { - (*parens)[i].str = *cp + result->parens[i].index; - (*parens)[i].len = result->parens[i].length; + if(result->parens[i].index == -1) { + (*parens)[i].str = NULL; + (*parens)[i].len = 0; + }else { + (*parens)[i].str = *cp + result->parens[i].index; + (*parens)[i].len = result->parens[i].length; + } } } diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index bcc9aba..9a14a93 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -71,6 +71,11 @@ m = re.exec(); ok(m === null, "m is not null"); ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex); +m = /(a|b)+|(c)/.exec("aa"); +ok(m[0] === "aa", "m[0] = " + m[0]); +ok(m[1] === "a", "m[1] = " + m[1]); +ok(m[2] === "", "m[2] = " + m[2]); + b = re.test(" a "); ok(b === true, "re.test(' a ') returned " + b); ok(re.lastIndex === 3, "re.lastIndex = " + re.lastIndex);

1 0

Jacek Caban : mshtml: Fixed dispid lookup in_cp_event.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: bfec9c619b31de8aff3f385a6fc9a03a9d331be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfec9c619b31de8aff3f385a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 01:12:30 2009 +0100 mshtml: Fixed dispid lookup in_cp_event. --- dlls/mshtml/htmlevent.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index af1327c..c09db52 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -780,7 +780,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid) static BOOL is_cp_event(ConnectionPoint *cp, DISPID dispid) { cp_static_data_t *data; - unsigned min, max, i; + int min, max, i; HRESULT hres; data = cp->data; @@ -790,11 +790,11 @@ static BOOL is_cp_event(ConnectionPoint *cp, DISPID dispid) if(!data->ids) { hres = get_dispids(data->tid, &data->id_cnt, &data->ids); if(FAILED(hres)) - return hres; + return FALSE; } min = 0; - max = data->id_cnt; + max = data->id_cnt-1; while(min <= max) { i = (min+max)/2; if(data->ids[i] == dispid)

1 0

Juan Lang : winecfg: Update Portuguese translation.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: eaa67c385c44a157cf183513d2de9d017f61a182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa67c385c44a157cf183513d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 20:50:42 2009 -0800 winecfg: Update Portuguese translation. --- programs/winecfg/Pt.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index 3d2ee2d..aeab826 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -85,7 +85,7 @@ BEGIN IDC_STATIC,15,20,227,20 CONTROL "Aplicações",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 - PUSHBUTTON "&Adiconar aplicação...",IDC_APP_ADDAPP, 90,204,75,14 + PUSHBUTTON "&Adicionar aplicação...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Remover aplicação",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "Versão do &Windows:",IDC_STATIC,17,226,58,8 COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -102,10 +102,10 @@ BEGIN IDC_STATIC,15,20,227,45 CONTROL "Aplicações",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,55,230,140 - PUSHBUTTON "&Adiconar aplicação...",IDC_APP_ADDAPP, 90,204,75,14 + PUSHBUTTON "&Adicionar aplicação...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Remover aplicação",IDC_APP_REMOVEAPP, 170,204,75,14 - LTEXT "Versão &Windows:",IDC_STATIC,17,226,58,8 - COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Versão do &Windows:",IDC_STATIC,17,226,68,8 + COMBOBOX IDC_WINVER,90,224,156,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END

1 0

James Hawkins : msi: ExpandEnvironmentStringsW returns the required size in characters, so multiply the required size by sizeof(WCHAR) when allocating the buffer.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 6b8b82ef13d10bbdc790e72ce1d01e1bd94169d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8b82ef13d10bbdc790e72ce… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 2 17:28:48 2009 -0800 msi: ExpandEnvironmentStringsW returns the required size in characters, so multiply the required size by sizeof(WCHAR) when allocating the buffer. --- dlls/msi/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index b443257..3b6dd2d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1498,7 +1498,7 @@ static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYT case REG_EXPAND_SZ: if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize))) ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError()); - else if (!(szNewString = msi_alloc(dwNewSize))) + else if (!(szNewString = msi_alloc(dwNewSize * sizeof(WCHAR)))) ERR("Out of memory\n"); else if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize))) ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError());

1 0

Jacek Caban : mshtml: Added generic bind_to_tree node notification and use it to set frame' s content window.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 451f5b4ad6e4cbad9f5d06f9ee7012b8256bf305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451f5b4ad6e4cbad9f5d06f9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 01:12:12 2009 +0100 mshtml: Added generic bind_to_tree node notification and use it to set frame's content window. --- dlls/mshtml/htmlelem.c | 5 ++- dlls/mshtml/htmlframebase.c | 72 +++++++++++++++++++++++----- dlls/mshtml/htmliframe.c | 61 +++++++++-------------- dlls/mshtml/mshtml_private.h | 8 ++- dlls/mshtml/mutation.c | 107 ++++++++---------------------------------- 5 files changed, 112 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451f5b4ad6e4cbad9f5d0…

1 0

Jacek Caban : mshtml: Detach window from frame element on window destruction.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: bd715dc8e48c2373f68ef352081583dbd7fced1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd715dc8e48c2373f68ef3520… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 01:12:46 2009 +0100 mshtml: Detach window from frame element on window destruction. --- dlls/mshtml/htmlwindow.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index cdbddb8..8838586 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -185,6 +185,9 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) window_set_docnode(This, NULL); release_children(This); + if(This->frame_element) + This->frame_element->content_window = NULL; + if(This->option_factory) { This->option_factory->window = NULL; IHTMLOptionElementFactory_Release(HTMLOPTFACTORY(This->option_factory));

1 0

Jacek Caban : mshtml: Fixed tests on older IEs.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 2b04973e092415a7987bd8e685e6eb753bbced7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b04973e092415a7987bd8e68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 3 01:09:16 2009 +0100 mshtml: Fixed tests on older IEs. --- dlls/mshtml/tests/dom.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 41faa94..367bbee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -501,7 +501,7 @@ static BOOL _test_get_dispid(unsigned line, IUnknown *unk, IID *iid) HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); - ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatchEx: %08x\n", hres); if(FAILED(hres)) return FALSE; @@ -3050,6 +3050,7 @@ static void test_navigator(IHTMLDocument2 *doc) static void test_screen(IHTMLWindow2 *window) { IHTMLScreen *screen, *screen2; + IDispatchEx *dispex; LONG l, exl; HDC hdc; HRESULT hres; @@ -3068,7 +3069,12 @@ static void test_screen(IHTMLWindow2 *window) ok(iface_cmp((IUnknown*)screen2, (IUnknown*)screen), "screen2 != screen\n"); IHTMLScreen_Release(screen2); - test_disp((IUnknown*)screen, &DIID_DispHTMLScreen, "[object]"); + hres = IHTMLScreen_QueryInterface(screen, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK || broken(hres == E_NOINTERFACE), "Could not get IDispatchEx interface: %08x\n", hres); + if(SUCCEEDED(hres)) { + test_disp((IUnknown*)screen, &DIID_DispHTMLScreen, "[object]"); + IDispatchEx_Release(dispex); + } hdc = CreateICW(displayW, NULL, NULL, NULL);

1 0

Juan Lang : crypt32: The KeyId member of an authority key identifier is an octet string, not an integer.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 91fbdb561a53d764a6a3e9e21470da091d045efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fbdb561a53d764a6a3e9e21… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 13:05:28 2009 -0800 crypt32: The KeyId member of an authority key identifier is an octet string, not an integer. --- dlls/crypt32/decode.c | 41 ++--------------------------------------- dlls/crypt32/encode.c | 43 ++----------------------------------------- 2 files changed, 4 insertions(+), 80 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a16d89f..1fd2383 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3106,43 +3106,6 @@ static BOOL CRYPT_AsnDecodeAltNameInternal(const BYTE *pbEncoded, return ret; } -/* Like CRYPT_AsnDecodeIntegerInternal, but swaps the bytes */ -static BOOL CRYPT_AsnDecodeIntegerSwapBytes(const BYTE *pbEncoded, - DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, - DWORD *pcbDecoded) -{ - BOOL ret; - - TRACE("(%p, %d, 0x%08x, %p, %d, %p)\n", pbEncoded, cbEncoded, dwFlags, - pvStructInfo, *pcbStructInfo, pcbDecoded); - - /* Can't use the CRYPT_DECODE_NOCOPY_FLAG, because we modify the bytes in- - * place. - */ - ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_NOCOPY_FLAG, pvStructInfo, pcbStructInfo, - pcbDecoded); - if (ret && pvStructInfo) - { - CRYPT_DATA_BLOB *blob = pvStructInfo; - - if (blob->cbData) - { - DWORD i; - BYTE temp; - - for (i = 0; i < blob->cbData / 2; i++) - { - temp = blob->pbData[i]; - blob->pbData[i] = blob->pbData[blob->cbData - i - 1]; - blob->pbData[blob->cbData - i - 1] = temp; - } - } - } - TRACE("returning %d (%08x)\n", ret, GetLastError()); - return ret; -} - static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -3153,7 +3116,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId), - CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID_INFO, CertIssuer), @@ -3188,7 +3151,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId2(DWORD dwCertEncodingType, { struct AsnDecodeSequenceItem items[] = { { ASN_CONTEXT | 0, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId), - CRYPT_AsnDecodeIntegerSwapBytes, sizeof(CRYPT_DATA_BLOB), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DATA_BLOB), TRUE, TRUE, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, KeyId.pbData), 0 }, { ASN_CONTEXT | ASN_CONSTRUCTOR| 1, offsetof(CERT_AUTHORITY_KEY_ID2_INFO, AuthorityCertIssuer), diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 4d137ce..b7bbc83 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2438,45 +2438,6 @@ static BOOL WINAPI CRYPT_AsnEncodeAltNameEntry(DWORD dwCertEncodingType, return ret; } -static BOOL WINAPI CRYPT_AsnEncodeIntegerSwapBytes(DWORD dwCertEncodingType, - LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, - PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) -{ - BOOL ret; - - __TRY - { - const CRYPT_DATA_BLOB *blob = pvStructInfo; - CRYPT_DATA_BLOB newBlob = { blob->cbData, NULL }; - - ret = TRUE; - if (newBlob.cbData) - { - newBlob.pbData = CryptMemAlloc(newBlob.cbData); - if (newBlob.pbData) - { - DWORD i; - - for (i = 0; i < newBlob.cbData; i++) - newBlob.pbData[newBlob.cbData - i - 1] = blob->pbData[i]; - } - else - ret = FALSE; - } - if (ret) - ret = CRYPT_AsnEncodeInteger(dwCertEncodingType, lpszStructType, - &newBlob, dwFlags, pEncodePara, pbEncoded, pcbEncoded); - CryptMemFree(newBlob.pbData); - } - __EXCEPT_PAGE_FAULT - { - SetLastError(STATUS_ACCESS_VIOLATION); - ret = FALSE; - } - __ENDTRY - return ret; -} - static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -2495,7 +2456,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId(DWORD dwCertEncodingType, { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeOctets; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++; @@ -2626,7 +2587,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAuthorityKeyId2(DWORD dwCertEncodingType, { swapped[cSwapped].tag = ASN_CONTEXT | 0; swapped[cSwapped].pvStructInfo = &info->KeyId; - swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeIntegerSwapBytes; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodeOctets; items[cItem].pvStructInfo = &swapped[cSwapped]; items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; cSwapped++;

1 0

Nikolay Sivov : user32/tests: Free window after use.
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: 0e16d4cd5b0d42dff9dd28fa0d8854cd9fe9df0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e16d4cd5b0d42dff9dd28fa0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Dec 2 23:06:59 2009 +0300 user32/tests: Free window after use. --- dlls/user32/tests/class.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 940550e..b11b5d2 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -572,6 +572,7 @@ static void test_instances(void) SetClassLongPtrA( hwnd, GCLP_HMODULE, 0xdeadbeef ); check_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef ); check_thread_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef ); + DestroyWindow(hwnd); } static void test_builtinproc(void)

1 0

Michael Stefaniuc : wininet: Free the mem unconditionally to prevent a potential leak (Smatch).
by Alexandre Julliard Dec. 3, 2009

Dec. 3, 2009

Module: wine Branch: master Commit: b8a087d6a8c3038fe9befc362f75e78f814cec67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8a087d6a8c3038fe9befc362… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 3 00:41:55 2009 +0100 wininet: Free the mem unconditionally to prevent a potential leak (Smatch). --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 48a7a95..bbef8ca 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1397,8 +1397,8 @@ HINTERNET FTP_FtpOpenFileW(ftp_session_t *lpwfs, HeapFree(GetProcessHeap(), 0, lpwh->cache_file); lpwh->cache_file = NULL; } - HeapFree(GetProcessHeap(), 0, url); } + HeapFree(GetProcessHeap(), 0, url); } HeapFree(GetProcessHeap(), 0, uc.lpszUrlPath); }

1 0