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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard June 8, 2017

June 8, 2017

Module: wine Branch: master Commit: 27f82b46ada927124d20f4ccd551f4d5d1f33595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f82b46ada927124d20f4ccd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 8 13:26:46 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9e99cba..f176a29 100644 --- a/po/ru.po +++ b/po/ru.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-02 09:06+0300\n" +"PO-Revision-Date: 2017-06-08 13:21+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11768,8 +11768,6 @@ msgid "Expand" msgstr "Развернуть" #: regedit.rc:134 regedit.rc:232 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." msgstr "Изменить &двоичные данные..."

1 0

Alexandre Julliard : wineandroid: Add support for mouse events.
by Alexandre Julliard June 8, 2017

June 8, 2017

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 : explorer: Allow the driver to override the desktop winproc at creation time.
by Alexandre Julliard June 8, 2017

June 8, 2017

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: Implement SetCapture and store the capture window in the desktop process for global captures.
by Alexandre Julliard June 8, 2017

June 8, 2017

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: Properly clean up windows that aren' t destroyed explicitly.
by Alexandre Julliard June 8, 2017

June 8, 2017

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 : Revert "winetest: Get the work directory directly from the web server."
by Alexandre Julliard June 8, 2017

June 8, 2017

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 : Revert "winetest: Let the scripts autodetect the work directory."
by Alexandre Julliard June 8, 2017

June 8, 2017

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

Henri Verbeet : wined3d: Use WINED3D_CS_QUEUE_MAP for WINED3D_CS_OP_UPDATE_SUB_RESOURCE.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: e0e4f9bbcda1243b9317dbfbeeff84a18b4e855c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e4f9bbcda1243b9317dbfbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:54 2017 +0200 wined3d: Use WINED3D_CS_QUEUE_MAP for WINED3D_CS_OP_UPDATE_SUB_RESOURCE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1e1d69e..c7df670 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2146,7 +2146,7 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r { struct wined3d_cs_update_sub_resource *op; - op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; op->resource = resource; op->sub_resource_idx = sub_resource_idx; @@ -2157,10 +2157,10 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r wined3d_resource_acquire(resource); - cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->ops->submit(cs, WINED3D_CS_QUEUE_MAP); /* The data pointer may go away, so we need to wait until it is read. * Copying the data may be faster if it's small. */ - cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); + cs->ops->finish(cs, WINED3D_CS_QUEUE_MAP); } static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e07d07c..ded4af6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4216,6 +4216,8 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str return; } + wined3d_resource_wait_idle(resource); + wined3d_cs_emit_update_sub_resource(device->cs, resource, sub_resource_idx, box, data, row_pitch, depth_pitch); }

1 0

Henri Verbeet : d2d1: Fix the segment count for open figures.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: 4dcdc80ad58673f3aba48130d975c8b8d171d01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcdc80ad58673f3aba48130d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 7 21:31:53 2017 +0200 d2d1: Fix the segment count for open figures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 2 +- dlls/d2d1/tests/d2d1.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 0a60561..31a3eda 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2105,7 +2105,6 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i } geometry->u.path.state = D2D_GEOMETRY_STATE_FIGURE; - ++geometry->u.path.segment_count; } static void STDMETHODCALLTYPE d2d_geometry_sink_AddLines(ID2D1GeometrySink *iface, @@ -2196,6 +2195,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; if (figure_end == D2D1_FIGURE_END_CLOSED) { + ++geometry->u.path.segment_count; figure->flags |= D2D_FIGURE_FLAG_CLOSED; if (!memcmp(&figure->vertices[0], &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) --figure->vertex_count; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d1f8398..0adeef4 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2528,6 +2528,9 @@ static void test_path_geometry(void) hr = ID2D1GeometrySink_Close(sink); ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); ID2D1GeometrySink_Release(sink); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 2, "Got unexpected segment count %u.\n", count); geometry_sink_init(&simplify_sink); hr = ID2D1PathGeometry_Simplify(geometry, D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES,

1 0

Huw Davies : wineandroid: Tell git diff about java files.
by Alexandre Julliard June 7, 2017

June 7, 2017

Module: wine Branch: master Commit: 745aed5700aae36cddc05c73c9670ff3b31f6894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745aed5700aae36cddc05c73c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 7 16:13:16 2017 +0100 wineandroid: Tell git diff about java files. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/.gitattributes b/dlls/wineandroid.drv/.gitattributes new file mode 100644 index 0000000..f57840b --- /dev/null +++ b/dlls/wineandroid.drv/.gitattributes @@ -0,0 +1 @@ +*.java diff=java

1 0