mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correctly terminate properties list 

add helper to convert strings

svn path=/trunk/netsurf/; revision=13991
This commit is contained in:
Vincent Sanders 2012-06-27 23:39:18 +00:00
parent 804bec4f99
commit 1c15183fe3
2 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
javascript/jsapi.h
View File

@ -46,6 +46,19 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
#define JS_StrictPropertyStub JS_PropertyStub
#define JSString_to_char(injsstring, outchar, outlen) \
txt = JS_GetStringBytes(u16_txt); \
outlen = strlen(txt)
#else
#define JSString_to_char(injsstring, outchar, outlen) \
outlen = JS_GetStringLength(injsstring); \
outchar = alloca(sizeof(char)*(outlen+1)); \
JS_EncodeStringToBuffer(injsstring, outchar, outlen); \
outchar[outlen] = '\0'
#endif

51
javascript/jsapi/window.c
View File

@ -151,20 +151,12 @@ static JSBool jsnative_alert(JSContext *cx, uintN argc, jsval *vp)
{
JSString* u16_txt;
char *txt;
unsigned long length;
if (!JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "S", &u16_txt))
return JS_FALSE;
#if JS_VERSION <= 180
txt = JS_GetStringBytes(u16_txt);
#else
unsigned int length;
length = JS_GetStringLength(u16_txt);
txt = alloca(sizeof(char)*(length+1));
JS_EncodeStringToBuffer(u16_txt, txt, length);
txt[length] = '\0';
#endif
JSString_to_char(u16_txt, txt, length);
warn_user(txt, NULL);
@ -173,10 +165,48 @@ static JSBool jsnative_alert(JSContext *cx, uintN argc, jsval *vp)
return JS_TRUE;
}
static JSBool jsnative_confirm(JSContext *cx, uintN argc, jsval *vp)
{
JSString* u16_txt;
char *txt;
unsigned long length;
JSBool result = JS_FALSE;
if (!JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "S", &u16_txt))
return JS_FALSE;
JSString_to_char(u16_txt, txt, length);
warn_user(txt, NULL);
JS_SET_RVAL(cx, vp, result);
return JS_TRUE;
}
static JSBool jsnative_prompt(JSContext *cx, uintN argc, jsval *vp)
{
JSString* u16_txt;
char *txt;
unsigned long length;
if (!JS_ConvertArguments(cx, argc, JS_ARGV(cx, vp), "S", &u16_txt))
return JS_FALSE;
JSString_to_char(u16_txt, txt, length);
warn_user(txt, NULL);
JS_SET_RVAL(cx, vp, JSVAL_VOID);
return JS_TRUE;
}
static JSFunctionSpec jsfunctions_window[] =
{
JS_FN("alert", jsnative_alert, 1, 0),
JS_FN("confirm", jsnative_confirm, 1, 0),
JS_FN("prompt", jsnative_prompt, 1, 0),
JS_FS_END
};
@ -207,6 +237,7 @@ static JSPropertySpec jsproperties_window[] =
jsproperty_get_window,
jsproperty_set_window
},
{ NULL, 0,0,NULL,NULL }
};
/* The class of the global object. */