wine-commits January 2007

wine-commits@winehq.org

4 participants
893 discussions

Mike McCormack : msi: Register IMsiServer.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 208cdde0f5774e078ba36c279a46cfc19aa50643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=208cdde0f5774e078ba36c279… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 17 20:06:44 2007 +0900 msi: Register IMsiServer. --- dlls/msi/regsvr.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index dca1c80..dca44e2 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -588,22 +588,28 @@ static struct regsvr_coclass const cocla */ /* * we should declare: (@see ole32/regsvr.c for examples) - [-HKEY_CLASSES_ROOT\Interface\{000C101C-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C101D-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1025-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1033-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1090-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1093-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C1095-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109A-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109B-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109C-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109D-0000-0000-C000-000000000046}] - [-HKEY_CLASSES_ROOT\Interface\{000C109E-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C101D-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1025-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1033-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1090-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1093-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C1095-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109A-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109B-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109C-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109D-0000-0000-C000-000000000046}] + [-HKEY_CLASSES_ROOT\Interface\{000C109E-0000-0000-C000-000000000046}] [-HKEY_CLASSES_ROOT\Interface\{000C109F-0000-0000-C000-000000000046}] */ + static struct regsvr_interface const interface_list[] = { - { NULL } /* list terminator */ + { &CLSID_IMsiServer, + "IMsiServer", + NULL, + 18, + NULL, + NULL }, + { NULL } /* list terminator */ }; static HRESULT register_msiexec(void)

1 0

Mike McCormack : user32: Add a test showing WM_GETTEXT doesn' t crash with bad pointers.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: 95fdf165cd1ffa3cd201576953ca839162b363cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fdf165cd1ffa3cd20157695… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 17 19:52:08 2007 +0900 user32: Add a test showing WM_GETTEXT doesn't crash with bad pointers. --- dlls/user32/tests/win.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a420e28..951c6aa 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4084,6 +4084,39 @@ static void test_ShowWindow(void) ok(!IsWindow(hwnd), "window should not exist\n"); } +void test_gettext(void) +{ + WNDCLASS cls; + LPCSTR clsname = "gettexttest"; + HWND hwnd; + LRESULT r; + + memset( &cls, 0, sizeof cls ); + cls.lpfnWndProc = DefWindowProc; + cls.lpszClassName = clsname; + cls.hInstance = GetModuleHandle(NULL); + + if (!RegisterClass( &cls )) return; + + hwnd = CreateWindow( clsname, "test text", WS_OVERLAPPED, 0, 0, 10, 10, 0, NULL, NULL, NULL); + ok( hwnd != NULL, "window was null\n"); + + r = SendMessage( hwnd, WM_GETTEXT, 0x10, 0x1000); + ok( r == 0, "settext should return zero\n"); + + r = SendMessage( hwnd, WM_GETTEXT, 0x10000, 0); + ok( r == 0, "settext should return zero (%ld)\n", r); + + r = SendMessage( hwnd, WM_GETTEXT, 0xff000000, 0x1000); + ok( r == 0, "settext should return zero (%ld)\n", r); + + r = SendMessage( hwnd, WM_GETTEXT, 0x1000, 0xff000000); + ok( r == 0, "settext should return zero (%ld)\n", r); + + DestroyWindow(hwnd); + UnregisterClass( clsname, NULL ); +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -4161,6 +4194,7 @@ START_TEST(win) test_csparentdc(); test_SetWindowLong(); test_ShowWindow(); + test_gettext(); /* add the tests above this line */ UnhookWindowsHookEx(hhook);

1 0

Mike McCormack : user32: Add an exception handler around the WM_GETTEXT handler.
by Alexandre Julliard 18 Jan '07

18 Jan '07

Module: wine Branch: master Commit: ce21d918d85fbf8d75e5bb1d375bdeee079a4cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce21d918d85fbf8d75e5bb1d3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 17 19:51:32 2007 +0900 user32: Add an exception handler around the WM_GETTEXT handler. --- dlls/user32/defwnd.c | 59 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 9278ddd..06c10b2 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -36,6 +36,7 @@ #include "wine/unicode.h" #include "wine/winuser16.h" #include "wine/server.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -726,7 +727,27 @@ static LRESULT DEFWND_DefWinProc( HWND h return 0; } +static LPARAM DEFWND_GetTextA( WND *wndPtr, LPSTR dest, WPARAM wParam ) +{ + LPARAM result = 0; + __TRY + { + if (wndPtr->text) + { + if (!WideCharToMultiByte( CP_ACP, 0, wndPtr->text, -1, + dest, wParam, NULL, NULL )) dest[wParam-1] = 0; + result = strlen( dest ); + } + else dest[0] = '\0'; + } + __EXCEPT_PAGE_FAULT + { + return 0; + } + __ENDTRY + return result; +} /*********************************************************************** * DefWindowProcA (USER32.@) @@ -778,13 +799,8 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd WND *wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr) break; - if (wndPtr->text) - { - if (!WideCharToMultiByte( CP_ACP, 0, wndPtr->text, -1, - dest, wParam, NULL, NULL )) dest[wParam-1] = 0; - result = strlen( dest ); - } - else dest[0] = '\0'; + result = DEFWND_GetTextA( wndPtr, dest, wParam ); + WIN_ReleasePtr( wndPtr ); } break; @@ -862,6 +878,28 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd } +static LPARAM DEFWND_GetTextW( WND *wndPtr, LPWSTR dest, WPARAM wParam ) +{ + LPARAM result = 0; + + __TRY + { + if (wndPtr->text) + { + lstrcpynW( dest, wndPtr->text, wParam ); + result = strlenW( dest ); + } + else dest[0] = '\0'; + } + __EXCEPT_PAGE_FAULT + { + return 0; + } + __ENDTRY + + return result; +} + /*********************************************************************** * DefWindowProcW (USER32.@) Calls default window message handler * @@ -917,12 +955,7 @@ LRESULT WINAPI DefWindowProcW( WND *wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr) break; - if (wndPtr->text) - { - lstrcpynW( dest, wndPtr->text, wParam ); - result = strlenW( dest ); - } - else dest[0] = '\0'; + result = DEFWND_GetTextW( wndPtr, dest, wParam ); WIN_ReleasePtr( wndPtr ); } break;

1 0

appdb/include downloadurl.php
by WineHQ 18 Jan '07

18 Jan '07

ChangeSet ID: 30889 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/17 21:21:27 Modified files: include : downloadurl.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Code changes to fix issues that appear to affect php4 but not php5 Patch: http://cvs.winehq.org/patch.py?id=30889 Old revision New revision Changes Path 1.9 1.10 +4 -1 appdb/include/downloadurl.php Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.9 appdb/include/downloadurl.php:1.10 --- appdb/include/downloadurl.php:1.9 18 Jan 2007 3:21:27 -0000 +++ appdb/include/downloadurl.php 18 Jan 2007 3:21:27 -0000 @@ -303,7 +303,10 @@ class downloadurl function processFormSingle($iVersionId, $aValues, $bUnQueue = FALSE) { if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) - $iId = mysql_fetch_object($hResult)->id; + { + $oObject = mysql_fetch_object($hResult); + $iId = $oObject->id; + } $oDownloadurl = new downloadurl($iId);

1 0

appdb/ include/application.php include/version ...
by WineHQ 18 Jan '07

18 Jan '07

ChangeSet ID: 30888 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/17 20:38:18 Modified files: include : application.php version.php Added files: . : contact.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow contacting maintainers through a form, so their e-mail address is not exposed Patch: http://cvs.winehq.org/patch.py?id=30888 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/contact.php 1.85 1.86 +3 -1 appdb/include/application.php 1.95 1.96 +2 -1 appdb/include/version.php Index: appdb/contact.php diff -u -p /dev/null appdb/contact.php:1.1 --- /dev/null 18 Jan 2007 2:38:18 -0000 +++ appdb/contact.php 18 Jan 2007 2:38:18 -0000 @@ -0,0 +1,75 @@ +<?php + +require_once("path.php"); +require_once(BASE."/include/incl.php"); + +/** + * Page containing a form for sending e-mail + * + */ + +$oUser = new User($_SESSION['current']->iUserId); + +/* Restrict error to logged-in users */ +if(!$oUser->isLoggedIn()) + util_show_error_page_and_exit("You need to be logged in."); + + +$oRecipient = new User($aClean['iRecipientId']); + +if(!User::exists($oRecipient->sEmail)) + util_show_error_page_and_exit("User not found"); + +/* Check for errors */ +if((!$aClean['sMessage'] || !$aClean['sSubject']) && $aClean['sSubmit']) +{ + $error = "<font color=\"red\">Please enter both a subject and a ". + "message.</font>"; + $aClean['sSubmit'] = ""; +} + +/* Display the feedback form if nothing else is specified */ +if(!$aClean['sSubmit']) +{ + apidb_header("E-mail $oRecipient->sRealname"); + echo html_frame_start("Send us your suggestions",400,"",0); + + echo $error; + echo "<form action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">"; + echo "<p>E-mail $oRecipient->sRealname.</p>"; + echo html_table_begin("width\"100%\" border=\"0\" cellpadding=\"2\"". + "cellspacing=\"2\""); + echo html_tr(array( + array("Subject", ""), + "<input type=\"text\" name=\"sSubject\" size=\"71\" />"), + "color4"); + echo html_tr(array( + array("Message", "valign=\"top\""), + "<textarea name=\"sMessage\" rows=\"15\" cols=\"60\"></textarea>"), + "color4"); + echo html_tr(array( + "", + "<input type=\"submit\" value=\"Submit\" name=\"sSubmit\" />") + ); + + echo "<input type=\"hidden\" name=\"iRecipientId\" ". + "value=\"$oRecipient->iUserId\" />"; + + echo html_table_end(); + echo "</form>\n"; + + echo html_frame_end(" "); + +} else if ($aClean['sSubject'] && $aClean['sMessage']) +{ + $sMsg = "The following message was sent to you from $oUser->sRealname "; + $sMsg .= "through the Wine AppDB contact form.\nTo Reply, visit "; + $sMsg .= APPDB_ROOT."contact.php?iRecipientId=$oUser->iUserId\n\n"; + $sMsg .= $aClean['sMessage']; + + mail_appdb($oRecipient->sEmail, $aClean['sSubject'], $sMsg); + + util_redirect_and_exit(BASE."index.php"); +} + +?> Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.85 appdb/include/application.php:1.86 --- appdb/include/application.php:1.85 18 Jan 2007 2:38:18 -0000 +++ appdb/include/application.php 18 Jan 2007 2:38:18 -0000 @@ -662,7 +662,9 @@ class Application { while(list($index, $userIdValue) = each($other_maintainers)) { $oUser = new User($userIdValue); - echo " <li>".$oUser->sRealname."</li>\n"; + echo " <li>$oUser->sRealname (<a href=\"". + BASE."contact.php?iRecipientId=$oUser->iUserId\">". + "e-mail</a>)</li>\n"; } echo "</ul></td></tr>\n"; } else Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.95 appdb/include/version.php:1.96 --- appdb/include/version.php:1.95 18 Jan 2007 2:38:18 -0000 +++ appdb/include/version.php 18 Jan 2007 2:38:18 -0000 @@ -680,7 +680,8 @@ class Version { while(list($index, $userIdValue) = each($aAllMaintainers)) { $oUser = new User($userIdValue); - echo "<li>".$oUser->sRealname."</li>"; + echo "<li>$oUser->sRealname (<a href=\"".BASE."contact.php?". + "iRecipientId=$oUser->iUserId\">e-mail</a>)</li>"; } echo "</ul></td></tr>\n"; } else

1 0

appdb/. testResults.php
by WineHQ 18 Jan '07

18 Jan '07

ChangeSet ID: 30887 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/17 20:35:16 Modified files: . : testResults.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Language fixes Patch: http://cvs.winehq.org/patch.py?id=30887 Old revision New revision Changes Path 1.25 1.26 +2 -2 appdb/testResults.php Index: appdb/testResults.php diff -u -p appdb/testResults.php:1.25 appdb/testResults.php:1.26 --- appdb/testResults.php:1.25 18 Jan 2007 2:35:16 -0000 +++ appdb/testResults.php 18 Jan 2007 2:35:16 -0000 @@ -180,9 +180,9 @@ else // if ($aClean['sSub']) is not defi { // help echo "<div align=center><table width='90%' border=0 cellpadding=3 cellspacing=0><tr><td>\n\n"; - echo "<p>This is the list of Test Results waiting for submition, or to be deleted.</p>\n"; + echo "<p>This is the list of test results waiting to be accepted or deleted.</p>\n"; echo "<p>To view a submission, click on its name. From that page you can delete or edit and\n"; - echo "re-submit it into the AppDB .<br>\n"; + echo "re-submit it into the AppDB.<br>\n"; echo "</td></tr></table></div>\n\n"; $oTest->ShowListofTests($hResult,"Submitted Testing Results");

1 0

appdb/ ./appsubmit.php admin/adminAppQueue.php ...
by WineHQ 18 Jan '07

18 Jan '07

ChangeSet ID: 30886 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/17 20:34:19 Modified files: . : appsubmit.php admin : adminAppQueue.php include : appData.php downloadurl.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Allow download urls on version submission Patch: http://cvs.winehq.org/patch.py?id=30886 Old revision New revision Changes Path 1.60 1.61 +5 -0 appdb/appsubmit.php 1.71 1.72 +5 -0 appdb/admin/adminAppQueue.php 1.2 1.3 +4 -2 appdb/include/appData.php 1.8 1.9 +80 -0 appdb/include/downloadurl.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.60 appdb/appsubmit.php:1.61 --- appdb/appsubmit.php:1.60 18 Jan 2007 2:34:19 -0000 +++ appdb/appsubmit.php 18 Jan 2007 2:34:19 -0000 @@ -216,6 +216,9 @@ if ($aClean['sSub']) { $oTest->create(); } + + downloadurl::processFormSingle($oVersion->iVersionId, $aClean); + util_redirect_and_exit($_SERVER['PHP_SELF']); } } @@ -351,6 +354,8 @@ if ($aClean['sSub']) $oVersion->outputEditor(false, false); + echo downloadurl::outputEditorSingle($iVersionId, $aClean); + $oTest->outputEditor($aClean['sDistribution'],true); echo "<table width='100%' border=0 cellpadding=2 cellspacing=2>\n"; Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.71 appdb/admin/adminAppQueue.php:1.72 --- appdb/admin/adminAppQueue.php:1.71 18 Jan 2007 2:34:19 -0000 +++ appdb/admin/adminAppQueue.php 18 Jan 2007 2:34:19 -0000 @@ -193,6 +193,9 @@ if ($aClean['sSub']) $oVersion->unQueue(); $oTest->update(true); $oTest->unQueue(); + + downloadurl::processFormSingle($oVersion->iVersionId, $aClean, TRUE); + util_redirect_and_exit($_SERVER['PHP_SELF']); } else if ($aClean['sSub'] == 'duplicate') @@ -377,6 +380,8 @@ if ($aClean['sSub']) $oVersion->outputEditor(false, false); + echo downloadurl::outputEditorSingle($oVersion->iVersionId, $aClean); + $oTest->outputEditor($aClean['sDistribution']); echo html_frame_start("Reply text", "90%", "", 0); Index: appdb/include/appData.php diff -u -p appdb/include/appData.php:1.2 appdb/include/appData.php:1.3 --- appdb/include/appData.php:1.2 18 Jan 2007 2:34:19 -0000 +++ appdb/include/appData.php 18 Jan 2007 2:34:19 -0000 @@ -53,7 +53,7 @@ class appData } /* Get appData for a given version/application, optionally filter by type */ - function getData($iId, $sType, $bIsVersion = TRUE) + function getData($iId, $sType, $bIsVersion = TRUE, $bQueued = FALSE) { $iAppId = 0; $iVersionId = 0; @@ -63,7 +63,9 @@ class appData else $iAppId = $iId; - $hResult = query_parameters("SELECT * FROM appData WHERE appId = '?' AND versionId = '?' AND TYPE = '?'", $iAppId, $iVersionId, $sType); + $hResult = query_parameters("SELECT * FROM appData WHERE appId = '?' AND + versionId = '?' AND TYPE = '?' AND queued = '?'", + $iAppId, $iVersionId, $sType, $bQueued ? "true" : "false"); if(!$hResult || !mysql_num_rows($hResult)) return FALSE; Index: appdb/include/downloadurl.php diff -u -p appdb/include/downloadurl.php:1.8 appdb/include/downloadurl.php:1.9 --- appdb/include/downloadurl.php:1.8 18 Jan 2007 2:34:19 -0000 +++ appdb/include/downloadurl.php 18 Jan 2007 2:34:19 -0000 @@ -222,6 +222,50 @@ class downloadurl } } + /* Output an editor for a single new URL */ + function outputEditorSingle($iVersionId = NULL, $aValues = NULL) + { + if($iVersionId) + { + if($hResult = appData::getData($iVersionId, "downloadurl", + TRUE, TRUE)) + { + $oRow = mysql_fetch_object($hResult); + $sDownloadUrlUrl = $oRow->url; + $sDownloadUrlDescription = $oRow->description; + } + } else + { + $sDownloadUrlUrl = $aValues["sDownloadUrlUrl"]; + $sDownloadUrlDescription = $aValues["sDownloadUrlDescription"]; + } + + $sReturn .= html_frame_start("Download URL","90%"); + $sReturn .= html_table_begin(""); + + $sReturn .= "A place where this version can be downloaded for free". + " (if applicable). You can add more links later.<br />"; + + $sReturn .= html_tr(array( + array("Download URL", "valign=\"top\""), + array("<input type=\"text\" name=\"sDownloadUrlUrl\" ". + "value=\"$sDownloadUrlUrl\" size=\"60\" />", + "class=\"color4\"")), + "color0"); + + $sReturn .= html_tr(array( + array("Download URL Description", "valign=\"top\""), + array("<input type=\"text\" name=\"sDownloadUrlDescription\" ". + "value=\"$sDownloadUrlDescription\" size=\"60\" />", + "class=\"color4\"")), + "color0"); + + $sReturn .= html_table_end(); + $sReturn .= html_frame_end("nbsp;"); + + return $sReturn; + } + function create() { if(!$this->sUrl or !$this->sDescription or !$this->iVersionId) @@ -255,6 +299,42 @@ class downloadurl return TRUE; } + /* Process a form made only for submitting one URL */ + function processFormSingle($iVersionId, $aValues, $bUnQueue = FALSE) + { + if($hResult = appData::getData($iVersionId, "downloadurl", TRUE, TRUE)) + $iId = mysql_fetch_object($hResult)->id; + + $oDownloadurl = new downloadurl($iId); + + $oDownloadurl->sDescription = $aValues['sDownloadUrlDescription']; + $oDownloadurl->sUrl = $aValues['sDownloadUrlUrl']; + $oDownloadurl->iVersionId = $iVersionId; + + if($iId) + $oDownloadurl->update(); + else + $oDownloadurl->create(); + + if($bUnQueue) + $oDownloadurl->unQueue(); + } + + function unQueue() + { + if(!$this->canEdit($this->iVersionId)) + return FALSE; + + $hResult = query_parameters("UPDATE appData SET queued = '?' + WHERE id = '?'", + "false", $this->iId); + + if(!$hResult) + return FALSE; + + return TRUE; + } + function delete() { if(!downloadurl::canEdit($this->iVersionId))

1 0

appdb/include url.php version.php
by WineHQ 18 Jan '07

18 Jan '07

ChangeSet ID: 30885 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/17 20:28:21 Modified files: include : url.php version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add url::display and replace old link display code. Patch: http://cvs.winehq.org/patch.py?id=30885 Old revision New revision Changes Path 1.11 1.12 +25 -1 appdb/include/url.php 1.94 1.95 +5 -13 appdb/include/version.php Index: appdb/include/url.php diff -u -p appdb/include/url.php:1.11 appdb/include/url.php:1.12 --- appdb/include/url.php:1.11 18 Jan 2007 2:28:21 -0000 +++ appdb/include/url.php 18 Jan 2007 2:28:21 -0000 @@ -234,6 +234,30 @@ class Url { $sEmail = User::get_notify_email_address_list(null, $this->iVersionId); if($sEmail) mail_appdb($sEmail, $sSubject ,$sMsg); - } + } + + /* Display links for a given version/application */ + function display($iVersionId, $iAppId = NULL) + { + if($iVersionId) + { + if(!($hResult = appData::getData($iVersionId, "url"))) + return FALSE; + } else + { + if(!($hResult = appData::getData($iAppId, "url", FALSE))) + return FALSE; + } + + for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) + { + $sReturn .= html_tr(array( + "<b>Link</b>", + "<a href=\"$oRow->url\">$oRow->description</a>"), + "color1"); + } + + return $sReturn; + } } ?> Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.94 appdb/include/version.php:1.95 --- appdb/include/version.php:1.94 18 Jan 2007 2:28:21 -0000 +++ appdb/include/version.php 18 Jan 2007 2:28:21 -0000 @@ -646,28 +646,20 @@ class Version { // main URL echo " <tr class=\"color1\"><td><b>URL</b></td><td>".$appLinkURL."</td></tr>\n"; - // links - $result = query_parameters("SELECT * FROM appData WHERE versionID = '?' AND type = 'url'", - $this->iVersionId); - if($result && mysql_num_rows($result) > 0) - { - echo " <tr class=\"color1\"><td><b>Links</b></td><td>\n"; - while($oRow = mysql_fetch_object($result)) - { - echo " <a href=\"$oRow->url\">".substr(stripslashes($oRow->description),0,30)."</a> <br />\n"; - } - echo " </td></tr>\n"; - } - if($this->sTestedRating != "/" && $this->sTestedRating) $sMaintainerColor = $this->sTestedRating; else $sMaintainerColor = "color0"; + // URLs + if($sUrls = url::display($this->iVersionId)) + echo $sUrls; + // rating Area echo "<tr class=\"$sMaintainerColor\" valign=\"top\"><td><b>Maintainer’s Rating</b></td><td>".$this->sTestedRating."</td></tr>\n"; echo "<tr class=\"$sMaintainerColor\" valign=\"top\"><td><b>Maintainer’s Version</b></td><td>".$this->sTestedRelease."</td></tr>\n"; + // Download URLs if($sDownloadurls = downloadurl::display($this->iVersionId)) echo $sDownloadurls;

1 0

appdb/. README
by WineHQ 18 Jan '07

18 Jan '07

ChangeSet ID: 30884 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/17 20:25:14 Modified files: . : README Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Improve setup instructions to remind the user about mysql user and permissions that must be set so the appdb works properly Patch: http://cvs.winehq.org/patch.py?id=30884 Old revision New revision Changes Path 1.9 1.10 +9 -0 appdb/README Index: appdb/README diff -u -p appdb/README:1.9 appdb/README:1.10 --- appdb/README:1.9 18 Jan 2007 2:25:14 -0000 +++ appdb/README 18 Jan 2007 2:25:14 -0000 @@ -21,8 +21,17 @@ To install locally for testing/hacking: used in the table creation step below is "apidb", you'll have to modify these files if you change this in config.php +# NOTE: if you've changed the name of the database by changing the define of + 'APPS_DB' in include/config.php you'll have to modify the 'create database' and 'use' + entries in pretty much every file in the /tables/ directory. The recommendation is to + leave the default value of APPS_DB to keep things simple # cd tables, run ./create_tables to create the database tables +# Look in include/config.php at the 'APPS_DBUSER' and 'APPS_DBPASS' defines. + Ensure that this user and password exist in your mysql users list and that this user + has been granted 'SELECT', 'INSERT', 'UPDATE' and 'DELETE' privileges on the database + defined by the value of 'APPS_DB' in include/config.php + # Try to open up localhost/appdb, if you get a directory listing Edit your /etc/apache/httpd.conf "DirectoryIndex" to include index.php so apache will open index.php after not finding index.html/index.htm etc

1 0

appdb/. queueditems.php
by WineHQ 18 Jan '07

18 Jan '07

ChangeSet ID: 30883 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/17 19:40:12 Modified files: . : queueditems.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix display of queueditems.php by not including filter.php twice Patch: http://cvs.winehq.org/patch.py?id=30883 Old revision New revision Changes Path 1.1 1.2 +6 -10 appdb/queueditems.php Index: appdb/queueditems.php diff -u -p appdb/queueditems.php:1.1 appdb/queueditems.php:1.2 --- appdb/queueditems.php:1.1 18 Jan 2007 1:40:12 -0000 +++ appdb/queueditems.php 18 Jan 2007 1:40:12 -0000 @@ -4,20 +4,16 @@ * A list of the user's queued items */ -require("path.php"); -require(BASE."include/incl.php"); -require(BASE."include/filter.php"); -require(BASE."include/appData.php"); - -apidb_header("View Your Queued Items"); +require_once("path.php"); +require_once(BASE."include/incl.php"); +require_once(BASE."include/appData.php"); $oUser = new User($_SESSION['current']->iUserId); if(!$oUser->isLoggedIn()) -{ - echo "You need to log in to display your queued items."; - apidb_footer(); -} + util_show_error_page_and_exit("You need to log in to view your queued items."); + +apidb_header("View Your Queued Items"); /* Test data */ if($sResult = testData::listSubmittedBy($oUser->iUserId))

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2007