November 2012 - Wine-commits

Alexandre Julliard : user32: Implement a number of missing system parameters.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 2dc978686d0d77387a5ce71d464e29c6a3c6af0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc978686d0d77387a5ce71d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 15:59:37 2012 +0100 user32: Implement a number of missing system parameters. --- dlls/user32/sysparams.c | 119 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 87 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2dc978686d0d77387a5ce…

1 0

Alexandre Julliard : user32: Add some defines to reduce Unicode string duplication.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 44423f915ca87bb83a4cff3107cfa2ef797e4d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44423f915ca87bb83a4cff310… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 16:09:22 2012 +0100 user32: Add some defines to reduce Unicode string duplication. --- dlls/user32/sysparams.c | 123 +++++++++++++++++++++++------------------------ 1 files changed, 61 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44423f915ca87bb83a4cf…

1 0

Daniel Jelinski : comctl32: Move WM_SIZE handling into WM_WINDOWPOSCHANGED.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: e9e09b66a0eca2cec97faa71cffa9ea7269fc681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e09b66a0eca2cec97faa71c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Nov 12 19:03:24 2012 +0100 comctl32: Move WM_SIZE handling into WM_WINDOWPOSCHANGED. --- dlls/comctl32/listview.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2525dfe..d8d11ca 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11584,9 +11584,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SHOWWINDOW: return LISTVIEW_ShowWindow(infoPtr, wParam, lParam); - case WM_SIZE: - return LISTVIEW_Size(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); - case WM_STYLECHANGED: return LISTVIEW_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); @@ -11612,13 +11609,14 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_WINDOWPOSCHANGED: if (!(((WINDOWPOS *)lParam)->flags & SWP_NOSIZE)) { - SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | - SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE); + SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | + SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE); - if ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (infoPtr->uView == LV_VIEW_DETAILS)) - { - if (notify_measureitem(infoPtr)) LISTVIEW_InvalidateList(infoPtr); - } + if ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (infoPtr->uView == LV_VIEW_DETAILS)) + { + if (notify_measureitem(infoPtr)) LISTVIEW_InvalidateList(infoPtr); + } + LISTVIEW_Size(infoPtr, ((WINDOWPOS *)lParam)->cx, ((WINDOWPOS *)lParam)->cy); } return DefWindowProcW(hwnd, uMsg, wParam, lParam);

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement::get_text implementation.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 95f3c6402a01021a78dfd8ceaa93d481764179dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f3c6402a01021a78dfd8cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 13 13:35:49 2012 +0100 mshtml: Added IHTMLScriptElement::get_text implementation. --- dlls/mshtml/htmlscript.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 2dc25de..d08c9cb 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -199,8 +199,14 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR static HRESULT WINAPI HTMLScriptElement_get_text(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLScriptElement_GetText(This->nsscript, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLScriptElement_put_defer(IHTMLScriptElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3f9bd5f..6bd7837 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3559,6 +3559,19 @@ static void _test_link_type(unsigned line, IHTMLElement *elem, const char *v) IHTMLLinkElement_Release(link); } +#define test_script_text(a,b) _test_script_text(__LINE__,a,b) +static void _test_script_text(unsigned line, IHTMLScriptElement *script, const char *extext) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLScriptElement_get_text(script, &str); + ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); + ok(!strcmp_wa(str, extext), "text = %s, expected \"%s\"\n", wine_dbgstr_w(str), extext); + SysFreeString(str); +} + #define link_put_type(a,b) _link_put_type(__LINE__,a,b) static void _link_put_type(unsigned line, IHTMLElement *elem, const char *v) { @@ -5822,9 +5835,10 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLScriptElement_get_type(script, &type); ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(!strcmp_wa(type, "text/javascript"), "Unexpected type %s\n", wine_dbgstr_w(type)); - SysFreeString(type); + test_script_text(script, "\n"); + /* test defer */ hres = IHTMLScriptElement_put_defer(script, VARIANT_TRUE); ok(hres == S_OK, "put_defer failed: %08x\n", hres);

1 0

Piotr Caban : gdi32: Ignore contours containing one point in get_glyph_outline function.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: b696558f04511f86bff73e20adebed7f422b15c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b696558f04511f86bff73e20a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 13 16:51:29 2012 +0100 gdi32: Ignore contours containing one point in get_glyph_outline function. --- dlls/gdi32/freetype.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8b56330..79a0975 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6377,6 +6377,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } for(contour = 0; contour < outline->n_contours; contour++) { + /* Ignore contours containing one point */ + if(point == outline->contours[contour]) { + point++; + continue; + } + pph_start = needed; pph = (TTPOLYGONHEADER *)((char *)buf + needed); first_pt = point;

1 0

Piotr Caban : gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 4f07c49547cc110323b9201c51514d4f10c11b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f07c49547cc110323b9201c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 13 16:51:51 2012 +0100 gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour. --- dlls/gdi32/tests/font.c | 42 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_test.sfd | 29 +++++++++++++++++++++++++- dlls/gdi32/tests/wine_test.ttf | Bin 1552 -> 1652 bytes 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4d41388..1064ce2 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4277,6 +4277,46 @@ static BOOL write_ttf_file(const char *fontname, char *tmp_name) return ret; } +static void test_GetGlyphOutline_empty_contour(void) +{ + HDC hdc; + LOGFONTA lf; + HFONT hfont, hfont_prev; + TTPOLYGONHEADER *header; + GLYPHMETRICS gm; + char buf[1024]; + DWORD ret; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, 0, NULL, &mat); + ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret); + + header = (TTPOLYGONHEADER*)buf; + ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, sizeof(buf), buf, &mat); + ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret); + ok(header->cb == 36, "header->cb = %d, expected 36\n", header->cb); + ok(header->dwType == TT_POLYGON_TYPE, "header->dwType = %d, expected TT_POLYGON_TYPE\n", header->dwType); + header = (TTPOLYGONHEADER*)((char*)header+header->cb); + ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb); + header = (TTPOLYGONHEADER*)((char*)header+header->cb); + ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_CreateScalableFontResource(void) { char ttf_name[MAX_PATH]; @@ -4358,6 +4398,8 @@ todo_wine ret = is_truetype_font_installed("wine_test"); ok(ret, "font wine_test should be enumerated\n"); + test_GetGlyphOutline_empty_contour(); + ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); todo_wine ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); diff --git a/dlls/gdi32/tests/wine_test.sfd b/dlls/gdi32/tests/wine_test.sfd index 5b73545..5adf7cf 100644 --- a/dlls/gdi32/tests/wine_test.sfd +++ b/dlls/gdi32/tests/wine_test.sfd @@ -20,7 +20,7 @@ OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1288336343 -ModificationTime: 1288336873 +ModificationTime: 1352483620 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -86,7 +86,7 @@ DisplaySize: -24 AntiAlias: 1 FitToEm: 1 WinInfo: 65 65 19 -BeginChars: 65539 4 +BeginChars: 65539 5 StartChar: .notdef Encoding: 65536 -1 0 @@ -176,5 +176,30 @@ Width: 0 Flags: W LayerCount: 2 EndChar + +StartChar: dieresis +Encoding: 168 168 0 +Width: 1000 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +620.215 824.429 m 1,0,1 + 760.84 777.554 760.84 777.554 713.965 636.929 c 1,2,-1 + 620.215 824.429 l 1,0,1 +154.883 324.971 m 0,3,-1 +254.492 773.213 m 1,4,5 + 310.707 834.805 310.707 834.805 374.609 767.354 c 1,6,7 + 410.471 728.672 410.471 728.672 374.609 691.182 c 0,8,9 + 308.375 621.934 308.375 621.934 254.492 688.252 c 0,10,11 + 216.406 735.127 216.406 735.127 254.492 773.213 c 1,4,5 +254.492 773.213 m 1,12,13 + 216.406 735.127 216.406 735.127 254.492 688.252 c 0,14,15 + 308.375 621.934 308.375 621.934 374.609 691.182 c 0,16,17 + 410.471 728.672 410.471 728.672 374.609 767.354 c 1,18,19 + 310.707 834.805 310.707 834.805 254.492 773.213 c 1,12,13 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/dlls/gdi32/tests/wine_test.ttf b/dlls/gdi32/tests/wine_test.ttf index badef18..1e546eb 100644 Binary files a/dlls/gdi32/tests/wine_test.ttf and b/dlls/gdi32/tests/wine_test.ttf differ

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 5b1dc444e684f66fedb0a7e24f230fad041c7e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1dc444e684f66fedb0a7e24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 12 21:50:57 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 3746b4b..d1fb494 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -214,7 +214,7 @@ DECLARE_INTERFACE_(IDirect3D,IUnknown) STDMETHOD(Initialize)(THIS_ REFIID riid) PURE; STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL *lplpDirect3DMaterial, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT *lplpD3DViewport, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; };

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DVIEWPORT3.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 29d2f95acb752b5c0c0b2e2e74e87fed5cddb2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d2f95acb752b5c0c0b2e2e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 12 21:50:58 2012 +0100 ddraw: Avoid LPDIRECT3DVIEWPORT3. --- include/d3d.h | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index d1fb494..2c0d102 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -309,7 +309,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; - STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport3 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface, struct IDirect3DDevice3 **device, IUnknown *outer) PURE; @@ -1146,16 +1146,17 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) /*** IDirect3DDevice3 methods ***/ STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; - STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE; - STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE; - STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3, LPDIRECT3DVIEWPORT3 *lplpDirect3DViewport3, DWORD dwFlags) PURE; + STDMETHOD(AddViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; + STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; + STDMETHOD(NextViewport)(THIS_ IDirect3DViewport3 *ref, + IDirect3DViewport3 **viewport, DWORD flags) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D3 *lplpDirect3D3) PURE; /*** DrawPrimitive API ***/ - STDMETHOD(SetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE; - STDMETHOD(GetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpDirect3DViewport3) PURE; + STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; + STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport3 **viewport) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface4 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface4 **surface) PURE; STDMETHOD(Begin)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexTypeDesc, DWORD dwFlags) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DVIEWPORT2.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: ea50cde93951a2755a572f2bfd15a1fbacdd7465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea50cde93951a2755a572f2bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 12 21:50:59 2012 +0100 ddraw: Avoid LPDIRECT3DVIEWPORT2. --- dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f1e20fc..7968b09 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -925,7 +925,7 @@ static void D3D1_releaseObjects(void) static void ViewportTest(void) { HRESULT hr; - LPDIRECT3DVIEWPORT2 Viewport2; + IDirect3DViewport2 *Viewport2; IDirect3DViewport3 *Viewport3; D3DVIEWPORT vp1_data, ret_vp1_data; D3DVIEWPORT2 vp2_data, ret_vp2_data; diff --git a/include/d3d.h b/include/d3d.h index 2c0d102..c7c7838 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -261,7 +261,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; - STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport2 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface, struct IDirect3DDevice2 **device) PURE; @@ -1028,16 +1028,17 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; - STDMETHOD(AddViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE; - STDMETHOD(DeleteViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE; - STDMETHOD(NextViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2, LPDIRECT3DVIEWPORT2 *lplpDirect3DViewport2, DWORD dwFlags) PURE; + STDMETHOD(AddViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; + STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; + STDMETHOD(NextViewport)(THIS_ IDirect3DViewport2 *ref, + IDirect3DViewport2 **viewport, DWORD flags) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D2 *lplpDirect3D2) PURE; /*** DrawPrimitive API ***/ - STDMETHOD(SetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT2 lpDirect3DViewport2) PURE; - STDMETHOD(GetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpDirect3DViewport2) PURE; + STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; + STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport2 **viewport) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface **surface) PURE; STDMETHOD(Begin)(THIS_ D3DPRIMITIVETYPE d3dpt,D3DVERTEXTYPE dwVertexTypeDesc,DWORD dwFlags) PURE;

1 0

Jacek Caban : ieframe: Added IWebBrowser2::Refresh implementation.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 9c3c57040e64bab4a8ddc1b93200f538565d5886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3c57040e64bab4a8ddc1b93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:20 2012 +0100 ieframe: Added IWebBrowser2::Refresh implementation. --- dlls/ieframe/dochost.c | 26 ++++++++++++++++++++++++++ dlls/ieframe/ie.c | 6 ++++-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/webbrowser.c | 6 ++++-- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c063851..1b10fb4 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -453,6 +453,32 @@ void deactivate_document(DocHost *This) This->document = NULL; } +HRESULT refresh_document(DocHost *This) +{ + IOleCommandTarget *cmdtrg; + VARIANT vin, vout; + HRESULT hres; + + if(!This->document) { + FIXME("no document\n"); + return E_FAIL; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(FAILED(hres)) + return hres; + + V_VT(&vin) = VT_EMPTY; + V_VT(&vout) = VT_EMPTY; + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_REFRESH, OLECMDEXECOPT_PROMPTUSER, &vin, &vout); + IOleCommandTarget_Release(cmdtrg); + if(FAILED(hres)) + return hres; + + VariantClear(&vout); + return S_OK; +} + void release_dochost_client(DocHost *This) { if(This->hwnd) { diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 02d0c28..da0e99c 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -182,8 +182,10 @@ static HRESULT WINAPI InternetExplorer_Navigate(IWebBrowser2 *iface, BSTR szUrl, static HRESULT WINAPI InternetExplorer_Refresh(IWebBrowser2 *iface) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return refresh_document(&This->doc_host->doc_host); } static HRESULT WINAPI InternetExplorer_Refresh2(IWebBrowser2 *iface, VARIANT *Level) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8dd3f17..0c13c82 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -265,6 +265,7 @@ void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; +HRESULT refresh_document(DocHost*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 1bd14fa..dda957a 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -292,8 +292,10 @@ static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl, static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return refresh_document(&This->doc_host); } static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level)

1 0