Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 48291, r=saari. For internal formats that are not CF_TEXT, eg text/html,

Browse Source 
treat them like they are unicode and do the fiddling required for win98.
This commit is contained in:
pinkerton%netscape.com 2000-08-17 04:19:14 +00:00
parent ed3fbaf39c
commit 2ee7406a8e
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
widget/src/windows/nsClipboard.cpp
View File

@ -535,8 +535,24 @@ nsresult nsClipboard::GetNativeDataOffClipboard(IDataObject * aDataObject, UINT
default: {
if ( fe.cfFormat == fileDescriptorFlavor || fe.cfFormat == fileFlavor ) {
NS_WARNING ( "Mozilla doesn't yet understand how to read this type of file flavor" );
} else
result = GetGlobalData(stm.hGlobal, aData, aLen);
}
else {
// Get the data out of the global data handle. The size we return
// should not include the null because the other platforms don't
// use nulls, so just return the length we get back from strlen(),
// since we know CF_UNICODETEXT is null terminated. Recall that GetGlobalData()
// returns the size of the allocated buffer, not the size of the data
// (on 98, these are not the same) so we can't use that.
//
// NOTE: we are assuming that anything that falls into this default case
// is unicode. As we start to get more kinds of binary data, this
// may become an incorrect assumption. Stay tuned.
PRUint32 allocLen = 0;
if ( NS_SUCCEEDED(GetGlobalData(stm.hGlobal, aData, &allocLen)) ) {
*aLen = nsCRT::strlen(NS_REINTERPRET_CAST(PRUnichar*, *aData)) * 2;
result = NS_OK;
}
}
} break;
} // switch
} break;

7
widget/src/windows/nsDataObj.cpp
View File

@ -580,9 +580,12 @@ HRESULT nsDataObj::GetText(nsCAutoString * aDataFlavor, FORMATETC& aFE, STGMEDIU
return ResultFromScode(S_OK);
}
}
else if ( aFE.cfFormat == CF_UNICODETEXT )
else {
// we assume that any data that isn't CF_TEXT is unicode. This may
// be an erroneous assumption, but is true so far.
allocLen += sizeof(PRUnichar);
}
hGlobalMemory = (HGLOBAL)::GlobalAlloc(GMEM_MOVEABLE, allocLen);
// Copy text to Global Memory Area