wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Francois Gouget : wmvcore/tests: Make test_profile_manager_interfaces() static.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: bc54489ba6d41b993bee6857deead74dd766f34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc54489ba6d41b993bee6857d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:38:44 2017 +0200 wmvcore/tests: Make test_profile_manager_interfaces() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 51ff9dc..a190013 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -183,7 +183,7 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } -void test_profile_manager_interfaces(void) +static void test_profile_manager_interfaces(void) { HRESULT hr; IWMProfileManager *profile;

1 0

Francois Gouget : odbccp32/tests: Make test_SQLInstallTranslatorEx() static.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 522385f619f025fba360ca4e158640da7be2d3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522385f619f025fba360ca4e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:39:05 2017 +0200 odbccp32/tests: Make test_SQLInstallTranslatorEx() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 8e119e0..4a72ad0 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -530,7 +530,7 @@ if (0) /* Crashes on XP. */ ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } -void test_SQLInstallTranslatorEx(void) +static void test_SQLInstallTranslatorEx(void) { char path[MAX_PATH]; char syspath[MAX_PATH];

1 0

Alexandre Julliard : wineandroid: Forward native window setSwapInterval() calls to the desktop process.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e441e85db94b2380e2e652c1c8332f64152b1b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e441e85db94b2380e2e652c1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:59 2017 +0200 wineandroid: Forward native window setSwapInterval() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 7b4e348..344e0c3 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -58,6 +58,7 @@ enum android_ioctl IOCTL_WINDOW_POS_CHANGED, IOCTL_QUERY, IOCTL_PERFORM, + IOCTL_SET_SWAP_INT, NB_IOCTLS }; @@ -68,6 +69,7 @@ struct native_win_data HWND hwnd; int api; int buffer_format; + int swap_interval; }; /* wrapper for a native window in the context of the client (non-Java) process */ @@ -120,6 +122,12 @@ struct ioctl_android_perform int args[4]; }; +struct ioctl_android_set_swap_interval +{ + struct ioctl_header hdr; + int interval; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -207,6 +215,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR wrap_java_call(); if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); + win->setSwapInterval( win, data->swap_interval ); unwrap_java_call(); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); @@ -474,6 +483,25 @@ static NTSTATUS perform_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_ return android_error_to_status( ret ); } +static NTSTATUS setSwapInterval_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_set_swap_interval *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + win_data->swap_interval = res->interval; + + if (!(parent = win_data->parent)) return STATUS_SUCCESS; + wrap_java_call(); + ret = parent->setSwapInterval( parent, res->interval ); + unwrap_java_call(); + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -482,6 +510,7 @@ static const ioctl_func ioctl_funcs[] = windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ query_ioctl, /* IOCTL_QUERY */ perform_ioctl, /* IOCTL_PERFORM */ + setSwapInterval_ioctl, /* IOCTL_SET_SWAP_INT */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -662,7 +691,13 @@ static int queueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeW static int setSwapInterval( struct ANativeWindow *window, int interval ) { - return 0; + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_set_swap_interval swap; + + TRACE( "hwnd %p interval %d\n", win->hwnd, interval ); + swap.hdr.hwnd = HandleToLong( win->hwnd ); + swap.interval = interval; + return android_ioctl( IOCTL_SET_SWAP_INT, &swap, sizeof(swap), NULL, NULL ); } static int query( const ANativeWindow *window, int what, int *value )

1 0

Alexandre Julliard : wineandroid: Forward native window perform() calls to the desktop process.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 4c1f541c13b38d9523753afb9e2ddb2f5431f7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1f541c13b38d9523753afb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:40 2017 +0200 wineandroid: Forward native window perform() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 182 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 48b595f..7b4e348 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -57,6 +57,7 @@ enum android_ioctl IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, IOCTL_QUERY, + IOCTL_PERFORM, NB_IOCTLS }; @@ -65,6 +66,8 @@ struct native_win_data { struct ANativeWindow *parent; HWND hwnd; + int api; + int buffer_format; }; /* wrapper for a native window in the context of the client (non-Java) process */ @@ -110,6 +113,13 @@ struct ioctl_android_query int value; }; +struct ioctl_android_perform +{ + struct ioctl_header hdr; + int operation; + int args[4]; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -171,6 +181,8 @@ static struct native_win_data *create_native_win_data( HWND hwnd ) } if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return NULL; data->hwnd = hwnd; + data->api = NATIVE_WINDOW_API_CPU; + data->buffer_format = PF_BGRA_8888; data_map[idx] = data; return data; } @@ -193,7 +205,8 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (win) { wrap_java_call(); - win->perform( win, NATIVE_WINDOW_API_CONNECT, NATIVE_WINDOW_API_CPU ); + if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); + win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); unwrap_java_call(); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); @@ -374,6 +387,93 @@ static NTSTATUS query_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PT return android_error_to_status( ret ); } +static NTSTATUS perform_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_perform *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret = -ENOENT; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + + switch (res->operation) + { + case NATIVE_WINDOW_SET_BUFFERS_FORMAT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->buffer_format = res->args[0]; + break; + case NATIVE_WINDOW_API_CONNECT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->api = res->args[0]; + break; + case NATIVE_WINDOW_API_DISCONNECT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->api = 0; + break; + case NATIVE_WINDOW_SET_USAGE: + case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM: + case NATIVE_WINDOW_SET_SCALING_MODE: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFER_COUNT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, (size_t)res->args[0] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS: + case NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0], res->args[1] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0], res->args[1], res->args[2] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] | ((int64_t)res->args[1] << 32) ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_CONNECT: + case NATIVE_WINDOW_DISCONNECT: + case NATIVE_WINDOW_UNLOCK_AND_POST: + wrap_java_call(); + ret = parent->perform( parent, res->operation ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_CROP: + { + android_native_rect_t rect; + rect.left = res->args[0]; + rect.top = res->args[1]; + rect.right = res->args[2]; + rect.bottom = res->args[3]; + wrap_java_call(); + ret = parent->perform( parent, res->operation, &rect ); + unwrap_java_call(); + break; + } + case NATIVE_WINDOW_LOCK: + default: + FIXME( "unsupported perform op %d\n", res->operation ); + break; + } + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -381,6 +481,7 @@ static const ioctl_func ioctl_funcs[] = destroyWindow_ioctl, /* IOCTL_DESTROY_WINDOW */ windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ query_ioctl, /* IOCTL_QUERY */ + perform_ioctl, /* IOCTL_PERFORM */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -581,7 +682,84 @@ static int query( const ANativeWindow *window, int what, int *value ) static int perform( ANativeWindow *window, int operation, ... ) { - return 0; + static const char * const names[] = + { + "SET_USAGE", "CONNECT", "DISCONNECT", "SET_CROP", "SET_BUFFER_COUNT", "SET_BUFFERS_GEOMETRY", + "SET_BUFFERS_TRANSFORM", "SET_BUFFERS_TIMESTAMP", "SET_BUFFERS_DIMENSIONS", "SET_BUFFERS_FORMAT", + "SET_SCALING_MODE", "LOCK", "UNLOCK_AND_POST", "API_CONNECT", "API_DISCONNECT", + "SET_BUFFERS_USER_DIMENSIONS", "SET_POST_TRANSFORM_CROP" + }; + + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_perform perf; + va_list args; + + perf.hdr.hwnd = HandleToLong( win->hwnd ); + perf.operation = operation; + memset( perf.args, 0, sizeof(perf.args) ); + + va_start( args, operation ); + switch (operation) + { + case NATIVE_WINDOW_SET_USAGE: + case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM: + case NATIVE_WINDOW_SET_BUFFERS_FORMAT: + case NATIVE_WINDOW_SET_SCALING_MODE: + case NATIVE_WINDOW_API_CONNECT: + case NATIVE_WINDOW_API_DISCONNECT: + perf.args[0] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %d\n", win->hwnd, names[operation], perf.args[0] ); + break; + case NATIVE_WINDOW_SET_BUFFER_COUNT: + perf.args[0] = va_arg( args, size_t ); + TRACE( "hwnd %p %s count %d\n", win->hwnd, names[operation], perf.args[0] ); + break; + case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS: + case NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS: + perf.args[0] = va_arg( args, int ); + perf.args[1] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %dx%d\n", win->hwnd, names[operation], perf.args[0], perf.args[1] ); + break; + case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY: + perf.args[0] = va_arg( args, int ); + perf.args[1] = va_arg( args, int ); + perf.args[2] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %dx%d %d\n", win->hwnd, names[operation], + perf.args[0], perf.args[1], perf.args[2] ); + break; + case NATIVE_WINDOW_SET_CROP: + { + android_native_rect_t *rect = va_arg( args, android_native_rect_t * ); + perf.args[0] = rect->left; + perf.args[1] = rect->top; + perf.args[2] = rect->right; + perf.args[3] = rect->bottom; + TRACE( "hwnd %p %s rect %d,%d-%d,%d\n", win->hwnd, names[operation], + perf.args[0], perf.args[1], perf.args[2], perf.args[3] ); + break; + } + case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP: + { + int64_t timestamp = va_arg( args, int64_t ); + perf.args[0] = timestamp; + perf.args[1] = timestamp >> 32; + TRACE( "hwnd %p %s arg %08x%08x\n", win->hwnd, names[operation], perf.args[1], perf.args[0] ); + break; + } + case NATIVE_WINDOW_LOCK: + case NATIVE_WINDOW_UNLOCK_AND_POST: + case NATIVE_WINDOW_CONNECT: + case NATIVE_WINDOW_DISCONNECT: + TRACE( "hwnd %p %s\n", win->hwnd, names[operation] ); + break; + case NATIVE_WINDOW_SET_POST_TRANSFORM_CROP: + default: + FIXME( "unsupported perform hwnd %p op %d %s\n", win->hwnd, operation, + operation < sizeof(names)/sizeof(names[0]) ? names[operation] : "???" ); + break; + } + va_end( args ); + return android_ioctl( IOCTL_PERFORM, &perf, sizeof(perf), NULL, NULL ); } struct ANativeWindow *create_ioctl_window( HWND hwnd )

1 0

Alexandre Julliard : wineandroid: Forward native window query() calls to the desktop process.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: f69836eba907653b581a0ea7287ee4a74bef489a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69836eba907653b581a0ea72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:27 2017 +0200 wineandroid: Forward native window query() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 64 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index e6ddc50..48b595f 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -56,6 +56,7 @@ enum android_ioctl IOCTL_CREATE_WINDOW, IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, + IOCTL_QUERY, NB_IOCTLS }; @@ -102,6 +103,13 @@ struct ioctl_android_window_pos_changed int owner; }; +struct ioctl_android_query +{ + struct ioctl_header hdr; + int what; + int value; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -197,6 +205,29 @@ void register_native_window( HWND hwnd, struct ANativeWindow *win ) NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, 0 ); } +static NTSTATUS android_error_to_status( int err ) +{ + switch (err) + { + case 0: return STATUS_SUCCESS; + case -ENOMEM: return STATUS_NO_MEMORY; + case -ENOSYS: return STATUS_NOT_SUPPORTED; + case -EINVAL: return STATUS_INVALID_PARAMETER; + case -ENOENT: return STATUS_INVALID_HANDLE; + case -EPERM: return STATUS_ACCESS_DENIED; + case -ENODEV: return STATUS_NO_SUCH_DEVICE; + case -EEXIST: return STATUS_DUPLICATE_NAME; + case -EPIPE: return STATUS_PIPE_DISCONNECTED; + case -ENODATA: return STATUS_NO_MORE_FILES; + case -ETIMEDOUT: return STATUS_IO_TIMEOUT; + case -EBADMSG: return STATUS_INVALID_DEVICE_REQUEST; + case -EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; + default: + FIXME( "unmapped error %d\n", err ); + return STATUS_UNSUCCESSFUL; + } +} + static int status_to_android_error( NTSTATUS status ) { switch (status) @@ -323,12 +354,33 @@ static NTSTATUS windowPosChanged_ioctl( void *data, DWORD in_size, DWORD out_siz return STATUS_SUCCESS; } +static NTSTATUS query_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_query *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + if (out_size < sizeof(*res)) return STATUS_BUFFER_OVERFLOW; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + + *ret_size = sizeof( *res ); + wrap_java_call(); + ret = parent->query( parent, res->what, &res->value ); + unwrap_java_call(); + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { createWindow_ioctl, /* IOCTL_CREATE_WINDOW */ destroyWindow_ioctl, /* IOCTL_DESTROY_WINDOW */ windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ + query_ioctl, /* IOCTL_QUERY */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -514,7 +566,17 @@ static int setSwapInterval( struct ANativeWindow *window, int interval ) static int query( const ANativeWindow *window, int what, int *value ) { - return 0; + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_query query; + DWORD size = sizeof( query ); + int ret; + + query.hdr.hwnd = HandleToLong( win->hwnd ); + query.what = what; + ret = android_ioctl( IOCTL_QUERY, &query, sizeof(query), &query, &size ); + TRACE( "hwnd %p what %d got %d -> %p\n", win->hwnd, what, query.value, value ); + if (!ret) *value = query.value; + return ret; } static int perform( ANativeWindow *window, int operation, ... )

1 0

Alexandre Julliard : wineandroid: Allocate a native window wrapper in the client process for every window.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: fbc482db1d011887468d11ef2fbac99e50af04a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc482db1d011887468d11ef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:21:26 2017 +0200 wineandroid: Allocate a native window wrapper in the client process for every window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 4 +- dlls/wineandroid.drv/device.c | 114 ++++++++++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/window.c | 5 +- 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index f03671a..3d9ac5a 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -53,7 +53,9 @@ DECL_FUNCPTR( ANativeWindow_release ); extern void start_android_device(void) DECLSPEC_HIDDEN; extern void register_native_window( HWND hwnd, struct ANativeWindow *win ) DECLSPEC_HIDDEN; -extern void create_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct ANativeWindow *create_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; +extern void release_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; extern void destroy_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; extern int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, UINT style, UINT flags, diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 3dacd48..e6ddc50 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -66,6 +66,14 @@ struct native_win_data HWND hwnd; }; +/* wrapper for a native window in the context of the client (non-Java) process */ +struct native_win_wrapper +{ + struct ANativeWindow win; + HWND hwnd; + LONG ref; +}; + struct ioctl_header { int hwnd; @@ -452,14 +460,118 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void return status_to_android_error( status ); } -void create_ioctl_window( HWND hwnd ) +static void win_incRef( struct android_native_base_t *base ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)base; + InterlockedIncrement( &win->ref ); +} + +static void win_decRef( struct android_native_base_t *base ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)base; + InterlockedDecrement( &win->ref ); +} + +static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer **buffer, int *fence ) +{ + return 0; +} + +static int cancelBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fence ) +{ + return 0; +} + +static int queueBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fence ) +{ + return 0; +} + +static int dequeueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer **buffer ) +{ + return 0; +} + +static int cancelBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; +} + +static int lockBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; /* nothing to do */ +} + +static int queueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; +} + +static int setSwapInterval( struct ANativeWindow *window, int interval ) +{ + return 0; +} + +static int query( const ANativeWindow *window, int what, int *value ) +{ + return 0; +} + +static int perform( ANativeWindow *window, int operation, ... ) +{ + return 0; +} + +struct ANativeWindow *create_ioctl_window( HWND hwnd ) { struct ioctl_android_create_window req; + struct native_win_wrapper *win = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*win) ); HWND parent = GetAncestor( hwnd, GA_PARENT ); + if (!win) return NULL; + + win->win.common.magic = ANDROID_NATIVE_WINDOW_MAGIC; + win->win.common.version = sizeof(ANativeWindow); + win->win.common.incRef = win_incRef; + win->win.common.decRef = win_decRef; + win->win.setSwapInterval = setSwapInterval; + win->win.dequeueBuffer_DEPRECATED = dequeueBuffer_DEPRECATED; + win->win.lockBuffer_DEPRECATED = lockBuffer_DEPRECATED; + win->win.queueBuffer_DEPRECATED = queueBuffer_DEPRECATED; + win->win.query = query; + win->win.perform = perform; + win->win.cancelBuffer_DEPRECATED = cancelBuffer_DEPRECATED; + win->win.dequeueBuffer = dequeueBuffer; + win->win.queueBuffer = queueBuffer; + win->win.cancelBuffer = cancelBuffer; + win->ref = 1; + win->hwnd = hwnd; + TRACE( "-> %p %p\n", win, win->hwnd ); + req.hdr.hwnd = HandleToLong( hwnd ); req.parent = parent == GetDesktopWindow() ? 0 : HandleToLong( parent ); android_ioctl( IOCTL_CREATE_WINDOW, &req, sizeof(req), NULL, NULL ); + + return &win->win; +} + +struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + InterlockedIncrement( &win->ref ); + return window; +} + +void release_ioctl_window( struct ANativeWindow *window ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + + if (InterlockedDecrement( &win->ref ) > 0) return; + + TRACE( "%p %p\n", win, win->hwnd ); + + destroy_ioctl_window( win->hwnd ); + HeapFree( GetProcessHeap(), 0, win ); } void destroy_ioctl_window( HWND hwnd ) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 49520eb..65b37d8 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -57,6 +57,7 @@ struct android_win_data RECT window_rect; /* USER window rectangle relative to parent */ RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ + ANativeWindow *window; /* native window wrapper that forwards calls to the desktop process */ }; #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) @@ -88,7 +89,7 @@ static struct android_win_data *alloc_win_data( HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->hwnd = hwnd; - create_ioctl_window( hwnd ); + data->window = create_ioctl_window( hwnd ); EnterCriticalSection( &win_data_section ); win_data_context[context_idx(hwnd)] = data; } @@ -103,7 +104,7 @@ static void free_win_data( struct android_win_data *data ) { win_data_context[context_idx( data->hwnd )] = NULL; LeaveCriticalSection( &win_data_section ); - destroy_ioctl_window( data->hwnd ); + if (data->window) release_ioctl_window( data->window ); HeapFree( GetProcessHeap(), 0, data ); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetSockaddr.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 5b57a6a52fc5935f4c9b10b90383bc97d467f6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b57a6a52fc5935f4c9b10b90… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:52 2017 +0100 wsdapi/tests: Add tests for Get/SetSockaddr. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index c3112f4..fefc253 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -22,6 +22,7 @@ #define COBJMACROS #include <winsock2.h> +#include <ws2tcpip.h> #include <windows.h> #include "wine/test.h" @@ -221,6 +222,135 @@ static void GetSetMessageType_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); } +static void GetSetSockaddr_udp_tests(void) +{ + SOCKADDR_STORAGE storage1, storage2; + SOCKADDR_STORAGE returnedStorage; + struct sockaddr_in6 *sockAddr6Ptr; + struct sockaddr_in *sockAddrPtr; + IWSDUdpAddress *udpAddress = NULL; + LPCWSTR returnedAddress = NULL; + char addressBuffer[MAX_PATH]; + WSADATA wsaData; + WORD port = 0; + HRESULT rc; + int ret; + + const char *ipv4Address = "1.2.3.4"; + const short ipv4Port = 1234; + const WCHAR expectedIpv4TransportAddr[] = {'1','.','2','.','3','.','4',':','1','2','3','4',0}; + + const char *ipv6Address = "2a00:1234:5678:dead:beef::aaaa"; + const short ipv6Port = 2345; + const WCHAR expectedIpv6TransportAddr[] = {'[','2','a','0','0',':','1','2','3','4',':','5','6','7','8',':','d','e','a','d',':', + 'b','e','e','f',':',':','a','a','a','a',']',':','2','3','4','5',0}; + + ZeroMemory(&storage1, sizeof(SOCKADDR_STORAGE)); + ZeroMemory(&storage2, sizeof(SOCKADDR_STORAGE)); + ZeroMemory(&returnedStorage, sizeof(SOCKADDR_STORAGE)); + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == E_FAIL, "GetSockaddr returned unexpected result: %08x\n", rc); + + /* Try setting a transport address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, expectedIpv6TransportAddr); + todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + + /* A socket address should be returned */ + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + todo_wine ok(returnedStorage.ss_family == AF_INET6, "returnedStorage.ss_family != AF_INET6 (%d)\n", returnedStorage.ss_family); + + sockAddr6Ptr = (struct sockaddr_in6 *) &returnedStorage; + + /* Windows however doesn't set the port number */ + ok(sockAddr6Ptr->sin6_port == 0, "returnedStorage.sin6_port != 0 (%d)\n", sockAddr6Ptr->sin6_port); + + todo_wine ok(inet_ntop(returnedStorage.ss_family, &sockAddr6Ptr->sin6_addr, addressBuffer, MAX_PATH) != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + todo_wine ok(strcmp(addressBuffer, ipv6Address) == 0, "returnedStorage.sin6_addr != '%s' ('%s')\n", ipv6Address, addressBuffer); + + /* Release the object and create a new one */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* Try setting an IPv4 address */ + sockAddrPtr = (struct sockaddr_in *) &storage1; + sockAddrPtr->sin_family = AF_INET; + sockAddrPtr->sin_port = htons(ipv4Port); + + ret = inet_pton(AF_INET, ipv4Address, &sockAddrPtr->sin_addr); + ok(ret == 1, "inet_pton(ipv4) failed: %d\n", WSAGetLastError()); + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + + todo_wine ok(returnedStorage.ss_family == storage1.ss_family, "returnedStorage.ss_family != storage1.ss_family (%d)\n", returnedStorage.ss_family); + todo_wine ok(memcmp(&returnedStorage, &storage1, sizeof(struct sockaddr_in)) == 0, "returnedStorage != storage1\n"); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + + /* Check that GetPort doesn't return the port set via the socket */ + rc = IWSDUdpAddress_GetPort(udpAddress, &port); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(port == 0, "GetPort returned unexpected port: %d\n", port); + + /* Try setting an IPv6 address */ + sockAddr6Ptr = (struct sockaddr_in6 *) &storage2; + sockAddr6Ptr->sin6_family = AF_INET6; + sockAddr6Ptr->sin6_port = htons(ipv6Port); + + ret = inet_pton(AF_INET6, ipv6Address, &sockAddr6Ptr->sin6_addr); + ok(ret == 1, "inet_pton(ipv6) failed: %d\n", WSAGetLastError()); + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + + todo_wine ok(returnedStorage.ss_family == storage2.ss_family, "returnedStorage.ss_family != storage2.ss_family (%d)\n", returnedStorage.ss_family); + todo_wine ok(memcmp(&returnedStorage, &storage2, sizeof(struct sockaddr_in6)) == 0, "returnedStorage != storage2\n"); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + + /* Check that GetPort doesn't return the port set via the socket */ + rc = IWSDUdpAddress_GetPort(udpAddress, &port); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(port == 0, "GetPort returned unexpected port: %d\n", port); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(address) { CoInitialize(NULL); @@ -229,6 +359,7 @@ START_TEST(address) GetSetTransportAddress_udp_tests(); GetSetPort_udp_tests(); GetSetMessageType_udp_tests(); + GetSetSockaddr_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetMessageType.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 529688312128647dd372f1cefe4645e6c9e819d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529688312128647dd372f1cef… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:49 2017 +0100 wsdapi/tests: Add tests for Get/SetMessageType. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 74a1c12..c3112f4 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -180,6 +180,47 @@ static void GetSetPort_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); } +static void GetSetMessageType_udp_tests(void) +{ + WSDUdpMessageType expectedMessageType1 = TWO_WAY; + WSDUdpMessageType expectedMessageType2 = ONE_WAY; + WSDUdpMessageType actualMessageType = 0; + IWSDUdpAddress *udpAddress = NULL; + HRESULT rc; + int ret; + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(actualMessageType == 0, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Try setting a message type */ + rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType1); + todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + todo_wine ok(actualMessageType == expectedMessageType1, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Set another one */ + rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType2); + todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(actualMessageType == expectedMessageType2, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); +} + START_TEST(address) { CoInitialize(NULL); @@ -187,6 +228,7 @@ START_TEST(address) CreateUdpAddress_tests(); GetSetTransportAddress_udp_tests(); GetSetPort_udp_tests(); + GetSetMessageType_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetPort.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d0291c272692896def11e65ac73b849a10739268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0291c272692896def11e65ac… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:44 2017 +0100 wsdapi/tests: Add tests for Get/SetPort. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index c1bf3ba..74a1c12 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -132,12 +132,61 @@ static void GetSetTransportAddress_udp_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void GetSetPort_udp_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL; + WORD expectedPort1 = 12345; + WORD expectedPort2 = 8080; + WORD actualPort = 0; + HRESULT rc; + int ret; + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* No test for GetPort(NULL) as this causes an access violation exception on Windows */ + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); + + /* Try setting a zero port */ + rc = IWSDUdpAddress_SetPort(udpAddress, 0); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); + + /* Set a real port */ + rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort1); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + todo_wine ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); + + /* Now set a different port */ + rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort2); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + todo_wine ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); +} + START_TEST(address) { CoInitialize(NULL); CreateUdpAddress_tests(); GetSetTransportAddress_udp_tests(); + GetSetPort_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetTransportAddress.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: a4ee1b2675074b795054c6174b27a3ae11c2c42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee1b2675074b795054c6174… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:40 2017 +0100 wsdapi/tests: Add tests for Get/SetTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/address.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index a4a2821..e2f6642 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 user32 +IMPORTS = wsdapi ole32 user32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 8b16b06..c1bf3ba 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <winsock2.h> #include <windows.h> #include "wine/test.h" @@ -72,11 +73,71 @@ static void CreateUdpAddress_tests(void) ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); } +static void GetSetTransportAddress_udp_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL; + const WCHAR ipv4Address[] = {'1','0','.','2','0','.','3','0','.','4','0',0}; + const WCHAR ipv6Address[] = {'a','a','b','b',':','c','d',':',':','a','b','c',0}; + const WCHAR invalidAddress[] = {'n','o','t','/','v','a','l','i','d',0}; + LPCWSTR returnedAddress = NULL; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); + + /* Try setting a null address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + /* Try setting an invalid address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, invalidAddress); + todo_wine ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + + /* Try setting an IPv4 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Try setting an IPv6 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(address) { CoInitialize(NULL); CreateUdpAddress_tests(); + GetSetTransportAddress_udp_tests(); CoUninitialize(); }

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
60
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 June 2017