March 2016 - Wine-commits - list.winehq.org

Hugh McMaster : reg: Fail if /v is passed without an argument.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 735dca607409b7409b8adc4dd3e126c49d4603c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735dca607409b7409b8adc4dd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 15 23:23:55 2016 +1100 reg: Fail if /v is passed without an argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 24 +++++++++++++++++++++--- programs/reg/tests/reg.c | 13 +++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 1167ccb..29be40e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -601,7 +601,13 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) - value_name = argvW[++i]; + { + if (!(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashVEW)) value_empty = TRUE; else if (!lstrcmpiW(argvW[i], slashTW)) @@ -652,7 +658,13 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) - value_name = argvW[++i]; + { + if (!(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashVEW)) value_empty = TRUE; else if (!lstrcmpiW(argvW[i], slashVAW)) @@ -683,7 +695,13 @@ int wmain(int argc, WCHAR *argvW[]) for (i = 1; i < argc; i++) { if (!lstrcmpiW(argvW[i], slashVW)) - value_name = argvW[++i]; + { + if (!(value_name = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashVEW)) value_empty = TRUE; else if (!lstrcmpiW(argvW[i], slashSW)) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 6a55537..d1db5c4 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -519,6 +519,19 @@ static void test_v_flags(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* No /v argument */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /d Test /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } START_TEST(reg)

1 0

Hugh McMaster : reg: Fail if multiple /v switches are passed in.
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: bd278b1983d0913b28f85cfd897e1e6484bd5f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd278b1983d0913b28f85cfd8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 15 23:23:56 2016 +1100 reg: Fail if multiple /v switches are passed in. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 6 +++--- programs/reg/tests/reg.c | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 29be40e..9dbce32 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -602,7 +602,7 @@ int wmain(int argc, WCHAR *argvW[]) { if (!lstrcmpiW(argvW[i], slashVW)) { - if (!(value_name = argvW[++i])) + if (value_name || !(value_name = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; @@ -659,7 +659,7 @@ int wmain(int argc, WCHAR *argvW[]) { if (!lstrcmpiW(argvW[i], slashVW)) { - if (!(value_name = argvW[++i])) + if (value_name || !(value_name = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; @@ -696,7 +696,7 @@ int wmain(int argc, WCHAR *argvW[]) { if (!lstrcmpiW(argvW[i], slashVW)) { - if (!(value_name = argvW[++i])) + if (value_name || !(value_name = argvW[++i])) { output_message(STRING_INVALID_CMDLINE); return 1; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d1db5c4..927288d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -532,6 +532,13 @@ static void test_v_flags(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Multiple /v switches */ + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /t REG_DWORD /d 0x1 /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } START_TEST(reg)

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_cleanup().
by Alexandre Julliard 15 Mar '16

15 Mar '16

Module: wine Branch: master Commit: 724463d66661558bfb9f99931b2c17d129b7ad63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724463d66661558bfb9f99931… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 17:02:11 2016 +0100 wined3d: Get resource info from the texture in wined3d_surface_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 574069b..a19098f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -53,10 +53,10 @@ void wined3d_surface_cleanup(struct wined3d_surface *surface) if (surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { + struct wined3d_device *device = surface->container->resource.device; struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_device *device = surface->resource.device; context = context_acquire(device, NULL); gl_info = context->gl_info;

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.5
by Jeremy Newman 14 Mar '16

14 Mar '16

Module: website Branch: master Commit: 1b2551c4c84d5f16c1c359be12ee7f894b1ec6c4 URL: http://source.winehq.org/git/website.git/?a=commit;h=1b2551c4c84d5f16c1c359… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 13 17:16:41 2016 +0100 Polish translation for release 1.9.5 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016030501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2016030501.xml b/news/pl/2016030501.xml new file mode 100644 index 0000000..33e9630 --- /dev/null +++ b/news/pl/2016030501.xml @@ -0,0 +1,16 @@ +<news> +<date>Marzec 5, 2016</date> +<title>Wydano Wine 1.9.5</title> +<body> + Wydanie rozwojowe Wine 1.9.5 jest już dostępne. + <a href="{$root}/announce/1.9.5">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Mono, ze 64-bitowym wsparciem.</li> + <li>Początki strumienia poleceń WineD3D.</li> + <li>Wsparcie dla stanów efektów w Direct3DX.</li> + <li>Ulepszenia w przeciąganiu i upuszczaniu.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : libwine: Don' t include backwards compatibility functions on Android.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 877a4a733f26c724c919c9ba49d68e97e9e969d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=877a4a733f26c724c919c9ba4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 19:28:51 2016 +0900 libwine: Don't include backwards compatibility functions on Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/port.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index e05e166..d5ce07a 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -28,7 +28,9 @@ #include "wine/unicode.h" #include "wine/library.h" -/* functions from libwine_port that are also exported from libwine for backwards compatibility */ +/* functions from libwine_port that are also exported from libwine for backwards compatibility, + * on platforms that require it */ +#ifndef __ANDROID__ const void *libwine_port_functions[] = { wine_cp_enum_table, @@ -41,6 +43,7 @@ const void *libwine_port_functions[] = wine_utf8_mbstowcs, wine_utf8_wcstombs }; +#endif /* no longer used, for backwards compatibility only */ struct wine_pthread_functions;

1 0

Józef Kucia : d3d11/tests: Trace feature level.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 37954777d5d7c92ae7860ecd00bd76f19609f37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37954777d5d7c92ae7860ecd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 14 00:03:09 2016 +0100 d3d11/tests: Trace feature level. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2238380..65173f3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -438,6 +438,7 @@ static void test_create_device(void) } supported_feature_level = ID3D11Device_GetFeatureLevel(device); + trace("Feature level %#x.\n", supported_feature_level); ID3D11Device_Release(device); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL);

1 0

Michael Stefaniuc : d3drm: Use debugstr_a to print a string that can be NULL.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 62277fb7779f76341efc71999d59242055be5c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62277fb7779f76341efc71999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 11:54:50 2016 +0100 d3drm: Use debugstr_a to print a string that can be NULL. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 8bd5131..6d0b55b 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1069,7 +1069,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, return hr; } - TRACE("Mesh name is '%s'\n", This->name ? This->name : ""); + TRACE("Mesh name is %s\n", debugstr_a(This->name)); This->nb_normals = 0;

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_map( ) and wined3d_volume_map().
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: aeefbdffba9ea77310759956007f1348920b4477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeefbdffba9ea773107599560… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 16:01:43 2016 +0100 wined3d: Merge wined3d_surface_map() and wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/volume.c | 5 +- dlls/d3d9/volume.c | 5 +- dlls/wined3d/surface.c | 153 ------------------------ dlls/wined3d/texture.c | 256 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/volume.c | 163 +------------------------- dlls/wined3d/wined3d_private.h | 12 +- 6 files changed, 245 insertions(+), 349 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aeefbdffba9ea77310759…

1 0

Jacek Caban : winex11.drv: Use grabbed window display in SetCapture.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: ecf9e9135d9d923071dbe9c598f7b5d5b6df8f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf9e9135d9d923071dbe9c59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 10 14:03:02 2016 +0100 winex11.drv: Use grabbed window display in SetCapture. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- dlls/winex11.drv/window.c | 28 ++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 63d202c..677acfa 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -602,7 +602,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU /* update the wine server Z-order */ - if (window != x11drv_thread_data()->grab_window && + if (hwnd != x11drv_thread_data()->grab_hwnd && /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { @@ -1611,7 +1611,7 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); if (event->detail == NotifyVirtual) return; - if (event->window == x11drv_thread_data()->grab_window) return; + if (hwnd == x11drv_thread_data()->grab_hwnd) return; /* simulate a mouse motion event */ input.u.mi.dx = event->x; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4a047e2..4789f98 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2116,27 +2116,31 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + struct x11drv_win_data *data; - if (!thread_data) return; if (!(flags & (GUI_INMOVESIZE | GUI_INMENUMODE))) return; if (hwnd) { - Window grab_win = X11DRV_get_whole_window( GetAncestor( hwnd, GA_ROOT ) ); - - if (!grab_win) return; - XFlush( gdi_display ); - XGrabPointer( thread_data->display, grab_win, False, - PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); - thread_data->grab_window = grab_win; + if (!(data = get_win_data( GetAncestor( hwnd, GA_ROOT )))) return; + if (data->whole_window) + { + XFlush( gdi_display ); + XGrabPointer( data->display, data->whole_window, False, + PointerMotionMask | ButtonPressMask | ButtonReleaseMask, + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); + thread_data->grab_hwnd = data->hwnd; + } + release_win_data( data ); } else /* release capture */ { + if (!(data = get_win_data( thread_data->grab_hwnd ))) return; XFlush( gdi_display ); - XUngrabPointer( thread_data->display, CurrentTime ); - XFlush( thread_data->display ); - thread_data->grab_window = None; + XUngrabPointer( data->display, CurrentTime ); + XFlush( data->display ); + thread_data->grab_hwnd = NULL; + release_win_data( data ); } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2694d23..23f4ab6 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -308,7 +308,7 @@ struct x11drv_thread_data { Display *display; XEvent *current_event; /* event currently being processed */ - Window grab_window; /* window that currently grabs the mouse */ + HWND grab_hwnd; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */

1 0

Piotr Caban : user32: Return window procedure pointer in WINPROC_AllocProc if it' s not possible to allocate handle.
by Alexandre Julliard 14 Mar '16

14 Mar '16

Module: wine Branch: master Commit: 7cb0e78dbf35420de4fd6302a580d8bc34e97930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb0e78dbf35420de4fd6302a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 9 13:51:21 2016 +0100 user32: Return window procedure pointer in WINPROC_AllocProc if it's not possible to allocate handle. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3642109..507a36a 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -165,7 +165,7 @@ static inline WINDOWPROC *alloc_winproc( WNDPROC func, BOOL unicode ) proc_to_handle(proc), unicode ? 'W' : 'A', func, winproc_used, MAX_WINPROCS ); } - else FIXME( "too many winprocs, cannot allocate one for %p\n", func ); + else WARN( "too many winprocs, cannot allocate one for %p\n", func ); } else TRACE( "reusing %p for %p\n", proc_to_handle(proc), func ); @@ -309,7 +309,7 @@ WNDPROC WINPROC_AllocProc( WNDPROC func, BOOL unicode ) { WINDOWPROC *proc; - if (!(proc = alloc_winproc( func, unicode ))) return NULL; + if (!(proc = alloc_winproc( func, unicode ))) return func; if (proc == WINPROC_PROC16) return func; return proc_to_handle( proc ); }

1 0