May 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Add support for __ptr64 attribute in symbol demangling.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 5e1b9c149eb88ba87238e49e079824d89c9bd131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1b9c149eb88ba87238e49e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 14 14:11:50 2011 +0200 msvcrt: Add support for __ptr64 attribute in symbol demangling. --- dlls/msvcrt/tests/cpp.c | 2 + dlls/msvcrt/undname.c | 54 ++++++++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index dfb2cd7..b4eb515 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1051,6 +1051,8 @@ static void test_demangle(void) /* 116 */ {"?vswprintf@@YAHPAGIPBGPAD(a)Z", "int __cdecl vswprintf(unsigned short *,unsigned int,unsigned short const *,char *)"}, /* 117 */ {"?vswprintf@@YAHPA_WIPB_WPAD(a)Z", "int __cdecl vswprintf(wchar_t *,unsigned int,wchar_t const *,char *)"}, /* 118 */ {"?swprintf@@YAHPA_WIPB_WZZ", "int __cdecl swprintf(wchar_t *,unsigned int,wchar_t const *,...)"}, +/* 119 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & __ptr64 __cdecl std::operator*=(class std::complex<float> & __ptr64,class std::complex<float> const & __ptr64)"}, +/* 120 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)const __ptr64"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 920a763..8ed0757 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -416,11 +416,17 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t /****************************************************************** * get_modifier - * Parses the type modifier. Always returns a static string + * Parses the type modifier. Always returns static strings. */ -static BOOL get_modifier(char ch, const char** ret) +static BOOL get_modifier(struct parsed_symbol *sym, const char **ret, const char **ptr_modif) { - switch (ch) + *ptr_modif = NULL; + if (*sym->current == 'E') + { + *ptr_modif = "__ptr64"; + sym->current++; + } + switch (*sym->current++) { case 'A': *ret = NULL; break; case 'B': *ret = "const"; break; @@ -436,20 +442,27 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, { const char* modifier; const char* str_modif; + const char *ptr_modif = ""; + + if (*sym->current == 'E') + { + ptr_modif = " __ptr64"; + sym->current++; + } switch (modif) { - case 'A': str_modif = " &"; break; - case 'B': str_modif = " & volatile"; break; - case 'P': str_modif = " *"; break; - case 'Q': str_modif = " * const"; break; - case 'R': str_modif = " * volatile"; break; - case 'S': str_modif = " * const volatile"; break; + case 'A': str_modif = str_printf(sym, " &%s", ptr_modif); break; + case 'B': str_modif = str_printf(sym, " &%s volatile", ptr_modif); break; + case 'P': str_modif = str_printf(sym, " *%s", ptr_modif); break; + case 'Q': str_modif = str_printf(sym, " *%s const", ptr_modif); break; + case 'R': str_modif = str_printf(sym, " *%s volatile", ptr_modif); break; + case 'S': str_modif = str_printf(sym, " *%s const volatile", ptr_modif); break; case '?': str_modif = ""; break; default: return FALSE; } - if (get_modifier(*sym->current++, &modifier)) + if (get_modifier(sym, &modifier, &ptr_modif)) { unsigned mark = sym->stack.num; struct datatype_t sub_ct; @@ -924,10 +937,10 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, case '$': if (*sym->current == 'C') { - const char* ptr; + const char *ptr, *ptr_modif; sym->current++; - if (!get_modifier(*sym->current++, &ptr)) goto done; + if (!get_modifier(sym, &ptr, &ptr_modif)) goto done; if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; ct->left = str_printf(sym, "%s %s", ct->left, ptr); } @@ -960,6 +973,7 @@ static BOOL handle_data(struct parsed_symbol* sym) const char* access = NULL; const char* member_type = NULL; const char* modifier = NULL; + const char* ptr_modif; struct datatype_t ct; char* name = NULL; BOOL ret = FALSE; @@ -1004,14 +1018,16 @@ static BOOL handle_data(struct parsed_symbol* sym) str_array_init(&pmt); if (!demangle_datatype(sym, &ct, &pmt, FALSE)) goto done; - if (!get_modifier(*sym->current++, &modifier)) goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier && ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if (!modifier) modifier = ptr_modif; sym->stack.num = mark; } break; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ ct.left = ct.right = NULL; - if (!get_modifier(*sym->current++, &modifier)) goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; if (*sym->current != '@') { char* cls = NULL; @@ -1123,10 +1139,11 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) { if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) { + const char *ptr_modif; /* Implicit 'this' pointer */ /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(*sym->current, &modifier)) goto done; - sym->current++; + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); } } @@ -1164,12 +1181,11 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) /* Note: '()' after 'Z' means 'throws', but we don't care here * Yet!!! FIXME */ - sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s%s", + sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s", access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, - name, args_str, modifier, - modifier ? " " : NULL, ct_ret.right); + name, args_str, modifier, ct_ret.right); ret = TRUE; done: return ret;

1 0

Alexandre Julliard : msvcrt: Add support for template operators in symbol demangling.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 5d12e970ff640a2c92a0fb31324ccc565e97f306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d12e970ff640a2c92a0fb313… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 14 16:19:33 2011 +0200 msvcrt: Add support for template operators in symbol demangling. --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index b4eb515..8d0dbd4 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1053,6 +1053,9 @@ static void test_demangle(void) /* 118 */ {"?swprintf@@YAHPA_WIPB_WZZ", "int __cdecl swprintf(wchar_t *,unsigned int,wchar_t const *,...)"}, /* 119 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & __ptr64 __cdecl std::operator*=(class std::complex<float> & __ptr64,class std::complex<float> const & __ptr64)"}, /* 120 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)const __ptr64"}, +/* 121 */ {"??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z", + "class std::complex<float> __cdecl std::operator*<float>(float const &,class std::complex<float> const &)", + "??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 8ed0757..9c24f4a 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1238,10 +1238,16 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->current++; /* Then function name or operator code */ - if (*sym->current == '?' && sym->current[1] != '$') + if (*sym->current == '?' && (sym->current[1] != '$' || sym->current[2] == '?')) { const char* function_name = NULL; + if (sym->current[1] == '$') + { + do_after = 6; + sym->current += 2; + } + /* C++ operator code (one character, or two if the first is '_') */ switch (*++sym->current) { @@ -1374,6 +1380,17 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->result = (char*)function_name; ret = TRUE; goto done; + case 6: + { + char *args; + struct array array_pmt; + + str_array_init(&array_pmt); + args = get_args(sym, &array_pmt, FALSE, '<', '>'); + if (args != NULL) function_name = str_printf(sym, "%s%s", function_name, args); + sym->names.num = 0; + } + /* fall through */ default: if (!str_array_push(sym, function_name, -1, &sym->stack)) return FALSE;

1 0

Jacek Caban : mshtml: Pass E_ABORT as binding results of bindings without IBinding in abort_document_bindings .
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: b9bfc10199ba3ae121f9257397b4df2e6f35197e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bfc10199ba3ae121f925739… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:18:23 2011 +0200 mshtml: Pass E_ABORT as binding results of bindings without IBinding in abort_document_bindings. --- dlls/mshtml/navigate.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9e45025..2d45f09 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1649,6 +1649,8 @@ void abort_document_bindings(HTMLDocumentNode *doc) BSCallback *iter, *next; LIST_FOR_EACH_ENTRY_SAFE(iter, next, &doc->bindings, BSCallback, entry) { + TRACE("Aborting %p\n", iter); + if(iter->doc) remove_target_tasks(iter->doc->basedoc.task_magic); @@ -1657,7 +1659,7 @@ void abort_document_bindings(HTMLDocumentNode *doc) else { list_remove(&iter->entry); list_init(&iter->entry); - iter->vtbl->stop_binding(iter, S_OK); + iter->vtbl->stop_binding(iter, E_ABORT); } iter->doc = NULL;

1 0

Jacek Caban : mshtml: Move document binding to the new document binding list in on_start_nsrequest .
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: d7a2da5730f63513e0355f3755aecbb75e312575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a2da5730f63513e0355f375… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:17:59 2011 +0200 mshtml: Move document binding to the new document binding list in on_start_nsrequest. --- dlls/mshtml/navigate.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index eb2ba8f..bdb95a7 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -973,9 +973,12 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) } if(This->window) { + list_remove(&This->bsc.entry); + list_init(&This->bsc.entry); update_window_doc(This->window); if(This->window->doc != This->bsc.doc) This->bsc.doc = This->window->doc; + list_add_head(&This->bsc.doc->bindings, &This->bsc.entry); if(This->window->readystate != READYSTATE_LOADING) set_ready_state(This->window, READYSTATE_LOADING); }

1 0

Alexandre Julliard : Wine release 1.3.20
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: website Branch: master Commit: 59c94b4d468a65cb43b5fd9d42e91894cf17063d URL: http://source.winehq.org/git/website.git/?a=commit;h=59c94b4d468a65cb43b5fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 20:32:42 2011 +0200 Wine release 1.3.20 --- news/en/2011051301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011051301.xml b/news/en/2011051301.xml new file mode 100644 index 0000000..fd52487 --- /dev/null +++ b/news/en/2011051301.xml @@ -0,0 +1,18 @@ +<news> +<date>May 13, 2011</date> +<title>Wine 1.3.20 Released</title> +<body> + The Wine development release 1.3.20 is now available. + <a href="{$root}/announce/1.3.20">What's new</a> in this release: +<ul> + <li>Option to clip the mouse inside fullscreen windows.</li> + <li>Support for persistent HTTP connections.</li> + <li>Initial implementation of the XML writer.</li> + <li>Support for drawing rectangles in the DIB engine.</li> + <li>Volume control in MMDevAPI.</li> + <li>More MSVC runtime functions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Nikolay Sivov : comctl32/tests: Initialize subitem index.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 64cd12d74055def084d4ac51273e67bf182997ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cd12d74055def084d4ac512… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 13 21:56:48 2011 +0400 comctl32/tests: Initialize subitem index. --- dlls/comctl32/tests/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3cfacaf..949b214 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4733,6 +4733,8 @@ static void test_LVM_SETITEMTEXT(void) /* index out of bounds */ item.pszText = testA; item.cchTextMax = 0; /* ignored */ + item.iSubItem = 0; + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 1, (LPARAM)&item); expect(FALSE, ret);

1 0

Tag wine-1.3.20 : Alexandre Julliard : Release 1.3.20
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: refs/tags/wine-1.3.20 Tag: 5cdfdfd6a3f004825ab38ee1b0d06cd2a7508781 URL: http://source.winehq.org/git/wine.git/?a=tag;h=5cdfdfd6a3f004825ab38ee1b0d0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 20:23:06 2011 +0200 Release 1.3.20

1 0

Alexandre Julliard : Release 1.3.20.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 6f5e5ec98b1c9b4f930655e38a8d5ba86a5beac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5e5ec98b1c9b4f930655e38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 13 20:23:04 2011 +0200 Release 1.3.20. --- ANNOUNCE | 1012 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 536 insertions(+), 496 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f5e5ec98b1c9b4f93065…

1 0

Rico Schüller : d3dx9: Parse effect textures.
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: ca5b8e11cc90620250eff2e629143d1af1e489ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5b8e11cc90620250eff2e62… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 13 11:35:34 2011 +0200 d3dx9: Parse effect textures. --- dlls/d3dx9_36/effect.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9de5517..ee0a5ab 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -319,12 +319,17 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) if (param->class == D3DXPC_OBJECT && !param->element_count) { - switch(param->type) + switch (param->type) { case D3DXPT_STRING: HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); break; + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); @@ -1207,7 +1212,10 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH if (data && param && param->data && param->bytes <= bytes) { - if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) + if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER + || param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE) { UINT i; @@ -3358,6 +3366,11 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons switch (param->type) { case D3DXPT_STRING: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: read_dword(ptr, &id); @@ -3579,6 +3592,14 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch param->bytes = sizeof(LPDIRECT3DVERTEXSHADER9); break; + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + param->bytes = sizeof(LPDIRECT3DBASETEXTURE9); + break; + default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); break;

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTexture().
by Alexandre Julliard May 13, 2011

May 13, 2011

Module: wine Branch: master Commit: 041a651431d0532810bc7291967ad9498afeb895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041a651431d0532810bc72919… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 13 11:35:37 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTexture(). --- dlls/d3dx9_36/effect.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ee0a5ab..4332386 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1569,10 +1569,24 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetTexture(ID3DXBaseEffect *iface, D3D static HRESULT WINAPI ID3DXBaseEffectImpl_GetTexture(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 *texture) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, texture %p stub\n", This, parameter, texture); + TRACE("iface %p, parameter %p, texture %p\n", This, parameter, texture); - return E_NOTIMPL; + if (texture && param && !param->element_count && + (param->type == D3DXPT_TEXTURE || param->type == D3DXPT_TEXTURE1D + || param->type == D3DXPT_TEXTURE2D || param->type == D3DXPT_TEXTURE3D + || param->type == D3DXPT_TEXTURECUBE)) + { + *texture = *(LPDIRECT3DBASETEXTURE9 *)param->data; + if (*texture) IDirect3DBaseTexture9_AddRef(*texture); + TRACE("Returning %p\n", *texture); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 *pshader)

1 0