wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-06 07:48:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1584473 - Fix several issues

Browse source 
* Fix undefined HRESULT codes in class CMapiApi in MapiApi.cpp.
* Fix doubled up sub-expressions in MIME and MAPI.
* Remove broken/unused morkRowCellCursor::MakeCell()

Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-11 02:08:59 -05:00 • committed by Roy Tam
commit e7cf7528e2
6 changed files with 3 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
db/mork/public/mdb.h
View file

@ -2305,14 +2305,6 @@ public:
NS_IMETHOD GetRow(nsIMdbEnv* ev, nsIMdbRow** acqRow) = 0;
// } ----- end attribute methods -----
// { ----- begin cell creation methods -----
NS_IMETHOD MakeCell( // get cell at current pos in the row
nsIMdbEnv* ev, // context
mdb_column* outColumn, // column for this particular cell
mdb_pos* outPos, // position of cell in row sequence
nsIMdbCell** acqCell) = 0; // the cell at inPos
// } ----- end cell creation methods -----
// { ----- begin cell seeking methods -----
NS_IMETHOD SeekCell( // same as SetRow() followed by MakeCell()
nsIMdbEnv* ev, // context

36
db/mork/src/morkRowCellCursor.cpp
View file

@ -183,42 +183,6 @@ morkRowCellCursor::GetRow(nsIMdbEnv* mev, nsIMdbRow** acqRow)
}
// } ----- end attribute methods -----
// { ----- begin cell creation methods -----
NS_IMETHODIMP
morkRowCellCursor::MakeCell( // get cell at current pos in the row
nsIMdbEnv* mev, // context
mdb_column* outColumn, // column for this particular cell
mdb_pos* outPos, // position of cell in row sequence
nsIMdbCell** acqCell)
{
nsresult outErr = NS_OK;
nsIMdbCell* outCell = 0;
mdb_pos pos = 0;
mdb_column col = 0;
morkRow* row = 0;
morkEnv* ev = morkEnv::FromMdbEnv(mev);
if ( ev )
{
pos = mCursor_Pos;
morkCell* cell = row->CellAt(ev, pos);
if ( cell )
{
col = cell->GetColumn();
outCell = row->AcquireCellHandle(ev, cell, col, pos);
}
outErr = ev->AsErr();
}
if ( acqCell )
*acqCell = outCell;
if ( outPos )
*outPos = pos;
if ( outColumn )
*outColumn = col;
return outErr;
}
// } ----- end cell creation methods -----
// { ----- begin cell seeking methods -----
NS_IMETHODIMP
morkRowCellCursor::SeekCell( // same as SetRow() followed by MakeCell()

8
db/mork/src/morkRowCellCursor.h
View file

@ -59,14 +59,6 @@ public: // morkRowCellCursor construction & destruction
NS_IMETHOD GetRow(nsIMdbEnv* ev, nsIMdbRow** acqRow) override;
// } ----- end attribute methods -----
// { ----- begin cell creation methods -----
NS_IMETHOD MakeCell( // get cell at current pos in the row
nsIMdbEnv* ev, // context
mdb_column* outColumn, // column for this particular cell
mdb_pos* outPos, // position of cell in row sequence
nsIMdbCell** acqCell) override; // the cell at inPos
// } ----- end cell creation methods -----
// { ----- begin cell seeking methods -----
NS_IMETHOD SeekCell( // same as SetRow() followed by MakeCell()
nsIMdbEnv* ev, // context

9
mailnews/import/outlook/src/MapiApi.cpp
View file

@ -887,7 +887,7 @@ BOOL CMapiApi::IterateStores(CMapiFolderList& stores)
if (!m_lpSession) {
MAPI_TRACE0("IterateStores called before session is open\n");
m_lastError = -1;
m_lastError = E_UNEXPECTED;
return FALSE;
}
@ -1124,7 +1124,7 @@ CMsgStore * CMapiApi::FindMessageStore(ULONG cbEid, LPENTRYID lpEid)
{
if (!m_lpSession) {
MAPI_TRACE0("FindMessageStore called before session is open\n");
m_lastError = -1;
m_lastError = E_UNEXPECTED;
return NULL;
}
@ -1409,9 +1409,6 @@ void CMapiApi::ReportLongProp(const char *pTag, LPSPropValue pVal)
else if (pVal && (PROP_TYPE(pVal->ulPropTag) == PT_ERROR)) {
MAPI_TRACE1("%s {Error retrieving property}\n", pTag);
}
else if (pVal && (PROP_TYPE(pVal->ulPropTag) == PT_ERROR)) {
MAPI_TRACE1("%s {Error retrieving property}\n", pTag);
}
else {
MAPI_TRACE1("%s invalid value, expecting long\n", pTag);
}
@ -1843,7 +1840,7 @@ BOOL CMapiFolderContents::SetUpIter(void)
}
if (ulObjType != MAPI_FOLDER) {
m_lastError = -1;
m_lastError = E_UNEXPECTED;
MAPI_TRACE0("CMapiFolderContents - bad object type, not a folder.\n");
return FALSE;
}

1
mailnews/mime/emitters/nsEmitterUtils.cpp
View file

@ -54,7 +54,6 @@ EmitThisHeaderForPrefSetting(int32_t dispType, const char *header)
(!strcmp(header, HEADER_FOLLOWUP_TO)) ||
(!strcmp(header, HEADER_CC)) ||
(!strcmp(header, HEADER_ORGANIZATION)) ||
(!strcmp(header, HEADER_REPLY_TO)) ||
(!strcmp(header, HEADER_BCC))
)
return true;

1
mailnews/mime/src/mimemsig.cpp
View file

@ -599,7 +599,6 @@ MimeMultipartSigned_emit_child (MimeObject *obj)
obj->options->headers != MimeHeadersCitation &&
obj->options->write_html_p &&
obj->options->output_fn &&
obj->options->headers != MimeHeadersCitation &&
sig->crypto_closure)
{
// Calling crypto_generate_html may trigger wanted side effects,