Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 776902 - vc11 nullptr fix for nsFilePicker. r=bbondy

Browse Source
This commit is contained in:
Jim Mathies 2012-07-24 15:07:41 -05:00
parent e0afc045d4
commit 635260737a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widget/windows/nsFilePicker.cpp
View File

@ -539,7 +539,7 @@ nsFilePicker::ShowXPFolderPicker(const nsString& aInitialDir)
browserInfo.lpszTitle = mTitle.get();
browserInfo.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS;
browserInfo.hwndOwner = adtw.get();
browserInfo.iImage = nsnull;
browserInfo.iImage = 0;
browserInfo.lParam = reinterpret_cast<LPARAM>(this);
if (!aInitialDir.IsEmpty()) {
@ -548,8 +548,8 @@ nsFilePicker::ShowXPFolderPicker(const nsString& aInitialDir)
browserInfo.lParam = (LPARAM) aInitialDir.get();
browserInfo.lpfn = &BrowseCallbackProc;
} else {
browserInfo.lParam = nsnull;
browserInfo.lpfn = nsnull;
browserInfo.lParam = 0;
browserInfo.lpfn = NULL;
}
LPITEMIDLIST list = ::SHBrowseForFolderW(&browserInfo);
@ -777,7 +777,7 @@ nsFilePicker::ShowXPFilePicker(const nsString& aInitialDir)
CommDlgExtendedError() == FNERR_INVALIDFILENAME) {
// Probably the default file name is too long or contains illegal
// characters. Try again, without a starting file name.
ofn.lpstrFile[0] = nsnull;
ofn.lpstrFile[0] = L'\0';
result = FilePickerWrapper(&ofn, PICKER_TYPE_SAVE);
}
}