October 2012 - Wine-commits

Jacek Caban : mshtml: Added IHTMLStyleElement:: get_styleSheet imeplementation.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 62c0c7b11fc0e1fd01c513285ca10c61c3b31138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c0c7b11fc0e1fd01c513285… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 14:07:26 2012 +0200 mshtml: Added IHTMLStyleElement::get_styleSheet imeplementation. --- dlls/mshtml/htmlstyleelem.c | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index bfc12b6..cbb2af4 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -39,6 +39,7 @@ typedef struct { IHTMLStyleElement IHTMLStyleElement_iface; nsIDOMHTMLStyleElement *nsstyle; + IHTMLStyleSheet *style_sheet; } HTMLStyleElement; static inline HTMLStyleElement *impl_from_IHTMLStyleElement(IHTMLStyleElement *iface) @@ -183,8 +184,31 @@ static HRESULT WINAPI HTMLStyleElement_get_onerror(IHTMLStyleElement *iface, VAR static HRESULT WINAPI HTMLStyleElement_get_styleSheet(IHTMLStyleElement *iface, IHTMLStyleSheet **p) { HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nsstyle) + return E_FAIL; + + if(!This->style_sheet) { + nsIDOMStyleSheet *ss; + nsresult nsres; + + nsres = nsIDOMHTMLStyleElement_GetDOMStyleSheet(This->nsstyle, &ss); + assert(nsres == NS_OK); + + if(ss) { + This->style_sheet = HTMLStyleSheet_Create(ss); + nsIDOMStyleSheet_Release(ss); + if(!This->style_sheet) + return E_OUTOFMEMORY; + } + } + + if(This->style_sheet) + IHTMLStyleSheet_AddRef(This->style_sheet); + *p = This->style_sheet; + return S_OK; } static HRESULT WINAPI HTMLStyleElement_put_disabled(IHTMLStyleElement *iface, VARIANT_BOOL v) @@ -283,9 +307,21 @@ static HRESULT HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } +static void HTMLStyleElement_destructor(HTMLDOMNode *iface) +{ + HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + + if(This->style_sheet) { + IHTMLStyleSheet_Release(This->style_sheet); + This->style_sheet = NULL; + } + + HTMLElement_destructor(iface); +} + static const NodeImplVtbl HTMLStyleElementImplVtbl = { HTMLStyleElement_QI, - HTMLElement_destructor, + HTMLStyleElement_destructor, HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col

1 0

Jacek Caban : mshtml: Moved creating HTML element to separated function.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 878b85825accd0b4adbfb8555d06b8bd4d42031b URL: http://source.winehq.org/git/wine.git/?a=commit;h=878b85825accd0b4adbfb8555… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 14:07:44 2012 +0200 mshtml: Moved creating HTML element to separated function. --- dlls/mshtml/htmldoc.c | 14 +------------- dlls/mshtml/htmlelem.c | 18 ++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6954d17..986397c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1033,24 +1033,12 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa IHTMLElement **newElem) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - HTMLDocumentNode *doc_node; - nsIDOMHTMLElement *nselem; HTMLElement *elem; HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(eTag), newElem); - /* Use owner doc if called on document fragment */ - doc_node = This->doc_node; - if(!doc_node->nsdoc) - doc_node = doc_node->node.doc; - - hres = create_nselem(doc_node, eTag, &nselem); - if(FAILED(hres)) - return hres; - - hres = HTMLElement_Create(doc_node, (nsIDOMNode*)nselem, TRUE, &elem); - nsIDOMHTMLElement_Release(nselem); + hres = create_element(This->doc_node, eTag, &elem); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index aa3b68f..157d7af 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -199,6 +199,24 @@ HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement return S_OK; } +HRESULT create_element(HTMLDocumentNode *doc, const WCHAR *tag, HTMLElement **ret) +{ + nsIDOMHTMLElement *nselem; + HRESULT hres; + + /* Use owner doc if called on document fragment */ + if(!doc->nsdoc) + doc = doc->node.doc; + + hres = create_nselem(doc, tag, &nselem); + if(FAILED(hres)) + return hres; + + hres = HTMLElement_Create(doc, (nsIDOMNode*)nselem, TRUE, ret); + nsIDOMHTMLElement_Release(nselem); + return hres; +} + static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, REFIID riid, void **ppv) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a30895d..d199d21 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -838,6 +838,7 @@ HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; +HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN;

1 0

Lucas Zawacki : Portuguese translation for 08/21 news
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: a77bcc56ff8015b73640965515f50aca8031ad11 URL: http://source.winehq.org/git/website.git/?a=commit;h=a77bcc56ff8015b7364096… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:34 2012 -0300 Portuguese translation for 08/21 news --- news/pt/2012082101.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/news/pt/2012082101.xml b/news/pt/2012082101.xml new file mode 100644 index 0000000..4b99189 --- /dev/null +++ b/news/pt/2012082101.xml @@ -0,0 +1,5 @@ +<news> +<date>21 de Agosto de 2012</date> +<title>Doações do JIB</title> +<body> +O projeto <a href="http://jib.magicermine.com">Jinn in the Bottle</a> recentemente anunciou que estará doando 15% de suas vendas para o Wine.</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.12
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: ed35cf50b54f77dce9dd6ba35895abfb6d2c8cd8 URL: http://source.winehq.org/git/website.git/?a=commit;h=ed35cf50b54f77dce9dd6b… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:35 2012 -0300 Portuguese translation for release 1.5.12 --- news/pt/2012083101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pt/2012083101.xml b/news/pt/2012083101.xml new file mode 100644 index 0000000..7b4575e --- /dev/null +++ b/news/pt/2012083101.xml @@ -0,0 +1,15 @@ +<news> +<date>31 de Agosto de 2012</date> +<title>Wine 1.5.12 lançado</title> +<body> + A versão de desenvolvimento 1.5.12 já está disponível. + <a href="{$root}/announce/1.5.12">Novidades</a> nesta versão: +<ul> + <li>Possibilidade de desativar joysticks individualmente.</li> + <li>Melhor suporte às tabelas de constantes do D3DX9.</li> + <li>Algumas melhoras no XRandR.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.12.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.13
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: 5ecc071831e9600303fe93409926331ca8ac530f URL: http://source.winehq.org/git/website.git/?a=commit;h=5ecc071831e9600303fe93… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:36 2012 -0300 Portuguese translation for release 1.5.13 --- news/pt/2012091401.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pt/2012091401.xml b/news/pt/2012091401.xml new file mode 100644 index 0000000..6b82387 --- /dev/null +++ b/news/pt/2012091401.xml @@ -0,0 +1,18 @@ +<news> +<date>14 de Setembro de 2012</date> +<title>Wine 1.5.13 lançado</title> +<body> + A versão de desenvolvimento 1.5.13 já está disponível. + <a href="{$root}/announce/1.5.13">Novidades</a> nesta versão: +<ul> + <li>Desenho de janelas em Client-side usando a DIB engine.</li> + <li>Suporte para Raw input do teclado e mouse.</li> + <li>Suporte a janelas com áreas transparentes usando color keying.</li> + <li>Suporte a C++ RTTI em processadores 64-bit.</li> + <li>Implementação de informações lógicas de processador.</li> + <li>Suporte a fontes com nomes localizados.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.13.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.14
by Jeremy Newman 11 Oct '12

11 Oct '12

Module: website Branch: master Commit: 0a0ee01f9c633eeacb86af50ed2e428823814665 URL: http://source.winehq.org/git/website.git/?a=commit;h=0a0ee01f9c633eeacb86af… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Oct 11 14:53:37 2012 -0300 Portuguese translation for release 1.5.14 --- news/pt/2012092801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2012092801.xml b/news/pt/2012092801.xml new file mode 100644 index 0000000..64b6cd3 --- /dev/null +++ b/news/pt/2012092801.xml @@ -0,0 +1,16 @@ +<news> +<date>28 de Setembro de 2012</date> +<title>Wine 1.5.14 lançado</title> +<body> + A versão de desenvolvimento 1.5.14 já está disponível. + <a href="{$root}/announce/1.5.14">Novidades</a> nesta versão: +<ul> + <li>Grandes melhorias no comportamento da cache de URL.</li> + <li>Melhorias no suporte a imagens GIF.</li> + <li>Melhorias no analisador do compilador de shaders.</li> + <li>Otimizações do JavaScript.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.14.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Roman Dadkov : ole32: Fix dwClsContext parameter of a CoCreateInstance call in DefaultHandler_Run .
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 9e145eebdfbaa0fee22ff8c4eb7c33da67040981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e145eebdfbaa0fee22ff8c4e… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Tue Oct 9 14:49:50 2012 +0400 ole32: Fix dwClsContext parameter of a CoCreateInstance call in DefaultHandler_Run. --- dlls/ole32/defaulthandler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 577d976..b4e8203 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1322,7 +1322,7 @@ static HRESULT WINAPI DefaultHandler_Run( release_delegates(This); - hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER, + hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_ALL, &IID_IOleObject, (void **)&This->pOleDelegate); if (FAILED(hr)) return hr;

1 0

Matteo Bruni : wined3d: Recognize Radeon HD 6970 as reported on some Macs.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: 3d71c2d1cae32543fa1415de9e30a47568fb62ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d71c2d1cae32543fa1415de9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:56 2012 +0200 wined3d: Recognize Radeon HD 6970 as reported on some Macs. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1120a9e..24ed040 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1708,6 +1708,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 7800", CARD_AMD_RADEON_HD7800}, {"HD 7700", CARD_AMD_RADEON_HD7700}, /* Northern Islands */ + {"HD 6970", CARD_AMD_RADEON_HD6900}, {"HD 6900", CARD_AMD_RADEON_HD6900}, {"HD 6800", CARD_AMD_RADEON_HD6800}, {"HD 6770M",CARD_AMD_RADEON_HD6600M},

1 0

Matteo Bruni : d3d8: Use proper helper.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: f90f895759bf541ca1a245814beba67ed257cd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90f895759bf541ca1a245814… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:57 2012 +0200 d3d8: Use proper helper. --- dlls/d3d8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b16d5bf..8cd150f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -168,7 +168,7 @@ static void check_mipmap_levels(IDirect3DDevice8 *device, UINT width, UINT heigh } else trace("CreateTexture failed: %#08x\n", hr); - if (texture) IDirect3DDevice8_Release( texture ); + if (texture) IDirect3DBaseTexture8_Release( texture ); } static void test_mipmap_levels(void)

1 0

Matteo Bruni : d3dcompiler: Fix "for" syntax.
by Alexandre Julliard 10 Oct '12

10 Oct '12

Module: wine Branch: master Commit: f4eccde66d7942165d48375f9f9adce679f7169b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4eccde66d7942165d48375f9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 10 18:25:58 2012 +0200 d3dcompiler: Fix "for" syntax. --- dlls/d3dcompiler_43/hlsl.y | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 8627e54..afb12ec 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -320,7 +320,7 @@ enum loop_type }; static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, - struct list *iter, struct list *body, struct source_location *loc) + struct hlsl_ir_node *iter, struct list *body, struct source_location *loc) { struct list *list = NULL; struct hlsl_ir_loop *loop = NULL; @@ -355,14 +355,13 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l list_move_tail(loop->body, body); if (iter) - list_move_tail(loop->body, iter); + list_add_tail(loop->body, &iter->entry); if (type == LOOP_DO_WHILE) list_add_tail(loop->body, &cond_jump->node.entry); d3dcompiler_free(init); d3dcompiler_free(cond); - d3dcompiler_free(iter); d3dcompiler_free(body); return list; @@ -375,7 +374,7 @@ oom: d3dcompiler_free(list); free_instr_list(init); free_instr_list(cond); - free_instr_list(iter); + free_instr(iter); free_instr_list(body); return NULL; } @@ -1651,7 +1650,7 @@ loop_statement: KW_WHILE '(' expr ')' statement set_location(&loc, &@1); $$ = create_loop(LOOP_DO_WHILE, NULL, cond, NULL, $2, &loc); } - | KW_FOR '(' scope_start expr_statement expr_statement expr_statement ')' statement + | KW_FOR '(' scope_start expr_statement expr_statement expr ')' statement { struct source_location loc; @@ -1659,7 +1658,7 @@ loop_statement: KW_WHILE '(' expr ')' statement $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); pop_scope(&hlsl_ctx); } - | KW_FOR '(' scope_start declaration expr_statement expr_statement ')' statement + | KW_FOR '(' scope_start declaration expr_statement expr ')' statement { struct source_location loc;

1 0