November 2011 - Wine-commits

Alexandre Julliard : msacm32: Convert dialogs to po files.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 855d32d38a641230afc384d9bc0340861f0bcf6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=855d32d38a641230afc384d9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 20:50:11 2011 +0100 msacm32: Convert dialogs to po files. --- configure | 2 +- configure.ac | 2 +- dlls/msacm32/Makefile.in | 27 +-------- dlls/msacm32/{msacm_En.rc => msacm32.rc} | 22 ++++---- dlls/msacm32/msacm_Cs.rc | 57 ------------------- dlls/msacm32/msacm_Da.rc | 53 ------------------ dlls/msacm32/msacm_De.rc | 55 ------------------ dlls/msacm32/msacm_Es.rc | 53 ------------------ dlls/msacm32/msacm_Fr.rc | 58 ------------------- dlls/msacm32/msacm_He.rc | 57 ------------------- dlls/msacm32/msacm_Hu.rc | 53 ------------------ dlls/msacm32/msacm_It.rc | 57 ------------------- dlls/msacm32/msacm_Ja.rc | 56 ------------------- dlls/msacm32/msacm_Ko.rc | 55 ------------------ dlls/msacm32/msacm_Lt.rc | 56 ------------------- dlls/msacm32/msacm_Nl.rc | 53 ------------------ dlls/msacm32/msacm_No.rc | 53 ------------------ dlls/msacm32/msacm_Pl.rc | 54 ------------------ dlls/msacm32/msacm_Pt.rc | 89 ------------------------------ dlls/msacm32/msacm_Ro.rc | 54 ------------------ dlls/msacm32/msacm_Ru.rc | 56 ------------------- dlls/msacm32/msacm_Si.rc | 55 ------------------ dlls/msacm32/msacm_Sr.rc | 88 ----------------------------- dlls/msacm32/msacm_Sv.rc | 53 ------------------ dlls/msacm32/msacm_Tr.rc | 53 ------------------ dlls/msacm32/msacm_Uk.rc | 56 ------------------- dlls/msacm32/msacm_Zh.rc | 88 ----------------------------- po/ar.po | 63 ++++++++++++++------- po/bg.po | 67 +++++++++++++++-------- po/ca.po | 67 +++++++++++++++-------- po/cs.po | 62 +++++++++++++-------- po/da.po | 61 +++++++++++++------- po/de.po | 61 +++++++++++++------- po/el.po | 62 +++++++++++++------- po/en.po | 61 +++++++++++++------- po/en_US.po | 61 +++++++++++++------- po/eo.po | 67 +++++++++++++++-------- po/es.po | 61 +++++++++++++------- po/fa.po | 63 ++++++++++++++------- po/fi.po | 67 +++++++++++++++-------- po/fr.po | 61 +++++++++++++------- po/he.po | 61 +++++++++++++------- po/hi.po | 61 +++++++++++++------- po/hu.po | 62 +++++++++++++-------- po/it.po | 61 +++++++++++++------- po/ja.po | 61 +++++++++++++------- po/ko.po | 61 +++++++++++++------- po/lt.po | 61 +++++++++++++------- po/ml.po | 61 +++++++++++++------- po/nb_NO.po | 61 +++++++++++++------- po/nl.po | 61 +++++++++++++------- po/or.po | 61 +++++++++++++------- po/pa.po | 61 +++++++++++++------- po/pl.po | 61 +++++++++++++------- po/pt_BR.po | 61 +++++++++++++------- po/pt_PT.po | 61 +++++++++++++------- po/rm.po | 62 +++++++++++++------- po/ro.po | 61 +++++++++++++------- po/ru.po | 61 +++++++++++++------- po/sk.po | 63 ++++++++++++++------- po/sl.po | 61 +++++++++++++------- po/sr_RS(a)cyrillic.po | 69 +++++++++++++---------- po/sr_RS(a)latin.po | 66 +++++++++++++--------- po/sv.po | 61 +++++++++++++------- po/te.po | 61 +++++++++++++------- po/th.po | 63 ++++++++++++++------- po/tr.po | 61 +++++++++++++------- po/uk.po | 61 +++++++++++++------- po/wa.po | 62 +++++++++++++------- po/wine.pot | 61 +++++++++++++------- po/zh_CN.po | 62 +++++++++++++-------- po/zh_TW.po | 62 +++++++++++++-------- 72 files changed, 1802 insertions(+), 2410 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=855d32d38a641230afc38…

1 0

Alexandre Julliard : avifil32: Convert dialogs to po files.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 26ac8867528f51e52cf6ca222d972650f4e47edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ac8867528f51e52cf6ca222… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 20:33:01 2011 +0100 avifil32: Convert dialogs to po files. --- dlls/avifil32/Makefile.in | 28 +------------- dlls/avifil32/avifil32.rc | 18 +++++++++ dlls/avifil32/avifile_Cs.rc | 45 ---------------------- dlls/avifil32/avifile_Da.rc | 42 --------------------- dlls/avifil32/avifile_De.rc | 41 -------------------- dlls/avifil32/avifile_En.rc | 39 ------------------- dlls/avifil32/avifile_Es.rc | 39 ------------------- dlls/avifil32/avifile_Fr.rc | 46 ----------------------- dlls/avifil32/avifile_He.rc | 43 --------------------- dlls/avifil32/avifile_Hu.rc | 39 ------------------- dlls/avifil32/avifile_It.rc | 40 -------------------- dlls/avifil32/avifile_Ja.rc | 42 --------------------- dlls/avifil32/avifile_Ko.rc | 42 --------------------- dlls/avifil32/avifile_Lt.rc | 42 --------------------- dlls/avifil32/avifile_Nl.rc | 41 -------------------- dlls/avifil32/avifile_No.rc | 39 ------------------- dlls/avifil32/avifile_Pl.rc | 40 -------------------- dlls/avifil32/avifile_Pt.rc | 63 ------------------------------- dlls/avifil32/avifile_Ro.rc | 44 ---------------------- dlls/avifil32/avifile_Ru.rc | 44 ---------------------- dlls/avifil32/avifile_Si.rc | 41 -------------------- dlls/avifil32/avifile_Sr.rc | 62 ------------------------------- dlls/avifil32/avifile_Sv.rc | 39 ------------------- dlls/avifil32/avifile_Tr.rc | 39 ------------------- dlls/avifil32/avifile_Uk.rc | 42 --------------------- dlls/avifil32/avifile_Zh.rc | 64 -------------------------------- po/ar.po | 76 ++++++++++++++++++++++++------------- po/bg.po | 76 ++++++++++++++++++++++++------------- po/ca.po | 77 +++++++++++++++++++++++++------------- po/cs.po | 76 ++++++++++++++++++++++++-------------- po/da.po | 75 ++++++++++++++++++++++++------------- po/de.po | 75 ++++++++++++++++++++++++------------- po/el.po | 78 +++++++++++++++++++++++++-------------- po/en.po | 75 ++++++++++++++++++++++++------------- po/en_US.po | 75 ++++++++++++++++++++++++------------- po/eo.po | 76 ++++++++++++++++++++++++------------- po/es.po | 76 ++++++++++++++++++++++++-------------- po/fa.po | 76 ++++++++++++++++++++++++------------- po/fi.po | 86 +++++++++++++++++++++++++++---------------- po/fr.po | 75 ++++++++++++++++++++++++------------- po/he.po | 75 ++++++++++++++++++++++++------------- po/hi.po | 76 ++++++++++++++++++++++++------------- po/hu.po | 75 ++++++++++++++++++++++++------------- po/it.po | 75 ++++++++++++++++++++++++------------- po/ja.po | 75 ++++++++++++++++++++++++------------- po/ko.po | 75 ++++++++++++++++++++++++------------- po/lt.po | 75 ++++++++++++++++++++++++------------- po/ml.po | 76 ++++++++++++++++++++++++------------- po/nb_NO.po | 75 ++++++++++++++++++++++++------------- po/nl.po | 75 ++++++++++++++++++++++++------------- po/or.po | 76 ++++++++++++++++++++++++------------- po/pa.po | 76 ++++++++++++++++++++++++------------- po/pl.po | 75 ++++++++++++++++++++++++------------- po/pt_BR.po | 75 ++++++++++++++++++++++++------------- po/pt_PT.po | 75 ++++++++++++++++++++++++------------- po/rm.po | 78 +++++++++++++++++++++++++-------------- po/ro.po | 75 ++++++++++++++++++++++++------------- po/ru.po | 75 ++++++++++++++++++++++++------------- po/sk.po | 76 ++++++++++++++++++++++++------------- po/sl.po | 75 ++++++++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 76 ++++++++++++++++++++++++-------------- po/sr_RS(a)latin.po | 76 ++++++++++++++++++++++++-------------- po/sv.po | 75 ++++++++++++++++++++++++------------- po/te.po | 76 ++++++++++++++++++++++++------------- po/th.po | 76 ++++++++++++++++++++++++------------- po/tr.po | 75 ++++++++++++++++++++++++------------- po/uk.po | 75 ++++++++++++++++++++++++------------- po/wa.po | 78 +++++++++++++++++++++++++-------------- po/wine.pot | 75 ++++++++++++++++++++++++------------- po/zh_CN.po | 75 ++++++++++++++++++++++++------------- po/zh_TW.po | 75 ++++++++++++++++++++++++------------- 71 files changed, 2204 insertions(+), 2312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26ac8867528f51e52cf6c…

1 0

Alexandre Julliard : credui: Convert dialogs to po files.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: c4a907f9a85e903da8c027961766c5b5fa4371c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a907f9a85e903da8c027961… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 20:13:11 2011 +0100 credui: Convert dialogs to po files. --- dlls/credui/Makefile.in | 26 +----------------- dlls/credui/credui.rc | 18 ++++++++++++ dlls/credui/credui_Da.rc | 45 ------------------------------- dlls/credui/credui_De.rc | 44 ------------------------------ dlls/credui/credui_En.rc | 42 ----------------------------- dlls/credui/credui_Es.rc | 45 ------------------------------- dlls/credui/credui_Fr.rc | 44 ------------------------------ dlls/credui/credui_He.rc | 46 -------------------------------- dlls/credui/credui_Hu.rc | 45 ------------------------------- dlls/credui/credui_It.rc | 45 ------------------------------- dlls/credui/credui_Ja.rc | 46 -------------------------------- dlls/credui/credui_Ko.rc | 45 ------------------------------- dlls/credui/credui_Lt.rc | 45 ------------------------------- dlls/credui/credui_Nl.rc | 42 ----------------------------- dlls/credui/credui_No.rc | 42 ----------------------------- dlls/credui/credui_Pl.rc | 43 ------------------------------ dlls/credui/credui_Pt.rc | 66 ---------------------------------------------- dlls/credui/credui_Ro.rc | 43 ------------------------------ dlls/credui/credui_Ru.rc | 45 ------------------------------- dlls/credui/credui_Si.rc | 44 ------------------------------ dlls/credui/credui_Sr.rc | 66 ---------------------------------------------- dlls/credui/credui_Sv.rc | 42 ----------------------------- dlls/credui/credui_Uk.rc | 46 -------------------------------- dlls/credui/credui_Zh.rc | 66 ---------------------------------------------- po/ar.po | 51 ++++++++++++++++++++++------------- po/bg.po | 51 ++++++++++++++++++++++------------- po/ca.po | 52 +++++++++++++++++++++++------------- po/cs.po | 51 ++++++++++++++++++++++------------- po/da.po | 50 +++++++++++++++++++++------------- po/de.po | 50 +++++++++++++++++++++------------- po/el.po | 50 +++++++++++++++++++++------------- po/en.po | 50 +++++++++++++++++++++------------- po/en_US.po | 50 +++++++++++++++++++++------------- po/eo.po | 51 ++++++++++++++++++++++------------- po/es.po | 50 +++++++++++++++++++++------------- po/fa.po | 51 ++++++++++++++++++++++------------- po/fi.po | 51 ++++++++++++++++++++++------------- po/fr.po | 50 +++++++++++++++++++++------------- po/he.po | 50 +++++++++++++++++++++------------- po/hi.po | 50 +++++++++++++++++++++------------- po/hu.po | 50 +++++++++++++++++++++------------- po/it.po | 50 +++++++++++++++++++++------------- po/ja.po | 50 +++++++++++++++++++++------------- po/ko.po | 50 +++++++++++++++++++++------------- po/lt.po | 50 +++++++++++++++++++++------------- po/ml.po | 50 +++++++++++++++++++++------------- po/nb_NO.po | 50 +++++++++++++++++++++------------- po/nl.po | 50 +++++++++++++++++++++------------- po/or.po | 50 +++++++++++++++++++++------------- po/pa.po | 50 +++++++++++++++++++++------------- po/pl.po | 50 +++++++++++++++++++++------------- po/pt_BR.po | 50 +++++++++++++++++++++------------- po/pt_PT.po | 50 +++++++++++++++++++++------------- po/rm.po | 51 ++++++++++++++++++++++------------- po/ro.po | 50 +++++++++++++++++++++------------- po/ru.po | 50 +++++++++++++++++++++------------- po/sk.po | 51 ++++++++++++++++++++++------------- po/sl.po | 50 +++++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 50 +++++++++++++++++++++------------- po/sr_RS(a)latin.po | 50 +++++++++++++++++++++------------- po/sv.po | 50 +++++++++++++++++++++------------- po/te.po | 50 +++++++++++++++++++++------------- po/th.po | 51 ++++++++++++++++++++++------------- po/tr.po | 51 ++++++++++++++++++++++------------- po/uk.po | 50 +++++++++++++++++++++------------- po/wa.po | 51 ++++++++++++++++++++++------------- po/wine.pot | 50 +++++++++++++++++++++------------- po/zh_CN.po | 50 +++++++++++++++++++++------------- po/zh_TW.po | 50 +++++++++++++++++++++------------- 69 files changed, 1427 insertions(+), 1917 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4a907f9a85e903da8c02…

1 0

Alexandre Julliard : mpr: Convert dialogs to po files.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: d2a876e53502013c963b8b6f3e4f287e3bab3b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a876e53502013c963b8b6f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 24 20:22:45 2011 +0100 mpr: Convert dialogs to po files. --- dlls/mpr/Makefile.in | 30 +--------------------- dlls/mpr/mpr.rc | 20 ++++++++++++++ dlls/mpr/mpr_Bg.rc | 43 ------------------------------- dlls/mpr/mpr_Cs.rc | 46 --------------------------------- dlls/mpr/mpr_Da.rc | 43 ------------------------------- dlls/mpr/mpr_De.rc | 45 --------------------------------- dlls/mpr/mpr_En.rc | 43 ------------------------------- dlls/mpr/mpr_Eo.rc | 43 ------------------------------- dlls/mpr/mpr_Es.rc | 43 ------------------------------- dlls/mpr/mpr_Fr.rc | 47 ---------------------------------- dlls/mpr/mpr_He.rc | 47 ---------------------------------- dlls/mpr/mpr_Hu.rc | 43 ------------------------------- dlls/mpr/mpr_It.rc | 47 ---------------------------------- dlls/mpr/mpr_Ja.rc | 46 --------------------------------- dlls/mpr/mpr_Ko.rc | 46 --------------------------------- dlls/mpr/mpr_Lt.rc | 46 --------------------------------- dlls/mpr/mpr_Nl.rc | 44 -------------------------------- dlls/mpr/mpr_No.rc | 43 ------------------------------- dlls/mpr/mpr_Pl.rc | 44 -------------------------------- dlls/mpr/mpr_Pt.rc | 68 -------------------------------------------------- dlls/mpr/mpr_Ro.rc | 43 ------------------------------- dlls/mpr/mpr_Ru.rc | 46 --------------------------------- dlls/mpr/mpr_Si.rc | 45 --------------------------------- dlls/mpr/mpr_Sr.rc | 68 -------------------------------------------------- dlls/mpr/mpr_Sv.rc | 43 ------------------------------- dlls/mpr/mpr_Tr.rc | 43 ------------------------------- dlls/mpr/mpr_Uk.rc | 47 ---------------------------------- dlls/mpr/mpr_Zh.rc | 68 -------------------------------------------------- po/ar.po | 51 ++++++++++++++++++++++++++++--------- po/bg.po | 51 ++++++++++++++++++++++++++++--------- po/ca.po | 55 ++++++++++++++++++++++++++++++--------- po/cs.po | 51 ++++++++++++++++++++++++++++--------- po/da.po | 51 ++++++++++++++++++++++++++++--------- po/de.po | 51 ++++++++++++++++++++++++++++--------- po/el.po | 51 ++++++++++++++++++++++++++++--------- po/en.po | 51 ++++++++++++++++++++++++++++--------- po/en_US.po | 51 ++++++++++++++++++++++++++++--------- po/eo.po | 51 ++++++++++++++++++++++++++++--------- po/es.po | 51 ++++++++++++++++++++++++++++--------- po/fa.po | 51 ++++++++++++++++++++++++++++--------- po/fi.po | 53 +++++++++++++++++++++++++++++--------- po/fr.po | 51 ++++++++++++++++++++++++++++--------- po/he.po | 51 ++++++++++++++++++++++++++++--------- po/hi.po | 51 ++++++++++++++++++++++++++++--------- po/hu.po | 51 ++++++++++++++++++++++++++++--------- po/it.po | 51 ++++++++++++++++++++++++++++--------- po/ja.po | 51 ++++++++++++++++++++++++++++--------- po/ko.po | 51 ++++++++++++++++++++++++++++--------- po/lt.po | 51 ++++++++++++++++++++++++++++--------- po/ml.po | 51 ++++++++++++++++++++++++++++--------- po/nb_NO.po | 51 ++++++++++++++++++++++++++++--------- po/nl.po | 51 ++++++++++++++++++++++++++++--------- po/or.po | 51 ++++++++++++++++++++++++++++--------- po/pa.po | 51 ++++++++++++++++++++++++++++--------- po/pl.po | 51 ++++++++++++++++++++++++++++--------- po/pt_BR.po | 51 ++++++++++++++++++++++++++++--------- po/pt_PT.po | 51 ++++++++++++++++++++++++++++--------- po/rm.po | 51 ++++++++++++++++++++++++++++--------- po/ro.po | 51 ++++++++++++++++++++++++++++--------- po/ru.po | 51 ++++++++++++++++++++++++++++--------- po/sk.po | 51 ++++++++++++++++++++++++++++--------- po/sl.po | 51 ++++++++++++++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 51 ++++++++++++++++++++++++++++--------- po/sr_RS(a)latin.po | 51 ++++++++++++++++++++++++++++--------- po/sv.po | 51 ++++++++++++++++++++++++++++--------- po/te.po | 51 ++++++++++++++++++++++++++++--------- po/th.po | 51 ++++++++++++++++++++++++++++--------- po/tr.po | 51 ++++++++++++++++++++++++++++--------- po/uk.po | 51 ++++++++++++++++++++++++++++--------- po/wa.po | 51 ++++++++++++++++++++++++++++--------- po/wine.pot | 51 ++++++++++++++++++++++++++++--------- po/zh_CN.po | 51 ++++++++++++++++++++++++++++--------- po/zh_TW.po | 51 ++++++++++++++++++++++++++++--------- 73 files changed, 1737 insertions(+), 1844 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2a876e53502013c963b8…

1 0

Piotr Caban : msvcrt: Fix FILE critical section initialization.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 66520ea08a5960bc15312dae71190969de478d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66520ea08a5960bc15312dae7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 24 12:13:03 2011 +0100 msvcrt: Fix FILE critical section initialization. --- dlls/msvcrt/file.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7a034d3..c4ba546 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -364,8 +364,11 @@ static MSVCRT_FILE* msvcrt_alloc_fp(void) { if (i == MSVCRT_stream_idx) { - InitializeCriticalSection(&((file_crit*)file)->crit); - ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + if (file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + { + InitializeCriticalSection(&((file_crit*)file)->crit); + ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + } MSVCRT_stream_idx++; } return file;

1 0

Jacek Caban : mshtml: Properly remove event listeners.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: ea0ebbfeb2c513e41d0ebf1812ff3f40bd728dbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0ebbfeb2c513e41d0ebf181… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 12:48:31 2011 +0100 mshtml: Properly remove event listeners. --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlevent.c | 14 ++++++++++++++ dlls/mshtml/htmlevent.h | 2 ++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/nsevents.c | 30 +++++++++++++++++++++++++++++- 5 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 32cbde4..45a7986 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2032,6 +2032,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) heap_free(This->elem_vars[i]); heap_free(This->elem_vars); + detach_events(This); if(This->body_event_target) release_event_target(This->body_event_target); if(This->nsevent_listener) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2b9e62e..74e8069 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1184,6 +1184,20 @@ static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *eve return S_OK; } +void detach_events(HTMLDocumentNode *doc) +{ + int i; + + if(!doc->event_vector) + return; + + for(i=0; i < EVENTID_LAST; i++) { + if(doc->event_vector[i]) + detach_nsevent(doc, event_info[i].name); + } +} + + static HRESULT remove_event_handler(event_target_t **event_target, eventid_t eid) { if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 9072482..b3ff251 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -54,10 +54,12 @@ HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPE HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; +void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; +void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e9bb8eb..f907776 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -46,6 +46,7 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) if(window->doc) { if(window->doc_obj && window == window->doc_obj->basedoc.window) window->doc->basedoc.cp_container.forward_container = NULL; + detach_events(window->doc); abort_document_bindings(window->doc); window->doc->basedoc.window = NULL; htmldoc_release(&window->doc->basedoc); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 89684fe..d4cdc10 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -281,7 +281,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * eventid_t eid; nsresult nsres; - TRACE("\n"); + TRACE("%p\n", This->This); nsAString_Init(&type_str, NULL); nsIDOMEvent_GetType(event, &type_str); @@ -363,8 +363,34 @@ void add_nsevent_listener(HTMLDocumentNode *doc, nsIDOMNode *nsnode, LPCWSTR typ nsIDOMEventTarget_Release(target); } +void detach_nsevent(HTMLDocumentNode *doc, const WCHAR *type) +{ + nsIDOMEventTarget *target; + nsAString type_str; + nsresult nsres; + + if(!doc->basedoc.window) + return; + + nsres = nsIDOMWindow_QueryInterface(doc->basedoc.window->nswindow, &IID_nsIDOMEventTarget, (void**)&target); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + return; + } + + nsAString_InitDepend(&type_str, type); + nsres = nsIDOMEventTarget_RemoveEventListener(target, &type_str, + &doc->nsevent_listener->htmlevent_listener.nsIDOMEventListener_iface, TRUE); + nsAString_Finish(&type_str); + nsIDOMEventTarget_Release(target); + if(NS_FAILED(nsres)) + ERR("RemoveEventTarget failed: %08x\n", nsres); +} + void release_nsevents(HTMLDocumentNode *doc) { + TRACE("%p %p\n", doc, doc->nsevent_listener); + if(doc->nsevent_listener) { doc->nsevent_listener->doc = NULL; release_listener(doc->nsevent_listener); @@ -387,6 +413,8 @@ void init_nsevents(HTMLDocumentNode *doc) if(!listener) return; + TRACE("%p %p\n", doc, listener); + listener->ref = 1; listener->doc = doc;

1 0

Jacek Caban : jscript: Use bytecode for null literal.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 83c53d855a10474949c64767fe993249e9dc6a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c53d855a10474949c64767f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 14:23:26 2011 +0100 jscript: Use bytecode for null literal. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 11 +++++++++++ dlls/jscript/engine.h | 1 + 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 85d38da..0f4381a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -179,6 +179,8 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_expression_t *expr) return push_instr_double(ctx, OP_double, literal->u.dval); case LT_INT: return push_instr_int(ctx, OP_int, literal->u.lval); + case LT_NULL: + return push_instr(ctx, OP_null); case LT_STRING: return push_instr_str(ctx, OP_str, literal->u.wstr); default: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e9dc976..66d10d6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1724,6 +1724,17 @@ HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return hres; } +/* ECMA-262 3rd Edition 7.8.1 */ +HRESULT interp_null(exec_ctx_t *ctx) +{ + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_NULL; + return stack_push(ctx, &v); +} + /* ECMA-262 3rd Edition 7.8.2 */ HRESULT interp_bool(exec_ctx_t *ctx) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2c099e4..b48f04c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -51,6 +51,7 @@ typedef struct _func_stack { X(int, 1, ARG_INT) \ X(neg, 1, 0) \ X(neq2, 1, 0) \ + X(null, 1, 0) \ X(str, 1, 0) \ X(tonum, 1, 0) \ X(tree, 1, ARG_EXPR) \

1 0

Jacek Caban : jscript: Use bytecode for regexp literals.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: e4f92ef473726a4a9bf86487985fc9b96aeb99fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f92ef473726a4a9bf864879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 14:23:39 2011 +0100 jscript: Use bytecode for regexp literals. --- dlls/jscript/compile.c | 26 +++++++++++++++++++++----- dlls/jscript/engine.c | 23 +++++++++++++++++++++-- dlls/jscript/engine.h | 35 ++++++++++++++++++----------------- 3 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0f4381a..9542912 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -168,10 +168,8 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) return S_OK; } -static HRESULT compile_literal(compiler_ctx_t *ctx, literal_expression_t *expr) +static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) { - literal_t *literal = expr->literal; - switch(literal->type) { case LT_BOOL: return push_instr_int(ctx, OP_bool, literal->u.bval); @@ -183,8 +181,26 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_expression_t *expr) return push_instr(ctx, OP_null); case LT_STRING: return push_instr_str(ctx, OP_str, literal->u.wstr); + case LT_REGEXP: { + unsigned instr; + WCHAR *str; + + str = compiler_alloc(ctx->code, (literal->u.regexp.str_len+1)*sizeof(WCHAR)); + if(!str) + return E_OUTOFMEMORY; + memcpy(str, literal->u.regexp.str, literal->u.regexp.str_len*sizeof(WCHAR)); + str[literal->u.regexp.str_len] = 0; + + instr = push_instr(ctx, OP_regexp); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.str = str; + instr_ptr(ctx, instr)->arg2.lng = literal->u.regexp.flags; + return S_OK; + } default: - return compile_interp_fallback(ctx, &expr->expr); + assert(0); } } @@ -200,7 +216,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) case EXPR_IN: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); case EXPR_LITERAL: - return compile_literal(ctx, (literal_expression_t*)expr); + return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOTEQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 66d10d6..e004ffa 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1788,6 +1788,25 @@ HRESULT interp_str(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 7.8 */ +HRESULT interp_regexp(exec_ctx_t *ctx) +{ + const WCHAR *source = ctx->parser->code->instrs[ctx->ip].arg1.str; + const LONG flags = ctx->parser->code->instrs[ctx->ip].arg2.lng; + jsdisp_t *regexp; + VARIANT v; + HRESULT hres; + + TRACE("%s %x\n", debugstr_w(source), flags); + + hres = create_regexp(ctx->parser->script, source, strlenW(source), flags, &regexp); + if(FAILED(hres)) + return hres; + + var_set_jsdisp(&v, regexp); + return stack_push(ctx, &v); +} + +/* ECMA-262 3rd Edition 7.8 */ HRESULT literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { literal_expression_t *expr = (literal_expression_t*)_expr; @@ -3382,13 +3401,13 @@ static HRESULT interp_tree(exec_ctx_t *ctx) typedef HRESULT (*op_func_t)(exec_ctx_t*); static const op_func_t op_funcs[] = { -#define X(x,a,b) interp_##x, +#define X(x,a,b,c) interp_##x, OP_LIST #undef X }; static const unsigned op_move[] = { -#define X(a,x,b) x, +#define X(a,x,b,c) x, OP_LIST #undef X }; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index b48f04c..eb67050 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -41,24 +41,25 @@ typedef struct _func_stack { struct _func_stack *next; } func_stack_t; -#define OP_LIST \ - X(add, 1, 0) \ - X(bool, 1, 0) \ - X(bneg, 1, 0) \ - X(double, 1, 0) \ - X(eq2, 1, 0) \ - X(in, 1, 0) \ - X(int, 1, ARG_INT) \ - X(neg, 1, 0) \ - X(neq2, 1, 0) \ - X(null, 1, 0) \ - X(str, 1, 0) \ - X(tonum, 1, 0) \ - X(tree, 1, ARG_EXPR) \ - X(ret, 0, 0) +#define OP_LIST \ + X(add, 1, 0,0) \ + X(bool, 1, ARG_INT, 0) \ + X(bneg, 1, 0,0) \ + X(double, 1, ARG_SBL, 0) \ + X(eq2, 1, 0,0) \ + X(in, 1, 0,0) \ + X(int, 1, ARG_INT, 0) \ + X(neg, 1, 0,0) \ + X(neq2, 1, 0,0) \ + X(null, 1, 0,0) \ + X(regexp, 1, ARG_STR, ARG_INT) \ + X(str, 1, ARG_STR, 0) \ + X(tonum, 1, 0,0) \ + X(tree, 1, ARG_EXPR, 0) \ + X(ret, 0, 0,0) typedef enum { -#define X(x,a,b) OP_##x, +#define X(x,a,b,c) OP_##x, OP_LIST #undef X OP_LAST @@ -80,6 +81,7 @@ typedef enum { typedef struct { jsop_t op; instr_arg_t arg1; + instr_arg_t arg2; } instr_t; typedef struct { @@ -199,7 +201,6 @@ typedef struct { double dval; const WCHAR *wstr; VARIANT_BOOL bval; - IDispatch *disp; struct { const WCHAR *str; DWORD str_len;

1 0

Jacek Caban : jscript: Always use bytecode version of literal expressions.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 9050c3725fa278bc9113b35d89f87e4dc40637a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9050c3725fa278bc9113b35d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 14:24:00 2011 +0100 jscript: Always use bytecode version of literal expressions. --- dlls/jscript/engine.c | 18 ------------------ dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 3 files changed, 1 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e004ffa..fc19128 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1806,24 +1806,6 @@ HRESULT interp_regexp(exec_ctx_t *ctx) return stack_push(ctx, &v); } -/* ECMA-262 3rd Edition 7.8 */ -HRESULT literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - literal_expression_t *expr = (literal_expression_t*)_expr; - VARIANT var; - HRESULT hres; - - TRACE("\n"); - - hres = literal_to_var(ctx, expr->literal, &var); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = var; - return S_OK; -} - /* ECMA-262 3rd Edition 11.1.4 */ HRESULT array_literal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index eb67050..c775066 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -530,7 +530,6 @@ HRESULT new_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprva HRESULT call_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT this_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0fcba92..7f46e94 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1362,7 +1362,7 @@ static const expression_eval_t expression_eval_table[] = { identifier_expression_eval, array_literal_expression_eval, property_value_expression_eval, - literal_expression_eval + compiled_expression_eval }; static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size)

1 0

Jacek Caban : jscript: Use bytecode for this expression implementation.
by Alexandre Julliard 24 Nov '11

24 Nov '11

Module: wine Branch: master Commit: 83667e74d6fe8afc5c2bbdcec176b0775b73402a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83667e74d6fe8afc5c2bbdcec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 24 14:24:14 2011 +0100 jscript: Use bytecode for this expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 13 +++++++------ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9542912..0393c6a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -223,6 +223,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); + case EXPR_THIS: + return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK; default: assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fc19128..5446fa3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1694,15 +1694,16 @@ HRESULT call_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags } /* ECMA-262 3rd Edition 11.1.1 */ -HRESULT this_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_this(exec_ctx_t *ctx) { + VARIANT v; + TRACE("\n"); - ret->type = EXPRVAL_VARIANT; - V_VT(&ret->u.var) = VT_DISPATCH; - V_DISPATCH(&ret->u.var) = ctx->exec_ctx->this_obj; - IDispatch_AddRef(ctx->exec_ctx->this_obj); - return S_OK; + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = ctx->this_obj; + IDispatch_AddRef(ctx->this_obj); + return stack_push(ctx, &v); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c775066..e7b66ec 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -54,6 +54,7 @@ typedef struct _func_stack { X(null, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ + X(this, 1, 0,0) \ X(tonum, 1, 0,0) \ X(tree, 1, ARG_EXPR, 0) \ X(ret, 0, 0,0) @@ -528,7 +529,6 @@ HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,expr HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT new_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT call_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT this_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7f46e94..a380576 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1357,7 +1357,7 @@ static const expression_eval_t expression_eval_table[] = { member_expression_eval, new_expression_eval, call_expression_eval, - this_expression_eval, + compiled_expression_eval, function_expression_eval, identifier_expression_eval, array_literal_expression_eval,

1 0