March 2012 - Wine-Commits - list.winehq.org

Aric Stewart : strmbase: Basic BaseRenderer implementation.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: eccd9770cc83029b9df845d0a153e56cfb735d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eccd9770cc83029b9df845d0a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:33 2012 -0500 strmbase: Basic BaseRenderer implementation. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/renderer.c | 415 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 59 +++++++ 3 files changed, 475 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eccd9770cc83029b9df84…

1 0

Aric Stewart : strmbase: Implement BaseControlVideo.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 4ae6f928aaec7b6863a2584ca6843498a61e7659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae6f928aaec7b6863a2584ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:24 2012 -0500 strmbase: Implement BaseControlVideo. --- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/video.c | 480 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 79 ++++++++ 3 files changed, 560 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ae6f928aaec7b6863a25…

1 0

Aric Stewart : strmbase: Implement BaseControlWindow.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 73efbff484fbd6bc6df53df48fb235a85e44f9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=73efbff484fbd6bc6df53df48… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 14:53:14 2012 -0500 strmbase: Implement BaseControlWindow. --- dlls/strmbase/window.c | 575 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 66 ++++++ 2 files changed, 641 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73efbff484fbd6bc6df53…

1 0

André Hentschel : view: Also show the filename in the window title when loading it from command line .
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 189800e04c43c623f8a9d4d1228e514b95b3efff URL: http://source.winehq.org/git/wine.git/?a=commit;h=189800e04c43c623f8a9d4d12… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 21:06:05 2012 +0200 view: Also show the filename in the window title when loading it from command line. --- programs/view/view.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index ebd48aa..d32a10b 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -386,7 +386,10 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline++; cmdline[lstrlenW(cmdline) - 1] = 0; } + szFileTitle[0] = 0; + GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)); DoOpenFile(cmdline); + UpdateWindowCaption(); } }

1 0

Alistair Leslie-Hughes : gdiplus: Add GdipResetPageTransform stub.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 0b2ea8aaf572dc0e3e785271b997176dffcaa88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2ea8aaf572dc0e3e785271b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 17 23:20:47 2012 +1100 gdiplus: Add GdipResetPageTransform stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b7d82da..535ecab 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -457,7 +457,7 @@ 457 stdcall GdipResetClip(ptr) 458 stub GdipResetImageAttributes 459 stdcall GdipResetLineTransform(ptr) -460 stub GdipResetPageTransform +460 stdcall GdipResetPageTransform(ptr) 461 stdcall GdipResetPath(ptr) 462 stub GdipResetPathGradientTransform 463 stdcall GdipResetPenTransform(ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f46d1ce..ee6325a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6501,3 +6501,15 @@ cleanup: GdipDeleteRegion(rgn); return stat; } + +GpStatus WINGDIPAPI GdipResetPageTransform(GpGraphics *graphics) +{ + static int calls; + + TRACE("(%p) stub\n", graphics); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Christian Costa : dmime: Check return code of CoCreateInstance in Init method.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: afbf28940cffa94d18fda89f3212715a8a1d2874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbf28940cffa94d18fda89f3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 29 08:54:15 2012 +0200 dmime: Check return code of CoCreateInstance in Init method. --- dlls/dmime/performance.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 91df283..d847d8e 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -238,15 +238,18 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic; IDirectMusic8_AddRef(This->pDirectMusic); } else { - /* app allows the performance to initialise itself and needs a pointer to object*/ - CoCreateInstance (&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); - if (ppDirectMusic) { - *ppDirectMusic = (LPDIRECTMUSIC) This->pDirectMusic; - IDirectMusic8_AddRef((LPDIRECTMUSIC8) *ppDirectMusic); - } - } - - return S_OK; + HRESULT hr; + /* App enables the performance to initialize itself and needs a pointer to object */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); + if (FAILED(hr)) + return hr; + if (ppDirectMusic) { + *ppDirectMusic = (LPDIRECTMUSIC)This->pDirectMusic; + IDirectMusic8_AddRef((LPDIRECTMUSIC8)*ppDirectMusic); + } + } + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment (LPDIRECTMUSICPERFORMANCE8 iface, IDirectMusicSegment* pSegment, DWORD dwFlags, __int64 i64StartTime, IDirectMusicSegmentState** ppSegmentState) {

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 7afb12909ce75c1757a05bec84911b60a8dc379a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7afb12909ce75c1757a05bec8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 28 20:36:14 2012 +0200 po: Update German translation. --- po/de.po | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 1c6d57e..411693c 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-14 16:50+0100\n" -"Last-Translator: Julian Rüger\n" +"PO-Revision-Date: 2012-03-28 20:12+0200\n" +"Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" "MIME-Version: 1.0\n" @@ -3457,10 +3457,8 @@ msgid "Expected ')'" msgstr "')' erwartet" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Ungültiger Parameter.\n" +msgstr "Ungültiges Zeichen" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Jacek Caban : mshtml: Added support for anchors with target '_top'.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: f11ed78b2e37ec4268747654f5d8c85ee1252ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11ed78b2e37ec4268747654f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 15:05:25 2012 +0200 mshtml: Added support for anchors with target '_top'. --- dlls/mshtml/htmlanchor.c | 20 +++++++++++++------- dlls/mshtml/htmlwindow.c | 17 ++++++++++++----- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 1ef7f72..00301ad 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -73,6 +73,7 @@ static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *targ static HRESULT navigate_anchor(HTMLAnchorElement *This) { nsAString href_str, target_str; + HTMLWindow *window = NULL; nsresult nsres; HRESULT hres = E_FAIL; @@ -87,14 +88,18 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&target_str, &target); if(*target && strcmpiW(target, _selfW)) { - if(strcmpiW(target, _parentW) && strcmpiW(target, _topW)) { - hres = navigate_anchor_window(This, target); + if(!strcmpiW(target, _topW)) { + TRACE("target _top\n"); + get_top_window(This->element.node.doc->basedoc.window, &window); + }else if(!strcmpiW(target, _parentW)) { + FIXME("Navigating to target _parent is not implemented\n"); + nsAString_Finish(&target_str); + return S_OK; }else { - FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); - hres = S_OK; + hres = navigate_anchor_window(This, target); + nsAString_Finish(&target_str); + return hres; } - nsAString_Finish(&target_str); - return hres; } } nsAString_Finish(&target_str); @@ -106,7 +111,8 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&href_str, &href); if(*href) { - HTMLWindow *window = This->element.node.doc->basedoc.window; + if(!window) + window = This->element.node.doc->basedoc.window; hres = navigate_url(window, href, window->url); }else { TRACE("empty href\n"); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2623520..2bd5d7e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -107,6 +107,14 @@ static HRESULT get_location(HTMLWindow *This, HTMLLocation **ret) return S_OK; } +void get_top_window(HTMLWindow *window, HTMLWindow **ret) +{ + HTMLWindow *iter; + + for(iter = window; iter->parent; iter = iter->parent); + *ret = iter; +} + static inline HRESULT set_window_event(HTMLWindow *window, eventid_t eid, VARIANT *var) { if(!window->doc) { @@ -838,13 +846,12 @@ static HRESULT WINAPI HTMLWindow2_get_self(IHTMLWindow2 *iface, IHTMLWindow2 **p static HRESULT WINAPI HTMLWindow2_get_top(IHTMLWindow2 *iface, IHTMLWindow2 **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLWindow *curr; + HTMLWindow *top; + TRACE("(%p)->(%p)\n", This, p); - curr = This; - while(curr->parent) - curr = curr->parent; - *p = &curr->IHTMLWindow2_iface; + get_top_window(This, &top); + *p = &top->IHTMLWindow2_iface; IHTMLWindow2_AddRef(*p); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2e4df12..789ffb5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -631,6 +631,7 @@ HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode* HRESULT HTMLWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLWindow*,HTMLWindow**) DECLSPEC_HIDDEN; void update_window_doc(HTMLWindow*) DECLSPEC_HIDDEN; HTMLWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; +void get_top_window(HTMLWindow*,HTMLWindow**) DECLSPEC_HIDDEN; HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLWindow*) DECLSPEC_HIDDEN; HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow*) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLWindow*,HTMLLocation**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Added Mid function implementation.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 4b00511c644345bd8ebd6da40455a51c8541a9bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b00511c644345bd8ebd6da40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 12:06:11 2012 +0200 vbscript: Added Mid function implementation. --- dlls/vbscript/global.c | 73 +++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 21 ++++++++++++ 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d0f1130..2e45d8f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -105,6 +105,23 @@ static inline HRESULT return_null(VARIANT *res) return S_OK; } +static HRESULT to_int(VARIANT *v, int *ret) +{ + switch(V_VT(v)) { + case VT_I2: + *ret = V_I2(v); + break; + case VT_I4: + *ret = V_I4(v); + break; + default: + FIXME("not supported %s\n", debugstr_variant(v)); + return E_NOTIMPL; + } + + return S_OK; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -471,10 +488,60 @@ static HRESULT Global_RightB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_Mid(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_Mid(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int len = -1, start, str_len; + BSTR str; + HRESULT hres; + + TRACE("\n"); + + switch(args_cnt) { + case 3: + hres = to_int(args, &len); + if(FAILED(hres)) + return hres; + + if(len < 0) { + FIXME("len = %d\n", len); + return E_FAIL; + } + /* fallthrough */ + case 2: + hres = to_int(args+args_cnt-2, &start); + if(FAILED(hres)) + return hres; + + if(V_VT(args+args_cnt-1) != VT_BSTR) { + FIXME("args[0] = %s\n", debugstr_variant(args+args_cnt-1)); + return E_NOTIMPL; + } + + str = V_BSTR(args+args_cnt-1); + break; + default: + assert(0); + } + + + str_len = SysStringLen(str); + start--; + if(start > str_len) + start = str_len; + + if(len == -1) + len = str_len-start; + else if(len > str_len-start) + len = str_len-start; + + if(res) { + V_VT(res) = VT_BSTR; + V_BSTR(res) = SysAllocStringLen(str+start, len); + if(!V_BSTR(res)) + return E_OUTOFMEMORY; + } + + return S_OK; } static HRESULT Global_MidB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1c22791..67c365d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -124,4 +124,25 @@ Call ok(isNull(x), "InStr returned " & x) x = InStr(2, null, "abcd") Call ok(isNull(x), "InStr returned " & x) +Sub TestMid(str, start, len, ex) + x = Mid(str, start, len) + Call ok(x = ex, "Mid(" & str & ", " & start & ", " & len & ") = " & x & " expected " & ex) +End Sub + +Sub TestMid2(str, start, ex) + x = Mid(str, start) + Call ok(x = ex, "Mid(" & str & ", " & start & ") = " & x & " expected " & ex) +End Sub + +TestMid "test", 2, 2, "es" +TestMid "test", 2, 4, "est" +TestMid "test", 1, 2, "te" +TestMid "test", 1, 0, "" +TestMid "test", 1, 0, "" +TestMid "test", 5, 2, "" +TestMid2 "test", 1, "test" +TestMid2 "test", 2, "est" +TestMid2 "test", 4, "t" +TestMid2 "test", 5, "" + Call reportSuccess()

1 0

Jacek Caban : vbscript: Use to_int in InStr implementation.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 81fe4bd8a50b427f1421781f0b53eb894cb41982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fe4bd8a50b427f1421781f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 12:06:20 2012 +0200 vbscript: Use to_int in InStr implementation. --- dlls/vbscript/global.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2e45d8f..eaf4383 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -603,6 +603,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA VARIANT *startv, *str1v, *str2v; BSTR str1, str2; int start, ret; + HRESULT hres; TRACE("\n"); @@ -625,18 +626,9 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA } if(startv) { - /* FIXME: Move to helper */ - switch(V_VT(startv)) { - case VT_I2: - start = V_I2(startv); - break; - case VT_I4: - start = V_I4(startv); - break; - default: - FIXME("unsupported start %s\n", debugstr_variant(startv)); - return E_NOTIMPL; - } + hres = to_int(startv, &start); + if(FAILED(hres)) + return hres; if(--start < 0) { FIXME("start %d\n", start); return E_FAIL;

1 0