February 2013 - Wine-Commits

Jactry Zeng : Simplified Chinese translation for release 1.5.24
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: c31b987e7af7091cbc7b0a3c48a7221f1c2ef7f7 URL: http://source.winehq.org/git/website.git/?a=commit;h=c31b987e7af7091cbc7b0a… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Feb 16 11:35:41 2013 +0800 Simplified Chinese translation for release 1.5.24 --- news/zh-cn/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013021501.xml b/news/zh-cn/2013021501.xml new file mode 100644 index 0000000..ed83791 --- /dev/null +++ b/news/zh-cn/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>二月 15, 2013</date> +<title>Wine 1.5.24 发布</title> +<body> + Wine 开发版 1.5.24 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.24">更新</a>： +<ul> + <li>Mac 后端驱动对键盘和鼠标滚轮的支持。</li> + <li>VB Script 对正则表达式的支持。</li> + <li>许多 RichEdit 代码的清理。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.24
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: 9cf04996b80c23d8f6e6e92547259bec3be07895 URL: http://source.winehq.org/git/website.git/?a=commit;h=9cf04996b80c23d8f6e6e9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Feb 17 09:14:15 2013 +0100 Polish translation for release 1.5.24 --- news/pl/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2013021501.xml b/news/pl/2013021501.xml new file mode 100644 index 0000000..cde60e4 --- /dev/null +++ b/news/pl/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>Luty 15, 2013</date> +<title>Wydano Wine 1.5.24</title> +<body> + Wydanie rozwojowe Wine 1.5.24 jest już dostępne. + <a href="{$root}/announce/1.5.24">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla klawiatury i rolki myszy w sterowniku Mac.</li> + <li>Wsparcie dla wyrażeń regularnych w VB Script.</li> + <li>Wiele porządków w kodzie RichEdit.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.24
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: a5defce31a1bdb5e4c91ec60471c303aa45b1803 URL: http://source.winehq.org/git/website.git/?a=commit;h=a5defce31a1bdb5e4c91ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 15 23:11:32 2013 +0100 French translation for release 1.5.24 --- news/fr/2013021501.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013021501.xml b/news/fr/2013021501.xml new file mode 100644 index 0000000..4e96df0 --- /dev/null +++ b/news/fr/2013021501.xml @@ -0,0 +1,14 @@ +<news> +<date>15 février 2013</date> +<title>Sortie de Wine 1.5.24</title> +<body> + La version de développement 1.5.24 de Wine est disponible. + <a href="{$root}/announce/1.5.24">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du clavier et de la molette de souris dans le pilote Mac.</li> + <li>Prise en charge des expressions rationnelles dans VB Script.</li> + <li>Un tas de nettoyages dans le code RichEdit.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.5.24 freigegeben
by Jeremy Newman Feb. 18, 2013

Feb. 18, 2013

Module: website Branch: master Commit: 8af3798b23f8cbc8a99da226d761aa09351a17f4 URL: http://source.winehq.org/git/website.git/?a=commit;h=8af3798b23f8cbc8a99da2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 15 22:28:51 2013 +0100 Wine 1.5.24 freigegeben --- news/de/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013021501.xml b/news/de/2013021501.xml new file mode 100644 index 0000000..c868ff6 --- /dev/null +++ b/news/de/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>15. Februar 2013</date> +<title>Wine 1.5.24 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Tastatur und Mausrad Unterstützung im Mac Treiber.</li> + <li>Unterstützung für reguläre Ausdrücke in VB Script.</li> + <li>Viele Aufräumarbeiten am RichEdit Code.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.24
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: website Branch: master Commit: a9ac7e2d779df91bd7119467bc8374293a1aebcc URL: http://source.winehq.org/git/website.git/?a=commit;h=a9ac7e2d779df91bd71194… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:30:09 2013 +0100 Wine release 1.5.24 --- news/en/2013021501.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013021501.xml b/news/en/2013021501.xml new file mode 100644 index 0000000..c91f7dd --- /dev/null +++ b/news/en/2013021501.xml @@ -0,0 +1,15 @@ +<news> +<date>February 15, 2013</date> +<title>Wine 1.5.24 Released</title> +<body> + The Wine development release 1.5.24 is now available. + <a href="{$root}/announce/1.5.24">What's new</a> in this release: +<ul> + <li>Keyboard and mouse wheel support in the Mac driver.</li> + <li>Regular expression support in VB Script.</li> + <li>Many RichEdit code cleanups.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.24.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.24 : Alexandre Julliard : Release 1.5.24
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: refs/tags/wine-1.5.24 Tag: 9d9fff69a9641e739f497726875704023b93cc7e URL: http://source.winehq.org/git/wine.git/?a=tag;h=9d9fff69a9641e739f4977268757… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:21:18 2013 +0100 Release 1.5.24

1 0

Alexandre Julliard : Release 1.5.24.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: c41f6add0563252a5809c3c83cbb6a6e6f81c2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41f6add0563252a5809c3c83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:21:05 2013 +0100 Release 1.5.24. --- ANNOUNCE | 727 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 335 insertions(+), 412 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c41f6add0563252a5809c…

1 0

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

Feb. 15, 2013

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

Huw Davies : riched20: Move the password string hack to just before it' s used.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 635614b5ea9881bb9b922549b3cfb5f9bceee02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=635614b5ea9881bb9b922549b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:40 2013 +0000 riched20: Move the password string hack to just before it's used. --- dlls/riched20/paint.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 9937ec7..0ab4e2b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -314,11 +314,19 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in } -static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *text, BOOL selected, RECT *sel_rect ) +static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, RECT *sel_rect ) { COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; COLORREF old_text, old_back; + const WCHAR *text = get_text( run, 0 ); + ME_String *masked = NULL; + + if (c->editor->cPasswordMask) + { + masked = ME_MakeStringR( c->editor->cPasswordMask, run->len ); + text = masked->szData; + } old_text = SetTextColor( c->hDC, text_color ); if (selected) old_back = SetBkColor( c->hDC, back_color ); @@ -330,11 +338,12 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *te draw_underline( c, run, x, y, text_color ); + ME_DestroyString( masked ); return; } -static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, +static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; @@ -373,12 +382,12 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS hOldFont = ME_SelectStyleFont( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); - draw_text( c, run, x, y - yOffset, szText, FALSE, NULL ); + draw_text( c, run, x, y - yOffset, FALSE, NULL ); if (sel_rgn) { ExtSelectClipRgn( hDC, clip, RGN_COPY ); ExtSelectClipRgn( hDC, sel_rgn, RGN_AND ); - draw_text( c, run, x, y - yOffset, szText, TRUE, &sel_rect ); + draw_text( c, run, x, y - yOffset, TRUE, &sel_rect ); ExtSelectClipRgn( hDC, clip, RGN_COPY ); if (clip) DeleteObject( clip ); DeleteObject( sel_rgn ); @@ -439,20 +448,9 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); else { - if (c->editor->cPasswordMask) - { - ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - ME_DrawTextWithStyle(c, run, x, y, - szMasked->szData, nSelFrom - runofs, nSelTo - runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); - ME_DestroyString(szMasked); - } - else - ME_DrawTextWithStyle(c, run, x, y, - get_text( run, 0 ), nSelFrom - runofs, nSelTo - runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight); } }

1 0

Hans Leidekker : msi: Don' t remove products if msidbUpgradeAttributesOnlyDetect is set.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: bfe5e58d3a3e3e829fa1dd5a08c874dc8744bc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe5e58d3a3e3e829fa1dd5a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 15 16:45:04 2013 +0100 msi: Don't remove products if msidbUpgradeAttributesOnlyDetect is set. --- dlls/msi/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5abe040..d48ecdd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7260,12 +7260,14 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); + int attrs = MSI_RecordGetInteger( rec, 5 ); UINT len = sizeof(fmtW)/sizeof(fmtW[0]); WCHAR *product, *features, *cmd; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL ret; + if (attrs & msidbUpgradeAttributesOnlyDetect) return ERROR_SUCCESS; if (!(product = msi_dup_property( package->db, property ))) return ERROR_SUCCESS; deformat_string( package, MSI_RecordGetString( rec, 6 ), &features );

1 0

Huw Davies : riched20: Move underline drawing to a common function.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 79278497d3095c4a0a6710c6065c169fefec067e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79278497d3095c4a0a6710c60… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:38 2013 +0000 riched20: Move underline drawing to a common function. --- dlls/riched20/paint.c | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e4bd9e6..06026df 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -228,6 +228,22 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) return; } +static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color ) +{ + HPEN pen; + + get_underline_pen( run->style, color, &pen ); + if (pen) + { + HPEN old_pen = SelectObject( c->hDC, pen ); + MoveToEx( c->hDC, x, y + 1, NULL ); + LineTo( c->hDC, x + run->nWidth, y + 1 ); + SelectObject( c->hDC, old_pen ); + DeleteObject( pen ); + } + return; +} + /********************************************************************* * draw_space * @@ -260,7 +276,6 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF old_text, old_back; HFONT old_font = NULL; - HPEN pen = NULL; int y_offset = calc_y_offset( c, run->style ); static const WCHAR space[1] = {' '}; @@ -274,15 +289,7 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, SetTextColor( hdc, old_text ); ME_UnselectStyleFont( c, run->style, old_font ); - get_underline_pen( run->style, text_color, &pen ); - if (pen) - { - HPEN old_pen = SelectObject( hdc, pen ); - MoveToEx( hdc, x, y - y_offset + 1, NULL ); - LineTo( hdc, x + run->nWidth, y - y_offset + 1 ); - SelectObject( hdc, old_pen ); - DeleteObject( pen ); - } + draw_underline( c, run, x, y - y_offset, text_color ); } else if (selected) { @@ -311,7 +318,6 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *te COLORREF text_color = get_text_color( c, run->style, selected ); COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; COLORREF old_text, old_back; - HPEN pen; old_text = SetTextColor( c->hDC, text_color ); if (selected) old_back = SetBkColor( c->hDC, back_color ); @@ -321,15 +327,7 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *te if (selected) SetBkColor( c->hDC, old_back ); SetTextColor( c->hDC, old_text ); - get_underline_pen( run->style, text_color, &pen ); - if (pen) - { - HPEN old_pen = SelectObject( c->hDC, pen ); - MoveToEx( c->hDC, x, y + 1, NULL ); - LineTo( c->hDC, x + run->nWidth, y + 1 ); - SelectObject( c->hDC, old_pen ); - DeleteObject( pen ); - } + draw_underline( c, run, x, y, text_color ); return; }

1 0

Francois Gouget : winetest: Trace the time it takes to run each test.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: f704803c96d0f789f947d2de6ad0189f59f5fa8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f704803c96d0f789f947d2de6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:16:49 2013 +0100 winetest: Trace the time it takes to run each test. --- programs/winetest/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 427b6b4..6c8e327 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -724,12 +724,13 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch else { int status; + DWORD start = GetTickCount(); char *cmd = strmake (NULL, "%s %s", test->exename, subtest); report (R_STEP, "Running: %s:%s", test->name, subtest); xprintf ("%s:%s start %s -\n", test->name, subtest, file); status = run_ex (cmd, out_file, tempdir, 120000); heap_free (cmd); - xprintf ("%s:%s done (%d)\n", test->name, subtest, status); + xprintf ("%s:%s done (%d) in %ds\n", test->name, subtest, status, (GetTickCount()-start)/1000); if (status) failures++; } if (failures) report (R_STATUS, "Running tests - %u failures", failures);

1 0

Piotr Caban : vbscript: Added IRegExp2::Pattern implementation.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 7246f7f3aa97ef5e0a6554846fe600d309bb61f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7246f7f3aa97ef5e0a6554846… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:10:53 2013 +0100 vbscript: Added IRegExp2::Pattern implementation. --- dlls/vbscript/vbregexp.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 1afe44b..ffd110d 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -84,6 +84,8 @@ typedef struct { IRegExp IRegExp_iface; LONG ref; + + WCHAR *pattern; } RegExp2; static inline RegExp2 *impl_from_IRegExp2(IRegExp2 *iface) @@ -135,6 +137,7 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + heap_free(This->pattern); heap_free(This); } @@ -186,15 +189,44 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%p)\n", This, pPattern); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pPattern); + + if(!pPattern) + return E_POINTER; + + if(!This->pattern) { + *pPattern = NULL; + return S_OK; + } + + *pPattern = SysAllocString(This->pattern); + return *pPattern ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%s)\n", This, wine_dbgstr_w(pattern)); - return E_NOTIMPL; + WCHAR *p; + DWORD size; + + TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(pattern)); + + if(!pattern) { + heap_free(This->pattern); + This->pattern = NULL; + return S_OK; + } + + size = (SysStringLen(pattern)+1) * sizeof(WCHAR); + p = heap_alloc(size); + if(!p) + return E_OUTOFMEMORY; + + heap_free(This->pattern); + This->pattern = p; + memcpy(p, pattern, size); + return S_OK; } static HRESULT WINAPI RegExp2_get_IgnoreCase(IRegExp2 *iface, VARIANT_BOOL *pIgnoreCase)

1 0

Huw Davies : riched20: Move the range clamping to the helper now that the range isn' t used later on.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: a4378f44aa162c6e7984d2fe41dcabc990dadbe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4378f44aa162c6e7984d2fe4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 16:13:39 2013 +0000 riched20: Move the range clamping to the helper now that the range isn't used later on. --- dlls/riched20/paint.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 06026df..9937ec7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -304,7 +304,8 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, int cy, RECT *r ) { - + from = max( 0, from ); + to = min( run->len, to ); r->left = ME_PointFromCharContext( c, run, from ); r->top = 0; r->right = ME_PointFromCharContext( c, run, to ); @@ -349,8 +350,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS if (selected) { - nSelFrom = max( 0, nSelFrom ); - nSelTo = min( run->len, nSelTo ); get_selection_rect( c, run, nSelFrom, nSelTo, cy, &sel_rect ); OffsetRect( &sel_rect, x, ymin );

1 0

Piotr Caban : vbscript: Rename vbsheap to heap_pool.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: fb29bf7d2f04607b0a8e74b2b35f7aa2cda9ebdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb29bf7d2f04607b0a8e74b2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:11:13 2013 +0100 vbscript: Rename vbsheap to heap_pool. --- dlls/vbscript/compile.c | 8 ++++---- dlls/vbscript/interp.c | 12 ++++++------ dlls/vbscript/parse.h | 2 +- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/vbscript.c | 6 +++--- dlls/vbscript/vbscript.h | 12 ++++++------ dlls/vbscript/vbscript_main.c | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d324284..58494b9 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -118,14 +118,14 @@ static void dump_code(compile_ctx_t *ctx) static inline void *compiler_alloc(vbscode_t *vbscode, size_t size) { - return vbsheap_alloc(&vbscode->heap, size); + return heap_pool_alloc(&vbscode->heap, size); } static inline void *compiler_alloc_zero(vbscode_t *vbscode, size_t size) { void *ret; - ret = vbsheap_alloc(&vbscode->heap, size); + ret = heap_pool_alloc(&vbscode->heap, size); if(ret) memset(ret, 0, size); return ret; @@ -1585,7 +1585,7 @@ void release_vbscode(vbscode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); - vbsheap_free(&code->heap); + heap_pool_free(&code->heap); heap_free(code->bstr_pool); heap_free(code->source); @@ -1615,7 +1615,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_cnt = 1; ctx->instr_size = 32; - vbsheap_init(&ret->heap); + heap_pool_init(&ret->heap); ret->option_explicit = ctx->parser.option_explicit; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index eace041..b3f4244 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -37,7 +37,7 @@ typedef struct { VARIANT *vars; dynamic_var_t *dynamic_vars; - vbsheap_t heap; + heap_pool_t heap; BOOL resume_next; @@ -210,19 +210,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, BOOL is_const, VARIANT *val, BOOL own_val, VARIANT **out_var) { dynamic_var_t *new_var; - vbsheap_t *heap; + heap_pool_t *heap; WCHAR *str; unsigned size; HRESULT hres; heap = ctx->func->type == FUNC_GLOBAL ? &ctx->script->heap : &ctx->heap; - new_var = vbsheap_alloc(heap, sizeof(*new_var)); + new_var = heap_pool_alloc(heap, sizeof(*new_var)); if(!new_var) return E_OUTOFMEMORY; size = (strlenW(name)+1)*sizeof(WCHAR); - str = vbsheap_alloc(heap, size); + str = heap_pool_alloc(heap, size); if(!str) return E_OUTOFMEMORY; memcpy(str, name, size); @@ -1833,7 +1833,7 @@ static void release_exec(exec_ctx_t *ctx) VariantClear(ctx->vars+i); } - vbsheap_free(&ctx->heap); + heap_pool_free(&ctx->heap); heap_free(ctx->args); heap_free(ctx->vars); heap_free(ctx->stack); @@ -1852,7 +1852,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DI return E_FAIL; } - vbsheap_init(&exec.heap); + heap_pool_init(&exec.heap); if(func->arg_cnt) { VARIANT *v; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 74e0a8a..ba1a311 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -263,7 +263,7 @@ typedef struct { statement_t *stats_tail; class_decl_t *class_decls; - vbsheap_t heap; + heap_pool_t heap; } parser_ctx_t; HRESULT parse_script(parser_ctx_t*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index b71b92d..4b380ef 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -922,7 +922,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) { void *ret; - ret = vbsheap_alloc(&ctx->heap, size); + ret = heap_pool_alloc(&ctx->heap, size); if(!ret) ctx->hres = E_OUTOFMEMORY; return ret; @@ -935,7 +935,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); - vbsheap_init(&ctx->heap); + heap_pool_init(&ctx->heap); ctx->parse_complete = FALSE; ctx->hres = S_OK; @@ -961,5 +961,5 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite void parser_release(parser_ctx_t *ctx) { - vbsheap_free(&ctx->heap); + heap_pool_free(&ctx->heap); } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 1195f85..48dd18c 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -172,8 +172,8 @@ static void release_script(script_ctx_t *ctx) IDispatchEx_Release(&script_obj->IDispatchEx_iface); } - vbsheap_free(&ctx->heap); - vbsheap_init(&ctx->heap); + heap_pool_free(&ctx->heap); + heap_pool_init(&ctx->heap); } static void destroy_script(script_ctx_t *ctx) @@ -568,7 +568,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) return E_OUTOFMEMORY; ctx->safeopt = This->safeopt; - vbsheap_init(&ctx->heap); + heap_pool_init(&ctx->heap); list_init(&ctx->objects); list_init(&ctx->code_list); list_init(&ctx->named_items); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index e3d96d8..f499e4f 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -37,11 +37,11 @@ typedef struct { DWORD last_block; DWORD offset; struct list custom_blocks; -} vbsheap_t; +} heap_pool_t; -void vbsheap_init(vbsheap_t*) DECLSPEC_HIDDEN; -void *vbsheap_alloc(vbsheap_t*,size_t) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; -void vbsheap_free(vbsheap_t*) DECLSPEC_HIDDEN; +void heap_pool_init(heap_pool_t*) DECLSPEC_HIDDEN; +void *heap_pool_alloc(heap_pool_t*,size_t) __WINE_ALLOC_SIZE(2) DECLSPEC_HIDDEN; +void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; typedef struct _function_t function_t; typedef struct _vbscode_t vbscode_t; @@ -177,7 +177,7 @@ struct _script_ctx_t { class_desc_t *classes; class_desc_t *procs; - vbsheap_t heap; + heap_pool_t heap; struct list objects; struct list code_list; @@ -320,7 +320,7 @@ struct _vbscode_t { BSTR *bstr_pool; unsigned bstr_pool_size; unsigned bstr_cnt; - vbsheap_t heap; + heap_pool_t heap; struct list entry; }; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 9ff2a51..a06eb2c 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -133,13 +133,13 @@ static inline DWORD block_size(DWORD block) return MIN_BLOCK_SIZE << block; } -void vbsheap_init(vbsheap_t *heap) +void heap_pool_init(heap_pool_t *heap) { memset(heap, 0, sizeof(*heap)); list_init(&heap->custom_blocks); } -void *vbsheap_alloc(vbsheap_t *heap, size_t size) +void *heap_pool_alloc(heap_pool_t *heap, size_t size) { struct list *list; void *tmp; @@ -194,7 +194,7 @@ void *vbsheap_alloc(vbsheap_t *heap, size_t size) return list+1; } -void vbsheap_free(vbsheap_t *heap) +void heap_pool_free(heap_pool_t *heap) { struct list *iter; DWORD i;

1 0

Piotr Caban : vbscript: Added partial implementation of IDispatch methods in IRegExp2.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 08a16a28767923391b870132bd19dbb7cd94cf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a16a28767923391b870132b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:10:27 2013 +0100 vbscript: Added partial implementation of IDispatch methods in IRegExp2. --- dlls/vbscript/vbregexp.c | 97 +++++++++++++++++++++++++++++++++++++--- dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 1 + 3 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 2bf866b..1afe44b 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -23,6 +23,62 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define REGEXP_TID_LIST \ + XDIID(RegExp2) \ + XDIID(Match2) \ + XDIID(MatchCollection2) \ + XDIID(SubMatches) + +typedef enum { +#define XDIID(iface) iface ## _tid, +REGEXP_TID_LIST +#undef XDIID + REGEXP_LAST_tid +} regexp_tid_t; + +static REFIID tid_ids[] = { +#define XDIID(iface) &IID_I ## iface, +REGEXP_TID_LIST +#undef XDIID +}; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[REGEXP_LAST_tid]; + +static HRESULT init_regexp_typeinfo(regexp_tid_t tid) +{ + HRESULT hres; + + if(!typelib) { + static const WCHAR vbscript_dll3W[] = {'v','b','s','c','r','i','p','t','.','d','l','l','\\','3',0}; + ITypeLib *tl; + + hres = LoadTypeLib(vbscript_dll3W, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + } + + if(!typeinfos[tid]) { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + return S_OK; +} + typedef struct { IRegExp2 IRegExp2_iface; IRegExp IRegExp_iface; @@ -78,8 +134,9 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { heap_free(This); + } return ref; } @@ -87,8 +144,11 @@ static ULONG WINAPI RegExp2_Release(IRegExp2 *iface) static HRESULT WINAPI RegExp2_GetTypeInfoCount(IRegExp2 *iface, UINT *pctinfo) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI RegExp2_GetTypeInfo(IRegExp2 *iface, @@ -103,9 +163,11 @@ static HRESULT WINAPI RegExp2_GetIDsOfNames(IRegExp2 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); + + return ITypeInfo_GetIDsOfNames(typeinfos[RegExp2_tid], rgszNames, cNames, rgDispId); } static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, @@ -113,9 +175,12 @@ static HRESULT WINAPI RegExp2_Invoke(IRegExp2 *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + return ITypeInfo_Invoke(typeinfos[RegExp2_tid], iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) @@ -357,6 +422,10 @@ HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnkno TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + hres = init_regexp_typeinfo(RegExp2_tid); + if(FAILED(hres)) + return hres; + ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -370,3 +439,15 @@ HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnkno IRegExp2_Release(&ret->IRegExp2_iface); return hres; } + +void release_regexp_typelib(void) +{ + DWORD i; + + for(i=0; i<REGEXP_LAST_tid; i++) { + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + } + if(typelib) + ITypeLib_Release(typelib); +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 868a9f4..e3d96d8 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -342,6 +342,7 @@ TID_LIST } tid_t; HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; +void release_regexp_typelib(void) DECLSPEC_HIDDEN; #ifndef INT32_MIN #define INT32_MIN (-2147483647-1) diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index eefb7a5..9ff2a51 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -285,6 +285,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: release_typelib(); + release_regexp_typelib(); } return TRUE;

1 0

Piotr Caban : jscript: Move code operating on JSRegExp out of do_regexp_match_next function.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: deca5e1aca54e8ed3948a3c53604aa48ab176add URL: http://source.winehq.org/git/wine.git/?a=commit;h=deca5e1aca54e8ed3948a3c53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:59 2013 +0100 jscript: Move code operating on JSRegExp out of do_regexp_match_next function. --- dlls/jscript/regexp.c | 67 +++++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index db04e9b..ea25c64 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3202,6 +3202,42 @@ bad: return NULL; } +static HRESULT MatchRegExpNext(JSRegExp *jsregexp, const WCHAR *str, DWORD str_len, + const WCHAR **cp, heap_pool_t *pool, REMatchState **result, DWORD *matchlen) +{ + REMatchState *x, *res; + REGlobalData gData; + + gData.cpbegin = str; + gData.cpend = str+str_len; + gData.start = *cp-str; + gData.skipped = 0; + gData.pool = pool; + + x = InitMatch(NULL, &gData, jsregexp, gData.cpend - gData.cpbegin); + if(!x) { + WARN("InitMatch failed\n"); + return E_FAIL; + } + + x->cp = *cp; + res = MatchRegExp(&gData, x); + if(!gData.ok) { + WARN("MatchRegExp failed\n"); + return E_FAIL; + } + + *result = res; + if(!res) { + *matchlen = 0; + return S_FALSE; + } + + *matchlen = (res->cp-*cp) - gData.skipped; + *cp = res->cp; + return S_OK; +} + static void js_DestroyRegExp(JSRegExp *re) { @@ -3327,30 +3363,15 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D jsstr_t *str, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { - REMatchState *x, *result; - REGlobalData gData; + REMatchState *result; DWORD matchlen; + HRESULT hres; - gData.cpbegin = str->str; - gData.cpend = str->str + jsstr_length(str); - gData.start = *cp-str->str; - gData.skipped = 0; - gData.pool = &ctx->tmp_heap; - - x = InitMatch(NULL, &gData, regexp->jsregexp, gData.cpend - gData.cpbegin); - if(!x) { - WARN("InitMatch failed\n"); - return E_FAIL; - } - - x->cp = *cp; - result = MatchRegExp(&gData, x); - if(!gData.ok) { - WARN("MatchRegExp failed\n"); - return E_FAIL; - } - - if(!result) { + hres = MatchRegExpNext(regexp->jsregexp, str->str, jsstr_length(str), + cp, &ctx->tmp_heap, &result, &matchlen); + if(FAILED(hres)) + return hres; + if(hres == S_FALSE) { if(rem_flags & REM_RESET_INDEX) set_last_index(regexp, 0); return S_FALSE; @@ -3410,8 +3431,6 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D 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; ret->len = matchlen; set_last_index(regexp, result->cp-str->str);

1 0

Piotr Caban : jscript: Don't use jsstr_t in js_NewRegExp.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 1d61b4581ab1b0daa343041f4165f1849ce948d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d61b4581ab1b0daa343041f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:44 2013 +0100 jscript: Don't use jsstr_t in js_NewRegExp. --- dlls/jscript/regexp.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index decabcc..db04e9b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3218,7 +3218,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) +js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3230,10 +3230,10 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re = NULL; mark = heap_pool_mark(&cx->tmp_heap); - len = jsstr_length(str); + len = str_len; state.context = cx; - state.cp = str->str; + state.cp = str; if (!state.cp) goto out; state.cpbegin = state.cp; @@ -3303,8 +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->str; - re->source_len = jsstr_length(str); + re->source = str; + re->source_len = str_len; out: heap_pool_clear(mark); @@ -3865,7 +3865,8 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str, flags, FALSE); + regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n"); jsdisp_release(&regexp->dispex);

1 0

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

Feb. 15, 2013

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

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

Feb. 15, 2013

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

Piotr Caban : jscript: Rename jsheap_t to heap_pool_t.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

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

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

Feb. 15, 2013

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

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

Feb. 15, 2013

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

Piotr Caban : jscript: Moved generic regular expressions code to separate file.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 06e8d830e21804defd06a7423ec23ee47036829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e8d830e21804defd06a7423… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:42 2013 +0100 jscript: Moved generic regular expressions code to separate file. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jsregexp.c | 1013 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/regexp.c | 1047 +--------------------------------------------- dlls/jscript/regexp.h | 90 ++++ 4 files changed, 1108 insertions(+), 1043 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e8d830e21804defd06a…

1 0

Piotr Caban : jscript: Make context generic in internal regular expression functions.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 5f06c6de285d78caaae497e8b573e7fe238d1343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06c6de285d78caaae497e8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:15 2013 +0100 jscript: Make context generic in internal regular expression functions. --- dlls/jscript/regexp.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index ea25c64..9df7372 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -294,7 +294,7 @@ typedef struct REBackTrackData { #define INITIAL_BACKTRACK 8000 typedef struct REGlobalData { - script_ctx_t *cx; + void *cx; JSRegExp *regexp; /* the RE in execution */ BOOL ok; /* runtime error (out_of_memory only?) */ size_t start; /* offset to start at */ @@ -354,7 +354,7 @@ struct RENode { #define CLASS_CACHE_SIZE 4 typedef struct CompilerState { - script_ctx_t *context; + void *context; const WCHAR *cpbegin; const WCHAR *cpend; const WCHAR *cp; @@ -370,6 +370,9 @@ typedef struct CompilerState { size_t index; } classCache[CLASS_CACHE_SIZE]; WORD flags; + + heap_pool_t *pool; /* It's faster to use one malloc'd pool + than to malloc/free */ } CompilerState; typedef struct EmitStateStackEntry { @@ -469,7 +472,7 @@ NewRENode(CompilerState *state, REOp op) { RENode *ren; - ren = heap_pool_alloc(&state->context->tmp_heap, sizeof(*ren)); + ren = heap_pool_alloc(state->pool, sizeof(*ren)); if (!ren) { /* js_ReportOutOfScriptQuota(cx); */ return NULL; @@ -3254,7 +3257,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) +js_NewRegExp(void *cx, heap_pool_t *pool, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3265,10 +3268,11 @@ js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL size_t len; re = NULL; - mark = heap_pool_mark(&cx->tmp_heap); + mark = heap_pool_mark(pool); len = str_len; state.context = cx; + state.pool = pool; state.cp = str; if (!state.cp) goto out; @@ -3884,7 +3888,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + regexp->jsregexp = js_NewRegExp(ctx, &ctx->tmp_heap, regexp->str->str, jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n");

1 0