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

Hugh McMaster : reg/tests: Add tests for deleting registry values during the import operation.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 80d248c5f989f9ce3319ffbab4ac8d2d1e016fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d248c5f989f9ce3319ffbab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:12 2017 +0000 reg/tests: Add tests for deleting registry values during the import operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4dd8817..58e003a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1687,6 +1687,40 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test value deletion. We start by creating some registry values. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine46e\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + todo_wine verify_reg_nonexist(hkey, "Wine46b"); + todo_wine verify_reg_nonexist(hkey, "Wine46c"); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2541,6 +2575,41 @@ static void test_import(void) todo_wine verify_key_nonexist(hkey, "Subkey2a"); todo_wine verify_key_nonexist(hkey, "Subkey2b"); + /* Test value deletion. We start by creating some registry values. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine46e\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + todo_wine verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine46a"); + todo_wine verify_reg_nonexist(hkey, "Wine46b"); + todo_wine verify_reg_nonexist(hkey, "Wine46c"); + todo_wine verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg_nonexist(hkey, "Wine46e"); + todo_wine verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Alexandre Julliard : explorer: Allow the driver to override the desktop winproc at creation time.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: e6fdea726a2016ce712d335e2b3d90eb3327dc48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fdea726a2016ce712d335e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:08:04 2017 +0200 explorer: Allow the driver to override the desktop winproc at creation time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4088dd4..a2d9e1a 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -978,8 +978,8 @@ void manage_desktop( WCHAR *arg ) CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); + using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN),

1 0

Alexandre Julliard : wineandroid: Properly clean up windows that aren' t destroyed explicitly.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: c339d7214c2a86592c01a3b4932d498acb237417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c339d7214c2a86592c01a3b49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:08:15 2017 +0200 wineandroid: Properly clean up windows that aren't destroyed explicitly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 ++ dlls/wineandroid.drv/window.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index f12de98..428e79c 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -314,7 +314,9 @@ public class WineActivity extends Activity public void destroy() { Log.i( LOGTAG, String.format( "destroy hwnd %08x", hwnd )); + if (visible && window_view != null) top_view.removeView( window_view ); visible = false; + window_view = null; win_map.remove( this ); } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index e3fd865..a663505 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -828,8 +828,6 @@ 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 ); } @@ -1214,6 +1212,9 @@ LRESULT CDECL ANDROID_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) */ BOOL CDECL ANDROID_create_desktop( UINT width, UINT height ) { + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), GWLP_WNDPROC, + (LONG_PTR)desktop_wndproc_wrapper ); + /* wait until we receive the surface changed event */ while (!screen_width) {

1 0

Alexandre Julliard : wineandroid: Implement SetCapture and store the capture window in the desktop process for global captures.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: b0690b13da5d4d8f120241068338e259e48cb913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0690b13da5d4d8f120241068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:08:40 2017 +0200 wineandroid: Implement SetCapture and store the capture window in the desktop process for global captures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/device.c | 37 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 10 +++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 4 files changed, 50 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index f3dd019..3d1a676 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -61,6 +61,7 @@ extern int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const R const RECT *visible_rect, UINT style, UINT flags, HWND after, HWND owner ) DECLSPEC_HIDDEN; extern int ioctl_set_window_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; +extern int ioctl_set_capture( HWND hwnd ) DECLSPEC_HIDDEN; /************************************************************************** @@ -77,6 +78,7 @@ enum android_window_messages WM_ANDROID_REFRESH = 0x80001000, }; +extern HWND get_capture_window(void) DECLSPEC_HIDDEN; 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 eafaf04..3829e69 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -52,6 +52,7 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; static HANDLE thread; static JNIEnv *jni_env; +static HWND capture_window; #define ANDROIDCONTROLTYPE ((ULONG)'A') #define ANDROID_IOCTL(n) CTL_CODE(ANDROIDCONTROLTYPE, n, METHOD_BUFFERED, FILE_READ_ACCESS) @@ -68,6 +69,7 @@ enum android_ioctl IOCTL_QUERY, IOCTL_PERFORM, IOCTL_SET_SWAP_INT, + IOCTL_SET_CAPTURE, NB_IOCTLS }; @@ -195,6 +197,11 @@ struct ioctl_android_set_window_parent int parent; }; +struct ioctl_android_set_capture +{ + struct ioctl_header hdr; +}; + static inline BOOL is_in_desktop_process(void) { return thread != NULL; @@ -407,6 +414,7 @@ static void free_native_win_data( struct native_win_data *data ) { unsigned int idx = data_map_idx( data->hwnd ); + InterlockedCompareExchangePointer( (void **)&capture_window, 0, data->hwnd ); release_native_window( data ); HeapFree( GetProcessHeap(), 0, data ); data_map[idx] = NULL; @@ -465,6 +473,12 @@ void register_native_window( HWND hwnd, struct ANativeWindow *win ) NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, 0 ); } +/* get the capture window stored in the desktop process */ +HWND get_capture_window(void) +{ + return capture_window; +} + static NTSTATUS android_error_to_status( int err ) { switch (err) @@ -861,6 +875,20 @@ static NTSTATUS setWindowParent_ioctl( void *data, DWORD in_size, DWORD out_size return STATUS_SUCCESS; } +static NTSTATUS setCapture_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_set_capture *res = data; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (res->hdr.hwnd && !get_ioctl_native_win_data( &res->hdr )) return STATUS_INVALID_HANDLE; + + TRACE( "hwnd %08x\n", res->hdr.hwnd ); + + InterlockedExchangePointer( (void **)&capture_window, LongToHandle( res->hdr.hwnd )); + return STATUS_SUCCESS; +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -874,6 +902,7 @@ static const ioctl_func ioctl_funcs[] = query_ioctl, /* IOCTL_QUERY */ perform_ioctl, /* IOCTL_PERFORM */ setSwapInterval_ioctl, /* IOCTL_SET_SWAP_INT */ + setCapture_ioctl, /* IOCTL_SET_CAPTURE */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -1395,3 +1424,11 @@ int ioctl_set_window_parent( HWND hwnd, HWND parent ) req.parent = parent == GetDesktopWindow() ? 0 : HandleToLong( parent ); return android_ioctl( IOCTL_SET_WINDOW_PARENT, &req, sizeof(req), NULL, NULL ); } + +int ioctl_set_capture( HWND hwnd ) +{ + struct ioctl_android_set_capture req; + + req.hdr.hwnd = HandleToLong( hwnd ); + return android_ioctl( IOCTL_SET_CAPTURE, &req, sizeof(req), NULL, NULL ); +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index a663505..a8a1623 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1034,6 +1034,16 @@ void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) /*********************************************************************** + * ANDROID_SetCapture + */ +void CDECL ANDROID_SetCapture( HWND hwnd, UINT flags ) +{ + if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; + ioctl_set_capture( hwnd ); +} + + +/*********************************************************************** * ANDROID_SetWindowStyle */ void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 3605241..f893299 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 SetCapture(long long) ANDROID_SetCapture @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetParent(long long long) ANDROID_SetParent @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn

1 0

Alexandre Julliard : wineandroid: Add support for mouse events.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: db742a49c9efdaecbb44bc3d4bdf5e78757f30f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db742a49c9efdaecbb44bc3d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 10:16:41 2017 +0200 wineandroid: Add support for mouse events. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 39 +++++++++++ dlls/wineandroid.drv/android.h | 10 +++ dlls/wineandroid.drv/init.c | 1 + dlls/wineandroid.drv/window.c | 115 +++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db742a49c9efdaecbb44b…

1 0

Alexandre Julliard : Revert "winetest: Let the scripts autodetect the work directory."
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: tools Branch: master Commit: 80227edd9887f6ca1bde397ec9199298ec41bcaf URL: http://source.winehq.org/git/tools.git/?a=commit;h=80227edd9887f6ca1bde397e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 16:17:34 2017 +0200 Revert "winetest: Let the scripts autodetect the work directory." This reverts commit c9170c8554a3837712b40f529c56165bbbc9f347. It doesn't work with the Apache configuration on the WineHQ server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/INSTALL.txt | 1 + winetest/build-errors | 10 ++-------- winetest/build-index | 13 +++---------- winetest/dissect | 13 +++---------- winetest/gather | 14 ++++---------- winetest/winetest.conf | 2 ++ 6 files changed, 15 insertions(+), 38 deletions(-) diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index b10788c..d13d1cf 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -32,6 +32,7 @@ Read-only source code account: should be available as $HOME/tools/winetest/INSTALL.txt). git clone git://source.winehq.org/git/tools.git - Edit $HOME/tools/winetest/winetest.conf to set: + $workdir = "/home/winehq/sites/winetest"; $gitdir = "/home/wine/wine.git"; Web site account: diff --git a/winetest/build-errors b/winetest/build-errors index f41824f..2d25ae3 100755 --- a/winetest/build-errors +++ b/winetest/build-errors @@ -33,7 +33,8 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } - +use vars qw/$workdir/; +require "winetest.conf"; my $name0=$0; $name0 =~ s+^.*/++; @@ -62,13 +63,6 @@ sub long_date($) # Generate a table of the errors encountered during processing # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} chdir($workdir) or die "could not chdir to the work directory: $!"; my @errors; diff --git a/winetest/build-index b/winetest/build-index index dc413cd..dcd9795 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -34,7 +34,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -62,11 +62,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "data/$build"; + utime $date, $date, "$workdir/data/$build"; } else { - $date = (stat "data/$build")[9]; + $date = (stat "$workdir/data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -113,13 +113,6 @@ my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \% # Grab the build list and archive the old results # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} chdir($workdir) or die "could not chdir to the work directory: $!"; my @builds; diff --git a/winetest/dissect b/winetest/dissect index 1e4a5fe..99e50fb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -48,7 +48,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; +use vars qw/$workdir $gitdir $gitweb $maxmult $maxuserskips $maxfailedtests $maxfilesize $acceptprediluvianwin/; require "winetest.conf"; my $name0=$0; @@ -81,11 +81,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "data/$build"; + utime $date, $date, "$workdir/data/$build"; } else { - $date = (stat "data/$build")[9]; + $date = (stat "$workdir/data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -105,13 +105,6 @@ sub short_date($) # Command line processing # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} chdir($workdir) or die "could not chdir to the work directory: $!"; my ($update, $report); diff --git a/winetest/gather b/winetest/gather index 28227a3..94f3541 100755 --- a/winetest/gather +++ b/winetest/gather @@ -45,7 +45,7 @@ sub BEGIN } unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); } -use vars qw/$gitdir $gitweb/; +use vars qw/$workdir $gitdir $gitweb/; require "winetest.conf"; my $name0=$0; @@ -76,11 +76,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "data/$build"; + utime $date, $date, "$workdir/data/$build"; } else { - $date = (stat "data/$build")[9]; + $date = (stat "$workdir/data/$build")[9]; $subject = ""; } return ($date, $subject); @@ -175,13 +175,7 @@ my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k # Pick a build to work on # -require Cwd; -my $workdir = Cwd::cwd(); -if (!-f "$workdir/report.css") -{ - error("'$workdir' is not a valid work directory\n"); - exit 2; -} + chdir($workdir) or die "could not chdir to the work directory: $!"; my ($outdated,undef) = glob "data/*/outdated"; diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 0d35d11..ba15514 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -1,5 +1,7 @@ # Hey Emacs! This is a -*-cperl-*- file! +$workdir = "/home/winehq/opt/winetest"; + $gitdir = "/home/winehq/opt/source/git/wine.git"; $gitweb = "//source.winehq.org/git/wine.git";

1 0

Alexandre Julliard : Revert "winetest: Get the work directory directly from the web server."
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: tools Branch: master Commit: 02c466dd9c3f8cefdbf7f03cfca1f2fce99e4eae URL: http://source.winehq.org/git/tools.git/?a=commit;h=02c466dd9c3f8cefdbf7f03c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 16:18:01 2017 +0200 Revert "winetest: Get the work directory directly from the web server." This reverts commit 0708ab216e005ae740a5346ca6ae1bb308cbe6a5. It doesn't work with the Apache configuration on the WineHQ server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/vhost_winetest.conf | 1 - winetest/winetest.cgi | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf index 6d72ccc..797aac3 100644 --- a/winetest/vhost_winetest.conf +++ b/winetest/vhost_winetest.conf @@ -17,7 +17,6 @@ BEGIN { unshift @INC, "/home/wine/tools/winetest"; - $::workdir = "/home/winehq/sites/winetest"; } </Perl> diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index a2aebef..9a4ad71 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -18,7 +18,7 @@ use strict; use warnings; -use vars qw/$maxfilesize/; +use vars qw/$workdir $maxfilesize/; BEGIN { require "winetest.conf"; @@ -29,7 +29,7 @@ use File::Temp qw(tempdir); use CGI qw(:standard); # Cater for some overhead $CGI::POST_MAX = $maxfilesize + 1024; -$ENV{TMPDIR} = "$::workdir/queue"; +$ENV{TMPDIR} = "$workdir/queue"; my $name = param ("reportfile"); my $error = cgi_error (); @@ -47,7 +47,7 @@ sub move_file($) { my ($filename) = @_; my $orig = tmpFileName($filename); - my $tmpdir = tempdir ("repXXXXX", DIR => "$::workdir/queue"); + my $tmpdir = tempdir ("repXXXXX", DIR => "$workdir/queue"); chmod 0777, $tmpdir; chmod 0666&~umask, $orig; my $size = -s $orig;

1 0

Alexandre Julliard : wineandroid: Implement UpdateLayeredWindow.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: d1b5f7594601abe577ef162c2352266c8a0a87bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b5f7594601abe577ef162c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:26:57 2017 +0200 wineandroid: Implement UpdateLayeredWindow. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 86 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 87 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index ef849f8..f5d2e4f 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1056,6 +1056,92 @@ void CDECL ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alp } +/***************************************************************************** + * ANDROID_UpdateLayeredWindow + */ +BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, + const RECT *window_rect ) +{ + struct window_surface *surface; + struct android_win_data *data; + BLENDFUNCTION blend = { AC_SRC_OVER, 0, 255, 0 }; + COLORREF color_key = (info->dwFlags & ULW_COLORKEY) ? info->crKey : CLR_INVALID; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + void *src_bits, *dst_bits; + RECT rect; + HDC hdc = 0; + HBITMAP dib; + BOOL ret = FALSE; + + if (!(data = get_win_data( hwnd ))) return FALSE; + + rect = *window_rect; + OffsetRect( &rect, -window_rect->left, -window_rect->top ); + + surface = data->surface; + if (!is_argb_surface( surface )) + { + if (surface) window_surface_release( surface ); + surface = NULL; + } + + if (!surface || memcmp( &surface->rect, &rect, sizeof(RECT) )) + { + data->surface = create_surface( data->hwnd, &rect, 255, color_key, TRUE ); + if (surface) window_surface_release( surface ); + surface = data->surface; + } + else set_surface_layered( surface, 255, color_key ); + + if (surface) window_surface_add_ref( surface ); + release_win_data( data ); + + if (!surface) return FALSE; + if (!info->hdcSrc) + { + window_surface_release( surface ); + return TRUE; + } + + dst_bits = surface->funcs->get_info( surface, bmi ); + + if (!(dib = CreateDIBSection( info->hdcDst, bmi, DIB_RGB_COLORS, &src_bits, NULL, 0 ))) goto done; + if (!(hdc = CreateCompatibleDC( 0 ))) goto done; + + SelectObject( hdc, dib ); + + surface->funcs->lock( surface ); + + if (info->prcDirty) + { + IntersectRect( &rect, &rect, info->prcDirty ); + memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); + PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); + } + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, + rect.left + (info->pptSrc ? info->pptSrc->x : 0), + rect.top + (info->pptSrc ? info->pptSrc->y : 0), + rect.right - rect.left, rect.bottom - rect.top, + (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); + if (ret) + { + memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); + add_bounds_rect( surface->funcs->get_bounds( surface ), &rect ); + } + + surface->funcs->unlock( surface ); + surface->funcs->flush( surface ); + +done: + window_surface_release( surface ); + if (hdc) DeleteDC( hdc ); + if (dib) DeleteObject( dib ); + return ret; +} + + /********************************************************************** * ANDROID_WindowMessage */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 8a6e72d..6445bab 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -12,6 +12,7 @@ @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle +@ cdecl UpdateLayeredWindow(long ptr ptr) ANDROID_UpdateLayeredWindow @ 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 ShowWindow to put icons off-screen.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: b6a00bc0eb595aeec9c9b4f044ce8c259e5cc8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a00bc0eb595aeec9c9b4f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:27:16 2017 +0200 wineandroid: Implement ShowWindow to put icons off-screen. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 17 +++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 18 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f5d2e4f..94f23e0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -999,6 +999,23 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag /*********************************************************************** + * ANDROID_ShowWindow + */ +UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) +{ + if (IsRectEmpty( rect )) return swp; + if (!IsIconic( hwnd )) return swp; + /* always hide icons off-screen */ + if (rect->left != -32000 || rect->top != -32000) + { + OffsetRect( rect, -32000 - rect->left, -32000 - rect->top ); + swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); + } + return swp; +} + + +/*********************************************************************** * ANDROID_SetWindowStyle */ void CDECL ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 6445bab..ed3138a 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -12,6 +12,7 @@ @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle +@ cdecl ShowWindow(long long ptr long) ANDROID_ShowWindow @ cdecl UpdateLayeredWindow(long ptr ptr) ANDROID_UpdateLayeredWindow @ cdecl WindowMessage(long long long long) ANDROID_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging

1 0

Alexandre Julliard : wineandroid: Implement SetParent and forward it to Java.
by Alexandre Julliard 07 Jun '17

07 Jun '17

Module: wine Branch: master Commit: be285af54fc5dcbd8a3f47fa5f60240451a88692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be285af54fc5dcbd8a3f47fa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 7 11:27:54 2017 +0200 wineandroid: Implement SetParent and forward it to Java. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 26 +++++++++++++++++++++ dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/device.c | 39 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 18 ++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 5 files changed, 85 insertions(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 50ff0bf..f12de98 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -337,6 +337,20 @@ public class WineActivity extends Activity visible = (style & WS_VISIBLE) != 0; } + public void set_parent( WineWindow new_parent ) + { + Log.i( LOGTAG, String.format( "set parent hwnd %08x parent %08x -> %08x", + hwnd, parent == null ? 0 : parent.hwnd, + new_parent == null ? 0 : new_parent.hwnd )); + parent = new_parent; + if (new_parent == null) + { + window_view = new WineView( WineActivity.this, this ); + window_view.layout( 0, 0, 1, 1 ); // make sure the surface gets created + } + else window_view = null; + } + public int get_hwnd() { return hwnd; @@ -452,6 +466,13 @@ public class WineActivity extends Activity if (win != null) win.destroy(); } + public void set_window_parent( int hwnd, int parent, int pid ) + { + WineWindow win = get_window( hwnd ); + if (win == null) return; + win.set_parent( get_window( parent )); + } + public void window_pos_changed( int hwnd, int flags, int insert_after, int owner, int style, Rect window_rect, Rect client_rect, Rect visible_rect ) { @@ -475,6 +496,11 @@ public class WineActivity extends Activity runOnUiThread( new Runnable() { public void run() { destroy_window( hwnd ); }} ); } + public void setParent( final int hwnd, final int parent, final int pid ) + { + runOnUiThread( new Runnable() { public void run() { set_window_parent( hwnd, parent, pid ); }} ); + } + public void windowPosChanged( final int hwnd, final int flags, final int insert_after, final int owner, final int style, final int window_left, final int window_top, diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 3c2500e..f3dd019 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -60,6 +60,7 @@ 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, HWND after, HWND owner ) DECLSPEC_HIDDEN; +extern int ioctl_set_window_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; /************************************************************************** diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 1af59be..eafaf04 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -61,6 +61,7 @@ enum android_ioctl IOCTL_CREATE_WINDOW, IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, + IOCTL_SET_WINDOW_PARENT, IOCTL_DEQUEUE_BUFFER, IOCTL_QUEUE_BUFFER, IOCTL_CANCEL_BUFFER, @@ -188,6 +189,12 @@ struct ioctl_android_set_swap_interval int interval; }; +struct ioctl_android_set_window_parent +{ + struct ioctl_header hdr; + int parent; +}; + static inline BOOL is_in_desktop_process(void) { return thread != NULL; @@ -832,12 +839,35 @@ static NTSTATUS setSwapInterval_ioctl( void *data, DWORD in_size, DWORD out_size return android_error_to_status( ret ); } +static NTSTATUS setWindowParent_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + static jmethodID method; + jobject object; + struct ioctl_android_set_window_parent *res = data; + struct native_win_data *win_data; + DWORD pid = current_client_id(); + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + + TRACE( "hwnd %08x parent %08x\n", res->hdr.hwnd, res->parent ); + + if (!(object = load_java_method( &method, "setParent", "(III)V" ))) return STATUS_NOT_SUPPORTED; + + wrap_java_call(); + (*jni_env)->CallVoidMethod( jni_env, object, method, res->hdr.hwnd, res->parent, pid ); + unwrap_java_call(); + return STATUS_SUCCESS; +} + 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 */ + setWindowParent_ioctl, /* IOCTL_SET_WINDOW_PARENT */ dequeueBuffer_ioctl, /* IOCTL_DEQUEUE_BUFFER */ queueBuffer_ioctl, /* IOCTL_QUEUE_BUFFER */ cancelBuffer_ioctl, /* IOCTL_CANCEL_BUFFER */ @@ -1356,3 +1386,12 @@ int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const RECT *cl req.owner = HandleToLong( owner ); return android_ioctl( IOCTL_WINDOW_POS_CHANGED, &req, sizeof(req), NULL, NULL ); } + +int ioctl_set_window_parent( HWND hwnd, HWND parent ) +{ + struct ioctl_android_set_window_parent req; + + req.hdr.hwnd = HandleToLong( hwnd ); + req.parent = parent == GetDesktopWindow() ? 0 : HandleToLong( parent ); + return android_ioctl( IOCTL_SET_WINDOW_PARENT, &req, sizeof(req), NULL, NULL ); +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 94f23e0..7dff297 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1015,6 +1015,24 @@ UINT CDECL ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) } +/***************************************************************** + * ANDROID_SetParent + */ +void CDECL ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ) +{ + struct android_win_data *data; + + if (parent == old_parent) return; + if (!(data = get_win_data( hwnd ))) return; + + TRACE( "win %p parent %p -> %p\n", hwnd, old_parent, parent ); + + data->parent = (parent == GetDesktopWindow()) ? 0 : parent; + ioctl_set_window_parent( hwnd, parent ); + release_win_data( data ); +} + + /*********************************************************************** * ANDROID_SetWindowStyle */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index ed3138a..3605241 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -10,6 +10,7 @@ @ cdecl DestroyWindow(long) ANDROID_DestroyWindow @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx @ cdecl SetLayeredWindowAttributes(long long long long) ANDROID_SetLayeredWindowAttributes +@ cdecl SetParent(long long long) ANDROID_SetParent @ cdecl SetWindowRgn(long long long) ANDROID_SetWindowRgn @ cdecl SetWindowStyle(ptr long ptr) ANDROID_SetWindowStyle @ cdecl ShowWindow(long long ptr long) ANDROID_ShowWindow

1 0