December 2006 - Wine-commits

Vitaliy Margolen : dinput: Fix processing of custom format.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 1056c881e12a6b88100118eee4b22725c6394791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1056c881e12a6b88100118eee… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Dec 9 23:56:58 2006 -0700 dinput: Fix processing of custom format. --- dlls/dinput/device.c | 7 +++++-- dlls/dinput/joystick_linux.c | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 7d24dfc..fd38baa 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -327,8 +327,8 @@ DataFormat *create_DataFormat(const DIDA (DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType) == DIDFT_GETINSTANCE(wine_format->rgodf[i].dwType))) && ( /* Then if the asked type matches the one Wine provides */ - wine_format->rgodf[i].dwType & asked_format->rgodf[j].dwType)) { - + DIDFT_GETTYPE(asked_format->rgodf[j].dwType) & wine_format->rgodf[i].dwType)) + { done[j] = 1; TRACE("Matching :\n"); @@ -1009,6 +1009,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ HRESULT WINAPI IDirectInputDevice2AImpl_Poll( LPDIRECTINPUTDEVICE8A iface) { + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + + if (!This->acquired) return DIERR_NOTACQUIRED; /* Because wine devices do not need to be polled, just return DI_NOEFFECT */ return DI_NOEFFECT; } diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 7f9acd4..474678c 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -113,7 +113,6 @@ struct JoystickImpl int axes; int buttons; POV povs[4]; - BOOL overflow; }; static GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ @@ -495,7 +494,6 @@ static HRESULT alloc_device(REFGUID rgui newDevice->base.lpVtbl = jvt; newDevice->base.ref = 1; newDevice->dinput = dinput; - newDevice->overflow = FALSE; CopyMemory(&newDevice->base.guid, rguid, sizeof(*rguid)); InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)"DINPUT_joystick";

1 0

Paul Vriens : winspool.drv/tests: Fix typo.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: c5d2053a7dda308a5d3be1125d044bdcec709e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d2053a7dda308a5d3be1125… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Dec 10 11:01:30 2006 +0100 winspool.drv/tests: Fix typo. --- dlls/winspool.drv/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index eafddd6..8f3bdd0 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1650,7 +1650,7 @@ static void test_EnumPrinters(void) ok(num == 0, "num %d\n", num); SetLastError(0xdeadbeef); - EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededW, &num); + ret = EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &neededW, &num); ok(ret == 0, "ret %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "gle %d\n", GetLastError()); ok(num == 0, "num %d\n", num);

1 0

Marcus Meissner : made functions and variables static in some testcases.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: f0280cbd1e641df54e865c9860d428f564afae8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0280cbd1e641df54e865c986… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 10 16:51:26 2006 +0100 made functions and variables static in some testcases. --- dlls/crypt32/tests/cert.c | 4 +- dlls/ddraw/tests/refcount.c | 2 +- dlls/dinput/tests/dinput_test.h | 1 - dlls/dinput/tests/joystick.c | 2 +- dlls/dsound/tests/capture.c | 2 +- dlls/dsound/tests/dsound_test.h | 1 - dlls/dsound/tests/propset.c | 8 +++--- dlls/gdi32/tests/bitmap.c | 4 +- dlls/gdi32/tests/mapping.c | 8 +++--- dlls/gdi32/tests/metafile.c | 4 +- dlls/msi/tests/db.c | 2 +- dlls/msvcrt/tests/data.c | 4 +- dlls/msvcrt/tests/dir.c | 2 +- dlls/msvcrt/tests/string.c | 2 +- dlls/msxml3/tests/domdoc.c | 4 +- dlls/ole32/tests/ole2.c | 50 +++++++++++++++++++------------------- dlls/oleaut32/tests/olefont.c | 8 +++--- dlls/oleaut32/tests/safearray.c | 2 +- dlls/oleaut32/tests/vartype.c | 9 ------- dlls/rpcrt4/tests/cstub.c | 38 ++++++++++++++-------------- dlls/rpcrt4/tests/ndr_marshall.c | 4 +- dlls/secur32/tests/main.c | 2 +- dlls/shell32/tests/shlfolder.c | 6 ++-- dlls/user32/tests/dde.c | 2 +- dlls/user32/tests/edit.c | 4 +- dlls/user32/tests/menu.c | 20 +++++++------- dlls/user32/tests/sysparams.c | 6 ++-- dlls/user32/tests/win.c | 4 +- 28 files changed, 97 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0280cbd1e641df54e865…

1 0

Andrew Talbot : kernel32/tests: Cast-qual warnings fix.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: bc3e7263bc4ad38c86c1ed3d7e0e047ad92e857f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3e7263bc4ad38c86c1ed3d7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 9 18:04:14 2006 +0000 kernel32/tests: Cast-qual warnings fix. --- dlls/kernel32/tests/locale.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 95e1a10..f09c898 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1340,24 +1340,24 @@ const char *strings[] = static int compare_string1(const void *e1, const void *e2) { - const char *s1 = *(const char **)e1; - const char *s2 = *(const char **)e2; + const char *s1 = *(const char *const *)e1; + const char *s2 = *(const char *const *)e2; return lstrcmpA(s1, s2); } static int compare_string2(const void *e1, const void *e2) { - const char *s1 = *(const char **)e1; - const char *s2 = *(const char **)e2; + const char *s1 = *(const char *const *)e1; + const char *s2 = *(const char *const *)e2; return CompareStringA(0, 0, s1, -1, s2, -1) - 2; } static int compare_string3(const void *e1, const void *e2) { - const char *s1 = *(const char **)e1; - const char *s2 = *(const char **)e2; + const char *s1 = *(const char *const *)e1; + const char *s2 = *(const char *const *)e2; char key1[256], key2[256]; LCMapStringA(0, LCMAP_SORTKEY, s1, -1, key1, sizeof(key1));

1 0

Andrew Talbot : dmime: Dangling references fix.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: db299e3a3aa2711cb0d691ea101476db256825de URL: http://source.winehq.org/git/wine.git/?a=commit;h=db299e3a3aa2711cb0d691ea1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 9 23:56:06 2006 +0000 dmime: Dangling references fix. --- dlls/dmime/dmutils.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 992a2d2..83ad57b 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -668,7 +668,7 @@ const char *debugstr_DMUS_CONTAINED_OBJF const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); @@ -684,8 +684,7 @@ const char *debugstr_DMUS_OBJECTDESC (LP wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -713,13 +712,12 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJEC const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):\n", pHeader); ptr += sprintf(ptr, " - dwFlags = %s\n", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -727,7 +725,7 @@ const char *debugstr_DMUS_IO_CONTAINER_H const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):\n", pHeader); ptr += sprintf(ptr, " - guidClassID = %s\n", debugstr_dmguid(&pHeader->guidClassID)); @@ -735,8 +733,7 @@ const char *debugstr_DMUS_IO_CONTAINED_O ptr += sprintf(ptr, " - ckid = %s\n", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, " - fccType = %s\n", debugstr_fourcc (pHeader->fccType)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); }

1 0

Andrew Talbot : dmloader: Dangling references fix.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: e6a0a09b88d28aa5aa49b5ff3fcfc07485831948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a0a09b88d28aa5aa49b5ff3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Dec 10 17:11:27 2006 +0000 dmloader: Dangling references fix. --- dlls/dmloader/debug.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 551e6d8..3d8b6cc 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -482,7 +482,7 @@ const char *debugstr_DMUS_CONTAINED_OBJF const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):", pDesc); ptr += sprintf(ptr, "\n - dwSize = 0x%08X", pDesc->dwSize); @@ -498,8 +498,7 @@ const char *debugstr_DMUS_OBJECTDESC (LP wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, "\n - pStream = %p", pDesc->pStream); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -507,13 +506,12 @@ const char *debugstr_DMUS_OBJECTDESC (LP const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - dwFlags = %s", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -521,7 +519,7 @@ const char *debugstr_DMUS_IO_CONTAINER_H const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):", pHeader); ptr += sprintf(ptr, "\n - guidClassID = %s", debugstr_dmguid(&pHeader->guidClassID)); @@ -529,8 +527,7 @@ const char *debugstr_DMUS_IO_CONTAINED_O ptr += sprintf(ptr, "\n - ckid = %s", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, "\n - fccType = %s", debugstr_fourcc (pHeader->fccType)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); }

1 0

Andrew Talbot : dmstyle: Dangling references fix.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 878d5cc06914cc636971965e8088262b91a153f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878d5cc06914cc636971965e8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Dec 10 17:12:49 2006 +0000 dmstyle: Dangling references fix. --- dlls/dmstyle/dmutils.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 2a960fe..4d8f12f 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -682,7 +682,7 @@ const char *debugstr_DMUS_CONTAINED_OBJF const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); @@ -698,8 +698,7 @@ const char *debugstr_DMUS_OBJECTDESC (LP wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -727,13 +726,12 @@ void debug_DMUS_OBJECTDESC (LPDMUS_OBJEC const char *debugstr_DMUS_IO_CONTAINER_HEADER (LPDMUS_IO_CONTAINER_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINER_HEADER (%p):\n", pHeader); ptr += sprintf(ptr, " - dwFlags = %s\n", debugstr_DMUS_CONTAINER_FLAGS(pHeader->dwFlags)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); } @@ -741,7 +739,7 @@ const char *debugstr_DMUS_IO_CONTAINER_H const char *debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER (LPDMUS_IO_CONTAINED_OBJECT_HEADER pHeader) { if (pHeader) { - char buffer[1024] = "", *ptr = &buffer[0]; + char buffer[1024], *ptr = buffer; ptr += sprintf(ptr, "DMUS_IO_CONTAINED_OBJECT_HEADER (%p):\n", pHeader); ptr += sprintf(ptr, " - guidClassID = %s\n", debugstr_dmguid(&pHeader->guidClassID)); @@ -749,8 +747,7 @@ const char *debugstr_DMUS_IO_CONTAINED_O ptr += sprintf(ptr, " - ckid = %s\n", debugstr_fourcc (pHeader->ckid)); ptr += sprintf(ptr, " - fccType = %s\n", debugstr_fourcc (pHeader->fccType)); - ptr = &buffer[0]; - return ptr; + return wine_dbg_sprintf("%s", buffer); } else { return wine_dbg_sprintf("(NULL)"); }

1 0

Eric Pouech : dbghelp: Sparse array speed up.
by Alexandre Julliard 11 Dec '06

11 Dec '06

Module: wine Branch: master Commit: 9a41a4e98429295601a8e9c3e35c2f814f6497f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a41a4e98429295601a8e9c3e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Dec 9 14:30:56 2006 +0100 dbghelp: Sparse array speed up. --- dlls/dbghelp/storage.c | 51 +++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 3aee97d..2d88d8c 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -244,22 +244,55 @@ void sparse_array_init(struct sparse_arr } /****************************************************************** - * spare_array_lookup + * sparse_array_lookup * * Returns the first index which key is >= at passed key */ -static struct key2index* spare_array_lookup(const struct sparse_array* sa, - unsigned long key, unsigned* idx) +static struct key2index* sparse_array_lookup(const struct sparse_array* sa, + unsigned long key, unsigned* idx) { struct key2index* pk2i; + unsigned low, high; - /* FIXME: should use bsearch here */ - for (*idx = 0; *idx < sa->elements.num_elts; (*idx)++) + if (!sa->elements.num_elts) { + *idx = 0; + return NULL; + } + high = sa->elements.num_elts; + pk2i = vector_at(&sa->key2index, high - 1); + if (pk2i->key < key) + { + *idx = high; + return NULL; + } + if (pk2i->key == key) + { + *idx = high - 1; + return pk2i; + } + low = 0; + pk2i = vector_at(&sa->key2index, low); + if (pk2i->key >= key) + { + *idx = 0; + return pk2i; + } + /* now we have: sa(lowest key) < key < sa(highest key) */ + while (low < high) + { + *idx = (low + high) / 2; pk2i = vector_at(&sa->key2index, *idx); - if (pk2i && pk2i->key >= key) return pk2i; + if (pk2i->key > key) high = *idx; + else if (pk2i->key < key) low = *idx + 1; + else return pk2i; } - return NULL; + /* binary search could return exact item, we search for highest one + * below the key + */ + if (pk2i->key < key) + pk2i = vector_at(&sa->key2index, ++(*idx)); + return pk2i; } void* sparse_array_find(const struct sparse_array* sa, unsigned long key) @@ -267,7 +300,7 @@ void* sparse_array_find(const struct s unsigned idx; struct key2index* pk2i; - if ((pk2i = spare_array_lookup(sa, key, &idx)) && pk2i->key == key) + if ((pk2i = sparse_array_lookup(sa, key, &idx)) && pk2i->key == key) return vector_at(&sa->elements, pk2i->index); return NULL; } @@ -279,7 +312,7 @@ void* sparse_array_add(struct sparse_a struct key2index* pk2i; struct key2index* to; - pk2i = spare_array_lookup(sa, key, &idx); + pk2i = sparse_array_lookup(sa, key, &idx); if (pk2i && pk2i->key == key) { FIXME("re adding an existing key\n");

1 0

appdb/include version.php
by WineHQ 09 Dec '06

09 Dec '06

ChangeSet ID: 30438 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/09 09:56:56 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Make sure that a version without a maintainer rating is not displayed with the colour of the previous version. Patch: http://cvs.winehq.org/patch.py?id=30438 Old revision New revision Changes Path 1.87 1.88 +2 -0 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.87 appdb/include/version.php:1.88 --- appdb/include/version.php:1.87 9 Dec 2006 15:56:56 -0000 +++ appdb/include/version.php 9 Dec 2006 15:56:56 -0000 @@ -930,6 +930,8 @@ class Version { if($oVersion->sTestedRating && $oVersion->sTestedRating != "/") $sRatingColor = "class=\"$oVersion->sTestedRating\""; + else + $sRatingColor = "class=\"$bgcolor\""; //display row echo "<tr class=$bgcolor>\n";

1 0

appdb/ include/application.php include/maintai ...
by WineHQ 09 Dec '06

09 Dec '06

ChangeSet ID: 30437 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/08 23:07:25 Modified files: include : application.php maintainer.php unit_test : test_maintainer.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow the user to tick a checkbox upon application submission, indication whether he would like to become a super maintainer of the application. The request is processed along with the application. Also add a unit test that tests maintainer requests submitted along with an application. Patch: http://cvs.winehq.org/patch.py?id=30437 Old revision New revision Changes Path 1.78 1.79 +38 -1 appdb/include/application.php 1.20 1.21 +6 -3 appdb/include/maintainer.php 1.2 1.3 +52 -0 appdb/unit_test/test_maintainer.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.78 appdb/include/application.php:1.79 --- appdb/include/application.php:1.78 9 Dec 2006 5: 7:25 -0000 +++ appdb/include/application.php 9 Dec 2006 5: 7:25 -0000 @@ -9,6 +9,7 @@ require_once(BASE."include/category.php" require_once(BASE."include/url.php"); require_once(BASE."include/util.php"); require_once(BASE."include/mail.php"); +require_once(BASE."include/maintainer.php"); define("PLATINUM_RATING", "Platinum"); define("GOLD_RATING", "Gold"); @@ -33,6 +34,8 @@ class Application { var $sSubmitTime; var $iSubmitterId; var $aVersionsIds; // an array that contains the versionId of every version linked to this app. + var $bSuperMaintainerRequest; // Temporary variable used in application submission. + // If the user wants to become a super maintainer for the application /** * constructor, fetches the data. @@ -128,6 +131,18 @@ class Application { $this->iAppId = mysql_insert_id(); $this->application($this->iAppId); $this->SendNotificationMail(); // Only administrators will be mailed as no supermaintainers exist for this app. + + /* Submit super maintainer request if asked to */ + if($this->bSuperMaintainerRequest) + { + $oMaintainer = new Maintainer(); + $oMaintainer->iAppId = $this->iAppId; + $oMaintainer->iUserId = $_SESSION['current']->iUserId; + $oMaintainer->sMaintainReason = "This user submitted the application; auto-queued."; + $oMaintainer->bSuperMaintainer = 1; + $oMaintainer->create(); + } + return true; } else { @@ -291,6 +306,15 @@ class Application { // we send an e-mail to intersted people $this->mailSubmitter(); $this->SendNotificationMail(); + + /* Unqueue matching super maintainer request */ + $hResultMaint = query_parameters("SELECT maintainerId FROM appMaintainers WHERE userId = '?' AND appId = '?'", $this->iSubmitterId, $this->iAppId); + if($hResultMaint) + { + $oMaintainerRow = mysql_fetch_object($hResultMaint); + $oMaintainer = new Maintainer($oMaintainerRow->maintainerId); + $oMaintainer->unQueue("OK"); + } } } @@ -336,7 +360,10 @@ class Application { { $aClean = array(); //array of filtered user input - $aClean['sReplyText'] = makeSafe($_REQUEST['sReplyText']); + if(isset($_REQUEST['sReplyText'])) + $aClean['sReplyText'] = makeSafe($_REQUEST['sReplyText']); + else + $aClean['sReplyText'] = ""; if($this->iSubmitterId) { @@ -517,6 +544,15 @@ class Application { echo $this->sDescription.'</textarea></p></td></tr>',"\n"; + // Allow user to apply as super maintainer if this is a new app + if(!$this->iAppId) + { + if($this->bSuperMaintainerRequest) + $sRequestSuperMaintainerChecked = 'checked="checked"'; + echo '<tr valign="top"><td class="color0"><b>Become super maintainer?</b></td>',"\n"; + echo '<td><input type="checkbox" '.$sRequestSuperMaintainerChecked.' name="bSuperMaintainerRequest" /> Check this to request being a super maintainer for the application</td></tr>',"\n"; + } + echo "</table>\n"; echo html_frame_end(); @@ -556,6 +592,7 @@ class Application { $this->iVendorId = $aValues['iAppVendorId']; $this->sWebpage = $aValues['sAppWebpage']; $this->sKeywords = $aValues['sAppKeywords']; + $this->bSuperMaintainerRequest = $aValues['bSuperMaintainerRequest']; } /* display this application */ Index: appdb/include/maintainer.php diff -u -p appdb/include/maintainer.php:1.20 appdb/include/maintainer.php:1.21 --- appdb/include/maintainer.php:1.20 9 Dec 2006 5: 7:25 -0000 +++ appdb/include/maintainer.php 9 Dec 2006 5: 7:25 -0000 @@ -185,9 +185,11 @@ class maintainer function ObjectGetEntries($bQueued) { + /* Excluding requests for queued apps, as these will be handled automatically */ if($bQueued) - $sQuery = "SELECT maintainerId FROM appMaintainers, user_list WHERE appMaintainers.userid = user_list.userid ". - "AND queued = '?' ORDER by submitTime"; + $sQuery = "SELECT maintainerId FROM appMaintainers, user_list, appFamily WHERE appMaintainers.userid = user_list.userid ". + "AND appMaintainers.queued = '?' AND appMaintainers.appId = ". + "appFamily.appId AND appFamily.queued = 'false' ORDER by ". "appMaintainers.submitTime"; else $sQuery = "SELECT maintainerId FROM appMaintainers, user_list WHERE appMaintainers.userid = user_list.userid ". "AND queued = '?' ORDER by realname"; @@ -248,7 +250,8 @@ class maintainer function getQueuedMaintainerCount() { - $sQuery = "SELECT count(*) as queued_maintainers FROM appMaintainers where queued='true'"; + /* Excluding requests for queued apps, as these are handled automatically */ + $sQuery = "SELECT COUNT(*) as queued_maintainers FROM appMaintainers, appFamily WHERE appMaintainers.queued='true' AND appFamily.appId = appMaintainers.appId AND appFamily.queued = 'false'"; $hResult = query_parameters($sQuery); $oRow = mysql_fetch_object($hResult); return $oRow->queued_maintainers; Index: appdb/unit_test/test_maintainer.php diff -u -p appdb/unit_test/test_maintainer.php:1.2 appdb/unit_test/test_maintainer.php:1.3 --- appdb/unit_test/test_maintainer.php:1.2 9 Dec 2006 5: 7:25 -0000 +++ appdb/unit_test/test_maintainer.php 9 Dec 2006 5: 7:25 -0000 @@ -257,6 +257,53 @@ function test_maintainer_unQueue() return true; } +/* Test whether a super maintainer request submitted along with an application is also accepted when the application is accepted */ +function test_superMaintainerOnAppSubmit() +{ + test_start(__FUNCTION__); + + global $test_email, $test_password; + + /* Log in */ + $oUser = new User(); + if($retval = $oUser->login($test_email, $test_password) != SUCCESS) + { + echo "Received '$retval' instead of SUCCESS('".SUCCESS."')."; + return FALSE; + } + + $iAppId = 655000; + $iVersionId = 655200; + + $oApp = new Application($iAppId); + + /* The user wants to be a super maintainer */ + $oApp->bSuperMaintainerRequest = 1; + + /* Make sure the user is not an admin, so the app will be queued */ + $oUser->delPriv("admin"); + + $oApp->create(); + + /* Make the user an admin so the app can be unqueued */ + $oUser->addPriv("admin"); + + $oApp->unQueue(); + + /* The user should now be a super maintainer */ + $iExpected = 1; + $iGot = Maintainer::getMaintainerCountForUser($oUser, TRUE); + + if($iGot != $iExpected) + { + echo "Got maintainer count of '$iGot' instead of '$iExpected'"; + return false; + } + + Maintainer::deleteMaintainer($oUser, $iAppId); + + return true; +} if(!test_maintainer_getMaintainerCountForUser()) echo "test_maintainer_getMaintainerCountForUser() failed!\n"; @@ -275,4 +322,9 @@ if(!test_maintainer_unQueue()) else echo "test_maintainer_unQueue() passed\n"; +if(!test_superMaintainerOnAppSubmit()) + echo "test_superMaintainerOnAppSubmit() failed!\n"; +else + echo "test_superMaintainerOnAppSubmit() passed\n"; + ?>

1 0