June 2008 - Wine-Commits - list.winehq.org

Vladimir Pankratov : winhlp32: Update Russian translation.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 2025d145038e82767eee6a77473c0da34f014b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2025d145038e82767eee6a774… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sat Jun 28 00:08:08 2008 +0500 winhlp32: Update Russian translation. --- programs/winhlp32/Ru.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index 0d32728..53f2d17 100644 --- a/programs/winhlp32/Ru.rc +++ b/programs/winhlp32/Ru.rc @@ -38,21 +38,21 @@ MAIN_MENU MENU LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT POPUP "&��" { MENUITEM "&��...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "&��" { + POPUP "�� " BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "�� ", MNID_OPTS_HELP_DEFAULT + MENUITEM "��", MNID_OPTS_HELP_VISIBLE + MENUITEM "�� ", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "��", MNID_OPTS_HISTORY + POPUP "��" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "��", MNID_OPTS_FONTS_SMALL + MENUITEM "��", MNID_OPTS_FONTS_NORMAL + MENUITEM "��", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "�� ", MNID_OPTS_SYSTEM_COLORS } POPUP "&��" { MENUITEM "�� &�� ", MNID_HELP_HELPON

1 0

Vladimir Pankratov : winecfg: Update Russian translation.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 79f4ec5cd47cba336fb5f454fc5a8fb8640c6208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f4ec5cd47cba336fb5f454f… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Sat Jun 28 00:07:44 2008 +0500 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 7b23136..1d78053 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -43,9 +43,9 @@ BEGIN */ LTEXT "This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.", IDC_STATIC,119,44,124,72 - GROUPBOX " Windows Registration Information ", IDC_STATIC, 15, 110, 230, 55 - LTEXT "Owner:", IDC_STATIC, 22, 126, 40, 20 - LTEXT "Organization:", IDC_STATIC, 22, 140, 50, 20 + GROUPBOX " �� Windows ", IDC_STATIC, 15, 110, 230, 55 + LTEXT "��:", IDC_STATIC, 22, 126, 40, 20 + LTEXT "��:", IDC_STATIC, 22, 140, 50, 20 EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP EDITTEXT IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END

1 0

Juan Lang : inetmib1: Make table searching function into a generic helper.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: cf3d35cf15801a97d5e3026f557f3c89a9ae9b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3d35cf15801a97d5e3026f5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Jun 28 08:33:01 2008 -0700 inetmib1: Make table searching function into a generic helper. --- dlls/inetmib1/main.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 20fc0b9..2dba6cf 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -352,18 +352,18 @@ static UINT findValueInTable(AsnObjectIdentifier *oid, } /* Given an OID and a base OID that it must begin with, finds the item and - * element of the table whose IP address matches the instance from the OID. - * E.g., given an OID foo.1.2.3.4.5 and a base OID foo, returns item 1 and the - * index of the entry in the table whose IP address is 2.3.4.5. + * element of the table whose value matches the instance from the OID. + * The OID is converted to a key with the function makeKey, and compared + * against entries in the table with the function compare. * If bPduType is not SNMP_PDU_GETNEXT and either the item or instance is * missing, returns SNMP_ERRORSTATUS_NOSUCHNAME. * If bPduType is SNMP_PDU_GETNEXT, returns the successor to the item and * instance, or item 1, instance 1 if either is missing. */ -static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, - AsnObjectIdentifier *base, BYTE bPduType, struct GenericTable *table, - size_t tableEntrySize, oidToKeyFunc makeKey, compareFunc compare, - UINT *item, UINT *instance) +static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, + AsnObjectIdentifier *base, UINT instanceLen, BYTE bPduType, + struct GenericTable *table, size_t tableEntrySize, oidToKeyFunc makeKey, + compareFunc compare, UINT *item, UINT *instance) { AsnInteger32 ret = SNMP_ERRORSTATUS_NOERROR; @@ -380,7 +380,7 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, *instance = 1; } else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength < base->idLength + 5) + oid->idLength < base->idLength + instanceLen + 1) { /* Either the table or an item is specified, but the instance is * not. @@ -396,7 +396,7 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, *item = 1; } else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength == base->idLength + 5) + oid->idLength == base->idLength + instanceLen + 1) { *item = oid->ids[base->idLength]; if (!*item) @@ -406,8 +406,8 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, } else { - AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 - }; + AsnObjectIdentifier ipOid = { instanceLen, + oid->ids + base->idLength + 1 }; *instance = findValueInTable(&ipOid, table, tableEntrySize, makeKey, compare) + 1; @@ -420,15 +420,15 @@ static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, break; default: if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength == base->idLength + 5) + oid->idLength == base->idLength + instanceLen + 1) { *item = oid->ids[base->idLength]; if (!*item) ret = SNMP_ERRORSTATUS_NOSUCHNAME; else { - AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 - }; + AsnObjectIdentifier ipOid = { instanceLen, + oid->ids + base->idLength + 1 }; *instance = findValueInTable(&ipOid, table, tableEntrySize, makeKey, compare); @@ -680,8 +680,8 @@ static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, { case SNMP_PDU_GET: case SNMP_PDU_GETNEXT: - *pErrorStatus = getItemAndIpAddressInstanceFromOid(&pVarBind->name, - &myOid, bPduType, (struct GenericTable *)ipAddrTable, + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, + &myOid, 4, bPduType, (struct GenericTable *)ipAddrTable, sizeof(MIB_IPADDRROW), oidToIpAddrRow, compareIpAddrRow, &item, &tableIndex); if (!*pErrorStatus) @@ -763,8 +763,8 @@ static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, { case SNMP_PDU_GET: case SNMP_PDU_GETNEXT: - *pErrorStatus = getItemAndIpAddressInstanceFromOid(&pVarBind->name, - &myOid, bPduType, (struct GenericTable *)ipRouteTable, + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, + &myOid, 4, bPduType, (struct GenericTable *)ipRouteTable, sizeof(MIB_IPFORWARDROW), oidToIpForwardRow, compareIpForwardRow, &item, &tableIndex); if (!*pErrorStatus)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::clearInterval implementation.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 876153976be7ff4d128c0e5ecc70715f21ac2e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=876153976be7ff4d128c0e5ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 14:14:08 2008 -0500 mshtml: Added IHTMLWindow2::clearInterval implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 766dafa..e8ed7d9 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -592,8 +592,10 @@ static HRESULT WINAPI HTMLWindow2_setInterval(IHTMLWindow2 *iface, BSTR expressi static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, long timerID) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%ld)\n", This, timerID); - return E_NOTIMPL; + + TRACE("(%p)->(%ld)\n", This, timerID); + + return clear_task_timer(This->doc, TRUE, timerID); } static HRESULT WINAPI HTMLWindow2_put_offscreenBuffering(IHTMLWindow2 *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::clearTimeout implementation.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 8d3aa6799c16d568b7b660bd1b95fc358bec56b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3aa6799c16d568b7b660bd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 14:14:40 2008 -0500 mshtml: Added IHTMLWindow2::clearTimeout implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/task.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 839858b..766dafa 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -197,8 +197,10 @@ static HRESULT WINAPI HTMLWindow2_setTimeout(IHTMLWindow2 *iface, BSTR expressio static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, long timerID) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%ld)\n", This, timerID); - return E_NOTIMPL; + + TRACE("(%p)->(%ld)\n", This, timerID); + + return clear_task_timer(This->doc, FALSE, timerID); } static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e6fd13d..f815b26 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -624,6 +624,7 @@ HWND get_thread_hwnd(void); void push_task(task_t*); void remove_doc_tasks(const HTMLDocument*); DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*); +HRESULT clear_task_timer(HTMLDocument*,BOOL,DWORD); HRESULT get_typeinfo(tid_t,ITypeInfo**); void release_typelib(void); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 329c6ac..d863fba 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -169,6 +169,25 @@ DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *di return timer->id; } +HRESULT clear_task_timer(HTMLDocument *doc, BOOL interval, DWORD id) +{ + thread_data_t *thread_data = get_thread_data(FALSE); + task_timer_t *iter; + + if(!thread_data) + return S_OK; + + LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { + if(iter->id == id && iter->doc == doc && (iter->interval == 0) == !interval) { + release_task_timer(thread_data->thread_hwnd, iter); + return S_OK; + } + } + + WARN("timet not found\n"); + return S_OK; +} + static void set_downloading(HTMLDocument *doc) { IOleCommandTarget *olecmd;

1 0

Jacek Caban : mshtml: Added IHTMLWindow3::setInterval implementation.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 74f29f10878ef423c60121c5a383074880d844f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f29f10878ef423c60121c5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 14:11:38 2008 -0500 mshtml: Added IHTMLWindow3::setInterval implementation. --- dlls/mshtml/htmlwindow.c | 13 ++++++---- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/task.c | 50 ++++++++++++++++++++++++++--------------- 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c76c132..839858b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -846,7 +846,8 @@ static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, I return E_NOTIMPL; } -static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, long msec, VARIANT *language, long *timer_id) +static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, long msec, VARIANT *language, + BOOL interval, long *timer_id) { IDispatch *disp = NULL; @@ -868,7 +869,7 @@ static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, long msec, VARI if(!disp) return E_FAIL; - *timer_id = set_task_timer(This->doc, msec, disp); + *timer_id = set_task_timer(This->doc, msec, interval, disp); IDispatch_Release(disp); return S_OK; @@ -881,15 +882,17 @@ static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expre TRACE("(%p)->(%p(%d) %ld %p %p)\n", This, expression, V_VT(expression), msec, language, timerID); - return window_set_timer(This, expression, msec, language, timerID); + return window_set_timer(This, expression, msec, language, FALSE, timerID); } static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expression, long msec, VARIANT *language, long *timerID) { HTMLWindow *This = HTMLWINDOW3_THIS(iface); - FIXME("(%p)->(%p %ld %p %p)\n", This, expression, msec, language, timerID); - return E_NOTIMPL; + + TRACE("(%p)->(%p %ld %p %p)\n", This, expression, msec, language, timerID); + + return window_set_timer(This, expression, msec, language, TRUE, timerID); } static HRESULT WINAPI HTMLWindow3_print(IHTMLWindow3 *iface) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7b2bf9e..e6fd13d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -623,7 +623,7 @@ thread_data_t *get_thread_data(BOOL); HWND get_thread_hwnd(void); void push_task(task_t*); void remove_doc_tasks(const HTMLDocument*); -DWORD set_task_timer(HTMLDocument*,DWORD,IDispatch*); +DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*); HRESULT get_typeinfo(tid_t,ITypeInfo**); void release_typelib(void); diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index f9969c5..329c6ac 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -43,6 +43,7 @@ typedef struct { HTMLDocument *doc; DWORD id; DWORD time; + DWORD interval; IDispatch *disp; struct list entry; @@ -123,7 +124,29 @@ void remove_doc_tasks(const HTMLDocument *doc) } } -DWORD set_task_timer(HTMLDocument *doc, DWORD msec, IDispatch *disp) +static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) +{ + task_timer_t *iter; + + if(list_empty(&thread_data->timer_list) + || LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry)->time > timer->time) { + + list_add_head(&thread_data->timer_list, &timer->entry); + return TRUE; + } + + LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { + if(iter->time > timer->time) { + list_add_tail(&iter->entry, &timer->entry); + return FALSE; + } + } + + list_add_tail(&thread_data->timer_list, &timer->entry); + return FALSE; +} + +DWORD set_task_timer(HTMLDocument *doc, DWORD msec, BOOL interval, IDispatch *disp) { thread_data_t *thread_data = get_thread_data(TRUE); task_timer_t *timer; @@ -135,27 +158,13 @@ DWORD set_task_timer(HTMLDocument *doc, DWORD msec, IDispatch *disp) timer->id = id_cnt++; timer->doc = doc; timer->time = tc + msec; + timer->interval = interval ? msec : 0; IDispatch_AddRef(disp); timer->disp = disp; - if(list_empty(&thread_data->timer_list) - || LIST_ENTRY(list_head(&thread_data->timer_list), task_timer_t, entry)->time > timer->time) { - - list_add_head(&thread_data->timer_list, &timer->entry); + if(queue_timer(thread_data, timer)) SetTimer(thread_data->thread_hwnd, TIMER_ID, msec, NULL); - }else { - task_timer_t *iter; - - LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { - if(iter->time > timer->time) { - list_add_tail(&iter->entry, &timer->entry); - return timer->id; - } - } - - list_add_tail(&thread_data->timer_list, &timer->entry); - } return timer->id; } @@ -354,7 +363,12 @@ static LRESULT process_timer(void) call_disp_func(timer->doc, timer->disp); - release_task_timer(thread_data->thread_hwnd, timer); + if(timer->interval) { + timer->time += timer->interval; + queue_timer(thread_data, timer); + }else { + release_task_timer(thread_data->thread_hwnd, timer); + } } KillTimer(thread_data->thread_hwnd, TIMER_ID);

1 0

Jacek Caban : mshtml: Forward IHTMLWindow2::setInterval to IHTMLWindow3.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 0d56f1058fbcf671d6f5fde23235f4c4cbe08b99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d56f1058fbcf671d6f5fde23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 14:10:23 2008 -0500 mshtml: Forward IHTMLWindow2::setInterval to IHTMLWindow3. --- dlls/mshtml/htmlwindow.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 32e0689..c76c132 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -578,8 +578,13 @@ static HRESULT WINAPI HTMLWindow2_setInterval(IHTMLWindow2 *iface, BSTR expressi long msec, VARIANT *language, long *timerID) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s %ld %p %p)\n", This, debugstr_w(expression), msec, language, timerID); - return E_NOTIMPL; + VARIANT expr; + + TRACE("(%p)->(%s %ld %p %p)\n", This, debugstr_w(expression), msec, language, timerID); + + V_VT(&expr) = VT_BSTR; + V_BSTR(&expr) = expression; + return IHTMLWindow3_setInterval(HTMLWINDOW3(This), &expr, msec, language, timerID); } static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, long timerID)

1 0

Jacek Caban : mshtml: Added VT_BSTR support to IHTMLWindow3::setTimeout.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 44223acceb78c1c6cbe056d67d8182e1dbf9254e URL: http://source.winehq.org/git/wine.git/?a=commit;h=44223acceb78c1c6cbe056d67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 14:10:04 2008 -0500 mshtml: Added VT_BSTR support to IHTMLWindow3::setTimeout. Resend without test depending on JScript. --- dlls/mshtml/htmlwindow.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6e1d092..32e0689 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -841,25 +841,44 @@ static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, I return E_NOTIMPL; } -static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expression, long msec, - VARIANT *language, long *timerID) +static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, long msec, VARIANT *language, long *timer_id) { - HTMLWindow *This = HTMLWINDOW3_THIS(iface); - - TRACE("(%p)->(%p(%d) %ld %p %p)\n", This, expression, V_VT(expression), msec, language, timerID); + IDispatch *disp = NULL; - switch(V_VT(expression)) { + switch(V_VT(expr)) { case VT_DISPATCH: - *timerID = set_task_timer(This->doc, msec, V_DISPATCH(expression)); + disp = V_DISPATCH(expr); + IDispatch_AddRef(disp); + break; + + case VT_BSTR: + disp = script_parse_event(This->doc, V_BSTR(expr)); break; default: - FIXME("unimplemented vt=%d\n", V_VT(expression)); + FIXME("unimplemented vt=%d\n", V_VT(expr)); + return E_NOTIMPL; } + if(!disp) + return E_FAIL; + + *timer_id = set_task_timer(This->doc, msec, disp); + IDispatch_Release(disp); + return S_OK; } +static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expression, long msec, + VARIANT *language, long *timerID) +{ + HTMLWindow *This = HTMLWINDOW3_THIS(iface); + + TRACE("(%p)->(%p(%d) %ld %p %p)\n", This, expression, V_VT(expression), msec, language, timerID); + + return window_set_timer(This, expression, msec, language, timerID); +} + static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expression, long msec, VARIANT *language, long *timerID) {

1 0

Jacek Caban : oleaut32: Added test showing need to QueryInterface on dual interface in ITypeInfo: :Invoke.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 6971db7ee32451e2add828ad8f35d0d148013ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6971db7ee32451e2add828ad8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 14:09:29 2008 -0500 oleaut32: Added test showing need to QueryInterface on dual interface in ITypeInfo::Invoke. --- dlls/oleaut32/tests/tmarshal.c | 218 +++++++++++++++++++++++++++++--- dlls/oleaut32/tests/tmarshal.idl | 22 ++++ dlls/oleaut32/tests/tmarshal_dispids.h | 1 + 3 files changed, 222 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 3812b72..7ddbe75 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -18,6 +18,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <windows.h> #include <ocidl.h> @@ -210,6 +211,72 @@ static void end_host_object(DWORD tid, HANDLE thread) CloseHandle(thread); } +static ItestDual TestDual, TestDualDisp; + +static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, void **ppvObject) +{ + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { + *ppvObject = &TestDualDisp; + return S_OK; + }else if(IsEqualGUID(riid, &IID_ItestDual)) { + *ppvObject = &TestDual; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TestDual_AddRef(ItestDual *iface) +{ + return 2; +} + +static ULONG WINAPI TestDual_Release(ItestDual *iface) +{ + return 1; +} + +static HRESULT WINAPI TestDual_GetTypeInfoCount(ItestDual *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestDual_GetTypeInfo(ItestDual *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestDual_GetIDsOfNames(ItestDual *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestDual_Invoke(ItestDual *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ItestDualVtbl TestDualVtbl = { + TestDual_QueryInterface, + TestDual_AddRef, + TestDual_Release, + TestDual_GetTypeInfoCount, + TestDual_GetTypeInfo, + TestDual_GetIDsOfNames, + TestDual_Invoke +}; + +static ItestDual TestDual = { &TestDualVtbl }; +static ItestDual TestDualDisp = { &TestDualVtbl }; + typedef struct Widget { const IWidgetVtbl *lpVtbl; @@ -553,6 +620,77 @@ static const struct IWidgetVtbl Widget_VTable = Widget_CloneInterface }; +static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) +{ + if (IsEqualIID(riid, &IID_IStaticWidget) || IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) + { + IStaticWidget_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI StaticWidget_AddRef(IStaticWidget *iface) +{ + return 2; +} + +static ULONG WINAPI StaticWidget_Release(IStaticWidget *iface) +{ + return 1; +} + +static HRESULT WINAPI StaticWidget_GetTypeInfoCount(IStaticWidget *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_GetTypeInfo(IStaticWidget *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_GetIDsOfNames(IStaticWidget *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_Invoke(IStaticWidget *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI StaticWidget_TestDual(IStaticWidget *iface, ItestDual *p) +{ + trace("TestDual()\n"); + todo_wine + ok(p == &TestDual, "wrong ItestDual\n"); + return S_OK; +} + +static const IStaticWidgetVtbl StaticWidgetVtbl = { + StaticWidget_QueryInterface, + StaticWidget_AddRef, + StaticWidget_Release, + StaticWidget_GetTypeInfoCount, + StaticWidget_GetTypeInfo, + StaticWidget_GetIDsOfNames, + StaticWidget_Invoke, + StaticWidget_TestDual +}; + +static IStaticWidget StaticWidget = { &StaticWidgetVtbl }; typedef struct KindaEnum { @@ -577,31 +715,44 @@ static HRESULT register_current_module_typelib(void) return hr; } -static IWidget *Widget_Create(void) +static ITypeInfo *get_type_info(REFIID riid) { - Widget *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - HRESULT hr; + ITypeInfo *pTypeInfo; ITypeLib *pTypeLib; + HRESULT hr; + + hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); + ok_ole_success(hr, LoadRegTypeLib); + if (FAILED(hr)) + return NULL; + + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, riid, &pTypeInfo); + ITypeLib_Release(pTypeLib); + ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + if (FAILED(hr)) + return NULL; + return pTypeInfo; +} + +static IWidget *Widget_Create(void) +{ + Widget *This; + ITypeInfo *pTypeInfo; + HRESULT hr = E_FAIL; + + pTypeInfo = get_type_info(&IID_IWidget); + if(!pTypeInfo) + return NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); This->lpVtbl = &Widget_VTable; This->refs = 1; + This->pDispatchUnknown = NULL; - hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); - ok_ole_success(hr, LoadRegTypeLib); - if (SUCCEEDED(hr)) - { - ITypeInfo *pTypeInfo; - hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IWidget, &pTypeInfo); - ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); - if (SUCCEEDED(hr)) - { - This->pDispatchUnknown = NULL; - hr = CreateStdDispatch((IUnknown *)&This->lpVtbl, This, pTypeInfo, &This->pDispatchUnknown); - ok_ole_success(hr, CreateStdDispatch); - ITypeInfo_Release(pTypeInfo); - } - ITypeLib_Release(pTypeLib); - } + hr = CreateStdDispatch((IUnknown *)&This->lpVtbl, This, pTypeInfo, &This->pDispatchUnknown); + ok_ole_success(hr, CreateStdDispatch); + ITypeInfo_Release(pTypeInfo); if (SUCCEEDED(hr)) return (IWidget *)&This->lpVtbl; @@ -1167,6 +1318,34 @@ static void test_DispCallFunc(void) IWidget_Release(pWidget); } +static void test_StaticWidget(void) +{ + ITypeInfo *type_info; + DISPPARAMS dispparams; + VARIANTARG vararg[4]; + EXCEPINFO excepinfo; + VARIANT varresult; + HRESULT hr; + + type_info = get_type_info(&IID_IStaticWidget); + + /* call TestDual */ + dispparams.cNamedArgs = 0; + dispparams.cArgs = 1; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + V_VT(vararg) = VT_DISPATCH; + V_DISPATCH(vararg) = (IDispatch*)&TestDualDisp; + VariantInit(&varresult); + hr = ITypeInfo_Invoke(type_info, &StaticWidget, DISPID_TM_TESTDUAL, DISPATCH_METHOD, + &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "vt %x\n", V_VT(&varresult)); + VariantClear(&varresult); + + ITypeInfo_Release(type_info); +} + START_TEST(tmarshal) { HRESULT hr; @@ -1178,6 +1357,7 @@ START_TEST(tmarshal) test_typelibmarshal(); test_DispCallFunc(); + test_StaticWidget(); hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, 1); ok_ole_success(hr, UnRegisterTypeLib); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 9b94843..2367f28 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -48,6 +48,17 @@ library TestTypelib [ odl, + oleautomation, + dual, + uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c7967) + ] + interface ItestDual : IDispatch + { + HRESULT test(); + } + + [ + odl, uuid(a1f8cae3-c947-4c5f-b57d-c87b9b5f3586), oleautomation, dual @@ -105,7 +116,18 @@ library TestTypelib [propget, id(DISPID_TM_CLONEINTERFACE)] HRESULT CloneInterface([out, retval] ISomethingFromDispatch **ppVal); + } + [ + odl, + uuid(a1f8cae3-c947-3c5f-a57c-c88b9b6f3586), + oleautomation, + dual + ] + interface IStaticWidget : IDispatch + { + [id(DISPID_TM_TESTDUAL)] + HRESULT TestDual([in] ItestDual *p); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 4bf47cd..803b94b 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -32,5 +32,6 @@ #define DISPID_TM_VARARG 13 #define DISPID_TM_ERROR 14 #define DISPID_TM_CLONEINTERFACE 15 +#define DISPID_TM_TESTDUAL 16 #define DISPID_NOA_BSTRRET 1

1 0

Jeremy White : configure: On Solaris, libpng requires libm.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 082e39f9514df57fa95e585a52d19a6eb2d54c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=082e39f9514df57fa95e585a5… Author: Jeremy White <jwhite(a)winehq.org> Date: Fri Jun 27 13:28:45 2008 -0500 configure: On Solaris, libpng requires libm. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 76111e1..e00a2dc 100755 --- a/configure +++ b/configure @@ -16044,7 +16044,7 @@ if test "${ac_cv_lib_soname_png+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lpng $LIBS" +LIBS="-lpng -lm $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF diff --git a/configure.ac b/configure.ac index 84ffddd..d71d92d 100644 --- a/configure.ac +++ b/configure.ac @@ -1201,7 +1201,7 @@ WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"], dnl **** Check for libpng **** if test "$ac_cv_header_png_h" = "yes" then - WINE_CHECK_SONAME(png,png_create_read_struct,,,,[[libpng[[0-9]]*]]) + WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm,[[libpng[[0-9]]*]]) fi WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"], [libpng development files not found, PNG won't be supported.])

1 0