January 2011 - Wine-commits

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLTable iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 031f595a05d2adc05d702313e0d215db1d5135fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=031f595a05d2adc05d702313e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:51:47 2011 +0100 mshtml: COM cleanup for the IHTMLTable iface. --- dlls/mshtml/htmltable.c | 134 +++++++++++++++++++++++----------------------- 1 files changed, 67 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=031f595a05d2adc05d702…

1 0

Alexandre Julliard : configure: Fix the bin install rule in wow64 mode.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: c1e29580ed02c3716c7106b1ff589f59383ea2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e29580ed02c3716c7106b1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 3 18:28:27 2011 +0100 configure: Fix the bin install rule in wow64 mode. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 264aed6..0cd5608 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -344,7 +344,7 @@ $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) install uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall" - if wine_fn_has_flag installbin $ac_flags -a -n "$DLLEXT" -a "x$enable_tools" != xno + if test -n "$DLLEXT" -a "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-lib:: tools \$(DESTDIR)\$(bindir) diff --git a/configure b/configure index c9dac48..771ccba 100755 --- a/configure +++ b/configure @@ -14602,7 +14602,7 @@ $ac_dir: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) install uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall" - if wine_fn_has_flag installbin $ac_flags -a -n "$DLLEXT" -a "x$enable_tools" != xno + if test -n "$DLLEXT" -a "x$enable_tools" != xno && wine_fn_has_flag installbin $ac_flags then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "install install-lib:: tools \$(DESTDIR)\$(bindir)

1 0

Alexandre Julliard : Revert "wined3d: Update detection of vertex blend capabilities."
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 8cbc6efdcad5f5e0b0eace6c6dadabdcfa5fd61f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbc6efdcad5f5e0b0eace6c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 3 19:31:43 2011 +0100 Revert "wined3d: Update detection of vertex blend capabilities." This reverts commit f41fdb225cf1e1df494237664ce92e51179f3725. It's wrong and was committed by mistake. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2b7e5ce..da179a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2318,7 +2318,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) TRACE_(d3d_caps)("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers); TRACE_(d3d_caps)("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); } - if (gl_info->supported[ARB_VERTEX_BLEND] || gl_info->supported[ARB_VERTEX_PROGRAM]) + if (gl_info->supported[ARB_VERTEX_BLEND]) { glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max); gl_info->limits.blends = gl_max;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_generate_mipmaps().
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: bf108ac8723d69364f668b7f6d107adb353ac641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf108ac8723d69364f668b7f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 3 18:51:38 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_generate_mipmaps(). --- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 0c3a67a..608efc9 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -225,10 +225,10 @@ WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture return texture->baseTexture.filterType; } -void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) +void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) { /* TODO: Implement filters using GL_SGI_generate_mipmaps. */ - FIXME("iface %p stub!\n", iface); + FIXME("texture %p stub!\n", texture); } BOOL basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 8ef8320..e3a0583 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -270,8 +270,9 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterT return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } -static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) { - basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); +static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) +{ + basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a4b7b36..232f105 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -261,8 +261,9 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType( return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } -static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) { - basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); +static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) +{ + basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 3d02895..b2ddce1 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -225,8 +225,9 @@ static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilte return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } -static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) { - basetexture_generate_mipmaps((IWineD3DBaseTexture *)iface); +static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) +{ + basetexture_generate_mipmaps((IWineD3DBaseTextureImpl *)iface); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23d1fd1..e22cc9f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1914,7 +1914,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; -void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;

1 0

Yaron Shahrabani : website: CSS RTL searchbox fix
by Jeremy Newman 04 Jan '11

04 Jan '11

Module: website Branch: master Commit: 30087771323ae7ee3f551ee841cdbb5eb16a50ac URL: http://source.winehq.org/git/website.git/?a=commit;h=30087771323ae7ee3f551e… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon Dec 27 16:15:37 2010 +0200 website: CSS RTL searchbox fix --0016364c7e8b8a4387049864f934 Content-Type: text/plain; charset=UTF-8 This is not the optimal fix but it certainly puts that naughty searchbox back in place... Yaron Shahrabani <Hebrew translator> <div dir="ltr">This is not the optimal fix but it certainly puts that naughty searchbox back in place... <div dir="ltr">Yaron Shahrabani<blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><Hebrew translator></div></blockquote></div> </div> >From 5a0e4a2b1a11c1b318fd75db49ffeb2e89b46980 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon, 27 Dec 2010 16:12:56 +0200 Subject: website: CSS RTL searchbox fix --- styles-rtl.css | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/styles-rtl.css b/styles-rtl.css index c7e158b..c5f57ce 100644 --- a/styles-rtl.css +++ b/styles-rtl.css @@ -17,7 +17,7 @@ BODY { /* search box */ #search_box { text-align: left; - left: 20px; + right: 78.91%; } /* top tabs */ @@ -83,7 +83,7 @@ DIV.newsblock { direction: ltr; margin: 0 10px 25px 5px; } .winehq_menu>.help:hover>.icon { background-position: -100px -50px } .winehq_menu>.devel>.icon { background-position: -150px 0 } .winehq_menu>.devel:hover>.icon { background-position: -150px -50px } -.winehq_menu>.donate>.icon { background-position: -200px 0 } +.winehq_menu>.donate>.icseon { background-position: -200px 0 } .winehq_menu>.donate:hover>.icon { background-position: -200px -50px } /* HR */

1 0

Yaron Shahrabani : winelib: Full Hebrew translation.
by Jeremy Newman 04 Jan '11

04 Jan '11

Module: website Branch: master Commit: fb40df52af555ee728800a78d981c6d3f30bd3cd URL: http://source.winehq.org/git/website.git/?a=commit;h=fb40df52af555ee728800a… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Dec 24 11:41:17 2010 +0200 winelib: Full Hebrew translation. --00504502c880e76742049824caf0 Content-Type: text/plain; charset=UTF-8 Kind regards, Yaron Shahrabani <Hebrew translator> <div dir="ltr">Kind regards, <div dir="ltr">Yaron Shahrabani<blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><Hebrew translator></div></blockquote></div> </div> >From a801e4e6520baa748e0b00241bf56967f5231344 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri, 24 Dec 2010 11:38:40 +0200 Subject: [website] winelib: Full Hebrew translation. --- templates/he/winelib.template | 557 ++++++++++++++++++++--------------------- 1 files changed, 272 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fb40df52af555ee728…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.7-1.3.10 and 1.2.2
by Jeremy Newman 04 Jan '11

04 Jan '11

Module: website Branch: master Commit: 6830def22c51b8db7c2454e0ad09e8f027f2e51e URL: http://source.winehq.org/git/website.git/?a=commit;h=6830def22c51b8db7c2454… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Dec 24 21:24:54 2010 +0100 Polish translation for release 1.3.7-1.3.10 and 1.2.2 --- news/pl/2010111201.xml | 18 ++++++++++++++++++ news/pl/2010112601.xml | 17 +++++++++++++++++ news/pl/2010120301.xml | 14 ++++++++++++++ news/pl/2010121001.xml | 18 ++++++++++++++++++ news/pl/2010122401.xml | 18 ++++++++++++++++++ 5 files changed, 85 insertions(+), 0 deletions(-) diff --git a/news/pl/2010111201.xml b/news/pl/2010111201.xml new file mode 100644 index 0000000..944e095 --- /dev/null +++ b/news/pl/2010111201.xml @@ -0,0 +1,18 @@ +<news> +<date>Listopad 12, 2010</date> +<title>Wydano Wine 1.3.7</title> +<body> + Wydanie rozwojowe Wine 1.3.7 jest już dostępne. + <a href="{$root}/announce/1.3.7">Co nowego</a> w tym wydaniu: +<ul> + <li>Ulepszone wsparcie dla tacki systemowej.</li> + <li>Lepsze wsparcie dla instalatorów z zespołami.</li> + <li>Zaimplementowano wiele funkcji "secure" z msvcrt.</li> + <li>Wiele poprawek wsparcia dla GStreamer.</li> + <li>Wiele ulepszeń MSXML.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.7.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2010112601.xml b/news/pl/2010112601.xml new file mode 100644 index 0000000..04194b7 --- /dev/null +++ b/news/pl/2010112601.xml @@ -0,0 +1,17 @@ +<news> +<date>Listopad 26, 2010</date> +<title>Wydano Wine 1.3.8</title> +<body> + Wydanie rozwojowe Wine 1.3.8 jest już dostępne. + <a href="{$root}/announce/1.3.8">Co nowego</a> w tym wydaniu: +<ul> + <li>Ikonki w menu "otwórz z".</li> + <li>Instrukcje dla wszystkich zainstalowanych binariów.</li> + <li>Wsparcie dla schematów w MSXML.</li> + <li>Wiele poprawek instalatorów.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.8.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2010120301.xml b/news/pl/2010120301.xml new file mode 100644 index 0000000..512fe27 --- /dev/null +++ b/news/pl/2010120301.xml @@ -0,0 +1,14 @@ +<news> +<date>Grudzień 3, 2010</date> +<title>Wydano Wine 1.2.2</title> +<body> + Poprawione wydanie Wine 1.2.2 jest już dostępne. + <a href="{$root}/announce/1.2.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla animowanych kursorów.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2010121001.xml b/news/pl/2010121001.xml new file mode 100644 index 0000000..d6b3771 --- /dev/null +++ b/news/pl/2010121001.xml @@ -0,0 +1,18 @@ +<news> +<date>Grudzień 10, 2010</date> +<title>Wydano Wine 1.3.9</title> +<body> + Wydanie rozwojowe Wine 1.3.9 jest już dostępne. + <a href="{$root}/announce/1.3.9">Co nowego</a> w tym wydaniu: +<ul> + <li>Początki wsparcia dla ActiveX we wbudowanej przeglądarce.</li> + <li>Ikonki na przyciskach skrótów w przeglądarce internetowej.</li> + <li>Standardyzacja kodu implementującego interfejsy COM.</li> + <li>Nowy schemat dla automatycznie wygenerowanych rejestracji bibilotek DLL.</li> + <li>Wrapper dla biblioteki OpenCL.</li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.9.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2010122401.xml b/news/pl/2010122401.xml new file mode 100644 index 0000000..3bcb8ae --- /dev/null +++ b/news/pl/2010122401.xml @@ -0,0 +1,18 @@ +<news> +<date>Grudzień 24, 2010</date> +<title>Wydano Wine 1.3.10/title> +<body> + Wydanie rozwojowe Wine 1.3.10 jest już dostępne. + <a href="{$root}/announce/1.3.10">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla dymków powiadomień w tacce systemowej.</li> + <li>Usunięto przestarzały sterownik dźwięku AudioIO.</li> + <li>Więcej pracy włożonej we wsparcie ActiveX.</li> + <li>Rozmaite poprawki do MSI.</li> + <li>Teraz preloader jest używany także dla 64-bitów. </li> + <li>Aktualizacje tłumaczeń.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.10.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.10
by Jeremy Newman 04 Jan '11

04 Jan '11

Module: website Branch: master Commit: ecc8fadddebc99aa991c188a7152fb052c6959e9 URL: http://source.winehq.org/git/website.git/?a=commit;h=ecc8fadddebc99aa991c18… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 24 22:33:29 2010 +0100 French translation for release 1.3.10 --- news/fr/2010122401.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2010122401.xml b/news/fr/2010122401.xml new file mode 100644 index 0000000..403817d --- /dev/null +++ b/news/fr/2010122401.xml @@ -0,0 +1,21 @@ +<news> +<date></date> +<title>Sortie de Wine 1.3.10</title> +<body> + La version de développement 1.3.10 de Wine est disponible. + <a href="{$root}/announce/1.3.10">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des bulles de notification dans la zone de notification système.</li> + <li>Pilote son obsolète AudioIO supprimé.</li> + <li>Poursuite du travail sur la prise en charge d'ActiveX.</li> + <li>Divers correctifs MSI.</li> + <li>Préchargeur à présent également utilisé en mode 64 bits. </li> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.10.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.3.10 freigegeben
by Jeremy Newman 04 Jan '11

04 Jan '11

Module: website Branch: master Commit: b81d8bc422b2ac8440f9f583ef51b6ea31639b7e URL: http://source.winehq.org/git/website.git/?a=commit;h=b81d8bc422b2ac8440f9f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 24 22:57:24 2010 +0100 Wine 1.3.10 freigegeben merry christmas! --- news/de/2010122401.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2010122401.xml b/news/de/2010122401.xml new file mode 100644 index 0000000..e94daba --- /dev/null +++ b/news/de/2010122401.xml @@ -0,0 +1,18 @@ +<news> +<date>24. Dezember 2010</date> +<title>Wine 1.3.10 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Benachrichtigungsballoons im Systemtray.</li> + <li>Veralteter AudioIO Treiber entfernt.</li> + <li>Weitere Arbeiten an der ActiveX Unterstützung.</li> + <li>Verschiedenste MSI Fehlerbehebungen.</li> + <li>Der Preloader wird nun auch für 64-Bit genutzt. </li> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.10.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. +</body></news>

1 0

Vitaliy Margolen : dinput: Pass interface instead of this pointer to joystick poll callback.
by Alexandre Julliard 03 Jan '11

03 Jan '11

Module: wine Branch: master Commit: 7d650d0b284b6814624ba07cdfa2d90854d801a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d650d0b284b6814624ba07cd… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jan 3 07:25:11 2011 -0700 dinput: Pass interface instead of this pointer to joystick poll callback. --- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linux.c | 9 +++++---- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/joystick_osx.c | 4 ++-- dlls/dinput/joystick_private.h | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 7d781c9..e894dc6 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -358,7 +358,7 @@ HRESULT WINAPI JoystickAGenericImpl_Poll(LPDIRECTINPUTDEVICE8A iface) return DIERR_NOTACQUIRED; } - This->joy_polldev(This); + This->joy_polldev(iface); return DI_OK; } @@ -381,7 +381,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState( } /* update joystick state */ - This->joy_polldev(This); + This->joy_polldev(iface); /* convert and copy data to user supplied buffer */ fill_DataFormat(ptr, len, &This->js, &This->base.data_format); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1396ea5..d489ef3 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -110,7 +110,7 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 static INT joystick_devices_count = -1; static struct JoyDev *joystick_devices; -static void joy_polldev(JoystickGenericImpl *This); +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface); static INT find_joystick_devices(void) { @@ -544,10 +544,11 @@ static HRESULT WINAPI JoystickLinuxAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) return DI_NOEFFECT; } -static void joy_polldev(JoystickGenericImpl *This_in) { +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) +{ struct pollfd plfd; - struct js_event jse; - JoystickImpl *This = (JoystickImpl*) This_in; + struct js_event jse; + JoystickImpl *This = (JoystickImpl*) iface; TRACE("(%p)\n", This); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6da6066..1bb3398 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -135,7 +135,7 @@ struct JoystickImpl static void fake_current_js_state(JoystickImpl *ji); static void find_joydevs(void); -static void joy_polldev(JoystickGenericImpl *This); +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface); /* This GUID is slightly different from the linux joystick one. Take note. */ static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a-23903fb6bdf7 */ @@ -731,7 +731,7 @@ static void fake_current_js_state(JoystickImpl *ji) #undef CENTER_AXIS /* convert wine format offset to user format object index */ -static void joy_polldev(JoystickGenericImpl *iface) +static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) { struct pollfd plfd; struct input_event ie; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index fc218d3..2b4ea12 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -517,9 +517,9 @@ static void get_osx_device_elements_props(JoystickImpl *device) } } -static void poll_osx_device_state(JoystickGenericImpl *device_in) +static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface) { - JoystickImpl *device = (JoystickImpl*)device_in; + JoystickImpl *device = (JoystickImpl*)iface; IOHIDElementRef tIOHIDTopElementRef; IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef = device->elementCFArrayRef; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index ebbd325..dfa0dfa 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -33,7 +33,7 @@ #define MAX_PROPS 164 struct JoystickGenericImpl; -typedef void joy_polldev_handler(struct JoystickGenericImpl *This); +typedef void joy_polldev_handler(LPDIRECTINPUTDEVICE8A iface); typedef struct JoystickGenericImpl {

1 0