February 2011 - Wine-commits

André Hentschel : Wine 1.3.14 freigegeben
by Jeremy Newman 22 Feb '11

22 Feb '11

Module: website Branch: master Commit: 3e6ac8f42ef558408cb51c53fbd67595d88bb30d URL: http://source.winehq.org/git/website.git/?a=commit;h=3e6ac8f42ef558408cb51c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 19 17:30:25 2011 +0100 Wine 1.3.14 freigegeben --- news/de/2011021801.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2011021801.xml b/news/de/2011021801.xml new file mode 100644 index 0000000..78eeee9 --- /dev/null +++ b/news/de/2011021801.xml @@ -0,0 +1,15 @@ +<news> +<date>18. Februar 2011</date> +<title>Wine 1.3.14 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.3.14 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.3.14">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele Aufräumarbeiten für Valgrind and Clang Warnungen.</li> + <li>Unterstützung für das Erstellen von komprimierte Cabinetdateien.</li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul></p> +<p><p>Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.14.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</p></body></news>

1 0

André Hentschel : Remove obsolete and wrong donation infos
by Jeremy Newman 22 Feb '11

22 Feb '11

Module: website Branch: master Commit: fb6c58a665aa33ddc9df207a537547613eaafe3c URL: http://source.winehq.org/git/website.git/?a=commit;h=fb6c58a665aa33ddc9df20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 19 17:31:48 2011 +0100 Remove obsolete and wrong donation infos As from jwhite: > As far as I know, we have received no income from Sourceforge since July > of 2009, and no income from Amazon and CDNow, ever. --- templates/de/contributing.template | 7 ------- templates/de/donate.template | 27 --------------------------- templates/en/contributing.template | 6 ------ templates/en/donate.template | 27 --------------------------- templates/he/contributing.template | 6 ------ templates/pl/donate.template | 27 --------------------------- templates/pt/contributing.template | 6 ------ 7 files changed, 0 insertions(+), 106 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index a1c94eb..18601bd 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -358,16 +358,9 @@ </div> </form> -<p>Wir haben außerdem ein PayPal Konto bei - <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge</a></p> - <p>Darüberhinaus kannst Du Bargeld, Schecks oder internationale Zahlungsanweisungen in US Währung an untenstehende Adresse senden:</p> <address>Wine Project Software Freedom Conservancy 1995 Broadway FL 17 New York, NY 10023-5882</address> -<p>Kauf Bücher oder Musik bei <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq"> - Amazon.com</a> oder <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> (nutze - ausschließlich diese speziellen Links, so dass der Wine Party Fonds das - Guthaben erhält).</p> diff --git a/templates/de/donate.template b/templates/de/donate.template index 580fbc6..4524217 100644 --- a/templates/de/donate.template +++ b/templates/de/donate.template @@ -49,31 +49,4 @@ </td> </tr> - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon</a> - </td> - <td valign="top"> - Kaufe bei <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon.com</a> speziell über diesen Link. - </td> - </tr> - -<tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> - </td> - <td valign="top"> - Kaufe bei <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> speziell über diesen Link. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge</a> - </td> - <td valign="top"> - Wir haben auch ein <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge.net</a> PayPal Konto. - </td> - </tr> - </table> diff --git a/templates/en/contributing.template b/templates/en/contributing.template index f868af5..255aa5a 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -322,14 +322,8 @@ permitted by law.</p> </div> </form> -<p>We also have a SourceForge PayPal account - <a href="http://sourceforge.net/donate/index.php?group_id=6241">sourceforge.net</a></p> - <p>You can also send cash, cheque or international money order in US funds to:</p> <address>Wine Project Software Freedom Conservancy 1995 Broadway FL 17 New York, NY 10023-5882</address> -<p>Purchase books or music from <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq"> - Amazon.com</a> or <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> (Use - these specific links only, so that the Wine Party Fund gets the credit.)</p> diff --git a/templates/en/donate.template b/templates/en/donate.template index 4006308..5ba193e 100644 --- a/templates/en/donate.template +++ b/templates/en/donate.template @@ -47,31 +47,4 @@ </td> </tr> - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon</a> - </td> - <td valign="top"> - Purchase from <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon.com</a> through that specific link. - </td> - </tr> - -<tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> - </td> - <td valign="top"> - Purchase from <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> through that specific link. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge</a> - </td> - <td valign="top"> - We also have a <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge.net</a> PayPal account. - </td> - </tr> - </table> diff --git a/templates/he/contributing.template b/templates/he/contributing.template index 088b5b5..2091c0f 100644 --- a/templates/he/contributing.template +++ b/templates/he/contributing.template @@ -320,14 +320,8 @@ permitted by law.</p> </div> </form> -<p>We also have a SourceForge PayPal account - <a href="http://sourceforge.net/donate/index.php?group_id=6241">sourceforge.net</a></p> - <p>You can also send cash, cheque or international money order in US funds to:</p> <address>Wine Project Software Freedom Conservancy 1995 Broadway FL 17 New York, NY 10023-5882</address> -<p>Purchase books or music from <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq"> - Amazon.com</a> or <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> (Use - these specific links only, so that the Wine Party Fund gets the credit.)</p> diff --git a/templates/pl/donate.template b/templates/pl/donate.template index dc30249..fc22d1d 100644 --- a/templates/pl/donate.template +++ b/templates/pl/donate.template @@ -47,31 +47,4 @@ </td> </tr> - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon</a> - </td> - <td valign="top"> - Kupuj na <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq">Amazon.com</a> przez ten konkretny link. - </td> - </tr> - -<tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> - </td> - <td valign="top"> - Kupuj na <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> przez ten konkretny link. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge</a> - </td> - <td valign="top"> - Posiadamy także konto <a href="http://sourceforge.net/donate/index.php?group_id=6241">SourceForge.net</a>na PayPalu. - </td> - </tr> - </table> diff --git a/templates/pt/contributing.template b/templates/pt/contributing.template index e3a1e46..3c25e82 100644 --- a/templates/pt/contributing.template +++ b/templates/pt/contributing.template @@ -341,15 +341,9 @@ </div> </form> -<p>Nós também temos uma conta de PayPal na SourceForge - <a href="http://sourceforge.net/donate/index.php?group_id=6241">sourceforge.net</a></p> - <p>Pode também enviar dinheiro, cheques ou ordens de câmbio internacionais em fundos dos Estados Unidos para:</p> <address>Wine Project Software Freedom Conservancy 1995 Broadway FL 17 New York, NY 10023-5882</address> -<p>Compre livros ou música em <a href="http://www.amazon.com/exec/obidos/redirect-home/winehq"> - Amazon.com</a> ou <a href="http://www.cdnow.com/from=sr-1093221">CDnow</a> - (Utilize apenas estes links, para que o Wine Party Fund receba o crédito)</p>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.3 and 1.3.14
by Jeremy Newman 22 Feb '11

22 Feb '11

Module: website Branch: master Commit: f57d1927658c51a670b1ef6966f79794b3315dc1 URL: http://source.winehq.org/git/website.git/?a=commit;h=f57d1927658c51a670b1ef… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Feb 20 17:48:51 2011 +0100 Polish translation for release 1.3.3 and 1.3.14 --- news/pl/2010091801.xml | 19 +++++++++++++++++++ news/pl/2011021801.xml | 15 +++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/news/pl/2010091801.xml b/news/pl/2010091801.xml new file mode 100644 index 0000000..3dab609 --- /dev/null +++ b/news/pl/2010091801.xml @@ -0,0 +1,19 @@ +<news> +<date>Wrzesień 18, 2010</date> +<title>Wydano Wine 1.3.3</title> +<body> +<p> Wydanie rozwojowe Wine 1.3.3 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.3.3">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszone wsparcie dla tekstu od-prawej-do-lewej.</li> + <li>Wsparcie dla obrazów CMYK JPEG.</li> + <li>Początki implementacji Game Explorer.</li> + <li>Ulepszone wsparcie 64-bitów w MSI.</li> + <li>Zalążek apletu panelu kontrolnego inetcpl.</li> + <li>Kilka poprawek dla wsparcia crypto.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news> diff --git a/news/pl/2011021801.xml b/news/pl/2011021801.xml new file mode 100644 index 0000000..30107d2 --- /dev/null +++ b/news/pl/2011021801.xml @@ -0,0 +1,15 @@ +<news> +<date>Luty 18, 2011</date> +<title>Wydano Wine 1.3.14</title> +<body> +<p> Wydanie rozwojowe Wine 1.3.14 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.3.14">Co nowego</a> w tym wydaniu: +<ul> + <li>Wiele porządków adresujących problem ostrzeżeń z Valgrind i Clang.</li> + <li>Wsparcie dla tworzenia skompresowanych plików cabinet.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul></p> +<p><p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.14.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Dmitry Timoshkov : gdi32: Do not leak the hfont list (Valgrind).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: e0f5ddddf1a5f5d007576ef16d3221c0e178dc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f5ddddf1a5f5d007576ef16… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 21 18:21:46 2011 +0800 gdi32: Do not leak the hfont list (Valgrind). --- dlls/gdi32/freetype.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index edddde1..506c994 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3086,20 +3086,20 @@ static void free_font(GdiFont *font) LIST_FOR_EACH_SAFE(cursor, cursor2, &font->child_fonts) { CHILD_FONT *child = LIST_ENTRY(cursor, CHILD_FONT, entry); - struct list *first_hfont; - HFONTLIST *hfontlist; list_remove(cursor); if(child->font) - { - first_hfont = list_head(&child->font->hfontlist); - hfontlist = LIST_ENTRY(first_hfont, HFONTLIST, entry); - DeleteObject(hfontlist->hfont); - HeapFree(GetProcessHeap(), 0, hfontlist); free_font(child->font); - } HeapFree(GetProcessHeap(), 0, child); } + LIST_FOR_EACH_SAFE(cursor, cursor2, &font->hfontlist) + { + HFONTLIST *hfontlist = LIST_ENTRY(cursor, HFONTLIST, entry); + DeleteObject(hfontlist->hfont); + list_remove(&hfontlist->entry); + HeapFree(GetProcessHeap(), 0, hfontlist); + } + if (font->ft_face) pFT_Done_Face(font->ft_face); if (font->mapping) unmap_font_file( font->mapping ); HeapFree(GetProcessHeap(), 0, font->kern_pairs);

1 0

Alistair Leslie-Hughes : mshtml: Add support for get/put mousemove event.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 62c8c143c46c4b8cd8a1c0042a859832b2bd43f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c8c143c46c4b8cd8a1c0042… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 21 20:23:48 2011 +1100 mshtml: Add support for get/put mousemove event. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- dlls/mshtml/htmlelem.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2b05ab9..0d42d4f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1146,15 +1146,19 @@ static HRESULT WINAPI HTMLDocument_get_onmousedown(IHTMLDocument2 *iface, VARIAN static HRESULT WINAPI HTMLDocument_put_onmousemove(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_doc_event(This, EVENTID_MOUSEMOVE, &v); } static HRESULT WINAPI HTMLDocument_get_onmousemove(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MOUSEMOVE, p); } static HRESULT WINAPI HTMLDocument_put_onmouseout(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d1df6f4..6d05a4e 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -592,15 +592,19 @@ static HRESULT WINAPI HTMLElement_get_onmouseover(IHTMLElement *iface, VARIANT * static HRESULT WINAPI HTMLElement_put_onmousemove(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->node, EVENTID_MOUSEMOVE, &v); } static HRESULT WINAPI HTMLElement_get_onmousemove(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_MOUSEMOVE, p); } static HRESULT WINAPI HTMLElement_put_onmousedown(IHTMLElement *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 59ca9ff..19a6013 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -83,6 +83,9 @@ static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; static const WCHAR mousedownW[] = {'m','o','u','s','e','d','o','w','n',0}; static const WCHAR onmousedownW[] = {'o','n','m','o','u','s','e','d','o','w','n',0}; +static const WCHAR mousemoveW[] = {'m','o','u','s','e','m','o','v','e',0}; +static const WCHAR onmousemoveW[] = {'o','n','m','o','u','s','e','m','o','v','e',0}; + static const WCHAR mouseoutW[] = {'m','o','u','s','e','o','u','t',0}; static const WCHAR onmouseoutW[] = {'o','n','m','o','u','s','e','o','u','t',0}; @@ -162,6 +165,8 @@ static const event_info_t event_info[] = { EVENT_NODEHANDLER}, {mousedownW, onmousedownW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {mousemoveW, onmousemoveW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseoutW, onmouseoutW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEOUT, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mouseoverW, onmouseoverW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEOVER, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 3a8619a..6089504 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -30,6 +30,7 @@ typedef enum { EVENTID_KEYUP, EVENTID_LOAD, EVENTID_MOUSEDOWN, + EVENTID_MOUSEMOVE, EVENTID_MOUSEOUT, EVENTID_MOUSEOVER, EVENTID_MOUSEUP,

1 0

Jacek Caban : include: Make some include guards compatible with MS headers.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 6ef4e780274e1b7a4cec4d32733bbf497eeb4135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef4e780274e1b7a4cec4d327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 21 13:00:07 2011 +0100 include: Make some include guards compatible with MS headers. This is for compatibility with mingw-w64. --- include/ddraw.h | 6 +++--- include/ddrawi.h | 6 +++--- include/ddstream.idl | 2 +- include/dinput.h | 6 +++--- include/dsound.h | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 88990f0..3eef218 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_DDRAW_H -#define __WINE_DDRAW_H +#ifndef __DDRAW_INCLUDED__ +#define __DDRAW_INCLUDED__ #define COM_NO_WINDOWS_H #include <objbase.h> @@ -2678,4 +2678,4 @@ HRESULT WINAPI DirectDrawCreateClipper(DWORD,LPDIRECTDRAWCLIPPER*,IUnknown*); } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* __WINE_DDRAW_H */ +#endif /* __DDRAW_INCLUDED__ */ diff --git a/include/ddrawi.h b/include/ddrawi.h index 4e3c9e3..a695a1c 100644 --- a/include/ddrawi.h +++ b/include/ddrawi.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_DDRAWI_H -#define __WINE_DDRAWI_H +#ifndef __DDRAWI_INCLUDED__ +#define __DDRAWI_INCLUDED__ #include <ddraw.h> #include <dciddi.h> /* the DD HAL is layered onto DCI escapes */ @@ -1067,4 +1067,4 @@ typedef struct _DDRAWI_DDRAWPALETTE_LCL { } /* extern "C" */ #endif -#endif /* __WINE_DDRAWI_H */ +#endif /* __DDRAWI_INCLUDED__ */ diff --git a/include/ddstream.idl b/include/ddstream.idl index 947e2bc..e2ad466 100644 --- a/include/ddstream.idl +++ b/include/ddstream.idl @@ -19,7 +19,7 @@ import "unknwn.idl"; import "mmstream.idl"; -cpp_quote("#ifndef __WINE_DDRAW_H") +cpp_quote("#ifndef __DDRAW_INCLUDED__") typedef void * LPDDSURFACEDESC; typedef struct tDDSURFACEDESC DDSURFACEDESC; interface IDirectDraw; diff --git a/include/dinput.h b/include/dinput.h index ac3aaba..c52a1b7 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_DINPUT_H -#define __WINE_DINPUT_H +#ifndef __DINPUT_INCLUDED__ +#define __DINPUT_INCLUDED__ #define COM_NO_WINDOWS_H #include <objbase.h> @@ -2298,4 +2298,4 @@ HRESULT WINAPI DirectInputCreateEx(HINSTANCE,DWORD,REFIID,LPVOID *,LPUNKNOWN); }; #endif -#endif /* __WINE_DINPUT_H */ +#endif /* __DINPUT_INCLUDED__ */ diff --git a/include/dsound.h b/include/dsound.h index dc1ead3..372fabf 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_DSOUND_H -#define __WINE_DSOUND_H +#ifndef __DSOUND_INCLUDED__ +#define __DSOUND_INCLUDED__ #ifndef DIRECTSOUND_VERSION #define DIRECTSOUND_VERSION 0x0900 @@ -1194,4 +1194,4 @@ DECLARE_INTERFACE_(IDirectSoundFullDuplex,IUnknown) } /* extern "C" */ #endif /* defined(__cplusplus) */ -#endif /* __WINE_DSOUND_H */ +#endif /* __DSOUND_INCLUDED__ */

1 0

Dylan Smith : d3dx9: Add stubs for D3DXCreateText.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 5fe7522ba1a17e1aba129df4683cebf55e8d7835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe7522ba1a17e1aba129df46… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 21 09:29:56 2011 -0500 d3dx9: Add stubs for D3DXCreateText. --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/mesh.c | 24 ++++++++++++++++++++++++ include/d3dx9shape.h | 19 +++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index cbb6d20..f91f962 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -90,8 +90,8 @@ @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) -@ stub D3DXCreateTextA -@ stub D3DXCreateTextW +@ stdcall D3DXCreateTextA(ptr long str float float ptr ptr ptr) +@ stdcall D3DXCreateTextW(ptr long wstr float float ptr ptr ptr) @ stdcall D3DXCreateTexture(ptr long long long long long long ptr) @ stdcall D3DXCreateTextureFromFileA(ptr str ptr) @ stdcall D3DXCreateTextureFromFileExA(ptr str long long long long long long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d9dd01f..f8f7c48 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1499,3 +1499,27 @@ HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3 return E_NOTIMPL; } + +HRESULT WINAPI D3DXCreateTextA(LPDIRECT3DDEVICE9 device, + HDC hdc, LPCSTR text, + FLOAT deviation, FLOAT extrusion, + LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics) +{ + FIXME("(%p, %p, %s, %f, %f, %p, %p, %p): stub\n", device, hdc, + debugstr_a(text), deviation, extrusion, mesh, adjacency, glyphmetrics); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, + HDC hdc, LPCWSTR text, + FLOAT deviation, FLOAT extrusion, + LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics) +{ + FIXME("(%p, %p, %s, %f, %f, %p, %p, %p): stub\n", device, hdc, + debugstr_w(text), deviation, extrusion, mesh, adjacency, glyphmetrics); + + return E_NOTIMPL; +} diff --git a/include/d3dx9shape.h b/include/d3dx9shape.h index 1a521de..690b183 100644 --- a/include/d3dx9shape.h +++ b/include/d3dx9shape.h @@ -52,6 +52,25 @@ HRESULT WINAPI D3DXCreateTeapot(LPDIRECT3DDEVICE9 device, LPD3DXMESH *mesh, LPD3DXBUFFER *adjacency); +HRESULT WINAPI D3DXCreateTextA(LPDIRECT3DDEVICE9 device, + HDC hdc, + LPCSTR text, + FLOAT deviation, + FLOAT extrusion, + LPD3DXMESH *mesh, + LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics); + +HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, + HDC hdc, + LPCWSTR text, + FLOAT deviation, + FLOAT extrusion, + LPD3DXMESH *mesh, + LPD3DXBUFFER *adjacency, + LPGLYPHMETRICSFLOAT glyphmetrics); +#define D3DXCreateText WINELIB_NAME_AW(D3DXCreateText) + #ifdef __cplusplus } #endif

1 0

Jörg Höhle : winmm: Let WideCharToMultiByte search for NUL string terminator (Valgrind).
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: fd8576bfdbaa6de55ba5bb5833f7f92173035a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8576bfdbaa6de55ba5bb583… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Feb 20 18:55:12 2011 +0100 winmm: Let WideCharToMultiByte search for NUL string terminator (Valgrind). --- dlls/winmm/mci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 8a889d2..0fcccec 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -464,7 +464,7 @@ static void MCI_UnmapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR dwParam2, if (!result) { WideCharToMultiByte(CP_ACP, 0, - mci_sysinfoW->lpstrReturn, mci_sysinfoW->dwRetSize, + mci_sysinfoW->lpstrReturn, -1, mci_sysinfoA->lpstrReturn, mci_sysinfoA->dwRetSize, NULL, NULL); } @@ -482,7 +482,7 @@ static void MCI_UnmapMsgAtoW(UINT msg, DWORD_PTR dwParam1, DWORD_PTR dwParam2, if (!result) { WideCharToMultiByte(CP_ACP, 0, - mci_infoW->lpstrReturn, mci_infoW->dwRetSize, + mci_infoW->lpstrReturn, -1, mci_infoA->lpstrReturn, mci_infoA->dwRetSize, NULL, NULL); }

1 0

Rico Schüller : d3dcompiler: Parse reflection constant buffers.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 3f6c54f26306dee49064c20e7c780d1f49ffbbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6c54f26306dee49064c20e7… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:11 2011 +0100 d3dcompiler: Parse reflection constant buffers. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 ++++ dlls/d3dcompiler_43/reflection.c | 106 +++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index bc99322..bec51e5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -64,6 +64,19 @@ struct d3dcompiler_shader_signature char *string_data; }; +struct d3dcompiler_shader_reflection_constant_buffer +{ + ID3D11ShaderReflectionConstantBuffer ID3D11ShaderReflectionConstantBuffer_iface; + + struct d3dcompiler_shader_reflection *reflection; + + char *name; + D3D_CBUFFER_TYPE type; + UINT variable_count; + UINT size; + UINT flags; +}; + /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { @@ -109,6 +122,7 @@ struct d3dcompiler_shader_reflection struct d3dcompiler_shader_signature *pcsg; char *resource_string; D3D11_SHADER_INPUT_BIND_DESC *bound_resources; + struct d3dcompiler_shader_reflection_constant_buffer *constant_buffers; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e1ba543..b382d83 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -63,6 +63,11 @@ static void free_signature(struct d3dcompiler_shader_signature *sig) HeapFree(GetProcessHeap(), 0, sig->string_data); } +static void free_constant_buffer(struct d3dcompiler_shader_reflection_constant_buffer *cb) +{ + HeapFree(GetProcessHeap(), 0, cb->name); +} + static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) { TRACE("Cleanup %p\n", ref); @@ -85,6 +90,17 @@ static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) HeapFree(GetProcessHeap(), 0, ref->pcsg); } + if (ref->constant_buffers) + { + unsigned int i; + + for (i = 0; i < ref->constant_buffer_count; ++i) + { + free_constant_buffer(&ref->constant_buffers[i]); + } + } + + HeapFree(GetProcessHeap(), 0, ref->constant_buffers); HeapFree(GetProcessHeap(), 0, ref->bound_resources); HeapFree(GetProcessHeap(), 0, ref->resource_string); HeapFree(GetProcessHeap(), 0, ref->creator); @@ -427,6 +443,40 @@ const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = d3dcompiler_shader_reflection_GetThreadGroupSize, }; +/* ID3D11ShaderReflectionConstantBuffer methods */ + +static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc( + ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex( + ID3D11ShaderReflectionConstantBuffer *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByName( + ID3D11ShaderReflectionConstantBuffer *iface, LPCSTR name) +{ + FIXME("iface %p, name %s stub!\n", iface, name); + + return NULL; +} + +const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl = +{ + /* ID3D11ShaderReflectionConstantBuffer methods */ + d3dcompiler_shader_reflection_constant_buffer_GetDesc, + d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex, + d3dcompiler_shader_reflection_constant_buffer_GetVariableByName, +}; + static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) { const char *ptr = data; @@ -542,11 +592,10 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c const char *ptr = data; DWORD size = data_size >> 2; DWORD offset, cbuffer_offset, resource_offset, creator_offset; - unsigned int i; - unsigned int string_data_offset; - unsigned int string_data_size; + unsigned int i, string_data_offset, string_data_size; char *string_data = NULL, *creator = NULL; D3D11_SHADER_INPUT_BIND_DESC *bound_resources = NULL; + struct d3dcompiler_shader_reflection_constant_buffer *constant_buffers = NULL; HRESULT hr; TRACE("Size %u\n", size); @@ -640,15 +689,64 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c } } - /* todo: Parse Constant buffers */ + if (r->constant_buffer_count) + { + constant_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, r->constant_buffer_count * sizeof(*constant_buffers)); + if (!constant_buffers) + { + ERR("Failed to allocate constant buffer memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + ptr = data + cbuffer_offset; + for (i = 0; i < r->constant_buffer_count; i++) + { + struct d3dcompiler_shader_reflection_constant_buffer *cb = &constant_buffers[i]; + + cb->ID3D11ShaderReflectionConstantBuffer_iface.lpVtbl = &d3dcompiler_shader_reflection_constant_buffer_vtbl; + cb->reflection = r; + + read_dword(&ptr, &offset); + if (!copy_name(data + offset, &cb->name)) + { + ERR("Failed to copy name.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + TRACE("Name: %s.\n", debugstr_a(cb->name)); + + read_dword(&ptr, &cb->variable_count); + TRACE("Variable count: %u\n", cb->variable_count); + + /* todo: Parse variables */ + read_dword(&ptr, &offset); + FIXME("Variable offset: %x\n", offset); + + read_dword(&ptr, &cb->size); + TRACE("Cbuffer size: %u\n", cb->size); + + read_dword(&ptr, &cb->flags); + TRACE("Cbuffer flags: %u\n", cb->flags); + + read_dword(&ptr, &cb->type); + TRACE("Cbuffer type: %#x\n", cb->type); + } + } r->creator = creator; r->resource_string = string_data; r->bound_resources = bound_resources; + r->constant_buffers = constant_buffers; return S_OK; err_out: + for (i = 0; i < r->constant_buffer_count; ++i) + { + free_constant_buffer(&constant_buffers[i]); + } + HeapFree(GetProcessHeap(), 0, constant_buffers); HeapFree(GetProcessHeap(), 0, bound_resources); HeapFree(GetProcessHeap(), 0, string_data); HeapFree(GetProcessHeap(), 0, creator);

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetConstantBufferByIndex().
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: a7483f4bcc13f287c1f1b0150304ee471b12fcfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7483f4bcc13f287c1f1b0150… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:14 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetConstantBufferByIndex(). --- dlls/d3dcompiler_43/reflection.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b382d83..3c4d138 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -31,6 +31,11 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7 = 7, }; +const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflection_constant_buffer_vtbl; + +/* null objects - needed for invalid calls */ +static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = {{&d3dcompiler_shader_reflection_constant_buffer_vtbl}}; + static BOOL copy_name(const char *ptr, char **name) { size_t name_len; @@ -216,9 +221,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11Sha static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByIndex( ID3D11ShaderReflection *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->constant_buffer_count) + { + WARN("Invalid argument specified\n"); + return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; + } + + return &This->constant_buffers[index].ID3D11ShaderReflectionConstantBuffer_iface; } static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName(

1 0