January 2012 - Wine-commits

Jacek Caban : mshtml: Added IHTMLStyle::paddingTop implementation.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: f01571182293bf4f97231119d23f7e8ba45ef811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01571182293bf4f97231119d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:47 2012 +0100 mshtml: Added IHTMLStyle::paddingTop implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 523fc8f..13c00a8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1556,15 +1556,19 @@ static HRESULT WINAPI HTMLStyle_get_marginLeft(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingTop(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_TOP, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingTop(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_TOP, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingRight(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e950f83..dc7908f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1228,6 +1228,22 @@ static void test_body_style(IHTMLStyle *style) ok(!str, "padding = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + hres = IHTMLStyle_get_paddingTop(style, &v); + ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingTop(style, v); + ok(hres == S_OK, "put_paddingTop failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingTop(style, &v); + ok(hres == S_OK, "get_paddingTop: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::paddingRight implementation.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 2de64c8a26f40f1f290d39ce4526b920b5aa71b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de64c8a26f40f1f290d39ce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:57 2012 +0100 mshtml: Added IHTMLStyle::paddingRight implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 13c00a8..3e328ba 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1574,15 +1574,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingTop(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingRight(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_RIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingRight(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_RIGHT, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index dc7908f..a6ac67a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1244,6 +1244,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_paddingRight(style, &v); + ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingRight(style, v); + ok(hres == S_OK, "put_paddingRight failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingRight(style, &v); + ok(hres == S_OK, "get_paddingRight: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added IHTMLStyle::paddingBottom implementation.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 9fc673f48e0b9fccfbb5861fa0f5b51751f82890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc673f48e0b9fccfbb5861fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:34:05 2012 +0100 mshtml: Added IHTMLStyle::paddingBottom implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 3e328ba..684f744 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1592,15 +1592,19 @@ static HRESULT WINAPI HTMLStyle_get_paddingRight(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_paddingBottom(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingBottom(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_BOTTOM, p, 0); } static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index a6ac67a..03a433f 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1260,6 +1260,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_get_paddingBottom(style, &v); + ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_paddingBottom(style, v); + ok(hres == S_OK, "put_paddingBottom failed: %08x\n", hres); + + hres = IHTMLStyle_get_paddingBottom(style, &v); + ok(hres == S_OK, "get_paddingBottom: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = a2bstr("1"); hres = IHTMLStyle_put_padding(style, str); ok(hres == S_OK, "put_padding failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use helpers in IHTMLStyle::paddingLeft implementation .
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: dec3a9c7b04bf7496c5fc1fea733ac6b22457715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec3a9c7b04bf7496c5fc1fea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:34:22 2012 +0100 mshtml: Use helpers in IHTMLStyle::paddingLeft implementation. --- dlls/mshtml/htmlstyle.c | 27 +++------------------------ dlls/mshtml/tests/style.c | 2 ++ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 684f744..0487992 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1611,39 +1611,18 @@ static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - TRACE("(%p)->(vt=%d)\n", This, V_VT(&v)); - - switch(V_VT(&v)) { - case VT_I4: { - WCHAR buf[14]; - - wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, STYLEID_PADDING_LEFT, buf, 0); - } - case VT_BSTR: - return set_style_attr(This, STYLEID_PADDING_LEFT, V_BSTR(&v), 0); - default: - FIXME("unsupported vt=%d\n", V_VT(&v)); - } + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_paddingLeft(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - BSTR ret; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = get_style_attr(This, STYLEID_PADDING_LEFT, &ret); - if(FAILED(hres)) - return hres; - - V_VT(p) = VT_BSTR; - V_BSTR(p) = ret; - return S_OK; + return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, p, 0); } static HRESULT WINAPI HTMLStyle_put_padding(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 03a433f..793b51c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1289,6 +1289,8 @@ static void test_body_style(IHTMLStyle *style) /* PaddingLeft */ hres = IHTMLStyle_get_paddingLeft(style, &vDefault); ok(hres == S_OK, "get_paddingLeft: %08x\n", hres); + ok(V_VT(&vDefault) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&vDefault)); + ok(!strcmp_wa(V_BSTR(&vDefault), "1px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&vDefault))); V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("10");

1 0

Jacek Caban : mshtml: Don' t use simplified fragment-only navigation if there is post data to send.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: c77ba794b7042611d6500a37fdd4263f04cab8a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77ba794b7042611d6500a37f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 15:15:39 2012 +0100 mshtml: Don't use simplified fragment-only navigation if there is post data to send. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9b650f4..9950511 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1920,7 +1920,7 @@ HRESULT super_navigate(HTMLWindow *window, IUri *uri, const WCHAR *headers, BYTE } } - if(window->uri && compare_ignoring_frag(window->uri, uri)) { + if(window->uri && !post_data_size && compare_ignoring_frag(window->uri, uri)) { TRACE("fragment navigate\n"); return navigate_fragment(window, uri); }

1 0

Austin English : iphlpapi: Add GetTcp6Table/GetTcp6Table2 stubs.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: ce2e7cdc9e2f6e77d6d9a11fafacba1b258da4b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2e7cdc9e2f6e77d6d9a11fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 14:29:48 2012 -0800 iphlpapi: Add GetTcp6Table/GetTcp6Table2 stubs. --- dlls/iphlpapi/iphlpapi.spec | 4 ++-- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++++++++++++ include/tcpmib.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index a6662c3..f168492 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -132,8 +132,8 @@ #@ stub GetPerTcpConnectionStats @ stdcall GetRTTAndHopCount( long ptr long ptr ) #@ stub GetSessionCompartmentId -#@ stub GetTcp6Table -#@ stub GetTcp6Table2 +@ stdcall GetTcp6Table( ptr ptr long ) +@ stdcall GetTcp6Table2( ptr ptr long ) #@ stub GetTcpStatisticsEx @ stdcall GetTcpStatistics( ptr ) @ stub GetTcpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ea759ae..2a3285f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2285,3 +2285,21 @@ ULONG WINAPI GetTcpTable2(PMIB_TCPTABLE2 table, PULONG size, BOOL order) FIXME("pTcpTable2 %p, pdwSize %p, bOrder %d: stub\n", table, size, order); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetTcp6Table (IPHLPAPI.@) + */ +ULONG WINAPI GetTcp6Table(PMIB_TCP6TABLE table, PULONG size, BOOL order) +{ + FIXME("pTcp6Table %p, size %p, order %d: stub\n", table, size, order); + return ERROR_NOT_SUPPORTED; +} + +/****************************************************************** + * GetTcp6Table2 (IPHLPAPI.@) + */ +ULONG WINAPI GetTcp6Table2(PMIB_TCP6TABLE2 table, PULONG size, BOOL order) +{ + FIXME("pTcp6Table2 %p, size %p, order %d: stub\n", table, size, order); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/tcpmib.h b/include/tcpmib.h index 58be385..8c3efa1 100644 --- a/include/tcpmib.h +++ b/include/tcpmib.h @@ -67,6 +67,38 @@ typedef struct _MIB_TCPTABLE MIB_TCPROW table[1]; } MIB_TCPTABLE, *PMIB_TCPTABLE; +typedef struct _MIB_TCP6ROW { + MIB_TCP_STATE State; + IN6_ADDR LocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + IN6_ADDR RemoteAddr; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; +} MIB_TCP6ROW, *PMIB_TCP6ROW; + +typedef struct _MIB_TCP6TABLE { + DWORD dwNumEntries; + MIB_TCP6ROW table[1]; +} MIB_TCP6TABLE, *PMIB_TCP6TABLE; + +typedef struct _MIB_TCP6ROW2 { + IN6_ADDR LocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + IN6_ADDR RemoteAddr; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + MIB_TCP_STATE State; + DWORD dwOwningPid; + TCP_CONNECTION_OFFLOAD_STATE dwOffloadState; +} MIB_TCP6ROW2, *PMIB_TCP6ROW2; + +typedef struct _MIB_TCP6TABLE2 { + DWORD dwNumEntries; + MIB_TCP6ROW2 table[1]; +} MIB_TCP6TABLE2, *PMIB_TCP6TABLE2; + typedef struct _MIB_TCPROW_OWNER_PID { DWORD dwState;

1 0

Austin English : setupapi: Add a stub for SetupAddToDiskSpaceListA/W.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 056de6fbcf4d436b00054031346db92f4ebb0233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056de6fbcf4d436b000540313… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 14:35:42 2012 -0800 setupapi: Add a stub for SetupAddToDiskSpaceListA/W. --- dlls/setupapi/diskspace.c | 24 ++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index 0a1a5ff..1ca45f9 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -259,3 +259,27 @@ BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) HeapFree(GetProcessHeap(),0,list); return TRUE; } + +/*********************************************************************** +* SetupAddToDiskSpaceListA (SETUPAPI.@) +*/ +BOOL WINAPI SetupAddToDiskSpaceListA(HDSKSPC diskspace, PCSTR targetfile, + LONGLONG filesize, UINT operation, + PVOID reserved1, UINT reserved2) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** +* SetupAddToDiskSpaceListW (SETUPAPI.@) +*/ +BOOL WINAPI SetupAddToDiskSpaceListW(HDSKSPC diskspace, PCWSTR targetfile, + LONGLONG filesize, UINT operation, + PVOID reserved1, UINT reserved2) +{ + FIXME(": stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index d3825d9..6397ab2 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -246,8 +246,8 @@ @ stub SetupAddInstallSectionToDiskSpaceListW @ stub SetupAddSectionToDiskSpaceListA @ stub SetupAddSectionToDiskSpaceListW -@ stub SetupAddToDiskSpaceListA -@ stub SetupAddToDiskSpaceListW +@ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) +@ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) @ stub SetupAddToSourceListA @ stub SetupAddToSourceListW @ stub SetupAdjustDiskSpaceListA

1 0

Austin English : wer: Add a stub for WerReportSetUIOption.
by Alexandre Julliard 26 Jan '12

26 Jan '12

Module: wine Branch: master Commit: 8842cd13a1e9068ac719b03730fb1f1276550ccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8842cd13a1e9068ac719b0373… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 14:56:35 2012 -0800 wer: Add a stub for WerReportSetUIOption. --- dlls/wer/main.c | 9 +++++++++ dlls/wer/wer.spec | 2 +- include/werapi.h | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index d68d652..ae9ab26 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -348,3 +348,12 @@ HRESULT WINAPI WerReportSubmit(HREPORT hreport, WER_CONSENT consent, DWORD flags *presult = WerDisabled; return E_NOTIMPL; } + +/*********************************************************************** + * WerReportSetUIOption (wer.@) + */ +HRESULT WINAPI WerReportSetUIOption(HREPORT hreport, WER_REPORT_UI uitype, PCWSTR value) +{ + FIXME("(%p, %d, %s) :stub\n", hreport, uitype, debugstr_w(value)); + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index bfc39e4..fe9fad7 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -68,7 +68,7 @@ @ stdcall WerReportCloseHandle(ptr) @ stdcall WerReportCreate(wstr long ptr ptr) @ stdcall WerReportSetParameter(ptr long wstr wstr) -@ stub WerReportSetUIOption +@ stdcall WerReportSetUIOption(ptr long wstr) @ stdcall WerReportSubmit(ptr long long ptr) @ stub WerpGetReportConsent @ stub WerpIsDisabled diff --git a/include/werapi.h b/include/werapi.h index e8ec487..c709dad 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -121,6 +121,22 @@ typedef enum _WER_DUMP_TYPE WerDumpTypeMax } WER_DUMP_TYPE; +typedef enum _WER_REPORT_UI +{ + WerUIAdditionalDataDlgHeader = 1, + WerUIIconFilePath = 2, + WerUIConsentDlgHeader = 3, + WerUIConsentDlgBody = 4, + WerUIOnlineSolutionCheckText = 5, + WerUIOfflineSolutionCheckText = 6, + WerUICloseText = 7, + WerUICloseDlgHeader = 8, + WerUICloseDlgBody = 9, + WerUICloseDlgButtonText = 10, + WerUICustomActionButtonText = 11, + WerUIMax +} WER_REPORT_UI; + /* #### */ typedef struct _WER_DUMP_CUSTOM_OPTIONS @@ -153,6 +169,7 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerReportCloseHandle(HREPORT); HRESULT WINAPI WerReportCreate(PCWSTR, WER_REPORT_TYPE, PWER_REPORT_INFORMATION, HREPORT*); HRESULT WINAPI WerReportSetParameter(HREPORT, DWORD, PCWSTR, PCWSTR); +HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); #ifdef __cplusplus

1 0

Jacek Caban : ieframe: Fixed a typo in IDocObjectService:: FireNavigateComplete2.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: 1f03cbf2817dd48981f540b5b83cac0c4dea3bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f03cbf2817dd48981f540b5b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 13:59:06 2012 +0100 ieframe: Fixed a typo in IDocObjectService::FireNavigateComplete2. --- dlls/ieframe/shellbrowser.c | 2 +- dlls/ieframe/tests/webbrowser.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 86bba68..f9bbc29 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -748,7 +748,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( set_dochost_url(This->doc_host, url); V_VT(params) = (VT_BYREF|VT_VARIANT); - V_BYREF(params) = &url; + V_VARIANTREF(params) = &url_var; V_VT(params+1) = VT_DISPATCH; V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3b3d133..443834c 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -768,6 +768,26 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const *V_BOOLREF(cancel)); } +static void test_navigatecomplete2(DISPPARAMS *dp) +{ + VARIANT *v; + + CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2); + + ok(dp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(dp->cArgs == 2, "cArgs=%d, expected 2\n", dp->cArgs); + + ok(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT), "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg)); + v = V_VARIANTREF(dp->rgvarg); + ok(V_VT(v) == VT_BSTR, "V_VT(url) = %d\n", V_VT(v)); + ok(!strcmp_wa(V_BSTR(v), current_url), "url=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), current_url); + + ok(V_VT(dp->rgvarg+1) == VT_DISPATCH, "V_VT(dp->rgvarg+1) = %d\n", V_VT(dp->rgvarg+1)); + ok(V_DISPATCH(dp->rgvarg+1) == (IDispatch*)wb, "V_DISPATCH=%p, wb=%p\n", V_DISPATCH(dp->rgvarg+1), wb); + + test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); +} + static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -896,9 +916,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe break; case DISPID_NAVIGATECOMPLETE2: - CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2); - /* FIXME */ - test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_navigatecomplete2(pDispParams); break; case DISPID_PROGRESSCHANGE:

1 0

Jacek Caban : ieframe: Fixed a typo in IDocObjectService:: FireDocumentComplete.
by Alexandre Julliard 25 Jan '12

25 Jan '12

Module: wine Branch: master Commit: a031473b1f87b67fbe94d751a610e85e2badaae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a031473b1f87b67fbe94d751a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 25 16:56:31 2012 +0100 ieframe: Fixed a typo in IDocObjectService::FireDocumentComplete. --- dlls/ieframe/shellbrowser.c | 2 +- dlls/ieframe/tests/webbrowser.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index f9bbc29..91a3bf6 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -809,7 +809,7 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( TRACE("got URL %s\n", debugstr_w(url)); V_VT(params) = (VT_BYREF|VT_VARIANT); - V_BYREF(params) = &url; + V_VARIANTREF(params) = &url_var; V_VT(params+1) = VT_DISPATCH; V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 443834c..e97cf3f 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -788,6 +788,26 @@ static void test_navigatecomplete2(DISPPARAMS *dp) test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); } +static void test_documentcomplete(DISPPARAMS *dp) +{ + VARIANT *v; + + CHECK_EXPECT(Invoke_DOCUMENTCOMPLETE); + + ok(dp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(dp->cArgs == 2, "cArgs=%d, expected 2\n", dp->cArgs); + + ok(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT), "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg)); + v = V_VARIANTREF(dp->rgvarg); + ok(V_VT(v) == VT_BSTR, "V_VT(url) = %d\n", V_VT(v)); + ok(!strcmp_wa(V_BSTR(v), current_url), "url=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), current_url); + + ok(V_VT(dp->rgvarg+1) == VT_DISPATCH, "V_VT(dp->rgvarg+1) = %d\n", V_VT(dp->rgvarg+1)); + ok(V_DISPATCH(dp->rgvarg+1) == (IDispatch*)wb, "V_DISPATCH=%p, wb=%p\n", V_DISPATCH(dp->rgvarg+1), wb); + + test_ready_state(READYSTATE_COMPLETE); +} + static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -925,9 +945,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe break; case DISPID_DOCUMENTCOMPLETE: - CHECK_EXPECT(Invoke_DOCUMENTCOMPLETE); - /* FIXME */ - test_ready_state(READYSTATE_COMPLETE); + test_documentcomplete(pDispParams); break; case 282: /* FIXME */

1 0