October 2009 - Wine-Commits

Detlef Riekenberg : winspool/tests: Add tests for EnumPrintProcessors.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 289ed3ada76030fb24ed7042309f2b4d9060e303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=289ed3ada76030fb24ed70423… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 14 23:50:49 2009 +0200 winspool/tests: Add tests for EnumPrintProcessors. --- dlls/winspool.drv/tests/info.c | 121 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 9a7acf6..f7e6ed5 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1238,6 +1238,126 @@ static void test_EnumPrinterDrivers(void) /* ########################### */ +static void test_EnumPrintProcessors(void) +{ + DWORD res; + LPBYTE buffer; + DWORD cbBuf; + DWORD pcbNeeded; + DWORD pcReturned; + + + cbBuf = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPrintProcessorsA(NULL, NULL, 1, NULL, 0, &cbBuf, &pcReturned); + RETURN_ON_DEACTIVATED_SPOOLER(res) + + if (res && !cbBuf) { + skip("No Printprocessor installed\n"); + return; + } + + ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf + 4); + if (buffer == NULL) + return; + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + /* validate the returned Data here. */ + + + SetLastError(0xdeadbeef); + pcReturned = 0xdeadbeef; + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError()); + + /* only level 1 is valid */ + if (0) { + /* both tests crash on win98se */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 0, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 2, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "got %u with %u (expected '0' with ERROR_INVALID_LEVEL)\n", + res, GetLastError()); + } + + /* an empty environment is ignored */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, empty, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "got %u with %u (expected '!=0')\n", res, GetLastError()); + + /* the environment is checked */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, invalid_env, 1, buffer, cbBuf, &pcbNeeded, &pcReturned); + /* NT5: ERROR_INVALID_ENVIRONMENT, 9x: ERROR_INVALID_PARAMETER */ + ok( !res && ((GetLastError() == ERROR_INVALID_ENVIRONMENT) || + (GetLastError() == ERROR_INVALID_PARAMETER)), + "got %u with %u (expected '0' with ERROR_INVALID_ENVIRONMENT or " + "ERROR_INVALID_PARAMETER)\n", res, GetLastError()); + + + /* failure-Codes for NULL */ + if (0) { + /* this test crash on win98se */ + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, NULL, cbBuf, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INVALID_USER_BUFFER) , + "got %u with %u (expected '0' with ERROR_INVALID_USER_BUFFER)\n", + res, GetLastError()); + } + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, NULL, &pcReturned); + /* the NULL is ignored on win9x */ + ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), + "got %u with %u (expected '0' with RPC_X_NULL_REF_POINTER)\n", + res, GetLastError()); + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPrintProcessorsA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded, NULL); + /* the NULL is ignored on win9x */ + ok( broken(res) || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)), + "got %u with %u (expected '0' with RPC_X_NULL_REF_POINTER)\n", + res, GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); + +} + +/* ########################### */ + static void test_GetDefaultPrinter(void) { BOOL retval; @@ -2426,6 +2546,7 @@ START_TEST(info) test_EnumPorts(); test_EnumPrinterDrivers(); test_EnumPrinters(); + test_EnumPrintProcessors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_GetPrintProcessorDirectory();

1 0

Eric Pouech : winmm: Transform the mmio proc kind into a boolean ( to distinguish between ANSI and Unicode).
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 99c4b22bab34a36f81cc20750cb42010b7e8e23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c4b22bab34a36f81cc20750… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 14 21:56:13 2009 +0200 winmm: Transform the mmio proc kind into a boolean (to distinguish between ANSI and Unicode). --- dlls/winmm/mmio.c | 101 ++++++++++++++++++++++----------------------------- dlls/winmm/winemm.h | 4 +-- 2 files changed, 44 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99c4b22bab34a36f81cc2…

1 0

Eric Pouech : mmsystem: Move the 16bit mmio code into a dedicated file ( mmio16.c).
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: f4c561746c577912181ebaef83105709c6e61147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c561746c577912181ebaef8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 14 21:55:57 2009 +0200 mmsystem: Move the 16bit mmio code into a dedicated file (mmio16.c). --- dlls/winmm/Makefile.in | 1 + dlls/winmm/mmio16.c | 449 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/mmsystem.c | 411 +------------------------------------------- 3 files changed, 451 insertions(+), 410 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4c561746c577912181eb…

1 0

Eric Pouech : winmm: Create real 16<>32 thunks for mmio support in MMSystem .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: e5b4559d2ea80d198a6f755de574756923264b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b4559d2ea80d198a6f755de… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 14 21:56:05 2009 +0200 winmm: Create real 16<>32 thunks for mmio support in MMSystem. --- dlls/winmm/mmio.c | 22 +--- dlls/winmm/mmio16.c | 271 +++++++++++++++++++++++++++++++++++++++++------- dlls/winmm/mmsystem.c | 3 - dlls/winmm/winemm.h | 12 +-- 4 files changed, 238 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b4559d2ea80d198a6f7…

1 0

Jacek Caban : msxml3: Store xmlnode structure instead of pointer in node implementations.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 04eff32bbb526fa35642f1b2bae3fc75b52d289f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04eff32bbb526fa35642f1b2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 20:01:42 2009 +0200 msxml3: Store xmlnode structure instead of pointer in node implementations. --- dlls/msxml3/attribute.c | 91 +++++++++++++++++------------------- dlls/msxml3/cdata.c | 99 +++++++++++++++++++--------------------- dlls/msxml3/comment.c | 103 ++++++++++++++++++++---------------------- dlls/msxml3/docfrag.c | 85 ++++++++++++++++------------------ dlls/msxml3/domdoc.c | 107 ++++++++++++++++++++---------------------- dlls/msxml3/element.c | 92 +++++++++++++++++-------------------- dlls/msxml3/entityref.c | 85 ++++++++++++++++------------------ dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 39 +++++++-------- dlls/msxml3/pi.c | 91 +++++++++++++++++------------------- dlls/msxml3/text.c | 99 +++++++++++++++++++--------------------- 11 files changed, 421 insertions(+), 472 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04eff32bbb526fa35642f…

1 0

James Helferty : d3d9/tests: Fix position of EndScene in visual test.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 2b5ff0916098a7ac89c8a7053440d13d0052370f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5ff0916098a7ac89c8a7053… Author: James Helferty <jlh(a)transgaming.com> Date: Wed Oct 14 10:57:36 2009 -0400 d3d9/tests: Fix position of EndScene in visual test. --- dlls/d3d9/tests/visual.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f12983d..c087f8b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9112,11 +9112,10 @@ static void tssargtemp_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed, hr = %08x\n", hr); if(SUCCEEDED(hr)) { - - hr = IDirect3DDevice9_EndScene(device); - ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr = %08x\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(quad[0])); ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed with %08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr = %08x\n", hr); } IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 320, 240);

1 0

Markus Stockhausen : dinput8: Ensure balance of CoInitialize/CoUninitialize .
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 70ae1ba4b552be732a5f627f62ec3521c4234988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ae1ba4b552be732a5f627f6… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Wed Oct 14 19:47:45 2009 +0200 dinput8: Ensure balance of CoInitialize/CoUninitialize. --- dlls/dinput8/dinput8_main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 77f7f64..87dd07b 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -51,7 +51,7 @@ static void UnlockModule(void) * DirectInput8Create (DINPUT8.@) */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { - HRESULT hr; + HRESULT hr, hrCo; TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); @@ -62,7 +62,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer if( !(IsEqualGUID(&IID_IDirectInput8A, riid) || IsEqualGUID(&IID_IDirectInput8W, riid) || IsEqualGUID(&IID_IUnknown, riid)) ) return DIERR_INVALIDPARAM; - CoInitialize(NULL); + hrCo = CoInitialize(NULL); hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI); if(FAILED(hr)) { @@ -70,7 +70,9 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer return DIERR_INVALIDPARAM; } - CoUninitialize(); + /* ensure balance of calls */ + if(hrCo == S_OK || hrCo == S_FALSE) + CoUninitialize(); /* When aggregation is used (punkOuter!=NULL) the application needs to manually call Initialize. */ if(punkOuter == NULL && IsEqualGUID(&IID_IDirectInput8A, riid)) {

1 0

Vincent Povirk : urlmon: Add CoInternetGetSecurityUrl stub.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 8643bae3642934dd7a91647b44c852cf9d150e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8643bae3642934dd7a91647b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 14 11:06:14 2009 -0500 urlmon: Add CoInternetGetSecurityUrl stub. --- dlls/urlmon/sec_mgr.c | 9 +++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 7a1255a..968a987 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1228,3 +1228,12 @@ HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneM TRACE("(%p %p %x)\n", pSP, ppZM, dwReserved); return ZoneMgrImpl_Construct(NULL, (void**)ppZM); } + +/******************************************************************** + * CoInternetGetSecurityUrl (URLMON.@) + */ +HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUACTION psuAction, DWORD dwReserved) +{ + FIXME("(%p,%p,%u,%u): stub\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); + return E_NOTIMPL; +} diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 2ed9988..cc40c36 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -15,7 +15,7 @@ @ stdcall CoInternetCreateSecurityManager(ptr ptr long) @ stdcall CoInternetCreateZoneManager(ptr ptr long) @ stub CoInternetGetProtocolFlags -@ stub CoInternetGetSecurityUrl +@ stdcall CoInternetGetSecurityUrl(ptr ptr long long) @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long)

1 0

Roderick Colenbrander : winex11: Use get_xrender_picture in X11DRV_XRender_GetSrcAreaStretch.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: a70525739359bb4bbcb7779b337fb7582dd15005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70525739359bb4bbcb7779b3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Oct 14 13:15:01 2009 +0200 winex11: Use get_xrender_picture in X11DRV_XRender_GetSrcAreaStretch. --- dlls/winex11.drv/xrender.c | 61 +++++++++++++++++++++++++++++++------------ 1 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7d4250c..d83c53d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -144,6 +144,7 @@ struct xrender_info { int cache_index; Picture pict; + Picture pict_src; const WineXRenderFormat *format; }; @@ -524,6 +525,27 @@ static Picture get_xrender_picture(X11DRV_PDEVICE *physDev) return info->pict; } +static Picture get_xrender_picture_source(X11DRV_PDEVICE *physDev) +{ + struct xrender_info *info = get_xrender_info(physDev); + if (!info) return 0; + + if (!info->pict_src && info->format) + { + XRenderPictureAttributes pa; + + wine_tsx11_lock(); + pa.subwindow_mode = IncludeInferiors; + info->pict_src = pXRenderCreatePicture(gdi_display, physDev->drawable, info->format->pict_format, + CPSubwindowMode, &pa); + wine_tsx11_unlock(); + + TRACE("Allocing pict_src=%lx dc=%p drawable=%08lx\n", info->pict_src, physDev->hdc, physDev->drawable); + } + + return info->pict_src; +} + static BOOL fontcmp(LFANDSIZE *p1, LFANDSIZE *p2) { if(p1->hash != p2->hash) return TRUE; @@ -943,18 +965,28 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTIO */ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) { - wine_tsx11_lock(); + struct xrender_info *info = physDev->xrender; - if(physDev->xrender->pict) + if (info->pict || info->pict_src) { - TRACE("freeing pict = %lx dc = %p\n", physDev->xrender->pict, physDev->hdc); - XFlush(gdi_display); - pXRenderFreePicture(gdi_display, physDev->xrender->pict); - physDev->xrender->pict = 0; + wine_tsx11_lock(); + XFlush( gdi_display ); + if (info->pict) + { + TRACE("freeing pict = %lx dc = %p\n", info->pict, physDev->hdc); + pXRenderFreePicture(gdi_display, info->pict); + info->pict = 0; + } + if(info->pict_src) + { + TRACE("freeing pict = %lx dc = %p\n", info->pict_src, physDev->hdc); + pXRenderFreePicture(gdi_display, info->pict_src); + info->pict_src = 0; + } + wine_tsx11_unlock(); } - wine_tsx11_unlock(); - physDev->xrender->format = NULL; + info->format = NULL; } /************************************************************************ @@ -2091,7 +2123,6 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE int height = visRectDst->bottom - visRectDst->top; int x_src = physDevSrc->dc_rect.left + visRectSrc->left; int y_src = physDevSrc->dc_rect.top + visRectSrc->top; - const WineXRenderFormat *src_format = get_xrender_format_from_color_shifts(physDevSrc->depth, physDevSrc->color_shifts); const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDevDst->depth, physDevDst->color_shifts); Picture src_pict=0, dst_pict=0, mask_pict=0; @@ -2136,36 +2167,32 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE get_xrender_color(dst_format, physDevDst->textPixel, &col); /* We use the source drawable as a mask */ - wine_tsx11_lock(); - mask_pict = pXRenderCreatePicture(gdi_display, physDevSrc->drawable, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); + mask_pict = get_xrender_picture_source(physDevSrc); /* Use backgroundPixel as the foreground color */ src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); /* Create a destination picture and fill it with textPixel color as the background color */ + wine_tsx11_lock(); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &col, 0, 0, width, height); xrender_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); - if(mask_pict) pXRenderFreePicture(gdi_display, mask_pict); wine_tsx11_unlock(); } else /* color -> color but with different depths */ { - wine_tsx11_lock(); - src_pict = pXRenderCreatePicture(gdi_display, - physDevSrc->drawable, src_format->pict_format, - CPSubwindowMode|CPRepeat, &pa); + src_pict = get_xrender_picture_source(physDevSrc); + wine_tsx11_lock(); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); xrender_blit(src_pict, 0, dst_pict, x_src, y_src, xscale, yscale, width, height); - if(src_pict) pXRenderFreePicture(gdi_display, src_pict); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); wine_tsx11_unlock(); }

1 0

Jacek Caban : jscript: Separate flags parsing from regexp creating.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 98b5a1c6e81601435838d676d91abc7a7b5c74f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98b5a1c6e81601435838d676d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 14:42:30 2009 +0200 jscript: Separate flags parsing from regexp creating. --- dlls/jscript/jscript.h | 3 +- dlls/jscript/lex.c | 12 +++++++--- dlls/jscript/regexp.c | 51 +++++++++++++++++++++++++---------------------- dlls/jscript/string.c | 2 +- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cde1e1b..af1c1c3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -225,7 +225,7 @@ HRESULT throw_uri_error(script_ctx_t*,jsexcept_t*,UINT,const WCHAR*); HRESULT create_object(script_ctx_t*,DispatchEx*,DispatchEx**); HRESULT create_math(script_ctx_t*,DispatchEx**); HRESULT create_array(script_ctx_t*,DWORD,DispatchEx**); -HRESULT create_regexp_str(script_ctx_t*,const WCHAR*,DWORD,const WCHAR*,DWORD,DispatchEx**); +HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,DispatchEx**); HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,DispatchEx**); HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,DispatchEx**); HRESULT create_number(script_ctx_t*,VARIANT*,DispatchEx**); @@ -319,6 +319,7 @@ typedef struct { HRESULT regexp_match_next(script_ctx_t*,DispatchEx*,BOOL,const WCHAR*,DWORD,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*); HRESULT regexp_match(script_ctx_t*,DispatchEx*,const WCHAR*,DWORD,BOOL,match_result_t**,DWORD*); +HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*); static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) { diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index cd53bd9..efb1782 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -766,10 +766,10 @@ static void add_object_literal(parser_ctx_t *ctx, DispatchEx *obj) literal_t *parse_regexp(parser_ctx_t *ctx) { - const WCHAR *re, *flags; + const WCHAR *re, *flags_ptr; + DWORD re_len, flags; DispatchEx *regexp; literal_t *ret; - DWORD re_len; HRESULT hres; TRACE("\n"); @@ -790,11 +790,15 @@ literal_t *parse_regexp(parser_ctx_t *ctx) re_len = ctx->ptr-re; - flags = ++ctx->ptr; + flags_ptr = ++ctx->ptr; while(ctx->ptr < ctx->end && isalnumW(*ctx->ptr)) ctx->ptr++; - hres = create_regexp_str(ctx->script, re, re_len, flags, ctx->ptr-flags, &regexp); + hres = parse_regexp_flags(flags_ptr, ctx->ptr-flags_ptr, &flags); + if(FAILED(hres)) + return NULL; + + hres = create_regexp(ctx->script, re, re_len, flags, &regexp); if(FAILED(hres)) return NULL; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index fa5672f..6c4af84 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3737,7 +3737,7 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, DispatchEx *object_prototype, Reg return S_OK; } -static HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, DispatchEx **ret) +HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, DispatchEx **ret) { RegExpInstance *regexp; HRESULT hres; @@ -3773,6 +3773,7 @@ static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *re const WCHAR *opt = emptyW, *src; DispatchEx *ret; VARIANT *arg; + DWORD flags; HRESULT hres; if(!arg_cnt(dp)) { @@ -3820,7 +3821,11 @@ static HRESULT regexp_constructor(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *re opt = V_BSTR(arg); } - hres = create_regexp_str(ctx, src, -1, opt, strlenW(opt), &ret); + hres = parse_regexp_flags(opt, strlenW(opt), &flags); + if(FAILED(hres)) + return hres; + + hres = create_regexp(ctx, src, -1, flags, &ret); if(FAILED(hres)) return hres; @@ -3892,33 +3897,31 @@ HRESULT create_regexp_constr(script_ctx_t *ctx, DispatchEx *object_prototype, Di return hres; } -HRESULT create_regexp_str(script_ctx_t *ctx, const WCHAR *exp, DWORD exp_len, const WCHAR *opt, - DWORD opt_len, DispatchEx **ret) +HRESULT parse_regexp_flags(const WCHAR *str, DWORD str_len, DWORD *ret) { const WCHAR *p; DWORD flags = 0; - if(opt) { - for (p = opt; p < opt+opt_len; p++) { - switch (*p) { - case 'g': - flags |= JSREG_GLOB; - break; - case 'i': - flags |= JSREG_FOLD; - break; - case 'm': - flags |= JSREG_MULTILINE; - break; - case 'y': - flags |= JSREG_STICKY; - break; - default: - WARN("wrong flag %c\n", *p); - return E_FAIL; - } + for (p = str; p < str+str_len; p++) { + switch (*p) { + case 'g': + flags |= JSREG_GLOB; + break; + case 'i': + flags |= JSREG_FOLD; + break; + case 'm': + flags |= JSREG_MULTILINE; + break; + case 'y': + flags |= JSREG_STICKY; + break; + default: + WARN("wrong flag %c\n", *p); + return E_FAIL; } } - return create_regexp(ctx, exp, exp_len, flags, ret); + *ret = flags; + return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index b78de0b..2e48d5b 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -656,7 +656,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(FAILED(hres)) return hres; - hres = create_regexp_str(ctx, match_str, SysStringLen(match_str), NULL, 0, &regexp); + hres = create_regexp(ctx, match_str, SysStringLen(match_str), 0, &regexp); SysFreeString(match_str); if(FAILED(hres)) return hres;

1 0