wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

Stefan Dösinger : ddraw: Do not access the surface connection structure directly in SetPalette.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: d30c25be839e84307de978eb5353d31ccaa0cbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30c25be839e84307de978eb5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 23 21:28:06 2007 +0200 ddraw: Do not access the surface connection structure directly in SetPalette. --- dlls/ddraw/surface.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4d62362..e6e316e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2238,13 +2238,30 @@ IDirectDrawSurfaceImpl_SetPalette(IDirectDrawSurface7 *iface, /* Release the old palette */ if(oldPal) IDirectDrawPalette_Release(oldPal); - /* If this is a front buffer, also update the back buffers */ + /* If this is a front buffer, also update the back buffers + * TODO: How do things work for palettized cube textures? + */ if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) { - for(surf = This->next_complex; surf != NULL; surf = surf->next_complex) + /* For primary surfaces the tree is just a list, so the simpler scheme fits too */ + DDSCAPS2 caps2 = { DDSCAPS_PRIMARYSURFACE, 0, 0, 0 }; + + surf = This; + while(1) { - IDirectDrawSurface7_SetPalette(ICOM_INTERFACE(surf, IDirectDrawSurface7), + IDirectDrawSurface7 *attach; + HRESULT hr; + hr = IDirectDrawSurface7_GetAttachedSurface(ICOM_INTERFACE(surf, IDirectDrawSurface7), + &caps2, &attach); + if(hr != DD_OK) + { + break; + } + + IDirectDrawSurface7_SetPalette(attach, Pal); + surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, attach); + IDirectDrawSurface7_Release(attach); } }

1 0

Stefan Dösinger : ddraw: Search for d3d primary a bit differently.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: b4d48c7fce205bcba522830d1a500d924a0f9816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d48c7fce205bcba522830d1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 23 23:00:29 2007 +0200 ddraw: Search for d3d primary a bit differently. --- dlls/ddraw/ddraw.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8b8308a..0194736 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2341,7 +2341,8 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, LIST_FOR_EACH(entry, &This->surface_list) { surface = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); - if(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + if((surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) == + (DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER)) { /* found */ target = surface; @@ -2351,7 +2352,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, } TRACE("(%p) Attaching a D3DDevice, rendertarget = %p\n", This, target); - hr = IDirectDrawImpl_AttachD3DDevice(This, target->first_complex); + hr = IDirectDrawImpl_AttachD3DDevice(This, target); if(hr != D3D_OK) { ERR("IDirectDrawImpl_AttachD3DDevice failed, hr = %x\n", hr); @@ -2636,7 +2637,7 @@ D3D7CB_CreateRenderTarget(IUnknown *device, IUnknown *pSuperior, HANDLE* pSharedHandle) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); - IDirectDrawSurfaceImpl *d3dSurface = This->d3d_target->first_complex, *target = NULL; + IDirectDrawSurfaceImpl *d3dSurface = This->d3d_target, *target = NULL; TRACE("(%p) call back\n", device); if(d3dSurface->isRenderTarget)

1 0

Dan Kegel : advapi: Improve SetEntriesInAclA stub.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 67e2c97a88ce75dbbe22eefcd3137bf8315786e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e2c97a88ce75dbbe22eefcd… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Apr 27 18:42:10 2007 -0700 advapi: Improve SetEntriesInAclA stub. --- dlls/advapi32/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 80dd89f..729727f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "rpcnterr.h" #include "winreg.h" #include "winternl.h" #include "winioctl.h" @@ -2865,7 +2864,8 @@ DWORD WINAPI SetEntriesInAclA( ULONG count, PEXPLICIT_ACCESSA pEntries, PACL OldAcl, PACL* NewAcl ) { FIXME("%d %p %p %p\n",count,pEntries,OldAcl,NewAcl); - return ERROR_CALL_NOT_IMPLEMENTED; + *NewAcl = NULL; + return ERROR_SUCCESS; } /******************************************************************************

1 0

Stefan Leichter : advapi32: Fix initial cleanup of the registry keys used for testing.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 552c225949cc2d778e6ef457b74b2c5da3a4cf21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552c225949cc2d778e6ef457b… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Apr 27 23:37:04 2007 +0200 advapi32: Fix initial cleanup of the registry keys used for testing. --- dlls/advapi32/tests/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 9d73633..0cc58f1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -196,7 +196,7 @@ static DWORD delete_key( HKEY hkey ) static void setup_main_key(void) { - if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )) delete_key( hkey_main ); + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )) delete_key( hkey_main ); assert (!RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )); }

1 0

Jacek Caban : mshtml: Fix offset in OnDataAvailable call.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: c747ece6c7ba29d29b053fabb9f9a2b9c2f8fd42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c747ece6c7ba29d29b053fabb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 21:40:02 2007 +0200 mshtml: Fix offset in OnDataAvailable call. --- dlls/mshtml/navigate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a30df13..c2a6947 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -425,7 +425,8 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if nsres = nsIStreamListener_OnDataAvailable(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, - NSINSTREAM(This->nsstream), This->readed, This->nsstream->buf_size); + NSINSTREAM(This->nsstream), This->readed-This->nsstream->buf_size, + This->nsstream->buf_size); if(NS_FAILED(nsres)) ERR("OnDataAvailable failed: %08x\n", nsres);

1 0

Huw Davies : oleaut32: Remove useless initialization of an [out] parameter.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: c4c5d64ccf5e3fd0ec3682126edd45ff3f019134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c5d64ccf5e3fd0ec3682126… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 27 12:01:22 2007 +0100 oleaut32: Remove useless initialization of an [out] parameter. --- dlls/oleaut32/tmarshal.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 7d0637e..3783aca 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -286,14 +286,12 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { ERR("No %s key found.\n",interfacekey); return E_FAIL; } - type = (1<<REG_SZ); tlguidlen = sizeof(tlguid); if (RegQueryValueExA(ikey,NULL,NULL,&type,(LPBYTE)tlguid,&tlguidlen)) { ERR("Getting typelib guid failed.\n"); RegCloseKey(ikey); return E_FAIL; } - type = (1<<REG_SZ); verlen = sizeof(ver); if (RegQueryValueExA(ikey,"Version",NULL,&type,(LPBYTE)ver,&verlen)) { ERR("Could not get version value?\n");

1 0

Emmanuel Maillard : winecoreaudio: Handle non System Exclusive messages.
by Alexandre Julliard 30 Apr '07

30 Apr '07

Module: wine Branch: master Commit: 9369c37a4cb0196cadde0a3c0e0076ca82c87e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9369c37a4cb0196cadde0a3c0… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Fri Apr 27 12:07:54 2007 +0200 winecoreaudio: Handle non System Exclusive messages. --- dlls/winecoreaudio.drv/midi.c | 51 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 27c87cb..7baf73b 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -842,8 +842,10 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD { MIDIMessage *msg = NULL; int i = 0; - FIXME("\n"); + MIDISource *src = NULL; + DWORD sendData = 0; + TRACE("\n"); switch (msgid) { case 0: @@ -853,11 +855,58 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD TRACE("%02X ", msg->data[i]); } TRACE("\n"); + src = &sources[msg->devID]; + if (src->state < 1) + { + TRACE("input not started, thrown away\n"); + goto done; + } + /* FIXME skipping SysEx */ + if (msg->data[0] == 0xF0) + { + FIXME("Starting System Exclusive\n"); + src->state |= 2; + for (i = 0; i < msg->length; ++i) + { + if (msg->data[i] == 0xF7) + { + FIXME("Ending System Exclusive\n"); + src->state &= ~2; + } + } + goto done; + } + if (src->state & 2) + { + for (i = 0; i < msg->length; ++i) + { + if (msg->data[i] == 0xF7) + { + FIXME("Ending System Exclusive\n"); + src->state &= ~2; + } + } + goto done; + } + EnterCriticalSection(&midiInLock); + if (msg->length == 3) + { + sendData = (msg->data[2] << 16) | + (msg->data[1] << 8) | + (msg->data[0] << 0); + } + if (msg->length == 2) + { + sendData = (msg->data[1] << 8) | (msg->data[0] << 0); + } + MIDI_NotifyClient(msg->devID, MIM_DATA, sendData, GetTickCount() - src->startTime); + LeaveCriticalSection(&midiInLock); break; default: CFRunLoopStop(CFRunLoopGetCurrent()); break; } +done: return NULL; }

1 0

appdb/ ./objectManager.php include/application ...
by WineHQ 29 Apr '07

29 Apr '07

ChangeSet ID: 31117 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/29 18:00:02 Modified files: . : objectManager.php include : application.php application_queue.php distribution.php maintainer.php objectManager.php screenshot.php testData.php testData_queue.php vendor.php version.php version_queue.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add allowAnonymousSubmissions(). objectManager checks the return value of this new function and exists with an error during certain actions if the user is not logged in and the function returns false Patch: http://cvs.winehq.org/patch.py?id=31117 Old revision New revision Changes Path 1.10 1.11 +3 -0 appdb/objectManager.php 1.107 1.108 +5 -0 appdb/include/application.php 1.2 1.3 +5 -0 appdb/include/application_queue.php 1.28 1.29 +5 -0 appdb/include/distribution.php 1.40 1.41 +5 -0 appdb/include/maintainer.php 1.19 1.20 +15 -0 appdb/include/objectManager.php 1.65 1.66 +5 -0 appdb/include/screenshot.php 1.50 1.51 +5 -0 appdb/include/testData.php 1.7 1.8 +5 -0 appdb/include/testData_queue.php 1.24 1.25 +5 -0 appdb/include/vendor.php 1.125 1.126 +5 -0 appdb/include/version.php 1.8 1.9 +5 -0 appdb/include/version_queue.php 1.11 1.12 +2 -1 appdb/unit_test/test_om_objects.php

1 0

appdb/include sidebar_admin.php testData_queue.php
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31116 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/27 18:45:19 Modified files: include : sidebar_admin.php testData_queue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Get rid of the distribution queue. If a testData entry is deleted and its associated distribution has not been approved and has no other testData assigned to it the distribution is now deleted. This change makes the distribution queue unnecessary as distributions are accepted along the testData Patch: http://cvs.winehq.org/patch.py?id=31116 Old revision New revision Changes Path 1.42 1.43 +0 -4 appdb/include/sidebar_admin.php 1.6 1.7 +11 -1 appdb/include/testData_queue.php Index: appdb/include/sidebar_admin.php diff -u -p appdb/include/sidebar_admin.php:1.42 appdb/include/sidebar_admin.php:1.43 --- appdb/include/sidebar_admin.php:1.42 27 Apr 2007 23:45:19 -0000 +++ appdb/include/sidebar_admin.php 27 Apr 2007 23:45:19 -0000 @@ -25,10 +25,6 @@ function global_admin_menu() { $g->add("View Test Results Queue (".testData::objectGetEntriesCount(true, false).")", BASE."objectManager.php?sClass=testData_queue&bIsQueue=true&sTitle=". "Test%20Results%20Queue"); - $g->add("View Distribution Queue (".distribution::objectGetEntriesCount(true, - false).")", - BASE."objectManager.php?sClass=distribution&bIsQueue=true&sTitle=". - "Distribution%20Queue"); $g->addmisc(" "); Index: appdb/include/testData_queue.php diff -u -p appdb/include/testData_queue.php:1.6 appdb/include/testData_queue.php:1.7 --- appdb/include/testData_queue.php:1.6 27 Apr 2007 23:45:19 -0000 +++ appdb/include/testData_queue.php 27 Apr 2007 23:45:19 -0000 @@ -24,7 +24,17 @@ class testData_queue function delete() { - return $this->oTestData->delete(); + $bSuccess = $this->oTestData->delete(); + + /* We delete the distribution if it has not been approved and is not associated + with any other testData. Otherwise we would have to have a distribution + queue for admins to clean up unused, queued entries */ + $this->oDistribution = new distribution($this->oDistribution->iDistributionId); + if(!sizeof($this->oDistribution->aTestingIds) && + $this->oDistribution->sQueued != "false") + $this->oDistribution->delete(); + + return $bSuccess; } function reQueue()

1 0

appdb/ ./objectManager.php include/distributio ...
by WineHQ 27 Apr '07

27 Apr '07

ChangeSet ID: 31115 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/04/27 18:43:43 Modified files: . : objectManager.php include : distribution.php objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add om method for displaying a move child objects page. A link to this page is displayed in an entry's view page automatically if the class that entry has the required methods objectMoveChildren and objectGetId Patch: http://cvs.winehq.org/patch.py?id=31115 Old revision New revision Changes Path 1.9 1.10 +4 -0 appdb/objectManager.php 1.27 1.28 +23 -0 appdb/include/distribution.php 1.18 1.19 +55 -0 appdb/include/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.9 appdb/objectManager.php:1.10 --- appdb/objectManager.php:1.9 27 Apr 2007 23:43:43 -0000 +++ appdb/objectManager.php 27 Apr 2007 23:43:43 -0000 @@ -82,6 +82,10 @@ if($oObject->iId) $oObject->display_entry_for_editing($REQUEST_URI, $sErrors); break; + case "showMoveChildren": + $oObject->display_move_children(); + break; + default: $oObject->view($REQUEST_URI); break; Index: appdb/include/distribution.php diff -u -p appdb/include/distribution.php:1.27 appdb/include/distribution.php:1.28 --- appdb/include/distribution.php:1.27 27 Apr 2007 23:43:43 -0000 +++ appdb/include/distribution.php 27 Apr 2007 23:43:43 -0000 @@ -592,6 +592,29 @@ class distribution { { return "<a href=\"".$this->objectMakeUrl()."\">$this->sName</a>"; } + + function objectMoveChildren($iNewId) + { + /* Keep track of how many children we modified */ + $iCount = 0; + + foreach($this->aTestingIds as $iTestId) + { + $oTest = new testData($iTestId); + $oTest->iDistributionId = $iNewId; + if($oTest->update(TRUE)) + $iCount++; + else + return FALSE; + } + + return $iCount; + } + + function objectGetid() + { + return $this->iDistributionId; + } } ?> Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.18 appdb/include/objectManager.php:1.19 --- appdb/include/objectManager.php:1.18 27 Apr 2007 23:43:43 -0000 +++ appdb/include/objectManager.php 27 Apr 2007 23:43:43 -0000 @@ -249,6 +249,52 @@ class ObjectManager $this->delete_entry(); } + /* Display a page where the user can select which object the children of the current + object can be moved to */ + function display_move_children() + { + $oObject = new $this->sClass($this->iId); + if(!$oObject->canEdit()) + { + echo "Insufficient privileges.<br />\n"; + return FALSE; + } + + /* We only allow moving to non-queued objects */ + if(!$hResult = $oObject->objectGetEntries(false, false)) + { + echo "Failed to get list of objects.<br />\n"; + return FALSE; + } + + /* Display some help text */ + echo "<p>Move all child objects of ".$oObject->objectMakeLink()." to the entry "; + echo "selected below, and delete ".$oObject->objectMakeLink()." afterwards.</p>\n"; + + echo "<table width=\"50%\" cellpadding=\"3\">\n"; + echo html_tr(array( + "Name", + "Move here"), + "color4"); + + for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) + { + $oCandidate = $oObject->objectGetInstanceFromRow($oRow); + if($oCandidate->objectGetId() == $this->iId) + { + $i++; + continue; + } + + echo html_tr(array( + $oCandidate->objectMakeLink(), + "<a href=\"".$this->makeUrl("moveChildren", $this->iId). + "&iNewId=".$oCandidate->objectGetId()."\">Move here</a>"), + ($i % 2) ? "color0" : "color1"); + } + echo "</table>\n"; + } + /* Display screen for submitting a new entry of given type */ function add_entry($sBackLink, $sErrors = "") { @@ -291,6 +337,15 @@ class ObjectManager $oObject = new $this->sClass($this->iId); + /* Display a link to the move child objects page if the class has the necessary + functions and the user has edit rights. Not all classes have child objects. */ + if(method_exists($oObject, "objectMoveChildren") && + method_exists($oObject, "objectGetId") && $oObject->canEdit()) + { + echo "<a href=\"".$this->makeUrl("showMoveChildren", $this->iId, + "Move Child Objects")."\">Move child objects</a><br /><br />\n"; + } + $oObject->display(); echo html_back_link(1, $sBackLink);

1 0

← Newer
1
2
3
4
5
6
7
...
69
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 April 2007