February 2017 - Wine-Commits

Henri Verbeet : usp10: Iterate in visual order in GPOS_apply_feature().
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: b6d541cac50d14314a6ffde9dd32d4b9644e1192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d541cac50d14314a6ffde9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:34 2017 +0100 usp10: Iterate in visual order in GPOS_apply_feature(). In particular, cursive attachment application depends on previous visual order glyph offsets. Affects e.g. wordpad with Nastaliq fonts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9549d9f..5c257dd 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -882,15 +882,17 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W static VOID GPOS_apply_feature(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, LoadedFeature *feature, const WORD *glyphs, INT glyph_count, GOFFSET *pGoffset) { - int i; + int dir = analysis->fLogicalOrder && analysis->fRTL ? -1 : 1; + unsigned int start_idx, i, j; TRACE("%i lookups\n", feature->lookup_count); + + start_idx = dir < 0 ? glyph_count - 1 : 0; for (i = 0; i < feature->lookup_count; i++) { - int j; for (j = 0; j < glyph_count; ) j += OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, - feature->lookups[i], glyphs, j, glyph_count, pGoffset); + feature->lookups[i], glyphs, start_idx + dir * j, glyph_count, pGoffset); } }

1 0

Henri Verbeet : usp10: Return the logical offset in GPOS_apply_lookup().
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 6fec9b1325e47a279554be54fbd964c5667f9816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fec9b1325e47a279554be54f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:33 2017 +0100 usp10: Return the logical offset in GPOS_apply_lookup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 8 ++++---- dlls/usp10/shape.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 0cf474d..e3aaf16 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2349,7 +2349,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG GPOS_convert_design_units_to_device(lpotm, lplogfont, advance[1].x, advance[1].y, &devX, &devY); piAdvance[glyph_index + write_dir] += round(devX); } - return glyph_index + index_offset; + return index_offset; } case GPOS_LOOKUP_ATTACH_CURSIVE: @@ -2417,17 +2417,17 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } case GPOS_LOOKUP_POSITION_CONTEXT: - return glyph_index + GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); case GPOS_LOOKUP_POSITION_CONTEXT_CHAINED: - return glyph_index + GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); default: FIXME("Unhandled GPOS lookup type %#x.\n", type); } - return glyph_index+1; + return 1; } INT OpenType_apply_GPOS_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, INT lookup_index, const WORD *glyphs, INT glyph_index, INT glyph_count, GOFFSET *pGoffset) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bf333b2..9549d9f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -889,7 +889,8 @@ static VOID GPOS_apply_feature(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPL { int j; for (j = 0; j < glyph_count; ) - j = OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, feature->lookups[i], glyphs, j, glyph_count, pGoffset); + j += OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, + feature->lookups[i], glyphs, j, glyph_count, pGoffset); } }

1 0

Henri Verbeet : usp10: Introduce an enumeration for GPOS lookup types.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: 61e8a388b2628d90c604c100e762abd0d85ef67f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e8a388b2628d90c604c100e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:29 2017 +0100 usp10: Introduce an enumeration for GPOS lookup types. As opposed to using magic numbers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 57 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a9aa4f4..a67bba7 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -48,6 +48,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); /* These are all structures needed for the cmap format 12 table */ #define CMAP_TAG MS_MAKE_TAG('c', 'm', 'a', 'p') +enum gpos_lookup_type +{ + GPOS_LOOKUP_ADJUST_SINGLE = 0x1, + GPOS_LOOKUP_ADJUST_PAIR = 0x2, + GPOS_LOOKUP_ATTACH_CURSIVE = 0x3, + GPOS_LOOKUP_ATTACH_MARK_TO_BASE = 0x4, + GPOS_LOOKUP_ATTACH_MARK_TO_LIGATURE = 0x5, + GPOS_LOOKUP_ATTACH_MARK_TO_MARK = 0x6, + GPOS_LOOKUP_POSITION_CONTEXT = 0x7, + GPOS_LOOKUP_POSITION_CONTEXT_CHAINED = 0x8, + GPOS_LOOKUP_POSITION_EXTENSION = 0x9, +}; + typedef struct { WORD platformID; WORD encodingID; @@ -1587,7 +1600,7 @@ static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) { int offset = GET_BE_WORD(look->SubTable[index]); - if (GET_BE_WORD(look->LookupType) == 9) + if (GET_BE_WORD(look->LookupType) == GPOS_LOOKUP_POSITION_EXTENSION) { const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + offset); if (GET_BE_WORD(ext->PosFormat) == 1) @@ -2250,13 +2263,15 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG int offset; const OT_LookupTable *look; int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; - WORD type; + enum gpos_lookup_type type; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); type = GET_BE_WORD(look->LookupType); - TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - if (type == 9) + TRACE("type %#x, flag %#x, subtables %u.\n", type, + GET_BE_WORD(look->LookupFlag), GET_BE_WORD(look->SubTableCount)); + + if (type == GPOS_LOOKUP_POSITION_EXTENSION) { if (GET_BE_WORD(look->SubTableCount)) { @@ -2278,7 +2293,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } switch (type) { - case 1: + case GPOS_LOOKUP_ADJUST_SINGLE: { double devX, devY; POINT adjust = {0,0}; @@ -2299,7 +2314,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 2: + + case GPOS_LOOKUP_ADJUST_PAIR: { POINT advance[2]= {{0,0},{0,0}}; POINT adjust[2]= {{0,0},{0,0}}; @@ -2333,7 +2349,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } return index; } - case 3: + + case GPOS_LOOKUP_ATTACH_CURSIVE: { POINT desU = {0,0}; double devX, devY; @@ -2348,7 +2365,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 4: + + case GPOS_LOOKUP_ATTACH_MARK_TO_BASE: { double devX, devY; POINT desU = {0,0}; @@ -2366,7 +2384,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 5: + + case GPOS_LOOKUP_ATTACH_MARK_TO_LIGATURE: { double devX, devY; POINT desU = {0,0}; @@ -2379,7 +2398,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 6: + + case GPOS_LOOKUP_ATTACH_MARK_TO_MARK: { double devX, devY; POINT desU = {0,0}; @@ -2393,14 +2413,17 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 7: - return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); - case 8: - { - return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); - } + + case GPOS_LOOKUP_POSITION_CONTEXT: + return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); + + case GPOS_LOOKUP_POSITION_CONTEXT_CHAINED: + return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); + default: - FIXME("We do not handle SubType %i\n",type); + FIXME("Unhandled GPOS lookup type %#x.\n", type); } return glyph_index+1; }

1 0

Nikolay Sivov : comdlg32: Use GetPropW() to get to file dialog data.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: b47de18ce140cfa5606c5dd3893ddafa204bd847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47de18ce140cfa5606c5dd38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 15:35:17 2017 +0300 comdlg32: Use GetPropW() to get to file dialog data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 63 ++++++++++++++++++++++-------------------- dlls/comdlg32/filedlgbrowser.c | 16 +++++------ dlls/comdlg32/filedlgbrowser.h | 2 +- 3 files changed, 42 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b47de18ce140cfa5606c5…

1 0

Nikolay Sivov : comdlg32: Consolidate file dialog initialization to avoid duplication.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: c23a91cb638262f1d60f4437650c7440d3c70c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23a91cb638262f1d60f44376… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 15:35:16 2017 +0300 comdlg32: Consolidate file dialog initialization to avoid duplication. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 365 ++++++++++++++++++++---------------------------- 1 file changed, 154 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c23a91cb638262f1d60f4…

1 0

Jacek Caban : server: Create async object in register_async handler.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

Module: wine Branch: master Commit: a604db12612afccd789e4c09884c3c35dc8f1562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a604db12612afccd789e4c098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 15 22:12:45 2017 +0100 server: Create async object in register_async handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 15 +++++++++------ server/file.h | 6 +++--- server/mailslot.c | 7 +++---- server/serial.c | 7 +++---- server/sock.c | 8 ++------ 5 files changed, 20 insertions(+), 23 deletions(-) diff --git a/server/fd.c b/server/fd.c index 202bd56..4aa1b1d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2091,16 +2091,14 @@ void fd_reselect_async( struct fd *fd, struct async_queue *queue ) fd->fd_ops->reselect_async( fd, queue ); } -void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); } -void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ) { - struct async *async; - - if ((async = fd_queue_async( fd, data, NULL, type ))) + if ((async = fd_queue_async( fd, async_get_data( async ), NULL, type ))) { release_object( async ); set_error( STATUS_PENDING ); @@ -2509,6 +2507,7 @@ DECL_HANDLER(ioctl) DECL_HANDLER(register_async) { unsigned int access; + struct async *async; struct fd *fd; switch(req->type) @@ -2526,7 +2525,11 @@ DECL_HANDLER(register_async) if ((fd = get_handle_fd_obj( current->process, req->async.handle, access ))) { - if (get_unix_fd( fd ) != -1) fd->fd_ops->queue_async( fd, &req->async, req->type, req->count ); + if (get_unix_fd( fd ) != -1 && (async = create_async( current, &req->async, NULL ))) + { + fd->fd_ops->queue_async( fd, async, req->type, req->count ); + release_object( async ); + } release_object( fd ); } } diff --git a/server/file.h b/server/file.h index 3605053..98a1e84 100644 --- a/server/file.h +++ b/server/file.h @@ -60,7 +60,7 @@ struct fd_ops /* perform an ioctl on the file */ obj_handle_t (*ioctl)(struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); /* queue an async operation */ - void (*queue_async)(struct fd *, const async_data_t *data, int type, int count); + void (*queue_async)(struct fd *, struct async *async, int type, int count); /* selected events for async i/o need an update */ void (*reselect_async)( struct fd *, struct async_queue *queue ); }; @@ -105,8 +105,8 @@ extern obj_handle_t no_fd_write( struct fd *fd, struct async *async, int blockin 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 ); -extern void no_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); -extern void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); +extern void default_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); extern void default_fd_reselect_async( struct fd *fd, struct async_queue *queue ); extern void main_loop(void); extern void remove_process_locks( struct process *process ); diff --git a/server/mailslot.c b/server/mailslot.c index 783b28b..20bf99c 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -94,7 +94,7 @@ static const struct object_ops mailslot_ops = }; static enum server_fd_type mailslot_get_fd_type( struct fd *fd ); -static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void mailslot_queue_async( struct fd *fd, struct async *async, int type, int count ); static const struct fd_ops mailslot_fd_ops = { @@ -325,14 +325,13 @@ static struct object *mailslot_open_file( struct object *obj, unsigned int acces return &writer->obj; } -static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +static void mailslot_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct mailslot *mailslot = get_fd_user( fd ); - struct async *async; assert(mailslot->obj.ops == &mailslot_ops); - if ((async = fd_queue_async( fd, data, NULL, type ))) + if ((async = fd_queue_async( fd, async_get_data( async ), NULL, type ))) { async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, STATUS_IO_TIMEOUT ); diff --git a/server/serial.c b/server/serial.c index 6f9cc24..58170cd 100644 --- a/server/serial.c +++ b/server/serial.c @@ -61,7 +61,7 @@ static struct fd *serial_get_fd( struct object *obj ); static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); -static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void serial_queue_async( struct fd *fd, struct async *async, int type, int count ); static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); struct serial @@ -183,11 +183,10 @@ static enum server_fd_type serial_get_fd_type( struct fd *fd ) return FD_TYPE_SERIAL; } -static void serial_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +static void serial_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct serial *serial = get_fd_user( fd ); timeout_t timeout = 0; - struct async *async; assert(serial->obj.ops == &serial_ops); @@ -201,7 +200,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ break; } - if ((async = fd_queue_async( fd, data, NULL, type ))) + if ((async = fd_queue_async( fd, async_get_data( async ), NULL, type ))) { if (timeout) async_set_timeout( async, timeout * -10000, STATUS_TIMEOUT ); release_object( async ); diff --git a/server/sock.c b/server/sock.c index e9369e5..c997bf3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -130,7 +130,7 @@ static int sock_get_poll_events( struct fd *fd ); static void sock_poll_event( struct fd *fd, int event ); static enum server_fd_type sock_get_fd_type( struct fd *fd ); static obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async, int blocking ); -static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ); +static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ); static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); static int sock_get_ntstatus( int err ); @@ -564,10 +564,9 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a } } -static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, int count ) +static void sock_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct sock *sock = get_fd_user( fd ); - struct async *async; struct async_queue *queue; assert( sock->obj.ops == &sock_ops ); @@ -594,10 +593,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, return; } - if (!(async = create_async( current, data, NULL ))) return; queue_async( queue, async ); - release_object( async ); - sock_reselect( sock ); set_error( STATUS_PENDING );

1 0

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

Feb. 21, 2017

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 Feb. 21, 2017

Feb. 21, 2017

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 : ole32: Use generic class factory for StdComponentCategoriesMgr object.
by Alexandre Julliard Feb. 21, 2017

Feb. 21, 2017

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 Feb. 21, 2017

Feb. 21, 2017

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