September 2012 - Wine-commits

Henri Verbeet : d3d10: Improve a couple of debug messages.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 99d1c9ba82dc612535beb8a18c97b8c6aec7864f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d1c9ba82dc612535beb8a18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:32 2012 +0200 d3d10: Improve a couple of debug messages. --- dlls/d3d10/effect.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5b82777..6d1337b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1191,20 +1191,20 @@ static BOOL parse_fx10_state_group(const char **ptr, const char *data, if (property_info->container_type != container_type) { - ERR("FAIL1\n"); + ERR("Invalid container type %#x for property %#x.\n", container_type, id); return FALSE; } if (idx >= property_info->count) { - ERR("FAIL2\n"); + ERR("Invalid index %#x for property %#x.\n", idx, id); return FALSE; } if (!read_value_list(data + value_offset, property_info->type, idx, property_info->size, (char *)container + property_info->offset)) { - ERR("FAIL3\n"); + ERR("Failed to read values for property %#x.\n", id); return FALSE; } }

1 0

Jacek Caban : mshtml: Properly expose frame and iframe element' s windows to scripts.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 4ff0a82416e61a99e7b30a0c4c2a525b008bff1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff0a82416e61a99e7b30a0c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:58:39 2012 +0200 mshtml: Properly expose frame and iframe element's windows to scripts. --- dlls/mshtml/htmlwindow.c | 44 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/tests/jstest.html | 7 ++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2ec4a7f..2ed3ca7 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2358,7 +2358,25 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - if(window->base.inner_window->doc) { + if(This->outer_window) { + HTMLOuterWindow *frame; + + hres = get_frame_by_name(This->outer_window, bstrName, FALSE, &frame); + if(SUCCEEDED(hres) && frame) { + global_prop_t *prop; + + IHTMLWindow2_Release(&frame->base.IHTMLWindow2_iface); + + prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName); + if(!prop) + return E_OUTOFMEMORY; + + *pid = prop_to_dispid(window, prop); + return S_OK; + } + } + + if(window->doc) { global_prop_t *prop; IHTMLElement *elem; @@ -2603,6 +2621,30 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD FIXME("Not supported flags: %x\n", flags); return E_NOTIMPL; } + case GLOBAL_FRAMEVAR: + if(!This->base.outer_window) + return E_UNEXPECTED; + + switch(flags) { + case DISPATCH_PROPERTYGET: { + HTMLOuterWindow *frame; + + hres = get_frame_by_name(This->base.outer_window, prop->name, FALSE, &frame); + if(FAILED(hres)) + return hres; + + if(!frame) + return DISP_E_MEMBERNOTFOUND; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)&frame->base.inner_window->base.IHTMLWindow2_iface; + IDispatch_AddRef(V_DISPATCH(res)); + return S_OK; + } + default: + FIXME("Not supported flags: %x\n", flags); + return E_NOTIMPL; + } case GLOBAL_DISPEXVAR: return IDispatchEx_InvokeEx(&This->dispex.IDispatchEx_iface, prop->id, 0, flags, params, res, ei, caller); default: diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f23dc10..9f10382 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -294,7 +294,8 @@ typedef struct ScriptHost ScriptHost; typedef enum { GLOBAL_SCRIPTVAR, GLOBAL_ELEMENTVAR, - GLOBAL_DISPEXVAR + GLOBAL_DISPEXVAR, + GLOBAL_FRAMEVAR } global_prop_type_t; typedef struct { diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 99eca1a..d9d6da5 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -68,6 +68,13 @@ function test_document_name_as_index() { ok(window.formname === 1, "window.formname = " + window.formname); formname = 2; ok(window.formname === 2, "window.formname = " + window.formname); + + document.body.innerHTML = '<iframe id="iframeid"></iframe>'; + ok("iframeid" in window, "iframeid is not in window"); + e = document.getElementById("iframeid"); + ok(!!e, "e is null"); + ok(iframeid != e, "iframeid == e"); + ok(iframeid.frameElement === e, "frameid != e.contentWindow"); } function test_remove_style_attribute() {

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onhelp property implementation.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: f63da13c288abf37414369443831722f40685b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63da13c288abf37414369443… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:58:58 2012 +0200 mshtml: Added IHTMLWindow2::onhelp property implementation. --- dlls/mshtml/htmlanchor.c | 8 +++----- dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmlelem.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/htmlembed.c | 1 + dlls/mshtml/htmlevent.c | 7 ++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 2 ++ dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmlmeta.c | 1 + dlls/mshtml/htmlobject.c | 2 +- dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmltable.c | 1 + dlls/mshtml/htmltablecell.c | 1 + dlls/mshtml/htmltablerow.c | 1 + dlls/mshtml/htmltextarea.c | 2 +- dlls/mshtml/htmlwindow.c | 12 ++++++++---- dlls/mshtml/mshtml_private.h | 3 ++- 26 files changed, 72 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63da13c288abf3741436…

1 0

Jacek Caban : mshtml: Added IHTMLStyle::put_pixelWidth implementation.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: d898f27af4f6e84fbdad403a0940eda1c6e88aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d898f27af4f6e84fbdad403a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:59:09 2012 +0200 mshtml: Added IHTMLStyle::put_pixelWidth implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++++-- dlls/mshtml/tests/style.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 1e068b1..cb164dc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -594,6 +594,15 @@ static inline HRESULT set_style_pos(HTMLStyle *This, styleid_t sid, float value) return set_style_attr(This, sid, szValue, 0); } +static HRESULT set_style_pxattr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, LONG value) +{ + WCHAR value_str[16]; + + sprintfW(value_str, px_formatW, value); + + return set_nsstyle_attr(nsstyle, sid, value_str, 0); +} + static HRESULT get_nsstyle_pos(HTMLStyle *This, styleid_t sid, float *p) { nsAString str_value; @@ -2376,8 +2385,10 @@ static HRESULT WINAPI HTMLStyle_get_pixelLeft(IHTMLStyle *iface, LONG *p) static HRESULT WINAPI HTMLStyle_put_pixelWidth(IHTMLStyle *iface, LONG v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_style_pxattr(This->nsstyle, STYLEID_WIDTH, v); } static HRESULT WINAPI HTMLStyle_get_pixelWidth(IHTMLStyle *iface, LONG *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index b44950c..0584ef4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -826,6 +826,16 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "100px"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + hres = IHTMLStyle_put_pixelWidth(style, 50); + ok(hres == S_OK, "put_pixelWidth failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_width(style, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "50px"), "V_BSTR(v)=%s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + /* margin tests */ str = (void*)0xdeadbeef; hres = IHTMLStyle_get_margin(style, &str);

1 0

Jacek Caban : mshtml: Added IHTMLElement::contains implementation.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: a1e6835d0e7466b0ade7432e7aeb4f2e6094dc76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e6835d0e7466b0ade7432e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 13:59:22 2012 +0200 mshtml: Added IHTMLElement::contains implementation. --- dlls/mshtml/htmlelem.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 26 ++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7d6620a..e44f97d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -773,8 +773,26 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC VARIANT_BOOL *pfResult) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p %p)\n", This, pChild, pfResult); - return E_NOTIMPL; + HTMLElement *child; + cpp_bool result; + nsresult nsres; + + TRACE("(%p)->(%p %p)\n", This, pChild, pfResult); + + child = unsafe_impl_from_IHTMLElement(pChild); + if(!child) { + ERR("not our element\n"); + return E_FAIL; + } + + nsres = nsIDOMNode_Contains(This->node.nsnode, child->node.nsnode, &result); + if(NS_FAILED(nsres)) { + ERR("failed\n"); + return E_FAIL; + } + + *pfResult = result ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLElement_get_sourceIndex(IHTMLElement *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1b7de75..149aa5e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2117,6 +2117,18 @@ static void _test_elem_outerhtml(unsigned line, IUnknown *unk, const char *outer SysFreeString(html); } +#define test_elem_contains(a,b,c) _test_elem_contains(__LINE__,a,b,c) +static void _test_elem_contains(unsigned line, IHTMLElement *elem, IHTMLElement *elem2, VARIANT_BOOL exval) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 100; + hres = IHTMLElement_contains(elem, elem2, &b); + ok_(__FILE__,line)(hres == S_OK, "contains failed: %08x\n", hres); + ok_(__FILE__,line)(b == exval, "contains returned %x, expected %x\n", b, exval); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -5301,13 +5313,23 @@ static void test_elems(IHTMLDocument2 *doc) elem2 = test_elem_get_parent((IUnknown*)elem); ok(elem2 != NULL, "elem2 == NULL\n"); test_node_name((IUnknown*)elem2, "BODY"); + elem3 = test_elem_get_parent((IUnknown*)elem2); - IHTMLElement_Release(elem2); ok(elem3 != NULL, "elem3 == NULL\n"); test_node_name((IUnknown*)elem3, "HTML"); + + test_elem_contains(elem3, elem2, VARIANT_TRUE); + test_elem_contains(elem3, elem, VARIANT_TRUE); + test_elem_contains(elem2, elem, VARIANT_TRUE); + test_elem_contains(elem2, elem3, VARIANT_FALSE); + test_elem_contains(elem, elem3, VARIANT_FALSE); + test_elem_contains(elem, elem2, VARIANT_FALSE); + test_elem_contains(elem, elem, VARIANT_TRUE); + IHTMLElement_Release(elem2); + elem2 = test_elem_get_parent((IUnknown*)elem3); - IHTMLElement_Release(elem3); ok(elem2 == NULL, "elem2 != NULL\n"); + IHTMLElement_Release(elem3); test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2); test_elem_getelembytag((IUnknown*)elem, ET_SELECT, 0);

1 0

Jacek Caban : jscript: Fixed empty cases in the end of switch statement.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 6ba7a1964aaec5f8e527128442a876975bee85d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba7a1964aaec5f8e52712844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 15:52:27 2012 +0200 jscript: Fixed empty cases in the end of switch statement. --- dlls/jscript/compile.c | 20 ++++++++++++++------ dlls/jscript/tests/lang.js | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f3c1df1..e45b132 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1540,18 +1540,26 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t set_arg_uint(ctx, iter->expr ? case_jmps[i++] : default_jmp, ctx->code_off); - for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); stat_iter = stat_iter->next) { - hres = compile_statement(ctx, &stat_ctx, stat_iter); + if(iter->stat) { + for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); + stat_iter = stat_iter->next) { + hres = compile_statement(ctx, &stat_ctx, stat_iter); + if(FAILED(hres)) + break; + + if(stat_iter->next && !push_instr(ctx, OP_pop)) { + hres = E_OUTOFMEMORY; + break; + } + } if(FAILED(hres)) break; - - if(stat_iter->next && !push_instr(ctx, OP_pop)) { + }else { + if(!push_instr(ctx, OP_undefined)) { hres = E_OUTOFMEMORY; break; } } - if(FAILED(hres)) - break; } heap_free(case_jmps); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 26a28b8..cb127da 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -757,6 +757,32 @@ case 3: ok(false, "unexpected case 3"); } +switch(1) { +case 2: + ok(false, "unexpected case 2"); + break; +default: + /* empty default */ +} + +switch(2) { +default: + ok(false, "unexpected default"); + break; +case 2: + /* empty case */ +}; + +switch(2) { +default: + ok(false, "unexpected default"); + break; +case 1: +case 2: +case 3: + /* empty case */ +}; + (function() { var i=0;

1 0

Chae Jong Bin : netapi32: Add stub for NetScheduleJobAdd.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: ecdd6c58c5fe2991e06a4f159107bc65030cd762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdd6c58c5fe2991e06a4f159… Author: Chae Jong Bin <chae(a)trunk.so> Date: Sat Sep 1 19:09:07 2012 -0400 netapi32: Add stub for NetScheduleJobAdd. --- dlls/netapi32/netapi32.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- include/lmat.h | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 470adf0..f6c6d20 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -238,6 +238,12 @@ NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWOR return ERROR_NOT_SUPPORTED; } +NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD jobid) +{ + FIXME("stub (%s, %p, %p)\n", debugstr_w(server), bufptr, jobid); + return NERR_Success; +} + NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index f577010..50e7b0e 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -166,7 +166,7 @@ @ stub NetRplWkstaEnum @ stub NetRplWkstaGetInfo @ stub NetRplWkstaSetInfo -@ stub NetScheduleJobAdd +@ stdcall NetScheduleJobAdd(wstr ptr ptr) @ stub NetScheduleJobDel @ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) @ stub NetScheduleJobGetInfo diff --git a/include/lmat.h b/include/lmat.h index f5b6883..fe8a9c0 100644 --- a/include/lmat.h +++ b/include/lmat.h @@ -25,6 +25,7 @@ extern "C" { #endif +NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); #ifdef __cplusplus

1 0

Chae Jong Bin : fltlib: Add stub for FilterUnload.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 4c6c8ed04102762a80e13a3fa1540b872ad19987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6c8ed04102762a80e13a3fa… Author: Chae Jong Bin <chae(a)trunk.so> Date: Sun Sep 2 08:40:12 2012 -0400 fltlib: Add stub for FilterUnload. --- dlls/fltlib/fltlib.c | 17 +++++++++++++++-- dlls/fltlib/fltlib.spec | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 9975a29..50f46ac 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -65,7 +65,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, LPHANDLE handle) { - FIXME("%u, %p, %u, %p, %p\n", class, buffer, size, bytes_returned, handle); + FIXME("(%u, %p, %u, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); } @@ -74,6 +74,19 @@ HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD b */ HRESULT WINAPI FilterFindClose(HANDLE handle) { - FIXME("%p\n", handle); + FIXME("(%p) stub\n", handle); + return S_OK; +} + +/********************************************************************** + * FilterUnload (FLTLIB.@) + */ +HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +{ + FIXME("(%s) stub\n", debugstr_w(lpFilterName)); + + if (!lpFilterName) + return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); + return S_OK; } diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec index ecf5893..91e803b 100644 --- a/dlls/fltlib/fltlib.spec +++ b/dlls/fltlib/fltlib.spec @@ -19,7 +19,7 @@ @ stub FilterLoad @ stub FilterReplyMessage @ stub FilterSendMessage -@ stub FilterUnload +@ stdcall FilterUnload(wstr) @ stub FilterVolumeClose @ stub FilterVolumeFindClose @ stub FilterVolumeFindFirst

1 0

Michael Geddes : tapi32: Stub some missing functions.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: cf41a41738865ba787dbb9e29909d680687169e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf41a41738865ba787dbb9e29… Author: Michael Geddes <michael(a)frog.wheelycreek.net> Date: Mon May 28 12:01:39 2012 +0800 tapi32: Stub some missing functions. --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/phone.c | 29 +++++++++++++++++++++++++++++ dlls/tapi32/tapi32.spec | 4 ++++ include/tapi.h | 30 ++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 3d8cb37..cbb5f98 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -544,6 +544,15 @@ DWORD WINAPI lineGetLineDevStatusA(HLINE hLine, LPLINEDEVSTATUS lpLineDevStatus) } /*********************************************************************** + * lineGetMessage (TAPI32.@) + */ +DWORD WINAPI lineGetMessage(HLINEAPP hLineApp, LPLINEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hLineApp, lpMessage, dwTimeout); + return 0; +} + +/*********************************************************************** * lineGetNewCalls (TAPI32.@) */ DWORD WINAPI lineGetNewCalls(HLINE hLine, DWORD dwAddressID, DWORD dwSelect, LPLINECALLLIST lpCallList) diff --git a/dlls/tapi32/phone.c b/dlls/tapi32/phone.c index 994d787..ed40a62 100644 --- a/dlls/tapi32/phone.c +++ b/dlls/tapi32/phone.c @@ -156,6 +156,15 @@ DWORD WINAPI phoneGetLamp(HPHONE hPhone, DWORD dwButtonLampID, } /*********************************************************************** + * phoneGetMessage (TAPI32.@) + */ +DWORD WINAPI phoneGetMessage(HPHONEAPP hPhoneApp, LPPHONEMESSAGE lpMessage, DWORD dwTimeout) +{ + FIXME("(%p, %p, %08x): stub.\n", hPhoneApp, lpMessage, dwTimeout); + return 0; +} + +/*********************************************************************** * phoneGetRing (TAPI32.@) */ DWORD WINAPI phoneGetRing(HPHONE hPhone, LPDWORD lpdwRingMode, LPDWORD lpdwVolume) @@ -205,6 +214,26 @@ DWORD WINAPI phoneInitialize(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONE } /*********************************************************************** + * phoneInitializeiExA (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExA(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, lpszAppName, lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; + return 0; +} + +/*********************************************************************** + * phoneInitializeiExW (TAPI32.@) + */ +DWORD WINAPI phoneInitializeExW(LPHPHONEAPP lphPhoneApp, HINSTANCE hInstance, PHONECALLBACK lpfnCallback, LPCWSTR lpszAppName, LPDWORD lpdwNumDevs, LPDWORD lpdwAPIVersion, LPPHONEINITIALIZEEXPARAMS lpPhoneInitializeExParams) +{ + FIXME("(%p, %p, %p, %s, %p, %p, %p): stub.\n", lphPhoneApp, hInstance, lpfnCallback, debugstr_w(lpszAppName), lpdwNumDevs, lpdwAPIVersion, lpPhoneInitializeExParams); + *lpdwNumDevs = 0; + return 0; +} + +/*********************************************************************** * phoneNegotiateAPIVersion (TAPI32.@) */ DWORD WINAPI phoneNegotiateAPIVersion(HPHONEAPP hPhoneApp, DWORD dwDeviceID, DWORD dwAPILowVersion, DWORD dwAPIHighVersion, LPDWORD lpdwAPIVersion, LPPHONEEXTENSIONID lpExtensionID) diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index b95f86f..78cd63b 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -53,6 +53,7 @@ @ stdcall lineGetIconA(long str ptr) @ stdcall lineGetLineDevStatus(long ptr) lineGetLineDevStatusA @ stdcall lineGetLineDevStatusA(long ptr) +@ stdcall lineGetMessage(long ptr long) @ stdcall lineGetNewCalls(long long long ptr) @ stdcall lineGetNumRings(long long ptr) @ stdcall lineGetProviderList(long ptr) lineGetProviderListA @@ -138,12 +139,15 @@ @ stdcall phoneGetIcon(long str ptr) phoneGetIconA @ stdcall phoneGetIconA(long str ptr) @ stdcall phoneGetLamp(long long ptr) +@ stdcall phoneGetMessage(long ptr long) @ stdcall phoneGetRing(long ptr ptr) @ stdcall phoneGetStatus(long ptr) phoneGetStatusA @ stdcall phoneGetStatusA(long ptr) @ stdcall phoneGetStatusMessages(long ptr ptr ptr) @ stdcall phoneGetVolume(long long ptr) @ stdcall phoneInitialize(ptr long ptr str ptr) +@ stdcall phoneInitializeExA(ptr long ptr str ptr ptr ptr) +@ stdcall phoneInitializeExW(ptr long ptr str ptr ptr ptr) @ stdcall phoneNegotiateAPIVersion(long long long long ptr ptr) @ stdcall phoneNegotiateExtVersion(long long long long long ptr) @ stdcall phoneOpen(long long ptr long long long long) diff --git a/include/tapi.h b/include/tapi.h index 9af7ea5..98d995a 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -747,6 +747,15 @@ typedef struct linetranslateoutput_tag { DWORD dwTranslateResults; } LINETRANSLATEOUTPUT, *LPLINETRANSLATEOUTPUT; +typedef struct linemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} LINEMESSAGE, *LPLINEMESSAGE; + typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); typedef struct _PHONEAPP { @@ -817,6 +826,27 @@ typedef struct phoneextensionid_tag { DWORD dwExtensionID3; } PHONEEXTENSIONID, *LPPHONEEXTENSIONID; +typedef struct phoneinitializeexparams_tag { + DWORD dwTotalSize; + DWORD dwNeededSize; + DWORD dwUsedSize; + DWORD dwOptions; + union { + HANDLE hEvent; + HANDLE hCompletionPort; + } Handles; + DWORD dwCompletionKey; +} PHONEINITIALIZEEXPARAMS, *LPPHONEINITIALIZEEXPARAMS; + +typedef struct phonemessage_tag { + DWORD hDevice; + DWORD dwMessageID; + DWORD_PTR dwCallbackInstance; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; + DWORD_PTR dwParam3; +} PHONEMESSAGE, *LPPHONEMESSAGE; + typedef struct phonestatus_tag { DWORD dwTotalSize; DWORD dwNeededSize;

1 0

Nikolay Sivov : oleaut32: Added some VT_DECIMAL rounding tests.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 2bb07936efdabba3e7309d1e25e1a3e06200c272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb07936efdabba3e7309d1e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 00:06:49 2012 +0400 oleaut32: Added some VT_DECIMAL rounding tests. --- dlls/oleaut32/tests/vartest.c | 77 +++++++++++++++++++++++++++++----------- 1 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1ac09cd..94bbf7e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3240,6 +3240,32 @@ static void test_Round( int line, VARIANT *arg, int deci, VARIANT *expected ) V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \ test_Round( __LINE__, &v, deci, &exp ) +struct decimal_t { + BYTE scale; + BYTE sign; + ULONG Hi32; + ULONG Mid32; + ULONG Lo32; +}; + +struct decimal_round_t { + struct decimal_t source; + struct decimal_t ret; + int dec; +}; + +static const struct decimal_round_t decimal_round_data[] = { + {{ 0, DECIMAL_NEG, 0, 0, 1 }, { 0, DECIMAL_NEG, 0, 0, 1 }, 0}, + {{ 0, 0, 0, 0, 1 }, { 0, 0, 0, 0, 1 }, 0}, + {{ 2, 0, 0, 0, 155 }, { 0, 0, 0, 0, 16 }, 1}, + {{ 2, 0, 0, 0, 155 }, { 1, 0, 0, 0, 2 }, 0}, + {{ 2, 0, 0, 0, 199 }, { 1, 0, 0, 0, 20 }, 1}, + {{ 2, 0, 0, 0, 199 }, { 2, 0, 0, 0, 199 }, 2}, + {{ 2, DECIMAL_NEG, 0, 0, 199 }, { 2, DECIMAL_NEG, 0, 0, 199 }, 2}, + {{ 2, DECIMAL_NEG, 0, 0, 55 }, { 2, DECIMAL_NEG, 0, 0, 6 }, 1}, + {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1} +}; + static void test_VarRound(void) { static WCHAR szNumMin[] = {'-','1','.','4','4','9','\0' }; @@ -3248,6 +3274,7 @@ static void test_VarRound(void) VARIANT v, exp, vDst; CY *pcy = &V_CY(&v); char buff[8]; + int i; CHECKPTR(VarRound); @@ -3324,30 +3351,38 @@ static void test_VarRound(void) ok(hres == S_OK && V_VT(&vDst) == VT_NULL, "VarRound: expected 0x0,%d got 0x%X,%d\n", VT_NULL, hres, V_VT(&vDst)); - /* not yet implemented so no use testing yet - todo_wine { - DECIMAL *pdec = &V_DECIMAL(&v); + /* VT_DECIMAL */ + for (i = 0; i < sizeof(decimal_round_data)/sizeof(struct decimal_round_t); i++) + { + const struct decimal_round_t *ptr = &decimal_round_data[i]; + DECIMAL *pdec; + + pdec = &V_DECIMAL(&v); V_VT(&v) = VT_DECIMAL; - S(U(*pdec)).sign = DECIMAL_NEG; - S(U(*pdec)).scale = 0; - pdec->Hi32 = 0; - S1(U1(*pdec)).Mid32 = 0; - S1(U1(*pdec)).Lo32 = 1; - hres = pVarRound(&v,0,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && - S(U(V_DECIMAL(&vDst))).sign == 0, - "VarRound: expected 0x0,%d,0x00, got 0x%X,%d,%02x\n", VT_DECIMAL, - hres, V_VT(&vDst), S(U(V_DECIMAL(&vDst))).sign); - - S(U(*pdec)).sign = 0; - hres = pVarRound(&v,0,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && - S(U(V_DECIMAL(&vDst))).sign == DECIMAL_NEG, - "VarRound: expected 0x0,%d,0x7f, got 0x%X,%d,%02x\n", VT_DECIMAL, - hres, V_VT(&vDst), S(U(V_DECIMAL(&vDst))).sign); - } - */ + S(U(*pdec)).sign = ptr->source.sign; + S(U(*pdec)).scale = ptr->source.scale; + pdec->Hi32 = ptr->source.Hi32; + S1(U1(*pdec)).Mid32 = ptr->source.Mid32; + S1(U1(*pdec)).Lo32 = ptr->source.Lo32; + VariantInit(&vDst); + hres = pVarRound(&v, ptr->dec, &vDst); + todo_wine + ok(hres == S_OK, "%d: got 0x%08x\n", i, hres); + if (hres == S_OK) + { + ok(V_VT(&vDst) == VT_DECIMAL, "%d: got VT %d, expected VT_DECIMAL\n", i, V_VT(&vDst)); + ok(S(U(V_DECIMAL(&vDst))).sign == ptr->ret.sign, "%d: got sign 0x%02x, expected 0x%02x\n", + i, S(U(V_DECIMAL(&vDst))).sign, ptr->ret.sign); + ok(V_DECIMAL(&vDst).Hi32 == ptr->ret.Hi32, "%d: got Hi32 %d, expected %d\n", + i, V_DECIMAL(&vDst).Hi32, ptr->ret.Hi32); + ok(S(U(V_DECIMAL(&vDst))).Mid32 == ptr->ret.Mid32, "%d: got Mid32 %d, expected %d\n", + i, S(U(V_DECIMAL(&vDst))).Mid32, ptr->ret.Mid32); + ok(S(U(V_DECIMAL(&vDst))).Lo32 == ptr->ret.Lo32, "%d: got Lo32 %d, expected %d\n", + i, S(U(V_DECIMAL(&vDst))).Lo32, ptr->ret.Lo32); + } + } + /* VT_CY */ V_VT(&v) = VT_CY; pcy->int64 = 10000; hres = pVarRound(&v,0,&vDst);

1 0