July 2009 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : objectManager: Only show the edit screen if the user has sufficient rights
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: 1dfb1a24c607620339bf0587f65234aa6766858a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1dfb1a24c607620339bf0587… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:29:48 2009 +0200 objectManager: Only show the edit screen if the user has sufficient rights --- include/objectManager.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 0e1f0df..4235279 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -393,6 +393,10 @@ class ObjectManager return; } + /* Only show the edit screen if the user has sufficient rights */ + if(!$oObject->canEdit()) + $this->error_exit('You do not have sufficient privileges to edit this entry'); + /* Display errors, if any, and fetch form data */ if($this->displayErrors($sErrors)) {

1 0

Alexander Nicolaysen Sørnes : voteInspector: View the info in objectManager's edit mode
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: 028d51d85dbc16a2f3f592ccf85ed9c58a79c817 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=028d51d85dbc16a2f3f592cc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:30:18 2009 +0200 voteInspector: View the info in objectManager's edit mode --- include/version.php | 2 +- include/vote.php | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/version.php b/include/version.php index b2c1798..7d4aa55 100644 --- a/include/version.php +++ b/include/version.php @@ -875,7 +875,7 @@ class version { if($_SESSION['current']->hasPriv('admin')) { $oMVoteInspector = new objectManager('voteInspector', 'Vote inspector'); - $shVoteLink .= '   <a href="'.$oMVoteInspector->makeUrl('view',$this->iVersionId).'">Inspect</a>'; + $shVoteLink .= '   <a href="'.$oMVoteInspector->makeUrl('edit',$this->iVersionId).'">Inspect</a>'; } $shVoteText = vote_count_version_total($this->iVersionId).$shVoteLink; diff --git a/include/vote.php b/include/vote.php index 193c3b8..692c2ab 100644 --- a/include/vote.php +++ b/include/vote.php @@ -250,7 +250,12 @@ class voteInspector return 'accepted'; } - public function display() + public function canEdit() + { + return $_SESSION['current']->hasPriv('admin'); + } + + public function outputEditor() { $oVersion = new version($this->iVersionId); @@ -314,6 +319,21 @@ class voteInspector echo $oTable->getString(); } + + public function getOutputEditorValues($aValues) + { + + } + + public function create() + { + return true; + } + + public function update() + { + return true; + } } /**

1 0

Alexander Nicolaysen Sørnes : Add vote inspector tool
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: 7b82cd1ef419ad87132bdc8743795e1c5dc2d1e6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7b82cd1ef419ad87132bdc87… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:11:07 2009 +0200 Add vote inspector tool --- include/version.php | 8 ++++ include/vote.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/include/version.php b/include/version.php index ae0bc3e..b2c1798 100644 --- a/include/version.php +++ b/include/version.php @@ -870,6 +870,14 @@ class version { else $shVoteLink = ''; + // Allow admins to see which users have voted, in order to identify + // bogus votes + if($_SESSION['current']->hasPriv('admin')) + { + $oMVoteInspector = new objectManager('voteInspector', 'Vote inspector'); + $shVoteLink .= '   <a href="'.$oMVoteInspector->makeUrl('view',$this->iVersionId).'">Inspect</a>'; + } + $shVoteText = vote_count_version_total($this->iVersionId).$shVoteLink; } else { diff --git a/include/vote.php b/include/vote.php index 36367e3..193c3b8 100644 --- a/include/vote.php +++ b/include/vote.php @@ -228,6 +228,95 @@ class voteManager } /** + * used by admins to check whether votes for a version are legit + */ +class voteInspector +{ + private $iVersionId; + + function voteInspector($iVersionId = null) + { + if(is_numeric($iVersionId)) + $this->iVersionId = $iVersionId; + } + + public function objectGetId() + { + return $this->iVersionId; + } + + public function objectGetState() + { + return 'accepted'; + } + + public function display() + { + $oVersion = new version($this->iVersionId); + + echo 'Inspecting votes for ' . version::fullNameLink($this->iVersionId); + echo ' '; + + $hResult = query_parameters("SELECT userId, COUNT(userId) as count FROM appVotes WHERE + versionId = '?' + GROUP BY userId", $this->iVersionId); + + if(!$hResult) + { + echo 'Failed to get list of votes'; + return; + } + + if(mysql_num_rows($hResult) == 0) + { + echo 'There are no votes for this version'; + return; + } + + $oTable = new Table(); + $oTable->setCellPadding(3); + + $oTableRow = new TableRow(); + $oTableRow->setClass('color4'); + $oTableRow->AddTextCell('User'); + $oTableRow->AddTextCell('ID'); + $oTableRow->AddTextCell('Created'); + $oTableRow->AddTextCell('Votes'); + $oTableRow->AddTextCell('Privileges'); + $oTable->AddRow($oTableRow); + + for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) + { + $oVoter = new user($oRow->userId); + $oTableRow = new TableRow(); + $oTableRow->setClass(($i % 2) ? 'color0' : 'color1'); + $oTableRow->AddTextCell($oVoter->objectMakeLink()); + $oTableRow->AddTextCell($oVoter->iUserId); + $oTableRow->AddTextCell($oVoter->sDateCreated); + $oTableRow->AddTextCell($oRow->count); + + $sPrivs = ''; + if($oVoter->hasPriv('admin')) + $sPrivs .= 'Admin '; + + if($oVoter->isMaintainer($this->iVersionId)) + $sPrivs .= 'Maintainer of this version '; + + if($oVoter->isMaintainer()) + { + $oM = new objectManager('maintainerView', 'View maintainership info'); + $sPrivs .= '<a href="'.$oM->makeUrl('view',$oVoter->iUserId).'">Maintainer (other entries)</a> '; + } + + $oTableRow->AddTextCell($sPrivs); + $oTable->AddRow($oTableRow); + } + + echo $oTable->getString(); + } +} + +/** * count the number of votes for appId by userId */ function vote_count($iVersionId, $iUserId = null)

1 0

Alexander Nicolaysen Sørnes : cron: Add a script to remove votes for deleted versions
by Alexander Nicolaysen Sørnes 22 Jul '09

22 Jul '09

Module: appdb Branch: master Commit: 95d93a09c2d7ae8a8c2f4f33e462c22ec9130048 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=95d93a09c2d7ae8a8c2f4f33… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 17:07:35 2009 +0200 cron: Add a script to remove votes for deleted versions --- cron/cleanup.php | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 7c1fb25..79b7173 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -28,6 +28,9 @@ removeScreenshotsWithMissingFiles(); /* status since they aren't really maintaining the application/version */ maintainerCheck(); +/* remove votes for versions that have been deleted */ +cleanupVotes(); + /* Updates the rating info for all versions based on test results */ //updateRatings(); @@ -294,6 +297,45 @@ function maintainerCheck() maintainer::notifyMaintainersOfQueuedData(); } +/* remove votes for versions that have been deleted */ +function cleanupVotes() +{ + $hResult = mysql_query("SELECT appVotes.* FROM appVotes,appVersion WHERE + appVotes.versionId = appVersion.versionId + AND appVersion.state = 'deleted'"); + + if(!$hResult) + return; + + $iDeleted = 0; + $iFailed = 0; + + while($oRow = mysql_fetch_object($hResult)) + { + $oVote = new vote(null, $oRow); + if($oVote->delete()) + $iDeleted++; + else + $iFailed++; + } + + $sEmails = user::get_notify_email_address_list(null, null); // only admins + + if($sEmails) + { + global $sEmailSubject; + $sSubject = $sEmailSubject . 'Vote Cleanup'; + $sPlural = ($iDeleted == 1) ? '' : 's'; + $sMsg = "Removed $iDeleted vote$sPlural cast for deleted versions\n"; + if($iFailed) + { + $sPlural = ($iFailed == 1) ? '' : 's'; + $sMsg .= "WARNING: Failed to delete $iFailed vote$sPlural\n"; + } + mail_appdb($sEmails, $sSubject, $sMsg); + } +} + function updateRatings() { $hResult = query_parameters("SELECT * FROM appVersion");

1 0

Alexandre Julliard : winhttp: Avoid casting away const.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: af77e9b388cf53ac379ed572d2383e1e3a5e3b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af77e9b388cf53ac379ed572d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 14:48:09 2009 +0200 winhttp: Avoid casting away const. --- dlls/winhttp/session.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 81113e4..27509e1 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -886,16 +886,16 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) if (hdr->flags & WINHTTP_PROXY_TYPE_PROXY) { BOOL sane = FALSE; + LPWSTR proxy = NULL; + LPWSTR proxy_bypass = NULL; /* Sanity-check length of proxy string */ if ((BYTE *)len - buf + *len <= size) { sane = TRUE; - info->lpszProxy = GlobalAlloc( 0, - (*len + 1) * sizeof(WCHAR) ); - if (info->lpszProxy) - copy_char_to_wchar_sz( (BYTE *)(len + 1), - *len, (LPWSTR)info->lpszProxy ); + proxy = GlobalAlloc( 0, (*len + 1) * sizeof(WCHAR) ); + if (proxy) + copy_char_to_wchar_sz( (BYTE *)(len + 1), *len, proxy ); len = (DWORD *)((BYTE *)(len + 1) + *len); } if (sane) @@ -903,19 +903,19 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) /* Sanity-check length of proxy bypass string */ if ((BYTE *)len - buf + *len <= size) { - info->lpszProxyBypass = GlobalAlloc( 0, - (*len + 1) * sizeof(WCHAR) ); - if (info->lpszProxyBypass) - copy_char_to_wchar_sz( (BYTE *)(len + 1), - *len, (LPWSTR)info->lpszProxyBypass ); + proxy_bypass = GlobalAlloc( 0, (*len + 1) * sizeof(WCHAR) ); + if (proxy_bypass) + copy_char_to_wchar_sz( (BYTE *)(len + 1), *len, proxy_bypass ); } else { sane = FALSE; - GlobalFree( (LPWSTR)info->lpszProxy ); - info->lpszProxy = NULL; + GlobalFree( proxy ); + proxy = NULL; } } + info->lpszProxy = proxy; + info->lpszProxyBypass = proxy_bypass; if (sane) { got_from_reg = TRUE;

1 0

Luke Benstead : ntdll: Add semi-stub implementation for SystemExecutionState query.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 8ed1f0547e8e2ae906fde0063cadcda1c89541c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed1f0547e8e2ae906fde0063… Author: Luke Benstead <kazade(a)gmail.com> Date: Tue Jul 14 17:02:59 2009 +0100 ntdll: Add semi-stub implementation for SystemExecutionState query. --- dlls/ntdll/nt.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c457028..c7d931c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1328,6 +1328,15 @@ NTSTATUS WINAPI NtPowerInformation( PowerCaps->DefaultLowLatencyWake = PowerSystemUnspecified; return STATUS_SUCCESS; } + case SystemExecutionState: { + PULONG ExecutionState = lpOutputBuffer; + FIXME("semi-stub: SystemExecutionState\n"); + if (lpInputBuffer != NULL) + return STATUS_INVALID_PARAMETER; + /* FIXME: The actual state should be the value set by SetThreadExecutionState which is not currently implemented. */ + *ExecutionState = ES_USER_PRESENT; + return STATUS_SUCCESS; + } default: /* FIXME: Needed by .NET Framework */ WARN("Unimplemented NtPowerInformation action: %d\n", InformationLevel);

1 0

Henri Verbeet : wined3d: Try to reuse the thread' s current context in FindContext().
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: e5d621c0813e795cd63755f90dcfbb8579a77006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d621c0813e795cd63755f90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:10 2009 +0200 wined3d: Try to reuse the thread's current context in FindContext(). --- dlls/wined3d/context.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2c61268..d82d2dc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1603,16 +1603,30 @@ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchai static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) { IWineD3DSwapChain *swapchain = NULL; BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; + struct WineD3DContext *current_context = context_get_current(); BOOL oldRenderOffscreen = This->render_offscreen; const struct StateEntry *StateTable = This->StateTable; const struct GlPixelFormatDesc *old, *new; struct WineD3DContext *context; - if (!target) target = This->activeContext->current_rt; + if (!target) + { + if (current_context + && ((IWineD3DSurfaceImpl *)current_context->surface)->resource.wineD3DDevice == This) + { + target = current_context->current_rt; + } + else + { + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->swapchains[0]; + if (swapchain->backBuffer) target = swapchain->backBuffer[0]; + else target = swapchain->frontBuffer; + } + } - if (This->activeContext->current_rt == target && This->activeContext->tid == tid) + if (current_context && current_context->current_rt == target) { - return This->activeContext; + return current_context; } if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { @@ -1678,9 +1692,10 @@ retry: else { /* Stay with the currently active context. */ - if (This->activeContext && This->activeContext->tid == tid) + if (current_context + && ((IWineD3DSurfaceImpl *)current_context->surface)->resource.wineD3DDevice == This) { - context = This->activeContext; + context = current_context; } else { @@ -1835,6 +1850,7 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, * *****************************************************************************/ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextUsage usage) { + struct WineD3DContext *current_context = context_get_current(); DWORD tid = GetCurrentThreadId(); DWORD i, dirtyState, idx; BYTE shift; @@ -1849,23 +1865,26 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU gl_info = context->gl_info; /* Activate the opengl context */ - if(last_device != This || context != This->activeContext) { + if (context != current_context) + { if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); else This->frag_pipe->enable_extension((IWineD3DDevice *)This, !context->last_was_blit); - if(This->activeContext->vshader_const_dirty) { - memset(This->activeContext->vshader_const_dirty, 1, - sizeof(*This->activeContext->vshader_const_dirty) * GL_LIMITS(vshader_constantsF)); + if (context->vshader_const_dirty) + { + memset(context->vshader_const_dirty, 1, + sizeof(*context->vshader_const_dirty) * GL_LIMITS(vshader_constantsF)); This->highest_dirty_vs_const = GL_LIMITS(vshader_constantsF); } - if(This->activeContext->pshader_const_dirty) { - memset(This->activeContext->pshader_const_dirty, 1, - sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); + if (context->pshader_const_dirty) + { + memset(context->pshader_const_dirty, 1, + sizeof(*context->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); This->highest_dirty_ps_const = GL_LIMITS(pshader_constantsF); } - This->activeContext = context; - context_set_last_device(This); } + This->activeContext = context; + context_set_last_device(This); switch (usage) { case CTXUSAGE_CLEAR:

1 0

Henri Verbeet : wined3d: Move some context selection code from ActivateContext() to FindContext().
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 9ceda3a6fdc25fcb994f74fd3763f695ba5c0222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ceda3a6fdc25fcb994f74fd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:09 2009 +0200 wined3d: Move some context selection code from ActivateContext() to FindContext(). --- dlls/wined3d/context.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 89d79a6..2c61268 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1608,6 +1608,13 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf const struct GlPixelFormatDesc *old, *new; struct WineD3DContext *context; + if (!target) target = This->activeContext->current_rt; + + if (This->activeContext->current_rt == target && This->activeContext->tid == tid) + { + return This->activeContext; + } + if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { TRACE("Rendering onscreen\n"); @@ -1763,6 +1770,9 @@ retry: This->isInDraw = oldInDraw; } + context->draw_buffer_dirty = TRUE; + context->current_rt = target; + return context; } @@ -1834,17 +1844,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); - if (!target) target = This->activeContext->current_rt; - - if (This->activeContext->current_rt != target || This->activeContext->tid != tid) - { - context = FindContext(This, target, tid); - context->draw_buffer_dirty = TRUE; - context->current_rt = target; - } else { - /* Stick to the old context */ - context = This->activeContext; - } + context = FindContext(This, target, tid); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Simplify FindContext() a bit.
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: 219d3abdd18022644836490718ec2eab5f296f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=219d3abdd1802264483649071… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:08 2009 +0200 wined3d: Simplify FindContext() a bit. --- dlls/wined3d/context.c | 141 +++++++++++++++++++++--------------------------- 1 files changed, 61 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0be356a..89d79a6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1603,10 +1603,10 @@ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchai static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) { IWineD3DSwapChain *swapchain = NULL; BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; - WineD3DContext *context = This->activeContext; BOOL oldRenderOffscreen = This->render_offscreen; const struct StateEntry *StateTable = This->StateTable; const struct GlPixelFormatDesc *old, *new; + struct WineD3DContext *context; if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { TRACE("Rendering onscreen\n"); @@ -1625,97 +1625,78 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } } IWineD3DSwapChain_Release(swapchain); - - if(oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); - Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); - Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); - } - - } else { + } + else + { TRACE("Rendering offscreen\n"); This->render_offscreen = TRUE; - switch(wined3d_settings.offscreen_rendering_mode) { - case ORM_FBO: - /* FBOs do not need a different context. Stay with whatever context is active at the moment */ - if (This->activeContext && This->activeContext->tid == tid) - { - context = This->activeContext; - } else { - /* This may happen if the app jumps straight into offscreen rendering - * Start using the context of the primary swapchain. tid == 0 is no problem - * for findThreadContextForSwapChain. - * - * Can also happen on thread switches - in that case findThreadContextForSwapChain - * is perfect to call. - */ - context = findThreadContextForSwapChain(This->swapchains[0], tid); - } - break; - - case ORM_PBUFFER: +retry: + if (wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) + { + IWineD3DSurfaceImpl *targetimpl = (IWineD3DSurfaceImpl *)target; + if (!This->pbufferContext + || This->pbufferWidth < targetimpl->currentDesc.Width + || This->pbufferHeight < targetimpl->currentDesc.Height) { - IWineD3DSurfaceImpl *targetimpl = (IWineD3DSurfaceImpl *) target; - if(This->pbufferContext == NULL || - This->pbufferWidth < targetimpl->currentDesc.Width || - This->pbufferHeight < targetimpl->currentDesc.Height) { - if(This->pbufferContext) { - DestroyContext(This, This->pbufferContext); - } - - /* The display is irrelevant here, the window is 0. But CreateContext needs a valid X connection. - * Create the context on the same server as the primary swapchain. The primary swapchain is exists at this point. - */ - This->pbufferContext = CreateContext(This, targetimpl, - ((IWineD3DSwapChainImpl *) This->swapchains[0])->context[0]->win_handle, - TRUE /* pbuffer */, &((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms); - This->pbufferWidth = targetimpl->currentDesc.Width; - This->pbufferHeight = targetimpl->currentDesc.Height; - } - - if(This->pbufferContext) { - if(This->pbufferContext->tid != 0 && This->pbufferContext->tid != tid) { - FIXME("The PBuffr context is only supported for one thread for now!\n"); - } - This->pbufferContext->tid = tid; - context = This->pbufferContext; - break; - } else { - ERR("Failed to create a buffer context and drawable, falling back to back buffer offscreen rendering\n"); - wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - } + if (This->pbufferContext) DestroyContext(This, This->pbufferContext); + + /* The display is irrelevant here, the window is 0. But + * CreateContext needs a valid X connection. Create the context + * on the same server as the primary swapchain. The primary + * swapchain is exists at this point. */ + This->pbufferContext = CreateContext(This, targetimpl, + ((IWineD3DSwapChainImpl *)This->swapchains[0])->context[0]->win_handle, + TRUE /* pbuffer */, &((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms); + This->pbufferWidth = targetimpl->currentDesc.Width; + This->pbufferHeight = targetimpl->currentDesc.Height; } - case ORM_BACKBUFFER: - /* Stay with the currently active context for back buffer rendering */ - if (This->activeContext && This->activeContext->tid == tid) + if (This->pbufferContext) + { + if (This->pbufferContext->tid && This->pbufferContext->tid != tid) { - context = This->activeContext; - } else { - /* This may happen if the app jumps straight into offscreen rendering - * Start using the context of the primary swapchain. tid == 0 is no problem - * for findThreadContextForSwapChain. - * - * Can also happen on thread switches - in that case findThreadContextForSwapChain - * is perfect to call. - */ - context = findThreadContextForSwapChain(This->swapchains[0], tid); + FIXME("The PBuffer context is only supported for one thread for now!\n"); } - break; + This->pbufferContext->tid = tid; + context = This->pbufferContext; + } + else + { + ERR("Failed to create a buffer context and drawable, falling back to back buffer offscreen rendering.\n"); + wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; + goto retry; + } } - - if(!oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); - Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); - Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); + else + { + /* Stay with the currently active context. */ + if (This->activeContext && This->activeContext->tid == tid) + { + context = This->activeContext; + } + else + { + /* This may happen if the app jumps straight into offscreen rendering + * Start using the context of the primary swapchain. tid == 0 is no problem + * for findThreadContextForSwapChain. + * + * Can also happen on thread switches - in that case findThreadContextForSwapChain + * is perfect to call. */ + context = findThreadContextForSwapChain(This->swapchains[0], tid); + } } } + if (This->render_offscreen != oldRenderOffscreen) + { + Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable); + Context_MarkStateDirty(context, STATE_VDECL, StateTable); + Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); + Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); + Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); + } + /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc;

1 0

Henri Verbeet : wined3d: Get rid of getActiveContext().
by Alexandre Julliard 22 Jul '09

22 Jul '09

Module: wine Branch: master Commit: ce436a76e237c362029bb590406aed001a715a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce436a76e237c362029bb5904… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:07 2009 +0200 wined3d: Get rid of getActiveContext(). --- dlls/wined3d/context.c | 4 ---- dlls/wined3d/gl_compat.c | 36 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 777b907..0be356a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1986,7 +1986,3 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU FIXME("Unexpected context usage requested\n"); } } - -WineD3DContext *getActiveContext(void) { - return last_device->activeContext; -} diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index dbd496b..2726173 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -147,7 +147,7 @@ static void WINE_GLAPI wine_glGetDoublev(GLenum pname, GLdouble* params) { static void (WINE_GLAPI *old_fogcoord_glEnable) (GLenum cap) = NULL; static void WINE_GLAPI wine_glEnable(GLenum cap) { if(cap == GL_FOG) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->fog_enabled = 1; if(ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) return; } @@ -157,7 +157,7 @@ static void WINE_GLAPI wine_glEnable(GLenum cap) { static void (WINE_GLAPI *old_fogcoord_glDisable) (GLenum cap) = NULL; static void WINE_GLAPI wine_glDisable(GLenum cap) { if(cap == GL_FOG) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->fog_enabled = 0; if(ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) return; } @@ -166,8 +166,9 @@ static void WINE_GLAPI wine_glDisable(GLenum cap) { static void (WINE_GLAPI *old_fogcoord_glFogi) (GLenum pname, GLint param) = NULL; static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { + struct WineD3DContext *ctx = context_get_current(); + if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = param; if(param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -177,9 +178,9 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { } } else { if(pname == GL_FOG_START) { - getActiveContext()->fogstart = param; + ctx->fogstart = param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = param; + ctx->fogend = param; } old_fogcoord_glFogi(pname, param); } @@ -187,8 +188,8 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { static void (WINE_GLAPI *old_fogcoord_glFogiv) (GLenum pname, const GLint *param) = NULL; static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { + struct WineD3DContext *ctx = context_get_current(); if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = *param; if(*param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -198,9 +199,9 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { } } else { if(pname == GL_FOG_START) { - getActiveContext()->fogstart = *param; + ctx->fogstart = *param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = *param; + ctx->fogend = *param; } old_fogcoord_glFogiv(pname, param); } @@ -208,8 +209,8 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { static void (WINE_GLAPI *old_fogcoord_glFogf) (GLenum pname, GLfloat param) = NULL; static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { + struct WineD3DContext *ctx = context_get_current(); if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = (GLint) param; if(param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -219,9 +220,9 @@ static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { } } else { if(pname == GL_FOG_START) { - getActiveContext()->fogstart = param; + ctx->fogstart = param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = param; + ctx->fogend = param; } old_fogcoord_glFogf(pname, param); } @@ -229,8 +230,8 @@ static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { static void (WINE_GLAPI *old_fogcoord_glFogfv) (GLenum pname, const GLfloat *param) = NULL; static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) { + struct WineD3DContext *ctx = context_get_current(); if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = (GLint) *param; if(*param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -240,15 +241,14 @@ static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) { } } else { if(pname == GL_FOG_COLOR) { - WineD3DContext *ctx = getActiveContext(); ctx->fogcolor[0] = param[0]; ctx->fogcolor[1] = param[1]; ctx->fogcolor[2] = param[2]; ctx->fogcolor[3] = param[3]; } else if(pname == GL_FOG_START) { - getActiveContext()->fogstart = *param; + ctx->fogstart = *param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = *param; + ctx->fogend = *param; } old_fogcoord_glFogfv(pname, param); } @@ -269,7 +269,7 @@ static void (WINE_GLAPI *old_fogcoord_glFogCoordfvEXT) (const GLfloat *f) = NULL static void (WINE_GLAPI *old_fogcoord_glFogCoorddvEXT) (const GLdouble *f) = NULL; static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); if(ctx->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx->fog_enabled) { GLfloat c[4] = {ctx->color[0], ctx->color[1], ctx->color[2], ctx->color[3]}; GLfloat i; @@ -299,7 +299,7 @@ static void WINE_GLAPI wine_glVertex3fv(const GLfloat *pos) { } static void wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->color[0] = r; ctx->color[1] = g; ctx->color[2] = b; @@ -327,7 +327,7 @@ static void wine_glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte a) { * precision function */ static void wine_glFogCoordfEXT(GLfloat f) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->fog_coord_value = f; } static void wine_glFogCoorddEXT(GLdouble f) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd170cb..363eb13 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1263,7 +1263,6 @@ typedef enum ContextUsage { } ContextUsage; void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); -WineD3DContext *getActiveContext(void); WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms); void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type);

1 0