wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Alexandre Julliard : wineandroid: Update the contents when we receive a new surface from Java.
by Alexandre Julliard 06 Jun '17

06 Jun '17

Module: wine Branch: master Commit: 20c627d58cb8f08aad0e086dd73760ecad987986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c627d58cb8f08aad0e086dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 6 08:33:09 2017 +0200 wineandroid: Update the contents when we receive a new surface from Java. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 5 +++++ dlls/wineandroid.drv/device.c | 2 ++ dlls/wineandroid.drv/window.c | 30 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 4 files changed, 38 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index bfdd697..3c2500e 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -71,6 +71,11 @@ extern unsigned int screen_height DECLSPEC_HIDDEN; extern RECT virtual_screen_rect DECLSPEC_HIDDEN; extern MONITORINFOEXW default_monitor DECLSPEC_HIDDEN; +enum android_window_messages +{ + WM_ANDROID_REFRESH = 0x80001000, +}; + extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; /* JNI entry points */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index fdcf24a..1af59be 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -433,6 +433,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (!data || data->parent == win) { if (win) pANativeWindow_release( win ); + if (data && win) PostMessageW( hwnd, WM_ANDROID_REFRESH, 0, 0 ); TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win ); return; } @@ -446,6 +447,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); win->setSwapInterval( win, data->swap_interval ); unwrap_java_call(); + PostMessageW( hwnd, WM_ANDROID_REFRESH, 0, 0 ); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 64333cb..203492a 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -977,6 +977,36 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag } +/********************************************************************** + * ANDROID_WindowMessage + */ +LRESULT CDECL ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + struct android_win_data *data; + + switch (msg) + { + case WM_ANDROID_REFRESH: + if ((data = get_win_data( hwnd ))) + { + struct window_surface *surface = data->surface; + if (surface) + { + surface->funcs->lock( surface ); + *surface->funcs->get_bounds( surface ) = surface->rect; + surface->funcs->unlock( surface ); + if (is_argb_surface( surface )) surface->funcs->flush( surface ); + } + release_win_data( data ); + } + return 0; + default: + FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); + return 0; + } +} + + /*********************************************************************** * ANDROID_create_desktop */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 84ed7fd..7379458 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx +@ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

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

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: 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: 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

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

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: 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

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

Piotr Caban : msvcrt: Use temp directory when creating file in tmpfile.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e4c9a2ec81b8029876d588e09587db40ab65ee69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c9a2ec81b8029876d588e09… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 5 18:15:30 2017 +0200 msvcrt: Use temp directory when creating file in tmpfile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c31ce77..7c8a0b5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4970,7 +4970,7 @@ MSVCRT_wchar_t * CDECL MSVCRT__wtmpnam(MSVCRT_wchar_t *s) */ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) { - char *filename = MSVCRT_tmpnam(NULL); + char *filename = MSVCRT__tempnam(",", "t"); int fd; MSVCRT_FILE* file = NULL;

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
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