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

Stefan Dösinger : ddraw: Complex surfaces form a tree.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 9e3e799ca3e5e74e20f9c3da1aefd74dfb15e9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3e799ca3e5e74e20f9c3da1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 27 15:31:12 2007 +0200 ddraw: Complex surfaces form a tree. --- dlls/ddraw/ddraw.c | 15 ++--- dlls/ddraw/ddraw_private.h | 14 ++++- dlls/ddraw/device.c | 3 + dlls/ddraw/main.c | 2 +- dlls/ddraw/surface.c | 142 ++++++++++++++++++++++++-------------------- 5 files changed, 99 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e3e799ca3e5e74e20f9c…

1 0

Stefan Dösinger : ddraw: Move the additional surface creation into a seperate function.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: 87544190a5ff61312b0972b828483eba47646007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87544190a5ff61312b0972b82… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 23 19:53:09 2007 +0200 ddraw: Move the additional surface creation into a seperate function. --- dlls/ddraw/ddraw.c | 93 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0194736..f6e153b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1950,6 +1950,54 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, return DD_OK; } +static HRESULT +CreateAdditionalSurfaces(IDirectDrawImpl *This, + IDirectDrawSurfaceImpl *root, + UINT count, + DDSURFACEDESC2 *DDSD) +{ + UINT i, level = 0; + HRESULT hr; + for(i = 0; i < count; i++) + { + IDirectDrawSurfaceImpl *object2 = NULL; + IDirectDrawSurfaceImpl *iterator; + + /* increase the mipmap level, but only if a mipmap is created + * In this case, also halve the size + */ + if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + level++; + if(DDSD->dwWidth > 1) DDSD->dwWidth /= 2; + if(DDSD->dwHeight > 1) DDSD->dwHeight /= 2; + } + + hr = IDirectDrawImpl_CreateNewSurface(This, + DDSD, + &object2, + level); + if(hr != DD_OK) + { + return hr; + } + + /* Add the new surface to the complex attachment list */ + object2->first_complex = root; + object2->next_complex = NULL; + iterator = root; + while(iterator->next_complex) iterator = iterator->next_complex; + iterator->next_complex = object2; + + /* Remove the (possible) back buffer cap from the new surface description, + * because only one surface in the flipping chain is a back buffer, one + * is a front buffer, the others are just primary surfaces. + */ + DDSD->ddsCaps.dwCaps &= ~DDSCAPS_BACKBUFFER; + } + return DD_OK; +} + /***************************************************************************** * IDirectDraw7::CreateSurface * @@ -2036,9 +2084,8 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); IDirectDrawSurfaceImpl *object = NULL; HRESULT hr; - LONG extra_surfaces = 0, i; + LONG extra_surfaces = 0; DDSURFACEDESC2 desc2; - UINT level = 0; WINED3DDISPLAYMODE Mode; TRACE("(%p)->(%p,%p,%p)\n", This, DDSD, Surf, UnkOuter); @@ -2279,44 +2326,12 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, desc2.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; } - for(i = 0; i < extra_surfaces; i++) + hr = CreateAdditionalSurfaces(This, object, extra_surfaces, &desc2); + if(hr != DD_OK) { - IDirectDrawSurfaceImpl *object2 = NULL; - IDirectDrawSurfaceImpl *iterator; - - /* increase the mipmap level, but only if a mipmap is created - * In this case, also halve the size - */ - if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) - { - level++; - if(desc2.dwWidth > 1) desc2.dwWidth /= 2; - if(desc2.dwHeight > 1) desc2.dwHeight /= 2; - } - - hr = IDirectDrawImpl_CreateNewSurface(This, - &desc2, - &object2, - level); - if(hr != DD_OK) - { - /* This destroys and possibly created surfaces too */ - IDirectDrawSurface_Release( ICOM_INTERFACE(object, IDirectDrawSurface7) ); - return hr; - } - - /* Add the new surface to the complex attachment list */ - object2->first_complex = object; - object2->next_complex = NULL; - iterator = object; - while(iterator->next_complex) iterator = iterator->next_complex; - iterator->next_complex = object2; - - /* Remove the (possible) back buffer cap from the new surface description, - * because only one surface in the flipping chain is a back buffer, one - * is a front buffer, the others are just primary surfaces. - */ - desc2.ddsCaps.dwCaps &= ~DDSCAPS_BACKBUFFER; + /* This destroys and possibly created surfaces too */ + IDirectDrawSurface_Release( ICOM_INTERFACE(object, IDirectDrawSurface7) ); + return hr; } /* Addref the ddraw interface to keep an reference for each surface */

1 0

Stefan Dösinger : ddraw: Add a test for surface attachments.
by Alexandre Julliard April 30, 2007

April 30, 2007

Module: wine Branch: master Commit: a61e58dbf4de82f626e1f4b3026966baf6f3c036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61e58dbf4de82f626e1f4b30… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 10:28:01 2007 +0200 ddraw: Add a test for surface attachments. --- dlls/ddraw/surface.c | 12 ++++- dlls/ddraw/tests/dsurface.c | 100 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3c64deb..fa9ce3d 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -794,8 +794,16 @@ IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurface7 *iface, if(Surf == This) return DDERR_CANNOTATTACHSURFACE; /* unchecked */ - /* TODO MSDN: "You can attach only z-buffer surfaces with this method." - * But apparently backbuffers and mipmaps can be attached too. */ + /* MSDN: Only Z buffer surfaces can be attached. An old comment said that apparently + * mipmaps and back buffers can be attached too, although our tests say no. + */ + if(!(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + { + /* Write a fixme until we know for sure what is going on */ + FIXME("Application tries to attach a non Z buffer surface. caps %08x\n", + Surf->surface_desc.ddsCaps.dwCaps); + return DDERR_CANNOTATTACHSURFACE; + } /* Set MIPMAPSUBLEVEL if this seems to be one */ if (This->surface_desc.ddsCaps.dwCaps & diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e269983..6db2d98 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -943,6 +943,105 @@ static void EnumTest(void) IDirectDrawSurface_Release(surface); } +HRESULT WINAPI SurfaceCounter(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + UINT *num = context; + (*num)++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} + +static void AttachmentTest(void) +{ + HRESULT hr; + IDirectDraw7 *dd7; + IDirectDrawSurface7 *surface1, *surface2, *surface3; + DDSURFACEDESC2 ddsd; + UINT num; + DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}; + HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_MIPMAPCOUNT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + U2(ddsd).dwMipMapCount = 3; /* Will create 128x128, 64x64, 32x32 */ + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + /* ROOT */ + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); + ok(num == 1, "Mipmap root has %d surfaces attached, expected 1\n", num); + /* DONE ROOT */ + + /* LEVEL 1 */ + hr = IDirectDrawSurface7_GetAttachedSurface(surface1, &caps, &surface2); + ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface2, &num, SurfaceCounter); + ok(num == 1, "First mip level has %d surfaces attached, expected 1\n", num); + /* DONE LEVEL 1 */ + + /* LEVEL 2 */ + hr = IDirectDrawSurface7_GetAttachedSurface(surface2, &caps, &surface3); + ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); + IDirectDrawSurface7_Release(surface2); + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface3, &num, SurfaceCounter); + ok(num == 0, "Secound mip level has %d surfaces attached, expected 1\n", num); + /* Done level 2 */ + /* Mip level 3 is still needed */ + + /* Try to attach a 16x16 miplevel - Should not work as far I can see */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface2, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface2); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 surface to a 128x128 texture root returned %08x\n", hr); + hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface1); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 128x128 texture root to a 16x16 texture returned %08x\n", hr); + hr = IDirectDrawSurface7_AddAttachedSurface(surface3, surface2); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 surface to a 32x32 texture mip level returned %08x\n", hr); + hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface3); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 32x32 texture mip level to a 16x16 surface returned %08x\n", hr); + + IDirectDrawSurface7_Release(surface3); + IDirectDrawSurface7_Release(surface2); + IDirectDrawSurface7_Release(surface1); + + hr = IDirectDraw7_SetCooperativeLevel(dd7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_BACKBUFFERCOUNT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U2(ddsd).dwBackBufferCount = 2; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + num = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); + ok(num == 1, "Primary surface has %d surfaces attached, expected 1\n", num); + IDirectDrawSurface7_Release(surface1); + + hr =IDirectDraw7_SetCooperativeLevel(dd7, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -955,5 +1054,6 @@ START_TEST(dsurface) GetDDInterface_4(); GetDDInterface_7(); EnumTest(); + AttachmentTest(); ReleaseDirectDraw(); }

1 0

Emmanuel Maillard : winecoreaudio: Handle non System Exclusive messages.
by Alexandre Julliard April 30, 2007

April 30, 2007

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

Jacek Caban : mshtml: Fix offset in OnDataAvailable call.
by Alexandre Julliard April 30, 2007

April 30, 2007

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 April 30, 2007

April 30, 2007

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

Stefan Leichter : advapi32: Fix initial cleanup of the registry keys used for testing.
by Alexandre Julliard April 30, 2007

April 30, 2007

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

appdb/ ./objectManager.php include/application ...
by WineHQ April 29, 2007

April 29, 2007

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 April 27, 2007

April 27, 2007

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 April 27, 2007

April 27, 2007

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