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

Hans Leidekker : webservices: Implement WsGetCustomHeader.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 03a63781fa47d50a05e29c907d32817aba5e40df URL: http://source.winehq.org/git/wine.git/?a=commit;h=03a63781fa47d50a05e29c907… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 6 09:55:57 2017 +0200 webservices: Implement WsGetCustomHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 91 ++++++++++++++++++++++++++++++++++----- dlls/webservices/tests/msg.c | 68 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 149 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 6d61aa0..74c6fd1 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1081,23 +1081,16 @@ done: return hr; } -static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYPE value_type, - WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) +static HRESULT find_header( WS_XML_READER *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - const WS_XML_STRING *localname = get_header_name( type ); - const WS_XML_STRING *ns = get_addr_namespace( msg->version_addr ); - const WS_XML_ELEMENT_NODE *elem; const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; HRESULT hr; - if (!heap) heap = msg->heap; - if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; - if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; - for (;;) { - if ((hr = WsReadNode( msg->reader, NULL )) != S_OK) return hr; - if ((hr = WsGetReaderNode( msg->reader, &node, NULL )) != S_OK) return hr; + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if ((hr = WsGetReaderNode( reader, &node, NULL )) != S_OK) return hr; if (node->nodeType == WS_XML_NODE_TYPE_EOF) return WS_E_INVALID_FORMAT; if (node->nodeType != WS_XML_NODE_TYPE_ELEMENT) continue; @@ -1106,6 +1099,21 @@ static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYP WsXmlStringEquals( elem->ns, ns, NULL ) == S_OK) break; } + return S_OK; +} + +static HRESULT get_standard_header( struct msg *msg, WS_HEADER_TYPE type, WS_TYPE value_type, + WS_READ_OPTION option, WS_HEAP *heap, void *value, ULONG size ) +{ + const WS_XML_STRING *localname = get_header_name( type ); + const WS_XML_STRING *ns = get_addr_namespace( msg->version_addr ); + HRESULT hr; + + if (!heap) heap = msg->heap; + if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; + if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + + if ((hr = find_header( msg->reader, localname, ns )) != S_OK) return hr; return read_header( msg->reader, localname, ns, value_type, NULL, option, heap, value, size ); } @@ -1463,6 +1471,67 @@ done: return hr; } +static HRESULT get_custom_header( struct msg *msg, const WS_ELEMENT_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size ) +{ + HRESULT hr; + if (!heap) heap = msg->heap; + if (!msg->reader && (hr = WsCreateReader( NULL, 0, &msg->reader, NULL )) != S_OK) return hr; + if ((hr = WsSetInputToBuffer( msg->reader, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + + if ((hr = find_header( msg->reader, desc->elementLocalName, desc->elementNs )) != S_OK) return hr; + return read_header( msg->reader, desc->elementLocalName, desc->elementNs, desc->type, desc->typeDescription, + option, heap, value, size ); +} + +/************************************************************************** + * WsGetCustomHeader [webservices.@] + */ +HRESULT WINAPI WsGetCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *desc, + WS_REPEATING_HEADER_OPTION repeat_option, ULONG index, WS_READ_OPTION option, + WS_HEAP *heap, void *value, ULONG size, ULONG *attrs, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %p %08x %u %08x %p %p %u %p %p\n", handle, desc, repeat_option, index, option, heap, value, + size, attrs, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!msg || !desc || repeat_option < WS_REPEATING_HEADER || repeat_option > WS_SINGLETON_HEADER || + (repeat_option == WS_SINGLETON_HEADER && index)) return E_INVALIDARG; + + if (repeat_option == WS_REPEATING_HEADER) + { + FIXME( "repeating header not supported\n" ); + return E_NOTIMPL; + } + if (attrs) + { + FIXME( "attributes not supported\n" ); + return E_NOTIMPL; + } + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) + { + LeaveCriticalSection( &msg->cs ); + return WS_E_INVALID_OPERATION; + } + + hr = get_custom_header( msg, desc, option, heap, value, size ); + + LeaveCriticalSection( &msg->cs ); + return hr; +} + /************************************************************************** * WsRemoveCustomHeader [webservices.@] */ diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 4b33b55..d26293b 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1268,6 +1268,73 @@ static void test_WsGetHeader(void) WsFreeMessage( msg ); } +static void test_WsGetCustomHeader(void) +{ + static char expected[] = + "<Envelope><Header><Custom xmlns=\"ns\">value</Custom></Header><Body/></Envelope>"; + static WS_XML_STRING custom = {6, (BYTE *)"Custom"}, ns = {2, (BYTE *)"ns"}; + static WCHAR valueW[] = {'v','a','l','u','e',0}; + WS_ELEMENT_DESCRIPTION desc; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_MESSAGE *msg; + HRESULT hr; + struct header + { + const WCHAR *value; + } test; + + hr = WsGetCustomHeader( NULL, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_NONE, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, NULL, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct header); + s.alignment = TYPE_ALIGNMENT(struct header); + s.fields = fields; + s.fieldCount = 1; + + desc.elementLocalName = &custom; + desc.elementNs = &ns; + desc.type = WS_STRUCT_TYPE; + desc.typeDescription = &s; + + test.value = valueW; + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, 0, 0, __LINE__ ); + + hr = WsGetCustomHeader( msg, &desc, 0, 0, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 1, 0, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + memset( &test, 0, sizeof(test) ); + hr = WsGetCustomHeader( msg, &desc, WS_SINGLETON_HEADER, 0, WS_READ_REQUIRED_VALUE, NULL, &test, sizeof(test), + NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test.value != NULL, "value not set\n" ); + ok( !memcmp( test.value, valueW, sizeof(valueW) ), "wrong value\n" ); + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -1288,4 +1355,5 @@ START_TEST(msg) test_WsReadBody(); test_WsResetMessage(); test_WsGetHeader(); + test_WsGetCustomHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index b6f246c..3e77436 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -60,7 +60,7 @@ @ stdcall WsFreeServiceProxy(ptr) @ stdcall WsFreeWriter(ptr) @ stdcall WsGetChannelProperty(ptr long ptr long ptr) -@ stub WsGetCustomHeader +@ stdcall WsGetCustomHeader(ptr ptr long long long ptr ptr long ptr ptr) @ stdcall WsGetDictionary(long ptr ptr) @ stdcall WsGetErrorProperty(ptr long ptr long) @ stdcall WsGetErrorString(ptr long ptr)

1 0

Alexandre Julliard : wineandroid: Forward native window buffer management calls to the desktop process.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: f856e102f283ff6f55d338a0b69620b2c5b681b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f856e102f283ff6f55d338a0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:31:29 2017 +0200 wineandroid: Forward native window buffer management calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 443 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 437 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f856e102f283ff6f55d33…

1 0

Alexandre Julliard : wineandroid: Implement LOCK/UNLOCK perform() functions on top of the buffer management calls.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 1e46722c675f73e64009726ecdf857644416ba60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e46722c675f73e64009726ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:31:38 2017 +0200 wineandroid: Implement LOCK/UNLOCK perform() functions on top of the buffer management calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 9212562..fdcf24a 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -1210,7 +1210,58 @@ static int perform( ANativeWindow *window, int operation, ... ) break; } case NATIVE_WINDOW_LOCK: + { + struct ANativeWindowBuffer *buffer; + struct ANativeWindow_Buffer *buffer_ret = va_arg( args, ANativeWindow_Buffer * ); + ARect *bounds = va_arg( args, ARect * ); + int ret = window->dequeueBuffer_DEPRECATED( window, &buffer ); + if (!ret) + { + if (gralloc_module) + { + if ((ret = gralloc_module->lock( gralloc_module, buffer->handle, + GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN, + 0, 0, buffer->width, buffer->height, &buffer_ret->bits ))) + { + WARN( "gralloc->lock %p failed %d %s\n", win->hwnd, ret, strerror(-ret) ); + window->cancelBuffer( window, buffer, -1 ); + } + } + else + buffer_ret->bits = ((struct native_buffer_wrapper *)buffer)->bits; + } + if (!ret) + { + buffer_ret->width = buffer->width; + buffer_ret->height = buffer->height; + buffer_ret->stride = buffer->stride; + buffer_ret->format = buffer->format; + win->locked_buffer = buffer; + if (bounds) + { + bounds->left = 0; + bounds->top = 0; + bounds->right = buffer->width; + bounds->bottom = buffer->height; + } + } + va_end( args ); + TRACE( "hwnd %p %s bits %p ret %d %s\n", win->hwnd, names[operation], buffer_ret->bits, ret, strerror(-ret) ); + return ret; + } case NATIVE_WINDOW_UNLOCK_AND_POST: + { + int ret = -EINVAL; + if (win->locked_buffer) + { + if (gralloc_module) gralloc_module->unlock( gralloc_module, win->locked_buffer->handle ); + ret = window->queueBuffer( window, win->locked_buffer, -1 ); + win->locked_buffer = NULL; + } + va_end( args ); + TRACE( "hwnd %p %s ret %d\n", win->hwnd, names[operation], ret ); + return ret; + } case NATIVE_WINDOW_CONNECT: case NATIVE_WINDOW_DISCONNECT: TRACE( "hwnd %p %s\n", win->hwnd, names[operation] );

1 0

Alexandre Julliard : wineandroid: Implement window surfaces.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 7f92cbf520aa97a0dad34a6e70a811b7db6a8901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f92cbf520aa97a0dad34a6e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:32:37 2017 +0200 wineandroid: Implement window surfaces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 468 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 468 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f92cbf520aa97a0dad34…

1 0

Nikolay Sivov : inetcomm: Release previously set data (Valgrind).
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 5557081956bb698cf92bdfbabb1b9b44de61f617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5557081956bb698cf92bdfbab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 08:47:24 2017 +0300 inetcomm: Release previously set data (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 0ed7cef..e27c5c6 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1755,7 +1755,7 @@ static HRESULT WINAPI MimeBody_SetData( } if(This->data) - FIXME("release old data\n"); + release_data(&This->data_iid, This->data); This->data_iid = *riid; This->data = pvObject;

1 0

Nikolay Sivov : inetcomm: Implemented IMimeBody::GetClassID().
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: fe6367aed7dcd1e0122ef2f1a9ec7e83a9db4262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6367aed7dcd1e0122ef2f1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 08:47:25 2017 +0300 inetcomm: Implemented IMimeBody::GetClassID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 11 ++++++++--- dlls/inetcomm/tests/mimeole.c | 8 ++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index e27c5c6..f0e186c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -971,10 +971,15 @@ static HRESULT WINAPI MimeBody_GetClassID( CLSID* pClassID) { MimeBody *This = impl_from_IMimeBody(iface); - FIXME("(%p)->(%p) stub\n", This, pClassID); - return E_NOTIMPL; -} + TRACE("(%p)->(%p)\n", This, pClassID); + + if(!pClassID) + return E_INVALIDARG; + + *pClassID = IID_IMimeBody; + return S_OK; +} static HRESULT WINAPI MimeBody_IsDirty( IMimeBody* iface) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 13b7aba..4915f99 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -197,10 +197,18 @@ static void test_CreateBody(void) MIMEPARAMINFO *param_info; IMimeAllocator *alloc; BODYOFFSETS offsets; + CLSID clsid; hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + hr = IMimeBody_GetClassID(body, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetClassID(body, &clsid); + ok(hr == S_OK, "ret %08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IMimeBody), "got %s\n", wine_dbgstr_guid(&clsid)); + hr = IMimeBody_GetHandle(body, &handle); ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); ok(handle == NULL, "handle %p\n", handle);

1 0

Nikolay Sivov : inetcomm/tests: Return interface pointer for test stream.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: aca1636f2c837f7146f932c4da50f02e79e1b913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca1636f2c837f7146f932c4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 6 08:47:23 2017 +0300 inetcomm/tests: Return interface pointer for test stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 956a5b7..13b7aba 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -445,14 +445,14 @@ static const IStreamVtbl StreamVtbl = { Stream_Clone }; -static TestStream *create_test_stream(void) +static IStream *create_test_stream(void) { TestStream *stream; stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*stream)); stream->IStream_iface.lpVtbl = &StreamVtbl; stream->ref = 1; stream->pos = 0; - return stream; + return &stream->IStream_iface; } #define test_stream_read(a,b,c,d) _test_stream_read(__LINE__,a,b,c,d) @@ -474,8 +474,7 @@ static void _test_stream_read(unsigned line, IStream *stream, HRESULT exhres, co static void test_SetData(void) { - IStream *stream, *stream2; - TestStream *test_stream; + IStream *stream, *stream2, *test_stream; IMimeBody *body; HRESULT hr; @@ -492,7 +491,7 @@ static void test_SetData(void) IStream_Release(stream); test_stream = create_test_stream(); - hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, &test_stream->IStream_iface); + hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, test_stream); ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeBody_IsContentType(body, "text", "plain"); @@ -507,7 +506,7 @@ static void test_SetData(void) CHECK_CALLED(Stream_Stat); CHECK_CALLED(Stream_Seek_END); ok(hr == S_OK, "GetData failed %08x\n", hr); - ok(stream != &test_stream->IStream_iface, "unexpected stream\n"); + ok(stream != test_stream, "unexpected stream\n"); SET_EXPECT(Stream_Seek); SET_EXPECT(Stream_Read); @@ -538,7 +537,7 @@ static void test_SetData(void) IStream_Release(stream); IStream_Release(stream2); - IStream_Release(&test_stream->IStream_iface); + IStream_Release(test_stream); stream = create_stream_from_string(" \t\r\n|}~YWJj ZGV|}~mZw== \t"); /* "abcdefg" in base64 obscured by invalid chars */ hr = IMimeBody_SetData(body, IET_BASE64, "text", "plain", &IID_IStream, stream);

1 0

Alexandre Julliard : wineandroid: Load the gralloc module in all processes.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 6396f9f5229466230747e03b64ab711176e17d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6396f9f5229466230747e03b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:30:23 2017 +0200 wineandroid: Load the gralloc module in all processes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/init.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 3d9ac5a..bfdd697 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -107,4 +107,6 @@ int send_event( const union event_data *data ); extern JavaVM *wine_get_java_vm(void); extern jobject wine_get_java_object(void); +extern struct gralloc_module_t *gralloc_module; + #endif /* __WINE_ANDROID_H */ diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index ecf32ad..45117bc 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -402,6 +402,31 @@ static const JNINativeMethod methods[] = DECL_FUNCPTR( __android_log_print ); DECL_FUNCPTR( ANativeWindow_fromSurface ); DECL_FUNCPTR( ANativeWindow_release ); +DECL_FUNCPTR( hw_get_module ); + +struct gralloc_module_t *gralloc_module = NULL; + +static void load_hardware_libs(void) +{ + const struct hw_module_t *module; + void *libhardware; + char error[256]; + + if ((libhardware = wine_dlopen( "libhardware.so", RTLD_GLOBAL, error, sizeof(error) ))) + { + LOAD_FUNCPTR( libhardware, hw_get_module ); + } + else + { + ERR( "failed to load libhardware: %s\n", error ); + return; + } + + if (phw_get_module( GRALLOC_HARDWARE_MODULE_ID, &module ) == 0) + gralloc_module = (struct gralloc_module_t *)module; + else + ERR( "failed to load gralloc module\n" ); +} static void load_android_libs(void) { @@ -433,6 +458,8 @@ static BOOL process_attach(void) JNIEnv *jni_env; JavaVM *java_vm; + load_hardware_libs(); + if ((java_vm = wine_get_java_vm())) /* running under Java */ { #ifdef __i386__

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 1561aa35279309a083a3e725198d9d73500e1572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1561aa35279309a083a3e7251… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jun 6 08:52:03 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index d61f36d..30c06c4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-06-03 07:42+0300\n" +"PO-Revision-Date: 2017-06-06 08:51+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11771,10 +11771,8 @@ msgid "Expand" msgstr "Išskleisti" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Modifikuoti dvejetainius duomenis..." +msgstr "Modifikuoti &dvejetainius duomenis..." #: regedit.rc:266 msgid "Export registry"

1 0

Paul Gofman : d3dx9/tests: Initialize boolean constants with the inverse of expected result.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 6930679a906d2539ea3f3249896ccd85cf773789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6930679a906d2539ea3f32498… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:10 2017 +0300 d3dx9/tests: Initialize boolean constants with the inverse of expected result. 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index eaf1647..966f1bd 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4312,12 +4312,13 @@ static const BOOL test_effect_preshader_bconsts[] = static void test_effect_preshader_clear_pbool_consts(IDirect3DDevice9 *device) { - BOOL bval = FALSE; + BOOL bval; unsigned int i; HRESULT hr; for (i = 0; i < 16; ++i) { + bval = i < ARRAY_SIZE(test_effect_preshader_bconsts) ? !test_effect_preshader_bconsts[i] : FALSE; hr = IDirect3DDevice9_SetPixelShaderConstantB(device, i, &bval, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); } @@ -4357,7 +4358,7 @@ static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDire } else { - ok_(__FILE__, line)(!bdata[i], + ok_(__FILE__, line)(bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants updated unexpectedly, parameter %s.\n", updated_param); } }

1 0