October 2010 - Wine-Commits

Yaron Shahrabani : website: Full translation of History to Hebrew
by Jeremy Newman Oct. 26, 2010

Oct. 26, 2010

Module: website Branch: master Commit: 9564e74052bd0587f224583751ca1fd18f699a65 URL: http://source.winehq.org/git/website.git/?a=commit;h=9564e74052bd0587f22458… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Oct 19 23:49:33 2010 +0200 website: Full translation of History to Hebrew --20cf30025aa0dcb9c40492ff4569 Content-Type: text/plain; charset=UTF-8 Yaron Shahrabani <Hebrew translator> <div dir="ltr"><br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div> <font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div><br> </div> >From 80676728c5eba39dc4d83b78e5d0792f62b8e69b Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue, 19 Oct 2010 23:43:21 +0200 Subject: website: Full translation of History --- templates/he/history.template | 328 +++++++++++++++++++---------------------- 1 files changed, 150 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=9564e74052bd0587f2…

1 0

André Hentschel : The user better understands if we tell him about Firefox instead of Mozilla
by Jeremy Newman Oct. 26, 2010

Oct. 26, 2010

Module: website Branch: master Commit: f9fbc8d317e5dd97bce73d8382d5f1d06be011ba URL: http://source.winehq.org/git/website.git/?a=commit;h=f9fbc8d317e5dd97bce73d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 20 19:44:01 2010 +0200 The user better understands if we tell him about Firefox instead of Mozilla --- templates/en/irc.template | 2 +- templates/es/irc.template | 2 +- templates/fr/irc.template | 2 +- templates/pl/irc.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/irc.template b/templates/en/irc.template index 0c8e24e..8de41fd 100644 --- a/templates/en/irc.template +++ b/templates/en/irc.template @@ -13,7 +13,7 @@ Wine. You can access the chat room using an IRC program such as <b>Channel:</b> #winehq<br> </blockquote> -<p>If you use Mozilla or any other browser that supports IRC urls, you can +<p>If you use Firefox or any other browser that supports IRC urls, you can join the chat by clicking on <a href="irc://irc.freenode.net/winehq">irc://irc.freenode.net/winehq</a>.</p> <p> </p> diff --git a/templates/es/irc.template b/templates/es/irc.template index 3ed8a85..644ec29 100644 --- a/templates/es/irc.template +++ b/templates/es/irc.template @@ -14,7 +14,7 @@ configuraciones listadas abajo.</p> <b>Canal:</b> #winehq<br> </blockquote> -<p>Si utilizas Mozilla o otros navegadores que soporte urls IRC, +<p>Si utilizas Firefox o otros navegadores que soporte urls IRC, puedes unirte al chat clickeando en <a href="irc://irc.freenode.net/#winehq">irc://irc.freenode.net/#winehq</a>.</p> diff --git a/templates/fr/irc.template b/templates/fr/irc.template index b53e484..60ce92f 100644 --- a/templates/fr/irc.template +++ b/templates/fr/irc.template @@ -13,7 +13,7 @@ Wine (en anglais). Vous pouvez y accéder avec un client IRC de votre choix comm <b>Canal :</b> #winehq<br> </blockquote> -<p>Si vous utilisez Mozilla ou n'importe quel autre navigateur qui supporte les URLs IRC, vous pouvez rejoindre +<p>Si vous utilisez Firefox ou n'importe quel autre navigateur qui supporte les URLs IRC, vous pouvez rejoindre le salon de discussion en cliquant simplement sur <a href="irc://irc.freenode.net/#winehq">irc://irc.freenode.net/#winehq</a>.</p> <p> </p> diff --git a/templates/pl/irc.template b/templates/pl/irc.template index 6e36d93..380e723 100644 --- a/templates/pl/irc.template +++ b/templates/pl/irc.template @@ -13,6 +13,6 @@ używając programu IRC takiego jak np. <b>Kanał:</b> #winehq<br> </blockquote> -<p>Jeżeli używasz Mozilli lub innej przeglądarki która wspiera <b>u</b>e<b>r</b>e<b>l</b>e IRC, to możesz dołączyć do rozmowy klikając na <a href="irc://irc.freenode.net/#winehq">irc://irc.freenode.net/#winehq</a>.</p> +<p>Jeżeli używasz Firefox lub innej przeglądarki która wspiera <b>u</b>e<b>r</b>e<b>l</b>e IRC, to możesz dołączyć do rozmowy klikając na <a href="irc://irc.freenode.net/#winehq">irc://irc.freenode.net/#winehq</a>.</p> <p> </p>

1 0

Yaron Shahrabani : website: wwn_content translation to Hebrew
by Jeremy Newman Oct. 26, 2010

Oct. 26, 2010

Module: website Branch: master Commit: f87c3ea3fcad845405db33a12cfeec55aa62aa0d URL: http://source.winehq.org/git/website.git/?a=commit;h=f87c3ea3fcad845405db33… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Oct 19 23:59:35 2010 +0200 website: wwn_content translation to Hebrew --002215b02d1ec3bae50492ff6929 Content-Type: text/plain; charset=UTF-8 Yaron Shahrabani <Hebrew translator> <div dir="ltr"><br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div> <font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div><br> </div> >From 71f31e63bf0f4e1ad0c0774a479b3481bc30ca45 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue, 19 Oct 2010 23:57:21 +0200 Subject: website: wwn_content translation to Hebrew --- templates/he/wwn_content.template | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/templates/he/wwn_content.template b/templates/he/wwn_content.template index 5707b77..d6c2ae1 100644 --- a/templates/he/wwn_content.template +++ b/templates/he/wwn_content.template @@ -1,13 +1,13 @@ -<div style="text-align: right;"> +<div style="text-align: left;"> <big>{$date}</big><br> - <small>by <a href="{$contact}">{$author}</a></small> + <small>מאת <a href="{$contact}">{$author}</a></small> </div> <div style="width: 250px; float: left; padding: 0 10px 0 10px;"> {$summary} - <p class="small"><a href="{$root}/wwn/source/{$xml}">XML source</a><br> - <a href="{$root}/wwn/">More Issues...</a></p> + <p class="small"><a href="{$root}/wwn/source/{$xml}">מקור XML</a><br> + <a href="{$root}/wwn/">דיווחים נוספים...</a></p> </div> <div class="wwn"> @@ -17,8 +17,7 @@ <hr> <p align="center"> - All Kernel Cousin issues and summaries are copyright their original authors, and distributed - under the terms of the <br> <a href="http://www.gnu.org/licenses/gpl2.txt">GNU General Public License, - version 2.0</a>. + כל דיווחי Kernel Cousin והתקצירים כפופים לזכויות היוצרים של כותביהם המקוריים והם מופצים תחת אותם התנאים כמו + <br> <a href="http://www.gnu.org/licenses/gpl2.txt">הרישיון הציבורי הכללי של GNU, גרסה 2.0</a>. </p>

1 0

André Hentschel : German translation of the news template
by Jeremy Newman Oct. 26, 2010

Oct. 26, 2010

Module: website Branch: master Commit: 1e6cee1c844ab75f5eb355d2ac99f43d266ef4d2 URL: http://source.winehq.org/git/website.git/?a=commit;h=1e6cee1c844ab75f5eb355… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 20 19:42:24 2010 +0200 German translation of the news template --- templates/de/news.template | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/templates/de/news.template b/templates/de/news.template new file mode 100644 index 0000000..0fe155a --- /dev/null +++ b/templates/de/news.template @@ -0,0 +1,16 @@ + + + +<h1 class="title">News</h1> + + + +<hr /> + +<div class="link-container"> + <p><a href="{$root}/wwn/">World Wine News Archiv</a></p> +</div> +<ul class="rss"> + <li><a href="{$root}/news/rss/">WineHQ News RSS Feed</a></li> +</ul> +

1 0

Ričardas Barkauskas : ddraw: Surfaces with DDSCAPS_3DDEVICE and DDSCAPS_ZBUFFER can't be render targets .
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 78e4a096a3af4ef000ac5251b39716066980340a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e4a096a3af4ef000ac5251b… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Sun Oct 24 22:39:31 2010 +0300 ddraw: Surfaces with DDSCAPS_3DDEVICE and DDSCAPS_ZBUFFER can't be render targets. --- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2878a56..6a12cdf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3517,7 +3517,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; } - if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && !(desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) { usage |= WINED3DUSAGE_RENDERTARGET; } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index f144543..87a368c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3181,7 +3181,7 @@ static void SetRenderTargetTest(void) ok(hr == DD_OK, "IDirect3DDevice7_GetRenderTarget failed, hr=0x%08x\n", hr); hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, failrt, 0); - todo_wine ok(hr != D3D_OK, "IDirect3DDevice7_SetRenderTarget succeeded\n"); + ok(hr != D3D_OK, "IDirect3DDevice7_SetRenderTarget succeeded\n"); hr = IDirect3DDevice7_SetRenderTarget(lpD3DDevice, newrt, 0); ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderTarget failed, hr=0x%08x\n", hr);

1 0

Ričardas Barkauskas : ddraw: Fix DDSCAPS_3DDEVICE surfaces always setting DDSCAPS_VISIBLE.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: ff659522f6d16c46d61b3cba0564ced8e65f5aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff659522f6d16c46d61b3cba0… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Sun Oct 24 22:36:43 2010 +0300 ddraw: Fix DDSCAPS_3DDEVICE surfaces always setting DDSCAPS_VISIBLE. --- dlls/ddraw/surface.c | 7 ++++++- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/tests/dsurface.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5bd219f..2878a56 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3511,12 +3511,17 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; } - if (desc->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { usage |= WINED3DUSAGE_RENDERTARGET; desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; } + if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) + { + usage |= WINED3DUSAGE_RENDERTARGET; + } + if (desc->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) { usage |= WINED3DUSAGE_OVERLAY; diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 8088188..f144543 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3593,7 +3593,7 @@ static void BackBuffer3DCreateSurfaceTest(void) { hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); ok(SUCCEEDED(hr), "IDirectDraw_GetSurfaceDesc failed: 0x%08x\n", hr); - todo_wine ok(created_ddsd.ddsCaps.dwCaps == expected_caps, + ok(created_ddsd.ddsCaps.dwCaps == expected_caps, "GetSurfaceDesc returned caps %x, expected %x\n", created_ddsd.ddsCaps.dwCaps, expected_caps); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 355c9d2..14fb87c 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2916,7 +2916,7 @@ static void SurfaceCapsTest(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc); ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc failed with %08x\n", hr); - if (!(create_caps[i] & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE))) + if (!(create_caps[i] & DDSCAPS_PRIMARYSURFACE)) ok(desc.ddsCaps.dwCaps == expected_caps[i], "GetSurfaceDesc test %d returned caps %x, expected %x\n", i, desc.ddsCaps.dwCaps, expected_caps[i]); @@ -2971,7 +2971,7 @@ static void SurfaceCapsTest(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc2); ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc failed with %08x\n", hr); - if (!(create_caps[i] & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE))) + if (!(create_caps[i] & DDSCAPS_PRIMARYSURFACE)) ok(desc2.ddsCaps.dwCaps == expected_caps[i], "GetSurfaceDesc test %d returned caps %x, expected %x\n", i, desc2.ddsCaps.dwCaps, expected_caps[i]);

1 0

Ričardas Barkauskas : ddraw/tests: Test some more caps combinations.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 7402761e214a3e33208650c2eb9348329a39bc03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7402761e214a3e33208650c2e… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Sun Oct 24 21:48:51 2010 +0300 ddraw/tests: Test some more caps combinations. --- dlls/ddraw/tests/dsurface.c | 48 ++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 93934e5..355c9d2 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -2852,7 +2852,10 @@ static void SurfaceCapsTest(void) 0, DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD | DDSCAPS_SYSTEMMEMORY, DDSCAPS_PRIMARYSURFACE, - DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY + DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY, + DDSCAPS_3DDEVICE, + DDSCAPS_ZBUFFER, + DDSCAPS_3DDEVICE | DDSCAPS_OFFSCREENPLAIN }; DWORD expected_caps[] = { DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, @@ -2861,7 +2864,10 @@ static void SurfaceCapsTest(void) DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, DDSCAPS_TEXTURE | DDSCAPS_ALLOCONLOAD | DDSCAPS_SYSTEMMEMORY, DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_VISIBLE, - DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_VISIBLE + DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_VISIBLE, + DDSCAPS_3DDEVICE | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM, + DDSCAPS_ZBUFFER | DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, + DDSCAPS_3DDEVICE | DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM }; UINT i; @@ -2891,6 +2897,15 @@ static void SurfaceCapsTest(void) create.dwWidth = 128; } + if (create.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + create.dwFlags |= DDSD_PIXELFORMAT; + U4(create).ddpfPixelFormat.dwSize = sizeof(U4(create).ddpfPixelFormat); + U4(create).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(create).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(create).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + } + hr = IDirectDraw_CreateSurface(lpDD, &create, &surface1, NULL); ok(hr == DD_OK, "IDirectDraw_CreateSurface failed with %08x\n", hr); @@ -2901,14 +2916,14 @@ static void SurfaceCapsTest(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface1, &desc); ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc failed with %08x\n", hr); - if (!(create_caps[i] & DDSCAPS_PRIMARYSURFACE)) + if (!(create_caps[i] & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE))) ok(desc.ddsCaps.dwCaps == expected_caps[i], - "GetSurfaceDesc returned caps %x, expected %x\n", desc.ddsCaps.dwCaps, - expected_caps[i]); + "GetSurfaceDesc test %d returned caps %x, expected %x\n", i, + desc.ddsCaps.dwCaps, expected_caps[i]); else todo_wine ok(desc.ddsCaps.dwCaps == expected_caps[i], - "GetSurfaceDesc returned caps %x, expected %x\n", desc.ddsCaps.dwCaps, - expected_caps[i]); + "GetSurfaceDesc test %d returned caps %x, expected %x\n", i, + desc.ddsCaps.dwCaps, expected_caps[i]); IDirectDrawSurface_Release(surface1); } @@ -2937,6 +2952,15 @@ static void SurfaceCapsTest(void) create2.dwWidth = 128; } + if (create2.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + create2.dwFlags |= DDSD_PIXELFORMAT; + U4(create2).ddpfPixelFormat.dwSize = sizeof(U4(create2).ddpfPixelFormat); + U4(create2).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(create2).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(create2).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + } + hr = IDirectDraw7_CreateSurface(dd7, &create2, &surface7, NULL); ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); @@ -2947,14 +2971,14 @@ static void SurfaceCapsTest(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface7, &desc2); ok(hr == DD_OK, "IDirectDrawSurface_GetSurfaceDesc failed with %08x\n", hr); - if (!(create_caps[i] & DDSCAPS_PRIMARYSURFACE)) + if (!(create_caps[i] & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE))) ok(desc2.ddsCaps.dwCaps == expected_caps[i], - "GetSurfaceDesc returned caps %x, expected %x\n", desc2.ddsCaps.dwCaps, - expected_caps[i]); + "GetSurfaceDesc test %d returned caps %x, expected %x\n", i, + desc2.ddsCaps.dwCaps, expected_caps[i]); else todo_wine ok(desc2.ddsCaps.dwCaps == expected_caps[i], - "GetSurfaceDesc returned caps %x, expected %x\n", desc2.ddsCaps.dwCaps, - expected_caps[i]); + "GetSurfaceDesc test %d returned caps %x, expected %x\n", i, + desc2.ddsCaps.dwCaps, expected_caps[i]); IDirectDrawSurface7_Release(surface7); }

1 0

Andrew Nguyen : winhttp: Fix const qualifier warning for OpenSSL 1.0.0.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 0c7bd62df214dfd0564f5e6e0767f19e7d4f6bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7bd62df214dfd0564f5e6e0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Oct 24 23:41:36 2010 -0500 winhttp: Fix const qualifier warning for OpenSSL 1.0.0. --- dlls/winhttp/net.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6727707..7826fbb 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -1073,7 +1073,11 @@ const void *netconn_get_certificate( netconn_t *conn ) int netconn_get_cipher_strength( netconn_t *conn ) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!conn->secure) return 0;

1 0

David Adam : d3d8: ApplyStateBlock with a zero token returns D3D_OK.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 743e9b35a1c18c81c52ee0ea07b397d77a20e242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743e9b35a1c18c81c52ee0ea0… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Oct 24 13:21:06 2010 +0200 d3d8: ApplyStateBlock with a zero token returns D3D_OK. --- dlls/d3d8/device.c | 2 + dlls/d3d8/tests/device.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f54f043..03a97b6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1354,6 +1354,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ApplyStateBlock(LPDIRECT3DDEVICE8 ifa TRACE("iface %p, token %#x.\n", iface, Token); + if (!Token) return D3D_OK; + wined3d_mutex_lock(); stateblock = d3d8_get_object(&This->handle_table, Token - 1, D3D8_HANDLE_SB); if (!stateblock) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 663dc91..a9ca496 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1992,6 +1992,71 @@ done: if (d3d8) IDirect3D8_Release(d3d8); } +static void test_ApplyStateBlock(void) +{ + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice8 *device = NULL; + IDirect3D8 *d3d8; + HWND hwnd; + HRESULT hr; + D3DDISPLAYMODE d3ddm; + DWORD received, token; + + d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d8 || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode( d3d8, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = 800; + d3dpp.BackBufferHeight = 600; + d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D16; + + hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "IDirect3D8_CreateDevice failed with %#x\n", hr); + if(!device) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } + + IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &token); + ok(token !=0, "received null token\n"); + + IDirect3DDevice8_BeginStateBlock(device); + IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, TRUE); + IDirect3DDevice8_EndStateBlock(device, &token); + IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); + ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); + ok(received==FALSE, "Expected = TRUE, received FALSE\n"); + + IDirect3DDevice8_ApplyStateBlock(device, 0); + ok(hr == D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); + ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); + ok(received==FALSE, "Expected = TRUE, received FALSE\n"); + + IDirect3DDevice8_ApplyStateBlock(device, token); + ok(hr == D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); + ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); + ok(received==TRUE, "Expected = TRUE, received FALSE\n"); + + cleanup: + if(device) IDirect3DDevice8_Release(device); + if(d3d8) IDirect3D8_Release(d3d8); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -2028,6 +2093,7 @@ START_TEST(device) test_shader(); test_limits(); test_lights(); + test_ApplyStateBlock(); test_render_zero_triangles(); test_depth_stencil_reset(); test_wndproc();

1 0

Andrew Nguyen : wininet: Fix const qualifier warning when compiling with OpenSSL 1.0.0.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: b20e1110881ca7542ac8be3a44389c56914a6ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20e1110881ca7542ac8be3a4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Oct 24 23:42:02 2010 -0500 wininet: Fix const qualifier warning when compiling with OpenSSL 1.0.0. --- dlls/wininet/netconnection.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 16b534b..a93aa11 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -875,7 +875,11 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!connection->useSSL)

1 0