wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Alexandre Julliard : winex11: Add a helper function to correctly check extension strings.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: f3e1e46c85c036ca212f1e34a247c7be80934107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e1e46c85c036ca212f1e34a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 24 17:37:39 2012 +0200 winex11: Add a helper function to correctly check extension strings. --- dlls/winex11.drv/opengl.c | 56 ++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e958132..22c608e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -209,7 +209,6 @@ static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; static void X11DRV_WineGL_LoadExtensions(void); static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixelFormat, BOOL AllowOffscreen, int *fmt_count); static BOOL glxRequireVersion(int requiredVersion); -static BOOL glxRequireExtension(const char *requiredExtension); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion); @@ -320,6 +319,20 @@ static void (*pglFlush)(void); static void wglFinish(void); static void wglFlush(void); +/* check if the extension is present in the list */ +static BOOL has_extension( const char *list, const char *ext ) +{ + size_t len = strlen( ext ); + + while (list) + { + while (*list == ' ') list++; + if (!strncmp( list, ext, len ) && (!list[len] || list[len] == ' ')) return TRUE; + list = strchr( list, ' ' ); + } + return FALSE; +} + static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) { /* In the future we might want to find the exact X or GLX error to report back to the app */ @@ -590,7 +603,7 @@ static BOOL has_opengl(void) pglXGetFBConfigAttrib = pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib"); pglXGetVisualFromFBConfig = pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig"); pglXQueryDrawable = pglXGetProcAddressARB((const GLubyte *) "glXQueryDrawable"); - } else if(glxRequireExtension("GLX_SGIX_fbconfig")) { + } else if (has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_fbconfig")) { pglXChooseFBConfig = pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfigSGIX"); pglXGetFBConfigAttrib = pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttribSGIX"); pglXGetVisualFromFBConfig = pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfigSGIX"); @@ -615,7 +628,7 @@ static BOOL has_opengl(void) ERR(" glx_version is %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxServerVersion); } - if(glxRequireExtension("GLX_MESA_copy_sub_buffer")) { + if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_copy_sub_buffer")) { pglXCopySubBufferMESA = pglXGetProcAddressARB((const GLubyte *) "glXCopySubBufferMESA"); } @@ -854,7 +867,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, struct wgl_ TRACE("pAttr[?] = GLX_RENDER_TYPE: %#x\n", pixelattrib); /* Set GLX_FLOAT_COMPONENTS_NV all the time */ - if(strstr(WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) { + if (has_extension(WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) { PUSH2(oGLXAttr, GLX_FLOAT_COMPONENTS_NV, nvfloatattrib); TRACE("pAttr[?] = GLX_FLOAT_COMPONENTS_NV: %#x\n", nvfloatattrib); } @@ -2860,15 +2873,6 @@ static BOOL glxRequireVersion(int requiredVersion) return FALSE; } -static BOOL glxRequireExtension(const char *requiredExtension) -{ - if (strstr(WineGLInfo.glxExtensions, requiredExtension) == NULL) { - return FALSE; - } - - return TRUE; -} - static void register_extension(const char *ext) { if (WineGLInfo.wglExtensions[0]) @@ -2887,16 +2891,16 @@ static void X11DRV_WineGL_LoadExtensions(void) /* ARB Extensions */ - if(glxRequireExtension("GLX_ARB_create_context")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context")) { register_extension( "WGL_ARB_create_context" ); opengl_funcs.ext.p_wglCreateContextAttribsARB = X11DRV_wglCreateContextAttribsARB; - if(glxRequireExtension("GLX_ARB_create_context_profile")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_profile")) register_extension("WGL_ARB_create_context_profile"); } - if(glxRequireExtension("GLX_ARB_fbconfig_float")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_fbconfig_float")) { register_extension("WGL_ARB_pixel_format_float"); register_extension("WGL_ATI_pixel_format_float"); @@ -2912,12 +2916,12 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglMakeContextCurrentARB = X11DRV_wglMakeContextCurrentARB; } - if (glxRequireExtension("GLX_ARB_multisample")) register_extension( "WGL_ARB_multisample" ); + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_multisample")) register_extension( "WGL_ARB_multisample" ); /* In general pbuffer functionality requires support in the X-server. The functionality is * available either when the GLX_SGIX_pbuffer is present or when the GLX server version is 1.3. */ - if ( glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer") ) + if ( glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") ) { register_extension( "WGL_ARB_pbuffer" ); opengl_funcs.ext.p_wglCreatePbufferARB = X11DRV_wglCreatePbufferARB; @@ -2934,19 +2938,19 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglGetPixelFormatAttribivARB = X11DRV_wglGetPixelFormatAttribivARB; /* Support WGL_ARB_render_texture when there's support or pbuffer based emulation */ - if (glxRequireExtension("GLX_ARB_render_texture") || - (glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer") && use_render_texture_emulation)) + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_render_texture") || + (glxRequireVersion(3) && has_extension( WineGLInfo.glxExtensions, "GLX_SGIX_pbuffer") && use_render_texture_emulation)) { register_extension( "WGL_ARB_render_texture" ); opengl_funcs.ext.p_wglBindTexImageARB = X11DRV_wglBindTexImageARB; opengl_funcs.ext.p_wglReleaseTexImageARB = X11DRV_wglReleaseTexImageARB; /* The WGL version of GLX_NV_float_buffer requires render_texture */ - if(glxRequireExtension("GLX_NV_float_buffer")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_NV_float_buffer")) register_extension("WGL_NV_float_buffer"); /* Again there's no GLX equivalent for this extension, so depend on the required GL extension */ - if(strstr(WineGLInfo.glExtensions, "GL_NV_texture_rectangle") != NULL) + if (has_extension(WineGLInfo.glExtensions, "GL_NV_texture_rectangle")) register_extension("WGL_NV_texture_rectangle"); } @@ -2961,17 +2965,17 @@ static void X11DRV_WineGL_LoadExtensions(void) opengl_funcs.ext.p_wglSwapIntervalEXT = X11DRV_wglSwapIntervalEXT; opengl_funcs.ext.p_wglGetSwapIntervalEXT = X11DRV_wglGetSwapIntervalEXT; - if(glxRequireExtension("GLX_EXT_framebuffer_sRGB")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_framebuffer_sRGB")) register_extension("WGL_EXT_framebuffer_sRGB"); - if(glxRequireExtension("GLX_EXT_fbconfig_packed_float")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_fbconfig_packed_float")) register_extension("WGL_EXT_pixel_format_packed_float"); - if (glxRequireExtension("GLX_EXT_swap_control")) + if (has_extension( WineGLInfo.glxExtensions, "GLX_EXT_swap_control")) has_swap_control = TRUE; /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ - if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) + if (has_extension(WineGLInfo.glExtensions, "GL_NV_vertex_array_range")) { register_extension( "WGL_NV_vertex_array_range" ); opengl_funcs.ext.p_wglAllocateMemoryNV = pglXAllocateMemoryNV;

1 0

Jacek Caban : jscript: Use prototype for builtin String properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 1104663fe78d5e324a55f1b2b88927cb57294f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1104663fe78d5e324a55f1b2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:41 2012 +0200 jscript: Use prototype for builtin String properties. --- dlls/jscript/string.c | 15 ++++++++++++++- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9b23005..4921f8b 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1536,6 +1536,19 @@ static const builtin_info_t String_info = { NULL }; +static const builtin_prop_t StringInst_props[] = { + {lengthW, String_length, 0} +}; + +static const builtin_info_t StringInst_info = { + JSCLASS_STRING, + {NULL, String_value, 0}, + sizeof(StringInst_props)/sizeof(*StringInst_props), + StringInst_props, + String_destructor, + NULL +}; + /* ECMA-262 3rd Edition 15.5.3.2 */ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) @@ -1635,7 +1648,7 @@ static HRESULT string_alloc(script_ctx_t *ctx, jsdisp_t *object_prototype, Strin if(object_prototype) hres = init_dispex(&string->dispex, ctx, &String_info, object_prototype); else - hres = init_dispex_from_constr(&string->dispex, ctx, &String_info, ctx->string_constr); + hres = init_dispex_from_constr(&string->dispex, ctx, &StringInst_info, ctx->string_constr); if(FAILED(hres)) { heap_free(string); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 9bc083d..c998fa6 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -239,6 +239,13 @@ ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); +obj = new String(); +ok(!obj.hasOwnProperty('charAt'), "obj.hasOwnProperty('charAt') is true"); +ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is false"); +ok(!String.hasOwnProperty('charAt'), "String.hasOwnProperty('charAt') is true"); +ok(String.prototype.hasOwnProperty('charAt'), "String.prototype.hasOwnProperty('charAt') is false"); +ok(String.prototype.hasOwnProperty('length'), "String.prototype.hasOwnProperty('length') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin RegExp properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 1dfb75d9a38a4c14f74fff3d8eb1ad40cb37b140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dfb75d9a38a4c14f74fff3d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:32 2012 +0200 jscript: Use prototype for builtin RegExp properties. --- dlls/jscript/regexp.c | 19 ++++++++++++++++++- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 996f9f0..718a720 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3807,6 +3807,23 @@ static const builtin_info_t RegExp_info = { NULL }; +static const builtin_prop_t RegExpInst_props[] = { + {globalW, RegExp_global, 0}, + {ignoreCaseW, RegExp_ignoreCase, 0}, + {lastIndexW, RegExp_lastIndex, 0}, + {multilineW, RegExp_multiline, 0}, + {sourceW, RegExp_source, 0} +}; + +static const builtin_info_t RegExpInst_info = { + JSCLASS_REGEXP, + {NULL, RegExp_value, 0}, + sizeof(RegExpInst_props)/sizeof(*RegExpInst_props), + RegExpInst_props, + RegExp_destructor, + NULL +}; + static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegExpInstance **ret) { RegExpInstance *regexp; @@ -3819,7 +3836,7 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegEx if(object_prototype) hres = init_dispex(&regexp->dispex, ctx, &RegExp_info, object_prototype); else - hres = init_dispex_from_constr(&regexp->dispex, ctx, &RegExp_info, ctx->regexp_constr); + hres = init_dispex_from_constr(&regexp->dispex, ctx, &RegExpInst_info, ctx->regexp_constr); if(FAILED(hres)) { heap_free(regexp); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fc787a9..9bc083d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -232,6 +232,13 @@ ok(!obj.hasOwnProperty('toFixed'), "obj.hasOwnProperty('toFixed') is true"); ok(!Number.hasOwnProperty('toFixed'), "Number.hasOwnProperty('toFixed') is true"); ok(Number.prototype.hasOwnProperty('toFixed'), "Number.prototype.hasOwnProperty('toFixed') is false"); +obj = /x/; +ok(!obj.hasOwnProperty('exec'), "obj.hasOwnProperty('exec') is true"); +ok(obj.hasOwnProperty('source'), "obj.hasOwnProperty('source') is false"); +ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true"); +ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); +ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin Number properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 3b80361a707109cd57e70dac5c05e76c33dcf9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b80361a707109cd57e70dac5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:19 2012 +0200 jscript: Use prototype for builtin Number properties. --- dlls/jscript/number.c | 10 +++++++++- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index d2de790..9107005 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -543,6 +543,14 @@ static const builtin_info_t Number_info = { NULL }; +static const builtin_info_t NumberInst_info = { + JSCLASS_NUMBER, + {NULL, Number_value, 0}, + 0, NULL, + NULL, + NULL +}; + static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -605,7 +613,7 @@ static HRESULT alloc_number(script_ctx_t *ctx, jsdisp_t *object_prototype, Numbe if(object_prototype) hres = init_dispex(&number->dispex, ctx, &Number_info, object_prototype); else - hres = init_dispex_from_constr(&number->dispex, ctx, &Number_info, ctx->number_constr); + hres = init_dispex_from_constr(&number->dispex, ctx, &NumberInst_info, ctx->number_constr); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a723f6e..fc787a9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -227,6 +227,11 @@ ok(!obj.hasOwnProperty('getTime'), "obj.hasOwnProperty('getTime') is true"); ok(!Date.hasOwnProperty('getTime'), "Date.hasOwnProperty('getTime') is true"); ok(Date.prototype.hasOwnProperty('getTime'), "Date.prototype.hasOwnProperty('getTime') is false"); +obj = new Number(); +ok(!obj.hasOwnProperty('toFixed'), "obj.hasOwnProperty('toFixed') is true"); +ok(!Number.hasOwnProperty('toFixed'), "Number.hasOwnProperty('toFixed') is true"); +ok(Number.prototype.hasOwnProperty('toFixed'), "Number.prototype.hasOwnProperty('toFixed') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin Date properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 175c4ddad5efa19a1cb4d0a12669792adef39e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=175c4ddad5efa19a1cb4d0a12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:17:06 2012 +0200 jscript: Use prototype for builtin Date properties. --- dlls/jscript/date.c | 10 +++++++++- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 465f7b2..f5cf591 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2110,6 +2110,14 @@ static const builtin_info_t Date_info = { NULL }; +static const builtin_info_t DateInst_info = { + JSCLASS_DATE, + {NULL, Date_value, 0}, + 0, NULL, + NULL, + NULL +}; + static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE time, jsdisp_t **ret) { DateInstance *date; @@ -2125,7 +2133,7 @@ static HRESULT create_date(script_ctx_t *ctx, jsdisp_t *object_prototype, DOUBLE if(object_prototype) hres = init_dispex(&date->dispex, ctx, &Date_info, object_prototype); else - hres = init_dispex_from_constr(&date->dispex, ctx, &Date_info, ctx->date_constr); + hres = init_dispex_from_constr(&date->dispex, ctx, &DateInst_info, ctx->date_constr); if(FAILED(hres)) { heap_free(date); return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3d8d67a..a723f6e 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -222,6 +222,11 @@ ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); ok(!Boolean.hasOwnProperty('toString'), "Boolean.hasOwnProperty('toString') is true"); ok(Boolean.prototype.hasOwnProperty('toString'), "Boolean.prototype.hasOwnProperty('toString') is false"); +obj = new Date(); +ok(!obj.hasOwnProperty('getTime'), "obj.hasOwnProperty('getTime') is true"); +ok(!Date.hasOwnProperty('getTime'), "Date.hasOwnProperty('getTime') is true"); +ok(Date.prototype.hasOwnProperty('getTime'), "Date.prototype.hasOwnProperty('getTime') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin Boolean properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 5058c1d12d632043133da233e1ab15c968b8fa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5058c1d12d632043133da233e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:16:46 2012 +0200 jscript: Use prototype for builtin Boolean properties. --- dlls/jscript/bool.c | 10 +++++++++- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 14bb1a3..d5dfcb4 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -117,6 +117,14 @@ static const builtin_info_t Bool_info = { NULL }; +static const builtin_info_t BoolInst_info = { + JSCLASS_BOOLEAN, + {NULL, Bool_value, 0}, + 0, NULL, + NULL, + NULL +}; + static HRESULT BoolConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -168,7 +176,7 @@ static HRESULT alloc_bool(script_ctx_t *ctx, jsdisp_t *object_prototype, BoolIns if(object_prototype) hres = init_dispex(&bool->dispex, ctx, &Bool_info, object_prototype); else - hres = init_dispex_from_constr(&bool->dispex, ctx, &Bool_info, ctx->bool_constr); + hres = init_dispex_from_constr(&bool->dispex, ctx, &BoolInst_info, ctx->bool_constr); if(FAILED(hres)) { heap_free(bool); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 4675e08..3d8d67a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -217,6 +217,11 @@ ok(Array.prototype.hasOwnProperty('length'), "Array.prototype.hasOwnProperty('le ok(!obj.hasOwnProperty('sort'), "obj.hasOwnProperty('sort') is true"); ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is true"); +obj = new Boolean(false); +ok(!obj.hasOwnProperty('toString'), "obj.hasOwnProperty('toString') is true"); +ok(!Boolean.hasOwnProperty('toString'), "Boolean.hasOwnProperty('toString') is true"); +ok(Boolean.prototype.hasOwnProperty('toString'), "Boolean.prototype.hasOwnProperty('toString') is false"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Jacek Caban : jscript: Use prototype for builtin Array properties.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 6e4f74f71b640db7eb7fd0f9b1a7ea6996177607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4f74f71b640db7eb7fd0f9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 24 13:15:53 2012 +0200 jscript: Use prototype for builtin Array properties. --- dlls/jscript/array.c | 15 ++++++++++++++- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6881412..856e063 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1100,6 +1100,19 @@ static const builtin_info_t Array_info = { Array_on_put }; +static const builtin_prop_t ArrayInst_props[] = { + {lengthW, Array_length, 0} +}; + +static const builtin_info_t ArrayInst_info = { + JSCLASS_ARRAY, + {NULL, Array_value, 0}, + sizeof(ArrayInst_props)/sizeof(*ArrayInst_props), + ArrayInst_props, + Array_destructor, + Array_on_put +}; + static HRESULT ArrayConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) { @@ -1161,7 +1174,7 @@ static HRESULT alloc_array(script_ctx_t *ctx, jsdisp_t *object_prototype, ArrayI if(object_prototype) hres = init_dispex(&array->dispex, ctx, &Array_info, object_prototype); else - hres = init_dispex_from_constr(&array->dispex, ctx, &Array_info, ctx->array_constr); + hres = init_dispex_from_constr(&array->dispex, ctx, &ArrayInst_info, ctx->array_constr); if(FAILED(hres)) { heap_free(array); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f8885dd..4675e08 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -211,6 +211,12 @@ ok(!Object.hasOwnProperty('isPrototypeOf'), "Object.hasOwnProperty('isPrototypeO ok(!parseFloat.hasOwnProperty('call'), "parseFloat.hasOwnProperty('call') is true"); ok(!Function.hasOwnProperty('call'), "Function.hasOwnProperty('call') is true"); +obj = new Array(); +ok(Array.prototype.hasOwnProperty('sort'), "Array.prototype.hasOwnProperty('sort') is false"); +ok(Array.prototype.hasOwnProperty('length'), "Array.prototype.hasOwnProperty('length') is false"); +ok(!obj.hasOwnProperty('sort'), "obj.hasOwnProperty('sort') is true"); +ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is true"); + tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); (tmp = new Array).f = Object.prototype.toString;

1 0

Nikolay Sivov : dwrite: Added initial stub.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: 3a724d58eba31666af3886d759371507f8cddd50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a724d58eba31666af3886d75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 24 14:05:18 2012 +0400 dwrite: Added initial stub. --- configure | 1 + configure.ac | 1 + dlls/dwrite/Makefile.in | 6 ++++++ dlls/dwrite/dwrite.spec | 1 + dlls/dwrite/main.c | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 46 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0f0cc15..0cc7ae6 100755 --- a/configure +++ b/configure @@ -15209,6 +15209,7 @@ wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave wine_fn_config_dll dwmapi enable_dwmapi implib +wine_fn_config_dll dwrite enable_dwrite wine_fn_config_dll dxdiagn enable_dxdiagn po wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test wine_fn_config_lib dxerr8 diff --git a/configure.ac b/configure.ac index 50e5513..aa2b026 100644 --- a/configure.ac +++ b/configure.ac @@ -2614,6 +2614,7 @@ WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave) WINE_CONFIG_DLL(dwmapi,,[implib]) +WINE_CONFIG_DLL(dwrite) WINE_CONFIG_DLL(dxdiagn,,[po]) WINE_CONFIG_TEST(dlls/dxdiagn/tests) WINE_CONFIG_LIB(dxerr8) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in new file mode 100644 index 0000000..7438d92 --- /dev/null +++ b/dlls/dwrite/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dwrite.dll + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ diff --git a/dlls/dwrite/dwrite.spec b/dlls/dwrite/dwrite.spec new file mode 100644 index 0000000..36ae913f --- /dev/null +++ b/dlls/dwrite/dwrite.spec @@ -0,0 +1 @@ +@ stub DWriteCreateFactory diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c new file mode 100644 index 0000000..ed4c4ee --- /dev/null +++ b/dlls/dwrite/main.c @@ -0,0 +1,37 @@ +/* + * DWrite + * + * Copyright 2012 Nikolay Sivov 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +}

1 0

Detlef Riekenberg : apphelp: Implement ApphelpCheckShellObject.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: bb254fce23a473e3c1d4b560c788024f7bc258e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb254fce23a473e3c1d4b560c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 21 18:25:39 2012 +0200 apphelp: Implement ApphelpCheckShellObject. --- dlls/apphelp/apphelp.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 9394cf3..7ef1a41 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -19,6 +19,8 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include <appcompatapi.h> + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(apphelp); @@ -70,6 +72,7 @@ PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) BOOL WINAPI ApphelpCheckShellObject( REFCLSID clsid, BOOL shim, ULONGLONG *flags ) { - FIXME("stub: %s %p\n", debugstr_guid(clsid), flags ); + TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), shim, flags); + if (flags) *flags = 0; return TRUE; }

1 0

Detlef Riekenberg : include: Add appcompatapi.h.
by Alexandre Julliard 24 Jul '12

24 Jul '12

Module: wine Branch: master Commit: d4db98dc54a89248c07e383f7462fd9b5b084fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4db98dc54a89248c07e383f7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jul 21 18:25:38 2012 +0200 include: Add appcompatapi.h. --- include/Makefile.in | 1 + include/appcompatapi.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 16a1e4f..742cbe1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -132,6 +132,7 @@ SRCDIR_INCLUDES = \ advpub.h \ af_irda.h \ amaudio.h \ + appcompatapi.h \ appmgmt.h \ asynot.idl \ asysta.idl \ diff --git a/include/appcompatapi.h b/include/appcompatapi.h new file mode 100644 index 0000000..90b184e --- /dev/null +++ b/include/appcompatapi.h @@ -0,0 +1,32 @@ +/* + * Copyright 2012 Detlef Riekenberg + * + * 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 + */ + +#ifndef __APPCOMPAT_H +#define __APPCOMPAT_H + +#ifdef __cplusplus +extern "C" { +#endif + +BOOL WINAPI ApphelpCheckShellObject(REFCLSID, BOOL, ULONGLONG *); + +#ifdef __cplusplus +} +#endif + +#endif /* __APPCOMPAT_H */

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012