September 2012 - Wine-commits

Jacek Caban : vbscript: Added IActiveScriptParseProcedure2:: ParseProcedureText implementation.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: cf0faf1d3cac6b1eeb49bd270187de4ce8594164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0faf1d3cac6b1eeb49bd270… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 6 11:57:33 2012 +0200 vbscript: Added IActiveScriptParseProcedure2::ParseProcedureText implementation. --- dlls/vbscript/vbdisp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/vbscript.c | 15 ++++++++++++- dlls/vbscript/vbscript.h | 3 ++ 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 022ac1d..f6e3f11 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -501,6 +501,8 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) vbdisp->ref = 1; vbdisp->desc = desc; + list_add_tail(&desc->ctx->objects, &vbdisp->entry); + if(desc->class_initialize_id) { DISPPARAMS dp = {0}; HRESULT hres; @@ -513,11 +515,56 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) } } - list_add_tail(&desc->ctx->objects, &vbdisp->entry); *ret = vbdisp; return S_OK; } +static HRESULT Procedure_invoke(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + script_ctx_t *ctx = This->desc->ctx; + HRESULT hres; + + TRACE("\n"); + + IActiveScriptSite_OnEnterScript(ctx->site); + hres = exec_script(ctx, This->desc->value_func, NULL, NULL, NULL); + IActiveScriptSite_OnLeaveScript(ctx->site); + + return hres; +} + +static const builtin_prop_t procedure_props[] = { + {DISPID_VALUE, Procedure_invoke, 0} +}; + +HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **ret) +{ + class_desc_t *desc; + vbdisp_t *vbdisp; + HRESULT hres; + + desc = heap_alloc_zero(sizeof(*desc)); + if(!desc) + return E_OUTOFMEMORY; + + desc->ctx = ctx; + desc->builtin_prop_cnt = sizeof(procedure_props)/sizeof(*procedure_props); + desc->builtin_props = procedure_props; + desc->value_func = &code->main_code; + + hres = create_vbdisp(desc, &vbdisp); + if(FAILED(hres)) { + heap_free(desc); + return hres; + } + + desc->next = ctx->procs; + ctx->procs = desc; + + *ret = (IDispatch*)&vbdisp->IDispatchEx_iface; + return S_OK; +} + void collect_objects(script_ctx_t *ctx) { vbdisp_t *iter, *iter2; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f250df3..f842bba 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -650,10 +650,21 @@ static HRESULT WINAPI VBScriptParseProcedure_ParseProcedureText(IActiveScriptPar CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, IDispatch **ppdisp) { VBScript *This = impl_from_IActiveScriptParseProcedure2(iface); - FIXME("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), + vbscode_t *code; + HRESULT hres; + + TRACE("(%p)->(%s %s %s %s %p %s %s %u %x %p)\n", This, debugstr_w(pstrCode), debugstr_w(pstrFormalParams), debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp); - return E_NOTIMPL; + + if(This->thread_id != GetCurrentThreadId() || This->state == SCRIPTSTATE_CLOSED) + return E_UNEXPECTED; + + hres = compile_script(This->ctx, pstrCode, &code); + if(FAILED(hres)) + return hres; + + return create_procedure_disp(This->ctx, code, ppdisp); } static const IActiveScriptParseProcedure2Vtbl VBScriptParseProcedureVtbl = { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 788d98d..8a316ab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -100,6 +100,7 @@ typedef struct _class_desc_t { unsigned builtin_prop_cnt; const builtin_prop_t *builtin_props; ITypeInfo *typeinfo; + function_t *value_func; struct _class_desc_t *next; } class_desc_t; @@ -121,6 +122,7 @@ HRESULT vbdisp_get_id(vbdisp_t*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*) DECLSPEC HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; void collect_objects(script_ctx_t*) DECLSPEC_HIDDEN; +HRESULT create_procedure_disp(script_ctx_t*,vbscode_t*,IDispatch**) DECLSPEC_HIDDEN; static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -160,6 +162,7 @@ struct _script_ctx_t { dynamic_var_t *global_vars; function_t *global_funcs; class_desc_t *classes; + class_desc_t *procs; vbsheap_t heap;

1 0

Alexandre Julliard : gdi32: Add a graphics driver to render windows contents through the DIB engine.
by Alexandre Julliard 06 Sep '12

06 Sep '12

Module: wine Branch: master Commit: 27b0b88a0b8f54dd8940841fc85df910417b8a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b0b88a0b8f54dd8940841fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 6 12:23:10 2012 +0200 gdi32: Add a graphics driver to render windows contents through the DIB engine. --- dlls/gdi32/clipping.c | 7 +- dlls/gdi32/dibdrv/dc.c | 608 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/user32/painting.c | 2 +- include/wine/gdi_driver.h | 39 +++- 6 files changed, 654 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27b0b88a0b8f54dd89408…

1 0

Kyle Auble : Remove "next" links to wiki, fix others
by Jeremy Newman 06 Sep '12

06 Sep '12

Module: website Branch: master Commit: 1c74fd1a83e50ff3e2d1ce3409b267e7450c0629 URL: http://source.winehq.org/git/website.git/?a=commit;h=1c74fd1a83e50ff3e2d1ce… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Wed Sep 5 17:35:38 2012 -0700 Remove "next" links to wiki, fix others --- templates/de/about.template | 5 ----- templates/en/about.template | 5 ----- templates/es/about.template | 5 ----- templates/fr/about.template | 8 ++------ templates/he/about.template | 7 +------ templates/pl/about.template | 6 ------ templates/pt/about.template | 6 ------ 7 files changed, 3 insertions(+), 39 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index 508dca5..1e2e5dc 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -20,8 +20,3 @@ <li><a href="http://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts (en)</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation und Leitung (en)</a></li> </ul> - -<hr> -<div class="link-container"> - <p class="right-link">Die Geschichte von Wine: <a href="{$root}/history">Weiter</a></p> -</div> diff --git a/templates/en/about.template b/templates/en/about.template index 93a2c3e..8696f5b 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -20,8 +20,3 @@ <li><a href="http://wiki.winehq.org/WineHistory">History of the Wine Project</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization">Organization and Leadership</a></li> </ul> - -<hr> -<div class="link-container"> - <p class="right-link">Wine's History: <a href="{$root}/history">Next</a></p> -</div> diff --git a/templates/es/about.template b/templates/es/about.template index 83f2249..517c717 100644 --- a/templates/es/about.template +++ b/templates/es/about.template @@ -20,8 +20,3 @@ <li><a href="http://wiki.winehq.org/WineHistory">Historia del Proyecto Wine</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization">Organización y Liderazgo</a></li> </ul> - -<hr> -<div class="link-container"> - <p class="right-link">Wine's History: <a href="{$root}/history">Siguiente</a></p> -</div> diff --git a/templates/fr/about.template b/templates/fr/about.template index bc29852..e1878d2 100644 --- a/templates/fr/about.template +++ b/templates/fr/about.template @@ -35,12 +35,8 @@ proviennent de volontaires.</p> si important</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Mythes courants sur Wine</a></li> - <li><a href="http://wiki.winehq.org/WineHistory">Historique du projet Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Historique du projet +Wine</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization">Organisation du projet</a></li> </ul> - -<hr> -<div class="link-container"> - <p class="right-link">Historique de Wine : <a href="{$root}/history">Suivant</a></p> -</div> diff --git a/templates/he/about.template b/templates/he/about.template index 61591d7..2574ff8 100644 --- a/templates/he/about.template +++ b/templates/he/about.template @@ -17,11 +17,6 @@ <ul> <li><a href="http://wiki.winehq.org/ImportanceOfWine">מדוע Wine כה חשובה</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">אגדות נפוצות על Wine</a></li> - <li><a href="http://wiki.winehq.org/WineHistory/he">היסטוריית מיזם Wine</a></li> + <li><a href="http://wiki.winehq.org/Wine_ההיסטוריה_של">היסטוריית מיזם Wine</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization/he">ארגון ומנהיגות</a></li> </ul> - -<hr> -<div class="link-container"> - <p class="right-link">ההיסטוריה של Wine: <a href="{$root}/history">הבא</a></p> -</div> diff --git a/templates/pl/about.template b/templates/pl/about.template index 2301289..7d67496 100644 --- a/templates/pl/about.template +++ b/templates/pl/about.template @@ -42,9 +42,3 @@ Julliard kieruje projektem Wine, i można się z nim skontaktować przez e-mail <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Wywiady</a></li> </ul> - -<hr> -<div class="link-container"> - <p class="right-link">Historia Wine: - <a href="http://wiki.winehq.org/WineHistory">Dalej</a></p> -</div> diff --git a/templates/pt/about.template b/templates/pt/about.template index ef35e2c..a67c027 100644 --- a/templates/pt/about.template +++ b/templates/pt/about.template @@ -44,9 +44,3 @@ projecto:</p> <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Entrevistas</a></li> </ul> - -<hr> -<div class="link-container"> - <p class="right-link">História do Wine: - <a href="http://wiki.winehq.org/WineHistory">Seguinte</a></p> -</div>

1 0

Kyle Auble : Delete history pages now on wiki
by Jeremy Newman 06 Sep '12

06 Sep '12

Module: website Branch: master Commit: e83a8ef5c31f99c346e394867f82be46fbe6bc9d URL: http://source.winehq.org/git/website.git/?a=commit;h=e83a8ef5c31f99c346e394… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Wed Sep 5 17:35:51 2012 -0700 Delete history pages now on wiki --- templates/en/history.template | 261 ----------------------------------------- templates/he/history.template | 233 ------------------------------------ 2 files changed, 0 insertions(+), 494 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=e83a8ef5c31f99c346…

1 0

Kyle Auble : Redirect Winelib links to wiki
by Jeremy Newman 06 Sep '12

06 Sep '12

Module: website Branch: master Commit: 46543b8ec40fc2a61ee0eb1643ee697cfd70c9db URL: http://source.winehq.org/git/website.git/?a=commit;h=46543b8ec40fc2a61ee0eb… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Wed Sep 5 17:36:07 2012 -0700 Redirect Winelib links to wiki --- templates/de/devel.template | 2 +- templates/en/devel.template | 2 +- templates/he/devel.template | 2 +- templates/pl/devel.template | 2 +- templates/tr/devel.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template index 88601b4..61c5d4b 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -118,7 +118,7 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/winelib">Winelib</a> + <a href="http://wiki.winehq.org/Winelib">Winelib</a> </td> <td valign="top"> Dokumentation zur Entwicklung mit Winelib, unseren Werkzeugen zur Anwendungsportierung. diff --git a/templates/en/devel.template b/templates/en/devel.template index b4e5f25..422edd8 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -117,7 +117,7 @@ various resources available for our developers.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/winelib">Winelib</a> + <a href="http://wiki.winehq.org/Winelib">Winelib</a> </td> <td valign="top"> Documentation on development with Winelib, our application porting tools. diff --git a/templates/he/devel.template b/templates/he/devel.template index 4117322..0f70353 100644 --- a/templates/he/devel.template +++ b/templates/he/devel.template @@ -116,7 +116,7 @@ <tr bgcolor="#ffffff"> <td> - <a href="{$root}/winelib">Winelib</a> + <a href="http://wiki.winehq.org/Winelib_he">Winelib</a> </td> <td valign="top"> תיעוד על פיתוח באמצעות Winelib, כלי הסבת היישומים שלנו. diff --git a/templates/pl/devel.template b/templates/pl/devel.template index fb64058..97c2f45 100644 --- a/templates/pl/devel.template +++ b/templates/pl/devel.template @@ -117,7 +117,7 @@ rozmaitych materiałów dostępnych dla programistów Wine.</p> <tr bgcolor="#ffffff"> <td> - <a href="{$root}/winelib">Winelib</a> + <a href="http://wiki.winehq.org/Winelib">Winelib</a> </td> <td valign="top"> Dokumentacja dotycząca programowania dla Winelib, nasze narzędzia do portowania aplikacji. diff --git a/templates/tr/devel.template b/templates/tr/devel.template index ebb7c84..a35adb5 100644 --- a/templates/tr/devel.template +++ b/templates/tr/devel.template @@ -116,7 +116,7 @@ <tr bgcolor="#ffffff"> <td> - <a href="{$root}/winelib">Winelib</a> + <a href="http://wiki.winehq.org/Winelib">Winelib</a> </td> <td valign="top"> Documentation on development with Winelib, our application porting tools.

1 0

Kyle Auble : Move static Winelib pages to wiki
by Jeremy Newman 06 Sep '12

06 Sep '12

Module: website Branch: master Commit: 667ac9f284d67484db438cd2ad1f2b9eb1b0f020 URL: http://source.winehq.org/git/website.git/?a=commit;h=667ac9f284d67484db438c… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Wed Sep 5 17:36:21 2012 -0700 Move static Winelib pages to wiki --- templates/en/winelib.template | 450 ----------------------------------------- templates/he/winelib.template | 437 --------------------------------------- 2 files changed, 0 insertions(+), 887 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=667ac9f284d67484db…

1 0

Kyle Auble : Fix links to wiki in various languages
by Jeremy Newman 06 Sep '12

06 Sep '12

Module: website Branch: master Commit: 521e23737d003d206ca66867552269bdabc3471f URL: http://source.winehq.org/git/website.git/?a=commit;h=521e23737d003d206ca668… Author: Kyle Auble <randomidman48(a)yahoo.com> Date: Wed Sep 5 17:36:38 2012 -0700 Fix links to wiki in various languages http://bugs.winehq.org/show_bug.cgi?id=31273 --- templates/es/about.template | 1 + templates/he/about.template | 1 + templates/pl/about.template | 2 +- templates/pl/help.template | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/es/about.template b/templates/es/about.template index 517c717..2d6799b 100644 --- a/templates/es/about.template +++ b/templates/es/about.template @@ -19,4 +19,5 @@ <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Mitos Comunes sobre Wine</a></li> <li><a href="http://wiki.winehq.org/WineHistory">Historia del Proyecto Wine</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization">Organización y Liderazgo</a></li> + <li><a href="http://wiki.winehq.org/CarateristicasWine">Características de Wine</a></li> </ul> diff --git a/templates/he/about.template b/templates/he/about.template index 2574ff8..5ce7df3 100644 --- a/templates/he/about.template +++ b/templates/he/about.template @@ -19,4 +19,5 @@ <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">אגדות נפוצות על Wine</a></li> <li><a href="http://wiki.winehq.org/Wine_ההיסטוריה_של">היסטוריית מיזם Wine</a></li> <li><a href="http://wiki.winehq.org/ProjectOrganization/he">ארגון ומנהיגות</a></li> + <li><a href="http://wiki.winehq.org/WineFeatures/he">התכונות של Wine</a></li> </ul> diff --git a/templates/pl/about.template b/templates/pl/about.template index 7d67496..ebb7764 100644 --- a/templates/pl/about.template +++ b/templates/pl/about.template @@ -37,7 +37,7 @@ Julliard kieruje projektem Wine, i można się z nim skontaktować przez e-mail <li><a href="http://wiki.winehq.org/WineHistory">Historia Wine</a></li> <li><a href="http://wiki.winehq.org/ImportanceOfWine">Dlaczego Wine jest tak ważny</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Obalanie mitów o Wine</a></li> - <li><a href="http://wiki.winehq.org/WineFeatures">Możliwości Wine</a></li> + <li><a href="http://wiki.winehq.org/FunkcjeWine">Możliwości Wine</a></li> <li><a href="http://wiki.winehq.org/DowodyUznania">Dowody uznania</a></li> <li><a href="{$root}/wwn">World Wine News</a></li> <li><a href="{$root}/interview">Wywiady</a></li> diff --git a/templates/pl/help.template b/templates/pl/help.template index 1c3bac2..8b95def 100644 --- a/templates/pl/help.template +++ b/templates/pl/help.template @@ -23,11 +23,11 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"><br>FAQ</a> + <a href="http://wiki.winehq.org/FAQ_pl"><img src="{$root}/images/faq.png"><br>FAQ</a> </td> <td valign="top"> Na większość Twoich pytań łatwo znajdziesz odpowiedź przeglądając nasze - <a href="http://wiki.winehq.org/FAQ_PL">FAQ</a>. + <a href="http://wiki.winehq.org/FAQ_pl">FAQ</a>. Jeżeli jesteś w potrzebie zajrzyj tam w pierwszej kolejności. </td> </tr>

1 0

Piotr Caban : msvcp90: Fixed RTTI structure on 64-bit systems.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 7477ceb6d1326d34f457877d4d07d81a6639074e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7477ceb6d1326d34f457877d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 5 14:36:16 2012 +0200 msvcp90: Fixed RTTI structure on 64-bit systems. --- dlls/msvcp90/cxx.h | 113 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/exception.c | 16 ++++++ dlls/msvcp90/ios.c | 46 +++++++++++++++++ dlls/msvcp90/locale.c | 28 +++++++++++ dlls/msvcp90/msvcp90.h | 2 + dlls/msvcp90/msvcp90_main.c | 2 + 6 files changed, 204 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index f709d12..956675c 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -64,7 +64,9 @@ #endif /* _WIN64 */ -#define DEFINE_RTTI_DATA(name, off, base_classes, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#ifndef __x86_64__ + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ static const type_info name ## _type_info = { \ &MSVCP_type_info_vtable, \ NULL, \ @@ -73,7 +75,7 @@ \ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ &name ##_type_info, \ - base_classes, \ + base_classes_no, \ { 0, -1, 0}, \ 64 \ }; \ @@ -96,7 +98,7 @@ static const rtti_base_array name ## _rtti_base_array = { \ static const rtti_object_hierarchy name ## _hierarchy = { \ 0, \ 0, \ - base_classes+1, \ + base_classes_no+1, \ &name ## _rtti_base_array \ }; \ \ @@ -108,6 +110,74 @@ const rtti_object_locator name ## _rtti = { \ &name ## _hierarchy \ } +#else + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + static const type_info name ## _type_info = { \ + &MSVCP_type_info_vtable, \ + NULL, \ + mangled_name \ + }; \ +\ +static rtti_base_descriptor name ## _rtti_base_descriptor = { \ + 0xdeadbeef, \ + base_classes_no, \ + { 0, -1, 0}, \ + 64 \ +}; \ +\ +static rtti_base_array name ## _rtti_base_array = { \ + { \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + } \ +}; \ +\ +static rtti_object_hierarchy name ## _hierarchy = { \ + 0, \ + 0, \ + base_classes_no+1, \ + 0xdeadbeef \ +}; \ +\ +rtti_object_locator name ## _rtti = { \ + 1, \ + off, \ + 0, \ + 0xdeadbeef, \ + 0xdeadbeef, \ + 0xdeadbeef \ +};\ +\ +static void init_ ## name ## _rtti(char *base) \ +{ \ + name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \ + name ## _rtti_base_array.bases[0] = (char*)&name ## _rtti_base_descriptor - base; \ + name ## _rtti_base_array.bases[1] = (char*)cl1 - base; \ + name ## _rtti_base_array.bases[2] = (char*)cl2 - base; \ + name ## _rtti_base_array.bases[3] = (char*)cl3 - base; \ + name ## _rtti_base_array.bases[4] = (char*)cl4 - base; \ + name ## _rtti_base_array.bases[5] = (char*)cl5 - base; \ + name ## _rtti_base_array.bases[6] = (char*)cl6 - base; \ + name ## _rtti_base_array.bases[7] = (char*)cl7 - base; \ + name ## _rtti_base_array.bases[8] = (char*)cl8 - base; \ + name ## _rtti_base_array.bases[9] = (char*)cl9 - base; \ + name ## _hierarchy.base_classes = (char*)&name ## _rtti_base_array - base; \ + name ## _rtti.type_descriptor = (char*)&name ## _type_info - base; \ + name ## _rtti.type_hierarchy = (char*)&name ## _hierarchy - base; \ + name ## _rtti.object_locator = (char*)&name ## _rtti - base; \ +} + +#endif + #define DEFINE_RTTI_DATA0(name, off, mangled_name) \ DEFINE_RTTI_DATA(name, off, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, mangled_name) #define DEFINE_RTTI_DATA1(name, off, cl1, mangled_name) \ @@ -191,6 +261,8 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; +#ifndef __x86_64__ + typedef struct _rtti_base_descriptor { const type_info *type_descriptor; @@ -220,3 +292,38 @@ typedef struct _rtti_object_locator const type_info *type_descriptor; const rtti_object_hierarchy *type_hierarchy; } rtti_object_locator; + +#else + +typedef struct +{ + unsigned int type_descriptor; + int num_base_classes; + this_ptr_offsets offsets; /* offsets for computing the this pointer */ + unsigned int attributes; +} rtti_base_descriptor; + +typedef struct +{ + unsigned int bases[10]; /* First element is the class itself */ +} rtti_base_array; + +typedef struct +{ + unsigned int signature; + unsigned int attributes; + int array_len; /* Size of the array pointed to by 'base_classes' */ + unsigned int base_classes; +} rtti_object_hierarchy; + +typedef struct +{ + unsigned int signature; + int base_class_offset; + unsigned int flags; + unsigned int type_descriptor; + unsigned int type_hierarchy; + unsigned int object_locator; +} rtti_object_locator; + +#endif diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7da6cbe..7202a25 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -750,3 +750,19 @@ void throw_exception(exception_type et, const char *str) } } } + +void init_exception(void) +{ +#ifdef __x86_64__ + void *base = GetModuleHandleA("msvcp90.dll"); + init_type_info_rtti(base); + init_exception_rtti(base); + init_bad_alloc_rtti(base); + init_logic_error_rtti(base); + init_length_error_rtti(base); + init_out_of_range_rtti(base); + init_invalid_argument_rtti(base); + init_runtime_error_rtti(base); + init_failure_rtti(base); +#endif +} diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index f7f6fa9..88ed0e9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -12923,6 +12923,52 @@ basic_ostream_wchar *_Ptr_wclog = &wclog.obj; void init_io(void) { +#ifdef __x86_64__ + void *base = GetModuleHandleA("msvcp90.dll"); + init_iosb_rtti(base); + init_ios_base_rtti(base); + init_basic_ios_char_rtti(base); + init_basic_ios_wchar_rtti(base); + init_basic_ios_short_rtti(base); + init_basic_streambuf_char_rtti(base); + init_basic_streambuf_wchar_rtti(base); + init_basic_streambuf_short_rtti(base); + init_basic_filebuf_char_rtti(base); + init_basic_filebuf_wchar_rtti(base); + init_basic_filebuf_short_rtti(base); + init_basic_stringbuf_char_rtti(base); + init_basic_stringbuf_wchar_rtti(base); + init_basic_stringbuf_short_rtti(base); + init_basic_ostream_char_rtti(base); + init_basic_ostream_wchar_rtti(base); + init_basic_ostream_short_rtti(base); + init_basic_istream_char_rtti(base); + init_basic_istream_wchar_rtti(base); + init_basic_istream_short_rtti(base); + init_basic_iostream_char_rtti(base); + init_basic_iostream_wchar_rtti(base); + init_basic_iostream_short_rtti(base); + init_basic_ofstream_char_rtti(base); + init_basic_ofstream_wchar_rtti(base); + init_basic_ofstream_short_rtti(base); + init_basic_ifstream_char_rtti(base); + init_basic_ifstream_wchar_rtti(base); + init_basic_ifstream_short_rtti(base); + init_basic_fstream_char_rtti(base); + init_basic_fstream_wchar_rtti(base); + init_basic_fstream_short_rtti(base); + init_basic_ostringstream_char_rtti(base); + init_basic_ostringstream_wchar_rtti(base); + init_basic_ostringstream_short_rtti(base); + init_basic_istringstream_char_rtti(base); + init_basic_istringstream_wchar_rtti(base); + init_basic_istringstream_short_rtti(base); + init_basic_stringstream_char_rtti(base); + init_basic_stringstream_wchar_rtti(base); + init_basic_stringstream_short_rtti(base); + init_strstreambuf_rtti(base); +#endif + basic_filebuf_char_ctor_file(&filebuf_char_stdin, stdin); basic_istream_char_ctor(&cin.obj, &filebuf_char_stdin.base, FALSE/*FIXME*/, TRUE); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 31b5b70..7e6b10f 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -8722,6 +8722,34 @@ void __asm_dummy_vtables(void) { } #endif +void init_locale(void) +{ +#ifdef __x86_64__ + void *base = GetModuleHandleA("msvcp90.dll"); + init_locale_facet_rtti(base); + init_collate_char_rtti(base); + init_collate_wchar_rtti(base); + init_collate_short_rtti(base); + init_ctype_base_rtti(base); + init_ctype_char_rtti(base); + init_ctype_wchar_rtti(base); + init_ctype_short_rtti(base); + init_codecvt_base_rtti(base); + init_codecvt_char_rtti(base); + init_codecvt_wchar_rtti(base); + init_codecvt_short_rtti(base); + init_numpunct_char_rtti(base); + init_numpunct_wchar_rtti(base); + init_numpunct_short_rtti(base); + init_num_get_char_rtti(base); + init_num_get_wchar_rtti(base); + init_num_get_short_rtti(base); + init_num_put_char_rtti(base); + init_num_put_wchar_rtti(base); + init_num_put_short_rtti(base); +#endif +} + void free_locale(void) { facets_elem *iter, *safe; diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b91faac..84e39c5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -463,5 +463,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, o ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar, ios_base*, wchar_t, MSVCP_bool); +void init_exception(void); +void init_locale(void); void init_io(void); void free_io(void); diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 9981e95..8d97c9d 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -90,6 +90,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_lockit(); + init_exception(); + init_locale(); init_io(); break; case DLL_PROCESS_DETACH:

1 0

Erich Hoover : hhctrl.ocx: Resize the window when HH_SET_WIN_TYPE is called .
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: 565036209080ad322bd96aa6a0cdc9adaae315e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565036209080ad322bd96aa6a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 5 10:24:28 2012 -0600 hhctrl.ocx: Resize the window when HH_SET_WIN_TYPE is called. --- dlls/hhctrl.ocx/chm.c | 6 +++--- dlls/hhctrl.ocx/help.c | 20 ++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.c | 3 ++- dlls/hhctrl.ocx/hhctrl.h | 3 ++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 4b2f36e..bff7186 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -250,7 +250,7 @@ static inline WCHAR *MergeChmString(LPCWSTR src, WCHAR **dst) return *dst; } -void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info) +void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) { DWORD unhandled_params = src->fsValidMembers & ~(HHWIN_PARAM_PROPERTIES|HHWIN_PARAM_STYLES |HHWIN_PARAM_EXSTYLES|HHWIN_PARAM_RECT|HHWIN_PARAM_NAV_WIDTH @@ -258,7 +258,7 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info) |HHWIN_PARAM_EXPANSION|HHWIN_PARAM_TABPOS|HHWIN_PARAM_TABORDER |HHWIN_PARAM_HISTORY_COUNT|HHWIN_PARAM_CUR_TAB); HH_WINTYPEW *dst = &info->WinType; - DWORD merge = src->fsValidMembers & ~dst->fsValidMembers; + DWORD merge = override ? src->fsValidMembers : src->fsValidMembers & ~dst->fsValidMembers; if (unhandled_params) FIXME("Unsupported fsValidMembers fields: 0x%x\n", unhandled_params); @@ -379,7 +379,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) } /* merge the new data with any pre-existing HH_WINTYPE structure */ - MergeChmProperties(&wintype, info); + MergeChmProperties(&wintype, info, FALSE); if (!info->WinType.pszFile) info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); if (!info->WinType.pszToc) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 514b2a8..79e5e11 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1565,6 +1565,26 @@ static LRESULT Help_OnSize(HWND hWnd) return 0; } +void UpdateHelpWindow(HHInfo *info) +{ + if (!info->WinType.hwndHelp) + return; + + WARN("Only the size of the window is currently updated.\n"); + if (info->WinType.fsValidMembers & HHWIN_PARAM_RECT) + { + RECT *rect = &info->WinType.rcWindowPos; + INT x, y, width, height; + + x = rect->left; + y = rect->top; + width = rect->right - x; + height = rect->bottom - y; + SetWindowPos(info->WinType.hwndHelp, NULL, rect->left, rect->top, width, height, + SWP_NOZORDER | SWP_NOACTIVATE); + } +} + static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 7f11276..03592c8 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -327,7 +327,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat TRACE("Changing WINTYPE, fsValidMembers=0x%x\n", wintype->fsValidMembers); - MergeChmProperties(wintype, info); + MergeChmProperties(wintype, info, TRUE); + UpdateHelpWindow(info); return 0; } case HH_GET_WIN_TYPE: { diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 7bdf26e..81b6879 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -218,7 +218,8 @@ HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; -void MergeChmProperties(HH_WINTYPEW*,HHInfo*) DECLSPEC_HIDDEN; +void MergeChmProperties(HH_WINTYPEW*,HHInfo*,BOOL) DECLSPEC_HIDDEN; +void UpdateHelpWindow(HHInfo *info) DECLSPEC_HIDDEN; void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN;

1 0

Erich Hoover : hhctrl.ocx: Do not permit a NULL caption for HtmlHelp windows.
by Alexandre Julliard 05 Sep '12

05 Sep '12

Module: wine Branch: master Commit: a61903388eb11a8c5c5e4929ebdcaccedd67430f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61903388eb11a8c5c5e4929e… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 5 10:36:39 2012 -0600 hhctrl.ocx: Do not permit a NULL caption for HtmlHelp windows. --- dlls/hhctrl.ocx/chm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index bff7186..88bd6e5 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -366,10 +366,8 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) wintype.cbStruct = sizeof(wintype); wintype.fUniCodeStrings = TRUE; wintype.pszType = pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); - wintype.pszFile = pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); wintype.pszToc = pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); wintype.pszIndex = pszIndex = strdupW(null); - wintype.pszCaption = pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); wintype.fsValidMembers = 0; wintype.fsWinProperties = HHWIN_PROP_TRI_PANE; wintype.dwStyles = WS_POPUP; @@ -380,12 +378,14 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) /* merge the new data with any pre-existing HH_WINTYPE structure */ MergeChmProperties(&wintype, info, FALSE); + if (!info->WinType.pszCaption) + info->WinType.pszCaption = info->stringsW.pszCaption = strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); if (!info->WinType.pszFile) - info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); + info->WinType.pszFile = info->stringsW.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); if (!info->WinType.pszToc) - info->WinType.pszToc = info->stringsW.pszToc = FindHTMLHelpSetting(info, toc_extW); + info->WinType.pszToc = info->stringsW.pszToc = FindHTMLHelpSetting(info, toc_extW); if (!info->WinType.pszIndex) - info->WinType.pszIndex = info->stringsW.pszIndex = FindHTMLHelpSetting(info, index_extW); + info->WinType.pszIndex = info->stringsW.pszIndex = FindHTMLHelpSetting(info, index_extW); heap_free(pszType); heap_free(pszFile);

1 0