diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2013-03-08 18:44:16 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-03-17 16:39:48 -0400 |
| commit | cb73bffed53128ed4f7a943e37c718b724199461 (patch) | |
| tree | 74047360c9e2c9925fe5629cff835608fa3fc5c2 /tests | |
| parent | e053a5625129bd11c301c9587f5f29cbda95c66d (diff) | |
client: Invoke new_id closure arguments as pointers instead of integers
This commit adds a flags parameter to wl_closure_invoke(). The so far
added flags are ment to specify if the invokation is client side or
server side. When on the server side, closure arguments of type 'new_id'
should be invoked as a integer id while on the client side they should
be invoked as a pointer to a proxy object.
This fixes a bug happening when the address of a client side 'new_id'
proxy object did not fit in a 32 bit integer.
krh: Squashed test suite compile fix from Jason Ekstrand.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/connection-test.c | 6 | ||||
| -rw-r--r-- | tests/os-wrappers-test.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/connection-test.c b/tests/connection-test.c index 1ac88d2..d5b3a99 100644 --- a/tests/connection-test.c +++ b/tests/connection-test.c @@ -338,7 +338,7 @@ demarshal(struct marshal_data *data, const char *format, closure = wl_connection_demarshal(data->read_connection, size, &objects, &message); assert(closure); - wl_closure_invoke(closure, &object, func, data); + wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, func, data); wl_closure_destroy(closure); } @@ -418,7 +418,7 @@ marshal_demarshal(struct marshal_data *data, object.id = msg[0]; closure = wl_connection_demarshal(data->read_connection, size, &objects, &message); - wl_closure_invoke(closure, &object, func, data); + wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, func, data); wl_closure_destroy(closure); } @@ -505,7 +505,7 @@ marshal_helper(const char *format, void *handler, ...) assert(closure); done = 0; - wl_closure_invoke(closure, &object, handler, &done); + wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, handler, &done); wl_closure_destroy(closure); assert(done); } diff --git a/tests/os-wrappers-test.c b/tests/os-wrappers-test.c index 515fd81..ce6fda6 100644 --- a/tests/os-wrappers-test.c +++ b/tests/os-wrappers-test.c @@ -252,7 +252,7 @@ marshal_demarshal(struct marshal_data *data, object.id = msg[0]; closure = wl_connection_demarshal(data->read_connection, size, &objects, &message); - wl_closure_invoke(closure, &object, func, data); + wl_closure_invoke(closure, WL_CLOSURE_INVOKE_SERVER, &object, func, data); wl_closure_destroy(closure); } |