wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE3.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 10db5750442af4445f5ec538f1ccf1644878a99d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10db5750442af4445f5ec538f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 21:38:21 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE3. --- include/ddraw.h | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 88660ba..2ab7826 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -2133,16 +2133,18 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawSurface3 methods ***/ - STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; + STDMETHOD(AddAttachedSurface)(THIS_ IDirectDrawSurface3 *attachment) PURE; STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; - STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; + STDMETHOD(Blt)(THIS_ RECT *dst_rest, IDirectDrawSurface3 *src_surface, RECT *src_rect, + DWORD flags, DDBLTFX *fx) PURE; STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; - STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE3 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; - STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSAttachedSurface) PURE; + STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface3 *src_surface, + RECT *src_rect, DWORD flags) PURE; + STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface3 *attachment) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; - STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE3 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; - STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE3 *lplpDDAttachedSurface) PURE; + STDMETHOD(Flip)(THIS_ IDirectDrawSurface3 *dst_surface, DWORD flags) PURE; + STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS *caps, IDirectDrawSurface3 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetCaps)(THIS_ LPDDSCAPS lpDDSCaps) PURE; STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE; @@ -2163,9 +2165,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; STDMETHOD(Unlock)(THIS_ LPVOID lpSurfaceData) PURE; - STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE3 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *src_rect, IDirectDrawSurface3 *dst_surface, RECT *dst_rect, + DWORD flags, DDOVERLAYFX *fx) PURE; STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE3 lpDDSReference) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD flags, IDirectDrawSurface3 *reference_surface) PURE; /* added in v2 */ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE; STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;

1 0

Jacek Caban : mshtml: Keep reference to document node in fire_event_obj.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: e3e0fdd4612a690b556b6b203870410eaa9c3967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3e0fdd4612a690b556b6b203… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 19:04:30 2012 +0100 mshtml: Keep reference to document node in fire_event_obj. --- dlls/mshtml/htmlevent.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index cb8a1cf..13095fb 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1055,6 +1055,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); + htmldoc_addref(&doc->basedoc); + window = doc->window; prev_event = window->event; window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL; @@ -1155,6 +1157,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("calling PreventDefault\n"); nsIDOMEvent_PreventDefault(event_obj->nsevent); } + + htmldoc_release(&doc->basedoc); } void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent,

1 0

Jacek Caban : mshtml: Don't call CP event sinks on detached documents.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 8086af47b5f803bd2e9dc2cbdf9569a06aeaf630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8086af47b5f803bd2e9dc2cbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 19:04:18 2012 +0100 mshtml: Don't call CP event sinks on detached documents. --- dlls/mshtml/htmlevent.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 068114a..cb8a1cf 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -996,7 +996,12 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, } } - if(cp_container) { + /* + * NOTE: CP events may require doc_obj reference, which we don't own. We make sure that + * it's safe to call event handler by checking nsevent_listener, which is NULL for + * detached documents. + */ + if(cp_container && doc->nsevent_listener) { ConnectionPoint *cp; if(cp_container->forward_container) @@ -1004,7 +1009,7 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, for(cp = cp_container->cp_list; cp; cp = cp->next) { if(cp->sinks_size && is_cp_event(cp->data, event_info[eid].dispid)) { - for(i=0; i < cp->sinks_size; i++) { + for(i=0; doc->nsevent_listener && i < cp->sinks_size; i++) { if(!cp->sinks[i].disp) continue; @@ -1028,6 +1033,9 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, WARN("cp %s [%d] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); } } + + if(!doc->nsevent_listener) + break; } } }

1 0

Alexandre Julliard : gdi32: Take into account the FontSmoothing key for anti-aliasing.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 86c41dc4682a7dc74ae7d5222039b55dc4102f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c41dc4682a7dc74ae7d5222… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 15:56:30 2012 +0100 gdi32: Take into account the FontSmoothing key for anti-aliasing. --- dlls/gdi32/font.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 10a942b..027c392 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -295,22 +295,17 @@ static UINT get_subpixel_orientation( HKEY key ) static UINT get_default_smoothing( HKEY key ) { + static const WCHAR smoothing[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g',0}; static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; - DWORD type; - - /* FIXME: Ignoring FontSmoothing for now since this is - set to off by default in wine.inf */ + DWORD enabled, type; - if (get_key_value( key, smoothing_type, &type )) return 0; + if (get_key_value( key, smoothing, &enabled )) return 0; + if (!enabled) return GGO_BITMAP; - switch (type) - { - case 1: /* FE_FONTSMOOTHINGSTANDARD */ - return GGO_GRAY4_BITMAP; - case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ + if (!get_key_value( key, smoothing_type, &type ) && type == 2 /* FE_FONTSMOOTHINGCLEARTYPE */) return get_subpixel_orientation( key ); - } - return 0; + + return GGO_GRAY4_BITMAP; }

1 0

Alexandre Julliard : gdi32: Avoid opening the desktop registry key multiple times.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: ff8647ea39b37083a239b184522d14849fa4c62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8647ea39b37083a239b1845… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 6 15:35:18 2012 +0100 gdi32: Avoid opening the desktop registry key multiple times. --- dlls/gdi32/font.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b289fa9..10a942b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -260,32 +260,28 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } -static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) +static DWORD get_key_value( HKEY key, const WCHAR *name, DWORD *value ) { - static const WCHAR desktop[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; - HKEY key; WCHAR buf[12]; DWORD count = sizeof(buf), type, err; - err = RegOpenKeyW( HKEY_CURRENT_USER, desktop, &key ); + err = RegQueryValueExW( key, name, NULL, &type, (BYTE *)buf, &count ); if (!err) { - err = RegQueryValueExW( key, name, NULL, &type, (BYTE*)buf, &count ); - if (!err) *value = atoiW( buf ); - RegCloseKey( key ); + if (type == REG_DWORD) memcpy( value, buf, sizeof(*value) ); + else *value = atoiW( buf ); } return err; } -static UINT get_subpixel_orientation( void ) +static UINT get_subpixel_orientation( HKEY key ) { static const WCHAR smoothing_orientation[] = {'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}; - DWORD orient, err; + DWORD orient; /* FIXME: handle vertical orientations even though Windows doesn't */ - err = get_desktop_value( smoothing_orientation, &orient ); - if (err) return GGO_GRAY4_BITMAP; + if (get_key_value( key, smoothing_orientation, &orient )) return GGO_GRAY4_BITMAP; switch (orient) { @@ -297,23 +293,22 @@ static UINT get_subpixel_orientation( void ) return GGO_GRAY4_BITMAP; } -static UINT get_default_smoothing( void ) +static UINT get_default_smoothing( HKEY key ) { static const WCHAR smoothing_type[] = {'F','o','n','t','S','m','o','o','t','h','i','n','g','T','y','p','e',0}; - DWORD type, err; + DWORD type; /* FIXME: Ignoring FontSmoothing for now since this is set to off by default in wine.inf */ - err = get_desktop_value( smoothing_type, &type ); - if (err) return 0; + if (get_key_value( key, smoothing_type, &type )) return 0; switch (type) { case 1: /* FE_FONTSMOOTHINGSTANDARD */ return GGO_GRAY4_BITMAP; case 2: /* FE_FONTSMOOTHINGCLEARTYPE */ - return get_subpixel_orientation(); + return get_subpixel_orientation( key ); } return 0; } @@ -666,7 +661,10 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) */ HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) { + static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', + 'D','e','s','k','t','o','p',0 }; LOGFONTW lf; + HKEY key; if (*aa_flags) return 0; @@ -681,10 +679,14 @@ HFONT nulldrv_SelectFont( PHYSDEV dev, HFONT font, UINT *aa_flags ) break; case CLEARTYPE_QUALITY: case CLEARTYPE_NATURAL_QUALITY: - *aa_flags = get_subpixel_orientation(); + if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key )) break; + *aa_flags = get_subpixel_orientation( key ); + RegCloseKey( key ); break; default: - *aa_flags = get_default_smoothing(); + if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key )) break; + *aa_flags = get_default_smoothing( key ); + RegCloseKey( key ); break; } return 0;

1 0

Alexandre Julliard : gdi32: Use the fontconfig anti-aliasing setup even for non-fontconfig fonts.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 7fdba1f3dde31b3c8584914b2be850660b28bd76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fdba1f3dde31b3c8584914b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 22:32:51 2012 +0100 gdi32: Use the fontconfig anti-aliasing setup even for non-fontconfig fonts. --- dlls/gdi32/freetype.c | 124 +++++++++++++++++++++++++++++++------------------ 1 files changed, 79 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9ef8b7b..8b56330 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -203,7 +203,6 @@ MAKE_FUNCPTR(FcPatternDestroy); MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetInteger); MAKE_FUNCPTR(FcPatternGetString); -MAKE_FUNCPTR(FcPatternPrint); #endif #undef MAKE_FUNCPTR @@ -516,6 +515,8 @@ struct font_mapping static struct list mappings_list = LIST_INIT( mappings_list ); +static UINT default_aa_flags; + static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -1905,6 +1906,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ INT ret = 0; DWORD aa_flags = HIWORD( flags ); + if (!aa_flags) aa_flags = default_aa_flags; + /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */ assert(file || !(flags & ADDFONT_EXTERNAL_FONT)); @@ -2378,9 +2381,70 @@ static BOOL ReadFontDir(const char *dirname, BOOL external_fonts) } #ifdef SONAME_LIBFONTCONFIG + +static BOOL fontconfig_enabled; + +static UINT parse_aa_pattern( FcPattern *pattern ) +{ + FcBool antialias; + int rgba; + UINT aa_flags = 0; + + if (pFcPatternGetBool( pattern, FC_ANTIALIAS, 0, &antialias ) == FcResultMatch) + aa_flags = antialias ? GGO_GRAY4_BITMAP : GGO_BITMAP; + + if (pFcPatternGetInteger( pattern, FC_RGBA, 0, &rgba ) == FcResultMatch) + { + switch (rgba) + { + case FC_RGBA_RGB: aa_flags = WINE_GGO_HRGB_BITMAP; break; + case FC_RGBA_BGR: aa_flags = WINE_GGO_HBGR_BITMAP; break; + case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break; + case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break; + case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break; + } + } + return aa_flags; +} + +static void init_fontconfig(void) +{ + void *fc_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0); + + if (!fc_handle) + { + TRACE("Wine cannot find the fontconfig library (%s).\n", SONAME_LIBFONTCONFIG); + return; + } + +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return;} + LOAD_FUNCPTR(FcConfigSubstitute); + LOAD_FUNCPTR(FcFontList); + LOAD_FUNCPTR(FcFontSetDestroy); + LOAD_FUNCPTR(FcInit); + LOAD_FUNCPTR(FcObjectSetAdd); + LOAD_FUNCPTR(FcObjectSetCreate); + LOAD_FUNCPTR(FcObjectSetDestroy); + LOAD_FUNCPTR(FcPatternCreate); + LOAD_FUNCPTR(FcPatternDestroy); + LOAD_FUNCPTR(FcPatternGetBool); + LOAD_FUNCPTR(FcPatternGetInteger); + LOAD_FUNCPTR(FcPatternGetString); +#undef LOAD_FUNCPTR + + if (pFcInit()) + { + FcPattern *pattern = pFcPatternCreate(); + pFcConfigSubstitute( NULL, pattern, FcMatchFont ); + default_aa_flags = parse_aa_pattern( pattern ); + pFcPatternDestroy( pattern ); + TRACE( "enabled, default flags = %x\n", default_aa_flags ); + fontconfig_enabled = TRUE; + } +} + static void load_fontconfig_fonts(void) { - void *fc_handle = NULL; FcPattern *pat; FcObjectSet *os; FcFontSet *fontset; @@ -2388,29 +2452,7 @@ static void load_fontconfig_fonts(void) char *file; const char *ext; - fc_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0); - if(!fc_handle) { - TRACE("Wine cannot find the fontconfig library (%s).\n", - SONAME_LIBFONTCONFIG); - return; - } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fc_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} -LOAD_FUNCPTR(FcConfigSubstitute); -LOAD_FUNCPTR(FcFontList); -LOAD_FUNCPTR(FcFontSetDestroy); -LOAD_FUNCPTR(FcInit); -LOAD_FUNCPTR(FcObjectSetAdd); -LOAD_FUNCPTR(FcObjectSetCreate); -LOAD_FUNCPTR(FcObjectSetDestroy); -LOAD_FUNCPTR(FcPatternCreate); -LOAD_FUNCPTR(FcPatternDestroy); -LOAD_FUNCPTR(FcPatternGetBool); -LOAD_FUNCPTR(FcPatternGetInteger); -LOAD_FUNCPTR(FcPatternGetString); -LOAD_FUNCPTR(FcPatternPrint); -#undef LOAD_FUNCPTR - - if(!pFcInit()) return; + if (!fontconfig_enabled) return; pat = pFcPatternCreate(); os = pFcObjectSetCreate(); @@ -2422,13 +2464,10 @@ LOAD_FUNCPTR(FcPatternPrint); if(!fontset) return; for(i = 0; i < fontset->nfont; i++) { FcBool scalable; - FcBool antialias; - int rgba; - DWORD aa_flags = 0; + DWORD aa_flags; if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) continue; - TRACE("fontconfig: %s\n", file); pFcConfigSubstitute( NULL, fontset->fonts[i], FcMatchFont ); @@ -2442,20 +2481,8 @@ LOAD_FUNCPTR(FcPatternPrint); continue; } - if (pFcPatternGetBool( fontset->fonts[i], FC_ANTIALIAS, 0, &antialias ) == FcResultMatch) - aa_flags = antialias ? GGO_GRAY4_BITMAP : GGO_BITMAP; - - if (pFcPatternGetInteger( fontset->fonts[i], FC_RGBA, 0, &rgba ) == FcResultMatch) - { - switch (rgba) - { - case FC_RGBA_RGB: aa_flags = WINE_GGO_HRGB_BITMAP; break; - case FC_RGBA_BGR: aa_flags = WINE_GGO_HBGR_BITMAP; break; - case FC_RGBA_VRGB: aa_flags = WINE_GGO_VRGB_BITMAP; break; - case FC_RGBA_VBGR: aa_flags = WINE_GGO_VBGR_BITMAP; break; - case FC_RGBA_NONE: aa_flags = GGO_GRAY4_BITMAP; break; - } - } + aa_flags = parse_aa_pattern( fontset->fonts[i] ); + TRACE("fontconfig: %s aa %x\n", file, aa_flags); len = strlen( file ); if(len < 4) continue; @@ -2467,8 +2494,6 @@ LOAD_FUNCPTR(FcPatternPrint); pFcFontSetDestroy(fontset); pFcObjectSetDestroy(os); pFcPatternDestroy(pat); - sym_not_found: - return; } #elif defined(HAVE_CARBON_CARBON_H) @@ -3597,6 +3622,10 @@ static void init_font_list(void) char *unixname; const char *data_dir; +#ifdef SONAME_LIBFONTCONFIG + init_fontconfig(); +#endif + delete_external_font_keys(); /* load the system bitmap fonts */ @@ -4989,10 +5018,15 @@ done: { WORD gasp_flags; if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + { + TRACE( "font %s %d aa disabled by GASP\n", + debugstr_w(lf.lfFaceName), lf.lfHeight ); *aa_flags = GGO_BITMAP; + } } } } + TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); dc->gdiFont = ret; physdev->font = ret; }

1 0

Alexandre Julliard : gdi32: Get rid of the non-standard flags in GetRasterizerCaps.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: ddba05547f6c92a8f7a5f0b9c8c81ee19e8e870f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddba05547f6c92a8f7a5f0b9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 22:31:31 2012 +0100 gdi32: Get rid of the non-standard flags in GetRasterizerCaps. --- dlls/gdi32/freetype.c | 23 +++++------------------ include/wingdi.h | 5 ----- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fcdcca9..9ef8b7b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -916,6 +916,7 @@ static BOOL is_hinting_enabled(void) } #endif else enabled = FALSE; + TRACE("hinting is %senabled\n", enabled ? "" : "NOT "); } return enabled; } @@ -925,8 +926,11 @@ static BOOL is_subpixel_rendering_enabled( void ) #ifdef HAVE_FREETYPE_FTLCDFIL_H static int enabled = -1; if (enabled == -1) + { enabled = (pFT_Library_SetLcdFilter && pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); + TRACE("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); + } return enabled; #else return FALSE; @@ -7556,25 +7560,8 @@ static BOOL freetype_FontIsLinked( PHYSDEV dev ) */ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) { - static int hinting = -1; - static int subpixel = -1; - - if(hinting == -1) - { - hinting = is_hinting_enabled(); - TRACE("hinting is %senabled\n", hinting ? "" : "NOT "); - } - - if ( subpixel == -1 ) - { - subpixel = is_subpixel_rendering_enabled(); - TRACE("subpixel rendering is %senabled\n", subpixel ? "" : "NOT "); - } - lprs->nSize = sizeof(RASTERIZER_STATUS); - lprs->wFlags = TT_AVAILABLE | TT_ENABLED | (hinting ? WINE_TT_HINTER_ENABLED : 0); - if ( subpixel ) - lprs->wFlags |= WINE_TT_SUBPIXEL_RENDERING_ENABLED; + lprs->wFlags = TT_AVAILABLE | TT_ENABLED; lprs->nLanguageID = 0; return TRUE; } diff --git a/include/wingdi.h b/include/wingdi.h index 782c4b7..ca98b3e 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1459,11 +1459,6 @@ typedef struct #define TT_AVAILABLE 0x0001 #define TT_ENABLED 0x0002 -#ifdef __WINESRC__ -#define WINE_TT_SUBPIXEL_RENDERING_ENABLED 0x4000 -#define WINE_TT_HINTER_ENABLED 0x8000 -#endif - #define TT_PRIM_LINE 1 #define TT_PRIM_QSPLINE 2 #define TT_PRIM_CSPLINE 3

1 0

Alexandre Julliard : include: Add format definitions for wglUseFontOutlines .
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 3176d4d495814ba6c2d609f244ce368e3a579462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3176d4d495814ba6c2d609f24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 23:23:48 2012 +0100 include: Add format definitions for wglUseFontOutlines. --- include/wingdi.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index bff96f4..782c4b7 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3767,6 +3767,9 @@ WINGDIAPI BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,INT); #define WGL_SWAP_UNDERLAY14 (1 << 29) #define WGL_SWAP_UNDERLAY15 (1 << 30) +#define WGL_FONT_LINES 0 +#define WGL_FONT_POLYGONS 1 + /* WGL prototypes */ WINGDIAPI HGLRC WINAPI wglCreateContext(HDC); WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC,INT);

1 0

Lucas Zawacki : Portuguese translation for release 1.5.16
by Jeremy Newman 06 Nov '12

06 Nov '12

Module: website Branch: master Commit: ae64214cbf5cf6b74cc7ef326fe1c9f51daf7449 URL: http://source.winehq.org/git/website.git/?a=commit;h=ae64214cbf5cf6b74cc7ef… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Nov 5 10:02:57 2012 -0200 Portuguese translation for release 1.5.16 --- news/pt/2012102601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012102601.xml b/news/pt/2012102601.xml new file mode 100644 index 0000000..0db2990 --- /dev/null +++ b/news/pt/2012102601.xml @@ -0,0 +1,17 @@ +<news> +<date>26 de Outubro de 2012</date> +<title>Wine 1.5.16 lançado</title> +<body> + A versão de desenvolvimento 1.5.16 já está disponível. + <a href="{$root}/announce/1.5.16">Novidades</a> nesta versão: +<ul> + <li>Nova versão do pacote Mono.</li> + <li>Várias melhorias no parser de linha de comando CMD.</li> + <li>Mais classes de stream no runtime C++.</li> + <li>Suporte ao gerenciamento de serviços usando WMI.</li> + <li>Melhoria na detecção de CPU.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.16.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Piotr Caban : msvcrt: Improved scanf precision.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 74ec93bab77d387018f170ae2e3576329ae207e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ec93bab77d387018f170ae2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 5 11:40:20 2012 +0100 msvcrt: Improved scanf precision. --- dlls/msvcrt/scanf.h | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 89fdac3..7f618f4 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -310,9 +310,11 @@ _FUNCTION_ { case 'f': case 'g': case 'G': { /* read a float */ - long double cur; + long double cur = 1, expcnt = 10; ULONGLONG d, hlp; int exp = 0, negative = 0; + unsigned fpcontrol; + BOOL negexp; /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) @@ -401,7 +403,24 @@ _FUNCTION_ { else exp += e; } - cur = (exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); + fpcontrol = _control87(0, 0); + _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE + |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); + + negexp = (exp < 0); + if(negexp) + exp = -exp; + /* update 'cur' with this exponent. */ + while(exp) { + if(exp & 1) + cur *= expcnt; + exp /= 2; + expcnt = expcnt*expcnt; + } + cur = (negexp ? d/cur : d*cur); + + _control87(fpcontrol, 0xffffffff); + st = 1; if (!suppress) { if (L_prefix) _SET_NUMBER_(double);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 34951f3154616f59568e668b354a244a0603867d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34951f3154616f59568e668b3… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 5 11:27:57 2012 +0100 po: Update German translation. --- po/de.po | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 98fa447..6087487 100644 --- a/po/de.po +++ b/po/de.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: 2012-10-27 03:40+0200\n" +"PO-Revision-Date: 2012-11-05 11:27+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -8278,44 +8278,37 @@ msgid "Security Warning" msgstr "Sicherheitswarnung" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Möchten Sie dennoch fortfahren?" +msgstr "Möchten Sie diese Software installieren?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Ort:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Software" +msgstr "Nicht installieren" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Wenn ActiveX installiert ist, hat es Vollzugriff auf ihren Computer. Klicken " +"Sie nicht auf Installieren, wenn Sie der obigen Quelle nicht absolut " +"vertrauen." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Installationsumwandlung konnte nicht angewendet werden.\n" +msgstr "Installation der Komponente fehlgeschlagen: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Installieren" +msgstr "Installieren (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Installieren" +msgstr "Installieren" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Frédéric Delanoy : msi: Fix a leak (coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 84541cc5e358a39e8a1bc3a3387e1e189571567e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84541cc5e358a39e8a1bc3a33… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 5 15:46:45 2012 +0100 msi: Fix a leak (coverity). --- dlls/msi/table.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a7798e5..c5aa685 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2267,6 +2267,7 @@ static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *r if ( !p ) { r = ERROR_OUTOFMEMORY; + msi_free(sval); goto err; } stname = p;

1 0

Hans Leidekker : msi: Fix handling of REG_MULTI_SZ values in the WriteRegistryValues action.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7d3f903db17e69dde66bedd53a23f8bf0a5a2ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f903db17e69dde66bedd53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 5 16:30:27 2012 +0100 msi: Fix handling of REG_MULTI_SZ values in the WriteRegistryValues action. --- dlls/msi/action.c | 270 +++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 2 +- dlls/msi/tests/action.c | 103 ++++++++++++++++++- 4 files changed, 318 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d3f903db17e69dde66be…

1 0

Hans Leidekker : msi: Preserve strings with embedded nulls in the record formatting implementation .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 570322069c98c8cddd98e67152f54a1ba0ec2fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570322069c98c8cddd98e6715… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 5 16:29:50 2012 +0100 msi: Preserve strings with embedded nulls in the record formatting implementation. --- dlls/msi/format.c | 268 +++++++++++++++++++++++++++-------------------------- 1 files changed, 135 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=570322069c98c8cddd98e…

1 0

Nikolay Sivov : dwrite: Support eight more script ranges.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: aeb5950e6f1edb2f687934524a9ac3aaec459bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb5950e6f1edb2f687934524… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 5 17:08:12 2012 -0500 dwrite: Support eight more script ranges. --- dlls/dwrite/analyzer.c | 40 +++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 84 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 114 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 34b9faf..d71220c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -30,7 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Balinese = 2, Script_Bengali = 3, + Script_Buginese = 6, Script_Canadian = 8, Script_Cherokee = 11, Script_Controls = 12, @@ -47,16 +49,22 @@ enum scriptcode { Script_Kannada = 32, Script_Khmer = 36, Script_Lao = 37, - Script_Latin = 38, + Script_Latin = 38, + Script_Lepcha = 39, + Script_Limbu = 40, Script_Malayalam = 44, Script_Mongolian = 45, Script_Myanmar = 46, + Script_New_TaiLue = 47, Script_NKo = 48, Script_Ogham = 49, + Script_OlChiki = 50, Script_Oriya = 53, Script_Runic = 58, Script_Sinhala = 61, + Script_Sundanese = 62, Script_Syriac = 64, + Script_TaiLe = 67, Script_Tamil = 68, Script_Telugu = 69, Script_Thaana = 70, @@ -167,7 +175,35 @@ static const struct script_range script_ranges[] = { /* Khmer: U+1780–U+17FF */ { Script_Khmer, 0x1780, 0x17ff }, /* Mongolian: U+1800–U+18AF */ - { Script_Mongolian, 0x1800, 0x18af}, + { Script_Mongolian, 0x1800, 0x18af }, + /* Limbu: U+1900–U+194F */ + { Script_Limbu, 0x1900, 0x194f }, + /* Tai Le: U+1950–U+197F */ + { Script_TaiLe, 0x1950, 0x197f }, + /* New Tai Lue: U+1980–U+19DF */ + { Script_New_TaiLue, 0x1980, 0x19df }, + /* Khmer Symbols: U+19E0–U+19FF */ + { Script_Khmer, 0x19e0, 0x19ff }, + /* Buginese: U+1A00–U+1A1F */ + { Script_Buginese, 0x1a00, 0x1a1f }, + /* Tai Tham: U+1A20–U+1AAF */ + { Script_Symbol, 0x1a20, 0x1aaf }, + /* Balinese: U+1B00–U+1B7F */ + { Script_Balinese, 0x1b00, 0x1b7f }, + /* Sundanese: U+1B80–U+1BBF */ + { Script_Sundanese, 0x1b80, 0x1bbf }, + /* Batak: U+1BC0–U+1BFF */ + { Script_Symbol, 0x1bc0, 0x1bff }, + /* Lepcha: U+1C00–U+1C4F */ + { Script_Lepcha, 0x1c00, 0x1c4f }, + /* Ol Chiki: U+1C50–U+1C7F */ + { Script_OlChiki, 0x1c50, 0x1c7f }, + /* Sundanese Supplement: U+1CC0–U+1CCF */ + { Script_Symbol, 0x1cc0, 0x1ccf }, + /* Vedic Extensions: U+1CD0-U+1CFF */ + { Script_Devanagari, 0x1cd0, 0x1cff }, + /* Phonetic Extensions: U+1D00–U+1DBF */ + { Script_Latin, 0x1d00, 0x1dbf }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 050837e..05dc036 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -399,7 +399,9 @@ struct sa_test { enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Balinese = 2, Script_Bengali = 3, + Script_Buginese = 6, Script_Canadian = 8, Script_Cherokee = 11, Script_Controls = 12, @@ -416,22 +418,28 @@ enum scriptcode { Script_Kannada = 32, Script_Khmer = 36, Script_Lao = 37, - Script_Latin = 38, + Script_Latin = 38, + Script_Lepcha = 39, + Script_Limbu = 40, Script_Malayalam = 44, Script_Mongolian = 45, Script_Myanmar = 46, + Script_New_TaiLue = 47, Script_NKo = 48, Script_Ogham = 49, + Script_OlChiki = 50, Script_Oriya = 53, Script_Runic = 58, Script_Sinhala = 61, + Script_Sundanese = 62, Script_Syriac = 64, + Script_TaiLe = 67, Script_Tamil = 68, Script_Telugu = 69, Script_Thaana = 70, Script_Thai = 71, Script_Tibetan = 72, - Script_Symbol = 77 + Script_Undefined = 77 }; static struct sa_test sa_tests[] = { @@ -446,16 +454,16 @@ static struct sa_test sa_tests[] = { }, { {' ',' ',' ',' ','!','$','[','^','{','~',0}, 1, - { { 0, 10, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 10, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { {' ',' ',' ','1','2',' ',0}, 1, - { { 0, 6, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 6, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* digits only */ {'1','2',0}, 1, - { { 0, 2, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 2, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Arabic */ @@ -526,7 +534,7 @@ static struct sa_test sa_tests[] = { { /* Combining Diacritical Marks */ {0x300,0x320,0x340,0x345,0x350,0x36f,0}, 1, - { { 0, 6, { Script_Symbol, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + { { 0, 6, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Greek and Coptic */ @@ -694,14 +702,74 @@ static struct sa_test sa_tests[] = { }, { /* Khmer */ - {0x1781,0x17c1,0x1798,0x179a,0x1797,0x17b6,0x179f,0x17b6,0}, 1, - { { 0, 8, { Script_Khmer, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + {0x1781,0x17c1,0x1798,0x179a,0x1797,0x17b6,0x179f,0x17b6,0x19e0,0}, 1, + { { 0, 9, { Script_Khmer, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, { /* Mongolian */ {0x182e,0x1823,0x1829,0x182d,0x1823,0x182f,0x0020,0x182a,0x1822,0x1834,0x1822,0x182d,0x180c,0}, 1, { { 0, 13, { Script_Mongolian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Limbu */ + {0x1900,0x1910,0x1920,0x1930,0}, 1, + { { 0, 4, { Script_Limbu, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tai Le */ + {0x1956,0x196d,0x1970,0x1956,0x196c,0x1973,0x1951,0x1968,0x1952,0x1970,0}, 1, + { { 0, 10, { Script_TaiLe, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* New Tai Lue */ + {0x1992,0x19c4,0}, 1, + { { 0, 2, { Script_New_TaiLue, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Buginese */ + {0x1a00,0x1a10,0}, 1, + { { 0, 2, { Script_Buginese, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tai Tham */ + {0x1a20,0x1a40,0x1a50,0}, 1, + { { 0, 3, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Balinese */ + {0x1b00,0x1b05,0x1b20,0}, 1, + { { 0, 3, { Script_Balinese, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Sundanese */ + {0x1b80,0x1b85,0x1ba0,0}, 1, + { { 0, 3, { Script_Sundanese, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Batak */ + {0x1bc0,0x1be5,0x1bfc,0}, 1, + { { 0, 3, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Lepcha */ + {0x1c00,0x1c20,0x1c40,0}, 1, + { { 0, 3, { Script_Lepcha, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Ol Chiki */ + {0x1c50,0x1c5a,0x1c77,0}, 1, + { { 0, 3, { Script_OlChiki, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Sundanese Supplement */ + {0x1cc0,0x1cc5,0x1cc8,0}, 1, + { { 0, 3, { Script_Undefined, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Phonetic Extensions */ + {0x1d00,0x1d40,0x1d70,0}, 1, + { { 0, 3, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Hans Leidekker : msi: Fix handling of strings with embedded nulls in msi_addstring.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 8d21f998c3c7fd4e469fab81229f07eb763cd6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d21f998c3c7fd4e469fab812… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 5 16:29:30 2012 +0100 msi: Fix handling of strings with embedded nulls in msi_addstring. --- dlls/msi/string.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 486cdf9..8e3e575 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -258,14 +258,12 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; - if( !data ) - return 0; - if( !data[0] ) + if( !data || !len ) return 0; if( n > 0 ) { @@ -295,8 +293,6 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U } /* allocate a new string */ - if( len < 0 ) - len = strlen(data); sz = MultiByteToWideChar( st->codepage, 0, data, len, NULL, 0 ); str = msi_alloc( (sz+1)*sizeof(WCHAR) ); if( !str ) @@ -305,7 +301,6 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U str[sz] = 0; set_st_entry( st, n, str, sz, refcount, persistence ); - return n; } @@ -316,6 +311,9 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun if( !data ) return 0; + + if (len < 0) len = strlenW( data ); + if( !data[0] && !len ) return 0; @@ -333,8 +331,6 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun return -1; /* allocate a new string */ - if(len<0) - len = strlenW(data); TRACE( "%s, n = %d len = %d\n", debugstr_wn(data, len), n, len ); str = msi_alloc( (len+1)*sizeof(WCHAR) ); @@ -344,7 +340,6 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun str[len] = 0; set_st_entry( st, n, str, len, refcount, persistence ); - return n; }

1 0

Jacek Caban : jscript: Added more enumerable attribute tests.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 25ffa3d97b33af2eaf2bae7ef536d20202135d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ffa3d97b33af2eaf2bae7ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:04:38 2012 +0100 jscript: Added more enumerable attribute tests. --- dlls/jscript/tests/api.js | 80 +++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/regexp.js | 5 +++ 2 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 03d1a71..ce2f153 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -26,6 +26,74 @@ ok(ScriptEngineMajorVersion() === ScriptEngineMajorVersion(2), "ScriptEngineMajo ok(ScriptEngineMinorVersion() === ScriptEngineMinorVersion(2), "ScriptEngineMinorVersion() !== ScriptEngineMinorVersion(2)"); ok(ScriptEngineBuildVersion() === ScriptEngineBuildVersion(2), "ScriptEngineBuildVersion() !== ScriptEngineBuildVersion(2)"); +function testNoEnumerables(expr) { + for(var iter in obj) + ok(false, expr + " has property " + iter); +} + +testNoEnumerables("Object"); +testNoEnumerables("Object.prototype"); +testNoEnumerables("new Object()"); +testNoEnumerables("Math"); +testNoEnumerables("String"); +testNoEnumerables("String.prototype"); +testNoEnumerables("new String()"); +testNoEnumerables("Number"); +testNoEnumerables("Number.prototype"); +testNoEnumerables("new Number(1)"); +testNoEnumerables("ActiveXObject"); +testNoEnumerables("Array"); +testNoEnumerables("Array.prototype"); +testNoEnumerables("new Array()"); +testNoEnumerables("Boolean"); +testNoEnumerables("Boolean.prototype"); +testNoEnumerables("new Boolean()"); +testNoEnumerables("Date"); +testNoEnumerables("Date.prototype"); +testNoEnumerables("new Date()"); +testNoEnumerables("TypeError"); +testNoEnumerables("TypeError.prototype"); +testNoEnumerables("new TypeError()"); +testNoEnumerables("Function"); +testNoEnumerables("Function.prototype"); +testNoEnumerables("testNoEnumerates"); +testNoEnumerables("VBArray"); + +ok(Object.propertyIsEnumerable("prototype") === false, "Object.prototype is enumerable"); +ok(Math.propertyIsEnumerable("E") === false, "Math.E is enumerable"); +ok(Math.propertyIsEnumerable("SQRT2") === false, "Math.SQRT2 is enumerable"); +ok(Math.propertyIsEnumerable("PI") === false, "Math.PI is enumerable"); +ok("test".propertyIsEnumerable("length") === false, "'test'.length is enumerable"); +ok([1].propertyIsEnumerable("length") === false, "[1].length is enumerable"); +ok((new TypeError()).propertyIsEnumerable("message") === true, "(new TypeError()).message is not enumerable"); +ok((new TypeError()).propertyIsEnumerable("description") === false, "(new TypeError()).description is enumerable"); +ok((new TypeError()).propertyIsEnumerable("name") === false, "(new TypeError()).name is enumerable"); +ok((new TypeError()).propertyIsEnumerable("number") === false, "(new TypeError()).number is enumerable"); +ok(Object.propertyIsEnumerable.propertyIsEnumerable("length") === false, "Object.propertyIsEnumerable.length is enumerable"); + +tmp = new Object(); +tmp.test = "1"; +ok(tmp.propertyIsEnumerable("test"), "tmp.test is not enumerable"); + +tmp = { test: 1 }; +ok(tmp.propertyIsEnumerable("test"), "tmp.test is not enumerable"); + +ok([1].concat([2]).propertyIsEnumerable("1"), "[1].concat([2]).1 is not enumerable"); +ok("t.e.s.t".split(".").propertyIsEnumerable("0"), "'test'.split().0 is not enumerable"); + +(function() { + ok(arguments.propertyIsEnumerable("0") === false, "arguments.0 is enumerable"); + ok(arguments.propertyIsEnumerable("length") === false, "arguments.length is enumerable"); + ok(arguments.propertyIsEnumerable("calee") === false, "arguments.calee is enumerable"); +})(); + +tmp = [1]; +tmp.push(""); +ok(tmp.propertyIsEnumerable("1"), "[1].push() ... 1 is not enumerable"); + +ok([1,2].reverse().propertyIsEnumerable("1"), "[1,2].rverse().1 is not enumerable"); +ok([1,2].propertyIsEnumerable("0"), "[1,2].0 is not enumerable"); + i = parseInt("0"); ok(i === 0, "parseInt('0') = " + i); i = parseInt("123"); @@ -489,7 +557,6 @@ ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); ok(r[2] === "3", "r[2] = " + r[2]); - r = "1,2,3".split(",*"); ok(r.length === 1, "r.length = " + r.length); ok(r[0] === "1,2,3", "r[0] = " + r[0]); @@ -811,6 +878,14 @@ tmp = arr.pop(); ok(arr.length === 5, "arr.length = " + arr.length); ok(tmp === undefined, "tmp = " + tmp); +function PseudoArray() { + this[0] = 0; +} +PseudoArray.prototype = {length: 1}; +arr = new PseudoArray(); +Array.prototype.push.call(arr, 2); +ok(arr.propertyIsEnumerable("length"), "arr.length is not enumerable"); + arr = [1,2,null,false,undefined,,"a"]; tmp = arr.join(); @@ -1998,6 +2073,7 @@ ok(err.valueOf === Object.prototype.valueOf, "err.valueOf !== Object.prototype.v ok(Error.prototype.name === "Error", "Error.prototype.name = " + Error.prototype.name); ok(err.name === "Error", "err.name = " + err.name); EvalError.prototype.message = "test"; +ok(EvalError.prototype.message === "test", "EvalError.prototype.message = " + EvalError.prototype.message); ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); ok(err.toString() === (invokeVersion < 2 ? "[object Error]" : "Error"), "err.toString() = " + err.toString()); err = new EvalError(); @@ -2440,6 +2516,8 @@ function testFunctions(obj, arr) { for(var i=0; i<arr.length; i++) { l = obj[arr[i][0]].length; ok(l === arr[i][1], arr[i][0] + ".length = " + l); + + ok(obj.propertyIsEnumerable(arr[i][0]) === false, arr[i][0] + " is enumerable"); } } diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 6274f93..69aa6b7 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -41,6 +41,11 @@ ok(m.index === 1, "m.index = " + m.index); ok(m.input === " aabaaa", "m.input = " + m.input); ok(m.length === 1, "m.length = " + m.length); ok(m[0] === "aa", "m[0] = " + m[0]); +ok(m.propertyIsEnumerable("0"), "m.0 is not enumerable"); +ok(m.propertyIsEnumerable("input"), "m.input is not enumerable"); +ok(m.propertyIsEnumerable("index"), "m.index is not enumerable"); +ok(m.propertyIsEnumerable("lastIndex"), "m.lastIndex is not enumerable"); +ok(m.propertyIsEnumerable("length") === false, "m.length is not enumerable"); ok(RegExp.leftContext === " ", "RegExp.leftContext = " + RegExp.leftContext); ok(RegExp.rightContext === "baaa", "RegExp.rightContext = " + RegExp.rightContext);

1 0

Jacek Caban : jscript: Added propertyIsEnumerable implementation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 78652f76022bf4c7bf6311948aa62addd047bf83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78652f76022bf4c7bf6311948… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:04:19 2012 +0100 jscript: Added propertyIsEnumerable implementation. --- dlls/jscript/dispex.c | 13 +++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 30 ++++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b01619e..f68a031 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1444,3 +1444,16 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, const WCHAR *name, BOOL *ret) *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN); return S_OK; } + +HRESULT jsdisp_is_enumerable(jsdisp_t *obj, const WCHAR *name, BOOL *ret) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name(obj, string_hash(name), name, &prop); + if(FAILED(hres)) + return hres; + + *ret = prop && (prop->flags & PROPF_ENUM) && prop->type != PROP_PROTREF; + return S_OK; +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 18ac1db..6b7c5a1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -273,6 +273,7 @@ HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_is_own_prop(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; +HRESULT jsdisp_is_enumerable(jsdisp_t*,const WCHAR*,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 6c585f7..34c572f 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -160,8 +160,34 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl static HRESULT Object_propertyIsEnumerable(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + jsstr_t *name; + BOOL ret; + HRESULT hres; + + TRACE("\n"); + + if(argc != 1) { + FIXME("argc %d not supported\n", argc); + return E_NOTIMPL; + } + + if(!is_jsdisp(jsthis)) { + FIXME("Host object this\n"); + return E_FAIL; + } + + hres = to_string(ctx, argv[0], &name); + if(FAILED(hres)) + return hres; + + hres = jsdisp_is_enumerable(jsthis->u.jsdisp, name->str, &ret); + jsstr_release(name); + if(FAILED(hres)) + return hres; + + if(r) + *r = jsval_bool(ret); + return S_OK; } static HRESULT Object_isPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Use jsdisp_propput_dontenum where appropriate.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: ea34e01493e736f8745829acf7339614f8edec6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea34e01493e736f8745829acf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:04:01 2012 +0100 jscript: Use jsdisp_propput_dontenum where appropriate. --- dlls/jscript/error.c | 6 +++--- dlls/jscript/function.c | 13 +++++++++---- dlls/jscript/global.c | 8 ++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index e127bfc..f7b0443 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -190,7 +190,7 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(err, numberW, jsval_number((INT)number)); + hres = jsdisp_propput_dontenum(err, numberW, jsval_number((INT)number)); if(FAILED(hres)) { jsdisp_release(err); return hres; @@ -201,7 +201,7 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr, if(str) { hres = jsdisp_propput_name(err, messageW, jsval_string(str)); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(err, descriptionW, jsval_string(str)); + hres = jsdisp_propput_dontenum(err, descriptionW, jsval_string(str)); jsstr_release(str); }else { hres = E_OUTOFMEMORY; @@ -357,7 +357,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) return E_OUTOFMEMORY; } - hres = jsdisp_propput_name(err, nameW, jsval_string(str)); + hres = jsdisp_propput_dontenum(err, nameW, jsval_string(str)); jsstr_release(str); if(SUCCEEDED(hres)) hres = create_builtin_constructor(ctx, constr_val[i], names[i], NULL, diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index c5bcd2e..299fafb 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -104,16 +104,21 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, unsigned ar } for(i=0; i < argc; i++) { - hres = jsdisp_propput_idx(args, i, argv[i]); + WCHAR buf[12]; + + static const WCHAR formatW[] = {'%','d',0}; + + sprintfW(buf, formatW, i); + hres = jsdisp_propput_dontenum(args, buf, argv[i]); if(FAILED(hres)) break; } if(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(args, lengthW, jsval_number(argc)); + hres = jsdisp_propput_dontenum(args, lengthW, jsval_number(argc)); if(SUCCEEDED(hres)) - hres = jsdisp_propput_name(args, caleeW, jsval_disp(calee)); + hres = jsdisp_propput_dontenum(args, caleeW, jsval_disp(calee)); } if(FAILED(hres)) { @@ -592,7 +597,7 @@ static HRESULT create_function(script_ctx_t *ctx, const builtin_info_t *builtin_ static inline HRESULT set_prototype(script_ctx_t *ctx, jsdisp_t *dispex, jsdisp_t *prototype) { - return jsdisp_propput_name(dispex, prototypeW, jsval_obj(prototype)); + return jsdisp_propput_dontenum(dispex, prototypeW, jsval_obj(prototype)); } HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 8809ddc..0668e86 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -1245,19 +1245,19 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, MathW, jsval_obj(math)); + hres = jsdisp_propput_dontenum(ctx->global, MathW, jsval_obj(math)); jsdisp_release(math); if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, undefinedW, jsval_undefined()); + hres = jsdisp_propput_dontenum(ctx->global, undefinedW, jsval_undefined()); if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, NaNW, jsval_number(NAN)); + hres = jsdisp_propput_dontenum(ctx->global, NaNW, jsval_number(NAN)); if(FAILED(hres)) return hres; - hres = jsdisp_propput_name(ctx->global, InfinityW, jsval_number(INFINITY)); + hres = jsdisp_propput_dontenum(ctx->global, InfinityW, jsval_number(INFINITY)); return hres; }

1 0

Jacek Caban : jscript: Create non-enumerable properties in jsdisp_propput_const.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 57f7a6fa4e75eb98387cac2ae324a1ece850d831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f7a6fa4e75eb98387cac2ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:03:49 2012 +0100 jscript: Create non-enumerable properties in jsdisp_propput_const. --- dlls/jscript/dispex.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index b4d333b..b01619e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -273,7 +273,7 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, BOOL search_p else hres = find_prop_name(This, string_hash(name), name, &prop); if(SUCCEEDED(hres) && (!prop || prop->type == PROP_DELETED)) { - TRACE("creating prop %s\n", debugstr_w(name)); + TRACE("creating prop %s flags %x\n", debugstr_w(name), create_flags); if(prop) { prop->type = PROP_JSVAL; @@ -1255,7 +1255,7 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, FALSE, PROPF_ENUM|PROPF_CONST, &prop); + hres = ensure_prop_name(obj, name, FALSE, PROPF_CONST, &prop); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Use prop_put in jsdisp_propput_dontenum.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7491d480a9aeb908c9311a91a05d543641d20b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7491d480a9aeb908c9311a91a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:03:35 2012 +0100 jscript: Use prop_put in jsdisp_propput_dontenum. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2be474e..b4d333b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1271,7 +1271,7 @@ HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) if(FAILED(hres)) return hres; - return jsval_copy(val, &prop->u.val); + return prop_put(obj, prop, val, NULL); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val)

1 0

Nikolay Sivov : scrrun: Added a stub for IFolder interface.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: fee495d5fda56fa5b0c24ac1f1368ae369209f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee495d5fda56fa5b0c24ac1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 16:59:00 2012 -0500 scrrun: Added a stub for IFolder interface. --- dlls/scrrun/filesystem.c | 325 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 1 + dlls/scrrun/scrrun_private.h | 11 ++ dlls/scrrun/tests/filesystem.c | 32 ++++- 4 files changed, 362 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fee495d5fda56fa5b0c24…

1 0

Nikolay Sivov : scrrun: Invoke() takes interface pointer, not a pointer to pointer.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f43b49fbedc697e33ca81a09d7dd18b4d6348ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43b49fbedc697e33ca81a09d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 10:36:16 2012 -0500 scrrun: Invoke() takes interface pointer, not a pointer to pointer. --- dlls/scrrun/filesystem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ade3310..d79c061 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -127,7 +127,7 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, hr = get_typeinfo(IFileSystem3_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Alexandre Julliard : winex11: Store the anti-aliasing flags in the device instead of the font cache.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 548e1264540e4ecc30b8ad55bd6146fd7d3df51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=548e1264540e4ecc30b8ad55b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 16:48:47 2012 +0100 winex11: Store the anti-aliasing flags in the device instead of the font cache. --- dlls/winex11.drv/xrender.c | 64 +++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b9d27fa..bafc622 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -146,7 +146,6 @@ typedef struct typedef struct { LFANDSIZE lfsz; - AA_Type aa_default; gsCacheEntryFormat * format[AA_MAXVALUE]; INT count; INT next; @@ -158,6 +157,7 @@ struct xrender_physdev X11DRV_PDEVICE *x11dev; HRGN region; enum wxr_format format; + UINT aa_flags; int cache_index; BOOL update_clip; Picture pict; @@ -789,10 +789,8 @@ static AA_Type aa_type_from_flags( UINT aa_flags ) { switch (aa_flags & 0x7f) { - case 0: case GGO_BITMAP: return AA_None; - case GGO_GRAY4_BITMAP: case WINE_GGO_GRAY16_BITMAP: return AA_Grey; case WINE_GGO_HRGB_BITMAP: @@ -860,6 +858,21 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) ret = next->funcs->pSelectFont( next, hfont, aa_flags ); if (!ret) return 0; + switch (*aa_flags) + { + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + physdev->aa_flags = WINE_GGO_GRAY16_BITMAP; + break; + case 0: + physdev->aa_flags = GGO_BITMAP; + break; + default: + physdev->aa_flags = *aa_flags; + break; + } + TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n", lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight, lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName)); @@ -883,7 +896,6 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (physdev->cache_index != -1) dec_ref_cache( physdev->cache_index ); physdev->cache_index = GetCacheEntry( &lfsz ); - glyphsetCache[physdev->cache_index].aa_default = aa_type_from_flags( *aa_flags ); LeaveCriticalSection(&xrender_cs); return ret; } @@ -1014,7 +1026,7 @@ static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) * * Helper to ExtTextOut. Must be called inside xrender_cs */ -static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type format) +static void UploadGlyph(struct xrender_physdev *physDev, int glyph) { unsigned int buflen; char *buf; @@ -1023,40 +1035,17 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type form XGlyphInfo gi; gsCacheEntry *entry = glyphsetCache + physDev->cache_index; gsCacheEntryFormat *formatEntry; - UINT ggo_format = GGO_GLYPH_INDEX; + UINT ggo_format = GGO_GLYPH_INDEX | physDev->aa_flags; + AA_Type format = aa_type_from_flags( physDev->aa_flags ); enum wxr_format wxr_format; static const char zero[4]; static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; - switch(format) { - case AA_Grey: - ggo_format |= WINE_GGO_GRAY16_BITMAP; - break; - case AA_RGB: - ggo_format |= WINE_GGO_HRGB_BITMAP; - break; - case AA_BGR: - ggo_format |= WINE_GGO_HBGR_BITMAP; - break; - case AA_VRGB: - ggo_format |= WINE_GGO_VRGB_BITMAP; - break; - case AA_VBGR: - ggo_format |= WINE_GGO_VBGR_BITMAP; - break; - - default: - ERR("aa = %d - not implemented\n", format); - case AA_None: - ggo_format |= GGO_BITMAP; - break; - } - buflen = GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, 0, NULL, &identity); if(buflen == GDI_ERROR) { if(format != AA_None) { format = AA_None; - entry->aa_default = AA_None; + physDev->aa_flags = GGO_BITMAP; ggo_format = GGO_GLYPH_INDEX | GGO_BITMAP; buflen = GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, 0, NULL, &identity); } @@ -1318,7 +1307,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, struct xrender_physdev *physdev = get_xrender_dev( dev ); gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; - AA_Type aa_type = AA_None; unsigned int idx; Picture pict, tile_pict = 0; XGlyphElt16 *elts; @@ -1354,17 +1342,15 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physdev->cache_index; - aa_type = entry->aa_default; - formatEntry = entry->format[aa_type]; + formatEntry = entry->format[aa_type_from_flags( physdev->aa_flags )]; for(idx = 0; idx < count; idx++) { if( !formatEntry ) { - UploadGlyph(physdev, wstr[idx], aa_type); - /* re-evaluate antialias since aa_default may have changed */ - aa_type = entry->aa_default; - formatEntry = entry->format[aa_type]; + UploadGlyph(physdev, wstr[idx]); + /* re-evaluate format entry since aa_flags may have changed */ + formatEntry = entry->format[aa_type_from_flags( physdev->aa_flags )]; } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) { - UploadGlyph(physdev, wstr[idx], aa_type); + UploadGlyph(physdev, wstr[idx]); } } if (!formatEntry)

1 0

Alexandre Julliard : winex11: Use the default anti-aliasing parameters from gdi32.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 11875bf40a62ece03a7bec739f1e8c2007f9c28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11875bf40a62ece03a7bec739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 13:22:46 2012 +0100 winex11: Use the default anti-aliasing parameters from gdi32. --- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/x11drv_main.c | 8 - dlls/winex11.drv/xrender.c | 320 +++++++++------------------------------- 3 files changed, 67 insertions(+), 263 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11875bf40a62ece03a7be…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012