December 2007 - Wine-Commits

Andrey Turkin : dbghelp: Adjust minidump streams ordering and sizing.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 33df0a7605c6675ea49e857a5aee4cf223ac0f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33df0a7605c6675ea49e857a5… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Dec 22 04:21:56 2007 +0300 dbghelp: Adjust minidump streams ordering and sizing. To more closely match native format; this is required for windbg. --- dlls/dbghelp/minidump.c | 55 ++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index e8daeda..949545f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -351,7 +351,8 @@ static void append(struct dump_context* dc, void* data, unsigned size) * Write in File the exception information from pcs */ static void dump_exception_info(struct dump_context* dc, - const MINIDUMP_EXCEPTION_INFORMATION* except) + const MINIDUMP_EXCEPTION_INFORMATION* except, + DWORD *size) { MINIDUMP_EXCEPTION_STREAM mdExcpt; EXCEPTION_RECORD rec, *prec; @@ -390,6 +391,7 @@ static void dump_exception_info(struct dump_context* dc, mdExcpt.ThreadContext.Rva = dc->rva + sizeof(mdExcpt); append(dc, &mdExcpt, sizeof(mdExcpt)); + *size = sizeof(mdExcpt); append(dc, pctx, sizeof(*pctx)); } @@ -398,7 +400,7 @@ static void dump_exception_info(struct dump_context* dc, * * Write in File the modules from pcs */ -static void dump_modules(struct dump_context* dc, BOOL dump_elf) +static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size) { MINIDUMP_MODULE mdModule; MINIDUMP_MODULE_LIST mdModuleList; @@ -422,7 +424,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf) * FIXME: if we don't ask for all modules in cb, we'll get a hole in the file */ rva_base = dc->rva; - dc->rva += sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; + dc->rva += *size = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; for (i = 0; i < dc->num_module; i++) { if ((dc->module[i].is_elf && !dump_elf) || @@ -497,7 +499,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf) * * Dumps into File the information about the system */ -static void dump_system_info(struct dump_context* dc) +static void dump_system_info(struct dump_context* dc, DWORD *size) { MINIDUMP_SYSTEM_INFO mdSysInfo; SYSTEM_INFO sysInfo; @@ -525,6 +527,7 @@ static void dump_system_info(struct dump_context* dc) memset(&mdSysInfo.Cpu, 0, sizeof(mdSysInfo.Cpu)); append(dc, &mdSysInfo, sizeof(mdSysInfo)); + *size = sizeof(mdSysInfo); slen = lstrlenW(osInfo.szCSDVersion) * sizeof(WCHAR); WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); @@ -538,7 +541,8 @@ static void dump_system_info(struct dump_context* dc) * Dumps into File the information about running threads */ static void dump_threads(struct dump_context* dc, - const MINIDUMP_EXCEPTION_INFORMATION* except) + const MINIDUMP_EXCEPTION_INFORMATION* except, + DWORD *size) { MINIDUMP_THREAD mdThd; MINIDUMP_THREAD_LIST mdThdList; @@ -618,6 +622,7 @@ static void dump_threads(struct dump_context* dc, } writeat(dc, rva_base, &mdThdList.NumberOfThreads, sizeof(mdThdList.NumberOfThreads)); + *size = dc->rva - rva_base; } /****************************************************************** @@ -625,7 +630,7 @@ static void dump_threads(struct dump_context* dc, * * dumps information about the memory of the process (stack of the threads) */ -static void dump_memory_info(struct dump_context* dc) +static void dump_memory_info(struct dump_context* dc, DWORD* size) { MINIDUMP_MEMORY_LIST mdMemList; MINIDUMP_MEMORY_DESCRIPTOR mdMem; @@ -639,6 +644,8 @@ static void dump_memory_info(struct dump_context* dc) sizeof(mdMemList.NumberOfMemoryRanges)); rva_base = dc->rva; dc->rva += mdMemList.NumberOfMemoryRanges * sizeof(mdMem); + *size = sizeof(mdMemList.NumberOfMemoryRanges) + + mdMemList.NumberOfMemoryRanges * sizeof(mdMem); for (i = 0; i < dc->num_mem; i++) { @@ -663,7 +670,7 @@ static void dump_memory_info(struct dump_context* dc) } } -static void dump_misc_info(struct dump_context* dc) +static void dump_misc_info(struct dump_context* dc, DWORD* size) { MINIDUMP_MISC_INFO mmi; @@ -672,6 +679,7 @@ static void dump_misc_info(struct dump_context* dc) mmi.ProcessId = dc->pid; /* FIXME: create/user/kernel time */ append(dc, &mmi, sizeof(mmi)); + *size = sizeof(mmi); } /****************************************************************** @@ -725,6 +733,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, mdHead.StreamDirectoryRva = sizeof(mdHead); mdHead.u.TimeDateStamp = time(NULL); mdHead.Flags = DumpType; + mdHead.CheckSum = 0; append(&dc, &mdHead, sizeof(mdHead)); /* 3) write stream directories */ @@ -733,45 +742,40 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, /* 3.1) write data stream directories */ + /* must be first in minidump */ + mdDir.StreamType = SystemInfoStream; + mdDir.Location.Rva = dc.rva; + dump_system_info(&dc, &mdDir.Location.DataSize); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + mdDir.StreamType = ThreadListStream; mdDir.Location.Rva = dc.rva; - dump_threads(&dc, ExceptionParam); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_threads(&dc, ExceptionParam, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = ModuleListStream; mdDir.Location.Rva = dc.rva; - dump_modules(&dc, FALSE); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_modules(&dc, FALSE, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = 0xfff0; /* FIXME: this is part of MS reserved streams */ mdDir.Location.Rva = dc.rva; - dump_modules(&dc, TRUE); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_modules(&dc, TRUE, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = MemoryListStream; mdDir.Location.Rva = dc.rva; - dump_memory_info(&dc); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; - writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), - &mdDir, sizeof(mdDir)); - - mdDir.StreamType = SystemInfoStream; - mdDir.Location.Rva = dc.rva; - dump_system_info(&dc); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_memory_info(&dc, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = MiscInfoStream; mdDir.Location.Rva = dc.rva; - dump_misc_info(&dc); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_misc_info(&dc, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); @@ -780,8 +784,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, { mdDir.StreamType = ExceptionStream; mdDir.Location.Rva = dc.rva; - dump_exception_info(&dc, ExceptionParam); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_exception_info(&dc, ExceptionParam, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); }

1 0

Alexandre Julliard : winedos: Add the possibility of refusing to emulate some interrupts.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 201fc77fd6876b737a8f7a5745e614604bac19a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=201fc77fd6876b737a8f7a574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 23 13:55:12 2007 +0100 winedos: Add the possibility of refusing to emulate some interrupts. --- dlls/kernel32/instr.c | 4 ++-- dlls/kernel32/kernel_private.h | 2 +- dlls/winedos/dosexe.h | 2 +- dlls/winedos/interrupts.c | 10 +++++++--- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index 97a1d14..87e486d 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -773,8 +773,8 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) if (winedos.EmulateInterruptPM) { context->Eip += prefixlen + 2; - winedos.EmulateInterruptPM( context, instr[1] ); - return ExceptionContinueExecution; + if (winedos.EmulateInterruptPM( context, instr[1] )) return ExceptionContinueExecution; + context->Eip -= prefixlen + 2; /* restore eip */ } break; /* Unable to emulate it */ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index dd7c916..8d69707 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -135,7 +135,7 @@ extern struct winedos_exports BOOL (*FreeDosBlock)(void* ptr); UINT (*ResizeDosBlock)(void *ptr, UINT size, BOOL exact); /* for instr.c */ - void (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum ); + BOOL (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum ); void (WINAPI *CallBuiltinHandler)( CONTEXT86 *context, BYTE intnum ); DWORD (WINAPI *inport)( int port, int size ); void (WINAPI *outport)( int port, int size, DWORD val ); diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 7b77470..a641849 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -473,7 +473,7 @@ extern void WINAPI EMS_Ioctl_Handler(CONTEXT86*); /* interrupts.c */ extern void WINAPI DOSVM_CallBuiltinHandler( CONTEXT86 *, BYTE ); -extern void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *, BYTE ); +extern BOOL WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *, BYTE ); extern BOOL WINAPI DOSVM_EmulateInterruptRM( CONTEXT86 *, BYTE ); extern FARPROC16 DOSVM_GetPMHandler16( BYTE ); extern FARPROC48 DOSVM_GetPMHandler48( BYTE ); diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index b482ab0..f254f5a 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -45,6 +45,7 @@ static void WINAPI DOSVM_Int2aHandler(CONTEXT86*); static void WINAPI DOSVM_Int41Handler(CONTEXT86*); static void WINAPI DOSVM_Int4bHandler(CONTEXT86*); static void WINAPI DOSVM_Int5cHandler(CONTEXT86*); +static void WINAPI DOSVM_DefaultHandler(CONTEXT86*); static FARPROC16 DOSVM_Vectors16[256]; static FARPROC48 DOSVM_Vectors48[256]; @@ -75,7 +76,8 @@ static const INTPROC DOSVM_VectorsBuiltin[] = /* 58 */ 0, 0, 0, 0, /* 5C */ DOSVM_Int5cHandler, 0, 0, 0, /* 60 */ 0, 0, 0, 0, - /* 64 */ 0, 0, 0, DOSVM_Int67Handler + /* 64 */ 0, 0, 0, DOSVM_Int67Handler, + /* 68 */ DOSVM_DefaultHandler }; @@ -257,7 +259,7 @@ static void DOSVM_PushFlags( CONTEXT86 *context, BOOL islong, BOOL isstub ) * Pushes interrupt frame to stack and changes instruction * pointer to interrupt handler. */ -void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum ) +BOOL WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum ) { TRACE_(relay)("Call DOS int 0x%02x ret=%04x:%08x\n" " eax=%08x ebx=%08x ecx=%08x edx=%08x\n" @@ -326,12 +328,14 @@ void WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum ) } else if (wine_ldt_is_system(context->SegCs)) { - DOSVM_CallBuiltinHandler( context, intnum ); + INTPROC proc = DOSVM_GetBuiltinHandler( intnum ); + if (!proc) return FALSE; } else { DOSVM_HardwareInterruptPM( context, intnum ); } + return TRUE; }

1 0

Alexandre Julliard : kernel32: Initialize MaximumLength of the user params directory too.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 28aed6d9c886cd566d27e9aff162203be2ad0959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28aed6d9c886cd566d27e9aff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 23 13:54:31 2007 +0100 kernel32: Initialize MaximumLength of the user params directory too. --- dlls/kernel32/process.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4a97ec3..84291c3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1194,6 +1194,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWST /* skip \??\ prefix */ curdir_str.Buffer = newdir.Buffer + 4; curdir_str.Length = newdir.Length - 4 * sizeof(WCHAR); + curdir_str.MaximumLength = newdir.MaximumLength - 4 * sizeof(WCHAR); } else cur_dir = NULL; }

1 0

Alexander Nicolaysen Sørnes : Display a note when viewiing old test results
by Chris Morgan Dec. 23, 2007

Dec. 23, 2007

Module: appdb Branch: master Commit: 058eba4b4ff88e10c54db21d2306eb0d34fbcbed URL: http://source.winehq.org/git/appdb.git/?a=commit;h=058eba4b4ff88e10c54db21d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 19 23:01:05 2007 +0100 Display a note when viewiing old test results --- include/testData.php | 9 +++++++++ include/version.php | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index aafeb71..7146dd8 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1214,6 +1214,15 @@ class testData{ return TRUE; } + public function isOld() + { + /* If no id is defined that means the test report is not in the database, which means it can't be old */ + if(!$this->iTestingId) + return false; + + return ((mktime() - mysqltimestamp_to_unixtimestamp($this->sSubmitTime)) > (60 * 60 * 24 * 175)); + } + function objectGetChildren($bIncludeDeleted = false) { /* We have none */ diff --git a/include/version.php b/include/version.php index 652ae01..f2df2cf 100644 --- a/include/version.php +++ b/include/version.php @@ -1038,13 +1038,15 @@ class version { ////////////////////// // Show test data + $iNewestId = 0; /* Set if the use chose to display a particular test report */ if($iTestingId) $oTest = new testData($iTestingId); else if($this->iVersionId) /* Let's query for the latest rest report */ { - $iTestingId = testData::getNewestTestIdFromVersionId($this->iVersionId); + $iNewestId = testData::getNewestTestIdFromVersionId($this->iVersionId); + $iTestingId = $iNewestId; if($iTestingId) /* We want all entries to have test data, but old versions might lack it, or data may have been deleted */ @@ -1059,6 +1061,19 @@ class version { if($oTest) { + if($oTest->isOld()) + { + if($iNewestId != $oTest->objectGetId()) + { + $sWarnOldText = 'The test results you have selected are very old and may not represent the current state of Wine.'; + } else + { + $sWarnOldText = 'The test results for this version are very old, and as such they may not represent '. + 'the current state of Wine. Please consider submitting a new test report.'; + } + echo html_note('Old test results', $sWarnOldText); + } + echo "<div class='info_container'>\n"; echo "\t<div class='title_class'>\n";

1 0

Alexander Nicolaysen Sørnes : Fix previewing of versions
by Chris Morgan Dec. 23, 2007

Dec. 23, 2007

Module: appdb Branch: master Commit: 587c866e163c658b2de9e0fcf70cb1a8c8df965d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=587c866e163c658b2de9e0fc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Dec 23 16:19:07 2007 +0100 Fix previewing of versions --- include/user.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/user.php b/include/user.php index ebbb4c9..af15196 100644 --- a/include/user.php +++ b/include/user.php @@ -721,6 +721,10 @@ class User { function canViewVersion($oVersion) { + /* If there is no id that means data must have been generated by the user */ + if(!$this->iVersionId) + return true; + /* if the version isn't queued */ if($oVersion->objectGetState() == 'accepted') return true;

1 0

Alexander Nicolaysen Sørnes : Allow users to delete their queued bug links
by Chris Morgan Dec. 23, 2007

Dec. 23, 2007

Module: appdb Branch: master Commit: a4720d9e4b4922d82b948d16148a2789fb0d56d3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a4720d9e4b4922d82b948d16… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Dec 22 00:46:47 2007 +0100 Allow users to delete their queued bug links --- include/bugs.php | 64 +++++++++++++++++++++++++++++++++++------------------ 1 files changed, 42 insertions(+), 22 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index e49a7a6..b1d7506 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -286,37 +286,54 @@ class Bug /* Get a list of bugs submitted by a given user */ function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT appFamily.appName, buglinks.versionId, appVersion.versionName, buglinks.submitTime, buglinks.bug_id FROM buglinks, appFamily, appVersion WHERE appFamily.appId = appVersion.appId AND buglinks.versionId = appVersion.versionId AND buglinks.queued = '?' AND buglinks.submitterId = '?' ORDER BY buglinks.versionId", $bQueued ? "true" : "false", $iUserId); + $hResult = query_parameters("SELECT appFamily.appName, buglinks.versionId, appVersion.versionName, buglinks.submitTime, buglinks.bug_id, buglinks.linkId FROM buglinks, appFamily, appVersion WHERE appFamily.appId = appVersion.appId AND buglinks.versionId = appVersion.versionId AND buglinks.queued = '?' AND buglinks.submitterId = '?' ORDER BY buglinks.versionId", $bQueued ? "true" : "false", $iUserId); if(!$hResult || !query_num_rows($hResult)) return FALSE; - $sReturn = html_table_begin("width=\"100%\" align=\"center\""); - $sReturn .= html_tr(array( - "Version", - array("Bug #", 'width="50"'), - array("Status", 'width="80"'), - array("Resolution", 'width="110"'), - "Description", - "Submit time"), - "color4"); + $oTable = new Table(); + $oTable->SetWidth("100%"); + $oTable->SetAlign("center"); + + // setup the table header + $oTableRow = new TableRow(); + $oTableRow->AddTextCell('Version'); + $oTableRow->AddTextCell('Bug #', 'width="50"'); + $oTableRow->AddTextCell('Status', 'width="80"'); + $oTableRow->AddTextCell('Resolution', 'width="110"'); + $oTableRow->AddTextCell('Description', 'Submit time'); + $oTableRow->AddTextCell('Submit time'); + + if($bQueued) + $oTableRow->addTextCell('Action'); + + $oTableRow->SetClass('color4'); + $oTable->AddRow($oTableRow); for($i = 1; $oRow = query_fetch_object($hResult); $i++) { - $oBug = new Bug($oRow->bug_id); - $sReturn .= html_tr(array( - version::fullNameLink($oRow->versionId), - "<a href=\"".BUGZILLA_ROOT."show_bug.cgi?id=".$oRow->bug_id."\">".$oRow->bug_id."</a>", - $oBug->sBug_status, - $oBug->sResolution, - $oBug->sShort_desc, - print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))), - ($i % 2) ? "color0" : "color1"); - } + $oTableRow = new TableRow(); - $sReturn .= html_table_end(); + $oTableRow->AddTextCell(version::fullNameLink($oRow->versionId)); + $oTableRow->AddTextCell('<a href='.BUGZILLA_ROOT.'show_bug.cgi?id='.$oRow->bug_id.'">'.$oRow->bug_id.'</a>'); + $oTableRow->AddTextCell($oBug->sBug_status); + $oTableRow->AddTextCell($oBug->sResolution); + $oTableRow->AddTextCell($oBug->sShort_desc); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))); - return $sReturn; + if($bQueued) + { + $oM = new objectManager('bug'); + $oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : ""); + $shDeleteLink = '<a href="'.$oM->makeUrl('delete', $oRow->linkId, 'Delete entry').'">delete</a>'; + $oTableRow->addTextCell(" [ $shDeleteLink ]"); + } + + $oTableRow->SetClass(($i % 2 ) ? 'color0' : 'color1'); + $oTable->AddRow($oTableRow); + } + + return $oTable->GetString(); } function isOpen() @@ -459,6 +476,9 @@ class Bug { return true; } + + if($this->iSubmitterId == $_SESSION['current']->iUserId) + return true; } return false;

1 0

Alexander Nicolaysen Sørnes : objectManager: Add some grammar
by Chris Morgan Dec. 23, 2007

Dec. 23, 2007

Module: appdb Branch: master Commit: 540e39dbbd7eef1766f6ec380796aa5558c6481a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=540e39dbbd7eef1766f6ec38… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Dec 21 21:41:54 2007 +0100 objectManager: Add some grammar --- include/objectManager.php | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index cf00be6..30c7b62 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -687,10 +687,24 @@ class ObjectManager addmsg("Entry deleted", "green"); if($iDeleted) - addmsg("Deleted $iDeleted child entries", "green"); + { + if($iDeleted == 1) + $sNoun = 'entry'; + else + $sNoun = 'entries'; + + addmsg("Deleted $iDeleted child $sNoun", 'green'); + } if($iFailed) - addmsg("Failed to delete $iFailed child entries", "red"); + { + if($iFailed == 1) + $sNoun = 'entry'; + else + $sNoun = 'entries'; + + addmsg("Failed to delete $iFailed child $sNoun", 'red'); + } $this->return_to_url($this->makeUrl("view", false)); }

1 0

Alexander Nicolaysen Sørnes : Allow users to modify/delete their queued apps
by Chris Morgan Dec. 23, 2007

Dec. 23, 2007

Module: appdb Branch: master Commit: 79dd0cfcf859b0fdcf8bfebb087630e4df45c71a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=79dd0cfcf859b0fdcf8bfebb… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Dec 21 21:48:15 2007 +0100 Allow users to modify/delete their queued apps --- include/application.php | 12 ++++++++++++ include/downloadurl.php | 4 +++- include/maintainer.php | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 47bbdd5..fcbde66 100644 --- a/include/application.php +++ b/include/application.php @@ -887,6 +887,9 @@ class Application { $oTableRow->SetClass("color4"); $oTable->SetHeader($oTableRow); + if($bQueued) + $oTableRow->addTextCell("Action"); + for($i = 1; $oRow = query_fetch_object($hResult); $i++) { @@ -900,6 +903,15 @@ class Application { $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))); $oTableRow->SetClass(($i % 2) ? "color0" : "color1"); + if($bQueued) + { + $oM = new objectManager('application'); + $oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : ""); + $shDeleteLink = '<a href="'.$oM->makeUrl("delete", $oApp->iAppId, "Delete entry").'">delete</a>'; + $shEditLink = '<a href="'.$oM->makeUrl("edit", $oApp->iAppId, "Edit entry").'">edit</a>'; + $oTableRow->addTextCell("[ $shEditLink ]   [ $shDeleteLink ]"); + } + $oTable->AddRow($oTableRow); } diff --git a/include/downloadurl.php b/include/downloadurl.php index e188ddc..408bcbe 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -258,7 +258,9 @@ class downloadurl return TRUE; } else { - return FALSE; + $oVersion = new version($this->iVersionId); + + return $oVersion->canEdit(); } } diff --git a/include/maintainer.php b/include/maintainer.php index 64e1037..0633c00 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -685,7 +685,7 @@ class maintainer function canEdit() { - if($_SESSION['current']->hasPriv("admin")) + if($_SESSION['current']->hasPriv("admin") || $this->iUserId == $_SESSION['current']->iUserId) return TRUE; return FALSE;

1 0

Alexander Nicolaysen Sørnes : Fix display of a user's queued test results
by Chris Morgan Dec. 23, 2007

Dec. 23, 2007

Module: appdb Branch: master Commit: d37cfc0e60dfcfdf5013d328ba6c15558576f2c2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d37cfc0e60dfcfdf5013d328… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Dec 21 20:43:25 2007 +0100 Fix display of a user's queued test results --- include/testData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index 78a9f3f..022459c 100644 --- a/include/testData.php +++ b/include/testData.php @@ -916,7 +916,7 @@ class testData{ /* List test data submitted by a given user. Ignore test results for queued applications/versions */ function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND (appFamily.queued = '?' OR appVersion.state = '?') AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", "false", 'accepted', $iUserId, $bQueued ? 'queued' : 'accepted'); + $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); if(!$hResult || !query_num_rows($hResult)) return false;

1 0

Alexander Nicolaysen Sørnes : Allow users to delete/edit their queued test reports
by Chris Morgan Dec. 23, 2007

Dec. 23, 2007

Module: appdb Branch: master Commit: 214de5a459d22b6f17ddf51ee4d4f42dd9a22bc8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=214de5a459d22b6f17ddf51e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Dec 22 00:11:55 2007 +0100 Allow users to delete/edit their queued test reports --- include/testData.php | 55 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 17 deletions(-) diff --git a/include/testData.php b/include/testData.php index 022459c..aafeb71 100644 --- a/include/testData.php +++ b/include/testData.php @@ -916,30 +916,51 @@ class testData{ /* List test data submitted by a given user. Ignore test results for queued applications/versions */ function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); + $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); if(!$hResult || !query_num_rows($hResult)) return false; - $sReturn = html_table_begin("width=\"100%\" align=\"center\""); - $sReturn .= html_tr(array( - "Version", - "Rating", - "Wine version", - "Submission Date"), - "color4"); + $oTable = new Table(); + $oTable->SetWidth("100%"); + $oTable->SetAlign("center"); + + // setup the table header + $oTableRow = new TableRow(); + $oTableRow->AddTextCell('Version'); + $oTableRow->AddTextCell('Rating'); + $oTableRow->AddTextCell('Wine version'); + $oTableRow->AddTextCell('Submission date'); + + if($bQueued) + $oTableRow->addTextCell('Action'); + + $oTableRow->SetClass('color4'); + $oTable->AddRow($oTableRow); for($i = 1; $oRow = query_fetch_object($hResult); $i++) - $sReturn .= html_tr(array( - version::fullNameLink($oRow->versionId), - $oRow->testedRating, - $oRow->testedRelease, - print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))), - $oRow->testedRating); + { + $oTableRow = new TableRow(); + + $oTableRow->AddTextCell(version::fullNameLink($oRow->versionId)); + $oTableRow->AddTextCell($oRow->testedRating); + $oTableRow->AddTextCell($oRow->testedRelease); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTim))); - $sReturn .= html_table_end(); + if($bQueued) + { + $oM = new objectManager('testData_queue'); + $oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : ""); + $shDeleteLink = '<a href="'.$oM->makeUrl('delete', $oRow->testingId, 'Delete entry').'">delete</a>'; + $shEditLink = '<a href="'.$oM->makeUrl('edit', $oRow->testingId, 'Edit entry').'">edit</a>'; + $oTableRow->addTextCell("[ $shEditLink ]   [ $shDeleteLink ]"); + } + + $oTableRow->SetClass($oRow->testedRating); + $oTable->AddRow($oTableRow); + } - return $sReturn; + return $oTable->GetString(); } // return the number of test data entries for a particular version id @@ -1143,7 +1164,7 @@ class testData{ else if($this->iVersionId) { if($this->iSubmitterId == $_SESSION['current']->iUserId && - $this->sState == 'rejected') + $this->sState != 'accepted') return TRUE; $oVersion = new version($this->iVersionId);

1 0