August 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdiplus: get_font_hfont helper should transform returned font height using font and device unit /resolution/scale.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 889be9d447329994f009726d4e79a2fb3772e456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889be9d447329994f009726d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 9 12:55:19 2012 +0900 gdiplus: get_font_hfont helper should transform returned font height using font and device unit/resolution/scale. --- dlls/gdiplus/gdiplus.c | 6 ++++++ dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 20 ++++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 29 +++++++++++++++++++++-------- 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index ed2dcae..0146a0f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -389,6 +389,12 @@ REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) } } +REAL units_scale(GpUnit from, GpUnit to, REAL dpi) +{ + REAL pixels = units_to_pixels(1.0, from, dpi); + return pixels_to_units(pixels, to, dpi); +} + /* Calculates Bezier points from cardinal spline points. */ void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0c7e055..ac070fe 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -51,6 +51,7 @@ extern GpStatus hresult_to_status(HRESULT res) DECLSPEC_HIDDEN; extern REAL convert_unit(REAL logpixels, GpUnit unit) DECLSPEC_HIDDEN; extern REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; extern REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN; +extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi) DECLSPEC_HIDDEN; extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 101b73a..41034e5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2115,11 +2115,27 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT * { HDC hdc = CreateCompatibleDC(0); GpPointF pt[3]; - REAL angle, rel_width, rel_height; + REAL angle, rel_width, rel_height, font_height, font_to_pixel_scale; LOGFONTW lfw; HFONT unscaled_font; TEXTMETRICW textmet; + font_to_pixel_scale = units_scale(UnitPoint, UnitPixel, font->family->dpi); + + if (font->unit == UnitPixel) + font_height = font->emSize * font_to_pixel_scale; + else + { + REAL unit_scale, res; + + res = (graphics->unit == UnitDisplay || graphics->unit == UnitPixel) ? graphics->xres : graphics->yres; + unit_scale = units_scale(font->unit, graphics->unit, res); + + font_height = font->emSize * font_to_pixel_scale * unit_scale; + if (graphics->unit != UnitDisplay) + font_height /= graphics->scale; + } + pt[0].X = 0.0; pt[0].Y = 0.0; pt[1].X = 1.0; @@ -2135,7 +2151,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT * (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); get_log_fontW(font, graphics, &lfw); - lfw.lfHeight = roundr(lfw.lfHeight * rel_height); + lfw.lfHeight = roundr(font_height * rel_height); unscaled_font = CreateFontIndirectW(&lfw); SelectObject(hdc, unscaled_font); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5f1213c..fb0c1cd 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3495,14 +3495,6 @@ static void test_GdipMeasureString(void) base_cy = bounds.Height; } - /* FIXME: remove once Wine is fixed */ - if (fabs(height - bounds.Height) > height / 100.0) - { - /* further testing is useless */ - GdipDeleteGraphics(graphics); - continue; - } - expectf(0.0, bounds.X); expectf(0.0, bounds.Y); expectf_(height, bounds.Height, height / 100.0); @@ -3521,6 +3513,13 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); + /* FIXME: remove once Wine is fixed */ + if (fabs(height - bounds.Height) > height / 100.0) + { + /* further testing is useless */ + GdipDeleteGraphics(graphics); + continue; + } expectf_(height, bounds.Height, height / 100.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars); @@ -3595,6 +3594,13 @@ static void test_GdipMeasureString(void) expectf(0.0, bounds.X); expectf(0.0, bounds.Y); + /* FIXME: remove once Wine is fixed */ + if (fabs(height - bounds.Height) > height / 85.0) + { + /* further testing is useless */ + GdipDeleteGraphics(graphics); + continue; + } expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars); @@ -3611,6 +3617,13 @@ static void test_GdipMeasureString(void) expect(Ok, status); expectf(50.0, bounds.X); expectf(50.0, bounds.Y); + /* FIXME: remove once Wine is fixed */ + if (fabs(height - bounds.Height) > height / 85.0) + { + /* further testing is useless */ + GdipDeleteGraphics(graphics); + continue; + } expectf_(height, bounds.Height, height / 85.0); expectf_(bounds.Height / base_cy, bounds.Width / base_cx, 0.05); expect(7, chars);

1 0

Nikolay Bogoychev : wined3d: Recognize GeForce GT 630M.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 9716c1b50c7e5bd4fe1182c96d965a190f662b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9716c1b50c7e5bd4fe1182c96… Author: Nikolay Bogoychev <nheart(a)gmail.com> Date: Wed Aug 1 23:59:19 2012 +0100 wined3d: Recognize GeForce GT 630M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e00c9b4..e47b4e1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1106,6 +1106,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1504,6 +1505,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ + {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6f96c0..36edf20 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1402,6 +1402,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, + CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0

Detlef Riekenberg : advpack/tests: Avoid test failures without high access rights.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: a97f81ff320920d0196cbfb572d53a718ee8e256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97f81ff320920d0196cbfb57… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 5 15:55:20 2012 +0200 advpack/tests: Avoid test failures without high access rights. --- dlls/advpack/tests/Makefile.in | 2 +- dlls/advpack/tests/install.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/Makefile.in b/dlls/advpack/tests/Makefile.in index 115f180..af9d2ee 100644 --- a/dlls/advpack/tests/Makefile.in +++ b/dlls/advpack/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = advpack.dll -IMPORTS = cabinet advapi32 +IMPORTS = cabinet advapi32 advpack C_SRCS = \ advpack.c \ diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 6a4d8d6..4876d71 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -259,6 +259,12 @@ START_TEST(install) if (!init_function_pointers()) return; + if (!IsNTAdmin(0, NULL)) + { + skip("Most tests need admin rights\n"); + return; + } + GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPath(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path);

1 0

Jacek Caban : mshtml: Use inner window' s moniker in PluginHost implementation.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 39182135861ba20d92d8ec0181f76aae4a8c9e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39182135861ba20d92d8ec018… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:28:50 2012 +0200 mshtml: Use inner window's moniker in PluginHost implementation. --- dlls/mshtml/pluginhost.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 07d6e3a..e24131b 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -534,12 +534,12 @@ static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAss switch(dwWhichMoniker) { case OLEWHICHMK_CONTAINER: - if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) { + if(!This->doc || !This->doc->window || !This->doc->window->mon) { FIXME("no moniker\n"); return E_UNEXPECTED; } - *ppmk = This->doc->basedoc.window->mon; + *ppmk = This->doc->window->mon; IMoniker_AddRef(*ppmk); break; default: @@ -1144,12 +1144,12 @@ static HRESULT WINAPI PHBindHost_CreateMoniker(IBindHost *iface, LPOLESTR szName TRACE("(%p)->(%s %p %p %x)\n", This, debugstr_w(szName), pBC, ppmk, dwReserved); - if(!This->doc || !This->doc->basedoc.window || !This->doc->basedoc.window->mon) { + if(!This->doc || !This->doc->window || !This->doc->window->mon) { FIXME("no moniker\n"); return E_UNEXPECTED; } - return CreateURLMoniker(This->doc->basedoc.window->mon, szName, ppmk); + return CreateURLMoniker(This->doc->window->mon, szName, ppmk); } static HRESULT WINAPI PHBindHost_MonikerBindToStorage(IBindHost *iface, IMoniker *pMk, IBindCtx *pBC,

1 0

Jacek Caban : mshtml: Use helper to get IUri in HTMLLocation implementation .
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 28f35f86c64fdc1f973cbc968ad43057df920903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f35f86c64fdc1f973cbc968… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:29:02 2012 +0200 mshtml: Use helper to get IUri in HTMLLocation implementation. --- dlls/mshtml/htmllocation.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 7a01039..1bcd048 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -46,6 +46,13 @@ static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) return S_OK; } +static IUri *get_uri(HTMLLocation *This) +{ + if(!This->window) + return NULL; + return This->window->uri; +} + static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) { const WCHAR *doc_url; @@ -278,6 +285,7 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR protocol, ret; unsigned len; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -285,12 +293,12 @@ static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetSchemeName(This->window->uri, &protocol); + hres = IUri_GetSchemeName(uri, &protocol); if(FAILED(hres)) return hres; if(hres == S_FALSE) { @@ -367,6 +375,7 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR hostname; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -374,12 +383,12 @@ static HRESULT WINAPI HTMLLocation_get_hostname(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetHost(This->window->uri, &hostname); + hres = IUri_GetHost(uri, &hostname); if(hres == S_OK) { *p = hostname; }else if(hres == S_FALSE) { @@ -403,6 +412,7 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); DWORD port; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -410,12 +420,12 @@ static HRESULT WINAPI HTMLLocation_get_port(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetPort(This->window->uri, &port); + hres = IUri_GetPort(uri, &port); if(FAILED(hres)) return hres; @@ -479,6 +489,7 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR query; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -486,12 +497,12 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetQuery(This->window->uri, &query); + hres = IUri_GetQuery(uri, &query); if(hres == S_OK) { *p = query; }else if(hres == S_FALSE) { @@ -515,6 +526,7 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); BSTR hash; + IUri *uri; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -522,12 +534,12 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - if(!This->window || !This->window->uri) { + if(!(uri = get_uri(This))) { FIXME("No current URI\n"); return E_NOTIMPL; } - hres = IUri_GetFragment(This->window->uri, &hash); + hres = IUri_GetFragment(uri, &hash); if(hres == S_OK) { *p = hash; }else if(hres == S_FALSE) {

1 0

Jacek Caban : mshtml: Moved HTMLLocation reference to inner window.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 93a2de1fba1cc78ec9fe9616f7d2215b90781ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a2de1fba1cc78ec9fe9616f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 14 11:29:17 2012 +0200 mshtml: Moved HTMLLocation reference to inner window. --- dlls/mshtml/htmllocation.c | 18 +++++++++--------- dlls/mshtml/htmlwindow.c | 19 +++++++++---------- dlls/mshtml/mshtml_private.h | 8 ++++---- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 1bcd048..cde1fee 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -37,20 +37,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) { - if(!This->window || !This->window->url) { + if(!This->window || !This->window->base.outer_window || !This->window->base.outer_window->url) { FIXME("No current URL\n"); return E_NOTIMPL; } - *ret = This->window->url; + *ret = This->window->base.outer_window->url; return S_OK; } static IUri *get_uri(HTMLLocation *This) { - if(!This->window) + if(!This->window || !This->window->base.outer_window) return NULL; - return This->window->uri; + return This->window->base.outer_window->uri; } static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) @@ -165,12 +165,12 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->window) { + if(!This->window || !This->window->base.outer_window) { FIXME("No window available\n"); return E_FAIL; } - return navigate_url(This->window, v, This->window->url); + return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->url); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -565,12 +565,12 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); - if(!This->window) { + if(!This->window || !This->window->base.outer_window) { FIXME("No window available\n"); return E_FAIL; } - return navigate_url(This->window, bstr, This->window->url); + return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->url); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) @@ -629,7 +629,7 @@ static dispex_static_data_t HTMLLocation_dispex = { }; -HRESULT HTMLLocation_Create(HTMLOuterWindow *window, HTMLLocation **ret) +HRESULT HTMLLocation_Create(HTMLInnerWindow *window, HTMLLocation **ret) { HTMLLocation *location; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 3884bf8..e9a0625 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -61,7 +61,7 @@ static void release_children(HTMLOuterWindow *This) } } -static HRESULT get_location(HTMLOuterWindow *This, HTMLLocation **ret) +static HRESULT get_location(HTMLInnerWindow *This, HTMLLocation **ret) { if(This->location) { IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); @@ -214,11 +214,6 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->frame_element) This->frame_element->content_window = NULL; - if(This->location) { - This->location->window = NULL; - IHTMLLocation_Release(&This->location->IHTMLLocation_iface); - } - This->window_ref->window = NULL; windowref_release(This->window_ref); @@ -250,6 +245,11 @@ static void release_inner_window(HTMLInnerWindow *This) heap_free(This->global_props[i].name); heap_free(This->global_props); + if(This->location) { + This->location->window = NULL; + IHTMLLocation_Release(&This->location->IHTMLLocation_iface); + } + if(This->image_factory) { This->image_factory->window = NULL; IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); @@ -707,7 +707,7 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio TRACE("(%p)->(%p)\n", This, p); - hres = get_location(This->outer_window, &location); + hres = get_location(This->inner_window, &location); if(FAILED(hres)) return hres; @@ -2335,7 +2335,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { HTMLWindow *This = impl_from_IDispatchEx(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); @@ -2355,8 +2355,7 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID return hres; } - return IDispatchEx_InvokeEx(&window->base.inner_window->dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, - pei, pspCaller); + return IDispatchEx_InvokeEx(&window->dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); } static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f76ebaf..dee8f90 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -323,7 +323,7 @@ struct HTMLLocation { LONG ref; - HTMLOuterWindow *window; + HTMLInnerWindow *window; }; typedef struct { @@ -371,8 +371,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; - HTMLLocation *location; - struct list children; struct list sibling_entry; struct list entry; @@ -400,6 +398,8 @@ struct HTMLInnerWindow { LONG task_magic; + HTMLLocation *location; + IMoniker *mon; nsChannelBSC *bscallback; struct list bindings; @@ -713,7 +713,7 @@ HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; -HRESULT HTMLLocation_Create(HTMLOuterWindow*,HTMLLocation**) DECLSPEC_HIDDEN; +HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_history(IOmHistory**) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3dx9: Introduce helper functions to operate on constant handles.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: c9f90256330c0deeea35eeae99e02267e2235352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f90256330c0deeea35eeae9… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:30 2012 +0200 d3dx9: Introduce helper functions to operate on constant handles. --- dlls/d3dx9_36/shader.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e0229f6..0e6b071 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -657,6 +657,21 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc) return 4 * desc->Elements * desc->Rows * desc->Columns; } +static inline int is_constant_handle(D3DXHANDLE handle) +{ + return !((UINT_PTR)handle >> 16); +} + +static inline ctab_constant *constant_from_handle(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) +{ + return &table->constants[(UINT_PTR)handle - 1]; +} + +static inline D3DXHANDLE handle_from_constant_index(UINT index) +{ + return (D3DXHANDLE)(DWORD_PTR)(index + 1); +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **out) { @@ -747,17 +762,15 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable return D3DERR_INVALIDCALL; /* Applications can pass the name of the constant in place of the handle */ - if (!((UINT_PTR)constant >> 16)) - constant_info = &This->constants[(UINT_PTR)constant - 1]; - else + if (!is_constant_handle(constant)) { - D3DXHANDLE c = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); - if (!c) + constant = ID3DXConstantTable_GetConstantByName(iface, NULL, constant); + if (!constant) return D3DERR_INVALIDCALL; - - constant_info = &This->constants[(UINT_PTR)c - 1]; } + constant_info = constant_from_handle(This, constant); + if (desc) *desc = constant_info->desc; if (count) @@ -800,7 +813,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable * if (index >= This->desc.Constants) return NULL; - return (D3DXHANDLE)(DWORD_PTR)(index + 1); + return handle_from_constant_index(index); } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantTable *iface, D3DXHANDLE constant, LPCSTR name) @@ -821,7 +834,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT for (i = 0; i < This->desc.Constants; i++) if (!strcmp(This->constants[i].desc.Name, name)) - return (D3DXHANDLE)(DWORD_PTR)(i + 1); + return handle_from_constant_index(i); return NULL; }

1 0

Józef Kucia : d3dx9: Introduce a helper function for setting float shader constants.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: e67920f12fe3abf82cf70395ef01dec6d2fed227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67920f12fe3abf82cf70395e… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:31 2012 +0200 d3dx9: Introduce a helper function for setting float shader constants. --- dlls/d3dx9_36/shader.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 0e6b071..6ae0b37 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -672,6 +672,15 @@ static inline D3DXHANDLE handle_from_constant_index(UINT index) return (D3DXHANDLE)(DWORD_PTR)(index + 1); } +static inline void set_float_shader_constant(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, + UINT register_index, const FLOAT *data, UINT count) +{ + if (is_vertex_shader(table->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, register_index, data, count); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, register_index, data, count); +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **out) { @@ -882,10 +891,7 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi FIXME("Unhandled type passed to set_float_array\n"); return D3DERR_INVALIDCALL; } - if (is_vertex_shader(This->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i, row, 1); - else - IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i, row, 1); + set_float_shader_constant(This, device, desc.RegisterIndex + i, row, 1); } break; default: @@ -1004,12 +1010,8 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable * switch (desc.RegisterSet) { case D3DXRS_FLOAT4: - if (is_vertex_shader(This->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex, (float *)vector, - min(desc.RegisterCount, count)); - else - IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex, (float *)vector, - min(desc.RegisterCount, count)); + set_float_shader_constant(This, device, desc.RegisterIndex, (float *)vector, + min(desc.RegisterCount, count)); break; default: FIXME("Handle other register sets\n"); @@ -1060,10 +1062,7 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable * else D3DXMatrixTranspose(&temp, &matrix[i]); - if (is_vertex_shader(This->desc.Version)) - IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); - else - IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); + set_float_shader_constant(This, device, desc.RegisterIndex + i * 4, &temp.u.s._11, 4); } break; default:

1 0

Józef Kucia : d3dx9: Correctly handle constants without default values in D3DXGetShaderConstantTableEx .
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 711ee8a792930319c95f102bcbf0e3d71f65899d URL: http://source.winehq.org/git/wine.git/?a=commit;h=711ee8a792930319c95f102bc… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:32 2012 +0200 d3dx9: Correctly handle constants without default values in D3DXGetShaderConstantTableEx. --- dlls/d3dx9_36/shader.c | 3 ++- dlls/d3dx9_36/tests/shader.c | 37 ++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6ae0b37..0dcb3a1 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1261,7 +1261,8 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, object->constants[i].desc.RegisterSet = constant_info[i].RegisterSet; object->constants[i].desc.RegisterIndex = constant_info[i].RegisterIndex; object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; - object->constants[i].desc.DefaultValue = object->ctab + constant_info[i].DefaultValue; + object->constants[i].desc.DefaultValue = constant_info[i].DefaultValue + ? object->ctab + constant_info[i].DefaultValue : NULL; hr = parse_ctab_constant_type((LPD3DXSHADER_TYPEINFO)(object->ctab + constant_info[i].TypeInfo), &object->constants[i]); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index aa3ac12..9a03467 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -93,11 +93,11 @@ static const DWORD ctab_basic[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_basic_expected[] = { - {"mvp", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, 0}, - {"i", D3DXRS_FLOAT4, 4, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4, 0}, - {"i4", D3DXRS_FLOAT4, 5, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, 0}, - {"f", D3DXRS_FLOAT4, 6, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, 0}, - {"f4", D3DXRS_FLOAT4, 7, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, 0}}; + {"mvp", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, NULL}, + {"i", D3DXRS_FLOAT4, 4, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4, NULL}, + {"i4", D3DXRS_FLOAT4, 5, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, NULL}, + {"f", D3DXRS_FLOAT4, 6, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4, NULL}, + {"f4", D3DXRS_FLOAT4, 7, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, NULL}}; static const DWORD ctab_matrices[] = { 0xfffe0300, /* vs_3_0 */ @@ -118,9 +118,9 @@ static const DWORD ctab_matrices[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_matrices_expected[] = { - {"fmatrix4x4", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, 0}, - {"imatrix2x3", D3DXRS_FLOAT4, 4, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 2, 3, 1, 0, 24, 0}, - {"fmatrix3x1", D3DXRS_FLOAT4, 7, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12, 0}}; + {"fmatrix4x4", D3DXRS_FLOAT4, 0, 4, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 4, 4, 1, 0, 64, NULL}, + {"imatrix2x3", D3DXRS_FLOAT4, 4, 3, D3DXPC_MATRIX_ROWS, D3DXPT_INT, 2, 3, 1, 0, 24, NULL}, + {"fmatrix3x1", D3DXRS_FLOAT4, 7, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12, NULL}}; static const DWORD ctab_arrays[] = { 0xfffe0300, /* vs_3_0 */ @@ -150,12 +150,12 @@ static const DWORD ctab_arrays[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_arrays_expected[] = { - {"fmtxarray", D3DXRS_FLOAT4, 0, 8, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4, 2, 0, 128, 0}, - {"farray", D3DXRS_FLOAT4, 8, 4, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 4, 0, 16, 0}, - {"fvecarray", D3DXRS_FLOAT4, 12, 2, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 2, 0, 32, 0}, - {"barray", D3DXRS_FLOAT4, 14, 2, D3DXPC_SCALAR, D3DXPT_BOOL, 1, 1, 2, 0, 8, 0}, - {"bvecarray", D3DXRS_FLOAT4, 16, 2, D3DXPC_VECTOR, D3DXPT_BOOL, 1, 3, 3, 0, 36, 0}, - {"ivecarray", D3DXRS_FLOAT4, 18, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, 0}}; + {"fmtxarray", D3DXRS_FLOAT4, 0, 8, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 4, 4, 2, 0, 128, NULL}, + {"farray", D3DXRS_FLOAT4, 8, 4, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 4, 0, 16, NULL}, + {"fvecarray", D3DXRS_FLOAT4, 12, 2, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 2, 0, 32, NULL}, + {"barray", D3DXRS_FLOAT4, 14, 2, D3DXPC_SCALAR, D3DXPT_BOOL, 1, 1, 2, 0, 8, NULL}, + {"bvecarray", D3DXRS_FLOAT4, 16, 2, D3DXPC_VECTOR, D3DXPT_BOOL, 1, 3, 3, 0, 36, NULL}, + {"ivecarray", D3DXRS_FLOAT4, 18, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, NULL}}; static const DWORD ctab_samplers[] = { 0xfffe0300, /* vs_3_0 */ @@ -176,9 +176,9 @@ static const DWORD ctab_samplers[] = { 0x0000ffff}; /* END */ static const D3DXCONSTANT_DESC ctab_samplers_expected[] = { - {"sampler1", D3DXRS_SAMPLER, 0, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER2D, 1, 1, 1, 0, 4, 0}, - {"sampler2", D3DXRS_SAMPLER, 3, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER3D, 1, 1, 1, 0, 4, 0}, - {"notsampler", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, 0}}; + {"sampler1", D3DXRS_SAMPLER, 0, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER2D, 1, 1, 1, 0, 4, NULL}, + {"sampler2", D3DXRS_SAMPLER, 3, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER3D, 1, 1, 1, 0, 4, NULL}, + {"notsampler", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, NULL}}; static void test_get_shader_size(void) { @@ -437,6 +437,9 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, ok(actual.Bytes == expected->Bytes, "%s in %s: Got different byte count: Got %d, expected %d\n", expected->Name, test_name, actual.Bytes, expected->Bytes); + ok(actual.DefaultValue == expected->DefaultValue, + "%s in %s: Got different default value: Got %p, expected %p\n", + expected->Name, test_name, actual.DefaultValue, expected->DefaultValue); } /* Finally, release the constant table */

1 0

Józef Kucia : d3dx9: Implement ID3DXConstantTable:: SetDefaults.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: fea0b7dcbeaf0677ac06bff0a16aa5697feb2147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea0b7dcbeaf0677ac06bff0a… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Aug 14 11:42:33 2012 +0200 d3dx9: Implement ID3DXConstantTable::SetDefaults. --- dlls/d3dx9_36/shader.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 0dcb3a1..728bff2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -905,10 +905,24 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device) { struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + UINT i; - FIXME("(%p)->(%p): stub\n", This, device); + TRACE("(%p)->(%p)\n", This, device); - return E_NOTIMPL; + if (!device) + return D3DERR_INVALIDCALL; + + for (i = 0; i < This->desc.Constants; i++) + { + D3DXCONSTANT_DESC *desc = &This->constants[i].desc; + + if (!desc->DefaultValue) + continue; + + set_float_shader_constant(This, device, desc->RegisterIndex, desc->DefaultValue, desc->RegisterCount); + } + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_SetValue(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0