December 2016 - Wine-Commits

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: f6de3806a759a69d89b0220c9847f82f4b609ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6de3806a759a69d89b0220c9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 5 00:37:12 2016 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/po/ja.po b/po/ja.po index 670b46d..d5b26a9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-08-20 14:33+0900\n" +"PO-Revision-Date: 2016-12-04 21:37+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -8028,10 +8028,8 @@ msgid "Wine was brought to you by:" msgstr "Wine の提供:" #: shell32.rc:334 -#, fuzzy -#| msgid "&Run..." msgid "Run" -msgstr "実行(&R)..." +msgstr "実行" #: shell32.rc:338 msgid "" @@ -10502,10 +10500,8 @@ msgid "IPv6 address" msgstr "IPv6 アドレス" #: msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "システム設定" +msgstr "システム情報" #: net.rc:30 msgid "" @@ -14497,10 +14493,8 @@ msgid "Error: Invalid query\n" msgstr "エラー: クエリが無効です\n" #: wmic.rc:31 -#, fuzzy -#| msgid "reg: Invalid syntax. " msgid "Error: Invalid syntax for PATH\n" -msgstr "reg: 無効な構文です。" +msgstr "エラー: PATH の構文が無効です\n" #: wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -14575,36 +14569,32 @@ msgid "F&ormat" msgstr "書式(&O)" #: wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" -msgstr "一覧(&L)" +msgstr "箇条書きと段落番号(&L)" #: wordpad.rc:87 wordpad.rc:116 msgid "&Bullet points" msgstr "箇条書き(&B)" #: wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL ナンバー" +msgstr "段落番号" #: wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "アルファベット - 小文字" #: wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "アルファベット - 大文字" #: wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "ローマ数字 - 小文字" #: wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "ローマ数字 - 大文字" #: wordpad.rc:94 wordpad.rc:117 msgid "&Paragraph..."

1 0

Henri Verbeet : d2d1/tests: Introduce a helper function to add quadratic bezier curves to a geometry sink.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3d51a7164bde6604a11ccc53181e30cd7cf4a9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d51a7164bde6604a11ccc531… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:05 2016 +0100 d2d1/tests: Introduce a helper function to add quadratic bezier curves to a geometry sink. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3635131..f271103 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -138,6 +138,14 @@ static void line_to(ID2D1GeometrySink *sink, float x, float y) ID2D1GeometrySink_AddLine(sink, point); } +static void quadratic_to(ID2D1GeometrySink *sink, float x1, float y1, float x2, float y2) +{ + D2D1_QUADRATIC_BEZIER_SEGMENT quadratic; + + set_quadratic(&quadratic, x1, y1, x2, y2); + ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); +} + static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -1255,31 +1263,22 @@ static void fill_geometry_sink(ID2D1GeometrySink *sink) static void fill_geometry_sink_bezier(ID2D1GeometrySink *sink) { - D2D1_QUADRATIC_BEZIER_SEGMENT quadratic; D2D1_POINT_2F point; set_point(&point, 5.0f, 160.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_quadratic(&quadratic, 40.0f, 160.0f, 40.0f, 20.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 75.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 40.0f, 300.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 40.0f, 160.0f, 5.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); + quadratic_to(sink, 40.0f, 160.0f, 40.0f, 20.0f); + quadratic_to(sink, 40.0f, 160.0f, 75.0f, 160.0f); + quadratic_to(sink, 40.0f, 160.0f, 40.0f, 300.0f); + quadratic_to(sink, 40.0f, 160.0f, 5.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); set_point(&point, 20.0f, 160.0f); ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); - set_quadratic(&quadratic, 20.0f, 80.0f, 40.0f, 80.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 60.0f, 80.0f, 60.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 60.0f, 240.0f, 40.0f, 240.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); - set_quadratic(&quadratic, 20.0f, 240.0f, 20.0f, 160.0f); - ID2D1GeometrySink_AddQuadraticBezier(sink, &quadratic); + quadratic_to(sink, 20.0f, 80.0f, 40.0f, 80.0f); + quadratic_to(sink, 60.0f, 80.0f, 60.0f, 160.0f); + quadratic_to(sink, 60.0f, 240.0f, 40.0f, 240.0f); + quadratic_to(sink, 20.0f, 240.0f, 20.0f, 160.0f); ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); }

1 0

Jacek Caban : server: Use async object to transfer IRP result to client.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: d055d3d121efd9cab4d6356ca375f8122267007c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d055d3d121efd9cab4d6356ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 4 21:22:05 2016 +0100 server: Use async object to transfer IRP result to client. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 3 +-- include/wine/server_protocol.h | 40 +++++++++++++++---------------- server/async.c | 32 +++++++++++++++++++++++++ server/device.c | 53 +++--------------------------------------- server/protocol.def | 19 +++++++-------- server/request.h | 13 +++++------ server/trace.c | 29 +++++++++++------------ 7 files changed, 85 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d055d3d121efd9cab4d63…

1 0

Jacek Caban : server: Store iosb in async object.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 64dc8f5c48e7bffb17d3e0853d5f758d6ee3f9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dc8f5c48e7bffb17d3e0853… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 4 21:21:46 2016 +0100 server: Store iosb in async object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 9 ++++++++- server/change.c | 2 +- server/device.c | 2 +- server/fd.c | 6 +++--- server/file.h | 4 ++-- server/mailslot.c | 2 +- server/named_pipe.c | 6 +++--- server/serial.c | 2 +- server/sock.c | 4 ++-- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/server/async.c b/server/async.c index 568b440..562fcd0 100644 --- a/server/async.c +++ b/server/async.c @@ -47,6 +47,7 @@ struct async int signaled; struct event *event; async_data_t data; /* data for async I/O call */ + struct iosb *iosb; /* I/O status block */ }; static void async_dump( struct object *obj, int verbose ); @@ -141,6 +142,7 @@ static void async_destroy( struct object *obj ) 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 ); } @@ -172,6 +174,7 @@ void async_terminate( struct async *async, unsigned int status ) } async->status = status; + if (async->iosb && async->iosb->status == STATUS_PENDING) async->iosb->status = status; if (async->data.callback) { @@ -225,7 +228,8 @@ void free_async_queue( struct async_queue *queue ) } /* 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 async *create_async( struct thread *thread, struct async_queue *queue, const async_data_t *data, + struct iosb *iosb ) { struct event *event = NULL; struct async *async; @@ -247,6 +251,9 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->queue = (struct async_queue *)grab_object( queue ); 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_tail( &thread->process->asyncs, &async->process_entry ); grab_object( async ); diff --git a/server/change.c b/server/change.c index ee30b98..d7ebf3b 100644 --- a/server/change.c +++ b/server/change.c @@ -1246,7 +1246,7 @@ DECL_HANDLER(read_directory_changes) return; /* requests don't timeout */ - if (!(async = fd_queue_async( dir->fd, &req->async, ASYNC_TYPE_WAIT ))) goto end; + if (!(async = fd_queue_async( dir->fd, &req->async, NULL, ASYNC_TYPE_WAIT ))) goto end; /* assign it once */ if (!dir->filter) diff --git a/server/device.c b/server/device.c index 99d5204..60a15e2 100644 --- a/server/device.c +++ b/server/device.c @@ -488,7 +488,7 @@ static obj_handle_t queue_irp( struct device_file *file, struct irp_call *irp, if (blocking && !(handle = alloc_handle( current->process, irp, SYNCHRONIZE, 0 ))) return 0; - if (!(irp->async = fd_queue_async( file->fd, async_data, ASYNC_TYPE_WAIT ))) + if (!(irp->async = fd_queue_async( file->fd, async_data, irp->iosb, ASYNC_TYPE_WAIT ))) { if (handle) close_handle( current->process, handle ); return 0; diff --git a/server/fd.c b/server/fd.c index faf27bc..3ccd0f8 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2030,7 +2030,7 @@ void default_poll_event( struct fd *fd, int event ) else if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); } -struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ) +struct async *fd_queue_async( struct fd *fd, const async_data_t *data, struct iosb *iosb, int type ) { struct async_queue *queue; struct async *async; @@ -2054,7 +2054,7 @@ struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type assert(0); } - if ((async = create_async( current, queue, data )) && type != ASYNC_TYPE_WAIT) + if ((async = create_async( current, queue, data, iosb )) && type != ASYNC_TYPE_WAIT) { if (!fd->inode) set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); @@ -2096,7 +2096,7 @@ void default_fd_queue_async( struct fd *fd, const async_data_t *data, int type, { struct async *async; - if ((async = fd_queue_async( fd, data, type ))) + if ((async = fd_queue_async( fd, data, NULL, type ))) { release_object( async ); set_error( STATUS_PENDING ); diff --git a/server/file.h b/server/file.h index 0a144ee..94322c7 100644 --- a/server/file.h +++ b/server/file.h @@ -97,7 +97,7 @@ extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *ent extern unsigned int default_fd_map_access( struct object *obj, unsigned int access ); extern int default_fd_get_poll_events( struct fd *fd ); extern void default_poll_event( struct fd *fd, int event ); -extern struct async *fd_queue_async( struct fd *fd, const async_data_t *data, int type ); +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 ); @@ -177,7 +177,7 @@ extern struct object *create_serial( struct fd *fd ); 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 ); + const async_data_t *data, struct iosb *iosb ); 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/mailslot.c b/server/mailslot.c index 3ddfab5..783b28b 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -332,7 +332,7 @@ static void mailslot_queue_async( struct fd *fd, const async_data_t *data, int t assert(mailslot->obj.ops == &mailslot_ops); - if ((async = fd_queue_async( fd, data, type ))) + if ((async = fd_queue_async( fd, data, NULL, type ))) { async_set_timeout( async, mailslot->read_timeout ? mailslot->read_timeout : -1, STATUS_IO_TIMEOUT ); diff --git a/server/named_pipe.c b/server/named_pipe.c index d93c40f..3245688 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -555,7 +555,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_ if (!pipe_data_remaining( server )) return 0; - if ((async = fd_queue_async( server->fd, async_data, ASYNC_TYPE_WAIT ))) + if ((async = fd_queue_async( server->fd, async_data, NULL, ASYNC_TYPE_WAIT ))) { /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ if (!server->flush_poll) @@ -602,7 +602,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - if ((async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT ))) + if ((async = fd_queue_async( server->ioctl_fd, async_data, NULL, ASYNC_TYPE_WAIT ))) { if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); set_server_state( server, ps_wait_open ); @@ -855,7 +855,7 @@ 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 ))) + if ((async = create_async( current, pipe->waiters, async_data, NULL ))) { timeout_t when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout; async_set_timeout( async, when, STATUS_IO_TIMEOUT ); diff --git a/server/serial.c b/server/serial.c index df462ea..6f9cc24 100644 --- a/server/serial.c +++ b/server/serial.c @@ -201,7 +201,7 @@ static void serial_queue_async( struct fd *fd, const async_data_t *data, int typ break; } - if ((async = fd_queue_async( fd, data, type ))) + if ((async = fd_queue_async( fd, data, 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 a3c88a0..f70a85d 100644 --- a/server/sock.c +++ b/server/sock.c @@ -552,7 +552,7 @@ 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 ))) return 0; + if (!(async = create_async( current, ifchange_q, async_data, NULL ))) return 0; if (blocking) wait_handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); release_object( async ); set_error( STATUS_PENDING ); @@ -593,7 +593,7 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, return; } - if (!(async = create_async( current, queue, data ))) return; + if (!(async = create_async( current, queue, data, NULL ))) return; release_object( async ); sock_reselect( sock );

1 0

Jacek Caban : server: Introduced iosb struct for server-side IO_STATUS_BLOCK representation and use it in irp_call.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: d2b3c6c3f9e42cdb49225fbabc4db7e61f3c119b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b3c6c3f9e42cdb49225fbab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 4 21:21:25 2016 +0100 server: Introduced iosb struct for server-side IO_STATUS_BLOCK representation and use it in irp_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ server/device.c | 58 +++++++++++++++++++++++------------------------------ server/file.h | 13 ++++++++++++ 3 files changed, 100 insertions(+), 33 deletions(-) diff --git a/server/async.c b/server/async.c index 70ebf95..568b440 100644 --- a/server/async.c +++ b/server/async.c @@ -389,6 +389,68 @@ void async_wake_up( struct async_queue *queue, unsigned int status ) } } +static void iosb_dump( struct object *obj, int verbose ); +static void iosb_destroy( struct object *obj ); + +static const struct object_ops iosb_ops = +{ + sizeof(struct iosb), /* size */ + iosb_dump, /* dump */ + no_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_close_handle, /* close_handle */ + iosb_destroy /* destroy */ +}; + +static void iosb_dump( struct object *obj, int verbose ) +{ + assert( obj->ops == &iosb_ops ); + fprintf( stderr, "I/O status block\n" ); +} + +static void iosb_destroy( struct object *obj ) +{ + struct iosb *iosb = (struct iosb *)obj; + + free( iosb->in_data ); + free( iosb->out_data ); +} + +/* allocate iosb struct */ +struct iosb *create_iosb( const void *in_data, data_size_t in_size, data_size_t out_size ) +{ + struct iosb *iosb; + + if (!(iosb = alloc_object( &iosb_ops ))) return NULL; + + iosb->status = STATUS_PENDING; + iosb->result = 0; + iosb->in_size = in_size; + iosb->in_data = NULL; + iosb->out_size = out_size; + iosb->out_data = NULL; + + if (in_size && !(iosb->in_data = memdup( in_data, in_size ))) + { + release_object( iosb ); + iosb = NULL; + } + + return iosb; +} + /* cancels all async I/O */ DECL_HANDLER(cancel_async) { diff --git a/server/device.c b/server/device.c index 2a34cfb..99d5204 100644 --- a/server/device.c +++ b/server/device.c @@ -50,13 +50,8 @@ struct irp_call 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 */ - unsigned int status; /* resulting status (or STATUS_PENDING) */ irp_params_t params; /* irp parameters */ - data_size_t result; /* size of result (input or output depending on the type) */ - data_size_t in_size; /* size of input data */ - void *in_data; /* input data */ - data_size_t out_size; /* size of output data */ - void *out_data; /* output data */ + struct iosb *iosb; /* I/O status block */ }; static void irp_call_dump( struct object *obj, int verbose ); @@ -241,13 +236,12 @@ static void irp_call_destroy( struct object *obj ) { struct irp_call *irp = (struct irp_call *)obj; - free( irp->in_data ); - free( irp->out_data ); if (irp->async) { async_terminate( irp->async, STATUS_CANCELLED ); release_object( irp->async ); } + if (irp->iosb) release_object( irp->iosb ); if (irp->file) release_object( irp->file ); if (irp->thread) release_object( irp->thread ); } @@ -269,14 +263,8 @@ static struct irp_call *create_irp( struct device_file *file, const irp_params_t irp->thread = NULL; irp->async = NULL; irp->params = *params; - irp->status = STATUS_PENDING; - irp->result = 0; - irp->in_size = in_size; - irp->in_data = NULL; - irp->out_size = out_size; - irp->out_data = NULL; - - if (irp->in_size && !(irp->in_data = memdup( in_data, in_size ))) + + if (!(irp->iosb = create_iosb( in_data, in_size, out_size ))) { release_object( irp ); irp = NULL; @@ -289,15 +277,16 @@ static void set_irp_result( struct irp_call *irp, unsigned int status, const void *out_data, data_size_t out_size, data_size_t result ) { struct device_file *file = irp->file; + struct iosb *iosb = irp->iosb; if (!file) return; /* already finished */ /* FIXME: handle the STATUS_PENDING case */ - irp->status = status; - irp->result = result; - irp->out_size = min( irp->out_size, out_size ); - if (irp->out_size && !(irp->out_data = memdup( out_data, irp->out_size ))) - irp->out_size = 0; + iosb->status = status; + iosb->result = result; + iosb->out_size = min( iosb->out_size, out_size ); + if (iosb->out_size && !(iosb->out_data = memdup( out_data, iosb->out_size ))) + iosb->out_size = 0; irp->file = NULL; if (irp->async) { @@ -761,6 +750,7 @@ DECL_HANDLER(get_next_device_request) struct irp_call *irp; struct device_manager *manager; struct list *ptr; + struct iosb *iosb; reply->params.major = IRP_MJ_MAXIMUM_FUNCTION + 1; @@ -788,14 +778,15 @@ DECL_HANDLER(get_next_device_request) reply->client_tid = get_thread_id( irp->thread ); } reply->params = irp->params; - reply->in_size = irp->in_size; - reply->out_size = irp->out_size; - if (irp->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); + iosb = irp->iosb; + reply->in_size = iosb->in_size; + reply->out_size = iosb->out_size; + if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if ((reply->next = alloc_handle( current->process, irp, 0, 0 ))) { - set_reply_data_ptr( irp->in_data, irp->in_size ); - irp->in_data = NULL; - irp->in_size = 0; + set_reply_data_ptr( iosb->in_data, iosb->in_size ); + iosb->in_data = NULL; + iosb->in_size = 0; list_remove( &irp->mgr_entry ); list_init( &irp->mgr_entry ); } @@ -833,17 +824,18 @@ DECL_HANDLER(get_irp_result) if ((irp = find_irp_call( file, current, req->user_arg ))) { - if (irp->out_data) + struct iosb *iosb = irp->iosb; + if (iosb->out_data) { - data_size_t size = min( irp->out_size, get_reply_max_size() ); + data_size_t size = min( iosb->out_size, get_reply_max_size() ); if (size) { - set_reply_data_ptr( irp->out_data, size ); - irp->out_data = NULL; + set_reply_data_ptr( iosb->out_data, size ); + iosb->out_data = NULL; } } - reply->size = irp->result; - set_error( irp->status ); + reply->size = iosb->result; + set_error( iosb->status ); list_remove( &irp->dev_entry ); release_object( irp ); /* no longer on the device queue */ } diff --git a/server/file.h b/server/file.h index fb2e905..0a144ee 100644 --- a/server/file.h +++ b/server/file.h @@ -53,6 +53,18 @@ struct fd_ops void (*reselect_async)( struct fd *, struct async_queue *queue ); }; +/* server-side representation of I/O status block */ +struct iosb +{ + struct object obj; /* object header */ + unsigned int status; /* resulting status (or STATUS_PENDING) */ + data_size_t result; /* size of result (input or output depending on the type) */ + data_size_t in_size; /* size of input data */ + void *in_data; /* input data */ + data_size_t out_size; /* size of output data */ + void *out_data; /* output data */ +}; + /* file descriptor functions */ extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, @@ -175,6 +187,7 @@ extern void async_terminate( struct async *async, unsigned int status ); 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 void cancel_process_asyncs( struct process *process ); /* access rights that require Unix read permission */

1 0

Nikolay Sivov : dwrite: Improve face name returned by ConvertFontToLOGFONT ().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 17586e308251fe96ce6304f1798142f1797c99ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=17586e308251fe96ce6304f17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:16 2016 +0300 dwrite: Improve face name returned by ConvertFontToLOGFONT(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 2 +- dlls/dwrite/gdiinterop.c | 14 -------------- dlls/dwrite/opentype.c | 26 ++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 29 ++++++++++++++++++++++++++++- 5 files changed, 54 insertions(+), 19 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 77b6c4a..1e46498 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -224,7 +224,7 @@ extern void opentype_get_font_properties(struct file_stream_desc*,struct dwrite_ extern void opentype_get_font_metrics(struct file_stream_desc*,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_facename(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_facename(struct file_stream_desc*,WCHAR*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 47ebd11..17bea89 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3247,7 +3247,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, IDWriteLocalized stream_desc.face_index = desc->index; opentype_get_font_properties(&stream_desc, &props); opentype_get_font_metrics(&stream_desc, &data->metrics, NULL); - opentype_get_font_facename(&stream_desc, &data->names); + opentype_get_font_facename(&stream_desc, props.lf.lfFaceName, &data->names); /* get family name from font file */ hr = opentype_get_font_familyname(&stream_desc, family_name); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 5034ad7..3675875 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -623,12 +623,8 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, IDWriteFont *font, LOGFONTW *logfont, BOOL *is_systemfont) { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); - static const WCHAR enusW[] = {'e','n','-','u','s',0}; IDWriteFontCollection *collection; - IDWriteLocalizedStrings *name; IDWriteFontFamily *family; - UINT32 index; - BOOL exists; HRESULT hr; TRACE("(%p)->(%p %p %p)\n", This, font, logfont, is_systemfont); @@ -655,17 +651,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, get_logfont_from_font(font, logfont); logfont->lfCharSet = DEFAULT_CHARSET; logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; - logfont->lfFaceName[0] = 0; - - exists = FALSE; - hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &name, &exists); - if (FAILED(hr) || !exists) - return hr; - hr = IDWriteLocalizedStrings_FindLocaleName(name, enusW, &index, &exists); - if (hr == S_OK) - hr = IDWriteLocalizedStrings_GetString(name, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); - IDWriteLocalizedStrings_Release(name); return hr; } diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7f6ccd1..4a6d62c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1612,10 +1612,11 @@ HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWri /* FaceName locating order is WWS Face Name -> Preferred Face Name -> Face Name. If font claims to have 'Preferred Face Name' in WWS format, then WWS name is not used. */ -HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names) +HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR *lfname, IDWriteLocalizedStrings **names) { - const TT_OS2_V2 *tt_os2; + IDWriteLocalizedStrings *lfnames; void *os2_context, *name_context; + const TT_OS2_V2 *tt_os2; const void *name_table; HRESULT hr; @@ -1635,6 +1636,27 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, IDWrite if (FAILED(hr)) hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_SUBFAMILY_NAME, names); + /* User locale is preferred, with fallback to en-us. */ + *lfname = 0; + if (SUCCEEDED(opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, &lfnames))) { + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; + UINT32 index; + BOOL exists; + + exists = FALSE; + if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); + + if (!exists) + IDWriteLocalizedStrings_FindLocaleName(lfnames, enusW, &index, &exists); + + if (exists) + IDWriteLocalizedStrings_GetString(lfnames, index, lfname, LF_FACESIZE); + + IDWriteLocalizedStrings_Release(lfnames); + } + if (tt_os2) IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); if (name_context) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ca35324..987eac9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3459,6 +3459,7 @@ static void test_TryGetFontTable(void) static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) { void *os2_context, *head_context; + IDWriteLocalizedStrings *names; DWRITE_FONT_SIMULATIONS sim; IDWriteFontFace *fontface; const TT_OS2_V2 *tt_os2; @@ -3531,6 +3532,31 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) } } + /* lfFaceName */ + exists = FALSE; + logfont->lfFaceName[0] = 0; + hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &names, &exists); + if (SUCCEEDED(hr)) { + if (exists) { + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; + UINT32 index; + + /* Fallback to en-us if there's no string for user locale. */ + exists = FALSE; + if (GetUserDefaultLocaleName(localeW, sizeof(localeW)/sizeof(WCHAR))) + IDWriteLocalizedStrings_FindLocaleName(names, localeW, &index, &exists); + + if (!exists) + IDWriteLocalizedStrings_FindLocaleName(names, enusW, &index, &exists); + + if (exists) + IDWriteLocalizedStrings_GetString(names, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); + } + + IDWriteLocalizedStrings_Release(names); + } + if (tt_os2) IDWriteFontFace_ReleaseFontTable(fontface, os2_context); if (tt_head) @@ -3631,6 +3657,8 @@ if (0) { /* crashes on native */ sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); + ok(!lstrcmpW(logfont.lfFaceName, lf.lfFaceName), "%s: unexpected facename %s, expected %s\n", + wine_dbgstr_w(nameW), wine_dbgstr_w(logfont.lfFaceName), wine_dbgstr_w(lf.lfFaceName)); ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "%s: unexpected output precision %d\n", wine_dbgstr_w(nameW), logfont.lfOutPrecision); @@ -3639,7 +3667,6 @@ if (0) { /* crashes on native */ ok(logfont.lfQuality == DEFAULT_QUALITY, "%s: unexpected quality %d\n", wine_dbgstr_w(nameW), logfont.lfQuality); ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "%s: unexpected pitch %d\n", wine_dbgstr_w(nameW), logfont.lfPitchAndFamily); - ok(logfont.lfFaceName[0] != 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteFont_Release(font); }

1 0

Nikolay Sivov : dwrite/tests: Use defined symbols when testing LOGFONT fields values.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3ffa9ee08284d7b4a43e5757001233bd967f9b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ffa9ee08284d7b4a43e57570… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:15 2016 +0300 dwrite/tests: Use defined symbols when testing LOGFONT fields values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 738d100..ca35324 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3632,10 +3632,13 @@ if (0) { /* crashes on native */ ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); - ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "got %d\n", logfont.lfOutPrecision); - ok(logfont.lfClipPrecision == 0, "got %d\n", logfont.lfClipPrecision); - ok(logfont.lfQuality == 0, "got %d\n", logfont.lfQuality); - ok(logfont.lfPitchAndFamily == 0, "got %d\n", logfont.lfPitchAndFamily); + ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "%s: unexpected output precision %d\n", wine_dbgstr_w(nameW), + logfont.lfOutPrecision); + ok(logfont.lfClipPrecision == CLIP_DEFAULT_PRECIS, "%s: unexpected clipping precision %d\n", wine_dbgstr_w(nameW), + logfont.lfClipPrecision); + ok(logfont.lfQuality == DEFAULT_QUALITY, "%s: unexpected quality %d\n", wine_dbgstr_w(nameW), logfont.lfQuality); + ok(logfont.lfPitchAndFamily == DEFAULT_PITCH, "%s: unexpected pitch %d\n", wine_dbgstr_w(nameW), + logfont.lfPitchAndFamily); ok(logfont.lfFaceName[0] != 0, "got face name %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteFont_Release(font);

1 0

Nikolay Sivov : dwrite: Improve lfWeight values returned by ConvertFontToLOGFONT().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: da11bee6c77729974520eca4fa1886997a41ec14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da11bee6c77729974520eca4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:14 2016 +0300 dwrite: Improve lfWeight values returned by ConvertFontToLOGFONT(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + dlls/dwrite/gdiinterop.c | 1 - dlls/dwrite/opentype.c | 12 +++---- dlls/dwrite/tests/font.c | 81 ++++++++++++++++++++++++++++++++---------------- 4 files changed, 62 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 356000c..47ebd11 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3401,6 +3401,7 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa if (init_font_data_from_font(family->fonts[heaviest], DWRITE_FONT_SIMULATIONS_BOLD, facenameW, &boldface) == S_OK) { boldface->bold_sim_tested = 1; + boldface->lf.lfWeight += (FW_BOLD - FW_REGULAR) / 2 + 1; fontfamily_add_font(family, boldface); } } diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index e4ef835..5034ad7 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -654,7 +654,6 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop1 *iface, get_logfont_from_font(font, logfont); logfont->lfCharSet = DEFAULT_CHARSET; - logfont->lfWeight = IDWriteFont_GetWeight(font); logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; logfont->lfFaceName[0] = 0; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e16bf76..7f6ccd1 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1307,10 +1307,9 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (version >= 4 && (fsSelection & OS2_FSSELECTION_OBLIQUE)) props->style = DWRITE_FONT_STYLE_OBLIQUE; - else if (fsSelection & OS2_FSSELECTION_ITALIC) { + else if (fsSelection & OS2_FSSELECTION_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; - props->lf.lfItalic = 1; - } + memcpy(&props->panose, &tt_os2->panose, sizeof(props->panose)); } else if (tt_head) { @@ -1324,12 +1323,13 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (macStyle & TT_HEAD_MACSTYLE_BOLD) props->weight = DWRITE_FONT_WEIGHT_BOLD; - if (macStyle & TT_HEAD_MACSTYLE_ITALIC) { + if (macStyle & TT_HEAD_MACSTYLE_ITALIC) props->style = DWRITE_FONT_STYLE_ITALIC; - props->lf.lfItalic = 1; - } } + props->lf.lfWeight = props->weight; + props->lf.lfItalic = props->style == DWRITE_FONT_STYLE_ITALIC; + TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); if (tt_os2) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d3c9d42..738d100 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3458,7 +3458,16 @@ static void test_TryGetFontTable(void) static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) { + void *os2_context, *head_context; + DWRITE_FONT_SIMULATIONS sim; + IDWriteFontFace *fontface; + const TT_OS2_V2 *tt_os2; DWRITE_FONT_STYLE style; + const TT_HEAD *tt_head; + LONG weight; + UINT32 size; + BOOL exists; + HRESULT hr; /* These are rendering time properties. */ logfont->lfHeight = 0; @@ -3468,32 +3477,50 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) logfont->lfUnderline = 0; logfont->lfStrikeOut = 0; + logfont->lfWeight = 0; logfont->lfItalic = 0; - if (IDWriteFont_GetSimulations(font) & DWRITE_FONT_SIMULATIONS_OBLIQUE) - logfont->lfItalic = 1; + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create font face, %#x\n", hr); - style = IDWriteFont_GetStyle(font); - if (!logfont->lfItalic && ((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE))) { - void *os2_context, *head_context; - IDWriteFontFace *fontface; - const TT_OS2_V2 *tt_os2; - const TT_HEAD *tt_head; - UINT32 size; - BOOL exists; - HRESULT hr; + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, + &os2_context, &exists); + ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "Failed to create font face, %#x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void **)&tt_head, &size, + &head_context, &exists); + ok(hr == S_OK, "Failed to get head table, %#x\n", hr); + + sim = IDWriteFont_GetSimulations(font); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, - &os2_context, &exists); - ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); + /* lfWeight */ + weight = FW_REGULAR; + if (tt_os2) { + USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void **)&tt_head, &size, - &head_context, &exists); - ok(hr == S_OK, "Failed to get head table, %#x\n", hr); + if (usWeightClass >= 1 && usWeightClass <= 9) + usWeightClass *= 100; + if (usWeightClass > DWRITE_FONT_WEIGHT_ULTRA_BLACK) + weight = DWRITE_FONT_WEIGHT_ULTRA_BLACK; + else if (usWeightClass > 0) + weight = usWeightClass; + } + else if (tt_head) { + USHORT macStyle = GET_BE_WORD(tt_head->macStyle); + if (macStyle & TT_HEAD_MACSTYLE_BOLD) + weight = DWRITE_FONT_WEIGHT_BOLD; + } + if (sim & DWRITE_FONT_SIMULATIONS_BOLD) + weight += (FW_BOLD - FW_REGULAR) / 2 + 1; + logfont->lfWeight = weight; + + /* lfItalic */ + if (IDWriteFont_GetSimulations(font) & DWRITE_FONT_SIMULATIONS_OBLIQUE) + logfont->lfItalic = 1; + + style = IDWriteFont_GetStyle(font); + if (!logfont->lfItalic && ((style == DWRITE_FONT_STYLE_ITALIC) || (style == DWRITE_FONT_STYLE_OBLIQUE))) { if (tt_os2) { USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); logfont->lfItalic = !!(fsSelection & OS2_FSSELECTION_ITALIC); @@ -3502,13 +3529,13 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) USHORT macStyle = GET_BE_WORD(tt_head->macStyle); logfont->lfItalic = !!(macStyle & TT_HEAD_MACSTYLE_ITALIC); } - - if (tt_os2) - IDWriteFontFace_ReleaseFontTable(fontface, os2_context); - if (tt_head) - IDWriteFontFace_ReleaseFontTable(fontface, head_context); - IDWriteFontFace_Release(fontface); } + + if (tt_os2) + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + if (tt_head) + IDWriteFontFace_ReleaseFontTable(fontface, head_context); + IDWriteFontFace_Release(fontface); } static void test_ConvertFontToLOGFONT(void) @@ -3599,10 +3626,12 @@ if (0) { /* crashes on native */ sim = IDWriteFont_GetSimulations(font); get_logfont_from_font(font, &lf); + ok(logfont.lfWeight == lf.lfWeight, "%s: unexpected lfWeight %d, expected lfWeight %d, font weight %d, " + "bold simulation %s\n", wine_dbgstr_w(nameW), logfont.lfWeight, lf.lfWeight, IDWriteFont_GetWeight(font), + sim & DWRITE_FONT_SIMULATIONS_BOLD ? "yes" : "no"); ok(logfont.lfItalic == lf.lfItalic, "%s: unexpected italic flag %d, oblique simulation %s\n", wine_dbgstr_w(nameW), logfont.lfItalic, sim & DWRITE_FONT_SIMULATIONS_OBLIQUE ? "yes" : "no"); - ok(logfont.lfWeight > 0, "got %d\n", logfont.lfWeight); ok(logfont.lfOutPrecision == OUT_OUTLINE_PRECIS, "got %d\n", logfont.lfOutPrecision); ok(logfont.lfClipPrecision == 0, "got %d\n", logfont.lfClipPrecision); ok(logfont.lfQuality == 0, "got %d\n", logfont.lfQuality);

1 0

Nikolay Sivov : dwrite: Return zeroed fsCsb for OS/2 table of version 0.
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: 3316f90418dd87c6d5c13f6658ce56e41039448c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3316f90418dd87c6d5c13f665… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 4 19:22:12 2016 +0300 dwrite: Return zeroed fsCsb for OS/2 table of version 0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 10 ++++++++-- dlls/dwrite/tests/font.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 3205b7f..3fe4690 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1923,8 +1923,14 @@ HRESULT opentype_get_font_signature(struct file_stream_desc *stream_desc, FONTSI fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); - fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + if (GET_BE_WORD(tt_os2->version) == 0) { + fontsig->fsCsb[0] = 0; + fontsig->fsCsb[1] = 0; + } + else { + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + } IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context); } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 12327a5..8df6f44 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6267,8 +6267,14 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); - fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); - fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + if (GET_BE_WORD(tt_os2->version) == 0) { + fontsig->fsCsb[0] = 0; + fontsig->fsCsb[1] = 0; + } + else { + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + } IDWriteFontFace_ReleaseFontTable(fontface, os2_context); }

1 0

Henri Verbeet : d2d1: Properly set an error state when adding the vertex fails in d2d_geometry_sink_BeginFigure ().
by Alexandre Julliard Dec. 6, 2016

Dec. 6, 2016

Module: wine Branch: master Commit: e37ba63d2f0bc5b7383d6c751901a7a6b53453bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e37ba63d2f0bc5b7383d6c751… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 13:16:02 2016 +0100 d2d1: Properly set an error state when adding the vertex fails in d2d_geometry_sink_BeginFigure(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index afbf339..cb6fab8 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1777,7 +1777,11 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_BeginFigure(ID2D1GeometrySink *i } if (!d2d_figure_add_vertex(&geometry->u.path.figures[geometry->u.path.figure_count - 1], start_point)) + { ERR("Failed to add vertex.\n"); + geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; + return; + } geometry->u.path.state = D2D_GEOMETRY_STATE_FIGURE; ++geometry->u.path.segment_count;

1 0