wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Roderick Colenbrander : wgl: Fix another BadMatch error by giving a pbuffer its own GLXContext.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: ae9119f8d02745ccecebf538150e0973e11d6875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9119f8d02745ccecebf5381… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 15:19:46 2007 +0200 wgl: Fix another BadMatch error by giving a pbuffer its own GLXContext. --- dlls/winex11.drv/opengl.c | 47 +++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 05f322e..db9eb44 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -81,26 +81,6 @@ typedef struct wine_glcontext { struct wine_glcontext *prev; } Wine_GLContext; -typedef struct wine_glpbuffer { - Drawable drawable; - Display* display; - int pixelFormat; - int width; - int height; - int* attribList; - HDC hdc; - - int use_render_texture; - GLuint texture_target; - GLuint texture_bind_target; - GLuint texture; - int texture_level; - HDC prev_hdc; - HGLRC prev_ctx; - HDC render_hdc; - HGLRC render_ctx; -} Wine_GLPBuffer; - typedef struct wine_glextension { const char *extName; struct { @@ -134,6 +114,22 @@ typedef struct wine_glpixelformat { BOOL offscreenOnly; } WineGLPixelFormat; +typedef struct wine_glpbuffer { + Drawable drawable; + Display* display; + WineGLPixelFormat* fmt; + int width; + int height; + int* attribList; + HDC hdc; + + int use_render_texture; + GLuint texture_target; + GLuint texture_bind_target; + GLuint texture; + int texture_level; +} Wine_GLPBuffer; + static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; @@ -1984,7 +1980,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->display = gdi_display; object->width = iWidth; object->height = iHeight; - object->pixelFormat = iPixelFormat; + object->fmt = fmt; nAttribs = ConvertAttribWGLtoGLX(piAttribList, attribs, object); if (-1 == nAttribs) { @@ -2163,7 +2159,7 @@ HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *physDev, HPBUFFERARB hPbuffer) /* The function wglGetPbufferDCARB returns a DC to which the pbuffer can be connected. * All formats in our pixelformat list are compatible with each other and the main drawable. */ - physDev->current_pf = object->pixelFormat; + physDev->current_pf = object->fmt->iPixelFormat; physDev->drawable = object->drawable; SetRect( &physDev->drawable_rect, 0, 0, object->width, object->height ); physDev->dc_rect = physDev->drawable_rect; @@ -2648,6 +2644,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf static int init = 0; GLXContext prev_context = pglXGetCurrentContext(); Drawable prev_drawable = pglXGetCurrentDrawable(); + GLXContext tmp_context; /* Our render_texture emulation is basic and lacks some features (1D/Cube support). This is mostly due to lack of demos/games using them. Further the use of glReadPixels @@ -2664,14 +2661,18 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf return GL_FALSE; } + TRACE("drawable=%p, context=%p\n", (void*)object->drawable, prev_context); + tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, GLX_RGBA_TYPE, NULL, True); + /* Switch to our pbuffer and readback its contents */ - pglXMakeCurrent(gdi_display, object->drawable, prev_context); + pglXMakeCurrent(gdi_display, object->drawable, tmp_context); pglReadPixels(0, 0, object->width, object->height, GL_RGBA, GL_UNSIGNED_BYTE, buf); /* Switch back to the original drawable and upload the pbuffer-texture */ pglXMakeCurrent(object->display, prev_drawable, prev_context); pglTexImage2D(object->texture_target, 0, GL_RGBA8, object->width, object->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf); + pglXDestroyContext(gdi_display, tmp_context); HeapFree(GetProcessHeap(), 0, buf); }

1 0

Roderick Colenbrander : wgl: Fix a BadMatch error resulting from ignoring that iPixelFormat stars counting from 1 .
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 7d8c31075b09a3c0fcb483cabc3b22f5fdf87290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8c31075b09a3c0fcb483cab… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 14:59:01 2007 +0200 wgl: Fix a BadMatch error resulting from ignoring that iPixelFormat stars counting from 1. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d6202e5..05f322e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -919,8 +919,8 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) /* We have found an offscreen rendering format :) */ if(tmp_vis_id == 0) { - TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize, i); - WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize; + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE;

1 0

Stefan Dösinger : d3d8: Only test pixel shaders for refcounting if they are supported.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 630d602631b07a2e4942b27d6f7a55ca6e1f31b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630d602631b07a2e4942b27d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:33:37 2007 +0200 d3d8: Only test pixel shaders for refcounting if they are supported. --- dlls/d3d8/tests/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 84b5f29..bc9c804 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -292,6 +292,7 @@ static void test_refcount(void) IDirect3DSurface8 *pBackBuffer = NULL; DWORD dStateBlock = -1; IDirect3DSwapChain8 *pSwapChain = NULL; + D3DCAPS8 caps; D3DPRESENT_PARAMETERS d3dpp; D3DDISPLAYMODE d3ddm; @@ -326,6 +327,7 @@ static void test_refcount(void) trace("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); goto cleanup; } + IDirect3DDevice8_GetDeviceCaps(pDevice, &caps); refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); @@ -435,8 +437,11 @@ static void test_refcount(void) /* Shaders */ hr = IDirect3DDevice8_CreateVertexShader( pDevice, decl, simple_vs, &dVertexShader, 0 ); CHECK_CALL( hr, "CreateVertexShader", pDevice, refcount ); - hr = IDirect3DDevice8_CreatePixelShader( pDevice, simple_ps, &dPixelShader ); - CHECK_CALL( hr, "CreatePixelShader", pDevice, refcount ); + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 0)) + { + hr = IDirect3DDevice8_CreatePixelShader( pDevice, simple_ps, &dPixelShader ); + CHECK_CALL( hr, "CreatePixelShader", pDevice, refcount ); + } /* Textures */ hr = IDirect3DDevice8_CreateTexture( pDevice, 32, 32, 3, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &pTexture ); CHECK_CALL( hr, "CreateTexture", pDevice, ++refcount );

1 0

Stefan Dösinger : d3d8: Skip volume test if volume textures are not supported.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 5016f48daa19b025933dc59b13fdb3cf93f8bb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5016f48daa19b025933dc59b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:27:58 2007 +0200 d3d8: Skip volume test if volume textures are not supported. --- dlls/d3d8/tests/volume.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c index 5d339c3..09767c2 100644 --- a/dlls/d3d8/tests/volume.c +++ b/dlls/d3d8/tests/volume.c @@ -125,6 +125,7 @@ START_TEST(volume) { HMODULE d3d8_handle; IDirect3DDevice8 *device_ptr; + D3DCAPS8 caps; d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) @@ -136,5 +137,11 @@ START_TEST(volume) device_ptr = init_d3d8(d3d8_handle); if (!device_ptr) return; + IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); + if(!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) { + skip("Volume textures not supported\n"); + return; + } + test_volume_get_container(device_ptr); }

1 0

Stefan Dösinger : wined3d: A more dynamic initialization of the gl pixel formats.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 5c905b9e8ca77fe8e30a5e4a5c7962be71191b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c905b9e8ca77fe8e30a5e4a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 10:25:35 2007 +0200 wined3d: A more dynamic initialization of the gl pixel formats. --- dlls/wined3d/utils.c | 158 ++++++++++++++++++++++++++++---------------------- 1 files changed, 89 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c905b9e8ca77fe8e30a5…

1 0

Stefan Dösinger : wined3d: Store the gl format table in the gl info structure.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: d2016ff8929ad72fb3b5a0e3e443fbf4e8aa92c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2016ff8929ad72fb3b5a0e3e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 27 13:22:54 2007 +0200 wined3d: Store the gl format table in the gl info structure. --- dlls/wined3d/device.c | 19 ++++------------ dlls/wined3d/directx.c | 9 ++++++++ dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 18 ++++++++++++--- dlls/wined3d/surface_gdi.c | 16 +++++++------- dlls/wined3d/utils.c | 44 +++++++++++++++++++++++++++++---------- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++---- include/wine/wined3d_gl.h | 7 ++++++ 9 files changed, 81 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2016ff8929ad72fb3b5a…

1 0

Stefan Dösinger : wined3d: Split up the format table.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: a0131a32729588d36dc93991a2e7154cc066d4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0131a32729588d36dc93991a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 23 11:13:37 2007 +0200 wined3d: Split up the format table. --- dlls/wined3d/device.c | 24 +++--- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 25 +++-- dlls/wined3d/surface_gdi.c | 18 ++-- dlls/wined3d/utils.c | 210 +++++++++++++++++++++++++++------------ dlls/wined3d/volume.c | 15 ++-- dlls/wined3d/wined3d_private.h | 9 ++- 7 files changed, 197 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0131a32729588d36dc93…

1 0

appdb/ include/incl.php unit_test/run_tests.php
by WineHQ 30 Jul '07

30 Jul '07

ChangeSet ID: 31289 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 20:56:39 Modified files: include : incl.php unit_test : run_tests.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Purge and check session message count before and after the unit tests. The unit tests generate a lot of session messages and we don't want to leave these around after the tests. Patch: http://cvs.winehq.org/patch.py?id=31289 Old revision New revision Changes Path 1.45 1.46 +6 -0 appdb/include/incl.php 1.16 1.17 +7 -1 appdb/unit_test/run_tests.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.45 appdb/include/incl.php:1.46 --- appdb/include/incl.php:1.45 30 Jul 2007 1:56:39 -0000 +++ appdb/include/incl.php 30 Jul 2007 1:56:39 -0000 @@ -273,6 +273,12 @@ function addmsg($text, $color = "black") } +function purgeSessionMessages() +{ + $sQuery = "truncate sessionMessages"; + query_parameters($sQuery); +} + /** * output msg_buffer and clear it. Index: appdb/unit_test/run_tests.php diff -u -p appdb/unit_test/run_tests.php:1.16 appdb/unit_test/run_tests.php:1.17 --- appdb/unit_test/run_tests.php:1.16 30 Jul 2007 1:56:39 -0000 +++ appdb/unit_test/run_tests.php 30 Jul 2007 1:56:39 -0000 @@ -17,11 +17,13 @@ if(!defined("DISABLE_EMAIL")) // default to the tests being successful $bTestSuccess = true; +// purge any session messages currently in the database +purgeSessionMessages(); + // retrieve counts of each of the tables so we can check again // at the end of the $oStartingTableCounts = new table_counts(); - include_once("test_user.php"); echo "\n"; @@ -43,6 +45,9 @@ include_once("test_appData.php"); echo "\n"; include_once("test_testData.php"); +// purge any session messages we generated during the test +purgeSessionMessages(); + // retrieve counts of each of the tables after our tests $oEndingTableCounts = new table_counts(); @@ -97,6 +102,7 @@ class table_counts 'testResults', 'user_list', 'user_privs', + 'sessionMessages', 'vendor'); $this->update_counts();

1 0

appdb/ include/monitor.php unit_test/test_om_o ...
by WineHQ 30 Jul '07

30 Jul '07

ChangeSet ID: 31288 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 20:22:55 Modified files: include : monitor.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add objectManager support to the monitor class Patch: http://cvs.winehq.org/patch.py?id=31288 Old revision New revision Changes Path 1.16 1.17 +111 -10 appdb/include/monitor.php 1.21 1.22 +2 -0 appdb/unit_test/test_om_objects.php Index: appdb/include/monitor.php diff -u -p appdb/include/monitor.php:1.16 appdb/include/monitor.php:1.17 --- appdb/include/monitor.php:1.16 30 Jul 2007 1:22:55 -0000 +++ appdb/include/monitor.php 30 Jul 2007 1:22:55 -0000 @@ -19,22 +19,26 @@ class Monitor { * Constructor. * If $iMonitorId is provided, fetches Monitor. */ - function Monitor($iMonitorId="") + function Monitor($iMonitorId="", $oRow = null) { - if($iMonitorId) + if(!$iMonitorId && !$oRow) + return; + + if(!$oRow) { $sQuery = "SELECT * FROM appMonitors WHERE monitorId = '".$iMonitorId."'"; $hResult = query_appdb($sQuery); $oRow = mysql_fetch_object($hResult); - if($oRow) - { - $this->iMonitorId = $oRow->monitorId; - $this->iAppId = $oRow->appId; - $this->iVersionId = $oRow->versionId; - $this->iUserId = $oRow->userId; - } + } + + if($oRow) + { + $this->iMonitorId = $oRow->monitorId; + $this->iAppId = $oRow->appId; + $this->iVersionId = $oRow->versionId; + $this->iUserId = $oRow->userId; } } @@ -98,8 +102,12 @@ class Monitor { $hResult = query_parameters("DELETE FROM appMonitors WHERE monitorId = '?'", $this->iMonitorId); if(!$bSilent) $this->SendNotificationMail("delete"); - } + if(!$hResult) + return FALSE; + + return TRUE; + } function SendNotificationMail($sAction="add",$sMsg=null) { @@ -139,6 +147,99 @@ class Monitor { mail_appdb($sEmail, $sSubject ,$sMsg); } + function canEdit() + { + if($_SESSION['current']->hasPriv("admin") || + ($this->iUserId == $_SESSION['current']->iUserId)) + return TRUE; + + return FALSE; + } + + function mustBeQueued() + { + return FALSE; + } + + /* Stub */ + function display() + { + return ""; + } + + /* Stub */ + function getOutputEditorValues() + { + return FALSE; + } + + /* Stub */ + function objectGetHeader() + { + return null; + } + + function objectGetId() + { + return $this->iMonitorId; + } + + /* Stub */ + function objectGetTableRow() + { + return null; + } + + /* Stub */ + function objectMakeLink() + { + return ""; + } + + /* Stub */ + function objectMakeUrl() + { + return ""; + } + + /* Stub */ + function outputEditor() + { + return ""; + } + + function objectGetEntries($bQueued, $bRejected) + { + $hResult = query_parameters("SELECT * FROM appMonitors"); + + if(!$hResult) + return FALSE; + + return $hResult; + } + + function objectGetEntriesCount($bQueued, $bRejected) + { + $hResult = query_parameters("SELECT COUNT(DISTINCT monitorId) as count + FROM appMonitors"); + + if(!$hResult) + return FALSE; + + $oRow = mysql_fetch_object($hResult); + + if(!$oRow) + return FALSE; + + return $oRow->count; + } + + function allowAnonymousSubmissions() + { + /* That makes no sense */ + return FALSE; + } + /* Retrieve the user's monitored versions */ function getVersionsMonitored($oUser) { Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.21 appdb/unit_test/test_om_objects.php:1.22 --- appdb/unit_test/test_om_objects.php:1.21 30 Jul 2007 1:22:55 -0000 +++ appdb/unit_test/test_om_objects.php 30 Jul 2007 1:22:55 -0000 @@ -11,6 +11,7 @@ require_once(BASE.'include/testData_queu require_once(BASE.'include/version_queue.php'); require_once(BASE.'include/application_queue.php'); require_once(BASE.'include/browse_newest_apps.php'); +require_once(BASE.'include/monitor.php'); /* internal function */ function test_class($sClassName, $aTestMethods) @@ -252,6 +253,7 @@ function test_object_methods() "distribution", "downloadurl", "maintainer", + "monitor", "note", "screenshot", "testData",

1 0

appdb/ admin/editAppNote.php include/note.php ...
by WineHQ 30 Jul '07

30 Jul '07

ChangeSet ID: 31287 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 19:27:38 Modified files: admin : editAppNote.php include : note.php version.php unit_test : test_om_objects.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add objectManager support to the note class Patch: http://cvs.winehq.org/patch.py?id=31287 Old revision New revision Changes Path 1.32 1.33 +2 -2 appdb/admin/editAppNote.php 1.25 1.26 +105 -34 appdb/include/note.php 1.141 1.142 +1 -1 appdb/include/version.php 1.20 1.21 +1 -0 appdb/unit_test/test_om_objects.php

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2007