April 2013 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Fixed load flags usage.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 0e53cfb3363960c507f6ce014833e96b47bcb9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e53cfb3363960c507f6ce014… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 4 16:15:16 2013 +0200 mshtml: Fixed load flags usage. --- dlls/mshtml/nsiface.idl | 33 +++++++++++++++++++++++++++++---- dlls/mshtml/persist.c | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 76f8ed0..368a154 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -545,6 +545,16 @@ interface nsILoadGroup : nsIRequest ] interface nsIChannel : nsIRequest { + const UINT LOAD_DOCUMENT_URI = 1 << 16; + const UINT LOAD_RETARGETED_DOCUMENT_URI = 1 << 17; + const UINT LOAD_REPLACE = 1 << 18; + const UINT LOAD_INITIAL_DOCUMENT_URI = 1 << 19; + const UINT LOAD_TARGETED = 1 << 20; + const UINT LOAD_CALL_CONTENT_SNIFFERS = 1 << 21; + const UINT LOAD_CLASSIFY_URI = 1 << 22; + const UINT LOAD_TREAT_APPLICATION_OCTET_STREAM_AS_UNKNOWN = 1 << 23; + const UINT LOAD_EXPLICIT_CREDENTIALS = 1 << 24; + nsresult GetOriginalURI(nsIURI **aOriginalURI); nsresult SetOriginalURI(nsIURI *aOriginalURI); nsresult GetURI(nsIURI **aURI); @@ -2299,10 +2309,6 @@ interface nsIBaseWindow : nsISupports nsresult SetTitle(const PRUnichar *aTitle); } -cpp_quote("#define LOAD_FLAGS_NONE 0x00000000") -cpp_quote("#define LOAD_REPLACE 0x00040000") -cpp_quote("#define LOAD_INITIAL_DOCUMENT_URI 0x00080000") - [ object, uuid(f5d9e7b0-d930-11d3-b057-00a024ffc08c), @@ -2310,6 +2316,25 @@ cpp_quote("#define LOAD_INITIAL_DOCUMENT_URI 0x00080000") ] interface nsIWebNavigation : nsISupports { + const UINT LOAD_FLAGS_MASK = 0xffff; + const UINT LOAD_FLAGS_NONE = 0; + const UINT LOAD_FLAGS_IS_REFRESH = 0x0010; + const UINT LOAD_FLAGS_IS_LINK = 0x0020; + const UINT LOAD_FLAGS_BYPASS_HISTORY = 0x0040; + const UINT LOAD_FLAGS_REPLACE_HISTORY = 0x0080; + const UINT LOAD_FLAGS_BYPASS_CACHE = 0x0100; + const UINT LOAD_FLAGS_BYPASS_PROXY = 0x0200; + const UINT LOAD_FLAGS_CHARSET_CHANGE = 0x0400; + const UINT LOAD_FLAGS_STOP_CONTENT = 0x0800; + const UINT LOAD_FLAGS_FROM_EXTERNAL = 0x1000; + const UINT LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP = 0x2000; + const UINT LOAD_FLAGS_FIRST_LOAD = 0x4000; + const UINT LOAD_FLAGS_ALLOW_POPUPS = 0x8000; + const UINT LOAD_FLAGS_BYPASS_CLASSIFIER = 0x10000; + const UINT LOAD_FLAGS_FORCE_ALLOW_COOKIES = 0x20000; + const UINT LOAD_FLAGS_DISALLOW_INHERIT_OWNER = 0x40000; + const UINT LOAD_FLAGS_URI_IS_UTF8 = 0x80000; + nsresult GetCanGoBack(bool *aCanGoBack); nsresult GetCanGoForward(bool *aCanGoForward); nsresult GoBack(); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a0bb208..ca1a0bb 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -379,7 +379,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel remove_target_tasks(This->task_magic); abort_window_bindings(This->window->base.inner_window); - hres = load_nsuri(This->window, nsuri, bscallback, 0/*LOAD_INITIAL_DOCUMENT_URI*/); + hres = load_nsuri(This->window, nsuri, bscallback, LOAD_FLAGS_BYPASS_CACHE); nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) hres = create_pending_window(This->window, bscallback);

1 0

Jacek Caban : mshtml: Pass IUri to create_doc_uri.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: afa527c1aed7ca4329bec94be230f23708f6b4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa527c1aed7ca4329bec94be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 4 16:15:33 2013 +0200 mshtml: Pass IUri to create_doc_uri. --- dlls/mshtml/binding.h | 4 ++-- dlls/mshtml/navigate.c | 6 ++++-- dlls/mshtml/nsio.c | 9 +-------- dlls/mshtml/persist.c | 23 ++++++++++++++++++----- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 4e86b76..63ac1ae 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -108,9 +108,9 @@ HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_ nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; -HRESULT create_doc_uri(HTMLOuterWindow*,const WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; +HRESULT create_doc_uri(HTMLOuterWindow*,IUri*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; -HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; +HRESULT set_moniker(HTMLDocument*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 012d7ac..d99d0aa 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1954,7 +1954,7 @@ static void navigate_proc(task_t *_task) navigate_task_t *task = (navigate_task_t*)_task; HRESULT hres; - hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, NULL, task->bscallback, TRUE); + hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, task->uri, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { set_current_mon(task->window, task->bscallback->bsc.mon, task->flags); set_current_uri(task->window, task->uri); @@ -2266,6 +2266,8 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis nsWineURI *nsuri; HRESULT hres; + TRACE("%s\n", debugstr_w(display_uri)); + if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { if(!(flags & BINDING_REFRESH)) { BOOL cancel = FALSE; @@ -2294,7 +2296,7 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis } } - hres = create_doc_uri(window, display_uri, &nsuri); + hres = create_doc_uri(window, uri, &nsuri); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d313676..c631cbb 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2917,19 +2917,12 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c return NS_OK; } -HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **ret) +HRESULT create_doc_uri(HTMLOuterWindow *window, IUri *iuri, nsWineURI **ret) { nsWineURI *uri; - IUri *iuri; nsresult nsres; - HRESULT hres; - - hres = create_uri(url, 0, &iuri); - if(FAILED(hres)) - return hres; nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri); - IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index ca1a0bb..b2eefd3 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -349,12 +349,13 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) } } -HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) +HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) { download_proc_task_t *download_task; nsChannelBSC *bscallback; nsWineURI *nsuri; LPOLESTR url; + IUri *uri; HRESULT hres; hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); @@ -363,11 +364,23 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel return hres; } + if(nav_uri) { + uri = nav_uri; + }else { + hres = create_uri(url, 0, &uri); + if(FAILED(hres)) { + CoTaskMemFree(url); + return hres; + } + } + TRACE("got url: %s\n", debugstr_w(url)); set_ready_state(This->window, READYSTATE_LOADING); - hres = create_doc_uri(This->window, url, &nsuri); + hres = create_doc_uri(This->window, uri, &nsuri); + if(!nav_uri) + IUri_Release(uri); if(SUCCEEDED(hres)) { if(async_bsc) bscallback = async_bsc; @@ -549,7 +562,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva prepare_for_binding(This, pimkName, FALSE); call_docview_84(This->doc_obj); - hres = set_moniker(This, pimkName, pibc, NULL, TRUE); + hres = set_moniker(This, pimkName, NULL, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -818,7 +831,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, TRUE); + hres = set_moniker(This, mon, NULL, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) return hres; @@ -875,7 +888,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, FALSE); + hres = set_moniker(This, mon, NULL, NULL, NULL, FALSE); IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

Akihiro Sagawa : gdi32: Introduce macros to calculate outline text metrics.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 786b931e4560b9149428724d34bc8a533d99092c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786b931e4560b9149428724d3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:12 2013 +0900 gdi32: Introduce macros to calculate outline text metrics. --- dlls/gdi32/freetype.c | 64 ++++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a452fa0..83e7ad8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6878,15 +6878,17 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->ntmCellHeight = ascent + descent; font->ntmAvgWidth = pOS2->xAvgCharWidth; +#define SCALE_X(x) ((pFT_MulFix(x, x_scale) + 32) >> 6) +#define SCALE_Y(y) ((pFT_MulFix(y, y_scale) + 32) >> 6) + if(font->yMax) { TM.tmAscent = font->yMax; TM.tmDescent = -font->yMin; TM.tmInternalLeading = (TM.tmAscent + TM.tmDescent) - ft_face->size->metrics.y_ppem; } else { - TM.tmAscent = (pFT_MulFix(ascent, y_scale) + 32) >> 6; - TM.tmDescent = (pFT_MulFix(descent, y_scale) + 32) >> 6; - TM.tmInternalLeading = (pFT_MulFix(ascent + descent - - ft_face->units_per_EM, y_scale) + 32) >> 6; + TM.tmAscent = SCALE_Y(ascent); + TM.tmDescent = SCALE_Y(descent); + TM.tmInternalLeading = SCALE_Y(ascent + descent - ft_face->units_per_EM); } TM.tmHeight = TM.tmAscent + TM.tmDescent; @@ -6894,15 +6896,15 @@ static BOOL get_outline_text_metrics(GdiFont *font) /* MSDN says: el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender))) */ - TM.tmExternalLeading = max(0, (pFT_MulFix(pHori->Line_Gap - - ((ascent + descent) - - (pHori->Ascender - pHori->Descender)), y_scale) + 32) >> 6); + TM.tmExternalLeading = max(0, SCALE_Y(pHori->Line_Gap - + ((ascent + descent) - + (pHori->Ascender - pHori->Descender)))); - TM.tmAveCharWidth = (pFT_MulFix(pOS2->xAvgCharWidth, x_scale) + 32) >> 6; + TM.tmAveCharWidth = SCALE_X(pOS2->xAvgCharWidth); if (TM.tmAveCharWidth == 0) { TM.tmAveCharWidth = 1; } - TM.tmMaxCharWidth = (pFT_MulFix(ft_face->bbox.xMax - ft_face->bbox.xMin, x_scale) + 32) >> 6; + TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin); TM.tmWeight = FW_REGULAR; if (font->fake_bold) TM.tmWeight = FW_BOLD; @@ -7036,36 +7038,38 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmsCharSlopeRun = pHori->caret_Slope_Run; font->potm->otmItalicAngle = 0; /* POST table */ font->potm->otmEMSquare = ft_face->units_per_EM; - font->potm->otmAscent = (pFT_MulFix(pOS2->sTypoAscender, y_scale) + 32) >> 6; - font->potm->otmDescent = (pFT_MulFix(pOS2->sTypoDescender, y_scale) + 32) >> 6; - font->potm->otmLineGap = (pFT_MulFix(pOS2->sTypoLineGap, y_scale) + 32) >> 6; - font->potm->otmsCapEmHeight = (pFT_MulFix(pOS2->sCapHeight, y_scale) + 32) >> 6; - font->potm->otmsXHeight = (pFT_MulFix(pOS2->sxHeight, y_scale) + 32) >> 6; - font->potm->otmrcFontBox.left = (pFT_MulFix(ft_face->bbox.xMin, x_scale) + 32) >> 6; - font->potm->otmrcFontBox.right = (pFT_MulFix(ft_face->bbox.xMax, x_scale) + 32) >> 6; - font->potm->otmrcFontBox.top = (pFT_MulFix(ft_face->bbox.yMax, y_scale) + 32) >> 6; - font->potm->otmrcFontBox.bottom = (pFT_MulFix(ft_face->bbox.yMin, y_scale) + 32) >> 6; + font->potm->otmAscent = SCALE_Y(pOS2->sTypoAscender); + font->potm->otmDescent = SCALE_Y(pOS2->sTypoDescender); + font->potm->otmLineGap = SCALE_Y(pOS2->sTypoLineGap); + font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); + font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + font->potm->otmrcFontBox.left = SCALE_X(ft_face->bbox.xMin); + font->potm->otmrcFontBox.right = SCALE_X(ft_face->bbox.xMax); + font->potm->otmrcFontBox.top = SCALE_Y(ft_face->bbox.yMax); + font->potm->otmrcFontBox.bottom = SCALE_Y(ft_face->bbox.yMin); font->potm->otmMacAscent = TM.tmAscent; font->potm->otmMacDescent = -TM.tmDescent; font->potm->otmMacLineGap = font->potm->otmLineGap; font->potm->otmusMinimumPPEM = 0; /* TT Header */ - font->potm->otmptSubscriptSize.x = (pFT_MulFix(pOS2->ySubscriptXSize, x_scale) + 32) >> 6; - font->potm->otmptSubscriptSize.y = (pFT_MulFix(pOS2->ySubscriptYSize, y_scale) + 32) >> 6; - font->potm->otmptSubscriptOffset.x = (pFT_MulFix(pOS2->ySubscriptXOffset, x_scale) + 32) >> 6; - font->potm->otmptSubscriptOffset.y = (pFT_MulFix(pOS2->ySubscriptYOffset, y_scale) + 32) >> 6; - font->potm->otmptSuperscriptSize.x = (pFT_MulFix(pOS2->ySuperscriptXSize, x_scale) + 32) >> 6; - font->potm->otmptSuperscriptSize.y = (pFT_MulFix(pOS2->ySuperscriptYSize, y_scale) + 32) >> 6; - font->potm->otmptSuperscriptOffset.x = (pFT_MulFix(pOS2->ySuperscriptXOffset, x_scale) + 32) >> 6; - font->potm->otmptSuperscriptOffset.y = (pFT_MulFix(pOS2->ySuperscriptYOffset, y_scale) + 32) >> 6; - font->potm->otmsStrikeoutSize = (pFT_MulFix(pOS2->yStrikeoutSize, y_scale) + 32) >> 6; - font->potm->otmsStrikeoutPosition = (pFT_MulFix(pOS2->yStrikeoutPosition, y_scale) + 32) >> 6; + font->potm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize); + font->potm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize); + font->potm->otmptSubscriptOffset.x = SCALE_X(pOS2->ySubscriptXOffset); + font->potm->otmptSubscriptOffset.y = SCALE_Y(pOS2->ySubscriptYOffset); + font->potm->otmptSuperscriptSize.x = SCALE_X(pOS2->ySuperscriptXSize); + font->potm->otmptSuperscriptSize.y = SCALE_Y(pOS2->ySuperscriptYSize); + font->potm->otmptSuperscriptOffset.x = SCALE_X(pOS2->ySuperscriptXOffset); + font->potm->otmptSuperscriptOffset.y = SCALE_Y(pOS2->ySuperscriptYOffset); + font->potm->otmsStrikeoutSize = SCALE_Y(pOS2->yStrikeoutSize); + font->potm->otmsStrikeoutPosition = SCALE_Y(pOS2->yStrikeoutPosition); if(!pPost) { font->potm->otmsUnderscoreSize = 0; font->potm->otmsUnderscorePosition = 0; } else { - font->potm->otmsUnderscoreSize = (pFT_MulFix(pPost->underlineThickness, y_scale) + 32) >> 6; - font->potm->otmsUnderscorePosition = (pFT_MulFix(pPost->underlinePosition, y_scale) + 32) >> 6; + font->potm->otmsUnderscoreSize = SCALE_Y(pPost->underlineThickness); + font->potm->otmsUnderscorePosition = SCALE_Y(pPost->underlinePosition); } +#undef SCALE_X +#undef SCALE_Y #undef TM /* otmp* members should clearly have type ptrdiff_t, but M$ knows best */

1 0

Akihiro Sagawa : gdi32: Improve outline text metrics calculation, especially if unitsPerEm is not power of 2.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 3a9689106145c8585e917ae6f4f22226d87872ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9689106145c8585e917ae6f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:14 2013 +0900 gdi32: Improve outline text metrics calculation, especially if unitsPerEm is not power of 2. --- dlls/gdi32/freetype.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 83e7ad8..7bc4366 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6775,7 +6775,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) TT_OS2 *pOS2; TT_HoriHeader *pHori; TT_Postscript *pPost; - FT_Fixed x_scale, y_scale; + FT_Fixed em_scale; WCHAR *family_nameW, *style_nameW, *face_nameW, *full_nameW; char *cp; INT ascent, descent; @@ -6837,8 +6837,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) needed += lenfull; - x_scale = ft_face->size->metrics.x_scale; - y_scale = ft_face->size->metrics.y_scale; + em_scale = (FT_Fixed)MulDiv(font->ppem, 1 << 16, ft_face->units_per_EM); pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); if(!pOS2) { @@ -6878,8 +6877,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->ntmCellHeight = ascent + descent; font->ntmAvgWidth = pOS2->xAvgCharWidth; -#define SCALE_X(x) ((pFT_MulFix(x, x_scale) + 32) >> 6) -#define SCALE_Y(y) ((pFT_MulFix(y, y_scale) + 32) >> 6) +#define SCALE_X(x) (pFT_MulFix(x, em_scale)) +#define SCALE_Y(y) (pFT_MulFix(y, em_scale)) if(font->yMax) { TM.tmAscent = font->yMax;

1 0

Akihiro Sagawa : gdi32: Improve fixed-pitch advance calculation as well as outline text metrics.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: e5f1508031eefb4f71f5fc6a3acaf71308003b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f1508031eefb4f71f5fc6a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:16 2013 +0900 gdi32: Improve fixed-pitch advance calculation as well as outline text metrics. --- dlls/gdi32/freetype.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7bc4366..96c94e4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5881,7 +5881,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL needsTransform = FALSE; BOOL tategaki = (font->GSUB_Table != NULL); UINT original_index; - FT_Fixed avgAdvance = 0; + LONG avgAdvance = 0; + FT_Fixed em_scale; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -6022,9 +6023,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, TEXTMETRICW tm; if (get_text_metrics(incoming_font, &tm) && !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { - avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, - incoming_font->ft_face->size->metrics.x_scale); - if (avgAdvance && (ft_face->glyph->metrics.horiAdvance+63) >> 6 == (avgAdvance*2+63) >> 6) + em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); + avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); + if (avgAdvance && + (ft_face->glyph->metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)) TRACE("Fixed-pitch full-width character detected\n"); else avgAdvance = 0; /* cancel this feature */ @@ -6037,7 +6039,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance) adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; else - adv = (INT)((avgAdvance + 32) >> 6) * 2; + adv = (INT)avgAdvance * 2; top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - @@ -6082,10 +6084,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance || vec.y) lpgm->gmCellIncX = (vec.x+63) >> 6; else { - vec.x = avgAdvance; + vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncX = ((vec.x+32) >> 6) * 2; + lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } vec.x = ft_face->glyph->metrics.horiAdvance; @@ -6094,10 +6096,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance || vec.y) adv = (vec.x+63) >> 6; else { - vec.x = avgAdvance; + vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); - adv = ((vec.x+32) >> 6) * 2; + adv = pFT_MulFix(vec.x, em_scale) * 2; } }

1 0

Akihiro Sagawa : gdi32/tests: Fix tests for fixed-pitch full-width character advance. It' s double of tmAveCharWidth.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f50e6495785f367d0203201c709ded732c1ca1d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50e6495785f367d0203201c7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:18 2013 +0900 gdi32/tests: Fix tests for fixed-pitch full-width character advance. It's double of tmAveCharWidth. For instance, 19 ppem "VL Gothic" on Windows, the advance value is 10 for half-width characters, but 18 for full-width characters. In this case, tmAveCharWidth is 9. Thus using tmAveCharWidth is reasonable. --- dlls/gdi32/tests/font.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index aa94dea..e5e7ff9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3757,6 +3757,7 @@ static void test_GetGlyphOutline(void) for (i = 0; i < sizeof c / sizeof c[0]; ++i) { static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}}; + TEXTMETRIC tm; lf.lfFaceName[0] = '\0'; lf.lfCharSet = c[i].cs; @@ -3803,15 +3804,15 @@ static void test_GetGlyphOutline(void) ret = GetObject(hfont, sizeof lf, &lf); ok(ret > 0, "GetObject error %u\n", GetLastError()); - ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %u\n", GetLastError()); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); - trace("Tests with height=%d,half=%d,full=%d,face=%s,charset=%d\n", - -lf.lfHeight, gm.gmCellIncX, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); - ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + trace("Tests with height=%d,avg=%d,full=%d,face=%s,charset=%d\n", + -lf.lfHeight, tm.tmAveCharWidth, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + ok(gm2.gmCellIncX == tm.tmAveCharWidth * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), "expected %d, got %d (%s:%d)\n", - gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + tm.tmAveCharWidth * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &rotate_mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); @@ -3823,13 +3824,13 @@ static void test_GetGlyphOutline(void) hfont = CreateFontIndirect(&lf); ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); DeleteObject(SelectObject(hdc, hfont)); - ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %u\n", GetLastError()); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); - ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + ok(gm2.gmCellIncX == tm.tmAveCharWidth * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), "expected %d, got %d (%s:%d)\n", - gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + tm.tmAveCharWidth * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); lf.lfItalic = FALSE; lf.lfEscapement = lf.lfOrientation = 2700;

1 0

Ken Thomases : winemac: Add a delivery limit to events.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: ca2d7140fb6f183f7924767afddddd7557c1dc05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2d7140fb6f183f7924767af… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:41 2013 -0500 winemac: Add a delivery limit to events. Some events are application-wide, not specific to a thread. Such an event needs to be broadcast to all GUI-attached threads because we don't know which are handling events, but we don't want the event to be processed in each. Often it should only be processed by the first to pull it from its queue. --- dlls/winemac.drv/cocoa_app.m | 7 +++++++ dlls/winemac.drv/cocoa_event.m | 30 ++++++++++++++++++------------ dlls/winemac.drv/macdrv_cocoa.h | 1 + 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e0a29ee..afb290f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -413,6 +413,13 @@ int macdrv_err_on; event->displays_changed.activating = activating; [eventQueuesLock lock]; + + // If we're activating, then we just need one of our threads to get the + // event, so it can send it directly to the desktop window. Otherwise, + // we need all of the threads to get it because we don't know which owns + // the desktop window and only that one will do anything with it. + if (activating) event->deliver = 1; + for (queue in eventQueues) [queue postEvent:event]; [eventQueuesLock unlock]; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 78a2f94..366aa46 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -198,7 +198,7 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea char buf[512]; int rc; NSUInteger index; - MacDrvEvent* event; + MacDrvEvent* ret = nil; /* Clear the pipe which signals there are pending events. */ do @@ -217,22 +217,27 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea [eventsLock lock]; index = 0; - for (event in events) + while (index < [events count]) { + MacDrvEvent* event = [events objectAtIndex:index]; if (event_mask_for_type(event->event->type) & mask) - break; - - index++; - } - - if (event) - { - [event retain]; - [events removeObjectAtIndex:index]; + { + [[event retain] autorelease]; + [events removeObjectAtIndex:index]; + + if (event->event->deliver == INT_MAX || + OSAtomicDecrement32Barrier(&event->event->deliver) >= 0) + { + ret = event; + break; + } + } + else + index++; } [eventsLock unlock]; - return [event autorelease]; + return ret; } - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window @@ -416,6 +421,7 @@ macdrv_event* macdrv_create_event(int type, WineWindow* window) event = calloc(1, sizeof(*event)); event->refs = 1; + event->deliver = INT_MAX; event->type = type; event->window = (macdrv_window)[window retain]; return event; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index c12545a..ae11b32 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -176,6 +176,7 @@ typedef uint32_t macdrv_event_mask; typedef struct macdrv_event { int refs; + int deliver; int type; macdrv_window window; union {

1 0

Ken Thomases : winemac: Handle a Cocoa quit request as a single-process session shutdown.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: fd1e187ac7a2c2f2300c4c8bb4114daa118bd6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1e187ac7a2c2f2300c4c8bb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:55 2013 -0500 winemac: Handle a Cocoa quit request as a single-process session shutdown. This lets programs ask the user to save documents, etc., and possibly cancel the quit. --- dlls/winemac.drv/cocoa_app.m | 53 ++++++++++++ dlls/winemac.drv/event.c | 8 ++- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 12 +++ dlls/winemac.drv/window.c | 167 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 240 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd1e187ac7a2c2f2300c4…

1 0

Joel Holdsworth : joy.cpl: Added a Tango compliant icon.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 4e25cd462e8e5830a597ae56c4b1ae404f4c80e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e25cd462e8e5830a597ae56c… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sat Jun 9 10:26:09 2012 +0100 joy.cpl: Added a Tango compliant icon. --- dlls/joy.cpl/Makefile.in | 3 + dlls/joy.cpl/joy.ico | Bin 0 -> 25214 bytes dlls/joy.cpl/joy.rc | 3 + dlls/joy.cpl/joy.svg | 265 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 271 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e25cd462e8e5830a597a…

1 0

Alexandre Julliard : ntdll: Set the address space limit before running application code.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: cd03a51e7ddcafb3cf98b6c1dd5469bb92b8adcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd03a51e7ddcafb3cf98b6c1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 4 13:00:47 2013 +0200 ntdll: Set the address space limit before running application code. --- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 3 ++- dlls/ntdll/virtual.c | 30 +++++++++++++++++++++++------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 28ed9f4..271907f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2703,7 +2703,6 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, WINE_MODREF *wm; LPCWSTR load_path; PEB *peb = NtCurrentTeb()->Peb; - IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); if (main_exe_file) NtClose( main_exe_file ); /* at this point the main module is created */ @@ -2721,6 +2720,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, if (!peb->ProcessParameters->WindowTitle.Buffer) peb->ProcessParameters->WindowTitle = wm->ldr.FullDllName; version_init( wm->ldr.FullDllName.Buffer ); + virtual_set_large_address_space(); LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW, REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL ); @@ -2742,7 +2742,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; - virtual_release_address_space( nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE ); + virtual_release_address_space(); virtual_clear_thread_stack(); wine_switch_to_stack( start_process, kernel_start, NtCurrentTeb()->Tib.StackBase ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b4f7dbd..146ce50 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -171,7 +171,8 @@ extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; -extern void virtual_release_address_space( BOOL free_high_mem ) DECLSPEC_HIDDEN; +extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; +extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; /* completion */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a99bca4..7a07128 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1815,22 +1815,21 @@ static int free_reserved_memory( void *base, size_t size, void *arg ) * * Release some address space once we have loaded and initialized the app. */ -void virtual_release_address_space( BOOL free_high_mem ) +void virtual_release_address_space(void) { struct free_range range; sigset_t sigset; - if (user_space_limit == address_space_limit) return; /* no need to free anything */ + if (is_win64) return; server_enter_uninterrupted_section( &csVirtual, &sigset ); - /* no large address space on win9x */ - if (free_high_mem && NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32_NT) + range.base = (char *)0x82000000; + range.limit = user_space_limit; + + if (range.limit > range.base) { - range.base = (char *)0x82000000; - range.limit = address_space_limit; while (wine_mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; - user_space_limit = working_set_limit = address_space_limit; } else { @@ -1846,6 +1845,23 @@ void virtual_release_address_space( BOOL free_high_mem ) /*********************************************************************** + * virtual_set_large_address_space + * + * Enable use of a large address space when allowed by the application. + */ +void virtual_set_large_address_space(void) +{ + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; + /* no large address space on win9x */ + if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; + + user_space_limit = working_set_limit = address_space_limit; +} + + +/*********************************************************************** * NtAllocateVirtualMemory (NTDLL.@) * ZwAllocateVirtualMemory (NTDLL.@) */

1 0