April 2007 - Wine-Commits - list.winehq.org

appdb/ ./preferences.php include/form_edit.php
by WineHQ April 17, 2007

April 17, 2007

ChangeSet ID: 31048 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/17 18:21:34 Modified files: . : preferences.php include : form_edit.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow setting admin privileges in the user mananger Patch: http://cvs.winehq.org/patch.py?id=31048 Old revision New revision Changes Path 1.34 1.35 +24 -11 appdb/preferences.php 1.11 1.12 +0 -12 appdb/include/form_edit.php Index: appdb/preferences.php diff -u -p appdb/preferences.php:1.34 appdb/preferences.php:1.35 --- appdb/preferences.php:1.34 17 Apr 2007 23:21:34 -0000 +++ appdb/preferences.php 17 Apr 2007 23:21:34 -0000 @@ -11,10 +11,9 @@ * - sUserEmail, e-mail address * - sUserRealname, user's real name * - sWineRelease, user's Wine release - * - sHasAdmin, "on" if user is an administrator + * - bIsAdmin, true if user is an administrator * * TODO: - * - rename sHasAdmin with bIsAdmin * - document iLimit and sOrderBy * - replace sOrderBy with iOrderBy and use constants for each accepted value * - add a field to prefs_list to flag the user level for the pref @@ -46,7 +45,7 @@ function build_prefs_list($oUser) if($r->name == "debug") continue; } - + $input = html_select("pref_$r->name", explode('|', $r->value_list), $oUser->getpref($r->name, $r->def_value)); echo html_tr(array("  $r->description", $input)); @@ -59,12 +58,22 @@ function show_user_fields($oUser) $sUserEmail = $oUser->sEmail; $sWineRelease = $oUser->sWineRelease; if($oUser->hasPriv("admin")) - $sHasAdmin = 'checked="true"'; + $sAdminChecked = 'checked="true"'; else - $sHasAdmin = ""; - + $sAdminChecked = ""; + include(BASE."include/form_edit.php"); + // Edit admin privilege + if($_SESSION['current']->hasPriv("admin")) + { + echo html_tr(array( + "  Administrator", + "<input type=\"checkbox\" name=\"bIsAdmin\" value=\"true\" ". + "$sAdminChecked />" + )); + } + echo "<tr><td>  Wine version </td><td>"; make_bugzilla_version_list("sWineRelease", $sWineRelease); echo "</td></tr>"; @@ -79,7 +88,7 @@ if($_SESSION['current']->hasPriv("admin" is_numeric($aClean['iUserId']) && is_numeric($aClean['iLimit']) && in_array($aClean['sOrderBy'],array("email","realname","created")) -) +) { $oUser = new User($aClean['iUserId']); } else @@ -123,14 +132,18 @@ if($aClean['sSubmit'] == "Update") if ($oUser->update() == SUCCESS) { addmsg("Preferences Updated", "green"); - // we were managing an user, let's go back to the admin after updating tha admin status - if($oUser->iUserId == $aClean['iUserId'] && $_SESSION['current']->hasPriv("admin")) + // we were managing an user, let's go back to the admin after + // updating tha admin status + if($oUser->iUserId == $aClean['iUserId'] && + $_SESSION['current']->hasPriv("admin")) { - if($aClean['sHasAdmin']=="on") + if($aClean['bIsAdmin'] == "true") $oUser->addPriv("admin"); else $oUser->delPriv("admin"); - util_redirect_and_exit(BASE."admin/adminUsers.php?iUserId=".$oUser->iUserId."&sSearch=".$aClean['sSearch']."&iLimit=".$aClean['iLimit']."&sOrderBy=".$aClean['sOrderBy']."&sSubmit=true"); + util_redirect_and_exit(BASE."admin/adminUsers.php?iUserId=".$oUser->iUserId. + "&sSearch=".$aClean['sSearch']."&iLimit=".$aClean['iLimit']. + "&sOrderBy=".$aClean['sOrderBy']."&sSubmit=true"); } } else Index: appdb/include/form_edit.php diff -u -p appdb/include/form_edit.php:1.11 appdb/include/form_edit.php:1.12 --- appdb/include/form_edit.php:1.11 17 Apr 2007 23:21:34 -0000 +++ appdb/include/form_edit.php 17 Apr 2007 23:21:34 -0000 @@ -23,18 +23,6 @@ require_once(BASE."include/util.php"); <td>   Real Name </td> <td> <input type="text" name="sUserRealname" value="<?php echo $sUserRealname; ?>"> </td> </tr> -<?php -// if we manage another user we can give him administrator rights -if($oUser->iUserId == $aClean['iUserId']) -{ -?> -<tr> - <td>   Administrator </td> - <td> <input type="checkbox" name="sHasAdmin" "<?php echo $sHasAdmin; ?>" value="on"> </td> -</tr> -<?php -} -?> <tr> <td colspan=2> </td> </tr>

1 0

appdb/include distribution.php
by WineHQ April 17, 2007

April 17, 2007

ChangeSet ID: 31047 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/17 18:19:48 Modified files: include : distribution.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use html_tr() function in distribution::outputEditor() Patch: http://cvs.winehq.org/patch.py?id=31047 Old revision New revision Changes Path 1.22 1.23 +15 -7 appdb/include/distribution.php Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.22 appdb/include/distribution.php:1.23 --- appdb/include/distribution.php:1.22 17 Apr 2007 23:19:48 -0000 +++ appdb/include/distribution.php 17 Apr 2007 23:19:48 -0000 @@ -346,19 +346,27 @@ class distribution { echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; // Name - echo '<tr valign=top><td class="color1" width="20%"><b>Distribution Name</b></td>',"\n"; - echo '<td class="color0"><input type=text name="sDistribution" value="'.$this->sName.'" size="50"></td></tr>',"\n"; - // Url - echo '<tr valign=top><td class="color1"><b>Distribution Url</b></td>',"\n"; - echo '<td class="color0"><input type=text name="sUrl" value="'.$this->sUrl.'" size="50"></td></tr>',"\n"; + echo html_tr(array( + array("<b>Distribution Name</b>", 'class="color1"'), + array('<input type=text name="sDistribution" value="'.$this->sName. + '" size="50" />', 'class="color0"') + )); + + // URL + echo html_tr(array( + array("<b>Distribution URL</b>", 'class="color1"'), + array('<input type=text name="sUrl" value="'.$this->sUrl. + '" size="50" />', 'class="color0"') + )); + + + echo "</table>\n"; if($this->iDistributionId) { echo '<input type="hidden" name="iDistributionId" '. 'value="'.$this->iDistributionId.'">',"\n"; } - - echo "</table>\n"; } /* retrieves values from $_REQUEST that were output by outputEditor() */

1 0

lostwages/templates/en download-deb.template d ...
by Jeremy Newman April 17, 2007

April 17, 2007

ChangeSet ID: 31046 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/04/17 16:59:47 Modified files: templates/en : download-deb.template download.template Log message: Scott Ritchie <scott(a)open-vote.org> * Update download page to reflect what distros deb packages are now available for * Simplify and update the download-deb page, moving some developer content to wiki Patch: http://cvs.winehq.org/patch.py?id=31046 Old revision New revision Changes Path 1.14 1.15 +2 -32 lostwages/templates/en/download-deb.template 1.90 1.91 +2 -2 lostwages/templates/en/download.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.14 lostwages/templates/en/download-deb.template:1.15 --- lostwages/templates/en/download-deb.template:1.14 17 Apr 2007 21:59:47 -0000 +++ lostwages/templates/en/download-deb.template 17 Apr 2007 21:59:47 -0000 @@ -12,12 +12,6 @@ distributions have their own repositorie Wine, however we keep our own repository of the latest available packages here for download.</p> -<p>Packages here are designed to function on Ubuntu Edgy (6.10) and Dapper (6.06). -Packages here used to also work for Debian unstable, however due to changes in -Debian this no longer works and our Ubuntu maintainer is unable to support them. -If you can help provide up-to-date Debian packages, please contact -<a href=mailto:scott(a)open-vote.org>Scott Ritchie</a>.</p> - <h2>Adding the WineHQ APT Repository:</h2> <p>First, open a terminal window. Then add the repository's key to your system's @@ -27,6 +21,8 @@ list of trusted APT keys by copy and pas <p>Next, add the repository to your system's list of APT sources:</p> +<p><b>For Ubuntu Feisty (7.04):</b><br> +<i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/feisty.list -O /etc/apt/sources.list.d/winehq.list</i></p> <p><b>For Ubuntu Edgy (6.10):</b><br> <i>sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/edgy.list -O /etc/apt/sources.list.d/winehq.list</i></p> <p><b>For Ubuntu Dapper (6.06):</b><br> @@ -49,32 +45,6 @@ into the 64-bit distribution and have it <a href="http://wiki.winehq.org/UbuntuAMD64">this page on the Wine wiki</a> for more details.</p> -<h2>Debian Users:</h2> - -<p>If you are using Debian and want to make sure that apt-get will install the -WineHQ Wine package instead of the Debian Wine package (which sometimes confuses -APT by having the same version number), then after following the instructions above -you will also need to add something like the following entry to /etc/apt/preferences:</p> - -<i><p>Package: wine<br> -Pin: release l=WineHQ APT Repository<br> -Pin-Priority: 1000</p></i> - -<h2>Building the Wine Package from Source using APT:</h2> - -<p>APT also allows easy compilation from source of a package. This is useful if -there is no binary package available for your architecture, or if you wish to -create a fresh .deb file from scratch. To do this, first follow the -instructions for installing from the console above, except instead of running -apt-get install wine run '<b>apt-get build-dep wine</b>'. This will download the -needed development packages for your system to make the wine package. Then, -run '<b>apt-get --build source wine</b>', have a snack, and wait for the -compiling to finish.</p> - -<p>To install your newly created package (which should be in whatever directory -you were in when you ran apt-get --build source), run '<b>dpkg -i wine*.deb</b>' -as root.</p> - <h2>Older .deb packages</h2> <p>Since the APT repository can only hold the latest packages, older versions of Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.90 lostwages/templates/en/download.template:1.91 --- lostwages/templates/en/download.template:1.90 17 Apr 2007 21:59:47 -0000 +++ lostwages/templates/en/download.template 17 Apr 2007 21:59:47 -0000 @@ -67,7 +67,7 @@ for post-installation instructions.</b>< <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <b><a href="{$root}/site/download-deb">Ubuntu</a></b> - binary and source .debs for Ubuntu Edgy, Dapper, and Breezy</td> + binary and source .debs for Ubuntu Feisty (7.04), Edgy (6.10), and Dapper (6.06)</td> <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> @@ -76,7 +76,7 @@ for post-installation instructions.</b>< <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian linux" border="0"></a> </td> <td> <b><a href="{$root}/site/download-deb">Debian</a></b> - binary and source .debs for Debian unstable</td> + binary and source .debs for Debian Etch (4.0)</td> <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr>

1 0

Dmitry Timoshkov : version: Add a VerQueryValue test, make it mostly pass under Wine.
by Alexandre Julliard April 17, 2007

April 17, 2007

Module: wine Branch: master Commit: 31368dec931f9c7d9ebd186b6f8d114ffe9f7f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31368dec931f9c7d9ebd186b6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 16 16:09:32 2007 +0900 version: Add a VerQueryValue test, make it mostly pass under Wine. --- dlls/version/info.c | 18 ++++- dlls/version/tests/info.c | 136 ++++++++++++++++++++++++++++++++++++++--- dlls/version/tests/version.rc | 47 +++++++++++--- 3 files changed, 179 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31368dec931f9c7d9ebd1…

1 0

Stefan Dösinger : d3d9: Do not allow Direct3D9:: GetAdapterModeCount to be called with D3DFMT_UNKNOWN.
by Alexandre Julliard April 17, 2007

April 17, 2007

Module: wine Branch: master Commit: 7cee0b2ed02a7be63db890148a4db2e7a58feced URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cee0b2ed02a7be63db890148… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 17 09:20:54 2007 +0200 d3d9: Do not allow Direct3D9::GetAdapterModeCount to be called with D3DFMT_UNKNOWN. --- dlls/d3d9/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index ec4f7aa..fd383e9 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -100,7 +100,7 @@ static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Ad IDirect3D9Impl *This = (IDirect3D9Impl *)iface; /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out */ - if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5 && Format != D3DFMT_UNKNOWN) { + if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5) { return 0; }

1 0

Michael Kaufmann : gdi32: Add a stub for CancelDC.
by Alexandre Julliard April 17, 2007

April 17, 2007

Module: wine Branch: master Commit: f265599f1b42265190976477b1bb96d4279db17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f265599f1b42265190976477b… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Mon Apr 16 22:01:13 2007 +0200 gdi32: Add a stub for CancelDC. --- dlls/gdi32/dc.c | 9 +++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 0e9f5eb..bb1080c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2101,6 +2101,15 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) } /*********************************************************************** + * CancelDC (GDI32.@) + */ +BOOL WINAPI CancelDC(HDC hdc) +{ + FIXME("stub\n"); + return TRUE; +} + +/*********************************************************************** * SetVirtualResolution (GDI32.@) * * Undocumented on msdn. Called when PowerPoint XP saves a file. diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 6f1c71b..b0c8e12 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -21,7 +21,7 @@ @ stdcall BeginPath(long) @ stdcall BitBlt(long long long long long long long long long) @ stub ByeByeGDI -@ stub CancelDC +@ stdcall CancelDC(long) @ stub CheckColorsInGamut @ stdcall ChoosePixelFormat(long ptr) @ stdcall Chord(long long long long long long long long long)

1 0

H. Verbeet : wined3d: Implement ColorFill using FBOs, if they're being used .
by Alexandre Julliard April 17, 2007

April 17, 2007

Module: wine Branch: master Commit: e0a94b906cbc04d5c42044bc2a6226020e8c197d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0a94b906cbc04d5c42044bc2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:21:13 2007 +0200 wined3d: Implement ColorFill using FBOs, if they're being used. --- dlls/wined3d/device.c | 158 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 109 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e3d18a..90c311e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4974,6 +4974,105 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT return WINED3D_OK; } +static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) { + HRESULT hr; + IWineD3DSwapChain *swapchain; + + hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); + if (SUCCEEDED(hr)) { + IWineD3DSwapChain_Release((IUnknown *)swapchain); + return swapchain; + } + + return NULL; +} + +static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + if (!*fbo) { + GL_EXTCALL(glGenFramebuffersEXT(1, fbo)); + checkGLcall("glGenFramebuffersEXT()"); + } + GL_EXTCALL(glBindFramebufferEXT(target, *fbo)); + checkGLcall("glBindFramebuffer()"); +} + +static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { + const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; + GLenum texttarget, target; + GLint old_binding; + + texttarget = surface_impl->glDescription.target; + target = texttarget == GL_TEXTURE_2D ? GL_TEXTURE_2D : GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(texttarget == GL_TEXTURE_2D ? GL_TEXTURE_BINDING_2D : GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + + IWineD3DSurface_PreLoad(surface); + + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glBindTexture(target, old_binding); + + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, surface_impl->glDescription.textureName, 0)); + + checkGLcall("attach_surface_fbo"); +} + +static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, CONST WINED3DRECT *rect, WINED3DCOLOR color) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DSwapChain *swapchain; + + swapchain = get_swapchain(surface); + if (swapchain) { + GLenum buffer; + + TRACE("Surface %p is onscreen\n", surface); + + GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); + buffer = surface_get_gl_buffer(surface, swapchain); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer()"); + } else { + TRACE("Surface %p is offscreen\n", surface); + bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->dst_fbo); + attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, surface); + } + + if (rect) { + glEnable(GL_SCISSOR_TEST); + if(!swapchain) { + glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1); + } else { + glScissor(rect->x1, ((IWineD3DSurfaceImpl *)surface)->currentDesc.Height - rect->y2, + rect->x2 - rect->x1, rect->y2 - rect->y1); + } + checkGLcall("glScissor"); + } else { + glDisable(GL_SCISSOR_TEST); + } + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + + glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + + glClearColor(D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)); + glClear(GL_COLOR_BUFFER_BIT); + checkGLcall("glClear"); + + if (This->render_offscreen) { + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); + } else { + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + checkGLcall("glBindFramebuffer()"); + } + + if (swapchain && surface == ((IWineD3DSwapChainImpl *)swapchain)->frontBuffer + && ((IWineD3DSwapChainImpl *)swapchain)->backBuffer) { + glDrawBuffer(GL_BACK); + checkGLcall("glDrawBuffer()"); + } +} + static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface; @@ -4985,11 +5084,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD return WINED3DERR_INVALIDCALL; } - /* Just forward this to the DirectDraw blitting engine */ - memset(&BltFx, 0, sizeof(BltFx)); - BltFx.dwSize = sizeof(BltFx); - BltFx.u5.dwFillColor = color; - return IWineD3DSurface_Blt(pSurface, (RECT *) pRect, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + color_fill_fbo(iface, pSurface, pRect, color); + return WINED3DERR_INVALIDCALL; + } else { + /* Just forward this to the DirectDraw blitting engine */ + memset(&BltFx, 0, sizeof(BltFx)); + BltFx.dwSize = sizeof(BltFx); + BltFx.u5.dwFillColor = color; + return IWineD3DSurface_Blt(pSurface, (RECT *) pRect, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE); + } } /* rendertarget and deptth stencil functions */ @@ -5108,17 +5212,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice return WINED3D_OK; } -static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - if (!*fbo) { - GL_EXTCALL(glGenFramebuffersEXT(1, fbo)); - checkGLcall("glGenFramebuffersEXT()"); - } - GL_EXTCALL(glBindFramebufferEXT(target, *fbo)); - checkGLcall("glBindFramebuffer()"); -} - /* TODO: Handle stencil attachments */ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -5154,26 +5247,6 @@ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_ } } -static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { - const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; - GLenum texttarget, target; - GLint old_binding; - - texttarget = surface_impl->glDescription.target; - target = texttarget == GL_TEXTURE_2D ? GL_TEXTURE_2D : GL_TEXTURE_CUBE_MAP_ARB; - glGetIntegerv(texttarget == GL_TEXTURE_2D ? GL_TEXTURE_BINDING_2D : GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); - - IWineD3DSurface_PreLoad(surface); - - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glBindTexture(target, old_binding); - - GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, surface_impl->glDescription.textureName, 0)); - - checkGLcall("attach_surface_fbo"); -} - static void set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWineD3DSurface *render_target) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *rtimpl = (IWineD3DSurfaceImpl *)render_target; @@ -5280,19 +5353,6 @@ void apply_fbo_state(IWineD3DDevice *iface) { check_fbo_status(iface); } -static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) { - HRESULT hr; - IWineD3DSwapChain *swapchain; - - hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); - if (SUCCEEDED(hr)) { - IWineD3DSwapChain_Release((IUnknown *)swapchain); - return swapchain; - } - - return NULL; -} - void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const WINED3DRECT *src_rect, IWineD3DSurface *dst_surface, const WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;

1 0

H. Verbeet : wined3d: Don't try to clear the depth stencil if there is none .
by Alexandre Julliard April 17, 2007

April 17, 2007

Module: wine Branch: master Commit: e49c480820f0611ddcc3e1e52dcadc80fcf6cbe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e49c480820f0611ddcc3e1e52… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:21:06 2007 +0200 wined3d: Don't try to clear the depth stencil if there is none. --- dlls/wined3d/swapchain.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e32423a..18d9b3d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -147,6 +147,7 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; + DWORD clear_flags = 0; ENTER_GL(); @@ -293,18 +294,23 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO #endif LEAVE_GL(); + + if (This->wineD3DDevice->stencilBufferTarget) { + clear_flags |= WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER; + } + /* Although this is not strictly required, a simple demo showed this does occur on (at least non-debug) d3d */ if (This->presentParms.SwapEffect == WINED3DSWAPEFFECT_DISCARD) { TRACE("Clearing\n"); - IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, clear_flags|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); - } else { + } else if (clear_flags) { TRACE("Clearing z/stencil buffer\n"); - IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER, 0x00, 1.0, 0); + IWineD3DDevice_Clear((IWineD3DDevice*)This->wineD3DDevice, 0, NULL, clear_flags, 0x00, 1.0, 0); } if(((IWineD3DSurfaceImpl *) This->frontBuffer)->Flags & SFLAG_INSYSMEM ||

1 0

H. Verbeet : wined3d: Properly handle the difference between GL_BACK and GL_FRONT for onscreen surfaces .
by Alexandre Julliard April 17, 2007

April 17, 2007

Module: wine Branch: master Commit: deeeda6802bc3fbca599ad287c5fcfd69172a525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deeeda6802bc3fbca599ad287… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:20:56 2007 +0200 wined3d: Properly handle the difference between GL_BACK and GL_FRONT for onscreen surfaces. --- dlls/wined3d/device.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2fe9c0e..1e3d18a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5280,23 +5280,24 @@ void apply_fbo_state(IWineD3DDevice *iface) { check_fbo_status(iface); } -static BOOL is_onscreen(IWineD3DSurface *target) { +static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) { HRESULT hr; - void *tmp; + IWineD3DSwapChain *swapchain; - hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, &tmp); + hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); if (SUCCEEDED(hr)) { - IWineD3DSwapChain_Release((IUnknown *)tmp); - return TRUE; + IWineD3DSwapChain_Release((IUnknown *)swapchain); + return swapchain; } - return FALSE; + return NULL; } void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const WINED3DRECT *src_rect, IWineD3DSurface *dst_surface, const WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ + IWineD3DSwapChain *src_swapchain, *dst_swapchain; GLenum gl_filter; TRACE("(%p) : src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %s (0x%08x), flip %u\n", @@ -5321,25 +5322,45 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const } /* Attach src surface to src fbo */ - if (is_onscreen(src_surface)) { + src_swapchain = get_swapchain(src_surface); + if (src_swapchain) { + GLenum buffer; + TRACE("Source surface %p is onscreen\n", src_surface); + GL_EXTCALL(glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0)); + buffer = surface_get_gl_buffer(src_surface, src_swapchain); + glReadBuffer(buffer); + checkGLcall("glReadBuffer()"); + flip = !flip; } else { TRACE("Source surface %p is offscreen\n", src_surface); bind_fbo(iface, GL_READ_FRAMEBUFFER_EXT, &This->src_fbo); attach_surface_fbo(This, GL_READ_FRAMEBUFFER_EXT, 0, src_surface); + glReadBuffer(GL_COLOR_ATTACHMENT0_EXT); + checkGLcall("glReadBuffer()"); } /* Attach dst surface to dst fbo */ - if (is_onscreen(dst_surface)) { + dst_swapchain = get_swapchain(dst_surface); + if (dst_swapchain) { + GLenum buffer; + TRACE("Destination surface %p is onscreen\n", dst_surface); + GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); + buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer()"); + flip = !flip; } else { TRACE("Destination surface %p is offscreen\n", dst_surface); bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->dst_fbo); attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface); + glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); + checkGLcall("glDrawBuffer()"); } if (flip) { @@ -5356,6 +5377,13 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); checkGLcall("glBindFramebuffer()"); } + + /* If we switched from GL_BACK to GL_FRONT above, we need to switch back here */ + if (dst_swapchain && dst_surface == ((IWineD3DSwapChainImpl *)dst_swapchain)->frontBuffer + && ((IWineD3DSwapChainImpl *)dst_swapchain)->backBuffer) { + glDrawBuffer(GL_BACK); + checkGLcall("glDrawBuffer()"); + } } static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget) {

1 0

H. Verbeet : wined3d: Use surface_get_gl_buffer where appropriate.
by Alexandre Julliard April 17, 2007

April 17, 2007

Module: wine Branch: master Commit: 5fddfd5bbc6479a4aedb37cee51e5cb97374c26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fddfd5bbc6479a4aedb37cee… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 16 21:20:32 2007 +0200 wined3d: Use surface_get_gl_buffer where appropriate. --- dlls/wined3d/surface.c | 52 ++++++++++++++--------------------------------- 1 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 049b827..4067ac8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -809,19 +809,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED glReadBuffer(myDevice->offscreenBuffer); srcIsUpsideDown = TRUE; } else { - if(iface == swapchain->frontBuffer) { - TRACE("Locking the front buffer\n"); - glReadBuffer(GL_FRONT); - } else if(swapchain->backBuffer && iface == swapchain->backBuffer[0]) { - TRACE("Locking the back buffer\n"); - glReadBuffer(GL_BACK); - } else { - /* Ok, there is an issue: OpenGL does not guarant any back buffer number, so all we can do is to read GL_BACK - * and hope it gives what the app wants - */ - FIXME("Application is locking a 2nd or higher back buffer\n"); - glReadBuffer(GL_BACK); - } + GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); + TRACE("Locking %#x buffer\n", buffer); + glReadBuffer(buffer); + checkGLcall("glReadBuffer"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); srcIsUpsideDown = FALSE; } @@ -1207,19 +1199,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { glDrawBuffer(myDevice->offscreenBuffer); checkGLcall("glDrawBuffer(myDevice->offscreenBuffer)"); } else { - if(iface == swapchain->frontBuffer) { - TRACE("Onscreen front buffer\n"); - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer(GL_FRONT)"); - } else if(iface == swapchain->backBuffer[0]) { - TRACE("Onscreen back buffer\n"); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - } else { - FIXME("Unlocking a higher back buffer\n"); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - } + GLenum buffer = surface_get_gl_buffer(iface, (IWineD3DSwapChain *)swapchain); + TRACE("Unlocking %#x buffer\n", buffer); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); } @@ -2364,10 +2348,9 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D checkGLcall("glBindTexture"); if(!swapchain) { glReadBuffer(myDevice->offscreenBuffer); - } else if(swapchain->backBuffer && SrcSurface == swapchain->backBuffer[0]) { - glReadBuffer(GL_BACK); } else { - glReadBuffer(GL_FRONT); + GLenum buffer = surface_get_gl_buffer(SrcSurface, (IWineD3DSwapChain *)swapchain); + glReadBuffer(buffer); } checkGLcall("glReadBuffer"); @@ -2877,14 +2860,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * if(!dstSwapchain) { TRACE("Drawing to offscreen buffer\n"); glDrawBuffer(myDevice->offscreenBuffer); - } else if(This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer) { - TRACE("Drawing to front buffer\n"); - glDrawBuffer(GL_FRONT); - checkGLcall("glDrawBuffer GL_FRONT"); } else { - TRACE("Drawing to back buffer\n"); - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer GL_BACK"); + GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)dstSwapchain); + TRACE("Drawing to %#x buffer\n", buffer); + glDrawBuffer(buffer); + checkGLcall("glDrawBuffer"); } /* Bind the texture */

1 0