December 2008 - Wine-commits

Rob Shearman : widl: Store the type-specific information in a union in the type_t structure.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 213f32744fa6dd4eed27454012b8b0138b22930c URL: http://source.winehq.org/git/wine.git/?a=commit;h=213f32744fa6dd4eed2745401… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:05:35 2008 +0000 widl: Store the type-specific information in a union in the type_t structure. Use pointers for the information for structures, enumerations, functions and interfaces so that we can determine whether or not the type has been defined yet and to enable more information to be stored. --- tools/widl/header.c | 2 +- tools/widl/parser.y | 44 ++++++++++++++++++++++++++++---------------- tools/widl/typetree.c | 13 ++++++++++--- tools/widl/typetree.h | 34 ++++++++++++++++++++++++---------- tools/widl/widltypes.h | 29 ++++++++++++++++++++++++++++- 5 files changed, 91 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=213f32744fa6dd4eed274…

1 0

Rob Shearman : widl: Don't create a temporary variable in the t_ident rule.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: efdd020514b03843058e570c0c0829f8da1e6d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdd020514b03843058e570c0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:05:41 2008 +0000 widl: Don't create a temporary variable in the t_ident rule. The identifier doesn't have any properties of a variable and we only use it for holding the name before it is freed. Use get_type instead of get_typev in the type_new_* functions and get rid of get_typev. --- tools/widl/parser.y | 43 ++++++++++++++++--------------------------- 1 files changed, 16 insertions(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 04df778..75cd63e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -125,17 +125,16 @@ static type_t *make_int(int sign); static typelib_t *make_library(const char *name, const attr_list_t *attrs); static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); -static type_t *type_new_enum(var_t *name, var_list_t *enums); -static type_t *type_new_struct(var_t *name, var_list_t *fields); -static type_t *type_new_nonencapsulated_union(var_t *name, var_list_t *fields); -static type_t *type_new_encapsulated_union(var_t *name, var_t *switch_field, var_t *union_field, var_list_t *cases); +static type_t *type_new_enum(char *name, var_list_t *enums); +static type_t *type_new_struct(char *name, var_list_t *fields); +static type_t *type_new_nonencapsulated_union(char *name, var_list_t *fields); +static type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); static type_t *find_type_or_error(const char *name, int t); static type_t *find_type_or_error2(char *name, int t); static type_t *get_type(unsigned char type, char *name, int t); -static type_t *get_typev(unsigned char type, var_t *name, int t); static var_t *reg_const(var_t *var); @@ -321,14 +320,14 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s %type <ifref_list> coclass_ints %type <var> arg ne_union_field union_field s_field case enum declaration %type <var_list> m_args no_args args fields ne_union_fields cases enums enum_list dispint_props field -%type <var> m_ident t_ident ident +%type <var> m_ident ident %type <declarator> declarator direct_declarator init_declarator %type <declarator_list> declarator_list %type <func> funcdef %type <func_list> int_statements dispint_meths %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version -%type <str> libraryhdr callconv cppquote importlib import +%type <str> libraryhdr callconv cppquote importlib import t_ident %type <uuid> uuid_string %type <import> import_start %type <typelib> library_start librarydef @@ -789,8 +788,8 @@ m_ident: { $$ = NULL; } ; t_ident: { $$ = NULL; } - | aIDENTIFIER { $$ = make_var($1); } - | aKNOWNTYPE { $$ = make_var($1); } + | aIDENTIFIER { $$ = $1; } + | aKNOWNTYPE { $$ = $1; } ; ident: aIDENTIFIER { $$ = make_var($1); } @@ -1371,9 +1370,9 @@ type_t *make_type(unsigned char type, type_t *ref) return t; } -static type_t *type_new_enum(var_t *name, var_list_t *enums) +static type_t *type_new_enum(char *name, var_list_t *enums) { - type_t *t = get_typev(RPC_FC_ENUM16, name, tsENUM); + type_t *t = get_type(RPC_FC_ENUM16, name, tsENUM); t->kind = TKIND_ENUM; if (enums) { @@ -1386,9 +1385,9 @@ static type_t *type_new_enum(var_t *name, var_list_t *enums) return t; } -static type_t *type_new_struct(var_t *name, var_list_t *fields) +static type_t *type_new_struct(char *name, var_list_t *fields) { - type_t *t = get_typev(RPC_FC_STRUCT, name, tsSTRUCT); + type_t *t = get_type(RPC_FC_STRUCT, name, tsSTRUCT); t->kind = TKIND_RECORD; t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; @@ -1396,9 +1395,9 @@ static type_t *type_new_struct(var_t *name, var_list_t *fields) return t; } -static type_t *type_new_nonencapsulated_union(var_t *name, var_list_t *fields) +static type_t *type_new_nonencapsulated_union(char *name, var_list_t *fields) { - type_t *t = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, name, tsUNION); + type_t *t = get_type(RPC_FC_NON_ENCAPSULATED_UNION, name, tsUNION); t->kind = TKIND_UNION; t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; @@ -1406,9 +1405,9 @@ static type_t *type_new_nonencapsulated_union(var_t *name, var_list_t *fields) return t; } -static type_t *type_new_encapsulated_union(var_t *name, var_t *switch_field, var_t *union_field, var_list_t *cases) +static type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases) { - type_t *t = get_typev(RPC_FC_ENCAPSULATED_UNION, name, tsUNION); + type_t *t = get_type(RPC_FC_ENCAPSULATED_UNION, name, tsUNION); t->kind = TKIND_UNION; if (!union_field) union_field = make_var( xstrdup("tagged_union") ); union_field->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); @@ -1953,16 +1952,6 @@ static type_t *get_type(unsigned char type, char *name, int t) return reg_type(tp, name, t); } -static type_t *get_typev(unsigned char type, var_t *name, int t) -{ - char *sname = NULL; - if (name) { - sname = name->name; - free(name); - } - return get_type(type, sname, t); -} - /***** constant repository *****/ struct rconst {

1 0

Rob Shearman : widl: Create a separate type_t object for each structure declaration or defintion .
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 1a71479fbde0c10ad946334c524c3fdcb7dfab01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a71479fbde0c10ad946334c5… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:05:53 2008 +0000 widl: Create a separate type_t object for each structure declaration or defintion. Set the details of the structure to the previously defined version if available, or add it to a list of incomplete types otherwise. Only set the defined flag when the structure is actually defined in the IDL file so that the type is written out in the exact order that it is mentioned in the file. --- tools/widl/parser.y | 58 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 50 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 75cd63e..1866a1e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -97,6 +97,7 @@ typelist_t incomplete_types = LIST_INIT(incomplete_types); static void add_incomplete(type_t *t); static void fix_incomplete(void); +static void fix_incomplete_types(type_t *complete_type); static str_list_t *append_str(str_list_t *list, char *str); static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); @@ -126,7 +127,7 @@ static typelib_t *make_library(const char *name, const attr_list_t *attrs); static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); static type_t *type_new_enum(char *name, var_list_t *enums); -static type_t *type_new_struct(char *name, var_list_t *fields); +static type_t *type_new_struct(char *name, int defined, var_list_t *fields); static type_t *type_new_nonencapsulated_union(char *name, var_list_t *fields); static type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); @@ -1047,7 +1048,7 @@ pointer_type: | tPTR { $$ = RPC_FC_FP; } ; -structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, $4); +structdef: tSTRUCT t_ident '{' fields '}' { $$ = type_new_struct($2, TRUE, $4); if(in_typelib) add_typelib_entry($$); } @@ -1059,7 +1060,7 @@ type: tVOID { $$ = find_type_or_error("void", 0); } | enumdef { $$ = $1; } | tENUM aIDENTIFIER { $$ = find_type_or_error2($2, tsENUM); } | structdef { $$ = $1; } - | tSTRUCT aIDENTIFIER { $$ = get_type(RPC_FC_STRUCT, $2, tsSTRUCT); } + | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } | uniondef { $$ = $1; } | tUNION aIDENTIFIER { $$ = find_type_or_error2($2, tsUNION); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } @@ -1385,13 +1386,33 @@ static type_t *type_new_enum(char *name, var_list_t *enums) return t; } -static type_t *type_new_struct(char *name, var_list_t *fields) +static type_t *type_new_struct(char *name, int defined, var_list_t *fields) { - type_t *t = get_type(RPC_FC_STRUCT, name, tsSTRUCT); + type_t *tag_type = name ? find_type(name, tsSTRUCT) : NULL; + type_t *t = make_type(RPC_FC_STRUCT, NULL); + t->name = name; t->kind = TKIND_RECORD; - t->details.structure = xmalloc(sizeof(*t->details.structure)); - t->details.structure->fields = fields; - t->defined = TRUE; + if (defined || (tag_type && tag_type->details.structure)) + { + if (tag_type && tag_type->details.structure) + { + t->details.structure = tag_type->details.structure; + t->type = tag_type->type; + } + else if (defined) + { + t->details.structure = xmalloc(sizeof(*t->details.structure)); + t->details.structure->fields = fields; + t->defined = TRUE; + } + } + if (name) + { + if (fields) + reg_type(t, name, tsSTRUCT); + else + add_incomplete(t); + } return t; } @@ -1807,6 +1828,8 @@ static type_t *reg_type(type_t *type, const char *name, int t) nt->t = t; nt->next = type_hash[hash]; type_hash[hash] = nt; + if ((t == tsSTRUCT || t == tsUNION)) + fix_incomplete_types(type); return type; } @@ -1839,10 +1862,29 @@ static void fix_incomplete(void) LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) { fix_type(tn->type); + list_remove(&tn->entry); free(tn); } } +static void fix_incomplete_types(type_t *complete_type) +{ + struct typenode *tn, *next; + + LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) + { + if (((is_struct(complete_type->type) && is_struct(tn->type->type)) || + (is_union(complete_type->type) && is_union(tn->type->type))) && + !strcmp(complete_type->name, tn->type->name)) + { + tn->type->details.structure = complete_type->details.structure; + tn->type->type = complete_type->type; + list_remove(&tn->entry); + free(tn); + } + } +} + static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, attr_list_t *attrs) { const declarator_t *decl;

1 0

Rob Shearman : widl: Hide the details of where arguments, fields, values and cases are stored in the type_t structure for functions, structures, enums and unions.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 04a22cc412fd970d83b9f2b1d5af40a6681d704d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a22cc412fd970d83b9f2b1d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:05:27 2008 +0000 widl: Hide the details of where arguments, fields, values and cases are stored in the type_t structure for functions, structures, enums and unions. --- tools/widl/Makefile.in | 1 + tools/widl/expr.c | 18 +++--- tools/widl/header.c | 21 +++++-- tools/widl/parser.h | 2 + tools/widl/parser.y | 161 +++++++++++++++++++--------------------------- tools/widl/typegen.c | 84 +++++++++++------------- tools/widl/typetree.c | 90 ++++++++++++++++++++++++++ tools/widl/typetree.h | 93 +++++++++++++++++++++++++++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 17 +++--- 10 files changed, 325 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04a22cc412fd970d83b9f…

1 0

Rob Shearman : include: Include winuser.h from generated oleidl.h header.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: 4a67e7a71e4775286deadc70930f826112127907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a67e7a71e4775286deadc709… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:05:12 2008 +0000 include: Include winuser.h from generated oleidl.h header. oleidl.h isn't usable without winuser.h being included first due to using the LPMSG type, so explicitly include it by adding a cpp_quote statement to oleidl.idl. In the PSDK it is implicitly included as IDL-generated header includes windows.h, which in turn includes winuser.h. --- dlls/ole32/ole32_oleidl.idl | 1 - dlls/oleaut32/oleaut32_ocidl.idl | 1 - include/oleidl.idl | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole32_oleidl.idl b/dlls/ole32/ole32_oleidl.idl index b9315b3..93cf079 100644 --- a/dlls/ole32/ole32_oleidl.idl +++ b/dlls/ole32/ole32_oleidl.idl @@ -16,5 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#include <winuser.h>") #include "oleidl.idl" diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl index 379df5b..dcd3ea4 100644 --- a/dlls/oleaut32/oleaut32_ocidl.idl +++ b/dlls/oleaut32/oleaut32_ocidl.idl @@ -16,5 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -cpp_quote("#include <winuser.h>") #include "ocidl.idl" diff --git a/include/oleidl.idl b/include/oleidl.idl index 5c92cb1..74962ff 100644 --- a/include/oleidl.idl +++ b/include/oleidl.idl @@ -24,6 +24,8 @@ import "objidl.idl"; interface IOleInPlaceActiveObject; +cpp_quote("#include <winuser.h>") + /***************************************************************************** * IOleTypes interface */

1 0

Rob Shearman : widl: Follow aliases in check_remoting_fields so that the fields for the type are correctly enumerated .
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: fbffe4a229b80d4120ea49c605f7fdf897411279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbffe4a229b80d4120ea49c60… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Dec 29 12:05:19 2008 +0000 widl: Follow aliases in check_remoting_fields so that the fields for the type are correctly enumerated. --- tools/widl/parser.y | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4d44e2c..47aef86 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2471,6 +2471,10 @@ static void check_remoting_fields(const var_t *var, type_t *type) const var_t *field; const var_list_t *fields = NULL; + /* find the real type */ + while (type->kind == TKIND_ALIAS) + type = type->orig; + if (type->checked) return;

1 0

Alexandre Julliard : ntdll: Make sure we don't return from a stub exception .
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: d75b0ce45298bc85c62ea84805b66f704670e883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75b0ce45298bc85c62ea8480… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 29 12:43:59 2008 +0100 ntdll: Make sure we don't return from a stub exception. --- dlls/ntdll/exception.c | 2 +- dlls/winecrt0/stub.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index c2bf5cb..d948f84 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -601,5 +601,5 @@ void __wine_spec_unimplemented_stub( const char *module, const char *function ) record.NumberParameters = 2; record.ExceptionInformation[0] = (ULONG_PTR)module; record.ExceptionInformation[1] = (ULONG_PTR)function; - RtlRaiseException( &record ); + for (;;) RtlRaiseException( &record ); } diff --git a/dlls/winecrt0/stub.c b/dlls/winecrt0/stub.c index c6ddb91..5f52d46 100644 --- a/dlls/winecrt0/stub.c +++ b/dlls/winecrt0/stub.c @@ -32,5 +32,5 @@ void DECLSPEC_HIDDEN __wine_spec_unimplemented_stub( const char *module, const c args[0] = (ULONG_PTR)module; args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EXCEPTION_NONCONTINUABLE, 2, args ); + for (;;) RaiseException( EXCEPTION_WINE_STUB, EXCEPTION_NONCONTINUABLE, 2, args ); }

1 0

Christian Costa : quartz: Fix some traces and fixmes.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: c83e4f130f7d4362015d24c0d207824c1b0192c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83e4f130f7d4362015d24c0d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Dec 29 12:00:10 2008 +0100 quartz: Fix some traces and fixmes. --- dlls/quartz/videorenderer.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 437779c..0d9896e 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -277,7 +277,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, HDC hDC; BITMAPINFOHEADER *bmiHeader; - TRACE("%p %p %d\n", This, data, size); + TRACE("(%p)->(%p, %d)\n", This, data, size); sdesc.dwSize = sizeof(sdesc); hr = IPin_ConnectionMediaType((IPin *)This->pInputPin, &amt); @@ -356,6 +356,8 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) REFERENCE_TIME tStart, tStop; HRESULT hr; + TRACE("(%p)->(%p)\n", iface, pSample); + EnterCriticalSection(&This->csFilter); if (This->pInputPin->flushing || This->pInputPin->end_of_stream) @@ -370,8 +372,6 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) return VFW_E_WRONG_STATE; } - TRACE("%p %p\n", iface, pSample); - hr = IMediaSample_GetTime(pSample, &tStart, &tStop); if (FAILED(hr)) ERR("Cannot get sample time (%x)\n", hr); @@ -571,7 +571,7 @@ static const IMediaSeekingVtbl VideoRendererImpl_Seeking_Vtbl = static HRESULT VideoRendererImpl_Change(IBaseFilter *iface) { - TRACE("(%p)\n", iface); + TRACE("(%p)->()\n", iface); return S_OK; } @@ -961,9 +961,7 @@ static HRESULT WINAPI VideoRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPi { VideoRendererImpl *This = (VideoRendererImpl *)iface; - TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); - - FIXME("VideoRenderer::FindPin(...)\n"); + FIXME("(%p/%p)->(%p,%p): stub !!!\n", This, iface, debugstr_w(Id), ppPin); /* FIXME: critical section */ @@ -1541,6 +1539,8 @@ static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface, AM_MEDIA_TYPE *amt = &This->pInputPin->pin.mtCurrent; char *ptr; + FIXME("(%p/%p)->(%p, %p): partial stub\n", This, iface, pBufferSize, pDIBImage); + EnterCriticalSection(&This->csFilter); if (!This->sample_held) @@ -1549,8 +1549,6 @@ static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface, return (This->state == State_Paused ? E_UNEXPECTED : VFW_E_NOT_PAUSED); } - FIXME("(%p/%p)->(%p, %p): partial stub\n", This, iface, pBufferSize, pDIBImage); - if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo)) { bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; @@ -1815,7 +1813,7 @@ static HRESULT WINAPI Videowindow_put_AutoShow(IVideoWindow *iface, TRACE("(%p/%p)->(%ld)\n", This, iface, AutoShow); - This->AutoShow = 1; /* FXIME: Should be AutoShow */; + This->AutoShow = 1; /* FIXME: Should be AutoShow */; return S_OK; }

1 0

Byeongsik Jeon : gdi32: Restore the trimmed bitmap image by FT_Render_Glyph ().
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: f2e1b254ce0009a2c373d22ee5a1d02d5b4b41a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2e1b254ce0009a2c373d22ee… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Sat Dec 27 17:56:32 2008 +0900 gdi32: Restore the trimmed bitmap image by FT_Render_Glyph(). --- dlls/gdi32/freetype.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d011c97..61ae475 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4776,7 +4776,8 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, { unsigned int *dst; BYTE *src; - INT x, src_pitch, rgb_interval, hmul, vmul; + INT x, src_pitch, src_width, src_height, rgb_interval, hmul, vmul; + INT x_shift, y_shift; BOOL rgb; FT_LcdFilter lcdfilter = FT_LCD_FILTER_DEFAULT; FT_Render_Mode render_mode = @@ -4810,13 +4811,16 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, if ( needsTransform ) pFT_Outline_Transform (&ft_face->glyph->outline, &transMat); - pFT_Outline_Translate (&ft_face->glyph->outline, -left, -bottom ); + if ( pFT_Library_SetLcdFilter ) pFT_Library_SetLcdFilter( library, lcdfilter ); pFT_Render_Glyph (ft_face->glyph, render_mode); src = ft_face->glyph->bitmap.buffer; src_pitch = ft_face->glyph->bitmap.pitch; + src_width = ft_face->glyph->bitmap.width; + src_height = ft_face->glyph->bitmap.rows; + if ( render_mode == FT_RENDER_MODE_LCD) { rgb_interval = 1; @@ -4830,9 +4834,20 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, vmul = 3; } - while ( height-- ) + x_shift = ft_face->glyph->bitmap_left - lpgm->gmptGlyphOrigin.x; + if ( x_shift < 0 ) x_shift = 0; + if ( x_shift + (src_width / hmul) > width ) + x_shift = width - (src_width / hmul); + + y_shift = lpgm->gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; + if ( y_shift < 0 ) y_shift = 0; + if ( y_shift + (src_height / vmul) > height ) + y_shift = height - (src_height / vmul); + + dst += x_shift + y_shift * ( pitch / 4 ); + while ( src_height ) { - for ( x = 0; x < width; x++ ) + for ( x = 0; x < src_width / hmul; x++ ) { if ( rgb ) { @@ -4851,6 +4866,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } src += src_pitch * vmul; dst += pitch / 4; + src_height -= vmul; } break;

1 0

Byeongsik Jeon : user32: Implementation the SPI_{GET|SET}FONTSMOOTHING* actions.
by Alexandre Julliard 29 Dec '08

29 Dec '08

Module: wine Branch: master Commit: edb852308c52be27554a75d9d7ada7276e13bfb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb852308c52be27554a75d9d… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Sat Dec 27 17:56:49 2008 +0900 user32: Implementation the SPI_{GET|SET}FONTSMOOTHING* actions. --- dlls/user32/sysparams.c | 111 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 104 insertions(+), 7 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index bd1b36c..92dc912 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -86,6 +86,9 @@ enum spi_index SPI_SETFOREGROUNDLOCKTIMEOUT_IDX, SPI_CARETWIDTH_IDX, SPI_SETMOUSESPEED_IDX, + SPI_SETFONTSMOOTHINGTYPE_IDX, + SPI_SETFONTSMOOTHINGCONTRAST_IDX, + SPI_SETFONTSMOOTHINGORIENTATION_IDX, SPI_INDEX_COUNT }; @@ -224,6 +227,12 @@ static const WCHAR SPI_CARETWIDTH_REGKEY[]= {'C','o','n','t',' static const WCHAR SPI_CARETWIDTH_VALNAME[]= {'C','a','r','e','t','W','i','d','t','h',0}; static const WCHAR SPI_SETMOUSESPEED_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0}; static const WCHAR SPI_SETMOUSESPEED_VALNAME[]= {'M','o','u','s','e','S','e','n','s','i','t','i','v','i','t','y',0}; +static const WCHAR SPI_SETFONTSMOOTHINGTYPE_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; +static const WCHAR SPI_SETFONTSMOOTHINGTYPE_VALNAME[]= {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; +static const WCHAR SPI_SETFONTSMOOTHINGCONTRAST_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; +static const WCHAR SPI_SETFONTSMOOTHINGCONTRAST_VALNAME[]= {'F','o','n','t','S','m','o','o','t','h','i','n','g','G','a','m','m','a',0}; +static const WCHAR SPI_SETFONTSMOOTHINGORIENTATION_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; +static const WCHAR SPI_SETFONTSMOOTHINGORIENTATION_VALNAME[]= {'F','o','n','t','S','m','o','o','t','h','i','n','g','O','r','i','e','n','t','a','t','i','o','n',0}; /* FIXME - real values */ static const WCHAR SPI_SETSCREENSAVERRUNNING_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -316,6 +325,9 @@ static BOOL swap_buttons = FALSE; static UINT foreground_lock_timeout = 0; static UINT caret_width = 1; static UINT mouse_sensitivity = 10; +static UINT font_smoothing_type = 0; +static UINT font_smoothing_contrast = 0; +static UINT font_smoothing_orientation = 0; static BYTE user_prefs[4]; static MINIMIZEDMETRICS minimized_metrics = @@ -1986,7 +1998,10 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, SPI_SETFONTSMOOTHING_REGKEY, SPI_SETFONTSMOOTHING_VALNAME, &font_smoothing, &tmpval ); - *(UINT *) pvParam = ( tmpval != 0); + if (!pvParam) ret = FALSE; + + if (ret) + *(UINT *) pvParam = ( tmpval != 0); break; } case SPI_SETFONTSMOOTHING: @@ -2357,16 +2372,98 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCKTIME); /* 0x2008 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCKTIME); /* 0x2009 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETFONTSMOOTHINGTYPE); /* 0x200A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETFONTSMOOTHINGTYPE); /* 0x200B _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETFONTSMOOTHINGCONTRAST);/* 0x200C _WIN32_WINNT >= 0x510 */ - WINE_SPI_FIXME(SPI_SETFONTSMOOTHINGCONTRAST);/* 0x200D _WIN32_WINNT >= 0x510 */ + case SPI_GETFONTSMOOTHINGTYPE: /* 0x200A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + spi_idx = SPI_SETFONTSMOOTHINGTYPE_IDX; + if (!spi_loaded[spi_idx]) + { + ret = SYSPARAMS_Load( SPI_SETFONTSMOOTHINGTYPE_REGKEY, + SPI_SETFONTSMOOTHINGTYPE_VALNAME, + (LPWSTR)&font_smoothing_type, + sizeof(font_smoothing_type) ); + if ( ret) spi_loaded[spi_idx] = TRUE; + } + if (!pvParam) ret = FALSE; + + if (ret) + *(UINT *)pvParam = font_smoothing_type; + break; + + case SPI_SETFONTSMOOTHINGTYPE: /* 0x200B _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + spi_idx = SPI_SETFONTSMOOTHINGTYPE_IDX; + if (SYSPARAMS_SaveRaw( SPI_SETFONTSMOOTHINGTYPE_REGKEY, + SPI_SETFONTSMOOTHINGTYPE_VALNAME, + (LPBYTE)&pvParam, sizeof(UINT), REG_DWORD, fWinIni )) + { + font_smoothing_type = (UINT)pvParam; + spi_loaded[spi_idx] = TRUE; + } + else + ret = FALSE; + break; + + case SPI_GETFONTSMOOTHINGCONTRAST: /* 0x200C _WIN32_WINNT >= 0x510 */ + spi_idx = SPI_SETFONTSMOOTHINGCONTRAST_IDX; + if (!spi_loaded[spi_idx]) + { + ret = SYSPARAMS_Load( SPI_SETFONTSMOOTHINGCONTRAST_REGKEY, + SPI_SETFONTSMOOTHINGCONTRAST_VALNAME, + (LPWSTR)&font_smoothing_contrast, + sizeof(font_smoothing_contrast) ); + if (ret) + spi_loaded[spi_idx] = TRUE; + } + if (!pvParam) ret = FALSE; + + if (ret) + *(UINT *)pvParam = font_smoothing_contrast; + break; + + case SPI_SETFONTSMOOTHINGCONTRAST: /* 0x200D _WIN32_WINNT >= 0x510 */ + spi_idx = SPI_SETFONTSMOOTHINGCONTRAST_IDX; + if (SYSPARAMS_SaveRaw( SPI_SETFONTSMOOTHINGCONTRAST_REGKEY, + SPI_SETFONTSMOOTHINGCONTRAST_VALNAME, + (LPBYTE)&pvParam, sizeof(UINT), REG_DWORD, fWinIni )) + { + font_smoothing_contrast = (UINT)pvParam; + spi_loaded[spi_idx] = TRUE; + } + else + ret = FALSE; + break; + WINE_SPI_FIXME(SPI_GETFOCUSBORDERWIDTH); /* 0x200E _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_SETFOCUSBORDERWIDTH); /* 0x200F _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_GETFOCUSBORDERHEIGHT); /* 0x2010 _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_SETFOCUSBORDERHEIGHT); /* 0x2011 _WIN32_WINNT >= 0x510 */ - WINE_SPI_FIXME(SPI_GETFONTSMOOTHINGORIENTATION); /* 0x2012 */ - WINE_SPI_FIXME(SPI_SETFONTSMOOTHINGORIENTATION); /* 0x2013 */ + case SPI_GETFONTSMOOTHINGORIENTATION: /* 0x2012 */ + spi_idx = SPI_SETFONTSMOOTHINGORIENTATION_IDX; + if (!spi_loaded[spi_idx]) + { + ret = SYSPARAMS_Load( SPI_SETFONTSMOOTHINGORIENTATION_REGKEY, + SPI_SETFONTSMOOTHINGORIENTATION_VALNAME, + (LPWSTR)&font_smoothing_orientation, + sizeof(font_smoothing_orientation) ); + if (ret) + spi_loaded[spi_idx] = TRUE; + } + if (!pvParam) ret = FALSE; + + if (ret) + *(UINT *)pvParam = font_smoothing_orientation; + break; + + case SPI_SETFONTSMOOTHINGORIENTATION: /* 0x2013 */ + spi_idx = SPI_SETFONTSMOOTHINGORIENTATION_IDX; + if (SYSPARAMS_SaveRaw( SPI_SETFONTSMOOTHINGORIENTATION_REGKEY, + SPI_SETFONTSMOOTHINGORIENTATION_VALNAME, + (LPBYTE)&pvParam, sizeof(UINT), REG_DWORD, fWinIni )) + { + font_smoothing_orientation = (UINT)pvParam; + spi_loaded[spi_idx] = TRUE; + } + else + ret = FALSE; + break; default: FIXME( "Unknown action: %u\n", uiAction );

1 0