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

Akihiro Sagawa : gdi32/tests: Fix tests for fixed-pitch full-width character advance. It' s double of tmAveCharWidth.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Akihiro Sagawa : gdi32: Introduce macros to calculate outline text metrics.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Jacek Caban : mshtml: Pass IUri to create_doc_uri.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Jacek Caban : mshtml: Fixed load flags usage.
by Alexandre Julliard April 4, 2013

April 4, 2013

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

Nozomi Kodama : d3dx9: Implement D3DXSHEvalHemisphereLight.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 6d6603b4955d55a2531f6722a521a546a259235c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6603b4955d55a2531f6722a… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sun Mar 31 13:37:34 2013 -1000 d3dx9: Implement D3DXSHEvalHemisphereLight. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 46 ++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 88 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 155 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d6603b4955d55a2531f6…

1 0

Nozomi Kodama : d3dx9: Implement D3DXSHEvalSphericalLight.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 6247dae2ace8763f393e8a895b5191c284a8ebd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6247dae2ace8763f393e8a895… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sun Mar 31 13:37:06 2013 -1000 d3dx9: Implement D3DXSHEvalSphericalLight. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 42 ++++++++++++ dlls/d3dx9_36/tests/math.c | 148 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 211 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6247dae2ace8763f393e8…

1 0

Ken Thomases : winemac: Make macdrv_event structs heap-allocated and reference-counted.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 1ee93853c2fff0917d43ad498f75f4608eb35238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee93853c2fff0917d43ad498… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:35 2013 -0500 winemac: Make macdrv_event structs heap-allocated and reference-counted. --- dlls/winemac.drv/cocoa_app.m | 56 ++++++------- dlls/winemac.drv/cocoa_event.h | 8 ++- dlls/winemac.drv/cocoa_event.m | 146 ++++++++++++++++++++-------------- dlls/winemac.drv/cocoa_status_item.m | 12 ++-- dlls/winemac.drv/cocoa_window.m | 141 +++++++++++++++++---------------- dlls/winemac.drv/event.c | 8 +- dlls/winemac.drv/macdrv_cocoa.h | 7 +- 7 files changed, 206 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ee93853c2fff0917d43a…

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayImpl aliases.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: f546609d09f9412b3fcc72a3a294ade29e98b375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f546609d09f9412b3fcc72a3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:12:33 2013 +0100 dplayx: Get rid of the IDirectPlayImpl aliases. --- dlls/dplayx/dplay.c | 149 +++++++++++++++------------------------- dlls/dplayx/dplay_global.h | 18 ++---- dlls/dplayx/dplaysp.c | 8 +- dlls/dplayx/dplayx_messages.c | 31 ++++----- dlls/dplayx/dplayx_messages.h | 10 ++-- dlls/dplayx/lobbysp.c | 8 +- dlls/dplayx/name_server.c | 6 +- dlls/dplayx/name_server.h | 2 +- 8 files changed, 90 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f546609d09f9412b3fcc7…

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayXImpl to IDirectPlayImpl casts.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 2a079ce62a082cf5ea11a40b2277be6437f532a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a079ce62a082cf5ea11a40b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:09:40 2013 +0100 dplayx: Get rid of the IDirectPlayXImpl to IDirectPlayImpl casts. --- dlls/dplayx/dplay.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index edcb20f..7d2beb3 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1482,7 +1482,7 @@ static HRESULT DP_IF_DestroyGroup return DPERR_INVALIDPLAYER; /* yes player */ } - context.This = (IDirectPlay3Impl*)This; + context.This = This; context.bAnsi = bAnsi; context.idGroup = idGroup; @@ -2919,15 +2919,10 @@ static HRESULT DP_IF_CreateGroupInGroup } /* Verify that the specified parent is valid */ - if( ( lpGParentData = DP_FindAnyGroup( (IDirectPlay2AImpl*)This, - idParentGroup ) ) == NULL - ) - { + if( ( lpGParentData = DP_FindAnyGroup(This, idParentGroup ) ) == NULL ) return DPERR_INVALIDGROUP; - } - lpGData = DP_CreateGroup( (IDirectPlay2AImpl*)This, lpidGroup, lpGroupName, - dwFlags, idParentGroup, bAnsi ); + lpGData = DP_CreateGroup(This, lpidGroup, lpGroupName, dwFlags, idParentGroup, bAnsi ); if( lpGData == NULL ) {

1 0

Michael Stefaniuc : dplayx: Forward AW agnostic IDirectPlay4A stub methods to the W versions.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 12a26e1d017cb506cce920e303423590e030cee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a26e1d017cb506cce920e30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:08:49 2013 +0100 dplayx: Forward AW agnostic IDirectPlay4A stub methods to the W versions. --- dlls/dplayx/dplay.c | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4658f4e..edcb20f 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3750,12 +3750,11 @@ static HRESULT WINAPI IDirectPlay4Impl_SetGroupConnectionSettings( IDirectPlay4 return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWORD dwFlags, - DPID idGroup ) +static HRESULT WINAPI IDirectPlay4AImpl_StartSession( IDirectPlay4A *iface, DWORD flags, + DPID group ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, dwFlags, idGroup ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_StartSession( &This->IDirectPlay4_iface, flags, group ); } static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD flags, DPID group ) @@ -3765,12 +3764,11 @@ static HRESULT WINAPI IDirectPlay4Impl_StartSession( IDirectPlay4 *iface, DWORD return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_GetGroupFlags( IDirectPlay4A *iface, DPID idGroup, - DWORD *lpdwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetGroupFlags( IDirectPlay4A *iface, DPID group, + DWORD *flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpdwFlags ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetGroupFlags( &This->IDirectPlay4_iface, group, flags ); } static HRESULT WINAPI IDirectPlay4Impl_GetGroupFlags( IDirectPlay4 *iface, DPID group, @@ -3820,12 +3818,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerAccount( IDirectPlay4 *iface, DP return DP_OK; } -static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerFlags( IDirectPlay4A *iface, DPID idPlayer, - DWORD *lpdwFlags ) +static HRESULT WINAPI IDirectPlay4AImpl_GetPlayerFlags( IDirectPlay4A *iface, DPID player, + DWORD *flags ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idPlayer, lpdwFlags ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetPlayerFlags( &This->IDirectPlay4_iface, player, flags ); } static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID player, @@ -3836,12 +3833,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetPlayerFlags( IDirectPlay4 *iface, DPID return DP_OK; } -static HRESULT WINAPI DirectPlay4AImpl_GetGroupOwner - ( LPDIRECTPLAY4A iface, DPID idGroup, LPDPID lpidGroupOwner ) +static HRESULT WINAPI IDirectPlay4AImpl_GetGroupOwner( IDirectPlay4A *iface, DPID group, + DPID *owner ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,%p): stub\n", This, idGroup, lpidGroupOwner ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_GetGroupOwner( &This->IDirectPlay4_iface, group, owner ); } static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID group, @@ -3852,12 +3848,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupOwner( IDirectPlay4 *iface, DPID return DP_OK; } -static HRESULT WINAPI DirectPlay4AImpl_SetGroupOwner - ( LPDIRECTPLAY4A iface, DPID idGroup , DPID idGroupOwner ) +static HRESULT WINAPI IDirectPlay4AImpl_SetGroupOwner( IDirectPlay4A *iface, DPID group, + DPID owner ) { - IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); - FIXME("(%p)->(0x%08x,0x%08x): stub\n", This, idGroup, idGroupOwner ); - return DP_OK; + IDirectPlayImpl *This = impl_from_IDirectPlay4A( iface ); + return IDirectPlayX_SetGroupOwner( &This->IDirectPlay4_iface, group, owner ); } static HRESULT WINAPI IDirectPlay4Impl_SetGroupOwner( IDirectPlay4 *iface, DPID group , @@ -4179,9 +4174,8 @@ static const IDirectPlay4Vtbl dp4A_vt = IDirectPlay4AImpl_GetGroupParent, IDirectPlay4AImpl_GetPlayerAccount, IDirectPlay4AImpl_GetPlayerFlags, - - DirectPlay4AImpl_GetGroupOwner, - DirectPlay4AImpl_SetGroupOwner, + IDirectPlay4AImpl_GetGroupOwner, + IDirectPlay4AImpl_SetGroupOwner, IDirectPlay4AImpl_SendEx, IDirectPlay4AImpl_GetMessageQueue, IDirectPlay4AImpl_CancelMessage,

1 0