wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Hans Leidekker : wininet/tests: Mark behavior of IE5 as broken for some ftp tests.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: bf58fdd197f516a598ee7f098282c058d2d3e908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf58fdd197f516a598ee7f098… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:44:29 2009 +0100 wininet/tests: Mark behavior of IE5 as broken for some ftp tests. --- dlls/wininet/tests/ftp.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 37c71da..d152601 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -438,7 +438,7 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); error = GetLastError(); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); trace_extended_error(error); @@ -446,22 +446,24 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); error = GetLastError(); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); trace_extended_error(error); SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); - ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + error = GetLastError(); + ok ( bRet == FALSE || broken(bRet == TRUE), "Expected FtpGetFileA to fail\n"); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_SUCCESS), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); DeleteFileA("should_be_non_existing_deadbeef"); /* Just in case */ SetLastError(0xdeadbeef); hOpenFile2 = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - ok ( bRet == FALSE, "Expected FtpOpenFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + error = GetLastError(); + ok ( bRet == FALSE || broken(bRet == TRUE), "Expected FtpOpenFileA to fail\n"); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_SUCCESS), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); InternetCloseHandle(hOpenFile2); /* Just in case */ /* Create a temporary local file */ @@ -471,22 +473,25 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) CloseHandle(hFile); SetLastError(0xdeadbeef); bRet = FtpPutFileA(hFtp, "now_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); DeleteFileA("now_existing_local"); SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(hFtp, "should_be_non_existing_deadbeef_dir"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); SetLastError(0xdeadbeef); bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", "new"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); } InternetCloseHandle(hOpenFile); @@ -748,6 +753,7 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) HINTERNET hSearch; HINTERNET hSearch2; HINTERNET hOpenFile; + DWORD error; /* NULL as the search file ought to return the first file in the directory */ SetLastError(0xdeadbeef); @@ -793,9 +799,10 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) /* This should fail as the OpenFile handle wasn't closed */ SetLastError(0xdeadbeef); hSearch = FtpFindFirstFileA(hFtp, "welcome.msg", &findData, 0, 0); + error = GetLastError(); ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError() ); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error ); InternetCloseHandle(hSearch); /* Just in case */ InternetCloseHandle(hOpenFile);

1 0

Hans Leidekker : ntdll/tests: Fix a memory leak.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: fe8f5c22325986a2225610a283319626d107f4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8f5c22325986a2225610a28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:44:04 2009 +0100 ntdll/tests: Fix a memory leak. Found by Valgrind. --- dlls/ntdll/tests/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dff5d9f..7e8f101 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -43,7 +43,7 @@ static BOOL (WINAPI * pGetVolumePathNameW)(LPCWSTR, LPWSTR, DWORD); static UINT (WINAPI *pGetSystemWow64DirectoryW)( LPWSTR, UINT ); -static NTSTATUS (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); +static VOID (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG, ULONG * ); @@ -337,6 +337,7 @@ static void open_file_test(void) } CloseHandle( dir ); + pRtlFreeUnicodeString( &nameW ); } static void delete_file_test(void)

1 0

Hans Leidekker : setupapi/tests: Fix a memory leak.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 3bf156a8c581b26985f55c4d63e4b7b3badc969e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf156a8c581b26985f55c4d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:43:42 2009 +0100 setupapi/tests: Fix a memory leak. Found by Valgrind. --- dlls/setupapi/tests/stringtable.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 40e4a54..2b7b77a 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -304,6 +304,7 @@ static void test_StringTableLookUpStringEx(void) ok(!memcmp(buffer, &data, 4), "unexpected data\n"); pStringTableDestroy(table); + pStringTableDestroy(table2); } static void test_StringTableStringFromId(void)

1 0

Marcus Meissner : winhttp: Check for endCert being NULL (Coverity).
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 298051ab37b4c6725865fb4a56788d3c9e3201b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298051ab37b4c6725865fb4a5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 6 20:58:14 2009 +0100 winhttp: Check for endCert being NULL (Coverity). --- dlls/winhttp/net.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 10176d9..6512db5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -359,6 +359,7 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) CertFreeCertificateContext( context ); } } + if (!endCert) ret = FALSE; if (ret) ret = netconn_verify_cert( endCert, store, server ); CertFreeCertificateContext( endCert );

1 0

Stefan Leichter : setupapi32/tests: More tests for SetupGetInfFileListW.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 6f8fb2f4e725038d4edc036c2a02ffb55c0672b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8fb2f4e725038d4edc036c2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 8 08:57:44 2009 +0100 setupapi32/tests: More tests for SetupGetInfFileListW. --- dlls/setupapi/tests/install.c | 56 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 4b718fc..9aed163 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -473,9 +473,16 @@ static void test_inffilelist(void) static const char inffile2[] = "test2.inf"; static const WCHAR inffile2W[] = {'t','e','s','t','2','.','i','n','f',0}; static const char invalid_inf[] = "invalid.inf"; + static const WCHAR invalid_infW[] = {'i','n','v','a','l','i','d','.','i','n','f',0}; static const char *inf = "[Version]\n" "Signature=\"$Chicago$\""; + static const char *inf2 = + "[Version]\n" + "Signature=\"$CHICAGO$\""; + static const char *infNT = + "[Version]\n" + "Signature=\"$WINDOWS NT$\""; WCHAR *p, *ptr; char dirA[MAX_PATH]; @@ -587,6 +594,55 @@ static void test_inffilelist(void) ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW), "unexpected filename %s\n",wine_dbgstr_w(p)); + /* upper case value + */ + create_inf_file(inffile2, inf2); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW), + "unexpected filename %s\n",wine_dbgstr_w(p)); + + /* signature Windows NT is also inf style win4 + */ + create_inf_file(inffile2, infNT); + expected = 3 + strlen(inffile) + strlen(inffile2); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW), + "unexpected filename %s\n",wine_dbgstr_w(p)); + + /* old style + */ + expected = 2 + strlen(invalid_inf); + ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT, buffer, MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,invalid_infW), "unexpected filename %s\n",wine_dbgstr_w(p)); + + /* mixed style + */ + expected = 4 + strlen(inffile) + strlen(inffile2) + strlen(invalid_inf); + ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, + MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW) || !lstrcmpW(p,invalid_infW), + "unexpected filename %s\n",wine_dbgstr_w(p)); + DeleteFile(inffile); DeleteFile(inffile2); DeleteFile(invalid_inf);

1 0

James Hawkins : msi: Add a NULL terminator to file->dest after reallocation .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: d90aca35c4d3e0d4d5cebaeae3a8628fb9d62767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90aca35c4d3e0d4d5cebaeae… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:55:32 2009 -0800 msi: Add a NULL terminator to file->dest after reallocation. --- dlls/msi/action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0755f42..ef30dda 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5288,6 +5288,11 @@ static BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) goto done; } + /* file->dest may be shorter after the reallocation, so add a NULL + * terminator. This is needed for the call to strrchrW, as there will no + * longer be a NULL terminator within the bounds of the allocation in this case. + */ + file->dest[size - 1] = '\0'; lstrcpyW(strrchrW(file->dest, '\\') + 1, file->destname); while (!list_empty(&files.entry))

1 0

James Hawkins : msi: Free the column info data when updating the table column info.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: b13803ea40ec15d39540694d45b431ce31b46463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13803ea40ec15d39540694d4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:55:21 2009 -0800 msi: Free the column info data when updating the table column info. --- dlls/msi/table.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a0317da..d2b9a00 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1042,17 +1042,22 @@ static UINT get_tablecolumns( MSIDATABASE *db, static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) { MSITABLE *table; + LPWSTR tablename; UINT size, offset, old_count; UINT n; - table = find_cached_table( db, name ); + /* We may free name in msi_free_colinfo. */ + tablename = strdupW( name ); + + table = find_cached_table( db, tablename ); old_count = table->col_count; + msi_free_colinfo( table->colinfo, table->col_count ); msi_free( table->colinfo ); table->colinfo = NULL; - table_get_column_info( db, name, &table->colinfo, &table->col_count ); + table_get_column_info( db, tablename, &table->colinfo, &table->col_count ); if (!table->col_count) - return; + goto done; size = msi_table_get_row_size( db, table->colinfo, table->col_count ); offset = table->colinfo[table->col_count - 1].offset; @@ -1063,6 +1068,9 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) if (old_count < table->col_count) memset( &table->data[n][offset], 0, size - offset ); } + +done: + msi_free(tablename); } /* try to find the table name in the _Tables table */

1 0

James Hawkins : msi: Make sure to free the extra row data when deleting a row.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: c20902314b2d673a6f85fbcbd9b24a3ad264afbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20902314b2d673a6f85fbcbd… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:54:37 2009 -0800 msi: Make sure to free the extra row data when deleting a row. --- dlls/msi/table.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index fa32a04..a0317da 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1754,15 +1754,14 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) tv->columns[i].hash_table = NULL; } - if ( row == num_rows - 1 ) - return ERROR_SUCCESS; - for (i = row + 1; i < num_rows; i++) { memcpy(tv->table->data[i - 1], tv->table->data[i], tv->row_size); tv->table->data_persistent[i - 1] = tv->table->data_persistent[i]; } + msi_free(tv->table->data[num_rows - 1]); + return ERROR_SUCCESS; }

1 0

Jacek Caban : mshtml: Added IHTMLDocument2:: onreadystatechange property implementation.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 70592b59e77f26f239c5d5ca5fd9982f718ea012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70592b59e77f26f239c5d5ca5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 01:19:15 2009 +0100 mshtml: Added IHTMLDocument2::onreadystatechange property implementation. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b52005b..eb1c782 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1146,15 +1146,19 @@ static HRESULT WINAPI HTMLDocument_get_onmouseover(IHTMLDocument2 *iface, VARIAN static HRESULT WINAPI HTMLDocument_put_onreadystatechange(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_READYSTATECHANGE, &v); } static HRESULT WINAPI HTMLDocument_get_onreadystatechange(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_READYSTATECHANGE, p); } static HRESULT WINAPI HTMLDocument_put_onafterupdate(IHTMLDocument2 *iface, VARIANT v)

1 0

Jacek Caban : jscript: Fixed String.split for missing regexp separator.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 1045bffcc018dba1ee26a34620f6732eb0c3a795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1045bffcc018dba1ee26a3462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 01:13:27 2009 +0100 jscript: Fixed String.split for missing regexp separator. --- dlls/jscript/string.c | 8 +++++--- dlls/jscript/tests/regexp.js | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 97c807f..95ad773 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1129,6 +1129,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP match_result_t *match_result = NULL; DWORD length, match_cnt, i, match_len = 0; const WCHAR *str, *ptr, *ptr2; + BOOL use_regexp = FALSE; VARIANT *arg, var; DispatchEx *array; BSTR val_str, match_str = NULL; @@ -1153,6 +1154,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP regexp = iface_to_jsdisp((IUnknown*)V_DISPATCH(arg)); if(regexp) { if(is_class(regexp, JSCLASS_REGEXP)) { + use_regexp = TRUE; hres = regexp_match(ctx, regexp, str, length, TRUE, &match_result, &match_cnt); jsdisp_release(regexp); if(FAILED(hres)) { @@ -1183,7 +1185,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(SUCCEEDED(hres)) { ptr = str; for(i=0;; i++) { - if(match_result) { + if(use_regexp) { if(i == match_cnt) break; ptr2 = match_result[i].str; @@ -1209,7 +1211,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(FAILED(hres)) break; - if(match_result) + if(use_regexp) ptr = match_result[i].str + match_result[i].len; else if(match_str) ptr = ptr2 + match_len; @@ -1218,7 +1220,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP } } - if(SUCCEEDED(hres) && (match_str || match_result)) { + if(SUCCEEDED(hres) && (match_str || use_regexp)) { DWORD len = (str+length) - ptr; if(len || match_str) { diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index c9066c6..ff00285 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -301,6 +301,19 @@ ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); ok(re.lastIndex === 5, "re.lastIndex = " + re.lastIndex); +r = "1 12 \t3".split(re = /\s+/).join(";"); +ok(r === "1;12;3", "r = " + r); +ok(re.lastIndex === 6, "re.lastIndex = " + re.lastIndex); + +r = "123".split(re = /\s+/).join(";"); +ok(r === "123", "r = " + r); +ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex); + +/* another standard violation */ +r = "1 12 \t3".split(re = /(\s)+/g).join(";"); +ok(r === "1;12;3", "r = " + r); +ok(re.lastIndex === 6, "re.lastIndex = " + re.lastIndex); + re = /,+/; re.lastIndex = 4; r = "1,,2,".split(re);

1 0

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 December 2009