September 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : Fix buglink deletion on version pages
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: 1e1b4a1ecea231ae8a065c5584c9c5bdba84aa74 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1e1b4a1ecea231ae8a065c55… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Thu Sep 27 12:54:22 2007 +0200 Fix buglink deletion on version pages --- include/bugs.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 672adb9..a7d712b 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -564,7 +564,9 @@ function view_version_bugs($iVersionId = null, $aBuglinkIds) if($bCanEdit == true) { - echo "<td align=center>[<a href='objectManager.php?sClass=bug&iId=".$oBuglink->iLinkId."&sAction=delete&sSubmit=Delete&sReturnTo=".$oVersion->objectMakeUrl()."'>delete</a>]</td>\n"; + $oM = new objectManager("bug"); + $oM->sReturnTo = $oVersion->objectMakeUrl(); + echo "<td align=center>[<a href='".$oM->makeUrl("delete", $oBuglink->iLinkId)."&sSubmit=delete'>delete</a>]</td>\n"; if ($oBuglink->bQueued) { echo "<td align=center>[<a href='objectManager.php?sClass=bug&iId=".$oBuglink->iLinkId."&sAction=edit&sSubmit=Submit&bIsQueue=true&sReturnTo=".$oVersion->objectMakeUrl()."'>OK</a>]</td>\n";

1 0

Alexander Nicolaysen Sørnes : Fix screenshot submission when an app but no version is selected
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: 715f3af1b327eca1caf62a53883667375e44e904 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=715f3af1b327eca1caf62a53… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Thu Sep 27 12:07:23 2007 +0200 Fix screenshot submission when an app but no version is selected --- screenshots.php | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/screenshots.php b/screenshots.php index defd506..306ae7d 100644 --- a/screenshots.php +++ b/screenshots.php @@ -147,11 +147,22 @@ if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn()) echo '<input type="hidden" name="MAX_FILE_SIZE" value="4000000" />',"\n"; echo '<input type="hidden" name="sCmd" value="screenshot_upload" />',"\n"; echo '<input type="hidden" name="iVersionId" value="'.$aClean['iVersionId'].'"></form />',"\n"; -} else // else let the person know that if they log in they can submit screenshots +} else if(!$_SESSION['current']->isLoggedIn()) // else let the person know that if they log in they can submit screenshots { echo '<div align="center"><a href="'.login_url().'">'; echo "Log in</a> to submit screenshots</div>\n"; +} else +{ + echo html_frame_start("Upload Screenshot", "30%"); + echo 'If you would like to submit screenshots, please select an application version below.<br />'; + echo '<ul>'; + foreach($oApp->getVersions() as $oVersion) + echo '<li><a href="'.BASE.'screenshots.php?iVersionId='.$oVersion->objectGetId().'">'.$oVersion->sName.'</a></li>'; + + echo '</ul>'; + echo html_frame_end(); } + echo html_back_link(1); apidb_footer();

1 0

Alexander Nicolaysen Sørnes : Allow maintainers to modify screenshot description when processing queued items
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: 53a6360ec0c23bc4f8309d6ad4654de4608d820a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=53a6360ec0c23bc4f8309d6a… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Thu Sep 27 11:53:31 2007 +0200 Allow maintainers to modify screenshot description when processing queued items --- include/appData.php | 13 +++---------- include/screenshot.php | 7 +++---- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/include/appData.php b/include/appData.php index a4cbe2a..a831acd 100644 --- a/include/appData.php +++ b/include/appData.php @@ -94,25 +94,18 @@ class appData return TRUE; } - function update($bSilent = FALSE) + function update() { if(!$this->canEdit()) return FALSE; - $sQuery = "UPDATE appData SET versionId = '?', appId = '?', sDescription = '?' + $sQuery = "UPDATE appData SET versionId = '?', appId = '?', description = '?' WHERE id = '?'"; - $hResult = query_parameters($this->iVersionId, $this->iAppId, + $hResult = query_parameters($sQuery, $this->iVersionId, $this->iAppId, $this->sDescription, $this->iId); if(!$hResult) - { - if(!$bResult) - addmsg("Failed to update add data", "red"); return FALSE; - } - - if(!$bSilent) - addmsg("Updated app data successfully", "green"); return TRUE; } diff --git a/include/screenshot.php b/include/screenshot.php index 9f7da6e..611b83b 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -669,14 +669,13 @@ class screenshot function getOutputEditorValues($aClean) { - /* STUB: No update possible, reply text fetched from $aClean */ - return TRUE; + $this->sDescription = $aClean['sDescription']; } function update() { - /* STUB: No updating possible at the moment */ - return TRUE; + $oAppData = new appData($this->iScreenshotId, null, $this); + return $oAppData->update(); } function objectHideDelete()

1 0

Alexander Nicolaysen Sørnes : Use objectManager to delete screenshots
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: 2823334eed128c7aa6b700d96f49d701bf543fd4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2823334eed128c7aa6b700d9… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Thu Sep 27 12:26:00 2007 +0200 Use objectManager to delete screenshots --- include/objectManager.php | 3 ++- screenshots.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 0aacf10..76680f5 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -935,7 +935,8 @@ class ObjectManager if($sAction) $sUrl .= "&sAction=$sAction"; - + if($this->sReturnTo) + $sUrl .= "&sReturnTo=".urlencode($this->sReturnTo); if(!$sTitle) $sTitle = $this->sTitle; diff --git a/screenshots.php b/screenshots.php index 306ae7d..ca23e53 100644 --- a/screenshots.php +++ b/screenshots.php @@ -107,7 +107,9 @@ if($hResult && query_num_rows($hResult)) ) ) { - echo "<br />[<a href='screenshots.php?sCmd=delete&iImageId=$oRow->id&iAppId=".$aClean['iAppId']."&iVersionId=".$aClean['iVersionId']."'>Delete Image</a>]"; + $oM = new objectManager("screenshot"); + $oM->sReturnTo = "screenshots.php?iAppId=".$oScreenshot->iAppId."&iVersionId=".$oScreenshot->iVersionId; + echo '<br />[<a href="'.$oM->makeUrl("delete", $oScreenshot->iScreenshotId, "Delete Screenshot").'">Delete</a>]'; } echo "</div></td>\n";

1 0

Alexander Nicolaysen Sørnes : application: Fix permissions
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: bbe286a16f40f62ab483eb594406c48fecaed931 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bbe286a16f40f62ab483eb59… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Thu Sep 27 12:41:46 2007 +0200 application: Fix permissions --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index e8f826e..47033fa 100644 --- a/include/application.php +++ b/include/application.php @@ -968,7 +968,7 @@ class Application { $this->iAppId)) return TRUE; - if($this->sQueued != "true" && $this->iSubmitterId = + if($this->sQueued != "false" && $this->iSubmitterId == $_SESSION['current']->iUserId) { return TRUE;

1 0

Chris Morgan : Switch version::makeLicenseList() back to public since we call it from browse_downloadable.php
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: b96e936ff846b3e20d5853d79efe7dedf1f73226 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b96e936ff846b3e20d5853d7… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Wed Sep 26 21:56:16 2007 -0400 Switch version::makeLicenseList() back to public since we call it from browse_downloadable.php --- include/version.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index 18a4e2b..8e2d75a 100644 --- a/include/version.php +++ b/include/version.php @@ -1245,7 +1245,7 @@ class version { } // returns a string containing the html for a selection list - private function makeLicenseList($sLicense = NULL) + public function makeLicenseList($sLicense = NULL) { if(!$sLicense) $sLicense = $this->sLicense;

1 0

Alexander Nicolaysen Sørnes : testData: Add a line break after distribution help text
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: f0a2416804701ff4a04b3cb7e6a71bca6ee08d5b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f0a2416804701ff4a04b3cb7… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Wed Sep 26 21:35:51 2007 +0200 testData: Add a line break after distribution help text --- include/testData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index 19f8efd..3dd833e 100644 --- a/include/testData.php +++ b/include/testData.php @@ -711,7 +711,7 @@ class testData{ "review it in the form below or replace ". "it with one from the list."; } - $sDistributionHelp ."<br />\n"; + $sDistributionHelp .= "<br />\n"; } echo '<tr valign=top><td class="color0"><b>Distribution</b></td class="color0">',"\n";

1 0

Alexander Nicolaysen Sørnes : Fix ordering of vendors in application drop-down vendor list
by Chris Morgan Sept. 27, 2007

Sept. 27, 2007

Module: appdb Branch: master Commit: c8b93843d7191b666984eea89496116527044549 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c8b93843d7191b666984eea8… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Wed Sep 26 21:32:57 2007 +0200 Fix ordering of vendors in application drop-down vendor list --- include/tableve.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/tableve.php b/include/tableve.php index 2781679..9a4e11a 100644 --- a/include/tableve.php +++ b/include/tableve.php @@ -182,7 +182,7 @@ class TableVE { if($aWhere) $sWhere = "WHERE ".$aWhere[0]." ='".$aWhere[1]."'"; - $hResult = query_parameters("SELECT ?, ? FROM ? $sWhere ORDER BY '?'", + $hResult = query_parameters("SELECT ?, ? FROM ? $sWhere ORDER BY ?", $sIdField, $sNameField, $sTable, $sNameField); if(!$hResult) return $sStr; // Oops

1 0

Alexandre Julliard : wineconsole: Default to the user backend, falling back to curses if we can't create a window.
by Alexandre Julliard Sept. 26, 2007

Sept. 26, 2007

Module: wine Branch: master Commit: d082517c3364ed01ed98ad4468437da7b9259ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d082517c3364ed01ed98ad446… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 14:21:46 2007 +0200 wineconsole: Default to the user backend, falling back to curses if we can't create a window. --- programs/wineconsole/curses.c | 2 ++ programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 971c22d..2210cd9 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1016,6 +1016,8 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data) #else enum init_return WCCURSES_InitBackend(struct inner_data* data) { + WINE_ERR("(n)curses was not found at configuration time.\n" + "If you want (n)curses support, please install relevant packages.\n"); return init_not_supported; } #endif diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index fdb0e16..deba453 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1437,7 +1437,7 @@ enum init_return WCUSER_InitBackend(struct inner_data* data) CreateWindow(wndclass.lpszClassName, NULL, WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_HSCROLL|WS_VSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, 0, wndclass.hInstance, data); - if (!data->hWnd) return init_failed; + if (!data->hWnd) return init_not_supported; return init_success; } diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 449cb64..a78e076 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -656,9 +656,18 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna WINE_TRACE("using hConOut %p\n", data->hConOut); /* filling data->curcfg from cfg */ - retry: switch ((*backend)(data)) { + case init_not_supported: + if (backend == WCCURSES_InitBackend) + { + if (WCUSER_InitBackend( data ) != init_success) break; + } + else if (backend == WCUSER_InitBackend) + { + if (WCCURSES_InitBackend( data ) != init_success) break; + } + /* fall through */ case init_success: WINECON_GetServerConfig(data); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -684,16 +693,6 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna return data; case init_failed: break; - case init_not_supported: - if (backend == WCCURSES_InitBackend) - { - WINE_ERR("(n)curses was not found at configuration time.\n" - "If you want (n)curses support, please install relevant packages.\n" - "Now forcing user backend instead of (n)curses.\n"); - backend = WCUSER_InitBackend; - goto retry; - } - break; } error: @@ -768,7 +767,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) memset(wci, 0, sizeof(*wci)); wci->ptr = lpCmdLine; wci->mode = from_process_name; - wci->backend = WCCURSES_InitBackend; + wci->backend = WCUSER_InitBackend; for (;;) { @@ -792,6 +791,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) } else if (strncmp(wci->ptr + 10, "curses", 6) == 0) { + wci->backend = WCCURSES_InitBackend; wci->ptr += 16; } else

1 0

Alex Villacís Lasso : riched20: EM_SETCHARFORMAT must return 1 on success, not 0.
by Alexandre Julliard Sept. 26, 2007

Sept. 26, 2007

Module: wine Branch: master Commit: fa5230fb54a2f0c57acf5ce800f6279b5b64b2aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5230fb54a2f0c57acf5ce80… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Sep 25 15:11:14 2007 -0500 riched20: EM_SETCHARFORMAT must return 1 on success, not 0. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a10c954..f90c353 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1748,7 +1748,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ME_CommitUndo(editor); if (bRepaint) ME_RewrapRepaint(editor); - return 0; + return 1; } case EM_GETCHARFORMAT: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1c564ec..7a092c3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -366,7 +366,8 @@ static void test_EM_SETTEXTMODE(void) /*EM_SETCHARFORMAT is not yet fully implemented for all WPARAMs in wine; however, SCF_ALL has been implemented*/ - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "wine"); /*Select the string "wine"*/ @@ -379,7 +380,8 @@ static void test_EM_SETTEXTMODE(void) /*Reset the formatting to default*/ cf2.dwEffects = CFE_ITALIC^cf2.dwEffects; - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); /*Clear the text in the control*/ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) ""); @@ -472,6 +474,7 @@ static void test_TM_PLAINTEXT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2 cf2, cf2test; CHARRANGE cr; + int rc = 0; /*Switch to plain text mode*/ @@ -494,7 +497,10 @@ static void test_TM_PLAINTEXT(void) cf2.dwMask = CFM_BOLD | cf2.dwMask; cf2.dwEffects = CFE_BOLD ^ cf2.dwEffects; - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_SELECTION, (LPARAM) &cf2); + todo_wine { + ok(rc == 0, "EM_SETCHARFORMAT returned %d instead of 0\n", rc); + } /*Get the formatting of those characters*/ @@ -534,7 +540,8 @@ static void test_TM_PLAINTEXT(void) SendMessage(hwndRichEdit, EM_GETCHARFORMAT, (WPARAM) SCF_DEFAULT, (LPARAM) &cf2); cf2.dwMask |= CFM_ITALIC; cf2.dwEffects ^= CFE_ITALIC; - SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + rc = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(rc == 1, "EM_SETCHARFORMAT returned %d instead of 1\n", rc); /*Set the text in the control to "wine", which will be bold and italicized*/ @@ -1472,6 +1479,8 @@ static void test_EM_GETMODIFY(void) cf2.dwMask = CFM_ITALIC | cf2.dwMask; cf2.dwEffects = CFE_ITALIC ^ cf2.dwEffects; SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + result = SendMessage(hwndRichEdit, EM_SETCHARFORMAT, (WPARAM) SCF_ALL, (LPARAM) &cf2); + ok(result == 1, "EM_SETCHARFORMAT returned %ld instead of 1\n", result); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero for EM_SETCHARFORMAT\n");

1 0