June 2006 - Wine-Commits - list.winehq.org

Huw Davies : winex11: Introduce a function to retrieve the glx drawable and have
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: f4e8169e9acb59b340b2a8f521d44a9f012267bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4e8169e9acb59b340b2a8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 23 12:13:55 2006 +0100 winex11: Introduce a function to retrieve the glx drawable and have both the GET_GLX_DRAWABLE Escape and SwapBuffers call it. --- dlls/winex11.drv/init.c | 13 +------ dlls/winex11.drv/opengl.c | 89 ++++++++++++++++++++++++++++----------------- dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 58 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 0aa38a4..651b2b4 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -410,18 +410,7 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph case X11DRV_GET_GLX_DRAWABLE: if (out_count >= sizeof(Drawable)) { - if(physDev->bitmap) - { - if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) - *(Drawable *)out_data = physDev->drawable; /* PBuffer */ - else { - if(!physDev->bitmap->glxpixmap) - physDev->bitmap->glxpixmap = create_glxpixmap(physDev); - *(Drawable *)out_data = physDev->bitmap->glxpixmap; - } - } - else - *(Drawable *)out_data = physDev->drawable; + *(Drawable *)out_data = get_glxdrawable(physDev); return TRUE; } break; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 60ebcce..2fe6c9d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -523,12 +523,64 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC return TRUE; } +static XID create_glxpixmap(X11DRV_PDEVICE *physDev) +{ + GLXPixmap ret; + XVisualInfo *vis; + XVisualInfo template; + int num; + GLXFBConfig *cfgs; + + wine_tsx11_lock(); + cfgs = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &num); + pglXGetFBConfigAttrib(gdi_display, cfgs[physDev->current_pf - 1], GLX_VISUAL_ID, (int *)&template.visualid); + + vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); + + ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); + XFree(vis); + XFree(cfgs); + wine_tsx11_unlock(); + TRACE("return %lx\n", ret); + return ret; +} + +Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) +{ + Drawable ret; + + if(physDev->bitmap) + { + if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) + ret = physDev->drawable; /* PBuffer */ + else + { + if(!physDev->bitmap->glxpixmap) + physDev->bitmap->glxpixmap = create_glxpixmap(physDev); + ret = physDev->bitmap->glxpixmap; + } + } + else + ret = physDev->drawable; + return ret; +} + +BOOL destroy_glxpixmap(XID glxpixmap) +{ + wine_tsx11_lock(); + pglXDestroyGLXPixmap(gdi_display, glxpixmap); + wine_tsx11_unlock(); + return TRUE; +} + /** * X11DRV_SwapBuffers * * Swap the buffers of this DC */ -BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) { +BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) +{ + GLXDrawable drawable; if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); return 0; @@ -536,8 +588,9 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE * TRACE_(opengl)("(%p)\n", physDev); + drawable = get_glxdrawable(physDev); wine_tsx11_lock(); - pglXSwapBuffers(gdi_display, physDev->drawable); + pglXSwapBuffers(gdi_display, drawable); wine_tsx11_unlock(); return TRUE; @@ -587,36 +640,6 @@ XVisualInfo *X11DRV_setup_opengl_visual( return visual; } -XID create_glxpixmap(X11DRV_PDEVICE *physDev) -{ - GLXPixmap ret; - XVisualInfo *vis; - XVisualInfo template; - int num; - GLXFBConfig *cfgs; - - wine_tsx11_lock(); - cfgs = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &num); - pglXGetFBConfigAttrib(gdi_display, cfgs[physDev->current_pf - 1], GLX_VISUAL_ID, (int *)&template.visualid); - - vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); - - ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); - XFree(vis); - XFree(cfgs); - wine_tsx11_unlock(); - TRACE("return %lx\n", ret); - return ret; -} - -BOOL destroy_glxpixmap(XID glxpixmap) -{ - wine_tsx11_lock(); - pglXDestroyGLXPixmap(gdi_display, glxpixmap); - wine_tsx11_unlock(); - return TRUE; -} - #else /* no OpenGL includes */ void X11DRV_OpenGL_Init(Display *display) @@ -679,7 +702,7 @@ XVisualInfo *X11DRV_setup_opengl_visual( return NULL; } -XID create_glxpixmap(X11DRV_PDEVICE *physDev) +Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) { return 0; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index adbb1f7..9537b77 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -272,7 +272,7 @@ extern BOOL X11DRV_XRender_ExtTextOut(X1 extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev); extern XVisualInfo *X11DRV_setup_opengl_visual(Display *display); -extern XID create_glxpixmap(X11DRV_PDEVICE *physDev); +extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); extern BOOL destroy_glxpixmap(XID glxpixmap); /* XIM support */

1 0

Paul Vriens : imagehlp: Fixed typo (Coverity).
by Alexandre Julliard June 26, 2006

June 26, 2006

Module: wine Branch: refs/heads/master Commit: 7c6febe6eb95209db71f8a76cf4d2d6058bd86a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c6febe6eb95209db71f8a7… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jun 23 13:02:56 2006 +0200 imagehlp: Fixed typo (Coverity). --- dlls/imagehlp/modify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 92b195d..ee21ddd 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -180,7 +180,7 @@ DWORD WINAPI MapFileAndCheckSumA( 0, 0, 0); - if (hMapping == 0) + if (BaseAddress == 0) { CloseHandle(hMapping); CloseHandle(hFile);

1 0

appdb/. maintainersubmit.php
by WineHQ June 26, 2006

June 26, 2006

ChangeSet ID: 26014 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/25 20:43:00 Modified files: . : maintainersubmit.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix applying to become a super maintainer Patch: http://cvs.winehq.org/patch.py?id=26014 Old revision New revision Changes Path 1.24 1.25 +1 -1 appdb/maintainersubmit.php Index: appdb/maintainersubmit.php diff -u -p appdb/maintainersubmit.php:1.24 appdb/maintainersubmit.php:1.25 --- appdb/maintainersubmit.php:1.24 26 Jun 2006 1:43: 0 -0000 +++ appdb/maintainersubmit.php 26 Jun 2006 1:43: 0 -0000 @@ -152,7 +152,7 @@ if( $aClean['maintainReason'] ) } echo "<input type=hidden name='appId' value={$aClean['appId']}>"; echo "<input type=hidden name='versionId' value={$aClean['versionId']}>"; - echo "<input type=hidden name='superMaintainer' value={$aClean['superMaintainer>']}"; + echo "<input type=hidden name='superMaintainer' value={$aClean['superMaintainer']}>"; if($aClean['superMaintainer']) echo '<tr valign=top><td class=color0><b>Why you want to and should be an application super maintainer</b></td><td><textarea name="maintainReason" rows=15 cols=70></textarea></td></tr>',"\n";

1 0

appdb/include application.php distributions.ph ...
by WineHQ June 26, 2006

June 26, 2006

ChangeSet ID: 26013 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/25 19:44:44 Modified files: include : application.php distributions.php incl.php testResults.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Warn if magic quotes is enabled and explain a bit about why we require that magic quotes be disabled. Also remove all of the conditional code that was working around cases where we had magic quotes enabled. We were only working around a small portion of cases where magic quotes was affecting the appdb. Patch: http://cvs.winehq.org/patch.py?id=26013 Old revision New revision Changes Path 1.47 1.48 +8 -23 appdb/include/application.php 1.5 1.6 +3 -11 appdb/include/distributions.php 1.27 1.28 +21 -0 appdb/include/incl.php 1.20 1.21 +12 -29 appdb/include/testResults.php 1.55 1.56 +7 -24 appdb/include/version.php

1 0

appdb/include testResults.php
by WineHQ June 24, 2006

June 24, 2006

ChangeSet ID: 26012 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/24 00:02:56 Modified files: include : testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix a warning due to missing first parameter when testData::OutputEditor() is called from adminTestResults.php. At this point we never expect to have a $sDistribution so we can just default the parameter to a null string Patch: http://cvs.winehq.org/patch.py?id=26012 Old revision New revision Changes Path 1.19 1.20 +1 -1 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.19 appdb/include/testResults.php:1.20 --- appdb/include/testResults.php:1.19 24 Jun 2006 5: 2:56 -0000 +++ appdb/include/testResults.php 24 Jun 2006 5: 2:56 -0000 @@ -446,7 +446,7 @@ class testData{ } // show the fields for editing - function OutputEditor($sDistribution, $bNewDist=false) + function OutputEditor($sDistribution="", $bNewDist=false) { HtmlAreaLoaderScript(array("Test1", "Test2", "Test3"));

1 0

appdb/ ./maintainersubmit.php admin/adminAppDa ...
by WineHQ June 24, 2006

June 24, 2006

ChangeSet ID: 26011 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 23:20:32 Modified files: . : maintainersubmit.php admin : adminAppDataQueue.php editBundle.php include : appdb.php application.php bugs.php category.php comment.php db.php distributions.php monitor.php note.php screenshot.php testResults.php url.php user.php util.php vendor.php version.php vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Protect against sql injection attacks in sql INSERT statements Patch: http://cvs.winehq.org/patch.py?id=26011 Old revision New revision Changes Path 1.23 1.24 +7 -8 appdb/maintainersubmit.php 1.19 1.20 +6 -4 appdb/admin/adminAppDataQueue.php 1.8 1.9 +4 -1 appdb/admin/editBundle.php 1.4 1.5 +6 -2 appdb/include/appdb.php 1.46 1.47 +8 -12 appdb/include/application.php 1.7 1.8 +6 -7 appdb/include/bugs.php 1.16 1.17 +7 -7 appdb/include/category.php 1.18 1.19 +8 -8 appdb/include/comment.php 1.13 1.14 +62 -25 appdb/include/db.php 1.4 1.5 +8 -8 appdb/include/distributions.php 1.2 1.3 +8 -8 appdb/include/monitor.php 1.7 1.8 +7 -7 appdb/include/note.php 1.36 1.37 +8 -9 appdb/include/screenshot.php 1.18 1.19 +14 -16 appdb/include/testResults.php 1.3 1.4 +8 -10 appdb/include/url.php 1.67 1.68 +15 -18 appdb/include/user.php 1.58 1.59 +9 -13 appdb/include/util.php 1.6 1.7 +6 -6 appdb/include/vendor.php 1.54 1.55 +8 -10 appdb/include/version.php 1.15 1.16 +3 -1 appdb/include/vote.php

1 0

appdb/. appsubmit.php
by WineHQ June 24, 2006

June 24, 2006

ChangeSet ID: 26010 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 23:07:42 Modified files: . : appsubmit.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Disable hackish looking "we've got errors message" since we'll display human readable errors later on. Patch: http://cvs.winehq.org/patch.py?id=26010 Old revision New revision Changes Path 1.41 1.42 +4 -4 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.41 appdb/appsubmit.php:1.42 --- appdb/appsubmit.php:1.41 24 Jun 2006 4: 7:42 -0000 +++ appdb/appsubmit.php 24 Jun 2006 4: 7:42 -0000 @@ -177,9 +177,9 @@ if ($aClean['sub']) } } + /* if we have errors go back to 'view' mode */ if(!empty($errors)) { - addmsg("we've got Errors???:".$errors.":"); $aClean['sub'] = 'view'; } else @@ -206,9 +206,9 @@ if ($aClean['sub']) } $oTest->iVersionId = $oVersion->iVersionId; if(is_numeric($oTest->iTestingId)) - { - $oTest->update(true); - $oTest->ReQueue(); + { + $oTest->update(true); + $oTest->ReQueue(); } else { $oTest->create();

1 0

appdb/include vote.php
by WineHQ June 24, 2006

June 24, 2006

ChangeSet ID: 26009 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 22:09:07 Modified files: include : vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix voting. Another case, ha ha, where different capitalization messed us up Patch: http://cvs.winehq.org/patch.py?id=26009 Old revision New revision Changes Path 1.14 1.15 +1 -1 appdb/include/vote.php Index: appdb/include/vote.php diff -u -p appdb/include/vote.php:1.14 appdb/include/vote.php:1.15 --- appdb/include/vote.php:1.14 24 Jun 2006 3: 9: 7 -0000 +++ appdb/include/vote.php 24 Jun 2006 3: 9: 7 -0000 @@ -113,7 +113,7 @@ function vote_menu() { $aClean = array(); //array of filtered user input - $aClean['appid'] = makeSafe($_REQUEST['appId']); + $aClean['appId'] = makeSafe($_REQUEST['appId']); $m = new htmlmenu("Votes","updatevote.php");

1 0

appdb/. appbrowse.php
by WineHQ June 24, 2006

June 24, 2006

ChangeSet ID: 26008 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 22:05:16 Modified files: . : appbrowse.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Retrieve iCatId from $_REQUEST(), we can't use $aClean[] because it isn't in scope. Fixes editing categories Patch: http://cvs.winehq.org/patch.py?id=26008 Old revision New revision Changes Path 1.12 1.13 +4 -6 appdb/appbrowse.php Index: appdb/appbrowse.php diff -u -p appdb/appbrowse.php:1.12 appdb/appbrowse.php:1.13 --- appdb/appbrowse.php:1.12 24 Jun 2006 3: 5:16 -0000 +++ appdb/appbrowse.php 24 Jun 2006 3: 5:16 -0000 @@ -14,14 +14,12 @@ $aClean['catId'] = makeSafe($_REQUEST['c function admin_menu() { - if( empty( $aClean['catId'] ) ) - { - $aClean['catId'] = ""; - } + if(isset($_REQUEST['catId'])) $iCatId=$_REQUEST['catId']; + else $iCatId=""; $m = new htmlmenu("Admin"); - $m->add("Edit this Category", BASE."admin/addCategory.php?catId']}"); - $url = BASE."admin/deleteAny.php?what=category&catId={$aClean['catId']}&confirmed=yes"; + $m->add("Edit this Category", BASE."admin/addCategory.php?catId=$iCatId"); + $url = BASE."admin/deleteAny.php?what=category&catId=$iCatId&confirmed=yes"; $m->add("Delete this Category", "javascript:deleteURL(\"Are you sure?\", \"".$url."\")"); $m->done();

1 0

appdb/include testResults.php
by WineHQ June 24, 2006

June 24, 2006

ChangeSet ID: 26007 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 21:38:44 Modified files: include : testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix entering a new distribution when submitting a new application or version Patch: http://cvs.winehq.org/patch.py?id=26007 Old revision New revision Changes Path 1.17 1.18 +1 -1 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.17 appdb/include/testResults.php:1.18 --- appdb/include/testResults.php:1.17 24 Jun 2006 2:38:44 -0000 +++ appdb/include/testResults.php 24 Jun 2006 2:38:44 -0000 @@ -542,7 +542,7 @@ class testData{ $errors .= "<li>Please enter the version of Wine that you tested with.</li>\n"; // No Distribution entered, and nothing in the list is selected - if (empty($sDistribution) && !$aClean['iDistributionId']) + if (empty($aClean['sDistribution']) && !$aClean['iDistributionId']) $errors .= "<li>Please enter a distribution.</li>\n"; if (empty($aClean['sInstalls']))

1 0