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

Hugh McMaster : regedit: Add status bar text for adding a new expandable string value.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 6eef9a95540c25fddb426f0b1ba35a472eb0a21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eef9a95540c25fddb426f0b1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:32:59 2017 +0000 regedit: Add status bar text for adding a new expandable string value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 214 +++++++++++++++++++++++--------------------- po/bg.po | 214 +++++++++++++++++++++++--------------------- po/ca.po | 214 +++++++++++++++++++++++--------------------- po/cs.po | 214 +++++++++++++++++++++++--------------------- po/da.po | 214 +++++++++++++++++++++++--------------------- po/de.po | 214 +++++++++++++++++++++++--------------------- po/el.po | 212 ++++++++++++++++++++++--------------------- po/en.po | 212 ++++++++++++++++++++++--------------------- po/en_US.po | 212 ++++++++++++++++++++++--------------------- po/eo.po | 214 +++++++++++++++++++++++--------------------- po/es.po | 214 +++++++++++++++++++++++--------------------- po/fa.po | 212 ++++++++++++++++++++++--------------------- po/fi.po | 214 +++++++++++++++++++++++--------------------- po/fr.po | 214 +++++++++++++++++++++++--------------------- po/he.po | 214 +++++++++++++++++++++++--------------------- po/hi.po | 212 ++++++++++++++++++++++--------------------- po/hr.po | 212 ++++++++++++++++++++++--------------------- po/hu.po | 214 +++++++++++++++++++++++--------------------- po/it.po | 214 +++++++++++++++++++++++--------------------- po/ja.po | 214 +++++++++++++++++++++++--------------------- po/ko.po | 214 +++++++++++++++++++++++--------------------- po/lt.po | 214 +++++++++++++++++++++++--------------------- po/ml.po | 212 ++++++++++++++++++++++--------------------- po/nb_NO.po | 214 +++++++++++++++++++++++--------------------- po/nl.po | 214 +++++++++++++++++++++++--------------------- po/or.po | 212 ++++++++++++++++++++++--------------------- po/pa.po | 212 ++++++++++++++++++++++--------------------- po/pl.po | 214 +++++++++++++++++++++++--------------------- po/pt_BR.po | 214 +++++++++++++++++++++++--------------------- po/pt_PT.po | 214 +++++++++++++++++++++++--------------------- po/rm.po | 212 ++++++++++++++++++++++--------------------- po/ro.po | 214 +++++++++++++++++++++++--------------------- po/ru.po | 214 +++++++++++++++++++++++--------------------- po/sk.po | 214 +++++++++++++++++++++++--------------------- po/sl.po | 214 +++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 212 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 212 ++++++++++++++++++++++--------------------- po/sv.po | 214 +++++++++++++++++++++++--------------------- po/te.po | 212 ++++++++++++++++++++++--------------------- po/th.po | 212 ++++++++++++++++++++++--------------------- po/tr.po | 214 +++++++++++++++++++++++--------------------- po/uk.po | 214 +++++++++++++++++++++++--------------------- po/wa.po | 212 ++++++++++++++++++++++--------------------- po/wine.pot | 212 ++++++++++++++++++++++--------------------- po/zh_CN.po | 214 +++++++++++++++++++++++--------------------- po/zh_TW.po | 214 +++++++++++++++++++++++--------------------- programs/regedit/regedit.rc | 1 + 47 files changed, 5029 insertions(+), 4784 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eef9a95540c25fddb426…

1 0

Hugh McMaster : regedit: Add status bar text for the 'Modify Binary Data' menu item.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 63a2a07e86ae60b82a075e8be9cc94a43eee102a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a2a07e86ae60b82a075e8be… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:33:10 2017 +0000 regedit: Add status bar text for the 'Modify Binary Data' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 226 +++++++++++++++++++++++--------------------- po/bg.po | 226 +++++++++++++++++++++++--------------------- po/ca.po | 226 +++++++++++++++++++++++--------------------- po/cs.po | 226 +++++++++++++++++++++++--------------------- po/da.po | 226 +++++++++++++++++++++++--------------------- po/de.po | 226 +++++++++++++++++++++++--------------------- po/el.po | 224 ++++++++++++++++++++++--------------------- po/en.po | 224 ++++++++++++++++++++++--------------------- po/en_US.po | 224 ++++++++++++++++++++++--------------------- po/eo.po | 224 ++++++++++++++++++++++--------------------- po/es.po | 226 +++++++++++++++++++++++--------------------- po/fa.po | 224 ++++++++++++++++++++++--------------------- po/fi.po | 226 +++++++++++++++++++++++--------------------- po/fr.po | 226 +++++++++++++++++++++++--------------------- po/he.po | 226 +++++++++++++++++++++++--------------------- po/hi.po | 224 ++++++++++++++++++++++--------------------- po/hr.po | 224 ++++++++++++++++++++++--------------------- po/hu.po | 226 +++++++++++++++++++++++--------------------- po/it.po | 226 +++++++++++++++++++++++--------------------- po/ja.po | 226 +++++++++++++++++++++++--------------------- po/ko.po | 226 +++++++++++++++++++++++--------------------- po/lt.po | 226 +++++++++++++++++++++++--------------------- po/ml.po | 224 ++++++++++++++++++++++--------------------- po/nb_NO.po | 226 +++++++++++++++++++++++--------------------- po/nl.po | 226 +++++++++++++++++++++++--------------------- po/or.po | 224 ++++++++++++++++++++++--------------------- po/pa.po | 224 ++++++++++++++++++++++--------------------- po/pl.po | 226 +++++++++++++++++++++++--------------------- po/pt_BR.po | 226 +++++++++++++++++++++++--------------------- po/pt_PT.po | 226 +++++++++++++++++++++++--------------------- po/rm.po | 224 ++++++++++++++++++++++--------------------- po/ro.po | 226 +++++++++++++++++++++++--------------------- po/ru.po | 226 +++++++++++++++++++++++--------------------- po/sk.po | 224 ++++++++++++++++++++++--------------------- po/sl.po | 226 +++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 224 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 224 ++++++++++++++++++++++--------------------- po/sv.po | 226 +++++++++++++++++++++++--------------------- po/te.po | 224 ++++++++++++++++++++++--------------------- po/th.po | 224 ++++++++++++++++++++++--------------------- po/tr.po | 226 +++++++++++++++++++++++--------------------- po/uk.po | 226 +++++++++++++++++++++++--------------------- po/wa.po | 224 ++++++++++++++++++++++--------------------- po/wine.pot | 224 ++++++++++++++++++++++--------------------- po/zh_CN.po | 226 +++++++++++++++++++++++--------------------- po/zh_TW.po | 226 +++++++++++++++++++++++--------------------- programs/regedit/regedit.rc | 1 + 47 files changed, 5301 insertions(+), 5060 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63a2a07e86ae60b82a075…

1 0

Nikolay Sivov : mf: Added MFCreateTopology and stub IMFTopology implementation.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 8323871f55dcfe87dd987c666c6f2dd041fe213a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8323871f55dcfe87dd987c666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 09:56:27 2017 +0300 mf: Added MFCreateTopology and stub IMFTopology implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/mf/Makefile.in | 4 +- dlls/mf/mf.spec | 2 +- dlls/mf/tests/Makefile.in | 5 + dlls/mf/tests/mf.c | 49 +++++ dlls/mf/topology.c | 523 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 8 files changed, 586 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8323871f55dcfe87dd987…

1 0

Alexandre Julliard : wineandroid: Create a pseudo-device to handle ioctl calls.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 481e9ff8ba7e20731f4597c5c08e1cbeed1baa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481e9ff8ba7e20731f4597c5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:39:20 2017 +0200 wineandroid: Create a pseudo-device to handle ioctl calls. This will allow using ioctls to perform operations in the context of the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/android.h | 7 +++ dlls/wineandroid.drv/device.c | 132 +++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 4 files changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index f83d494..f03f09a 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,7 +1,8 @@ MODULE = wineandroid.drv -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 ntoskrnl C_SRCS = \ + device.c \ init.c \ window.c diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 9fefb11..9cafe26 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -44,6 +44,13 @@ DECL_FUNCPTR( __android_log_print ); /************************************************************************** + * Android pseudo-device + */ + +extern void start_android_device(void) DECLSPEC_HIDDEN; + + +/************************************************************************** * USER driver */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c new file mode 100644 index 0000000..3180d69 --- /dev/null +++ b/dlls/wineandroid.drv/device.c @@ -0,0 +1,132 @@ +/* + * Android pseudo-device handling + * + * Copyright 2014-2017 Alexandre Julliard + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <errno.h> +#include <stdio.h> +#include <stdarg.h> +#include <sys/ioctl.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "android.h" +#include "wine/library.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(android); + +extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); +static HANDLE stop_event; +static HANDLE thread; +static JNIEnv *jni_env; + +#ifdef __i386__ +static WORD orig_fs, java_fs; +#endif /* __i386__ */ + +static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static NTSTATUS CALLBACK init_android_driver( DRIVER_OBJECT *driver, UNICODE_STRING *name ) +{ + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + static const WCHAR device_linkW[] = {'\\','?','?','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + + UNICODE_STRING nameW, linkW; + DEVICE_OBJECT *device; + NTSTATUS status; + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ioctl_callback; + + RtlInitUnicodeString( &nameW, device_nameW ); + RtlInitUnicodeString( &linkW, device_linkW ); + + if ((status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) return status; + return IoCreateSymbolicLink( &linkW, &nameW ); +} + +static DWORD CALLBACK device_thread( void *arg ) +{ + static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + + HANDLE start_event = arg; + UNICODE_STRING nameW; + NTSTATUS status; + JavaVM *java_vm; + DWORD ret; + + TRACE( "starting process %x\n", GetCurrentProcessId() ); + + if (!(java_vm = wine_get_java_vm())) return 0; /* not running under Java */ + +#ifdef __i386__ + orig_fs = wine_get_fs(); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + java_fs = wine_get_fs(); + wine_set_fs( orig_fs ); + if (java_fs != orig_fs) TRACE( "%%fs changed from %04x to %04x by Java VM\n", orig_fs, java_fs ); +#else + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); +#endif + + RtlInitUnicodeString( &nameW, driver_nameW ); + if ((status = IoCreateDriver( &nameW, init_android_driver ))) + { + FIXME( "failed to create driver error %x\n", status ); + return status; + } + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + SetEvent( start_event ); + + ret = wine_ntoskrnl_main_loop( stop_event ); + + (*java_vm)->DetachCurrentThread( java_vm ); + return ret; +} + +void start_android_device(void) +{ + HANDLE handles[2]; + + handles[0] = CreateEventW( NULL, TRUE, FALSE, NULL ); + handles[1] = thread = CreateThread( NULL, 0, device_thread, handles[0], 0, NULL ); + WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); + CloseHandle( handles[0] ); +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index cf35215..971fd56 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -307,6 +307,7 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) if (hwnd == GetDesktopWindow()) { init_event_queue(); + start_android_device(); } return TRUE; }

1 0

Alexandre Julliard : wineandroid: Create the top-level view on desktop window creation.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 4123bbdd84059ba69c6ef22757ccbc336a7ae47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4123bbdd84059ba69c6ef2275… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:40:29 2017 +0200 wineandroid: Create the top-level view on desktop window creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 47 ++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/device.c | 42 +++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index b0a8541..3696493 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -22,11 +22,14 @@ package org.winehq.wine; import android.app.Activity; import android.app.ProgressDialog; +import android.content.Context; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.util.Log; +import android.view.View; +import android.view.ViewGroup; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -42,6 +45,7 @@ import java.util.Map; public class WineActivity extends Activity { private native String wine_init( String[] cmdline, String[] env ); + public native void wine_desktop_changed( int width, int height ); private final String LOGTAG = "wine"; private ProgressDialog progress_dialog; @@ -263,4 +267,47 @@ public class WineActivity extends Activity progress_dialog.incrementProgressBy( 1 ); }}); } } + + // The top-level desktop view group + + protected class TopView extends ViewGroup + { + private int desktop_hwnd; + + public TopView( Context context, int hwnd ) + { + super( context ); + desktop_hwnd = hwnd; + } + + @Override + protected void onSizeChanged( int width, int height, int old_width, int old_height ) + { + Log.i( LOGTAG, String.format( "desktop size %dx%d", width, height )); + wine_desktop_changed( width, height ); + } + + @Override + protected void onLayout( boolean changed, int left, int top, int right, int bottom ) + { + // nothing to do + } + } + + protected TopView top_view; + + // Entry points for the device driver + + public void create_desktop_window( int hwnd ) + { + Log.i( LOGTAG, String.format( "create desktop view %08x", hwnd )); + top_view = new TopView( this, hwnd ); + setContentView( top_view ); + progress_dialog.dismiss(); + } + + public void createDesktopWindow( final int hwnd ) + { + runOnUiThread( new Runnable() { public void run() { create_desktop_window( hwnd ); }} ); + } } diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 3180d69..f565534 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -48,10 +48,48 @@ static HANDLE stop_event; static HANDLE thread; static JNIEnv *jni_env; -#ifdef __i386__ +#ifdef __i386__ /* the Java VM uses %fs for its own purposes, so we need to wrap the calls */ static WORD orig_fs, java_fs; +static inline void wrap_java_call(void) { wine_set_fs( java_fs ); } +static inline void unwrap_java_call(void) { wine_set_fs( orig_fs ); } +#else +static inline void wrap_java_call(void) { } +static inline void unwrap_java_call(void) { } #endif /* __i386__ */ +static jobject load_java_method( jmethodID *method, const char *name, const char *args ) +{ + jobject object = wine_get_java_object(); + + if (!*method) + { + jclass class; + + wrap_java_call(); + class = (*jni_env)->GetObjectClass( jni_env, object ); + *method = (*jni_env)->GetMethodID( jni_env, class, name, args ); + unwrap_java_call(); + if (!*method) + { + FIXME( "method %s not found\n", name ); + return NULL; + } + } + return object; +} + +static void create_desktop_window( HWND hwnd ) +{ + static jmethodID method; + jobject object; + + if (!(object = load_java_method( &method, "createDesktopWindow", "(I)V" ))) return; + + wrap_java_call(); + (*jni_env)->CallVoidMethod( jni_env, object, method, HandleToLong( hwnd )); + unwrap_java_call(); +} + static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -105,6 +143,8 @@ static DWORD CALLBACK device_thread( void *arg ) (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); #endif + create_desktop_window( GetDesktopWindow() ); + RtlInitUnicodeString( &nameW, driver_nameW ); if ((status = IoCreateDriver( &nameW, init_android_driver ))) {

1 0

Alexandre Julliard : wineandroid: Wait until we receive the desktop size before proceeding with startup.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: bcd99f5c370a85998dfc7ac3650d96c298e79c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd99f5c370a85998dfc7ac36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:41:05 2017 +0200 wineandroid: Wait until we receive the desktop size before proceeding with startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 3 ++- dlls/wineandroid.drv/window.c | 41 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 3 +++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 3696493..cc43bbe 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -70,7 +70,6 @@ public class WineActivity extends Activity Locale.getDefault().getCountry() + ".UTF-8"; copyAssetFiles(); - runOnUiThread( new Runnable() { public void run() { progress_dialog.dismiss(); }}); HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); @@ -96,6 +95,8 @@ public class WineActivity extends Activity log.delete(); } + createProgressDialog( 0, "Setting up the Windows environment..." ); + System.load( libdir.toString() + "/libwine.so" ); prefix.mkdirs(); diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 971fd56..ba9f3b4 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -282,6 +282,28 @@ static int process_events( DWORD mask ) /*********************************************************************** + * wait_events + */ +static int wait_events( int timeout ) +{ + assert( GetCurrentThreadId() == desktop_tid ); + + for (;;) + { + struct pollfd pollfd; + int ret; + + pollfd.fd = event_pipe[0]; + pollfd.events = POLLIN | POLLHUP; + ret = poll( &pollfd, 1, timeout ); + if (ret == -1 && errno == EINTR) continue; + if (ret && (pollfd.revents & (POLLHUP | POLLERR))) ret = -1; + return ret; + } +} + + +/*********************************************************************** * ANDROID_MsgWaitForMultipleObjectsEx */ DWORD CDECL ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, @@ -411,3 +433,22 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag TRACE( "win %p window %s client %s style %08x flags %08x\n", hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), new_style, swp_flags ); } + + +/*********************************************************************** + * ANDROID_create_desktop + */ +BOOL CDECL ANDROID_create_desktop( UINT width, UINT height ) +{ + /* wait until we receive the surface changed event */ + while (!screen_width) + { + if (wait_events( 2000 ) != 1) + { + ERR( "wait timed out\n" ); + break; + } + process_events( QS_ALLINPUT ); + } + return TRUE; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 49402a8..84ed7fd 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -11,3 +11,6 @@ @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged + +# Desktop +@ cdecl wine_create_desktop(long long) ANDROID_create_desktop

1 0

Alexandre Julliard : wineandroid: Add Java callbacks for creating and destroying a window.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 347699d77392cc7c7a3b7e4db427692ec696a543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347699d77392cc7c7a3b7e4db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:42:42 2017 +0200 wineandroid: Add Java callbacks for creating and destroying a window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 56 +++++++++++ dlls/wineandroid.drv/android.h | 2 + dlls/wineandroid.drv/device.c | 171 ++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/window.c | 7 ++ 4 files changed, 234 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=347699d77392cc7c7a3b7…

1 0

Alexandre Julliard : wineandroid: Notify Java also when a window is forcefully destroyed.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: d05f4f586753cfd59261adef6b668bd75d8c35b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f4f586753cfd59261adef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:44:26 2017 +0200 wineandroid: Notify Java also when a window is forcefully destroyed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index d889c8d..61f76bf 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -305,6 +305,20 @@ static int wait_events( int timeout ) } +static WNDPROC desktop_orig_wndproc; + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_PARENTNOTIFY: + if (LOWORD(wp) == WM_DESTROY) destroy_ioctl_window( (HWND)lp ); + break; + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + + /*********************************************************************** * ANDROID_MsgWaitForMultipleObjectsEx */ @@ -334,7 +348,8 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) init_event_queue(); start_android_device(); - + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( hwnd, GWLP_WNDPROC, + (LONG_PTR)desktop_wndproc_wrapper ); if (!(data = alloc_win_data( hwnd ))) return FALSE; release_win_data( data ); }

1 0

Nikolay Sivov : include: Added CreateSymbolicLink() flag.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: f6b8ce109c0e14baba5f1adb335b5c74041c8cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b8ce109c0e14baba5f1adb3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 11:17:02 2017 +0300 include: Added CreateSymbolicLink() flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 67c29b5..1347f8c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1682,6 +1682,9 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define PROC_THREAD_ATTRIBUTE_ALL_APPLICATION_PACKAGES_POLICY (ProcThreadAttributeAllApplicationPackagesPolicy | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_WIN32K_FILTER (ProcThreadAttributeWin32kFilter | PROC_THREAD_ATTRIBUTE_INPUT) +#define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) +#define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);

1 0

Jacek Caban : urlmon/tests: Get rid of debug leftovers.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 2e05a814ff27938fe919ce07657c0f825a922528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e05a814ff27938fe919ce076… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 1 15:11:50 2017 +0200 urlmon/tests: Get rid of debug leftovers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5981c25..1e6fa36 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1332,21 +1332,6 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB memcpy(data, post_data, sizeof(post_data)); U(pbindinfo->stgmedData).hGlobal = data; }else { - IStream *post_stream; - HGLOBAL data; - HRESULT hres; - - if(0) { - /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly */ - data = GlobalAlloc(GPTR, sizeof(post_data)); - memcpy(data, post_data, sizeof(post_data)); - U(pbindinfo->stgmedData).hGlobal = data; - - hres = CreateStreamOnHGlobal(data, FALSE, &post_stream); - ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); - - U(pbindinfo->stgmedData).pstm =post_stream;/* &Stream; */ - } U(pbindinfo->stgmedData).pstm = &Stream; } }

1 0