wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Jacek Caban : server: Create async objects in read and write request handlers.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 8ef4f9a0c8acffcde2cc21eb81ff8010ddddd363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef4f9a0c8acffcde2cc21eb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 22:12:37 2017 +0100 server: Create async objects in read and write request handlers. async_get_data allows splitting patches, but will be removed later in the series. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 10 ++++++++++ server/device.c | 22 ++++++++++++---------- server/fd.c | 25 ++++++++++++++++++------- server/file.h | 12 ++++++------ 4 files changed, 46 insertions(+), 23 deletions(-) diff --git a/server/async.c b/server/async.c index 3de60b6..aa50333 100644 --- a/server/async.c +++ b/server/async.c @@ -469,6 +469,16 @@ struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t return iosb; } +struct iosb *async_get_iosb( struct async *async ) +{ + return async->iosb ? (struct iosb *)grab_object( async->iosb ) : NULL; +} + +const async_data_t *async_get_data( struct async *async ) +{ + return &async->data; +} + /* cancels all async I/O */ DECL_HANDLER(cancel_async) { diff --git a/server/device.c b/server/device.c index bece6a8..90ebc9e 100644 --- a/server/device.c +++ b/server/device.c @@ -174,10 +174,8 @@ static struct fd *device_file_get_fd( struct object *obj ); static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); -static obj_handle_t device_file_read( struct fd *fd, const async_data_t *async_data, int blocking, - file_pos_t pos, struct iosb *iosb ); -static obj_handle_t device_file_write( struct fd *fd, const async_data_t *async_data, int blocking, - file_pos_t pos, struct iosb *iosb ); +static obj_handle_t device_file_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); static obj_handle_t device_file_flush( struct fd *fd, const async_data_t *async_data, int blocking ); static obj_handle_t device_file_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, int blocking ); @@ -489,13 +487,13 @@ static enum server_fd_type device_file_get_fd_type( struct fd *fd ) return FD_TYPE_DEVICE; } -static obj_handle_t device_file_read( struct fd *fd, const async_data_t *async_data, int blocking, - file_pos_t pos, struct iosb *iosb ) +static obj_handle_t device_file_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; obj_handle_t handle; irp_params_t params; + struct iosb *iosb; memset( &params, 0, sizeof(params) ); params.read.major = IRP_MJ_READ; @@ -503,21 +501,23 @@ static obj_handle_t device_file_read( struct fd *fd, const async_data_t *async_d params.read.pos = pos; params.read.file = file->user_ptr; + iosb = async_get_iosb( async ); irp = create_irp( file, &params, iosb ); + release_object( iosb ); if (!irp) return 0; - handle = queue_irp( file, irp, async_data, blocking ); + handle = queue_irp( file, irp, async_get_data( async ), blocking ); release_object( irp ); return handle; } -static obj_handle_t device_file_write( struct fd *fd, const async_data_t *async_data, int blocking, - file_pos_t pos, struct iosb *iosb ) +static obj_handle_t device_file_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; obj_handle_t handle; irp_params_t params; + struct iosb *iosb; memset( &params, 0, sizeof(params) ); params.write.major = IRP_MJ_WRITE; @@ -525,10 +525,12 @@ static obj_handle_t device_file_write( struct fd *fd, const async_data_t *async_ params.write.pos = pos; params.write.file = file->user_ptr; + iosb = async_get_iosb( async ); irp = create_irp( file, &params, iosb ); + release_object( iosb ); if (!irp) return 0; - handle = queue_irp( file, irp, async_data, blocking ); + handle = queue_irp( file, irp, async_get_data( async ), blocking ); release_object( irp ); return handle; } diff --git a/server/fd.c b/server/fd.c index 31d0f4a..202bd56 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2167,15 +2167,14 @@ static void unmount_device( struct fd *device_fd ) } /* default read() routine */ -obj_handle_t no_fd_read( struct fd *fd, const async_data_t *async, int blocking, file_pos_t pos, struct iosb *iosb ) +obj_handle_t no_fd_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; } /* default write() routine */ -obj_handle_t no_fd_write( struct fd *fd, const async_data_t *async, int blocking, - file_pos_t pos, struct iosb *iosb ) +obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; @@ -2450,14 +2449,20 @@ DECL_HANDLER(get_handle_fd) DECL_HANDLER(read) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, FILE_READ_DATA ); + struct async *async; struct iosb *iosb; if (!fd) return; if ((iosb = create_iosb( NULL, 0, get_reply_max_size() ))) { - reply->wait = fd->fd_ops->read( fd, &req->async, req->blocking, req->pos, iosb ); - reply->options = fd->options; + async = create_async( current, &req->async, iosb ); + if (async) + { + reply->wait = fd->fd_ops->read( fd, async, req->blocking, req->pos ); + reply->options = fd->options; + release_object( async ); + } release_object( iosb ); } release_object( fd ); @@ -2467,14 +2472,20 @@ DECL_HANDLER(read) DECL_HANDLER(write) { struct fd *fd = get_handle_fd_obj( current->process, req->async.handle, FILE_WRITE_DATA ); + struct async *async; struct iosb *iosb; if (!fd) return; if ((iosb = create_iosb( get_req_data(), get_req_data_size(), 0 ))) { - reply->wait = fd->fd_ops->write( fd, &req->async, req->blocking, req->pos, iosb ); - reply->options = fd->options; + async = create_async( current, &req->async, iosb ); + if (async) + { + reply->wait = fd->fd_ops->write( fd, async, req->blocking, req->pos ); + reply->options = fd->options; + release_object( async ); + } release_object( iosb ); } release_object( fd ); diff --git a/server/file.h b/server/file.h index af497da..3605053 100644 --- a/server/file.h +++ b/server/file.h @@ -52,9 +52,9 @@ struct fd_ops /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); /* perform a read on the file */ - obj_handle_t (*read)(struct fd *, const async_data_t *, int, file_pos_t, struct iosb * ); + obj_handle_t (*read)(struct fd *, struct async *, int, file_pos_t ); /* perform a write on the file */ - obj_handle_t (*write)(struct fd *, const async_data_t *, int, file_pos_t, struct iosb * ); + obj_handle_t (*write)(struct fd *, struct async *, int, file_pos_t ); /* flush the object buffers */ obj_handle_t (*flush)(struct fd *, const async_data_t *, int); /* perform an ioctl on the file */ @@ -100,10 +100,8 @@ extern void default_poll_event( struct fd *fd, int event ); extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, struct iosb *iosb, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); -extern obj_handle_t no_fd_read( struct fd *fd, const async_data_t *async, int blocking, file_pos_t pos, - struct iosb *iosb ); -extern obj_handle_t no_fd_write( struct fd *fd, const async_data_t *async, int blocking, - file_pos_t pos, struct iosb *iosb ); +extern obj_handle_t no_fd_read( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); +extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blocking, file_pos_t pos ); extern obj_handle_t no_fd_flush( struct fd *fd, const async_data_t *async, int blocking ); extern obj_handle_t no_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); extern obj_handle_t default_fd_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); @@ -189,6 +187,8 @@ extern void async_wake_up( struct async_queue *queue, unsigned int status ); extern struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key ); extern void fd_copy_completion( struct fd *src, struct fd *dst ); extern struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ); +extern struct iosb *async_get_iosb( struct async *async ); +extern const async_data_t *async_get_data( struct async *async ); extern void cancel_process_asyncs( struct process *process ); /* access rights that require Unix read permission */

1 0

Jacek Caban : server: Allow creating async object not associated with a queue.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 91bd81441f3b5ab4760ff225e7d88c6b35ca3f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bd81441f3b5ab4760ff225e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 22:12:28 2017 +0100 server: Allow creating async object not associated with a queue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 41 ++++++++++++++++++++++++++--------------- server/fd.c | 14 +++++++++----- server/file.h | 4 ++-- server/named_pipe.c | 6 ++++-- server/sock.c | 6 ++++-- 5 files changed, 45 insertions(+), 26 deletions(-) diff --git a/server/async.c b/server/async.c index ef548d1..3de60b6 100644 --- a/server/async.c +++ b/server/async.c @@ -114,7 +114,7 @@ static const struct object_ops async_queue_ops = static inline void async_reselect( struct async *async ) { - if (async->queue->fd) fd_reselect_async( async->queue->fd, async->queue ); + if (async->queue && async->queue->fd) fd_reselect_async( async->queue->fd, async->queue ); } static void async_dump( struct object *obj, int verbose ) @@ -137,13 +137,17 @@ static void async_destroy( struct object *obj ) assert( obj->ops == &async_ops ); list_remove( &async->process_entry ); - list_remove( &async->queue_entry ); - async_reselect( async ); + + if (async->queue) + { + list_remove( &async->queue_entry ); + async_reselect( async ); + release_object( async->queue ); + } if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); if (async->iosb) release_object( async->iosb ); - release_object( async->queue ); release_object( async->thread ); } @@ -191,7 +195,7 @@ void async_terminate( struct async *async, unsigned int status ) else async_set_result( &async->obj, STATUS_SUCCESS, 0, 0, 0 ); async_reselect( async ); - release_object( async ); /* so that it gets destroyed when the async is done */ + if (async->queue) release_object( async ); /* so that it gets destroyed when the async is done */ } /* callback for timeout on an async request */ @@ -227,9 +231,18 @@ void free_async_queue( struct async_queue *queue ) release_object( queue ); } +void queue_async( struct async_queue *queue, struct async *async ) +{ + async->queue = (struct async_queue *)grab_object( queue ); + + grab_object( async ); + list_add_tail( &queue->queue, &async->queue_entry ); + + if (queue->fd) set_fd_signaled( queue->fd, 0 ); +} + /* create an async on a given queue of a fd */ -struct async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data, - struct iosb *iosb ) +struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ) { struct event *event = NULL; struct async *async; @@ -248,18 +261,15 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->status = STATUS_PENDING; async->data = *data; async->timeout = NULL; - async->queue = (struct async_queue *)grab_object( queue ); + async->queue = NULL; async->signaled = 0; if (iosb) async->iosb = (struct iosb *)grab_object( iosb ); else async->iosb = NULL; - list_add_tail( &queue->queue, &async->queue_entry ); list_add_head( &thread->process->asyncs, &async->process_entry ); - grab_object( async ); - - if (queue->fd) set_fd_signaled( queue->fd, 0 ); if (event) reset_event( event ); + return async; } @@ -318,7 +328,8 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota async->status = status; if (status == STATUS_MORE_PROCESSING_REQUIRED) return; /* don't report the completion */ - if (async->data.cvalue) add_async_completion( async->queue, async->data.cvalue, status, total ); + if (async->queue && async->data.cvalue) + add_async_completion( async->queue, async->data.cvalue, status, total ); if (apc) { apc_call_t data; @@ -331,7 +342,7 @@ void async_set_result( struct object *obj, unsigned int status, apc_param_t tota thread_queue_apc( async->thread, NULL, &data ); } if (async->event) set_event( async->event ); - else if (async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); + else if (async->queue && async->queue->fd) set_fd_signaled( async->queue->fd, 1 ); async->signaled = 1; wake_up( &async->obj, 0 ); } @@ -364,7 +375,7 @@ restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { if (async->status == STATUS_CANCELLED) continue; - if ((!obj || (async->queue->fd && get_fd_user( async->queue->fd ) == obj)) && + if ((!obj || (async->queue && async->queue->fd && get_fd_user( async->queue->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) { diff --git a/server/fd.c b/server/fd.c index 732a5b7..31d0f4a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2054,12 +2054,16 @@ struct async *fd_queue_async( struct fd *fd, const async_data_t *data, struct io assert(0); } - if ((async = create_async( current, queue, data, iosb )) && type != ASYNC_TYPE_WAIT) + if ((async = create_async( current, data, iosb ))) { - if (!fd->inode) - set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); - else /* regular files are always ready for read and write */ - async_wake_up( queue, STATUS_ALERTED ); + queue_async( queue, async ); + if (type != ASYNC_TYPE_WAIT) + { + if (!fd->inode) + set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); + else /* regular files are always ready for read and write */ + async_wake_up( queue, STATUS_ALERTED ); + } } return async; } diff --git a/server/file.h b/server/file.h index c5867a6..af497da 100644 --- a/server/file.h +++ b/server/file.h @@ -177,8 +177,8 @@ extern struct object *create_serial( struct fd *fd ); /* async I/O functions */ extern struct async_queue *create_async_queue( struct fd *fd ); extern void free_async_queue( struct async_queue *queue ); -extern struct async *create_async( struct thread *thread, struct async_queue *queue, - const async_data_t *data, struct iosb *iosb ); +extern struct async *create_async( struct thread *thread, const async_data_t *data, struct iosb *iosb ); +extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total, client_ptr_t apc, client_ptr_t apc_arg ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 3245688..4eee875 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -838,6 +838,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, struct named_pipe *pipe; struct pipe_server *server; struct unicode_str name; + timeout_t when; if (size < sizeof(*buffer) || size < FIELD_OFFSET(FILE_PIPE_WAIT_FOR_BUFFER, Name[buffer->NameLength/sizeof(WCHAR)])) @@ -855,9 +856,10 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; - if ((async = create_async( current, pipe->waiters, async_data, NULL ))) + if ((async = create_async( current, async_data, NULL ))) { - timeout_t when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout; + queue_async( pipe->waiters, async ); + when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout; async_set_timeout( async, when, STATUS_IO_TIMEOUT ); if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); release_object( async ); diff --git a/server/sock.c b/server/sock.c index f70a85d..e9369e5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -552,7 +552,8 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a return 0; } if (!(ifchange_q = sock_get_ifchange_q( sock ))) return 0; - if (!(async = create_async( current, ifchange_q, async_data, NULL ))) return 0; + if (!(async = create_async( current, async_data, NULL ))) return 0; + queue_async( ifchange_q, async ); if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); release_object( async ); set_error( STATUS_PENDING ); @@ -593,7 +594,8 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, return; } - if (!(async = create_async( current, queue, data, NULL ))) return; + if (!(async = create_async( current, data, NULL ))) return; + queue_async( queue, async ); release_object( async ); sock_reselect( sock );

1 0

Jacek Caban : server: Removed no longer needed user_arg from irp_call struct.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 13daca6f1af97285463e57cd680b6da8a5c14e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13daca6f1af97285463e57cd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 22:12:20 2017 +0100 server: Removed no longer needed user_arg from irp_call struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/device.c b/server/device.c index a7dce3b..bece6a8 100644 --- a/server/device.c +++ b/server/device.c @@ -48,7 +48,6 @@ struct irp_call struct list mgr_entry; /* entry in manager queue */ struct device_file *file; /* file containing this irp */ struct thread *thread; /* thread that queued the irp */ - client_ptr_t user_arg; /* user arg used to identify the request */ struct async *async; /* pending async op */ irp_params_t params; /* irp parameters */ struct iosb *iosb; /* I/O status block */ @@ -480,7 +479,6 @@ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, if (handle) close_handle( current->process, handle ); return 0; } - irp->user_arg = async_data->arg; add_irp_to_queue( file, irp, current ); set_error( STATUS_PENDING ); return handle;

1 0

Jacek Caban : ole32: Use generic class factory for StdComponentCategoriesMgr object.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: fd09c37b4938826732b460e7e0a09606ccb4f2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd09c37b4938826732b460e7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:20:18 2017 +0100 ole32: Use generic class factory for StdComponentCategoriesMgr object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/comcat.c | 78 +-------------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 ++++++++- 3 files changed, 14 insertions(+), 79 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index eb5a927..d43c3af 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -700,53 +700,7 @@ static const ICatInformationVtbl COMCAT_ICatInformation_Vtbl = COMCAT_ICatInformation_EnumReqCategoriesOfClass }; -/********************************************************************** - * COMCAT_IClassFactory_QueryInterface (also IUnknown) - */ -static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( - LPCLASSFACTORY iface, - REFIID riid, - LPVOID *ppvObj) -{ - TRACE("%s\n",debugstr_guid(riid)); - - if (ppvObj == NULL) return E_POINTER; - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IClassFactory)) - { - *ppvObj = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - - return E_NOINTERFACE; -} - -/********************************************************************** - * COMCAT_IClassFactory_AddRef (also IUnknown) - */ -static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -/********************************************************************** - * COMCAT_IClassFactory_Release (also IUnknown) - */ -static ULONG WINAPI COMCAT_IClassFactory_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -/********************************************************************** - * COMCAT_IClassFactory_CreateInstance - */ -static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, - REFIID riid, - LPVOID *ppvObj) +HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppvObj) { HRESULT res; TRACE("%s\n",debugstr_guid(riid)); @@ -765,36 +719,6 @@ static HRESULT WINAPI COMCAT_IClassFactory_CreateInstance( } /********************************************************************** - * COMCAT_IClassFactory_LockServer - */ -static HRESULT WINAPI COMCAT_IClassFactory_LockServer( - LPCLASSFACTORY iface, - BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -/********************************************************************** - * static ClassFactory instance - */ -static const IClassFactoryVtbl ComCatCFVtbl = -{ - COMCAT_IClassFactory_QueryInterface, - COMCAT_IClassFactory_AddRef, - COMCAT_IClassFactory_Release, - COMCAT_IClassFactory_CreateInstance, - COMCAT_IClassFactory_LockServer -}; - -static const IClassFactoryVtbl *ComCatCF = &ComCatCFVtbl; - -HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&ComCatCF, riid, ppv); -} - -/********************************************************************** * IEnumCATEGORYINFO implementation * * This implementation is not thread-safe. The manager itself is, but diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 7438fe0..eaeed54 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -36,7 +36,7 @@ HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ComCat_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ int FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** stringTable) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index faceced..bc8e1ea 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -139,6 +139,17 @@ static const IClassFactoryVtbl PointerMonikerCFVtbl = static IClassFactory PointerMonikerCF = { &PointerMonikerCFVtbl }; +static const IClassFactoryVtbl ComCatCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ComCat_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ComCatCF = { &ComCatCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -168,7 +179,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) return IClassFactory_QueryInterface(&PointerMonikerCF, iid, ppv); if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) - return ComCatCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&ComCatCF, iid, ppv); hr = OLE32_DllGetClassObject(rclsid, iid, ppv); if (SUCCEEDED(hr))

1 0

Jacek Caban : ole32: Use generic class factory for pointer moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 076c78220d06cd788c59a99856421af94124fd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076c78220d06cd788c59a9985… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:20:09 2017 +0100 ole32: Use generic class factory for pointer moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 +++++++++++- dlls/ole32/pointermoniker.c | 48 ++------------------------------------------- 3 files changed, 15 insertions(+), 48 deletions(-) diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 24011c0..7438fe0 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -35,7 +35,7 @@ HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; /* This function decomposes a String path to a String Table containing all the elements ("\" or "subDirectory" or "Directory" or "FileName") of the path */ diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 80f6935..faceced 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -128,6 +128,17 @@ static const IClassFactoryVtbl ClassMonikerCFVtbl = static IClassFactory ClassMonikerCF = { &ClassMonikerCFVtbl }; +static const IClassFactoryVtbl PointerMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + PointerMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory PointerMonikerCF = { &PointerMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -155,7 +166,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) return IClassFactory_QueryInterface(&ClassMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) - return PointerMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&PointerMonikerCF, iid, ppv); if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) return ComCatCF_Create(iid, ppv); diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 3737600..a62ce3e 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -588,31 +588,8 @@ HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) return S_OK; } -static HRESULT WINAPI PointerMonikerCF_QueryInterface(LPCLASSFACTORY iface, - REFIID riid, LPVOID *ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI PointerMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI PointerMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI PointerMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI PointerMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { IMoniker *pMoniker; HRESULT hr; @@ -635,24 +612,3 @@ static HRESULT WINAPI PointerMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI PointerMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl PointerMonikerCFVtbl = -{ - PointerMonikerCF_QueryInterface, - PointerMonikerCF_AddRef, - PointerMonikerCF_Release, - PointerMonikerCF_CreateInstance, - PointerMonikerCF_LockServer -}; -static const IClassFactoryVtbl *PointerMonikerCF = &PointerMonikerCFVtbl; - -HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&PointerMonikerCF, riid, ppv); -}

1 0

Jacek Caban : ole32: Use generic class factory for class moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 961c3dc454bca3e53ed939ab80fd28fe0778e7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961c3dc454bca3e53ed939ab8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:47 2017 +0100 ole32: Use generic class factory for class moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 48 ++--------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 ++++++++++++- 3 files changed, 15 insertions(+), 48 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 22c76bf..ebad794 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -804,30 +804,8 @@ HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LP return hr; } -static HRESULT WINAPI ClassMonikerCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI ClassMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI ClassMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI ClassMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { HRESULT hr; IMoniker *pmk; @@ -847,25 +825,3 @@ static HRESULT WINAPI ClassMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI ClassMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl ClassMonikerCFVtbl = -{ - ClassMonikerCF_QueryInterface, - ClassMonikerCF_AddRef, - ClassMonikerCF_Release, - ClassMonikerCF_CreateInstance, - ClassMonikerCF_LockServer -}; - -static IClassFactory ClassMonikerCF = { &ClassMonikerCFVtbl }; - -HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface(&ClassMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 8e0d187..24011c0 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -34,7 +34,7 @@ HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ClassMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index ee3e120..80f6935 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -117,6 +117,17 @@ static const IClassFactoryVtbl CompositeMonikerCFVtbl = static IClassFactory CompositeMonikerCF = { &CompositeMonikerCFVtbl }; +static const IClassFactoryVtbl ClassMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ClassMonikerCF = { &ClassMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -142,7 +153,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker)) return IClassFactory_QueryInterface(&CompositeMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) - return ClassMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&ClassMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker)) return PointerMonikerCF_Create(iid, ppv); if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr))

1 0

Jacek Caban : ole32: Use generic class factory for composite moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 947c9ba2ca7b25fe53a41275d725d1e8f0a15eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947c9ba2ca7b25fe53a41275d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:39 2017 +0100 ole32: Use generic class factory for composite moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 47 ++----------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 +++++++++++- 3 files changed, 15 insertions(+), 47 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 579fe4c..75d97fa 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1989,30 +1989,8 @@ MonikerCommonPrefixWith(IMoniker* pmkThis,IMoniker* pmkOther,IMoniker** ppmkComm return E_NOTIMPL; } -static HRESULT WINAPI CompositeMonikerCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI CompositeMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI CompositeMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI CompositeMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { IMoniker* pMoniker; HRESULT hr; @@ -2034,24 +2012,3 @@ static HRESULT WINAPI CompositeMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI CompositeMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl CompositeMonikerCFVtbl = -{ - CompositeMonikerCF_QueryInterface, - CompositeMonikerCF_AddRef, - CompositeMonikerCF_Release, - CompositeMonikerCF_CreateInstance, - CompositeMonikerCF_LockServer -}; -static const IClassFactoryVtbl *CompositeMonikerCF = &CompositeMonikerCFVtbl; - -HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&CompositeMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 8af2d9e..8e0d187 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -33,7 +33,7 @@ DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI CompositeMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 52249a2..ee3e120 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -106,6 +106,17 @@ static const IClassFactoryVtbl AntiMonikerCFVtbl = static IClassFactory AntiMonikerCF = { &AntiMonikerCFVtbl }; +static const IClassFactoryVtbl CompositeMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + CompositeMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory CompositeMonikerCF = { &CompositeMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -129,7 +140,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker)) return IClassFactory_QueryInterface(&AntiMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker)) - return CompositeMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&CompositeMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker)) return ClassMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_PointerMoniker))

1 0

Jacek Caban : ole32: Use generic class factory for anti moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: b05fd4689e827dc64ef520c140ca0c5d5bde16cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05fd4689e827dc64ef520c14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:32 2017 +0100 ole32: Use generic class factory for anti moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/antimoniker.c | 47 ++--------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 ++++++++++++- 3 files changed, 15 insertions(+), 47 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index a99b1b7..f7912fa 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -628,30 +628,8 @@ HRESULT WINAPI CreateAntiMoniker(IMoniker **ppmk) (void**)ppmk); } -static HRESULT WINAPI AntiMonikerCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI AntiMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI AntiMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI AntiMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { IMoniker *pMoniker; HRESULT hr; @@ -674,24 +652,3 @@ static HRESULT WINAPI AntiMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI AntiMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl AntiMonikerCFVtbl = -{ - AntiMonikerCF_QueryInterface, - AntiMonikerCF_AddRef, - AntiMonikerCF_Release, - AntiMonikerCF_CreateInstance, - AntiMonikerCF_LockServer -}; -static const IClassFactoryVtbl *AntiMonikerCF = &AntiMonikerCFVtbl; - -HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&AntiMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index a811366..8af2d9e 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -32,7 +32,7 @@ DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI AntiMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT PointerMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index b7a11a1..52249a2 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -95,6 +95,17 @@ static const IClassFactoryVtbl ItemMonikerCFVtbl = static IClassFactory ItemMonikerCF = { &ItemMonikerCFVtbl }; +static const IClassFactoryVtbl AntiMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + AntiMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory AntiMonikerCF = { &AntiMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -116,7 +127,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) return IClassFactory_QueryInterface(&ItemMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker)) - return AntiMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&AntiMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker)) return CompositeMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ClassMoniker))

1 0

Jacek Caban : ole32: Use generic class factory for item moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: dee64631ffeda2dffe4bb5d75405bbdf29873630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee64631ffeda2dffe4bb5d75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:24 2017 +0100 ole32: Use generic class factory for item moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 50 +++--------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 ++++++++++++- 3 files changed, 16 insertions(+), 49 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 67bef5f..14beada 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -948,39 +948,16 @@ HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, IMoni hr = ItemMonikerImpl_Construct(newItemMoniker,lpszDelim,lpszItem); if (FAILED(hr)){ - HeapFree(GetProcessHeap(),0,newItemMoniker); - return hr; + return hr; } return ItemMonikerImpl_QueryInterface(&newItemMoniker->IMoniker_iface,&IID_IMoniker, (void**)ppmk); } -static HRESULT WINAPI ItemMonikerCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI ItemMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI ItemMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI ItemMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { ItemMonikerImpl* newItemMoniker; HRESULT hr; @@ -1006,24 +983,3 @@ static HRESULT WINAPI ItemMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI ItemMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl ItemMonikerCFVtbl = -{ - ItemMonikerCF_QueryInterface, - ItemMonikerCF_AddRef, - ItemMonikerCF_Release, - ItemMonikerCF_CreateInstance, - ItemMonikerCF_LockServer -}; -static const IClassFactoryVtbl *ItemMonikerCF = &ItemMonikerCFVtbl; - -HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&ItemMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 2b08384..a811366 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -31,7 +31,7 @@ DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index ba0703d..b7a11a1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -84,6 +84,17 @@ static const IClassFactoryVtbl FileMonikerCFVtbl = static IClassFactory FileMonikerCF = { &FileMonikerCFVtbl }; +static const IClassFactoryVtbl ItemMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ItemMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ItemMonikerCF = { &ItemMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -103,7 +114,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) - return ItemMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&ItemMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker)) return AntiMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker))

1 0

Jacek Caban : ole32: Added generic class factory implementation and use it for file moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: cf7883f3960f20f1ed652d119269be9ad60c938f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7883f3960f20f1ed652d119… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:12 2017 +0100 ole32: Added generic class factory implementation and use it for file moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 47 +---------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 3cd7da4..271e5bb 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1541,31 +1541,7 @@ HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, } -static HRESULT WINAPI FileMonikerCF_QueryInterface(LPCLASSFACTORY iface, - REFIID riid, LPVOID *ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI FileMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI FileMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv) { FileMonikerImpl* newFileMoniker; HRESULT hr; @@ -1591,24 +1567,3 @@ static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI FileMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl FileMonikerCFVtbl = -{ - FileMonikerCF_QueryInterface, - FileMonikerCF_AddRef, - FileMonikerCF_Release, - FileMonikerCF_CreateInstance, - FileMonikerCF_LockServer -}; -static const IClassFactoryVtbl *FileMonikerCF = &FileMonikerCFVtbl; - -HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&FileMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index c23e9d3..2b08384 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -30,7 +30,7 @@ DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); -HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 8351f27..ba0703d 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -39,6 +39,51 @@ #include "moniker.h" #include "comcat.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%x)\n", fLock); + return S_OK; +} + +static const IClassFactoryVtbl FileMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + FileMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory FileMonikerCF = { &FileMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -56,7 +101,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualIID(rclsid,&CLSID_StdGlobalInterfaceTable) && (IsEqualIID(iid,&IID_IClassFactory) || IsEqualIID(iid,&IID_IUnknown))) return StdGlobalInterfaceTable_GetFactory(ppv); if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) - return FileMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) return ItemMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker))

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017