Commit: 642b947efc5358f232f9eeda98f7c8eb111acf1f - ffftp (git)

Loweynet

Commit MetaInfo

• Revision: 642b947efc5358f232f9eeda98f7c8eb111acf1f (tree)
• Zeit: 2011-10-15 16:46:37
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of copying URL to clipboard.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: mbswrapper.c
• modified: mbswrapper.h

Diff

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -1818,6 +1818,34 @@ END_ROUTINE
 	return r;
 }
 
+HANDLE SetClipboardDataM(UINT uFormat, HANDLE hMem)
+{
+	HANDLE r = NULL;
+	char* p;
+	int Length;
+	int BufferLength;
+	HGLOBAL hBufferMem;
+START_ROUTINE
+	if(uFormat == CF_TEXT)
+	{
+		p = (char*)GlobalLock(hMem);
+		Length = (int)GlobalSize(hMem);
+		BufferLength = MtoW(NULL, 0, p, Length);
+		if(hBufferMem = GlobalAlloc(GMEM_MOVEABLE, sizeof(wchar_t) * BufferLength))
+		{
+			MtoW((LPWSTR)GlobalLock(hBufferMem), BufferLength, p, Length);
+			GlobalUnlock(hBufferMem);
+			r = SetClipboardData(CF_UNICODETEXT, hBufferMem);
+		}
+		GlobalUnlock(hMem);
+		GlobalFree(hMem);
+	}
+	else
+		r = SetClipboardData(uFormat, hMem);
+END_ROUTINE
+	return r;
+}
+
 int mkdirM(const char * _Path)
 {
 	int r = 0;

--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -155,6 +155,9 @@ HWND CreateDialogParamM(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndPar
 #undef sndPlaySound
 #define sndPlaySound sndPlaySoundM
 BOOL sndPlaySoundM(LPCSTR pszSound, UINT fuSound);
+#undef SetClipboardData
+#define SetClipboardData SetClipboardDataM
+HANDLE SetClipboardDataM(UINT uFormat, HANDLE hMem);
 #undef mkdir
 #define mkdir _mkdirM
 int mkdirM(const char * _Path);