November 2012 - Wine-commits

Detlef Riekenberg : mstask/tests: Add tests for GetTargetComputer.
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 48ddbde74683a7a58aa4e73cb7fd60197d1df0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ddbde74683a7a58aa4e73cb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 6 00:20:13 2012 +0100 mstask/tests: Add tests for GetTargetComputer. --- dlls/mstask/tests/task_scheduler.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 2de0e16..98556be 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -102,10 +102,43 @@ static void test_Activate(void) return; } +static void test_GetTargetComputer(void) +{ + HRESULT hres; + WCHAR *oldname; + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler.\n"); + return; + } + + if (0) + { + /* This crashes on w2k */ + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, NULL); + ok(hres == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hres); + } + + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); + ok((hres == S_OK) && oldname && oldname[0] == '\\' && oldname[1] == '\\' && oldname[2], + "got 0x%x and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); + + CoTaskMemFree(oldname); + + ITaskScheduler_Release(test_task_scheduler); + return; +} + START_TEST(task_scheduler) { CoInitialize(NULL); test_NewWorkItem(); test_Activate(); + test_GetTargetComputer(); CoUninitialize(); }

1 0

Dmitry Timoshkov : gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString .
by Alexandre Julliard 06 Nov '12

06 Nov '12

Module: wine Branch: master Commit: 12340af3f9234186116663a70fa8d1fb85adc013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12340af3f9234186116663a70… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 6 17:38:23 2012 +0800 gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b3eaa86d..e7b72b7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2166,7 +2166,8 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) } static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, - GDIPCONST GpStringFormat *format, HFONT *hfont) + GDIPCONST GpStringFormat *format, HFONT *hfont, + GDIPCONST GpMatrix *matrix) { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; @@ -2193,6 +2194,11 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + if (matrix) + { + GpMatrix xform = *matrix; + GdipTransformMatrixPoints(&xform, pt, 3); + } if (graphics) GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); @@ -5052,7 +5058,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - get_font_hfont(graphics, font, stringFormat, &gdifont); + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); for (i=0; i<stringFormat->range_count; i++) @@ -5182,7 +5188,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; - get_font_hfont(graphics, font, format, &gdifont); + get_font_hfont(graphics, font, format, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); bounds->X = rect->X; @@ -5369,7 +5375,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SelectClipRgn(hdc, rgn); } - get_font_hfont(graphics, font, format, &gdifont); + get_font_hfont(graphics, font, format, &gdifont, NULL); SelectObject(hdc, gdifont); args.graphics = graphics; @@ -6325,10 +6331,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - - get_font_hfont(graphics, font, NULL, &hfont); + get_font_hfont(graphics, font, NULL, &hfont, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -6341,6 +6344,11 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT pt[1].Y = 0.0; pt[2].X = 0.0; pt[2].Y = 1.0; + if (matrix) + { + GpMatrix xform = *matrix; + GdipTransformMatrixPoints(&xform, pt, 3); + } GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); @@ -6417,9 +6425,6 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - if (!(flags & DriverStringOptionsCmapLookup)) eto_flags |= ETO_GLYPH_INDEX; @@ -6430,7 +6435,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 pt = positions[0]; GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &pt, 1); - get_font_hfont(graphics, font, format, &hfont); + get_font_hfont(graphics, font, format, &hfont, matrix); SelectObject(graphics->hdc, hfont); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); @@ -6476,9 +6481,6 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); - if (matrix) - FIXME("Ignoring matrix\n"); - pti = GdipAlloc(sizeof(POINT) * length); if (!pti) return OutOfMemory; @@ -6505,7 +6507,7 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI GdipFree(real_positions); } - get_font_hfont(graphics, font, format, &hfont); + get_font_hfont(graphics, font, format, &hfont, matrix); hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont);

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

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 : 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: 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: 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

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

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

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