September 2012 - Wine-commits

Francois Gouget : shell32/tests: Use consistent types for the ShellExecute( ) & co return value.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 2083f28fbc6b5e75646b88da25d416a8f674097d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2083f28fbc6b5e75646b88da2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 20 12:58:43 2012 +0200 shell32/tests: Use consistent types for the ShellExecute() & co return value. --- dlls/shell32/tests/shlexec.c | 106 ++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2083f28fbc6b5e75646b8…

1 0

Francois Gouget : shell32: Add tests for ShellExecute()' s handling of file URLs.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 7df54b4b8d55137fa312ef60b8dd96cd74ce509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df54b4b8d55137fa312ef60b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 20 13:01:48 2012 +0200 shell32: Add tests for ShellExecute()'s handling of file URLs. --- dlls/shell32/tests/shlexec.c | 130 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 127 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 88cf79f..ec96ed3 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -90,6 +90,7 @@ static void strcat_param(char* str, const char* param) } static char shell_call[2048]=""; +static int bad_shellexecute = 0; static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) { INT_PTR rc, rcEmpty = 0; @@ -133,7 +134,7 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L rc = SE_ERR_NOASSOC; } } - ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "WaitForSingleObject returned %d\n", wait_rc); + ok(wait_rc==WAIT_OBJECT_0 || rc <= 32, "%s WaitForSingleObject returned %d\n", shell_call, wait_rc); } /* The child process may have changed the result file, so let profile * functions know about it @@ -143,8 +144,12 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L dump_child(); if(!operation) - ok(rc == rcEmpty || broken(rc > 32 && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, - "Got different return value with empty string: %lu %lu\n", rc, rcEmpty); + { + if (rc != rcEmpty && rcEmpty == SE_ERR_NOASSOC) /* NT4 */ + bad_shellexecute = 1; + ok(rc == rcEmpty || broken(rc != rcEmpty && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, + "%s Got different return value with empty string: %lu %lu\n", shell_call, rc, rcEmpty); + } return rc; } @@ -1302,6 +1307,124 @@ static void test_filename(void) } } +typedef struct +{ + const char* urlprefix; + const char* basename; + int flags; + int todo; +} fileurl_tests_t; + +#define URL_SUCCESS 0x1 +#define USE_COLON 0x2 +#define USE_BSLASH 0x4 + +static fileurl_tests_t fileurl_tests[]= +{ + {"file:///", "%s\\nonexistent.shlexec", 0, 0x1}, + {"file:/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, + {"file://", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, + {"File:///", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_COLON, 0x1}, + {"file:///", "%s\\test file.shlexec", URL_SUCCESS | USE_BSLASH, 0x1}, + {"file:////", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, + {"file://///", "%s\\test file.shlexec", 0, 0x1}, + {"file://localhost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, + {"file://localhost:80/", "%s\\test file.shlexec", 0, 0x1}, + {"file://LocalHost/", "%s\\test file.shlexec", URL_SUCCESS, 0x1}, + {"file://127.0.0.1/", "%s\\test file.shlexec", 0, 0x1}, + {"file://::1/", "%s\\test file.shlexec", 0, 0x1}, + {"file://notahost/", "%s\\test file.shlexec", 0, 0x1}, + {"file://www.winehq.org/", "%s\\test file.shlexec", 0, 0x1}, + + {NULL, NULL, 0, 0} +}; + +static void test_fileurl(void) +{ + char filename[MAX_PATH], fileurl[MAX_PATH], longtmpdir[MAX_PATH]; + char command[MAX_PATH]; + const fileurl_tests_t* test; + char *s; + INT_PTR rc; + + rc = (INT_PTR)ShellExecute(NULL, NULL, "file:///nosuchfile.shlexec", NULL, NULL, SW_SHOWNORMAL); + if (rc > 32) + { + win_skip("shell32 is too old (likely < 4.72). Skipping the file URL tests\n"); + return; + } + + get_long_path_name(tmpdir, longtmpdir, sizeof(longtmpdir)/sizeof(*longtmpdir)); + + test=fileurl_tests; + while (test->basename) + { + /* Build the file URL */ + sprintf(filename, test->basename, longtmpdir); + strcpy(fileurl, test->urlprefix); + strcat(fileurl, filename); + s = fileurl + strlen(test->urlprefix); + while (*s) + { + if (!(test->flags & USE_COLON) && *s == ':') + *s = '|'; + else if (!(test->flags & USE_BSLASH) && *s == '\\') + *s = '/'; + s++; + } + + /* Test it first with FindExecutable() */ + rc = (INT_PTR)FindExecutableA(fileurl, NULL, command); + ok(rc == SE_ERR_FNF, "FindExecutable(%s) failed: bad rc=%lu\n", fileurl, rc); + + /* Then ShellExecute() */ + rc = shell_execute(NULL, fileurl, NULL, NULL); + if (bad_shellexecute) + { + win_skip("shell32 is too old (likely 4.72). Skipping the file URL tests\n"); + break; + } + if (test->flags & URL_SUCCESS) + { + if ((test->todo & 0x1) == 0) + ok(rc > 32, "%s failed: bad rc=%lu\n", shell_call, rc); + else todo_wine + ok(rc > 32, "%s failed: bad rc=%lu\n", shell_call, rc); + } + else + { + if ((test->todo & 0x1) == 0) + ok(rc == SE_ERR_FNF || rc == SE_ERR_PNF || + broken(rc == SE_ERR_ACCESSDENIED) /* win2000 */, + "%s failed: bad rc=%lu\n", shell_call, rc); + else todo_wine + ok(rc == SE_ERR_FNF || rc == SE_ERR_PNF || + broken(rc == SE_ERR_ACCESSDENIED) /* win2000 */, + "%s failed: bad rc=%lu\n", shell_call, rc); + } + if (rc == 33) + { + if ((test->todo & 0x2) == 0) + okChildInt("argcA", 5); + else todo_wine + okChildInt("argcA", 5); + + if ((test->todo & 0x4) == 0) + okChildString("argvA3", "Open"); + else todo_wine + okChildString("argvA3", "Open"); + + if ((test->todo & 0x8) == 0) + okChildPath("argvA4", filename); + else todo_wine + okChildPath("argvA4", filename); + } + test++; + } +} + static void test_find_executable(void) { char notepad_path[MAX_PATH]; @@ -2288,6 +2411,7 @@ START_TEST(shlexec) test_argify(); test_lpFile_parsed(); test_filename(); + test_fileurl(); test_find_executable(); test_lnks(); test_exes();

1 0

Erich Hoover : kernel32: Report FILE_PERSISTENT_ACLS flag for NTFS volumes.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 6e0d43811b5e407a77fde3a64ead5f3700ea68a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0d43811b5e407a77fde3a64… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 19 08:03:46 2012 -0600 kernel32: Report FILE_PERSISTENT_ACLS flag for NTFS volumes. --- dlls/kernel32/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 238dd9c..200c293 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -791,7 +791,7 @@ fill_fs_info: /* now fill in the information that depends on the file system ty default: if (fsname) lstrcpynW( fsname, ntfsW, fsname_len ); if (filename_len) *filename_len = 255; - if (flags) *flags = FILE_CASE_PRESERVED_NAMES; + if (flags) *flags = FILE_CASE_PRESERVED_NAMES | FILE_PERSISTENT_ACLS; break; } ret = TRUE;

1 0

Erich Hoover : shell32: Create the All Users Microsoft directory.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 7eb0d62b3d155f1e4099bf7778e4febf30dacdb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb0d62b3d155f1e4099bf777… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 19 08:04:04 2012 -0600 shell32: Create the All Users Microsoft directory. --- dlls/shell32/shellpath.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 00ee079..e607149 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2722,6 +2722,7 @@ static void _SHCreateSymbolicLinks(void) static HRESULT create_extra_folders(void) { static const WCHAR environW[] = {'E','n','v','i','r','o','n','m','e','n','t',0}; + static const WCHAR microsoftW[] = {'M','i','c','r','o','s','o','f','t',0}; static const WCHAR TempW[] = {'T','e','m','p',0}; static const WCHAR TEMPW[] = {'T','E','M','P',0}; static const WCHAR TMPW[] = {'T','M','P',0}; @@ -2746,6 +2747,12 @@ static HRESULT create_extra_folders(void) RegSetValueExW( hkey, TMPW, 0, REG_SZ, (LPBYTE)path, (strlenW(path) + 1) * sizeof(WCHAR) ); } RegCloseKey( hkey ); + + if (SUCCEEDED(hr)) + { + hr = SHGetFolderPathAndSubDirW( 0, CSIDL_COMMON_APPDATA | CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_DEFAULT, microsoftW, path ); + } return hr; }

1 0

Alexandre Julliard : gdi32: Always update the DC before looking for the physdev pointer.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: e95cff03327e9e7bda55087bca45397a646426f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95cff03327e9e7bda55087bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 21:07:04 2012 +0200 gdi32: Always update the DC before looking for the physdev pointer. --- dlls/gdi32/bitblt.c | 31 ++++--- dlls/gdi32/clipping.c | 60 ++++++------- dlls/gdi32/dc.c | 3 +- dlls/gdi32/dib.c | 6 +- dlls/gdi32/driver.c | 15 ++-- dlls/gdi32/painting.c | 228 ++++++++++++++++++++++-------------------------- 6 files changed, 165 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e95cff03327e9e7bda550…

1 0

Christian Costa : dmusic: Rename params of SynthPortImpl_IDirectMusicPort_DownloadInstrument.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 4262ecf91039c258de8b510f59a4ccd031e3e062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4262ecf91039c258de8b510f5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Sep 20 00:17:35 2012 +0200 dmusic: Rename params of SynthPortImpl_IDirectMusicPort_DownloadInstrument. --- dlls/dmusic/port.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index bc9c3e7..cfe4265 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -146,16 +146,16 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT ifac return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicInstrument* pInstrument, IDirectMusicDownloadedInstrument** ppDownloadedInstrument, DMUS_NOTERANGE* pNoteRanges, DWORD dwNumNoteRanges) +static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicInstrument* instrument, IDirectMusicDownloadedInstrument** downloaded_instrument, DMUS_NOTERANGE* note_ranges, DWORD num_note_ranges) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); - FIXME("(%p, %p, %p, %p, %d): stub\n", This, pInstrument, ppDownloadedInstrument, pNoteRanges, dwNumNoteRanges); + FIXME("(%p/%p)->(%p, %p, %p, %d): stub\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); - if (!pInstrument || !ppDownloadedInstrument || (dwNumNoteRanges && !pNoteRanges)) - return E_POINTER; + if (!instrument || !downloaded_instrument || (num_note_ranges && !note_ranges)) + return E_POINTER; - return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(&IID_IDirectMusicDownloadedInstrument, (LPVOID*)ppDownloadedInstrument, NULL); + return DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(&IID_IDirectMusicDownloadedInstrument, (LPVOID*)downloaded_instrument, NULL); } static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument)

1 0

Francois Gouget : comdlg32: Make FD31_GetFldrHeight() static.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: bfd9cd1c427584d96b31f6d8a961990178d31fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd9cd1c427584d96b31f6d8a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 20 11:06:29 2012 +0200 comdlg32: Make FD31_GetFldrHeight() static. --- dlls/comdlg32/filedlg31.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 4ede0b3..4a78958 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -1069,7 +1069,7 @@ static LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) return TRUE; } -int FD31_GetFldrHeight(void) +static int FD31_GetFldrHeight(void) { return fldrHeight; }

1 0

Michael Stefaniuc : user32: Remove superfluous function pointer casts.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 1e5328c77c861e163081b5e084b648bc6f6a72e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5328c77c861e163081b5e08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 20 13:29:17 2012 +0200 user32: Remove superfluous function pointer casts. --- dlls/user32/dialog.c | 3 +-- dlls/user32/tests/msg.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index f0fdf49..497d545 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1513,8 +1513,7 @@ BOOL WINAPI CheckRadioButton( HWND hwndDlg, int firstID, radioGroup.lastID = lastID; radioGroup.checkID = checkID; - return EnumChildWindows(hwndDlg, (WNDENUMPROC)CheckRB, - (LPARAM)&radioGroup); + return EnumChildWindows(hwndDlg, CheckRB, (LPARAM)&radioGroup); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2e4ad7d..7d14b12 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11268,8 +11268,7 @@ static void test_EndDialog(void) ok(GetClassInfo(0, "#32770", &cls), "GetClassInfo failed\n"); cls.lpszClassName = "MyDialogClass"; cls.hInstance = GetModuleHandle(0); - /* need a cast since a dlgproc is used as a wndproc */ - cls.lpfnWndProc = (WNDPROC)test_dlg_proc; + cls.lpfnWndProc = test_dlg_proc; if (!RegisterClass(&cls)) assert(0); flush_sequence();

1 0

Jacek Caban : jscript: Added support for RegExp.$* properties.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: 87d6e2385a028788ee89ab6beb5fc7bbcd8ec059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d6e2385a028788ee89ab6be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 20 15:02:55 2012 +0200 jscript: Added support for RegExp.$* properties. --- dlls/jscript/jscript.h | 11 ++-- dlls/jscript/regexp.c | 122 ++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/regexp.js | 23 ++++++++ 3 files changed, 151 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 87d43e8..99d3863 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -299,6 +299,11 @@ typedef struct { jsval_t val; } jsexcept_t; +typedef struct { + const WCHAR *str; + DWORD len; +} match_result_t; + struct _script_ctx_t { LONG ref; @@ -321,6 +326,7 @@ struct _script_ctx_t { IDispatch *host_global; BSTR last_match; + match_result_t match_parens[9]; DWORD last_match_index; DWORD last_match_length; @@ -371,11 +377,6 @@ HRESULT create_vbarray_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDE IUnknown *create_ax_site(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_jscaller(script_ctx_t*) DECLSPEC_HIDDEN; -typedef struct { - const WCHAR *str; - DWORD len; -} match_result_t; - #define REM_CHECK_GLOBAL 0x0001 #define REM_RESET_INDEX 0x0002 #define REM_NO_CTX_UPDATE 0x0004 diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index fc4be4f..b53b848 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -101,6 +101,16 @@ static const WCHAR leftContextW[] = static const WCHAR rightContextW[] = {'r','i','g','h','t','C','o','n','t','e','x','t',0}; +static const WCHAR idx1W[] = {'$','1',0}; +static const WCHAR idx2W[] = {'$','2',0}; +static const WCHAR idx3W[] = {'$','3',0}; +static const WCHAR idx4W[] = {'$','4',0}; +static const WCHAR idx5W[] = {'$','5',0}; +static const WCHAR idx6W[] = {'$','6',0}; +static const WCHAR idx7W[] = {'$','7',0}; +static const WCHAR idx8W[] = {'$','8',0}; +static const WCHAR idx9W[] = {'$','9',0}; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR emptyW[] = {0}; @@ -3388,6 +3398,23 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D } } + if(!(rem_flags & REM_NO_CTX_UPDATE)) { + DWORD i, n = min(sizeof(ctx->match_parens)/sizeof(ctx->match_parens[0]), regexp->jsregexp->parenCount); + + for(i=0; i < n; i++) { + if(result->parens[i].index == -1) { + ctx->match_parens[i].str = NULL; + ctx->match_parens[i].len = 0; + }else { + ctx->match_parens[i].str = ctx->last_match + result->parens[i].index; + ctx->match_parens[i].len = result->parens[i].length; + } + } + + if(n < sizeof(ctx->match_parens)/sizeof(ctx->match_parens[0])) + memset(ctx->match_parens+n, 0, sizeof(ctx->match_parens) - n*sizeof(ctx->match_parens[0])); + } + matchlen = (result->cp-*cp) - gData.skipped; *cp = result->cp; ret->str = result->cp-matchlen; @@ -4000,6 +4027,92 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, BSTR str, jsval_t * return hres; } +static HRESULT global_idx(script_ctx_t *ctx, DWORD flags, DWORD idx, jsval_t *r) +{ + switch(flags) { + case DISPATCH_PROPERTYGET: { + BSTR ret = NULL; + + ret = SysAllocStringLen(ctx->match_parens[idx].str, ctx->match_parens[idx].len); + if(!ret) + return E_OUTOFMEMORY; + + *r = jsval_string(ret); + break; + } + case DISPATCH_PROPERTYPUT: + break; + default: + FIXME("unsupported flags\n"); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT RegExpConstr_idx1(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 0, r); +} + +static HRESULT RegExpConstr_idx2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 1, r); +} + +static HRESULT RegExpConstr_idx3(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 2, r); +} + +static HRESULT RegExpConstr_idx4(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 3, r); +} + +static HRESULT RegExpConstr_idx5(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 4, r); +} + +static HRESULT RegExpConstr_idx6(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 5, r); +} + +static HRESULT RegExpConstr_idx7(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 6, r); +} + +static HRESULT RegExpConstr_idx8(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 7, r); +} + +static HRESULT RegExpConstr_idx9(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + unsigned argc, jsval_t *argv, jsval_t *r) +{ + TRACE("\n"); + return global_idx(ctx, flags, 8, r); +} + static HRESULT RegExpConstr_leftContext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -4108,6 +4221,15 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } static const builtin_prop_t RegExpConstr_props[] = { + {idx1W, RegExpConstr_idx1, 0}, + {idx2W, RegExpConstr_idx2, 0}, + {idx3W, RegExpConstr_idx3, 0}, + {idx4W, RegExpConstr_idx4, 0}, + {idx5W, RegExpConstr_idx5, 0}, + {idx6W, RegExpConstr_idx6, 0}, + {idx7W, RegExpConstr_idx7, 0}, + {idx8W, RegExpConstr_idx8, 0}, + {idx9W, RegExpConstr_idx9, 0}, {leftContextW, RegExpConstr_leftContext, 0}, {rightContextW, RegExpConstr_rightContext, 0} }; diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 7b363dd..38d5377 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -598,4 +598,27 @@ ok(tmp === "x*y", '"x/y".replace(/[/]/, "*") = ' + tmp); tmp = "x/y".replace(/[xy/]/g, "*"); ok(tmp === "***", '"x/y".replace(/[xy/]/, "*") = ' + tmp); +/(b)/.exec("abc"); +ok(RegExp.$1 === "b", "RegExp.$1 = " + RegExp.$1); +ok("$2" in RegExp, "RegExp.$2 doesn't exist"); +ok(RegExp.$2 === "", "RegExp.$2 = " + RegExp.$2); +ok(RegExp.$9 === "", "RegExp.$9 = " + RegExp.$9); +ok(!("$10" in RegExp), "RegExp.$10 exists"); + +/(b)(b)(b)(b)(b)(b)(b)(b)(b)(b)(b)/.exec("abbbbbbbbbbbc"); +ok(RegExp.$1 === "b", "RegExp.$1 = " + RegExp.$1); +ok(RegExp.$2 === "b", "[2] RegExp.$2 = " + RegExp.$2); +ok(RegExp.$9 === "b", "RegExp.$9 = " + RegExp.$9); +ok(!("$10" in RegExp), "RegExp.$10 exists"); + +/(b)/.exec("abc"); +ok(RegExp.$1 === "b", "RegExp.$1 = " + RegExp.$1); +ok("$2" in RegExp, "RegExp.$2 doesn't exist"); +ok(RegExp.$2 === "", "RegExp.$2 = " + RegExp.$2); +ok(RegExp.$9 === "", "RegExp.$9 = " + RegExp.$9); +ok(!("$10" in RegExp), "RegExp.$10 exists"); + +RegExp.$1 = "a"; +ok(RegExp.$1 === "b", "RegExp.$1 = " + RegExp.$1); + reportSuccess();

1 0

Jacek Caban : jscript: Get rid of unused hres.
by Alexandre Julliard 20 Sep '12

20 Sep '12

Module: wine Branch: master Commit: e374449e3052fcb29d60ed3b0b07501a6d014010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e374449e3052fcb29d60ed3b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 20 15:04:01 2012 +0200 jscript: Get rid of unused hres. Spotted by Michael Stefaniuc. --- dlls/jscript/engine.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6ff55e9..d1d85fa 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -771,15 +771,13 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) assert(is_bool(stack_top(ctx))); if(!get_bool(stack_top(ctx))) { - HRESULT hres; - TRACE("passing exception\n"); jsval_release(v); stack_popn(ctx, 1); ctx->script->ei.val = stack_pop(ctx); - return SUCCEEDED(hres) ? DISP_E_EXCEPTION : hres; + return DISP_E_EXCEPTION; } stack_popn(ctx, 2);

1 0