January 2016 - Wine-commits

Alexandre Julliard : server: Pass full object attributes in the create_mailslot request.
by Alexandre Julliard 18 Jan '16

18 Jan '16

Module: wine Branch: master Commit: 14825a7a558bb74a97071ce0547ce320fcf76642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14825a7a558bb74a97071ce05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:57:02 2016 +0900 server: Pass full object attributes in the create_mailslot request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 12 +++++++----- include/wine/server_protocol.h | 8 +++----- server/mailslot.c | 19 +++++++++++-------- server/protocol.def | 4 +--- server/request.h | 8 +++----- server/trace.c | 4 +--- 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4cac2ca..d547591 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3627,6 +3627,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, { LARGE_INTEGER timeout; NTSTATUS ret; + data_size_t len; + struct object_attributes *objattr; TRACE("%p %08x %p %p %08x %08x %08x %p\n", pHandle, DesiredAccess, attr, IoStatusBlock, @@ -3636,6 +3638,8 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, if (!attr) return STATUS_INVALID_PARAMETER; if (!attr->ObjectName) return STATUS_OBJECT_PATH_SYNTAX_BAD; + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + /* * For a NULL TimeOut pointer set the default timeout value */ @@ -3647,17 +3651,15 @@ NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE pHandle, ULONG DesiredAccess, SERVER_START_REQ( create_mailslot ) { req->access = DesiredAccess; - req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr->RootDirectory ); req->max_msgsize = MaxMessageSize; req->read_timeout = timeout.QuadPart; - wine_server_add_data( req, attr->ObjectName->Buffer, - attr->ObjectName->Length ); + wine_server_add_data( req, objattr, len ); ret = wine_server_call( req ); if( ret == STATUS_SUCCESS ) *pHandle = wine_server_ptr_handle( reply->handle ); } SERVER_END_REQ; - + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index aba649e..e5b7506 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4673,12 +4673,10 @@ struct create_mailslot_request { struct request_header __header; unsigned int access; - unsigned int attributes; - obj_handle_t rootdir; timeout_t read_timeout; unsigned int max_msgsize; - /* VARARG(name,unicode_str); */ - char __pad_36[4]; + /* VARARG(objattr,object_attributes); */ + char __pad_28[4]; }; struct create_mailslot_reply { @@ -6169,6 +6167,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 495 +#define SERVER_PROTOCOL_VERSION 496 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mailslot.c b/server/mailslot.c index 97ea3f6..cb9510c 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -395,7 +395,8 @@ void create_mailslot_device( struct directory *root, const struct unicode_str *n static struct mailslot *create_mailslot( struct directory *root, const struct unicode_str *name, unsigned int attr, - int max_msgsize, timeout_t read_timeout ) + int max_msgsize, timeout_t read_timeout, + const struct security_descriptor *sd ) { struct object *obj; struct unicode_str new_name; @@ -442,6 +443,8 @@ static struct mailslot *create_mailslot( struct directory *root, mailslot->max_msgsize = max_msgsize; mailslot->read_timeout = read_timeout; list_init( &mailslot->writers ); + if (sd) default_set_sd( &mailslot->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION ); if (!socketpair( PF_UNIX, SOCK_DGRAM, 0, fds )) { @@ -508,16 +511,16 @@ DECL_HANDLER(create_mailslot) struct mailslot *mailslot; struct unicode_str name; struct directory *root = NULL; + const struct security_descriptor *sd; + const struct object_attributes *objattr = get_req_object_attributes( &sd, &name ); - reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) - return; + if (!objattr) return; + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((mailslot = create_mailslot( root, &name, req->attributes, req->max_msgsize, - req->read_timeout ))) + if ((mailslot = create_mailslot( root, &name, objattr->attributes, req->max_msgsize, + req->read_timeout, sd ))) { - reply->handle = alloc_handle( current->process, mailslot, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, mailslot, req->access, objattr->attributes ); release_object( mailslot ); } diff --git a/server/protocol.def b/server/protocol.def index 8250bed..72a63e4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3277,11 +3277,9 @@ struct handle_info /* Create a mailslot */ @REQ(create_mailslot) unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ timeout_t read_timeout; unsigned int max_msgsize; - VARARG(name,unicode_str); /* mailslot name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the mailslot */ @END diff --git a/server/request.h b/server/request.h index d9163a0..310bcf4 100644 --- a/server/request.h +++ b/server/request.h @@ -2082,11 +2082,9 @@ C_ASSERT( sizeof(struct get_system_handles_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_system_handles_reply, count) == 8 ); C_ASSERT( sizeof(struct get_system_handles_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, access) == 12 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, attributes) == 16 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, rootdir) == 20 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, read_timeout) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, max_msgsize) == 32 ); -C_ASSERT( sizeof(struct create_mailslot_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, read_timeout) == 16 ); +C_ASSERT( FIELD_OFFSET(struct create_mailslot_request, max_msgsize) == 24 ); +C_ASSERT( sizeof(struct create_mailslot_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_mailslot_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_mailslot_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_mailslot_info_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index 552e8c2..82f8342 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3866,11 +3866,9 @@ static void dump_get_system_handles_reply( const struct get_system_handles_reply static void dump_create_mailslot_request( const struct create_mailslot_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); dump_timeout( ", read_timeout=", &req->read_timeout ); fprintf( stderr, ", max_msgsize=%08x", req->max_msgsize ); - dump_varargs_unicode_str( ", name=", cur_size ); + dump_varargs_object_attributes( ", objattr=", cur_size ); } static void dump_create_mailslot_reply( const struct create_mailslot_reply *req )

1 0

Nikolay Sivov : dwrite: Always initialize out pointers.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: ac7954b7b93015ece09bf374484a0f3505f22aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7954b7b93015ece09bf3744… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 15 12:12:24 2016 +0300 dwrite: Always initialize out pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a19f2c7..313c77e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3880,9 +3880,13 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = localfontfilestream_GetLastWriteTime }; -static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream** iface) +static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, struct local_cached_stream *entry, IDWriteFontFileStream **ret) { - struct dwrite_localfontfilestream *This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); + struct dwrite_localfontfilestream *This; + + *ret = NULL; + + This = heap_alloc(sizeof(struct dwrite_localfontfilestream)); if (!This) return E_OUTOFMEMORY; @@ -3893,7 +3897,7 @@ static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, str This->size = size; This->entry = entry; - *iface = &This->IDWriteFontFileStream_iface; + *ret = &This->IDWriteFontFileStream_iface; return S_OK; } @@ -4060,9 +4064,13 @@ static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = { localfontfileloader_GetLastWriteTimeFromKey }; -HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) +HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader **ret) { - struct dwrite_localfontfileloader *This = heap_alloc(sizeof(struct dwrite_localfontfileloader)); + struct dwrite_localfontfileloader *This; + + *ret = NULL; + + This = heap_alloc(sizeof(struct dwrite_localfontfileloader)); if (!This) return E_OUTOFMEMORY; @@ -4070,7 +4078,7 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) This->ref = 1; list_init(&This->streams); - *iface = &This->IDWriteLocalFontFileLoader_iface; + *ret = &This->IDWriteLocalFontFileLoader_iface; return S_OK; }

1 0

Carlo Bramini : user32: Remove unused variables in SCROLL_TrackScrollBar.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 8d0d1e563ca7697902df9c285ff13ce648697537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0d1e563ca7697902df9c285… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Fri Jan 15 12:20:40 2016 +0300 user32: Remove unused variables in SCROLL_TrackScrollBar. Signed-off-by: Carlo Bramini <carlo.bramix(a)libero.it> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index be205ef..b28ee44 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1096,7 +1096,6 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) { MSG msg; - INT xoffset = 0, yoffset = 0; if (scrollbar != SB_CTL) { @@ -1117,8 +1116,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) msg.message == WM_MOUSEMOVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { - pt.x = (short)LOWORD(msg.lParam) + xoffset; - pt.y = (short)HIWORD(msg.lParam) + yoffset; + pt.x = (short)LOWORD(msg.lParam); + pt.y = (short)HIWORD(msg.lParam); SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); } else

1 0

Alexandre Julliard : ntdll: Add a helper function to allocate the full object_attributes structure.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 3198fb0c1c3779882944659d52a676319ffcc68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3198fb0c1c3779882944659d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:40:56 2016 +0900 ntdll: Add a helper function to allocate the full object_attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 33 +++---- dlls/ntdll/ntdll_misc.h | 7 +- dlls/ntdll/sync.c | 237 +++++++++++++++++++----------------------------- dlls/ntdll/virtual.c | 24 +---- 4 files changed, 113 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3198fb0c1c37798829446…

1 0

Alexandre Julliard : server: Store the attributes in the object_attributes structure.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 7350682aa6ec7702f26f76ccbaa7d2f11a85c93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7350682aa6ec7702f26f76ccb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 17:53:34 2016 +0900 server: Store the attributes in the object_attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 -- dlls/ntdll/sync.c | 6 +----- dlls/ntdll/virtual.c | 1 - include/wine/server_protocol.h | 23 ++++++-------------- server/event.c | 15 +++++++------ server/file.c | 2 +- server/mapping.c | 8 ++++--- server/mutex.c | 7 +++--- server/named_pipe.c | 4 ++-- server/process.c | 7 +++--- server/protocol.def | 15 ++++--------- server/request.h | 48 ++++++++++++++++++------------------------ server/semaphore.c | 7 +++--- server/trace.c | 10 +-------- 14 files changed, 62 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7350682aa6ec7702f26f7…

1 0

Alexandre Julliard : server: Add a helper function to validate and return object attributes.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 9504e2addf3a689e1e0316355452a676bf149dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9504e2addf3a689e1e0316355… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:15:31 2016 +0900 server: Add a helper function to validate and return object attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/event.c | 17 ++++------------- server/file.c | 11 ++++------- server/mapping.c | 10 ++-------- server/mutex.c | 10 ++-------- server/named_pipe.c | 12 +++--------- server/process.c | 7 ++----- server/request.c | 27 +++++++++++++++++++++++++++ server/request.h | 2 ++ server/security.h | 9 --------- server/semaphore.c | 10 ++-------- server/token.c | 24 ------------------------ 11 files changed, 48 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9504e2addf3a689e1e031…

1 0

Alexandre Julliard : server: Allow the object attributes to be omitted in requests.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 4c763a41ee0915d33398f7244952e5fff0c758b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c763a41ee0915d33398f7244… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 15 18:25:58 2016 +0900 server: Allow the object attributes to be omitted in requests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 8 +------- include/wine/server_protocol.h | 2 +- server/request.c | 8 ++++++++ server/trace.c | 22 +++++++++++++--------- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index bbbcfba..36a9c86 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -86,13 +86,7 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a *ret = NULL; *ret_len = 0; - if (!attr) - { - *ret = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - if (!*ret) return STATUS_NO_MEMORY; - *ret_len = len; - return STATUS_SUCCESS; - } + if (!attr) return STATUS_SUCCESS; if ((sd = attr->SecurityDescriptor)) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 65f0536..8dd4994 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6171,6 +6171,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 493 +#define SERVER_PROTOCOL_VERSION 494 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/request.c b/server/request.c index 7b7d8b1..2debf6d 100644 --- a/server/request.c +++ b/server/request.c @@ -169,9 +169,17 @@ void *set_reply_data_size( data_size_t size ) const struct object_attributes *get_req_object_attributes( const struct security_descriptor **sd, struct unicode_str *name ) { + static const struct object_attributes empty_attributes; const struct object_attributes *attr = get_req_data(); data_size_t size = get_req_data_size(); + if (!size) + { + *sd = NULL; + name->len = 0; + return &empty_attributes; + } + if ((size < sizeof(*attr)) || (size - sizeof(*attr) < attr->sd_len) || (size - sizeof(*attr) - attr->sd_len < attr->name_len)) { diff --git a/server/trace.c b/server/trace.c index e02b8c3..edfcaf5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1074,20 +1074,27 @@ static void dump_varargs_object_attributes( const char *prefix, data_size_t size const struct object_attributes *objattr = cur_data; fprintf( stderr,"%s{", prefix ); - if (size >= sizeof(struct object_attributes)) + if (size) { const WCHAR *str; - fprintf( stderr, "rootdir=%04x,attributes=%08x", objattr->rootdir, objattr->attributes ); - if (objattr->sd_len > size - sizeof(*objattr) || - objattr->name_len > size - sizeof(*objattr) - objattr->sd_len) + + if (size < sizeof(*objattr) || + (size - sizeof(*objattr) < objattr->sd_len) || + (size - sizeof(*objattr) - objattr->sd_len < objattr->name_len)) + { + fprintf( stderr, "***invalid***}" ); + remove_data( size ); return; + } + + fprintf( stderr, "rootdir=%04x,attributes=%08x", objattr->rootdir, objattr->attributes ); dump_inline_security_descriptor( ",sd=", (const struct security_descriptor *)(objattr + 1), objattr->sd_len ); str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); fprintf( stderr, ",name=L\"" ); dump_strW( str, objattr->name_len / sizeof(WCHAR), stderr, "\"\"" ); fputc( '\"', stderr ); remove_data( ((sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR) + - objattr->name_len ); + (objattr->name_len / sizeof(WCHAR)) * sizeof(WCHAR) ); } fputc( '}', stderr ); } @@ -3928,10 +3935,7 @@ static void dump_get_directory_entry_reply( const struct get_directory_entry_rep static void dump_create_symlink_request( const struct create_symlink_request *req ) { fprintf( stderr, " access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", rootdir=%04x", req->rootdir ); - fprintf( stderr, ", name_len=%u", req->name_len ); - dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) ); + dump_varargs_object_attributes( ", objattr=", cur_size ); dump_varargs_unicode_str( ", target_name=", cur_size ); }

1 0

Piotr Caban : msvcrt: Fix modff signature.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 0806b06f2ba7a690661d6ae417270bdbc7370953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0806b06f2ba7a690661d6ae41… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 17:01:02 2016 +0100 msvcrt: Fix modff signature. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f8937b3..661a1b4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -331,7 +331,7 @@ float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) /********************************************************************* * modff (MSVCRT.@) */ -double CDECL MSVCRT_modff( float x, float *iptr ) +float CDECL MSVCRT_modff( float x, float *iptr ) { return modff( x, iptr ); }

1 0

Akihiro Sagawa : gdi32: Fix the advance width in synthetic bold glyphs with scaling.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: 34e73617903da1f73f628d1eca355a9e2173da2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e73617903da1f73f628d1ec… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 13 23:09:08 2016 +0900 gdi32: Fix the advance width in synthetic bold glyphs with scaling. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 31 ++++++++++++++++++++++++++++--- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8550020..a5b320b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -162,6 +162,7 @@ MAKE_FUNCPTR(FT_Render_Glyph); MAKE_FUNCPTR(FT_Select_Charmap); MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); +MAKE_FUNCPTR(FT_Vector_Length); MAKE_FUNCPTR(FT_Vector_Transform); MAKE_FUNCPTR(FT_Vector_Unit); static FT_Error (*pFT_Outline_Embolden)(FT_Outline *, FT_Pos); @@ -4084,6 +4085,7 @@ static BOOL init_freetype(void) LOAD_FUNCPTR(FT_Select_Charmap) LOAD_FUNCPTR(FT_Set_Charmap) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) + LOAD_FUNCPTR(FT_Vector_Length) LOAD_FUNCPTR(FT_Vector_Transform) LOAD_FUNCPTR(FT_Vector_Unit) #undef LOAD_FUNCPTR @@ -6384,6 +6386,20 @@ static inline BOOL is_identity_MAT2(const MAT2 *matrix) return !memcmp(matrix, &identity, sizeof(MAT2)); } +static inline FT_Vector normalize_vector(FT_Vector *vec) +{ + FT_Vector out; + FT_Fixed len; + len = pFT_Vector_Length(vec); + if (len) { + out.x = (vec->x << 6) / len; + out.y = (vec->y << 6) / len; + } + else + out.x = out.y = 0; + return out; +} + static void synthesize_bold_glyph(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) { FT_Error err; @@ -6409,8 +6425,6 @@ static void synthesize_bold_glyph(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metric metrics->height = bbox.yMax - bbox.yMin; metrics->horiBearingX = bbox.xMin; metrics->horiBearingY = bbox.yMax; - metrics->horiAdvance += (1 << 6); - metrics->vertAdvance += (1 << 6); metrics->vertBearingX = metrics->horiBearingX - metrics->horiAdvance / 2; metrics->vertBearingY = (metrics->vertAdvance - metrics->height) / 2; break; @@ -6466,7 +6480,6 @@ static FT_Vector get_advance_metric(GdiFont *incoming_font, GdiFont *font, halfwidth characters. */ if(FT_IS_SCALABLE(incoming_font->ft_face) && (incoming_font->potm || get_outline_text_metrics(incoming_font)) && - !font->fake_bold && !(incoming_font->potm->otmTextMetrics.tmPitchAndFamily & TMPF_FIXED_PITCH)) { UINT avg_advance; em_scale = MulDiv(incoming_font->ppem, 1 << 16, @@ -6490,6 +6503,18 @@ static FT_Vector get_advance_metric(GdiFont *incoming_font, GdiFont *font, } } + if (font->fake_bold) { + if (!transMat) + adv.x += 1 << 6; + else { + FT_Vector fake_bold_adv, vec = { 1 << 6, 0 }; + pFT_Vector_Transform(&vec, transMat); + fake_bold_adv = normalize_vector(&vec); + adv.x += fake_bold_adv.x; + adv.y += fake_bold_adv.y; + } + } + adv.x = (adv.x + 63) & -64; adv.y = -((adv.y + 63) & -64); return adv; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 417b722..b5ce93e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6365,7 +6365,7 @@ static void test_fake_bold_font(void) ok(data[0].w + 1 == data[1].w, "expected %d, got %d\n", data[0].w + 1, data[1].w); - todo_wine ok(data[0].gm.gmCellIncX + 1 == data[1].gm.gmCellIncX, + ok(data[0].gm.gmCellIncX + 1 == data[1].gm.gmCellIncX, "expected %d, got %d\n", data[0].gm.gmCellIncX + 1, data[1].gm.gmCellIncX); ok(data[0].gm.gmCellIncY == data[1].gm.gmCellIncY, "expected %d, got %d\n", data[0].gm.gmCellIncY, data[1].gm.gmCellIncY);

1 0

Akihiro Sagawa : gdi32: Return an boolean value whether synthesizing bold glyph is success.
by Alexandre Julliard 15 Jan '16

15 Jan '16

Module: wine Branch: master Commit: ba79c19d09a5943c80033f1896a10fe86448c13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba79c19d09a5943c80033f189… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 13 23:09:09 2016 +0900 gdi32: Return an boolean value whether synthesizing bold glyph is success. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 52 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a5b320b..569dc02 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6400,40 +6400,32 @@ static inline FT_Vector normalize_vector(FT_Vector *vec) return out; } -static void synthesize_bold_glyph(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) +static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) { FT_Error err; - static UINT once; + FT_Pos strength; + FT_BBox bbox; - switch(glyph->format) { - case FT_GLYPH_FORMAT_OUTLINE: - { - FT_Pos strength; - FT_BBox bbox; - if(!pFT_Outline_Embolden) - break; - - strength = MulDiv(ppem, 1 << 6, 24); - err = pFT_Outline_Embolden(&glyph->outline, strength); - if(err) { - TRACE("FT_Ouline_Embolden returns %d, ignored\n", err); - break; - } + if(glyph->format != FT_GLYPH_FORMAT_OUTLINE) + return FALSE; + if(!pFT_Outline_Embolden) + return FALSE; - pFT_Outline_Get_CBox(&glyph->outline, &bbox); - metrics->width = bbox.xMax - bbox.xMin; - metrics->height = bbox.yMax - bbox.yMin; - metrics->horiBearingX = bbox.xMin; - metrics->horiBearingY = bbox.yMax; - metrics->vertBearingX = metrics->horiBearingX - metrics->horiAdvance / 2; - metrics->vertBearingY = (metrics->vertAdvance - metrics->height) / 2; - break; - } - default: - if (!once++) - WARN("Emboldening format 0x%x is not supported\n", glyph->format); - return; + strength = MulDiv(ppem, 1 << 6, 24); + err = pFT_Outline_Embolden(&glyph->outline, strength); + if(err) { + TRACE("FT_Ouline_Embolden returns %d\n", err); + return FALSE; } + + pFT_Outline_Get_CBox(&glyph->outline, &bbox); + metrics->width = bbox.xMax - bbox.xMin; + metrics->height = bbox.yMax - bbox.yMin; + metrics->horiBearingX = bbox.xMin; + metrics->horiBearingY = bbox.yMax; + metrics->vertBearingX = metrics->horiBearingX - metrics->horiAdvance / 2; + metrics->vertBearingY = (metrics->vertAdvance - metrics->height) / 2; + return TRUE; } static inline BYTE get_max_level( UINT format ) @@ -6926,7 +6918,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, metrics = ft_face->glyph->metrics; if(font->fake_bold) - synthesize_bold_glyph(ft_face->glyph, font->ppem, &metrics); + get_bold_glyph_outline(ft_face->glyph, font->ppem, &metrics); /* Some poorly-created fonts contain glyphs that exceed the boundaries set * by the text metrics. The proper behavior is to clip the glyph metrics to

1 0