July 2006 - Wine-commits - list.winehq.org

Andrew Talbot : crypt32/tests: Write-strings warnings fix.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: a0f208755e21bff7d7267e743dfa9b247861804f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a0f208755e21bff7d7267e7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jul 18 21:48:44 2006 +0100 crypt32/tests: Write-strings warnings fix. --- dlls/crypt32/tests/main.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 81a5a49..ec3d6e6 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -31,8 +31,9 @@ static void test_findAttribute(void) { PCRYPT_ATTRIBUTE ret; BYTE blobbin[] = {0x02,0x01,0x01}; + static CHAR oid[] = "1.2.3"; CRYPT_ATTR_BLOB blobs[] = { { sizeof blobbin, blobbin }, }; - CRYPT_ATTRIBUTE attr = { "1.2.3", sizeof(blobs) / sizeof(blobs[0]), blobs }; + CRYPT_ATTRIBUTE attr = { oid, sizeof(blobs) / sizeof(blobs[0]), blobs }; /* returns NULL, last error not set */ SetLastError(0xdeadbeef); @@ -71,8 +72,9 @@ static void test_findAttribute(void) static void test_findExtension(void) { PCERT_EXTENSION ret; + static CHAR oid[] = "1.2.3"; BYTE blobbin[] = {0x02,0x01,0x01}; - CERT_EXTENSION ext = { "1.2.3", TRUE, { sizeof blobbin, blobbin } }; + CERT_EXTENSION ext = { oid, TRUE, { sizeof blobbin, blobbin } }; /* returns NULL, last error not set */ SetLastError(0xdeadbeef); @@ -111,9 +113,10 @@ static void test_findExtension(void) static void test_findRDNAttr(void) { PCERT_RDN_ATTR ret; + static CHAR oid[] = "1.2.3"; BYTE bin[] = { 0x16,0x09,'J','u','a','n',' ','L','a','n','g' }; CERT_RDN_ATTR attrs[] = { - { "1.2.3", CERT_RDN_IA5_STRING, { sizeof bin, bin } }, + { oid, CERT_RDN_IA5_STRING, { sizeof bin, bin } }, }; CERT_RDN rdns[] = { { sizeof(attrs) / sizeof(attrs[0]), attrs },

1 0

Benjamin Arai : oleaut32: Update error codes for VarMod.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 911af4dce9c0b0d5984491baae7e515647519d2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=911af4dce9c0b0d5984491b… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Tue Jul 18 11:14:48 2006 -0700 oleaut32: Update error codes for VarMod. --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 642bd94..addc01c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2456,7 +2456,7 @@ static void test_VarMod(void) hexpected = DISP_E_TYPEMISMATCH; } else if((l == VT_NULL) && (r == VT_DECIMAL)) { - hexpected = DISP_E_OVERFLOW; + hexpected = E_INVALIDARG; } else if((l == VT_UNKNOWN) || ((r == VT_UNKNOWN) && lFound && lValid)) { hexpected = DISP_E_TYPEMISMATCH; @@ -2465,7 +2465,7 @@ static void test_VarMod(void) hexpected = S_OK; } else if((l == VT_DECIMAL) || ((r == VT_DECIMAL) && lFound && lValid)) { - hexpected = DISP_E_OVERFLOW; + hexpected = E_INVALIDARG; } else if(l == VT_RECORD) { hexpected = DISP_E_TYPEMISMATCH; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2de8550..3916b1c 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4600,7 +4600,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP return DISP_E_TYPEMISMATCH; case VT_DECIMAL: V_VT(result) = VT_EMPTY; - return DISP_E_OVERFLOW; + return E_INVALIDARG; case VT_ERROR: return DISP_E_TYPEMISMATCH; case VT_RECORD: @@ -4685,7 +4685,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP } else { V_VT(result) = VT_EMPTY; - return DISP_E_OVERFLOW; + return E_INVALIDARG; } case VT_ERROR: return DISP_E_TYPEMISMATCH;

1 0

Jacek Caban : mshtml: Added stub implementation of ShowHTMLDialog.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 5b37fe45bb5cefd75236e99e9e60207183b11247 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b37fe45bb5cefd75236e99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 01:17:58 2006 +0200 mshtml: Added stub implementation of ShowHTMLDialog. --- dlls/mshtml/main.c | 10 ++++++++++ dlls/mshtml/mshtml.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1bb34de..f713e27 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -224,6 +224,16 @@ HRESULT WINAPI DllInstall(BOOL bInstall, return S_OK; } +/*********************************************************************** + * ShowHTMLDialog (MSHTML.@) + */ +HRESULT WINAPI ShowHTMLDialog(HWND hwndParent, IMoniker *pMk, VARIANT *pvarArgIn, + WCHAR *pchOptions, VARIANT *pvarArgOut) +{ + FIXME("(%p %p %p %s %p)\n", hwndParent, pMk, pvarArgIn, debugstr_w(pchOptions), pvarArgOut); + return E_NOTIMPL; +} + DEFINE_GUID(CLSID_CAnchorBrowsePropertyPage, 0x3050F3BB, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CBackgroundPropertyPage, 0x3050F232, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDAnchorPropertyPage, 0x3050F1FC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/dlls/mshtml/mshtml.spec b/dlls/mshtml/mshtml.spec index 705d559..c8e1be5 100644 --- a/dlls/mshtml/mshtml.spec +++ b/dlls/mshtml/mshtml.spec @@ -9,7 +9,7 @@ @ stub PrintHTML @ stdcall RNIGetCompatibleVersion() @ stdcall RunHTMLApplication(long long str long) -@ stub ShowHTMLDialog +@ stdcall ShowHTMLDialog(ptr ptr ptr wstr ptr) @ stub ShowModalDialog @ stub ShowModelessHTMLDialog @ stub SvrTri_ClearCache

1 0

Juan Lang : crypt32: Don't return from a try block.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: dc98a727f33bdd67c8de859a6a95b6153af9f286 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc98a727f33bdd67c8de859… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jul 18 06:41:21 2006 -0700 crypt32: Don't return from a try block. --- dlls/crypt32/encode.c | 45 +++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index fc8235a..2aa6b67 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -945,32 +945,37 @@ static BOOL WINAPI CRYPT_AsnEncodeNameVa case CERT_RDN_ANY_TYPE: /* explicitly disallowed */ SetLastError(E_INVALIDARG); - return FALSE; + ret = FALSE; + break; default: FIXME("String type %ld unimplemented\n", value->dwValueType); - return FALSE; + ret = FALSE; } - CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); - bytesNeeded = 1 + lenBytes + encodedLen; - if (!pbEncoded) - *pcbEncoded = bytesNeeded; - else + if (ret) { - if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, - pcbEncoded, bytesNeeded))) + CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + encodedLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else { - if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) - pbEncoded = *(BYTE **)pbEncoded; - *pbEncoded++ = tag; - CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); - pbEncoded += lenBytes; - switch (value->dwValueType) + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) { - case CERT_RDN_NUMERIC_STRING: - case CERT_RDN_PRINTABLE_STRING: - case CERT_RDN_T61_STRING: - case CERT_RDN_IA5_STRING: - memcpy(pbEncoded, value->Value.pbData, value->Value.cbData); + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = tag; + CRYPT_EncodeLen(encodedLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + switch (value->dwValueType) + { + case CERT_RDN_NUMERIC_STRING: + case CERT_RDN_PRINTABLE_STRING: + case CERT_RDN_T61_STRING: + case CERT_RDN_IA5_STRING: + memcpy(pbEncoded, value->Value.pbData, + value->Value.cbData); + } } } }

1 0

Juan Lang : msi: Set name in ACTION_AppSearchGetSignature.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 2590c081a1e3a5a44200952797a23572a7b5e711 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2590c081a1e3a5a44200952… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jul 18 06:50:35 2006 -0700 msi: Set name in ACTION_AppSearchGetSignature. --- dlls/msi/appsearch.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index bea0c29..ce99eac 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); typedef struct tagMSISIGNATURE { - LPWSTR Name; /* NOT owned by this structure */ + LPCWSTR Name; /* NOT owned by this structure */ LPWSTR File; DWORD MinVersionMS; DWORD MinVersionLS; @@ -95,6 +95,7 @@ static UINT ACTION_AppSearchGetSignature TRACE("(package %p, sig %p)\n", package, sig); memset(sig, 0, sizeof(*sig)); + sig->Name = name; rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, name); if (rc == ERROR_SUCCESS) { @@ -951,9 +952,7 @@ UINT ACTION_AppSearch(MSIPACKAGE *packag } TRACE("Searching for Property %s, Signature_ %s\n", debugstr_w(propBuf), debugstr_w(sigBuf)); - /* This clears all the fields, so set Name and Property afterward */ rc = ACTION_AppSearchGetSignature(package, &sig, sigBuf); - sig.Name = sigBuf; if (rc == ERROR_SUCCESS) { rc = ACTION_AppSearchComponents(package, &value, &sig);

1 0

Huw Davies : msxml3: Add a test to check that selectSingleNode returns a NULL-ptr when it doesn 't find a match.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: 120e808f13d84eab358e12593b1924bb3e943d18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=120e808f13d84eab358e125… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 18 15:53:00 2006 +0100 msxml3: Add a test to check that selectSingleNode returns a NULL-ptr when it doesn't find a match. --- dlls/msxml3/tests/domdoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7cd0822..ecb8308 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -511,8 +511,10 @@ todo_wine else ok( FALSE, "no element\n"); + node = (void*)0xdeadbeef; r = IXMLDOMNode_selectSingleNode( element, (BSTR)szdl, &node ); ok( r == S_FALSE, "ret %08lx\n", r ); + ok( node == NULL, "node %p\n", node ); r = IXMLDOMNode_selectSingleNode( element, (BSTR)szbs, &node ); ok( r == S_OK, "ret %08lx\n", r ); r = IXMLDOMNode_Release( node );

1 0

Huw Davies : msxml3: removeChild should catch a NULL child node.
by Alexandre Julliard 19 Jul '06

19 Jul '06

Module: wine Branch: refs/heads/master Commit: a307901ac04595ade0be41ad5d6416b4a70fe31f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a307901ac04595ade0be41a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 18 15:54:16 2006 +0100 msxml3: removeChild should catch a NULL child node. --- dlls/msxml3/node.c | 3 +++ dlls/msxml3/tests/domdoc.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d7af878..1109a98 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -452,6 +452,9 @@ static HRESULT WINAPI xmlnode_removeChil TRACE("%p->(%p, %p)\n", This, childNode, oldChild); *oldChild = NULL; + + if(!childNode) return E_INVALIDARG; + hr = IXMLDOMNode_QueryInterface(childNode, &IID_IXMLDOMNode, (LPVOID)&child); if(FAILED(hr)) return hr; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ecb8308..aaad036 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1054,6 +1054,9 @@ static void test_removeChild(void) r = IXMLDOMNodeList_get_item( node_list, 0, &node4 ); ok( r == S_OK, "ret %08lx\n", r); + r = IXMLDOMElement_removeChild( element, NULL, &node2 ); + ok( r == E_INVALIDARG, "ret %08lx\n", r ); + r = IXMLDOMElement_removeChild( element, node4, &node2 ); ok( r == S_OK, "ret %08lx\n", r); ok( node4 == node2, "node %p node2 %p\n", node4, node2 );

1 0

appdb/include screenshot.php
by WineHQ 19 Jul '06

19 Jul '06

ChangeSet ID: 26633 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/18 19:54:56 Modified files: include : screenshot.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix centering of screenshot images on application/version pages Patch: http://cvs.winehq.org/patch.py?id=26633 Old revision New revision Changes Path 1.47 1.48 +2 -2 appdb/include/screenshot.php Index: appdb/include/screenshot.php diff -u -p appdb/include/screenshot.php:1.47 appdb/include/screenshot.php:1.48 --- appdb/include/screenshot.php:1.47 19 Jul 2006 0:54:56 -0000 +++ appdb/include/screenshot.php 19 Jul 2006 0:54:56 -0000 @@ -394,11 +394,11 @@ class Screenshot { if(!$hResult || !mysql_num_rows($hResult)) { - $sImgFile = '<img src="images/no_screenshot.png" alt="No Screenshot" />'; + $sImgFile.= '<img src="images/no_screenshot.png" alt="No Screenshot" />'; } else { $oRow = mysql_fetch_object($hResult); - $sImgFile = '<img src="appimage.php?bThumbnail=true&iId='.$oRow->id.'" alt="'.$oRow->description.'" />'; + $sImgFile.= '<img src="appimage.php?bThumbnail=true&iId='.$oRow->id.'" alt="'.$oRow->description.'" />'; } if($bFormatting)

1 0

appdb/include vote.php
by WineHQ 19 Jul '06

19 Jul '06

ChangeSet ID: 26632 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/18 19:11:40 Modified files: include : vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix voting(again) by changing all variables to use the new naming scheme Patch: http://cvs.winehq.org/patch.py?id=26632 Old revision New revision Changes Path 1.22 1.23 +39 -39 appdb/include/vote.php Index: appdb/include/vote.php diff -u -p appdb/include/vote.php:1.22 appdb/include/vote.php:1.23 --- appdb/include/vote.php:1.22 19 Jul 2006 0:11:40 -0000 +++ appdb/include/vote.php 19 Jul 2006 0:11:40 -0000 @@ -7,18 +7,18 @@ define('MAX_VOTES',3); /** * count the number of votes for appId by userId */ -function vote_count($appId, $userId = null) +function vote_count($iAppId, $iUserId = null) { - if(!$userId) + if(!$iUserId) { if($_SESSION['current']->isLoggedIn()) - $userId = $_SESSION['current']->iUserId; + $iUserId = $_SESSION['current']->iUserId; else return 0; -} + } $hResult = query_parameters("SELECT * FROM appVotes WHERE appId = '?' AND userId = '?'", - $appId, $userId); + $iAppId, $iUserId); return mysql_num_rows($hResult); } @@ -26,16 +26,16 @@ function vote_count($appId, $userId = nu /** * total votes by userId */ -function vote_count_user_total($userId = null) +function vote_count_user_total($iUserId = null) { - if(!$userId) + if(!$iUserId) { if($_SESSION['current']->isLoggedIn()) - $userId = $_SESSION['current']->iUserId; + $iUserId = $_SESSION['current']->iUserId; else return 0; } - $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $userId); + $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $iUserId); return mysql_num_rows($hResult); } @@ -43,9 +43,9 @@ function vote_count_user_total($userId = /* * total votes for appId */ -function vote_count_app_total($appId) +function vote_count_app_total($iAppId) { - $hResult = query_parameters("SELECT * FROM appVotes WHERE appId = '?'", $appId); + $hResult = query_parameters("SELECT * FROM appVotes WHERE appId = '?'", $iAppId); return mysql_num_rows($hResult); } @@ -53,55 +53,55 @@ function vote_count_app_total($appId) /** * add a vote for appId */ -function vote_add($appId, $slot, $userId = null) +function vote_add($iAppId, $iSlot, $iUserId = null) { - if(!$userId) + if(!$iUserId) { if($_SESSION['current']->isLoggedIn()) - $userId = $_SESSION['current']->iUserId; + $iUserId = $_SESSION['current']->iUserId; else return; } - if($slot > MAX_VOTES) + if($iSlot > MAX_VOTES) return; - vote_remove($slot, $userId); + vote_remove($iSlot, $iUserId); query_parameters("INSERT INTO appVotes (id, time, appId, userId, slot) - VALUES (?, ?, '?', '?', '?')", "null", "null", $appId, $userId, $slot); + VALUES (?, ?, '?', '?', '?')", "null", "null", $iAppId, $iUserId, $iSlot); } /** * remove vote for a slot */ -function vote_remove($slot, $userId = null) +function vote_remove($iSlot, $iUserId = null) { - if(!$userId) + if(!$iUserId) { if($_SESSION['current']->isLoggedIn()) - $userId = $_SESSION['current']->iUserId; + $iUserId = $_SESSION['current']->iUserId; else return; } $sQuery = "DELETE FROM appVotes WHERE userId = '?' AND slot = '?'"; - query_parameters($sQuery, $userId, $slot); + query_parameters($sQuery, $iUserId, $iSlot); } -function vote_get_user_votes($userId = null) +function vote_get_user_votes($iUserId = null) { - if(!$userId) + if(!$iUserId) { if($_SESSION['current']->isLoggedIn()) - $userId = $_SESSION['current']->iUserId; - if(!$userId) + $iUserId = $_SESSION['current']->iUserId; + if(!$iUserId) return array(); } - $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $userId); + $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $iUserId); if(!$hResult) return array(); @@ -128,7 +128,7 @@ function vote_menu() { $sAppName = Application::lookup_name($votes[$i]->appId); $str = "<a href='appview.php?iAppId=".$votes[$i]->appId."'> $sAppName</a>"; - $m->add("<input type=radio name=slot value='$i'> ".$str); + $m->add("<input type=radio name=iSlot value='$i'> ".$str); } else $m->add("<input type=radio name=iSlot value='$i'> No App Selected"); @@ -156,7 +156,7 @@ function vote_update($vars) if( !is_numeric($vars['iAppId']) OR !is_numeric($vars['iSlot'])) { if(is_numeric($vars['iAppId'])) - util_redirect_and_exit(apidb_fullurl("appview.php?iAppId=".$vars["iAppId"])); + util_redirect_and_exit(apidb_fullurl("appview.php?iAppId=".$vars['iAppId'])); else util_redirect_and_exit(apidb_fullurl("index.php")); @@ -165,37 +165,37 @@ function vote_update($vars) if($vars["sVote"]) { - addmsg("Registered vote for App #".$vars["iAppId"], "green"); - vote_add($vars["iAppId"], $vars["slot"]); - } else if($vars["sClear"]) + addmsg("Registered vote for App #".$vars['iAppId'], "green"); + vote_add($vars['iAppId'], $vars['iSlot']); + } else if($vars['sClear']) { /* see if we have a vote in this slot, if we don't there is */ /* little reason to remove it or even mention that we did anything */ - if(is_vote_in_slot($vars["slot"])) + if(is_vote_in_slot($vars['iSlot'])) { - vote_remove($vars["slot"]); - addmsg("Removed vote for App #".$vars["iAppId"], "green"); + vote_remove($vars['iSlot']); + addmsg("Removed vote for App #".$vars['iAppId'], "green"); } } - util_redirect_and_exit(apidb_fullurl("appview.php?iAppId=".$vars["iAppId"])); + util_redirect_and_exit(apidb_fullurl("appview.php?iAppId=".$vars['iAppId'])); } // tell us if there is a vote in a given slot so we don't // display incorrect information to the user or go // through the trouble of trying to remove a vote that doesn't exist -function is_vote_in_slot($slot, $userId = null) +function is_vote_in_slot($iSlot, $iUserId = null) { - if(!$userId) + if(!$iUserId) { if($_SESSION['current']->isLoggedIn()) - $userId = $_SESSION['current']->iUserId; + $iUserId = $_SESSION['current']->iUserId; else return; } $sQuery = "SELECT COUNT(*) as count from appVotes WHERE userId = '?' AND slot = '?'"; - if($hResult = query_parameters($sQuery, $userId, $slot)) + if($hResult = query_parameters($sQuery, $iUserId, $iSlot)) { $oRow = mysql_fetch_object($hResult); if($oRow->count != 0)

1 0

appdb/include html.php
by WineHQ 19 Jul '06

19 Jul '06

ChangeSet ID: 26631 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/18 19:11:11 Modified files: include : html.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove some unused functions from html.php Patch: http://cvs.winehq.org/patch.py?id=26631 Old revision New revision Changes Path 1.7 1.8 +0 -66 appdb/include/html.php Index: appdb/include/html.php diff -u -p appdb/include/html.php:1.7 appdb/include/html.php:1.8 --- appdb/include/html.php:1.7 19 Jul 2006 0:11:11 -0000 +++ appdb/include/html.php 19 Jul 2006 0:11:11 -0000 @@ -56,12 +56,6 @@ function do_html_tr($t, $arr, $class, $e return $str; } -// HTML TH -function html_th($arr, $class = "", $extra = "") -{ - return do_html_tr("th", $arr, $class, $extra); -} - // HTML TR function html_tr($arr, $class = "", $extra = "") { @@ -117,13 +111,6 @@ function html_body_end() return do_indent("</body>", -1); } - -// HTML BR -function html_br($count = 1) -{ - return do_indent(str_repeat("<br>", $count)); -} - // HTML A HREF function html_ahref($label, $url, $extra = "") { @@ -142,39 +129,6 @@ function html_ahref($label, $url, $extra } } -// HTML echo a string -function html_echo($str) -{ - return do_indent($str); -} - -// HTML B (bold) -function html_b($str) -{ - return do_indent("<b>$str</b>"); -} - -// HTML SMALL (small text) -function html_small($str) -{ - return do_indent("<small>$str</small>"); -} - -// HTML P -function html_p() -{ - return do_indent("<p>"); -} - -function html_line($thickness = 1, $colspan = 1, $color = "#000000") -{ - return do_indent("<tr><td bgcolor=\"$color\" colspan=$colspan> ". - "<img src=\"/images/blank.gif\" height=\"$thickness\" ". - "vspace=\"0\"> </td></tr>"); -} - - - function html_imagebutton($text, $url, $extra = "") { static $i = 1; @@ -325,24 +279,4 @@ function make_inx_option_list($varname, } - -function make_quality_option_list($varname, $quality) -{ - $list = array(-1, 1, 2, 3, 4, 5); - echo "<select name='$varname'>\n"; - while(list($idx, $value) = each($list)) - { - if($value == -1) - $label = "unknown"; - else - $label = $value; - - if($quality == $value) - echo "<option value=$value selected>$label\n"; - else - echo "<option value=$value>$label\n"; - } - echo "</select>\n"; -} - ?>

1 0