June 2017 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 2a3ad1d2098a2b0e462a362e4f689de11868da90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a3ad1d2098a2b0e462a362e4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:08 2017 +0300 d3dx9/tests: Factor out test_effect_preshader_clear_pbool_consts() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index bcb526e..ad9c553 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4305,6 +4305,19 @@ got (%g, %g, %g, %g), parameter %s.\n", } } +static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) +{ + BOOL bval = FALSE; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 16; ++i) + { + hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + } +} + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fvect_p[] = @@ -4368,12 +4381,9 @@ static void test_effect_preshader(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetPixelShaderConstantF(device, i, &fvect_filler.x, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); } - bval = FALSE; - for (i = 0; i < 16; ++i) - { - hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - } + + test_effect_preshader_clear_pbool_consts(device); + for (i = 0; i < 16; ++i) { hr = IDirect3DDevice9_SetPixelShaderConstantI(device, i, ivect_empty, 1);

1 0

Paul Gofman : d3dx9: Limit constant size by register count instead of table size.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: ef22e6f0da81fef00a63cd80079804a51029ff99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef22e6f0da81fef00a63cd800… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:05 2017 +0300 d3dx9: Limit constant size by register count instead of table size. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index aaf3961..cc103f5 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1070,14 +1070,15 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int *in; unsigned int offset; - offset = start_offset + i * info.major_stride + j; - if (get_reg_offset(table, offset) >= rs->table_sizes[table]) + offset = i * info.major_stride + j; + if (get_reg_offset(table, offset) >= const_set->register_count) { if (table != PRES_REGTAB_OBCONST) - FIXME("Output offset exceeds table size, name %s, component %u.\n", + FIXME("Output offset exceeds regiser count, name %s, component %u.\n", debugstr_a(param->name), i); break; } + offset += start_offset; if (info.transpose) param_offset = i + j * info.major; else

1 0

Francois Gouget : wined3d: Add a trailing newline to an ERR() message.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 2dc2db772c9b89741d4941b4f7e4946682720671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc2db772c9b89741d4941b4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:41:08 2017 +0200 wined3d: Add a trailing newline to an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 9ff2c9c..54ddc23 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -291,7 +291,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) && !strcmp(buffer,"enabled")) { - ERR_(winediag)("\"StrictDrawOrdering\" is deprecated, please use \"csmt\" instead."); + ERR_(winediag)("\"StrictDrawOrdering\" is deprecated, please use \"csmt\" instead.\n"); TRACE("Enforcing strict draw ordering.\n"); wined3d_settings.strict_draw_ordering = TRUE; }

1 0

Michael Müller : wined3d: Implement WINED3D_QUERY_TYPE_PIPELINE_STATISTICS.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: f52ead4b4d8ef30689df3e7da408f6dc5417e63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52ead4b4d8ef30689df3e7da… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jun 5 00:47:34 2017 +0200 wined3d: Implement WINED3D_QUERY_TYPE_PIPELINE_STATISTICS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/context.c | 58 +++++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/query.c | 227 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 39 +++++++ include/wine/wined3d.h | 15 +++ 8 files changed, 343 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f52ead4b4d8ef30689df3…

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetPort.
by Alexandre Julliard June 5, 2017

June 5, 2017

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 WSDCreateUdpAddress tests.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 30b356337384ca38b00c4273d278a73054233bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b356337384ca38b00c4273d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:37 2017 +0100 wsdapi/tests: Add WSDCreateUdpAddress tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 1 + dlls/wsdapi/tests/address.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 77434cf..a4a2821 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 user32 C_SRCS = \ + address.c \ discovery.c \ memory.c \ xml.c diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c new file mode 100644 index 0000000..8b16b06 --- /dev/null +++ b/dlls/wsdapi/tests/address.c @@ -0,0 +1,82 @@ +/* + * Web Services on Devices + * Address tests + * + * Copyright 2017 Owen Rudge 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 + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "objbase.h" +#include "wsdapi.h" + +static void CreateUdpAddress_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL, *udpAddress2 = NULL; + IWSDTransportAddress *transportAddress = NULL; + IWSDAddress *address = NULL; + IUnknown *unknown; + HRESULT rc; + ULONG ref; + + rc = WSDCreateUdpAddress(NULL); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08x\n", rc); + + 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 to query for objects */ + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDUdpAddress, (LPVOID*)&udpAddress2); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDUdpAddress_Release(udpAddress2); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDTransportAddress, (LPVOID*)&transportAddress); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDTransportAddress_Release(transportAddress); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDAddress, (LPVOID*)&address); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDAddress_Release(address); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IUnknown, (LPVOID*)&unknown); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + + if (rc == S_OK) + IUnknown_Release(unknown); + + ref = IWSDUdpAddress_Release(udpAddress); + ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); +} + +START_TEST(address) +{ + CoInitialize(NULL); + + CreateUdpAddress_tests(); + + CoUninitialize(); +}

1 0

Alexandre Julliard : wineandroid: Forward native window query() calls to the desktop process.
by Alexandre Julliard June 5, 2017

June 5, 2017

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 June 5, 2017

June 5, 2017

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 June 5, 2017

June 5, 2017

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 June 5, 2017

June 5, 2017

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