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

another attempt to stop copying data so much.

Browse Source
This commit is contained in:
pinkerton%netscape.com 1999-09-04 20:04:26 +00:00
parent 867ed4a72d
commit 8862e68dd0
4 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@
#include "nsITransferable.h"
#include "nsCOMPtr.h"
#include "nsISupportsPrimitives.h"
#include "nsXPIDLString.h"
#include "nsIWidget.h"
#include "nsIComponentManager.h"
@ -75,24 +76,23 @@ nsClipboard::~nsClipboard()
}
//-------------------------------------------------------------------------
UINT nsClipboard::GetFormat(const nsString & aMimeStr)
UINT nsClipboard::GetFormat(const char* aMimeStr)
{
nsCAutoString mimeStr ( CBufDescriptor(NS_CONST_CAST(char*,aMimeStr), PR_TRUE, PL_strlen(aMimeStr)+1) );
UINT format = 0;
if (aMimeStr.Equals(kTextMime)) {
if (mimeStr.Equals(kTextMime)) {
format = CF_TEXT;
} else if (aMimeStr.Equals(kUnicodeMime)) {
} else if (mimeStr.Equals(kUnicodeMime)) {
format = CF_UNICODETEXT;
} else if (aMimeStr.Equals(kJPEGImageMime)) {
} else if (mimeStr.Equals(kJPEGImageMime)) {
format = CF_DIB;
} else if (aMimeStr.Equals(kDropFilesMime)) {
} else if (mimeStr.Equals(kDropFilesMime)) {
format = CF_HDROP;
} else {
char * str = aMimeStr.ToNewCString();
format = ::RegisterClipboardFormat(str);
delete[] str;
format = ::RegisterClipboardFormat(aMimeStr);
}
printf("nsClipboard::GetFormat [%s] 0x%x\n", aMimeStr.ToNewCString(), format);
printf("nsClipboard::GetFormat [%s] 0x%x\n", aMimeStr, format);
return format;
}
@ -146,8 +146,8 @@ nsresult nsClipboard::SetupNativeDataObject(nsITransferable * aTransferable, IDa
dfList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
if ( currentFlavor ) {
char* flavorStr;
currentFlavor->ToString(&flavorStr);
nsXPIDLCString flavorStr;
currentFlavor->ToString(getter_Copies(flavorStr));
UINT format = GetFormat(flavorStr);
// check here to see if we can the data back from global member
@ -158,8 +158,6 @@ nsresult nsClipboard::SetupNativeDataObject(nsITransferable * aTransferable, IDa
// Now tell the native IDataObject about both the DataFlavor and
// the native data format
dObj->AddDataFlavor(flavorStr, &fe);
delete [] flavorStr;
}
}
@ -537,8 +535,8 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject * aDataObject,
flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
if ( currentFlavor ) {
char* flavorStr;
currentFlavor->ToString(&flavorStr);
nsXPIDLCString flavorStr;
currentFlavor->ToString(getter_Copies(flavorStr));
UINT format = GetFormat(flavorStr);
void * data;
@ -561,8 +559,6 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject * aDataObject,
break;
}
}
delete [] flavorStr;
}
}
return res;
@ -650,8 +646,8 @@ NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
flavorList->GetElementAt ( i, getter_AddRefs(genericFlavor) );
nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
if ( currentFlavor ) {
char* flavorStr;
currentFlavor->ToString(&flavorStr);
nsXPIDLCString flavorStr;
currentFlavor->ToString(getter_Copies(flavorStr));
UINT format = GetFormat(flavorStr);
void * data;
@ -669,8 +665,7 @@ NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
}
// Now, delete the memory that was created by the transferable
delete [] data;
delete [] flavorStr;
nsCRT::free ( data );
}
}

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

@ -58,7 +58,7 @@ public:
static nsresult GetGlobalData(HGLOBAL aHGBL, void ** aData, PRUint32 * aLen);
static UINT GetFormat(const nsString & aMimeStr);
static UINT GetFormat(const char* aMimeStr);
protected:

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

@ -463,13 +463,13 @@ CLSID nsDataObj::GetClassID() const
//-----------------------------------------------------
// Registers a the DataFlavor/FE pair
//-----------------------------------------------------
void nsDataObj::AddDataFlavor(const nsString & aDataFlavor, LPFORMATETC aFE)
void nsDataObj::AddDataFlavor(const char* aDataFlavor, LPFORMATETC aFE)
{
// These two lists are the mapping to and from data flavors and FEs
// Later, OLE will tell us it's needs a certain type of FORMATETC (text, unicode, etc)
// so we will look up data flavor that corresponds to the FE
// and then ask the transferable for that type of data
mDataFlavors->AppendElement(new nsString(aDataFlavor));
mDataFlavors->AppendElement(new nsCAutoString(aDataFlavor));
m_enumFE->AddFE(aFE);
}

2
widget/src/windows/nsDataObj.h
View File

@ -60,7 +60,7 @@ class nsDataObj : public IDataObject
virtual HRESULT SetMetafilePict(FORMATETC& FE, STGMEDIUM& STM);
// support for clipboard
void AddDataFlavor(const nsString & aDataFlavor, LPFORMATETC aFE);
void AddDataFlavor(const char* aDataFlavor, LPFORMATETC aFE);
void SetTransferable(nsITransferable * aTransferable);
virtual HRESULT GetText(nsString * aDF, FORMATETC& FE, STGMEDIUM& STM);