February 2013 - Wine-commits

Huw Davies : riched20: Use ME_PointFromChar to calculate the caret position .
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 1c0aaf7dd27b5ed00a5319e0e0506287bd02f606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0aaf7dd27b5ed00a5319e0e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:41 2013 +0000 riched20: Use ME_PointFromChar to calculate the caret position. --- dlls/riched20/caret.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4986f6e..76c169b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -205,7 +205,7 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, ME_DisplayItem *para = pCursor->pPara; ME_DisplayItem *pSizeRun = run; ME_Context c; - SIZE sz = {0, 0}; + int run_x; assert(height && x && y); assert(~para->member.para.nFlags & MEPF_REWRAP); @@ -235,18 +235,12 @@ ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, pSizeRun = run = tmp; assert(run); assert(run->type == diRun); - sz = ME_GetRunSize(&c, &para->member.para, - &run->member.run, run->member.run.len, - row->member.row.nLMargin); } } - if (pCursor->nOffset) { - sz = ME_GetRunSize(&c, &para->member.para, &run->member.run, - pCursor->nOffset, row->member.row.nLMargin); - } + run_x = ME_PointFromCharContext( &c, &run->member.run, pCursor->nOffset ); *height = pSizeRun->member.run.nAscent + pSizeRun->member.run.nDescent; - *x = c.rcView.left + run->member.run.pt.x + sz.cx - editor->horz_si.nPos; + *x = c.rcView.left + run->member.run.pt.x + run_x - editor->horz_si.nPos; *y = c.rcView.top + para->member.para.pt.y + row->member.row.nBaseline + run->member.run.pt.y - pSizeRun->member.run.nAscent - editor->vert_si.nPos;

1 0

Dmitry Timoshkov : gdi32: SelectClipPath should update actual clipping region for a EMF DC.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: e069662c0c8d76f3935c20bca255f1e4fec057da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e069662c0c8d76f3935c20bca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 13:06:33 2013 +0800 gdi32: SelectClipPath should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 3af7ef4..389dc38 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -159,7 +159,6 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.nSize = sizeof(emr); @@ -167,15 +166,14 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pExcludeClipRect( next, left, top, right, bottom ); } INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect ); EMRINTERSECTCLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_INTERSECTCLIPRECT; emr.emr.nSize = sizeof(emr); @@ -183,22 +181,21 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pIntersectClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pIntersectClipRect( next, left, top, right, bottom ); } INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; - BOOL ret; emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pOffsetClipRgn( next, x, y ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pOffsetClipRgn( next, x, y ); } INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) @@ -477,13 +474,15 @@ BOOL EMFDRV_FlattenPath( PHYSDEV dev ) BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectClipPath ); EMRSELECTCLIPPATH emr; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); emr.iMode = iMode; - return EMFDRV_WriteRecord( dev, &emr.emr ); + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; + return next->funcs->pSelectClipPath( next, iMode ); } BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )

1 0

Dmitry Timoshkov : kernel32: There is no need for lock/ unlock heap in GlobalAlloc.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 70c21c8e6c5b6f7f0b543a704b292824ca0a307b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c21c8e6c5b6f7f0b543a704… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 16:40:43 2013 +0800 kernel32: There is no need for lock/unlock heap in GlobalAlloc. --- dlls/kernel32/heap.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b74763f..e0b86e5 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -370,8 +370,6 @@ HGLOBAL WINAPI GlobalAlloc( return 0; } - RtlLockHeap(GetProcessHeap()); - pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); if (pintern) { @@ -400,7 +398,6 @@ HGLOBAL WINAPI GlobalAlloc( pintern->Pointer = NULL; } - RtlUnlockHeap(GetProcessHeap()); if (!pintern) return 0; TRACE( "(flags=%04x) returning handle %p pointer %p\n", flags, INTERN_TO_HANDLE(pintern), pintern->Pointer );

1 0

Jacek Caban : vbscript: Added support for a few more constants.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 97f2912965fae9aa33f10308ef5dc551c9f086b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f2912965fae9aa33f10308e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 15 10:29:42 2013 +0100 vbscript: Added support for a few more constants. --- dlls/vbscript/global.c | 32 ++++---------------------------- dlls/vbscript/tests/api.vbs | 9 +++++++++ dlls/vbscript/vbdisp.c | 11 ++++++++--- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 39b75ab..1a3dae7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1771,30 +1771,6 @@ static HRESULT Global_vbVerticalTab(vbdisp_t *This, VARIANT *arg, unsigned args_ return E_NOTIMPL; } -static HRESULT Global_vbMsgBoxHelpButton(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxSetForeground(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxRight(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, 0}, {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, NULL, BP_GET, 0}, @@ -1984,10 +1960,10 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_EXECUTE, Global_Execute, 0, 1}, {DISPID_GLOBAL_EXECUTEGLOBAL, Global_ExecuteGlobal, 0, 1}, {DISPID_GLOBAL_GETREF, Global_GetRef, 0, 1}, - {DISPID_GLOBAL_VBMSGBOXHELPBUTTON, Global_vbMsgBoxHelpButton, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXSETFOREGROUND, Global_vbMsgBoxSetForeground, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXRIGHT, Global_vbMsgBoxRight, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXRTLREADING, Global_vbMsgBoxRtlReading, BP_GET} + {DISPID_GLOBAL_VBMSGBOXHELPBUTTON, NULL, BP_GET, MB_HELP}, + {DISPID_GLOBAL_VBMSGBOXSETFOREGROUND, NULL, BP_GET, MB_SETFOREGROUND}, + {DISPID_GLOBAL_VBMSGBOXRIGHT, NULL, BP_GET, MB_RIGHT}, + {DISPID_GLOBAL_VBMSGBOXRTLREADING, NULL, BP_GET, MB_RTLREADING} }; HRESULT init_global(script_ctx_t *ctx) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 966b256..6472b95 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -43,6 +43,11 @@ Sub TestConstant(name, val, exval) Call ok(getVT(val) = "VT_I2*", "getVT(" & name & ") = " & getVT(val)) End Sub +Sub TestConstantI4(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_I4*", "getVT(" & name & ") = " & getVT(val)) +End Sub + TestConstant "vbEmpty", vbEmpty, 0 TestConstant "vbNull", vbNull, 1 TestConstant "vbLong", vbLong, 3 @@ -76,6 +81,10 @@ TestConstant "vbFirstFourDays", vbFirstFourDays, 2 TestConstant "vbFirstFullWeek", vbFirstFullWeek, 3 TestConstant "vbTrue", vbTrue, -1 TestConstant "vbFalse", vbFalse, 0 +TestConstantI4 "vbMsgBoxHelpButton", vbMsgBoxHelpButton, 16384 +TestConstantI4 "vbMsgBoxSetForeground", vbMsgBoxSetForeground, 65536 +TestConstantI4 "vbMsgBoxRight", vbMsgBoxRight, 524288 +TestConstantI4 "vbMsgBoxRtlReading", vbMsgBoxRtlReading, 1048576 Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index b37caf6..843d5c8 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -150,9 +150,14 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f break; case DISPATCH_PROPERTYGET|DISPATCH_METHOD: if(!prop->proc && prop->flags == BP_GET) { - assert((INT16)prop->min_args == prop->min_args); - V_VT(res) = VT_I2; - V_I2(res) = prop->min_args; + int val = prop->min_args; + if(val < 0x4000) { + V_VT(res) = VT_I2; + V_I2(res) = val; + }else { + V_VT(res) = VT_I4; + V_I4(res) = val; + } return S_OK; } break;

1 0

Francois Gouget : d3d11: Make debug_d3d_driver_type() static.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: aaabd02cffc1789a39c0bf7819cf2082db660a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabd02cffc1789a39c0bf781… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 15 11:13:48 2013 +0100 d3d11: Make debug_d3d_driver_type() static. --- dlls/d3d11/d3d11_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 4091bca..b5bf8cd 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) +static const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) { switch(driver_type) {

1 0

Roman Dadkov : ole32/tests: Add test for OleRun.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 665717ae75e01817da468055c30dfa9c7f09e6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=665717ae75e01817da468055c… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Wed Feb 13 18:03:53 2013 +0400 ole32/tests: Add test for OleRun. --- dlls/ole32/tests/ole2.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 4ef6638..ef3a0a6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1926,6 +1926,14 @@ static const IUnknownVtbl UnknownVtbl = static IUnknown unknown = { &UnknownVtbl }; +static void test_OleRun(void) +{ + HRESULT hr; + + hr = OleRun(&unknown); + ok(hr == S_OK, "OleRun failed 0x%08x\n", hr); +} + static void test_OleLockRunning(void) { HRESULT hr; @@ -1984,6 +1992,7 @@ START_TEST(ole2) test_data_cache(); test_default_handler(); test_runnable(); + test_OleRun(); test_OleLockRunning(); test_OleDraw();

1 0

Francois Gouget : ws2_32/tests: Fix the GetAcceptExSockaddrs() test.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 867615419e7ff3aac203743a03fdb661e28089b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867615419e7ff3aac203743a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:34:00 2013 +0100 ws2_32/tests: Fix the GetAcceptExSockaddrs() test. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ebde182..804c66b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4771,6 +4771,7 @@ static void test_AcceptEx(void) ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); ok(connect_time == ~0u, "unexpected connect time %u\n", connect_time); + /* AcceptEx() still won't complete until we send data */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); @@ -4786,6 +4787,13 @@ static void test_AcceptEx(void) iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); ok( !iret, "getsockname failed.\n"); + /* AcceptEx() could complete any time now */ + iret = send(connector, buffer, 1, 0); + ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + /* Check if the buffer from AcceptEx is decoded correctly */ pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, @@ -4805,12 +4813,6 @@ static void test_AcceptEx(void) "Remote socket port is different: %d != %d\n", readRemoteAddress->sin_port, peerAddress.sin_port); - iret = send(connector, buffer, 1, 0); - ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); - - dwret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); - bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned);

1 0

Jeff Latimer : wmvcore: Fix a typo.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 2b5babc3994219c867d8288d9e87dfa632ac3d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5babc3994219c867d8288d9… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Feb 15 23:32:02 2013 +1100 wmvcore: Fix a typo. --- dlls/wmvcore/wmvcore_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 8d928ca..b9cdd22 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -61,7 +61,7 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) { FIXME("(%p, %x, %p): stub\n", reserved, rights, reader);

1 0

Piotr Caban : jscript: Rename jsheap_t to heap_pool_t.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 02d63cb3120d89a5107d4e26a92eb4bd06e2213d URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d63cb3120d89a5107d4e26a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:14 2013 +0100 jscript: Rename jsheap_t to heap_pool_t. --- dlls/jscript/compile.c | 6 +++--- dlls/jscript/engine.h | 8 ++++---- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/jscript.h | 16 ++++++++-------- dlls/jscript/jsutils.c | 18 +++++++++--------- dlls/jscript/parser.y | 10 +++++----- dlls/jscript/regexp.c | 32 ++++++++++++++++---------------- 7 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02d63cb3120d89a5107d4…

1 0

Piotr Caban : jscript: Don't use jsstr_t in JSRegExp structure.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 89711e35c1dab1b9fe98ceff142cd703606dc0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=89711e35c1dab1b9fe98ceff1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:29 2013 +0100 jscript: Don't use jsstr_t in JSRegExp structure. --- dlls/jscript/regexp.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index bca73a4..decabcc 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -74,7 +74,8 @@ typedef struct { size_t parenCount; /* number of parenthesized submatches */ size_t classCount; /* count [...] bitmaps */ RECharSet *classList; /* list of [...] bitmaps */ - jsstr_t *source; /* locked source string, sans // */ + const WCHAR *source; /* locked source string, sans // */ + DWORD source_len; jsbytecode program[1]; /* regular expression bytecode */ } JSRegExp; @@ -2038,7 +2039,7 @@ PushBackTrackState(REGlobalData *gData, REOp op, } static inline REMatchState * -FlatNIMatcher(REGlobalData *gData, REMatchState *x, WCHAR *matchChars, +FlatNIMatcher(REGlobalData *gData, REMatchState *x, const WCHAR *matchChars, size_t length) { size_t i; @@ -2157,13 +2158,12 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) * source string. */ assert(1 <= charSet->u.src.startIndex); - assert(charSet->u.src.startIndex - < jsstr_length(gData->regexp->source)); - assert(charSet->u.src.length <= jsstr_length(gData->regexp->source) - - 1 - charSet->u.src.startIndex); + assert(charSet->u.src.startIndex < gData->regexp->source_len); + assert(charSet->u.src.length <= gData->regexp->source_len + - 1 - charSet->u.src.startIndex); charSet->converted = TRUE; - src = gData->regexp->source->str + charSet->u.src.startIndex; + src = gData->regexp->source + charSet->u.src.startIndex; end = src + charSet->u.src.length; @@ -2392,7 +2392,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, size_t parenIndex; size_t offset, length, index; jsbytecode *pc = *startpc; /* pc has already been incremented past op */ - WCHAR *source; + const WCHAR *source; const WCHAR *startcp = x->cp; WCHAR ch; RECharSet *charSet; @@ -2488,12 +2488,12 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLAT: pc = ReadCompactIndex(pc, &offset); - assert(offset < jsstr_length(gData->regexp->source)); + assert(offset < gData->regexp->source_len); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= jsstr_length(gData->regexp->source) - offset); + assert(length <= gData->regexp->source_len - offset); if (length <= (size_t)(gData->cpend - x->cp)) { - source = gData->regexp->source->str + offset; + source = gData->regexp->source + offset; TRACE("%s\n", debugstr_wn(source, length)); for (index = 0; index != length; index++) { if (source[index] != x->cp[index]) @@ -2513,11 +2513,11 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLATi: pc = ReadCompactIndex(pc, &offset); - assert(offset < jsstr_length(gData->regexp->source)); + assert(offset < gData->regexp->source_len); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= jsstr_length(gData->regexp->source) - offset); - source = gData->regexp->source->str; + assert(length <= gData->regexp->source_len - offset); + source = gData->regexp->source; result = FlatNIMatcher(gData, x, source + offset, length); break; case REOP_FLAT1i: @@ -3303,7 +3303,8 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re->flags = flags; re->parenCount = state.parenCount; - re->source = str; + re->source = str->str; + re->source_len = jsstr_length(str); out: heap_pool_clear(mark);

1 0