January 2012 - Wine-Commits

Jacek Caban : vbscript: Added support for VARIANTREF arguments in multiple argument functions.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: fc8756ac7c1ec1ddc12002b01e12d6b1cdef7b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8756ac7c1ec1ddc12002b01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 17:00:02 2011 +0100 vbscript: Added support for VARIANTREF arguments in multiple argument functions. --- dlls/vbscript/vbdisp.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5032f4a..ab62c9f 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "vbscript.h" #include "wine/debug.h" @@ -133,7 +135,8 @@ static HRESULT invoke_variant_prop(vbdisp_t *This, VARIANT *v, WORD flags, DISPP static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *res) { - VARIANT *args; + VARIANT *args, arg_buf[8]; + unsigned argn; switch(flags) { case DISPATCH_PROPERTYGET: @@ -163,15 +166,36 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_NOTIMPL; } - if(arg_cnt(dp) < prop->min_args || arg_cnt(dp) > (prop->max_args ? prop->max_args : prop->min_args)) { + argn = arg_cnt(dp); + + if(argn < prop->min_args || argn > (prop->max_args ? prop->max_args : prop->min_args)) { FIXME("invalid number of arguments\n"); return E_FAIL; } - if(arg_cnt(dp) == 1 && V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) - args = V_VARIANTREF(dp->rgvarg); - else - args = dp->rgvarg; + args = dp->rgvarg; + + if(argn == 1) { + if(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT)) + args = V_VARIANTREF(dp->rgvarg); + }else { + unsigned i; + + assert(argn < sizeof(arg_buf)/sizeof(*arg_buf)); + + for(i=0; i < argn; i++) { + if(V_VT(dp->rgvarg+i) == (VT_BYREF|VT_VARIANT)) { + for(i=0; i < argn; i++) { + if(V_VT(dp->rgvarg+i) == (VT_BYREF|VT_VARIANT)) + arg_buf[i] = *V_VARIANTREF(dp->rgvarg+i); + else + arg_buf[i] = dp->rgvarg[i]; + } + args = arg_buf; + break; + } + } + } return prop->proc(This, args, dp->cArgs, res); }

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShortcut_put_WorkingDirectory().
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 033c18fce9efe649e201a5afc01b6af641cfbd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033c18fce9efe649e201a5afc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:11:15 2012 +0300 wshom.ocx: Implement IWshShortcut_put_WorkingDirectory(). --- dlls/wshom.ocx/shell.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 0ab5080..7686284 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -490,8 +490,8 @@ static HRESULT WINAPI WshShortcut_get_WorkingDirectory(IWshShortcut *iface, BSTR static HRESULT WINAPI WshShortcut_put_WorkingDirectory(IWshShortcut *iface, BSTR WorkingDirectory) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(WorkingDirectory)); - return E_NOTIMPL; + TRACE("(%p)->(%s): stub\n", This, debugstr_w(WorkingDirectory)); + return IShellLinkW_SetWorkingDirectory(This->link, WorkingDirectory); } static HRESULT WINAPI WshShortcut_Load(IWshShortcut *iface, BSTR PathLink)

1 0

Alexandre Julliard : Update copyright info for 2012.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 5dc8bedb95630e5e22fc8bbc047954af6a3fd403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc8bedb95630e5e22fc8bbc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 10:17:10 2012 +0100 Update copyright info for 2012. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index bcd8991..1ec4844 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 8447169..0e755e6 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -106,7 +106,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2012 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Jacek Caban : vbscript: Added InStr tests.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: ea185259fb6795470af29c0161dba4f735480ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea185259fb6795470af29c016… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 17:00:23 2011 +0100 vbscript: Added InStr tests. --- dlls/vbscript/tests/api.vbs | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ae1e73b..1c22791 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -89,4 +89,39 @@ TestHex empty, "0" Call ok(getVT(hex(null)) = "VT_NULL", "getVT(hex(null)) = " & getVT(hex(null))) Call ok(getVT(hex(empty)) = "VT_BSTR", "getVT(hex(empty)) = " & getVT(hex(empty))) +x = InStr(1, "abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abcd", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abc", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abcbc", "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("bcabc", "bc") +Call ok(x = 1, "InStr returned " & x) + +x = InStr(3, "abcd", "bc") +Call ok(x = 0, "InStr returned " & x) + +x = InStr("abcd", "bcx") +Call ok(x = 0, "InStr returned " & x) + +x = InStr(5, "abcd", "bc") +Call ok(x = 0, "InStr returned " & x) + +x = "abcd" +x = InStr(x, "bc") +Call ok(x = 2, "InStr returned " & x) + +x = InStr("abcd", null) +Call ok(isNull(x), "InStr returned " & x) +x = InStr(null, "abcd") +Call ok(isNull(x), "InStr returned " & x) +x = InStr(2, null, "abcd") +Call ok(isNull(x), "InStr returned " & x) + Call reportSuccess()

1 0

Jacek Caban : jscript: Get rid of instr_off from expression_t.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 9752df99afd44a2229c299062a151f50a1d088d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9752df99afd44a2229c299062… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 11:46:21 2012 +0100 jscript: Get rid of instr_off from expression_t. --- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 386f448..4afec15 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -481,7 +481,6 @@ typedef enum { struct _expression_t { expression_type_t type; - unsigned instr_off; }; struct _parameter_t { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6311e65..7938968 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1342,7 +1342,6 @@ static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t si expression_t *ret = parser_alloc(ctx, size ? size : sizeof(*ret)); ret->type = type; - ret->instr_off = 0; return ret; }

1 0

Jacek Caban : jscript: Use 0 as an invalid label value.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 4f59ab4ab78cb0479a1f465f6e5d66889a4a9615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f59ab4ab78cb0479a1f465f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 11:46:33 2012 +0100 jscript: Use 0 as an invalid label value. --- dlls/jscript/compile.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 73540ad..4cdd2ed 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -328,14 +328,14 @@ static unsigned alloc_label(compiler_ctx_t *ctx) if(!ctx->labels_size) { ctx->labels = heap_alloc(8 * sizeof(*ctx->labels)); if(!ctx->labels) - return -1; + return 0; ctx->labels_size = 8; }else if(ctx->labels_size == ctx->labels_cnt) { unsigned *new_labels; new_labels = heap_realloc(ctx->labels, 2*ctx->labels_size*sizeof(*ctx->labels)); if(!new_labels) - return -1; + return 0; ctx->labels = new_labels; ctx->labels_size *= 2; @@ -1042,11 +1042,11 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s HRESULT hres; stat_ctx.break_label = alloc_label(ctx); - if(stat_ctx.break_label == -1) + if(!stat_ctx.break_label) return E_OUTOFMEMORY; stat_ctx.continue_label = alloc_label(ctx); - if(stat_ctx.continue_label == -1) + if(!stat_ctx.continue_label) return E_OUTOFMEMORY; if(!stat->do_while) { @@ -1118,11 +1118,11 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) } stat_ctx.break_label = alloc_label(ctx); - if(stat_ctx.break_label == -1) + if(!stat_ctx.break_label) return E_OUTOFMEMORY; stat_ctx.continue_label = alloc_label(ctx); - if(stat_ctx.continue_label == -1) + if(!stat_ctx.continue_label) return E_OUTOFMEMORY; /* FIXME: avoid */ @@ -1182,11 +1182,11 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s } stat_ctx.break_label = alloc_label(ctx); - if(stat_ctx.break_label == -1) + if(!stat_ctx.break_label) return E_OUTOFMEMORY; stat_ctx.continue_label = alloc_label(ctx); - if(stat_ctx.continue_label == -1) + if(!stat_ctx.continue_label) return E_OUTOFMEMORY; hres = compile_expression(ctx, stat->in_expr); @@ -1267,7 +1267,7 @@ static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_ HRESULT hres; for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { - if(pop_ctx->continue_label != -1) + if(pop_ctx->continue_label) break; } @@ -1296,7 +1296,7 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * HRESULT hres; for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { - if(pop_ctx->break_label != -1) + if(pop_ctx->break_label) break; } @@ -1339,7 +1339,7 @@ static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statemen /* ECMA-262 3rd Edition 12.10 */ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { - statement_ctx_t stat_ctx = {0, TRUE, FALSE, -1, -1}; + statement_ctx_t stat_ctx = {0, TRUE, FALSE}; HRESULT hres; hres = compile_expression(ctx, stat->expr); @@ -1362,7 +1362,7 @@ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *sta /* ECMA-262 3rd Edition 12.13 */ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t *stat) { - statement_ctx_t stat_ctx = {0, FALSE, FALSE, -1, -1}; + statement_ctx_t stat_ctx = {0, FALSE, FALSE}; unsigned case_cnt = 0, *case_jmps, i, default_jmp; BOOL have_default = FALSE; statement_t *stat_iter; @@ -1374,7 +1374,7 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t return hres; stat_ctx.break_label = alloc_label(ctx); - if(stat_ctx.break_label == -1) + if(!stat_ctx.break_label) return E_OUTOFMEMORY; for(iter = stat->case_list; iter; iter = iter->next) { @@ -1470,8 +1470,8 @@ static HRESULT compile_throw_statement(compiler_ctx_t *ctx, expression_statement /* ECMA-262 3rd Edition 12.14 */ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) { - statement_ctx_t try_ctx = {0, FALSE, TRUE, -1, -1}, catch_ctx = {0, TRUE, FALSE, -1, -1}; - statement_ctx_t finally_ctx = {2, FALSE, FALSE, -1, -1}; + statement_ctx_t try_ctx = {0, FALSE, TRUE}, catch_ctx = {0, TRUE, FALSE}; + statement_ctx_t finally_ctx = {2, FALSE, FALSE}; unsigned push_except; BSTR ident; HRESULT hres;

1 0

Nikolay Sivov : wshom.ocx: Implement IWshCollection::Item() for common programs folders.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 7f2d4f2933345aeac7d5c5d419bc5ed6610fe28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2d4f2933345aeac7d5c5d41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 31 00:56:37 2011 +0300 wshom.ocx: Implement IWshCollection::Item() for common programs folders. --- dlls/wshom.ocx/shell.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index bd5cb26..c2959e7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -171,6 +171,7 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, { WshCollection *This = impl_from_IWshCollection(iface); static const WCHAR allusersdesktopW[] = {'A','l','l','U','s','e','r','s','D','e','s','k','t','o','p',0}; + static const WCHAR allusersprogramsW[] = {'A','l','l','U','s','e','r','s','P','r','o','g','r','a','m','s',0}; static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; PIDLIST_ABSOLUTE pidl; WCHAR pathW[MAX_PATH]; @@ -191,6 +192,8 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, kind = CSIDL_DESKTOP; else if (!strcmpiW(folder, allusersdesktopW)) kind = CSIDL_COMMON_DESKTOPDIRECTORY; + else if (!strcmpiW(folder, allusersprogramsW)) + kind = CSIDL_COMMON_PROGRAMS; else { FIXME("folder kind %s not supported\n", debugstr_w(folder));

1 0

Jacek Caban : ieframe: Added ITargetFramePriv2 interface to HlinkFrame object.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: f3a2d0535944829e6b01197374e69dee33a7c39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a2d0535944829e6b0119737… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 16:42:40 2012 +0100 ieframe: Added ITargetFramePriv2 interface to HlinkFrame object. --- dlls/ieframe/ieframe.h | 3 +- dlls/ieframe/navigate.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4c32e52..026ab12 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -34,7 +34,7 @@ #include "mshtmhst.h" #include "exdisp.h" #include "hlink.h" -#include "htiframe.h" +#include "htiface.h" #include "shdeprecated.h" #include "docobjectservice.h" @@ -57,6 +57,7 @@ typedef struct { typedef struct { IHlinkFrame IHlinkFrame_iface; ITargetFrame2 ITargetFrame2_iface; + ITargetFramePriv2 ITargetFramePriv2_iface; IUnknown *outer; DocHost *doc_host; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index c58ff7f..a12b195 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1229,6 +1229,97 @@ static const ITargetFrame2Vtbl TargetFrame2Vtbl = { TargetFrame2_GetTargetAlias }; +static inline HlinkFrame *impl_from_ITargetFramePriv2(ITargetFramePriv2 *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, ITargetFramePriv2_iface); +} + +static HRESULT WINAPI TargetFramePriv2_QueryInterface(ITargetFramePriv2 *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI TargetFramePriv2_AddRef(ITargetFramePriv2 *iface) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI TargetFramePriv2_Release(ITargetFramePriv2 *iface) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI TargetFramePriv2_FindFrameDownwards(ITargetFramePriv2 *iface, + LPCWSTR pszTargetName, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(pszTargetName), dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_FindFrameInContext(ITargetFramePriv2 *iface, + LPCWSTR pszTargetName, IUnknown *punkContextFrame, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%s %p %x %p)\n", This, debugstr_w(pszTargetName), punkContextFrame, dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_OnChildFrameActivate(ITargetFramePriv2 *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_OnChildFrameDeactivate(ITargetFramePriv2 *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_NavigateHack(ITargetFramePriv2 *iface, DWORD grfHLNF, LPBC pbc, + IBindStatusCallback *pibsc, LPCWSTR pszTargetName, LPCWSTR pszUrl, LPCWSTR pszLocation) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%x %p %p %s %s %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), + debugstr_w(pszUrl), debugstr_w(pszLocation)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_FindBrowserByIndex(ITargetFramePriv2 *iface, DWORD dwID, IUnknown **ppunkBrowser) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%d %p)\n", This, dwID, ppunkBrowser); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFramePriv2_AggregatedNavigation2(ITargetFramePriv2 *iface, DWORD grfHLNF, LPBC pbc, + IBindStatusCallback *pibsc, LPCWSTR pszTargetName, IUri *pUri, LPCWSTR pszLocation) +{ + HlinkFrame *This = impl_from_ITargetFramePriv2(iface); + FIXME("(%p)->(%x %p %p %s %p %s)\n", This, grfHLNF, pbc, pibsc, debugstr_w(pszTargetName), + pUri, debugstr_w(pszLocation)); + return E_NOTIMPL; +} + +static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = { + TargetFramePriv2_QueryInterface, + TargetFramePriv2_AddRef, + TargetFramePriv2_Release, + TargetFramePriv2_FindFrameDownwards, + TargetFramePriv2_FindFrameInContext, + TargetFramePriv2_OnChildFrameActivate, + TargetFramePriv2_OnChildFrameDeactivate, + TargetFramePriv2_NavigateHack, + TargetFramePriv2_FindBrowserByIndex, + TargetFramePriv2_AggregatedNavigation2 +}; + BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IHlinkFrame, riid)) { @@ -1237,6 +1328,12 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_ITargetFrame2, riid)) { TRACE("(%p)->(IID_ITargetFrame2 %p)\n", This, ppv); *ppv = &This->ITargetFrame2_iface; + }else if(IsEqualGUID(&IID_ITargetFramePriv, riid)) { + TRACE("(%p)->(IID_ITargetFramePriv %p)\n", This, ppv); + *ppv = &This->ITargetFramePriv2_iface; + }else if(IsEqualGUID(&IID_ITargetFramePriv2, riid)) { + TRACE("(%p)->(IID_ITargetFramePriv2 %p)\n", This, ppv); + *ppv = &This->ITargetFramePriv2_iface; }else { return FALSE; } @@ -1249,6 +1346,7 @@ void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) { This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; + This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; This->outer = outer; This->doc_host = doc_host;

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShortcut::Save().
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 06c0b139f596cae83d498a55a9a0589e50400589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c0b139f596cae83d498a55a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:12:26 2012 +0300 wshom.ocx: Implement IWshShortcut::Save(). --- dlls/wshom.ocx/shell.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 121d3e7..4d0c266 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -504,8 +504,16 @@ static HRESULT WINAPI WshShortcut_Load(IWshShortcut *iface, BSTR PathLink) static HRESULT WINAPI WshShortcut_Save(IWshShortcut *iface) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + IPersistFile *file; + HRESULT hr; + + TRACE("(%p)\n", This); + + IShellLinkW_QueryInterface(This->link, &IID_IPersistFile, (void**)&file); + hr = IPersistFile_Save(file, This->path_link, TRUE); + IPersistFile_Release(file); + + return hr; } static const IWshShortcutVtbl WshShortcutVtbl = {

1 0

Nikolay Sivov : wshom.ocx: Implement IWshShortcut_put_TargetPath().
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 34f1811d1263dc9ac5cac34376dcc59782821b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f1811d1263dc9ac5cac3437… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:12:02 2012 +0300 wshom.ocx: Implement IWshShortcut_put_TargetPath(). --- dlls/wshom.ocx/shell.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 7686284..121d3e7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -462,8 +462,8 @@ static HRESULT WINAPI WshShortcut_get_TargetPath(IWshShortcut *iface, BSTR *Path static HRESULT WINAPI WshShortcut_put_TargetPath(IWshShortcut *iface, BSTR Path) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(Path)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(Path)); + return IShellLinkW_SetPath(This->link, Path); } static HRESULT WINAPI WshShortcut_get_WindowStyle(IWshShortcut *iface, int *ShowCmd)

1 0