September 2012 - Wine-Commits

Piotr Caban : msvcrt: Fixed strncpy_s behavior when count equals 0.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: bdf9a9f9bd56354f70a7431a9682183b84353211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf9a9f9bd56354f70a7431a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 7 16:58:23 2012 +0200 msvcrt: Fixed strncpy_s behavior when count equals 0. --- dlls/msvcrt/heap.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 5eaf4a1..0a0d819 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -598,8 +598,11 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, TRACE("(%s %lu %s %lu)\n", dest, numberOfElements, src, count); - if(!count) + if(!count) { + if(dest && numberOfElements) + *dest = 0; return 0; + } if (!MSVCRT_CHECK_PMT(dest != NULL)) return MSVCRT_EINVAL; if (!MSVCRT_CHECK_PMT(src != NULL)) return MSVCRT_EINVAL;

1 0

Jacek Caban : jscript: Be more verbose about parser failure.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 42d75be69d9fef4f59153337e8af2f85d7b30d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d75be69d9fef4f59153337e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 17:14:13 2012 +0200 jscript: Be more verbose about parser failure. --- dlls/jscript/parser.y | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index d108ab0..4c69ed9 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -21,6 +21,10 @@ #include "jscript.h" #include "engine.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + #define YYLEX_PARAM ctx #define YYPARSE_PARAM ctx @@ -1516,6 +1520,8 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite jsheap_clear(mark); hres = parser_ctx->hres; if(FAILED(hres)) { + WARN("parser failed around %s\n", + debugstr_w(parser_ctx->begin+20 > parser_ctx->ptr ? parser_ctx->begin : parser_ctx->ptr-20)); parser_release(parser_ctx); return hres; }

1 0

Jacek Caban : vbscript: Added ScriptDisp tests.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: c2dbc6bfaabefea0c6382001cae88da9a5219a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2dbc6bfaabefea0c6382001c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 15:10:38 2012 +0200 vbscript: Added ScriptDisp tests. --- dlls/vbscript/tests/vbscript.c | 152 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 152 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index fe53854..ec53712 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -85,6 +85,18 @@ DEFINE_EXPECT(OnLeaveScript); DEFINE_GUID(CLSID_VBScript, 0xb54f3741, 0x5b07, 0x11cf, 0xa4,0xb0, 0x00,0xaa,0x00,0x4a,0x55,0xe8); +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len-1); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + #define test_state(s,ss) _test_state(__LINE__,s,ss) static void _test_state(unsigned line, IActiveScript *script, SCRIPTSTATE exstate) { @@ -318,6 +330,35 @@ static IDispatchEx *get_script_dispatch(IActiveScript *script) return dispex; } +static void parse_script(IActiveScriptParse *parse, const char *src) +{ + BSTR str; + HRESULT hres; + + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + + str = a2bstr(src); + hres = IActiveScriptParse_ParseScriptText(parse, str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + SysFreeString(str); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); +} + +#define get_disp_id(a,b,c,d) _get_disp_id(__LINE__,a,b,c,d) +static void _get_disp_id(unsigned line, IDispatchEx *dispex, const char *name, HRESULT exhres, DISPID *id) +{ + BSTR str; + HRESULT hres; + + str = a2bstr(name); + hres = IDispatchEx_GetDispID(dispex, str, 0, id); + SysFreeString(str); + ok_(__FILE__,line)(hres == exhres, "GetDispID(%s) returned %08x, expected %08x\n", name, hres, exhres); +} + static void test_no_script_dispatch(IActiveScript *script) { IDispatch *disp; @@ -341,6 +382,116 @@ static IActiveScript *create_vbscript(void) return ret; } +static void test_scriptdisp(void) +{ + IActiveScriptParse *parser; + IDispatchEx *script_disp; + IActiveScript *vbscript; + DISPID id, id2; + DISPPARAMS dp; + EXCEPINFO ei; + VARIANT v; + ULONG ref; + HRESULT hres; + + vbscript = create_vbscript(); + + hres = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hres); + + test_state(vbscript, SCRIPTSTATE_UNINITIALIZED); + test_safety(vbscript); + + SET_EXPECT(GetLCID); + hres = IActiveScript_SetScriptSite(vbscript, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + + test_state(vbscript, SCRIPTSTATE_UNINITIALIZED); + + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_INITIALIZED); + + test_state(vbscript, SCRIPTSTATE_INITIALIZED); + + SET_EXPECT(OnStateChange_CONNECTED); + hres = IActiveScript_SetScriptState(vbscript, SCRIPTSTATE_CONNECTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CONNECTED); + + test_state(vbscript, SCRIPTSTATE_CONNECTED); + + script_disp = get_script_dispatch(vbscript); + + id = 100; + get_disp_id(script_disp, "LCase", DISP_E_UNKNOWNNAME, &id); + ok(id == -1, "id = %d, expected -1\n", id); + + get_disp_id(script_disp, "globalVariable", DISP_E_UNKNOWNNAME, &id); + parse_script(parser, "dim globalVariable\nglobalVariable = 3"); + get_disp_id(script_disp, "globalVariable", S_OK, &id); + + memset(&dp, 0, sizeof(dp)); + memset(&ei, 0, sizeof(ei)); + V_VT(&v) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(script_disp, id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 3, "V_I2(v) = %d\n", V_I2(&v)); + + get_disp_id(script_disp, "globalVariable2", DISP_E_UNKNOWNNAME, &id); + parse_script(parser, "globalVariable2 = 4"); + get_disp_id(script_disp, "globalVariable2", S_OK, &id); + + get_disp_id(script_disp, "globalFunction", DISP_E_UNKNOWNNAME, &id); + parse_script(parser, "function globalFunction()\nglobalFunction=5\nend function"); + get_disp_id(script_disp, "globalFunction", S_OK, &id); + + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + + memset(&dp, 0, sizeof(dp)); + memset(&ei, 0, sizeof(ei)); + V_VT(&v) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(script_disp, id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&v) == VT_I2, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I2(&v) == 5, "V_I2(v) = %d\n", V_I2(&v)); + + CHECK_CALLED(OnEnterScript); + CHECK_CALLED(OnLeaveScript); + + get_disp_id(script_disp, "globalSub", DISP_E_UNKNOWNNAME, &id); + parse_script(parser, "sub globalSub()\nend sub"); + get_disp_id(script_disp, "globalSub", S_OK, &id); + get_disp_id(script_disp, "globalSub", S_OK, &id2); + ok(id == id2, "id != id2\n"); + + get_disp_id(script_disp, "constVariable", DISP_E_UNKNOWNNAME, &id); + parse_script(parser, "const constVariable = 6"); + get_disp_id(script_disp, "ConstVariable", S_OK, &id); + get_disp_id(script_disp, "Constvariable", S_OK, &id2); + ok(id == id2, "id != id2\n"); + + IDispatchEx_Release(script_disp); + + IActiveScriptParse_Release(parser); + + SET_EXPECT(OnStateChange_DISCONNECTED); + SET_EXPECT(OnStateChange_INITIALIZED); + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(vbscript); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_DISCONNECTED); + CHECK_CALLED(OnStateChange_INITIALIZED); + CHECK_CALLED(OnStateChange_CLOSED); + + ref = IActiveScript_Release(vbscript); + ok(!ref, "ref = %d\n", ref); +} + static void test_vbscript(void) { IActiveScriptParseProcedure2 *parse_proc; @@ -644,6 +795,7 @@ START_TEST(vbscript) test_vbscript_release(); test_vbscript_simplecreate(); test_vbscript_initializing(); + test_scriptdisp(); }else { win_skip("VBScript engine not available\n"); }

1 0

Hans Leidekker : iphlpapi: Implement GetExtendedUdpTable.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 18ba68ea629f98c6afdc73c4baec0003f1c11ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ba68ea629f98c6afdc73c4b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 7 13:35:36 2012 +0200 iphlpapi: Implement GetExtendedUdpTable. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 49 +++-- dlls/iphlpapi/ipstats.c | 438 ++++++++++++++++++++++------------------ dlls/iphlpapi/ipstats.h | 1 + dlls/iphlpapi/tests/iphlpapi.c | 36 ++++ include/iphlpapi.h | 3 + include/iprtrmib.h | 7 + include/udpmib.h | 2 +- 8 files changed, 322 insertions(+), 216 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18ba68ea629f98c6afdc7…

1 0

Alexandre Julliard : winex11: Get the current pixel format from the drawable structure in wglCreateContext .
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: c01d723a4fd91fbde6d9dc201329be3c2cccdea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01d723a4fd91fbde6d9dc201… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 15:43:01 2012 +0200 winex11: Get the current pixel format from the drawable structure in wglCreateContext. --- dlls/winex11.drv/opengl.c | 48 +++++++++++++++------------------------------ 1 files changed, 16 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3c557db..dccee22 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1608,43 +1608,27 @@ static BOOL glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_context *d */ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) { - struct x11drv_escape_get_drawable escape; - struct wgl_context *ret; - const struct wgl_pixel_format *fmt; - - TRACE( "(%p)\n", hdc ); + struct wgl_context *ret = NULL; + struct gl_drawable *gl; + HWND hwnd = WindowFromDC( hdc ); - escape.code = X11DRV_GET_DRAWABLE; - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, - sizeof(escape), (LPSTR)&escape )) - return 0; + EnterCriticalSection( &context_section ); - fmt = get_pixel_format(gdi_display, escape.pixel_format, TRUE /* Offscreen */); - /* We can render using the iPixelFormat (1) of Wine's Main visual AND using some offscreen formats. - * Note that standard WGL-calls don't recognize offscreen-only formats. For that reason pbuffers - * use a sort of 'proxy' HDC (wglGetPbufferDCARB). - * If this fails something is very wrong on the system. */ - if(!fmt) { - ERR("Cannot get FB Config for iPixelFormat %d, expect problems!\n", escape.pixel_format); - SetLastError(ERROR_INVALID_PIXEL_FORMAT); - return NULL; + if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl ) || + !XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) + { + if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) goto done; + ret->hdc = hdc; + ret->fmt = gl->format; + ret->vis = pglXGetVisualFromFBConfig(gdi_display, gl->format->fbconfig); + ret->ctx = create_glxcontext(gdi_display, ret, NULL); + list_add_head( &context_list, &ret->entry ); } + else SetLastError( ERROR_INVALID_PIXEL_FORMAT ); - if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) return 0; - - ret->hdc = hdc; - ret->fmt = fmt; - ret->has_been_current = FALSE; - ret->sharing = FALSE; - - ret->vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); - ret->ctx = create_glxcontext(gdi_display, ret, NULL); - - EnterCriticalSection( &context_section ); - list_add_head( &context_list, &ret->entry ); +done: LeaveCriticalSection( &context_section ); - - TRACE(" creating context %p (GL context creation delayed)\n", ret); + TRACE( "%p -> %p\n", hdc, ret ); return ret; }

1 0

Alexandre Julliard : winex11: Store a format pointer instead of an index in the drawable structures.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 356f9897cd890b29b5a373e06bc075c0b86a15ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=356f9897cd890b29b5a373e06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 15:36:57 2012 +0200 winex11: Store a format pointer instead of an index in the drawable structures. --- dlls/winex11.drv/opengl.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a31c5ef..3c557db 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -184,23 +184,23 @@ enum dc_gl_type struct glx_physdev { - struct gdi_physdev dev; - X11DRV_PDEVICE *x11dev; - enum dc_gl_type type; /* type of GL device context */ - int pixel_format; - Drawable drawable; - Pixmap pixmap; /* pixmap for a DL_GL_PIXMAP_WIN drawable */ + struct gdi_physdev dev; + X11DRV_PDEVICE *x11dev; + enum dc_gl_type type; /* type of GL device context */ + const struct wgl_pixel_format *format; + Drawable drawable; + Pixmap pixmap; /* pixmap for a DL_GL_PIXMAP_WIN drawable */ }; struct gl_drawable { - enum dc_gl_type type; /* type of GL surface */ - Drawable drawable; /* drawable for rendering to the client area */ - Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ - Colormap colormap; /* colormap used for the drawable */ - int pixel_format; /* pixel format for the drawable */ - XVisualInfo *visual; /* information about the GL visual */ - RECT rect; /* drawable rect, relative to whole window drawable */ + enum dc_gl_type type; /* type of GL surface */ + Drawable drawable; /* drawable for rendering to the client area */ + Pixmap pixmap; /* base pixmap if drawable is a GLXPixmap */ + Colormap colormap; /* colormap used for the drawable */ + const struct wgl_pixel_format *format; /* pixel format for the drawable */ + XVisualInfo *visual; /* information about the GL visual */ + RECT rect; /* drawable rect, relative to whole window drawable */ }; /* X context to associate a struct gl_drawable to an hwnd */ @@ -1180,8 +1180,8 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) if (!(format = pixelformat_from_fbconfig_id( fbconfig_id ))) return FALSE; gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ); - gl->pixel_format = format; - gl->visual = pglXGetVisualFromFBConfig( gdi_display, pixel_formats[format - 1].fbconfig ); + gl->format = &pixel_formats[format - 1]; + gl->visual = pglXGetVisualFromFBConfig( gdi_display, gl->format->fbconfig ); if (!gl->visual) { HeapFree( GetProcessHeap(), 0, gl ); @@ -1516,7 +1516,7 @@ static int glxdrv_wglGetPixelFormat( HDC hdc ) EnterCriticalSection( &context_section ); if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl ) || !XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) - ret = gl->pixel_format; + ret = gl->format - pixel_formats + 1; LeaveCriticalSection( &context_section ); /* Offscreen formats can't be used with traditional WGL calls. @@ -1561,7 +1561,7 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM EnterCriticalSection( &context_section ); if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl )) - prev = gl->pixel_format; + prev = gl->format - pixel_formats + 1; LeaveCriticalSection( &context_section ); if (prev) return prev == iPixelFormat; /* cannot change it if already set */ @@ -2212,7 +2212,7 @@ static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object ) } gl->type = DC_GL_PBUFFER; gl->drawable = object->drawable; - gl->pixel_format = object->fmt - pixel_formats + 1; + gl->format = object->fmt; EnterCriticalSection( &context_section ); if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&prev )) @@ -3206,28 +3206,28 @@ static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d if (!XFindContext( gdi_display, (XID)data->hwnd, gl_hwnd_context, (char **)&gl ) || !XFindContext( gdi_display, (XID)dev->hdc, gl_pbuffer_context, (char **)&gl )) { - physdev->pixel_format = gl->pixel_format; + physdev->format = gl->format; physdev->type = gl->type; physdev->drawable = gl->drawable; physdev->pixmap = gl->pixmap; } else { - physdev->pixel_format = 0; + physdev->format = NULL; physdev->type = DC_GL_NONE; physdev->drawable = 0; physdev->pixmap = 0; } LeaveCriticalSection( &context_section ); - TRACE( "SET_DRAWABLE hdc %p drawable %lx pf %u type %u\n", - dev->hdc, physdev->drawable, physdev->pixel_format, physdev->type ); + TRACE( "SET_DRAWABLE hdc %p drawable %lx pf %p type %u\n", + dev->hdc, physdev->drawable, physdev->format, physdev->type ); } break; case X11DRV_GET_DRAWABLE: if (out_count >= sizeof(struct x11drv_escape_get_drawable)) { struct x11drv_escape_get_drawable *data = out_data; - data->pixel_format = physdev->pixel_format; + data->pixel_format = physdev->format ? physdev->format - pixel_formats + 1 : 0; data->gl_drawable = physdev->drawable; } break;

1 0

Alexandre Julliard : winex11: Get the current pixel format from the drawable structure in wglMakeContextCurrentARB .
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: bde5156876bc9c2255f3f98bdef81840c057ffb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde5156876bc9c2255f3f98bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 16:09:22 2012 +0200 winex11: Get the current pixel format from the drawable structure in wglMakeContextCurrentARB. --- dlls/winex11.drv/opengl.c | 48 +++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a6fb974..6e0c0b7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1718,8 +1718,9 @@ done: */ static BOOL X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct wgl_context *ctx ) { - struct x11drv_escape_get_drawable escape_draw, escape_read; - BOOL ret; + BOOL ret = FALSE; + HWND draw_hwnd, read_hwnd; + struct gl_drawable *draw_gl, *read_gl; TRACE("(%p,%p,%p)\n", draw_hdc, read_hdc, ctx); @@ -1730,43 +1731,36 @@ static BOOL X11DRV_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct return TRUE; } - escape_draw.code = X11DRV_GET_DRAWABLE; - if (!ExtEscape( draw_hdc, X11DRV_ESCAPE, sizeof(escape_draw.code), (LPCSTR)&escape_draw.code, - sizeof(escape_draw), (LPSTR)&escape_draw )) - return FALSE; + if (!pglXMakeContextCurrent) return FALSE; - escape_read.code = X11DRV_GET_DRAWABLE; - if (!ExtEscape( read_hdc, X11DRV_ESCAPE, sizeof(escape_read.code), (LPCSTR)&escape_read.code, - sizeof(escape_read), (LPSTR)&escape_read )) - return FALSE; + draw_hwnd = WindowFromDC( draw_hdc ); + read_hwnd = WindowFromDC( read_hdc ); + EnterCriticalSection( &context_section ); - if (!escape_draw.pixel_format) + if (!XFindContext( gdi_display, (XID)draw_hwnd, gl_hwnd_context, (char **)&draw_gl ) || + !XFindContext( gdi_display, (XID)draw_hdc, gl_pbuffer_context, (char **)&draw_gl )) { - WARN("Trying to use an invalid drawable\n"); - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - else - { - if (!pglXMakeContextCurrent) return FALSE; + if (XFindContext( gdi_display, (XID)read_hwnd, gl_hwnd_context, (char **)&read_gl ) && + XFindContext( gdi_display, (XID)read_hdc, gl_pbuffer_context, (char **)&read_gl )) + read_gl = NULL; - ret = pglXMakeContextCurrent(gdi_display, escape_draw.gl_drawable, escape_read.gl_drawable, ctx->ctx); + ret = pglXMakeContextCurrent(gdi_display, draw_gl->drawable, + read_gl ? read_gl->drawable : 0, ctx->ctx); if (ret) { - EnterCriticalSection( &context_section ); ctx->has_been_current = TRUE; ctx->hdc = draw_hdc; - ctx->drawables[0] = escape_draw.gl_drawable; - ctx->drawables[1] = escape_read.gl_drawable; + ctx->drawables[0] = draw_gl->drawable; + ctx->drawables[1] = read_gl ? read_gl->drawable : 0; ctx->refresh_drawables = FALSE; - LeaveCriticalSection( &context_section ); NtCurrentTeb()->glContext = ctx; + goto done; } - else - SetLastError(ERROR_INVALID_HANDLE); } - - TRACE(" returning %s\n", (ret ? "True" : "False")); + SetLastError( ERROR_INVALID_HANDLE ); +done: + LeaveCriticalSection( &context_section ); + TRACE( "%p,%p,%p returning %d\n", draw_hdc, read_hdc, ctx, ret ); return ret; }

1 0

Jacek Caban : vbscript: Added ScriptDisp::InvokeEx implementation.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 11d2dfaea9eb99c3bebfbb47658742de892e28f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d2dfaea9eb99c3bebfbb476… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 15:10:17 2012 +0200 vbscript: Added ScriptDisp::InvokeEx implementation. --- dlls/vbscript/vbdisp.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 4f473e2..a76660e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -97,7 +97,7 @@ static VARIANT *get_propput_arg(const DISPPARAMS *dp) return NULL; } -static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPPARAMS *dp, VARIANT *res) +static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIANT *res) { HRESULT hres; @@ -403,7 +403,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } if(id < This->desc->prop_cnt + This->desc->func_cnt) - return invoke_variant_prop(This, This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); + return invoke_variant_prop(This->props+(id-This->desc->func_cnt), wFlags, pdp, pvarRes); if(This->desc->builtin_prop_cnt) { unsigned min = 0, max = This->desc->builtin_prop_cnt-1, i; @@ -579,6 +579,11 @@ static inline DISPID ident_to_id(ScriptDisp *This, ident_map_t *ident) return (ident-This->ident_map)+1; } +static inline ident_map_t *id_to_ident(ScriptDisp *This, DISPID id) +{ + return 0 < id && id <= This->ident_map_cnt ? This->ident_map+id-1 : NULL; +} + static ident_map_t *add_ident(ScriptDisp *This, const WCHAR *name) { ident_map_t *ret; @@ -748,8 +753,30 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); + ident_map_t *ident; + HRESULT hres; + TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - return DISP_E_MEMBERNOTFOUND; + + ident = id_to_ident(This, id); + if(!ident) + return DISP_E_MEMBERNOTFOUND; + + if(ident->is_var) { + if(ident->u.var->is_const) { + FIXME("const not supported\n"); + return E_NOTIMPL; + } + + return invoke_variant_prop(&ident->u.var->v, wFlags, pdp, pvarRes); + } + + + IActiveScriptSite_OnEnterScript(This->ctx->site); + hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes); + IActiveScriptSite_OnLeaveScript(This->ctx->site); + + return hres; } static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex)

1 0

Alexandre Julliard : winex11: Store a drawable structure also for pbuffer contexts.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: 4df8f15ff9cefccf030fa5b92c4c53b0267fa29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df8f15ff9cefccf030fa5b92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 7 15:23:15 2012 +0200 winex11: Store a drawable structure also for pbuffer contexts. --- dlls/winex11.drv/opengl.c | 81 ++++++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 00642ce..d5d3ca9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -204,7 +204,9 @@ struct gl_drawable }; /* X context to associate a struct gl_drawable to an hwnd */ -static XContext gl_drawable_context; +static XContext gl_hwnd_context; +/* X context to associate a struct gl_drawable to a pbuffer hdc */ +static XContext gl_pbuffer_context; static const struct gdi_dc_funcs glxdrv_funcs; @@ -592,7 +594,8 @@ static BOOL has_opengl(void) ERR( "GLX extension is missing, disabling OpenGL.\n" ); goto failed; } - gl_drawable_context = XUniqueContext(); + gl_hwnd_context = XUniqueContext(); + gl_pbuffer_context = XUniqueContext(); /* In case of GLX you have direct and indirect rendering. Most of the time direct rendering is used * as in general only that is hardware accelerated. In some cases like in case of remote X indirect @@ -1160,7 +1163,7 @@ static void free_gl_drawable( struct gl_drawable *gl ) default: break; } - XFree( gl->visual ); + if (gl->visual) XFree( gl->visual ); HeapFree( GetProcessHeap(), 0, gl ); } @@ -1275,9 +1278,9 @@ BOOL set_win_format( HWND hwnd, XID fbconfig_id ) XFlush( gdi_display ); EnterCriticalSection( &context_section ); - if (!XFindContext( gdi_display, (XID)hwnd, gl_drawable_context, (char **)&prev )) + if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&prev )) free_gl_drawable( prev ); - XSaveContext( gdi_display, (XID)hwnd, gl_drawable_context, (char *)gl ); + XSaveContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char *)gl ); LeaveCriticalSection( &context_section ); /* force DCE invalidation */ @@ -1305,7 +1308,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r EnterCriticalSection( &context_section ); - if (XFindContext( gdi_display, (XID)hwnd, gl_drawable_context, (char **)&gl )) goto done; + if (XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl )) goto done; if (changes.width != gl->rect.right - gl->rect.left) mask |= CWWidth; if (changes.height != gl->rect.bottom - gl->rect.top) mask |= CWHeight; @@ -1358,9 +1361,9 @@ void destroy_gl_drawable( HWND hwnd ) struct gl_drawable *gl; EnterCriticalSection( &context_section ); - if (!XFindContext( gdi_display, (XID)hwnd, gl_drawable_context, (char **)&gl )) + if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl )) { - XDeleteContext( gdi_display, (XID)hwnd, gl_drawable_context ); + XDeleteContext( gdi_display, (XID)hwnd, gl_hwnd_context ); free_gl_drawable( gl ); } LeaveCriticalSection( &context_section ); @@ -1561,7 +1564,7 @@ static BOOL glxdrv_wglSetPixelFormat( HDC hdc, int iPixelFormat, const PIXELFORM } EnterCriticalSection( &context_section ); - if (!XFindContext( gdi_display, (XID)hwnd, gl_drawable_context, (char **)&gl )) + if (!XFindContext( gdi_display, (XID)hwnd, gl_hwnd_context, (char **)&gl )) prev = gl->pixel_format; LeaveCriticalSection( &context_section ); @@ -2200,11 +2203,27 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) static HDC X11DRV_wglGetPbufferDCARB( struct wgl_pbuffer *object ) { struct x11drv_escape_set_drawable escape; + struct gl_drawable *gl, *prev; HDC hdc; hdc = CreateDCA( "DISPLAY", NULL, NULL, NULL ); if (!hdc) return 0; + if (!(gl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*gl) ))) + { + DeleteDC( hdc ); + return 0; + } + gl->type = DC_GL_PBUFFER; + gl->drawable = object->drawable; + gl->pixel_format = object->fmt - pixel_formats + 1; + + EnterCriticalSection( &context_section ); + if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&prev )) + free_gl_drawable( prev ); + XSaveContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char *)gl ); + LeaveCriticalSection( &context_section ); + escape.code = X11DRV_SET_DRAWABLE; escape.hwnd = 0; escape.drawable = object->drawable; @@ -2313,7 +2332,18 @@ static BOOL X11DRV_wglQueryPbufferARB( struct wgl_pbuffer *object, int iAttribut */ static int X11DRV_wglReleasePbufferDCARB( struct wgl_pbuffer *object, HDC hdc ) { + struct gl_drawable *gl; + TRACE("(%p, %p)\n", object, hdc); + + EnterCriticalSection( &context_section ); + if (!XFindContext( gdi_display, (XID)hdc, gl_pbuffer_context, (char **)&gl )) + { + XDeleteContext( gdi_display, (XID)hdc, gl_pbuffer_context ); + free_gl_drawable( gl ); + } + LeaveCriticalSection( &context_section ); + return DeleteDC(hdc); } @@ -3176,32 +3206,23 @@ static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d struct gl_drawable *gl; const struct x11drv_escape_set_drawable *data = in_data; - if (!data->hwnd) /* pbuffer */ + EnterCriticalSection( &context_section ); + if (!XFindContext( gdi_display, (XID)data->hwnd, gl_hwnd_context, (char **)&gl ) || + !XFindContext( gdi_display, (XID)dev->hdc, gl_pbuffer_context, (char **)&gl )) { - physdev->pixel_format = pixelformat_from_fbconfig_id( data->fbconfig_id ); - physdev->type = DC_GL_PBUFFER; - physdev->drawable = data->drawable; - physdev->pixmap = 0; + physdev->pixel_format = gl->pixel_format; + physdev->type = gl->type; + physdev->drawable = gl->drawable; + physdev->pixmap = gl->pixmap; } else { - EnterCriticalSection( &context_section ); - if (!XFindContext( gdi_display, (XID)data->hwnd, gl_drawable_context, (char **)&gl )) - { - physdev->pixel_format = gl->pixel_format; - physdev->type = gl->type; - physdev->drawable = gl->drawable; - physdev->pixmap = gl->pixmap; - } - else - { - physdev->pixel_format = 0; - physdev->type = DC_GL_NONE; - physdev->drawable = 0; - physdev->pixmap = 0; - } - LeaveCriticalSection( &context_section ); + physdev->pixel_format = 0; + physdev->type = DC_GL_NONE; + physdev->drawable = 0; + physdev->pixmap = 0; } + LeaveCriticalSection( &context_section ); TRACE( "SET_DRAWABLE hdc %p drawable %lx pf %u type %u\n", dev->hdc, physdev->drawable, physdev->pixel_format, physdev->type ); }

1 0

Jacek Caban : vbscript: Fixed class_desc_t leak.
by Alexandre Julliard Sept. 7, 2012

Sept. 7, 2012

Module: wine Branch: master Commit: bac5fdc85f231abda5b9ac49d4d0d1617fce44a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac5fdc85f231abda5b9ac49d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 7 15:08:59 2012 +0200 vbscript: Fixed class_desc_t leak. --- dlls/vbscript/vbscript.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f842bba..095e3ae 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -115,6 +115,8 @@ static HRESULT set_ctx_site(VBScript *This) static void release_script(script_ctx_t *ctx) { + class_desc_t *class_desc; + collect_objects(ctx); release_dynamic_vars(ctx->global_vars); @@ -130,6 +132,13 @@ static void release_script(script_ctx_t *ctx) heap_free(iter); } + while(ctx->procs) { + class_desc = ctx->procs; + ctx->procs = class_desc->next; + + heap_free(class_desc); + } + if(ctx->host_global) { IDispatch_Release(ctx->host_global); ctx->host_global = NULL;

1 0