Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-22 07:28:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

use a callback instead of malloc inside js

Browse source
This commit is contained in:
Eric House 2021-02-23 11:16:15 -08:00
parent 534e245048
commit ab6abea6a7
3 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/wasm/main.c
View file

@ -99,9 +99,6 @@ static void ensureName( GameState* gs );
static void loadName( GameState* gs ); static void loadName( GameState* gs );
static void saveName( GameState* gs ); static void saveName( GameState* gs );
typedef void (*StringProc)(void* closure, const char* str);
EM_JS(void, show_name, (const char* name), { EM_JS(void, show_name, (const char* name), {
let jsname = UTF8ToString(name); let jsname = UTF8ToString(name);
document.getElementById('gamename').textContent = jsname; document.getElementById('gamename').textContent = jsname;

48
xwords4/wasm/wasmasm.c
View file

@ -24,16 +24,12 @@
#include "wasmasm.h" #include "wasmasm.h"
#include "comtypes.h" #include "comtypes.h"
EM_JS(const char*, _get_stored_value, (const char* key), { EM_JS(void, _get_stored_value, (const char* key,
StringProc proc, void* closure), {
var result = null; var result = null;
var jsKey = UTF8ToString(key); var jsKey = UTF8ToString(key);
var jsString = localStorage.getItem(jsKey); var val = localStorage.getItem(jsKey);
if ( jsString != null ) { ccallString(proc, closure, val);
var lengthBytes = lengthBytesUTF8(jsString)+1;
result = _malloc(lengthBytes);
stringToUTF8(jsString, result, lengthBytes);
}
return result;
}); });
EM_JS(void, set_stored_value, (const char* key, const char* val), { EM_JS(void, set_stored_value, (const char* key, const char* val), {
@ -54,20 +50,30 @@ EM_JS(bool, have_stored_value, (const char* key), {
return result; return result;
}); });
typedef struct _ValState {
void* ptr;
size_t** len;
bool success;
} ValState;
static void
onGotVal(void* closure, const char* val)
{
if ( !!val ) {
ValState* vs = (ValState*)closure;
size_t slen = 1 + strlen(val);
if ( !!vs->ptr && slen <= **vs->len ) {
memcpy( vs->ptr, val, slen );
vs->success = true;
}
**vs->len = slen;
}
}
bool bool
get_stored_value( const char* key, char out[], size_t* len ) get_stored_value( const char* key, char out[], size_t* len )
{ {
bool success = false; ValState state = { .ptr = out, .len = &len, .success = false, };
const char* tmp = _get_stored_value( key ); _get_stored_value( key, onGotVal, &state );
if ( !!tmp ) { return state.success;
size_t slen = 1 + strlen(tmp);
if ( !!out && slen <= *len ) {
memcpy( out, tmp, slen );
success = true;
}
*len = slen;
free( (void*)tmp );
}
return success;
} }

2
xwords4/wasm/wasmasm.h
View file

@ -23,6 +23,8 @@
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
typedef void (*StringProc)(void* closure, const char* str);
void set_stored_value(const char* key, const char* val); void set_stored_value(const char* key, const char* val);
bool get_stored_value(const char* key, char out[], size_t* len); bool get_stored_value(const char* key, char out[], size_t* len);
void remove_stored_value(const char* key); void remove_stored_value(const char* key);