May 2019 - Wine-commits - list.winehq.org

Jacek Caban : server: Store currently executed IRP call on server side.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 781dd9a145d0ef8e4465f78b8916ea0861b5e161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=781dd9a145d0ef8e4465f78b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:18 2019 +0200 server: Store currently executed IRP call on server side. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index 0fa23ca..61831b4 100644 --- a/server/device.c +++ b/server/device.c @@ -89,6 +89,7 @@ struct device_manager struct object obj; /* object header */ struct list devices; /* list of devices */ struct list requests; /* list of pending irps across all devices */ + struct irp_call *current_call; /* call currently executed on client side */ struct wine_rb_tree kernel_objects; /* map of objects that have client side pointer associated */ }; @@ -710,6 +711,12 @@ static void device_manager_destroy( struct object *obj ) struct kernel_object *kernel_object; struct list *ptr; + if (manager->current_call) + { + release_object( manager->current_call ); + manager->current_call = NULL; + } + while (manager->kernel_objects.root) { kernel_object = WINE_RB_ENTRY_VALUE( manager->kernel_objects.root, struct kernel_object, rb_entry ); @@ -740,6 +747,7 @@ static struct device_manager *create_device_manager(void) if ((manager = alloc_object( &device_manager_ops ))) { + manager->current_call = NULL; list_init( &manager->devices ); list_init( &manager->requests ); wine_rb_init( &manager->kernel_objects, compare_kernel_object ); @@ -870,6 +878,12 @@ DECL_HANDLER(get_next_device_request) clear_error(); } + if (manager->current_call) + { + release_object( manager->current_call ); + manager->current_call = NULL; + } + if ((ptr = list_head( &manager->requests ))) { irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); @@ -889,7 +903,8 @@ DECL_HANDLER(get_next_device_request) iosb->in_size = 0; list_remove( &irp->mgr_entry ); list_init( &irp->mgr_entry ); - if (!irp->file) release_object( irp ); /* no longer on manager queue */ + if (irp->file) grab_object( irp ); /* we already own the object if it's only on manager queue */ + manager->current_call = irp; } } else set_error( STATUS_PENDING );

1 0

Jacek Caban : server: Pass file object handle in IRP_CALL_CREATE request.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 29914d583fe098521472332687b8da69fc692690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29914d583fe0985214723326… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 3 15:40:40 2019 +0200 server: Pass file object handle in IRP_CALL_CREATE request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 +- server/device.c | 65 ++++++++++++++++++++++++++++-------------- server/protocol.def | 1 + server/trace.c | 2 +- 4 files changed, 48 insertions(+), 23 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9c5c196..17d2654 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -662,6 +662,7 @@ typedef union unsigned int sharing; unsigned int options; client_ptr_t device; + obj_handle_t file; } create; struct { @@ -6694,6 +6695,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 581 +#define SERVER_PROTOCOL_VERSION 582 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/device.c b/server/device.c index 61831b4..e2364d2 100644 --- a/server/device.c +++ b/server/device.c @@ -539,32 +539,49 @@ static void device_file_destroy( struct object *obj ) release_object( file->device ); } -static void fill_irp_params( struct device_manager *manager, struct irp_call *irp, irp_params_t *params ) +static int fill_irp_params( struct device_manager *manager, struct irp_call *irp, irp_params_t *params ) { - *params = irp->params; - - switch (params->type) + switch (irp->params.type) { case IRP_CALL_NONE: - case IRP_CALL_CREATE: case IRP_CALL_FREE: break; + case IRP_CALL_CREATE: + irp->params.create.file = alloc_handle( current->process, irp->file, + irp->params.create.access, 0 ); + if (!irp->params.create.file) return 0; + break; case IRP_CALL_CLOSE: - params->close.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.close.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_CALL_READ: - params->read.file = get_kernel_object_ptr( manager, &irp->file->obj ); - params->read.out_size = irp->iosb->out_size; + irp->params.read.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.read.out_size = irp->iosb->out_size; break; case IRP_CALL_WRITE: - params->write.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.write.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_CALL_FLUSH: - params->flush.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.flush.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_CALL_IOCTL: - params->ioctl.file = get_kernel_object_ptr( manager, &irp->file->obj ); - params->ioctl.out_size = irp->iosb->out_size; + irp->params.ioctl.file = get_kernel_object_ptr( manager, &irp->file->obj ); + irp->params.ioctl.out_size = irp->iosb->out_size; + break; + } + + *params = irp->params; + return 1; +} + +static void free_irp_params( struct irp_call *irp ) +{ + switch (irp->params.type) + { + case IRP_CALL_CREATE: + close_handle( current->process, irp->params.create.file ); + break; + default: break; } } @@ -875,15 +892,17 @@ DECL_HANDLER(get_next_device_request) close_handle( current->process, req->prev ); /* avoid an extra round-trip for close */ release_object( irp ); } - clear_error(); } if (manager->current_call) { + free_irp_params( manager->current_call ); release_object( manager->current_call ); manager->current_call = NULL; } + clear_error(); + if ((ptr = list_head( &manager->requests ))) { irp = LIST_ENTRY( ptr, struct irp_call, mgr_entry ); @@ -897,14 +916,18 @@ DECL_HANDLER(get_next_device_request) if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { - fill_irp_params( manager, irp, &reply->params ); - set_reply_data_ptr( iosb->in_data, iosb->in_size ); - iosb->in_data = NULL; - iosb->in_size = 0; - list_remove( &irp->mgr_entry ); - list_init( &irp->mgr_entry ); - if (irp->file) grab_object( irp ); /* we already own the object if it's only on manager queue */ - manager->current_call = irp; + if (fill_irp_params( manager, irp, &reply->params )) + { + set_reply_data_ptr( iosb->in_data, iosb->in_size ); + iosb->in_data = NULL; + iosb->in_size = 0; + list_remove( &irp->mgr_entry ); + list_init( &irp->mgr_entry ); + /* we already own the object if it's only on manager queue */ + if (irp->file) grab_object( irp ); + manager->current_call = irp; + } + else close_handle( current->process, reply->next ); } } else set_error( STATUS_PENDING ); diff --git a/server/protocol.def b/server/protocol.def index 15ee31d..fc7c4d0 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -678,6 +678,7 @@ typedef union unsigned int sharing; /* sharing flags */ unsigned int options; /* file options */ client_ptr_t device; /* opaque ptr for the device */ + obj_handle_t file; /* file handle */ } create; struct { diff --git a/server/trace.c b/server/trace.c index b5f3008..f149ed2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -326,7 +326,7 @@ static void dump_irp_params( const char *prefix, const irp_params_t *data ) fprintf( stderr, "%s{CREATE,access=%08x,sharing=%08x,options=%08x", prefix, data->create.access, data->create.sharing, data->create.options ); dump_uint64( ",device=", &data->create.device ); - fputc( '}', stderr ); + fprintf( stderr, ",file=%08x}", data->create.file ); break; case IRP_CALL_CLOSE: fprintf( stderr, "%s{CLOSE", prefix );

1 0

Alexandre Julliard : cmd: Build with msvcrt.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 43c430a6d837d99f30dbcdb770f676e60ddb1ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c430a6d837d99f30dbcdb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:33 2019 +0200 cmd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/Makefile.in | 3 +- programs/cmd/batch.c | 94 +++++------ programs/cmd/builtins.c | 422 +++++++++++++++++++++++------------------------ programs/cmd/directory.c | 80 ++++----- programs/cmd/wcmd.h | 6 +- programs/cmd/wcmdmain.c | 202 +++++++++++------------ 6 files changed, 403 insertions(+), 404 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43c430a6d837d99f30db…

1 0

Alexandre Julliard : explorer: Move screen saver activation to the X11 driver.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: ed22f0454bc50f7820fc93fbe8c2af4877083006 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed22f0454bc50f7820fc93fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:28:38 2019 +0200 explorer: Move screen saver activation to the X11 driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 26 +++++++++++++++++++++++++- programs/explorer/desktop.c | 22 ++-------------------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 97dee52..fb97ec5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdlib.h> @@ -2764,6 +2765,25 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) /*********************************************************************** + * start_screensaver + */ +static LRESULT start_screensaver(void) +{ + if (root_window == DefaultRootWindow(gdi_display)) + { + const char *argv[3] = { "xdg-screensaver", "activate", NULL }; + int pid = _spawnvp( _P_DETACH, argv[0], argv ); + if (pid > 0) + { + TRACE( "started process %d\n", pid ); + return 0; + } + } + return -1; +} + + +/*********************************************************************** * SysCommand (X11DRV.@) * * Perform WM_SYSCOMMAND handling. @@ -2774,7 +2794,11 @@ LRESULT CDECL X11DRV_SysCommand( HWND hwnd, WPARAM wparam, LPARAM lparam ) int dir; struct x11drv_win_data *data; - if (!(data = get_win_data( hwnd ))) return -1; + if (!(data = get_win_data( hwnd ))) + { + if (wparam == SC_SCREENSAVE && hwnd == GetDesktopWindow()) return start_screensaver(); + return -1; + } if (!data->whole_window || !data->managed || !data->mapped) goto failed; switch (wparam & 0xfff0) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 27b9b24..f4cc7b1 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -583,22 +583,6 @@ static void initialize_launchers( HWND hwnd ) } } -/* screen saver handler */ -static BOOL start_screensaver( void ) -{ - if (using_root) - { - const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = _spawnvp( _P_DETACH, argv[0], argv ); - if (pid > 0) - { - WINE_TRACE( "started process %d\n", pid ); - return TRUE; - } - } - return FALSE; -} - static WNDPROC desktop_orig_wndproc; /* window procedure for the desktop window */ @@ -613,11 +597,9 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR { case SC_CLOSE: ExitWindows( 0, 0 ); - break; - case SC_SCREENSAVE: - return start_screensaver(); + return 0; } - return 0; + break; case WM_CLOSE: PostQuitMessage(0);

1 0

Alexandre Julliard : makefiles: Only cross-compile the import libraries that are actually used.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: bbc302290b6e48e390a342e60eabdd5d6e3912cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbc302290b6e48e390a342e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 10:52:51 2019 +0200 makefiles: Only cross-compile the import libraries that are actually used. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 165 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 108 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbc302290b6e48e390a3…

1 0

Alexandre Julliard : makefiles: Only cross-compile the static libraries that are actually used.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: c685acba64f57a35fb2d04630ee0bbd6d0aa01bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c685acba64f57a35fb2d0463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 11:18:00 2019 +0200 makefiles: Only cross-compile the static libraries that are actually used. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d9d4d1a..97017d7 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2086,8 +2086,14 @@ static struct makefile *get_parent_makefile( struct makefile *make ) static int needs_cross_lib( const struct makefile *make ) { if (!crosstarget) return 0; - if (!make->importlib) return 0; - return strarray_exists( &cross_import_libs, make->importlib ); + if (make->importlib) return strarray_exists( &cross_import_libs, make->importlib ); + if (make->staticlib) + { + const char *name = replace_extension( make->staticlib, ".a", "" ); + if (!strncmp( name, "lib", 3 )) name += 3; + return strarray_exists( &cross_import_libs, name ); + } + return 0; } @@ -2974,7 +2980,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour (make->is_cross || ((source->file->flags & FLAG_C_IMPLIB) && (needs_cross_lib( make ) || needs_delay_lib( make ))) || - (make->module && make->staticlib))); + (make->staticlib && needs_cross_lib( make )))); int need_obj = (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib)); @@ -3289,7 +3295,7 @@ static void output_static_lib( struct makefile *make ) output( "\n\t%s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); - if (crosstarget && make->module) + if (needs_cross_lib( make )) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" );

1 0

Alexandre Julliard : dxerr8: Don't use snprintf().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 689f5c80f3c051af1087e59b962fc5e5583ea461 URL: https://source.winehq.org/git/wine.git/?a=commit;h=689f5c80f3c051af1087e59b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:26:36 2019 +0200 dxerr8: Don't use snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr8/dxerr8.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr8/dxerr8.c b/dlls/dxerr8/dxerr8.c index 1d22296..eb72394 100644 --- a/dlls/dxerr8/dxerr8.c +++ b/dlls/dxerr8/dxerr8.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> -#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -122,11 +120,11 @@ HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const cha char msg[1024]; if (bPopMsgBox) { - snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", + wsprintfA(msg, "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", strFile, dwLine, DXGetErrorString8A(hr), hr, strMsg); MessageBoxA(0, msg, "Unexpected error encountered", MB_OK|MB_ICONERROR); } else { - snprintf(msg, sizeof(msg), "%s(%d): %s (hr=%s (0x%08x))", strFile, + wsprintfA(msg, "%s(%d): %s (hr=%s (0x%08x))", strFile, dwLine, strMsg, DXGetErrorString8A(hr), hr); OutputDebugStringA(msg); }

1 0

Alexandre Julliard : dxerr9: Don't use snprintf().
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 0844e4473c52f15e1a6ec1e48c678aac42ed6649 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0844e4473c52f15e1a6ec1e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:26:45 2019 +0200 dxerr9: Don't use snprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxerr9/dxerr9.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dxerr9/dxerr9.c b/dlls/dxerr9/dxerr9.c index e5b1861..aa1de46 100644 --- a/dlls/dxerr9/dxerr9.c +++ b/dlls/dxerr9/dxerr9.c @@ -18,10 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> -#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -126,11 +124,11 @@ HRESULT WINAPI DXTraceA(const char* strFile, DWORD dwLine, HRESULT hr, const cha char msg[1024]; if (bPopMsgBox) { - snprintf(msg, sizeof(msg), "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", + wsprintfA(msg, "File: %s\nLine: %d\nError Code: %s (0x%08x)\nCalling: %s", strFile, dwLine, DXGetErrorString9A(hr), hr, strMsg); MessageBoxA(0, msg, "Unexpected error encountered", MB_OK|MB_ICONERROR); } else { - snprintf(msg, sizeof(msg), "%s(%d): %s (hr=%s (0x%08x))", strFile, + wsprintfA(msg, "%s(%d): %s (hr=%s (0x%08x))", strFile, dwLine, strMsg, DXGetErrorString9A(hr), hr); OutputDebugStringA(msg); }

1 0

Alexandre Julliard : strmbase: Avoid using wine/unicode.h.
by Alexandre Julliard 03 May '19

03 May '19

Module: wine Branch: master Commit: 71e7e73fc092b3594dde0fe3b99ae0552c626013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71e7e73fc092b3594dde0fe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 3 12:32:45 2019 +0200 strmbase: Avoid using wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/audio.c | 1 - dlls/strmbase/dispatch.c | 1 - dlls/strmbase/dllfunc.c | 2 -- dlls/strmbase/filter.c | 7 +++---- dlls/strmbase/outputqueue.c | 1 - dlls/strmbase/pin.c | 7 +++---- dlls/strmbase/renderer.c | 1 - dlls/strmbase/transform.c | 3 +-- dlls/strmbase/video.c | 1 - dlls/strmbase/window.c | 1 - 10 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index 1b79ec5..260e5ed 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -24,7 +24,6 @@ #include "dshow.h" #include "uuids.h" #include "vfwmsgs.h" -#include "wine/unicode.h" #include "wine/strmbase.h" diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 62bc397..6976185 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -21,7 +21,6 @@ #define COBJMACROS #include "dshow.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 195a409..da4f450 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -18,7 +18,6 @@ * 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 <stdarg.h> #include <assert.h> @@ -36,7 +35,6 @@ #include "uuids.h" #include "strmif.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h" diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 9b14cf0..f133f1c 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include <assert.h> @@ -162,7 +161,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin } if (info.pFilter) IBaseFilter_Release(info.pFilter); - if (!strcmpW(id, info.achName)) + if (!lstrcmpW(id, info.achName)) { *ret = pin; return S_OK; @@ -179,7 +178,7 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pInfo); - strcpyW(pInfo->achName, This->filterInfo.achName); + lstrcpyW(pInfo->achName, This->filterInfo.achName); pInfo->pGraph = This->filterInfo.pGraph; if (pInfo->pGraph) @@ -197,7 +196,7 @@ HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph EnterCriticalSection(&This->csFilter); { if (pName) - strcpyW(This->filterInfo.achName, pName); + lstrcpyW(This->filterInfo.achName, pName); else *This->filterInfo.achName = '\0'; This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 5513193..ba61c1f 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "wine/strmbase.h" #include "uuids.h" diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index a100ae1..3075207 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -23,7 +23,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" @@ -146,7 +145,7 @@ out: static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) { /* avoid copying uninitialized data */ - strcpyW(pDest->achName, pSrc->achName); + lstrcpyW(pDest->achName, pSrc->achName); pDest->dir = pSrc->dir; pDest->pFilter = pSrc->pFilter; } @@ -296,11 +295,11 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id) TRACE("(%p)->(%p)\n", This, Id); - *Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); + *Id = CoTaskMemAlloc((lstrlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); if (!*Id) return E_OUTOFMEMORY; - strcpyW(*Id, This->pinInfo.achName); + lstrcpyW(*Id, This->pinInfo.achName); return S_OK; } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 499bc2b..4e24ce1 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index c62e49a..d741e92 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -18,7 +18,7 @@ * 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 <stdarg.h> #define COBJMACROS @@ -32,7 +32,6 @@ #include <assert.h> -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/strmbase.h" #include "strmbase_private.h" diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index a03ba55..f536641 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -25,7 +25,6 @@ #include "uuids.h" #include "vfwmsgs.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index b08608e..64e9bc1 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -22,7 +22,6 @@ #include "dshow.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h"

1 0

Józef Kucia : vkd3d: Forbid D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS for buffers.
by Alexandre Julliard 03 May '19

03 May '19

Module: vkd3d Branch: master Commit: 6801c153309bfd709e2fb529680736ce11df6945 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6801c153309bfd709e2fb52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 2 16:02:38 2019 +0200 vkd3d: Forbid D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS for buffers. 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> --- libs/vkd3d/resource.c | 6 ++++++ tests/d3d12.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ac2ff38..5bb76bf 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -530,6 +530,12 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, buffer_info.usage |= VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; /* Buffers always have properties of D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS. */ + if (desc->Flags & D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS) + { + WARN("D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS cannot be set for buffers.\n"); + return E_INVALIDARG; + } + buffer_info.sharingMode = VK_SHARING_MODE_CONCURRENT; buffer_info.queueFamilyIndexCount = device->queue_family_count; buffer_info.pQueueFamilyIndices = device->queue_family_indices; diff --git a/tests/d3d12.c b/tests/d3d12.c index dd13ddf..cb05b5e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1615,6 +1615,9 @@ static void test_create_committed_resource(void) {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET}, {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS}, + {D3D12_HEAP_TYPE_DEFAULT, D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS}, + {D3D12_HEAP_TYPE_UPLOAD, D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS}, + {D3D12_HEAP_TYPE_READBACK, D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS}, }; if (!(device = create_device()))

1 0