Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backing out b=418703, caused test 40118 to fail on WINNT 5.2 qm-win2k3-01 dep unit test tinderbox

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@247139 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blassey%mozilla.com
2008-03-05 22:56:48 +00:00
parent 84bba37f5d
commit ca294d36ae
58 changed files with 551 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/xpcom/io/nsLocalFileWin.cpp
View File

@@ -108,8 +108,8 @@ private:
* HasMoreElements reads mLetter.
* GetNext advances mLetter.
*/
nsString mDrives;
const PRUnichar *mLetter;
nsCString mDrives;
const char *mLetter;
};
//----------------------------------------------------------------------------
@@ -2952,7 +2952,7 @@ nsresult nsDriveEnumerator::Init()
/* The string is null terminated */
if (!EnsureStringLength(mDrives, length+1))
return NS_ERROR_OUT_OF_MEMORY;
if (!GetLogicalDriveStringsW(length, mDrives.BeginWriting()))
if (!GetLogicalDriveStrings(length, mDrives.BeginWriting()))
return NS_ERROR_FAILURE;
mLetter = mDrives.get();
return NS_OK;
@@ -2982,9 +2982,8 @@ NS_IMETHODIMP nsDriveEnumerator::GetNext(nsISupports **aNext)
*aNext = nsnull;
return NS_OK;
}
nsString drive(mDrives);
NS_ConvertASCIItoUTF16 drive(mLetter);
mLetter += drive.Length() + 1;
nsILocalFile *file;
nsresult rv =
NS_NewLocalFile(drive, PR_FALSE, &file);