wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 403428 - fix drag and drop of URL formats from external apps without breaking internal URL drops (Drag & Drop of Favicon from Location bar (and link from web page) to personal toolbar broken). r=ere,sr=neil

Browse Source
This commit is contained in:
ted.mielczarek@gmail.com 2007-11-17 05:22:13 -08:00
parent 9efc20152c
commit 4ee5c082bb
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,8 +111,6 @@ UINT nsClipboard::GetFormat(const char* aMimeStr)
#endif
else if (strcmp(aMimeStr, kNativeHTMLMime) == 0)
format = CF_HTML;
else if (strcmp(aMimeStr, kURLMime) == 0)
format = ::RegisterClipboardFormat(CFSTR_INETURLW);
else
format = ::RegisterClipboardFormat(aMimeStr);
@ -616,8 +614,13 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject * aDataObject,
if ( !dataFound ) {
if ( strcmp(flavorStr, kUnicodeMime) == 0 )
dataFound = FindUnicodeFromPlainText ( aDataObject, anIndex, &data, &dataLen );
else if ( strcmp(flavorStr, kURLMime) == 0 )
dataFound = FindURLFromLocalFile ( aDataObject, anIndex, &data, &dataLen );
else if ( strcmp(flavorStr, kURLMime) == 0 ) {
// drags from other windows apps expose the native
// CFSTR_INETURL{A,W} flavor
dataFound = FindURLFromNativeURL ( aDataObject, anIndex, &data, &dataLen );
if ( !dataFound )
dataFound = FindURLFromLocalFile ( aDataObject, anIndex, &data, &dataLen );
}
} // if we try one last ditch effort to find our data
// Hopefully by this point we've found it and can go about our business
@ -706,7 +709,7 @@ nsClipboard :: FindPlatformHTML ( IDataObject* inDataObject, UINT inIndex, void*
//
// FindURLFromLocalFile
// FindUnicodeFromPlainText
//
// we are looking for text/unicode and we failed to find it on the clipboard first,
// try again with text/plain. If that is present, convert it to unicode.
@ -789,6 +792,34 @@ nsClipboard :: FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, v
return dataFound;
} // FindURLFromLocalFile
//
// FindURLFromNativeURL
//
// we are looking for a URL and couldn't find it using our internal
// URL flavor, so look for it using the native URL flavor,
// CF_INETURLSTRW (We don't handle CF_INETURLSTRA currently)
//
PRBool
nsClipboard :: FindURLFromNativeURL ( IDataObject* inDataObject, UINT inIndex, void** outData, PRUint32* outDataLen )
{
PRBool dataFound = PR_FALSE;
void* tempOutData = nsnull;
PRUint32 tempDataLen = 0;
nsresult loadResult = GetNativeDataOffClipboard(inDataObject, inIndex, ::RegisterClipboardFormat(CFSTR_INETURLW), &tempOutData, &tempDataLen);
if ( NS_SUCCEEDED(loadResult) && tempOutData ) {
nsDependentString urlString(static_cast<PRUnichar*>(tempOutData));
// the internal mozilla URL format, text/x-moz-url, contains
// URL\ntitle. Since we don't actually have a title here,
// just repeat the URL to fake it.
*outData = ToNewUnicode(urlString + NS_LITERAL_STRING("\n") + urlString);
*outDataLen = nsCRT::strlen(static_cast<PRUnichar*>(*outData)) * sizeof(PRUnichar);
nsMemory::Free(tempOutData);
dataFound = PR_TRUE;
}
return dataFound;
} // FindURLFromNativeURL
//
// ResolveShortcut

1
widget/src/windows/nsClipboard.h
View File

@ -85,6 +85,7 @@ protected:
static PRBool IsInternetShortcut ( const nsAString& inFileName ) ;
static PRBool FindURLFromLocalFile ( IDataObject* inDataObject, UINT inIndex, void** outData, PRUint32* outDataLen ) ;
static PRBool FindURLFromNativeURL ( IDataObject* inDataObject, UINT inIndex, void** outData, PRUint32* outDataLen ) ;
static PRBool FindUnicodeFromPlainText ( IDataObject* inDataObject, UINT inIndex, void** outData, PRUint32* outDataLen ) ;
static PRBool FindPlatformHTML ( IDataObject* inDataObject, UINT inIndex, void** outData, PRUint32* outDataLen );
static void ResolveShortcut ( nsILocalFile* inFileName, nsACString& outURL ) ;