September 2011 - Wine-commits

André Hentschel : ntdll: Allow reading from a writable section.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 8fc74191205e03719ee275fcd957ddd6deda7ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc74191205e03719ee275fcd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 18:00:42 2011 +0200 ntdll: Allow reading from a writable section. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a7679da..dda1f37 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1341,7 +1341,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_WRITECOPY; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ | VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; /* Dumb game crack lets the AOEP point into a data section. Adjust. */

1 0

Alistair Leslie-Hughes : msxml3: Only compare strings if the transform was successful.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 3a63aebc1c73ca7b983e55ffc49d5b41a7110310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a63aebc1c73ca7b983e55ffc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 7 20:07:28 2011 +1000 msxml3: Only compare strings if the transform was successful. --- dlls/msxml3/tests/domdoc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 22fb3ae..a758880 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6978,8 +6978,11 @@ static void test_testTransforms(void) hr = IXMLDOMDocument_transformNode(doc, pNode, &bOut); ok(hr == S_OK, "ret %08x\n", hr ); - ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n"); - SysFreeString(bOut); + if(hr == S_OK) + { + ok( compareIgnoreReturns( bOut, _bstr_(szTransformOutput)), "Stylesheet output not correct\n"); + SysFreeString(bOut); + } IXMLDOMNode_Release(pNode); }

1 0

Marcus Meissner : msi: Check for return value of GetUserName (Coverity).
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: ac0a7b644fa464fa640e06a6e26b2191b5a29a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0a7b644fa464fa640e06a6e… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Sep 7 15:48:23 2011 +0200 msi: Check for return value of GetUserName (Coverity). --- dlls/msi/package.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1025607..bec7627 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -501,7 +501,8 @@ static UINT set_user_sid_prop( MSIPACKAGE *package ) UINT r = ERROR_FUNCTION_FAILED; size = 0; - GetUserNameW( NULL, &size ); + if (!GetUserNameW( NULL, &size )) + return r; user_name = msi_alloc( (size + 1) * sizeof(WCHAR) ); if (!user_name)

1 0

Francois Gouget : net: Add a full stop at the end of a sentence in the usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Francois Gouget : wineconsole: Add full stops at the end of sentences in the usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Francois Gouget : winecfg: Specify a context for the drive letter setting.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Francois Gouget : cmd: Fix the indentation of the IF usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

1 0

Alexandre Julliard : gdi32: Don't allow CreateCompatibleDC on a metafile DC .
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: c331a1a6cd1df3da30da29c56f699e7512e49b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c331a1a6cd1df3da30da29c56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 16:31:19 2011 +0200 gdi32: Don't allow CreateCompatibleDC on a metafile DC. --- dlls/gdi32/mfdrv/init.c | 13 ++++++++++++- dlls/gdi32/tests/dc.c | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index bb36a85..2139b98 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); +static BOOL MFDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ); static BOOL MFDRV_DeleteDC( PHYSDEV dev ); @@ -91,7 +92,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ NULL, /* pCreateBitmap */ - NULL, /* pCreateCompatibleDC */ + MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ @@ -247,6 +248,16 @@ static DC *MFDRV_AllocMetaFile(void) /********************************************************************** + * MFDRV_CreateCompatibleDC + */ +static BOOL MFDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) +{ + /* not supported on metafile DCs */ + return FALSE; +} + + +/********************************************************************** * MFDRV_DeleteDC */ static BOOL MFDRV_DeleteDC( PHYSDEV dev ) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 12a875a..efa7d53 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -265,20 +265,50 @@ static void test_GdiConvertToDevmodeW(void) static void test_CreateCompatibleDC(void) { BOOL bRet; - HDC hDC; - HDC hNewDC; + HDC hdc, hNewDC, hdcMetafile; + HBITMAP bitmap; + INT caps; + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); /* Create a DC compatible with the screen */ - hDC = CreateCompatibleDC(NULL); - ok(hDC != NULL, "CreateCompatibleDC returned %p\n", hDC); + hdc = CreateCompatibleDC(NULL); + ok(hdc != NULL, "CreateCompatibleDC returned %p\n", hdc); + ok( SelectObject( hdc, bitmap ) != 0, "SelectObject failed\n" ); + caps = GetDeviceCaps( hdc, TECHNOLOGY ); + ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); /* Delete this DC, this should succeed */ - bRet = DeleteDC(hDC); + bRet = DeleteDC(hdc); ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); /* Try to create a DC compatible to the deleted DC. This has to fail */ - hNewDC = CreateCompatibleDC(hDC); + hNewDC = CreateCompatibleDC(hdc); ok(hNewDC == NULL, "CreateCompatibleDC returned %p\n", hNewDC); + + hdc = GetDC( 0 ); + hdcMetafile = CreateEnhMetaFileA(hdc, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA failed\n"); + hNewDC = CreateCompatibleDC( hdcMetafile ); + ok(hNewDC != NULL, "CreateCompatibleDC failed\n"); + ok( SelectObject( hNewDC, bitmap ) != 0, "SelectObject failed\n" ); + caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); + ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + caps = GetDeviceCaps( hNewDC, TECHNOLOGY ); + ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + DeleteDC( hNewDC ); + DeleteEnhMetaFile( CloseEnhMetaFile( hdcMetafile )); + ReleaseDC( 0, hdc ); + + hdcMetafile = CreateMetaFileA(NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA failed\n"); + hNewDC = CreateCompatibleDC( hdcMetafile ); + ok(hNewDC == NULL, "CreateCompatibleDC succeeded\n"); + caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); + ok( caps == DT_METAFILE, "wrong caps %u\n", caps ); + DeleteMetaFile( CloseMetaFile( hdcMetafile )); + + DeleteObject( bitmap ); } static void test_DC_bitmap(void)

1 0

Alexandre Julliard : gdi32: Leave it up to the driver to push the new device on the DC stack in CreateDC .
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: a28ddddcbcd3307e58a8de42a8e4d488080353e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28ddddcbcd3307e58a8de42a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 17:01:29 2011 +0200 gdi32: Leave it up to the driver to push the new device on the DC stack in CreateDC. --- dlls/gdi32/dc.c | 4 +--- dlls/gdi32/driver.c | 2 +- dlls/wineps.drv/init.c | 8 ++++---- dlls/winex11.drv/init.c | 6 +++--- include/wine/gdi_driver.h | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 7c1ebc0..5ba4e59 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -628,13 +628,11 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (funcs->pCreateDC) { - PHYSDEV physdev; - if (!funcs->pCreateDC( hdc, &physdev, buf, device, output, initData )) + if (!funcs->pCreateDC( &dc->physDev, buf, device, output, initData )) { WARN("creation aborted by device\n" ); goto error; } - push_dc_driver( &dc->physDev, physdev, funcs ); } dc->vis_rect.left = 0; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 4d1054e..51e241f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -224,7 +224,7 @@ static BOOL nulldrv_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) return display_driver->funcs->pCreateCompatibleDC( NULL, pdev ); } -static BOOL nulldrv_CreateDC( HDC hdc, PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, +static BOOL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *devmode ) { assert(0); /* should never be called */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a1ed1a2..e7e545e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -323,8 +323,8 @@ static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi ) /********************************************************************** * PSDRV_CreateDC */ -static BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ) { PSDRV_PDEVICE *physDev; PRINTERINFO *pi; @@ -354,7 +354,6 @@ static BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR devi } if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; - *pdev = &physDev->dev; if (output && *output) { INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); @@ -369,7 +368,8 @@ static BOOL PSDRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR devi } PSDRV_UpdateDevCaps(physDev); - SelectObject( hdc, PSDRV_DefaultFont ); + SelectObject( (*pdev)->hdc, PSDRV_DefaultFont ); + push_dc_driver( pdev, &physDev->dev, &psdrv_funcs ); return TRUE; } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ea96d0c..2b0df17 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -144,8 +144,8 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) /********************************************************************** * X11DRV_CreateDC */ -static BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +static BOOL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData ) { X11DRV_PDEVICE *physDev = create_x11_physdev( root_window ); @@ -156,7 +156,7 @@ static BOOL X11DRV_CreateDC( HDC hdc, PHYSDEV *pdev, LPCWSTR driver, LPCWSTR dev physDev->drawable_rect = virtual_screen_rect; SetRect( &physDev->dc_rect, 0, 0, virtual_screen_rect.right - virtual_screen_rect.left, virtual_screen_rect.bottom - virtual_screen_rect.top ); - *pdev = &physDev->dev; + push_dc_driver( pdev, &physDev->dev, &x11drv_funcs ); return TRUE; } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 3f67d81..1e7ebdb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -66,7 +66,7 @@ struct gdi_dc_funcs BOOL (*pCloseFigure)(PHYSDEV); BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); - BOOL (*pCreateDC)(HDC,PHYSDEV *,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); + BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,BITMAPINFO *,UINT); BOOL (*pDeleteBitmap)(HBITMAP); BOOL (*pDeleteDC)(PHYSDEV); @@ -189,7 +189,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 12 +#define WINE_GDI_DRIVER_VERSION 13 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Jacek Caban : vbscript: Added beginning bytecode compiler implementation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: c674c7a7ae4e0d1e6022d16d7e70ac67d4961133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c674c7a7ae4e0d1e6022d16d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 7 14:07:12 2011 +0200 vbscript: Added beginning bytecode compiler implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/compile.c | 125 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.c | 15 ++++-- dlls/vbscript/vbscript.h | 41 +++++++++++++++ 4 files changed, 177 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index ba267f4..977bcde 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,6 +1,7 @@ MODULE = vbscript.dll C_SRCS = \ + compile.c \ lex.c \ vbdisp.c \ vbscript.c \ diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c new file mode 100644 index 0000000..c51dd97 --- /dev/null +++ b/dlls/vbscript/compile.c @@ -0,0 +1,125 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "vbscript.h" +#include "parse.h" +#include "parser.tab.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +typedef struct { + parser_ctx_t parser; + + unsigned instr_cnt; + unsigned instr_size; + vbscode_t *code; +} compile_ctx_t; + +static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) +{ + assert(ctx->instr_size && ctx->instr_size >= ctx->instr_cnt); + + if(ctx->instr_size == ctx->instr_cnt) { + instr_t *new_instr; + + new_instr = heap_realloc(ctx->code->instrs, ctx->instr_size*2*sizeof(instr_t)); + if(!new_instr) + return -1; + + ctx->code->instrs = new_instr; + ctx->instr_size *= 2; + } + + ctx->code->instrs[ctx->instr_cnt].op = op; + return ctx->instr_cnt++; +} + +static HRESULT compile_func(compile_ctx_t *ctx, function_t *func) +{ + func->code_off = ctx->instr_cnt; + + if(push_instr(ctx, OP_ret) == -1) + return E_OUTOFMEMORY; + + return S_OK; +} + +void release_vbscode(vbscode_t *code) +{ + list_remove(&code->entry); + heap_free(code->source); + heap_free(code->instrs); + heap_free(code); +} + +static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) +{ + vbscode_t *ret; + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return NULL; + + ret->source = heap_strdupW(source); + if(!ret->source) { + heap_free(ret); + return NULL; + } + + ret->instrs = heap_alloc(32*sizeof(instr_t)); + if(!ret->instrs) { + release_vbscode(ret); + return NULL; + } + + ctx->instr_cnt = 0; + ctx->instr_size = 32; + + ret->global_code.code_ctx = ret; + + list_init(&ret->entry); + return ret; +} + +HRESULT compile_script(script_ctx_t *script, const WCHAR *src, vbscode_t **ret) +{ + compile_ctx_t ctx; + HRESULT hres; + + hres = parse_script(&ctx.parser, src); + if(FAILED(hres)) + return hres; + + ctx.code = alloc_vbscode(&ctx, src); + if(!ctx.code) + return E_OUTOFMEMORY; + + hres = compile_func(&ctx, &ctx.code->global_code); + if(FAILED(hres)) { + release_vbscode(ctx.code); + return hres; + } + + list_add_tail(&script->code_list, &ctx.code->entry); + *ret = ctx.code; + return S_OK; +} diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 53e90eb..ff9d2c9 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -20,8 +20,6 @@ #include <assert.h> #include "vbscript.h" -#include "parse.h" - #include "objsafe.h" #include "wine/debug.h" @@ -89,6 +87,9 @@ static HRESULT set_ctx_site(VBScript *This) static void destroy_script(script_ctx_t *ctx) { + while(!list_empty(&ctx->code_list)) + release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); + while(!list_empty(&ctx->named_items)) { named_item_t *iter = LIST_ENTRY(list_head(&ctx->named_items), named_item_t, entry); @@ -483,6 +484,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; + list_init(&ctx->code_list); list_init(&ctx->named_items); old_ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); @@ -514,18 +516,21 @@ static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { VBScript *This = impl_from_IActiveScriptParse(iface); - parser_ctx_t parser; + vbscode_t *code; HRESULT hres; TRACE("(%p)->(%s %s %p %s %s %u %x %p %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLine, dwFlags, pvarResult, pexcepinfo); - hres = parse_script(&parser, pstrCode); + if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + hres = compile_script(This->ctx, pstrCode, &code); if(FAILED(hres)) return hres; - FIXME("compiling script not implemented\n"); + FIXME("executing script not implemented\n"); return E_NOTIMPL; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9c1d35c..88f7552 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -31,6 +31,9 @@ #include "wine/list.h" #include "wine/unicode.h" +typedef struct _function_t function_t; +typedef struct _vbscode_t vbscode_t; + typedef struct named_item_t { IDispatch *disp; DWORD flags; @@ -53,11 +56,44 @@ typedef struct { vbdisp_t *script_obj; + struct list code_list; struct list named_items; } script_ctx_t; HRESULT init_global(script_ctx_t*); +#define OP_LIST \ + X(ret, 0) + +typedef enum { +#define X(x,n) OP_##x, +OP_LIST +#undef X + OP_LAST +} vbsop_t; + +typedef struct { + vbsop_t op; +} instr_t; + +struct _function_t { + unsigned code_off; + vbscode_t *code_ctx; +}; + +struct _vbscode_t { + instr_t *instrs; + WCHAR *source; + + BOOL global_executed; + function_t global_code; + + struct list entry; +}; + +void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,vbscode_t**) DECLSPEC_HIDDEN; + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); static inline void *heap_alloc(size_t len) @@ -70,6 +106,11 @@ static inline void *heap_alloc_zero(size_t len) return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem);

1 0