lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-04 10:20:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

[NtUser] Fix Clipboard Synthesized Returns

Browse Source 
Add supported for Meta file synthesized renderings.
See CORE-12143.
This commit is contained in:
James Tabor
2019-06-01 07:23:58 -05:00
parent 848f7bb687
commit 931c72fde5
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
win32ss/user/ntuser/clipboard.c
View File

@@ -290,7 +290,7 @@ cleanup:
static VOID NTAPI
IntAddSynthesizedFormats(PWINSTATION_OBJECT pWinStaObj)
{
BOOL bHaveText, bHaveUniText, bHaveOemText, bHaveLocale, bHaveBm, bHaveDib;
BOOL bHaveText, bHaveUniText, bHaveOemText, bHaveLocale, bHaveBm, bHaveDib, bHaveMFP, bHaveEMF;
bHaveText = IntIsFormatAvailable(pWinStaObj, CF_TEXT);
bHaveOemText = IntIsFormatAvailable(pWinStaObj, CF_OEMTEXT);
@@ -298,6 +298,8 @@ IntAddSynthesizedFormats(PWINSTATION_OBJECT pWinStaObj)
bHaveLocale = IntIsFormatAvailable(pWinStaObj, CF_LOCALE);
bHaveBm = IntIsFormatAvailable(pWinStaObj, CF_BITMAP);
bHaveDib = IntIsFormatAvailable(pWinStaObj, CF_DIB);
bHaveMFP = IntIsFormatAvailable(pWinStaObj, CF_METAFILEPICT);
bHaveEMF = IntIsFormatAvailable(pWinStaObj, CF_ENHMETAFILE);
/* Add CF_LOCALE format if we have CF_TEXT, CF_OEMTEXT or CF_UNICODETEXT */
if (!bHaveLocale && (bHaveText || bHaveOemText || bHaveUniText))
@@ -334,6 +336,14 @@ IntAddSynthesizedFormats(PWINSTATION_OBJECT pWinStaObj)
if (!bHaveBm && bHaveDib)
IntAddFormatedData(pWinStaObj, CF_BITMAP, DATA_SYNTH_KRNL, FALSE, TRUE);
/* Add CF_ENHMETAFILE. Note: it is synthesized in gdi32.dll */
if (bHaveMFP && !bHaveEMF)
IntAddFormatedData(pWinStaObj, CF_ENHMETAFILE, DATA_SYNTH_USER, FALSE, TRUE);
/* Add CF_METAFILEPICT. Note: it is synthesized in gdi32.dll */
if (bHaveEMF && !bHaveMFP)
IntAddFormatedData(pWinStaObj, CF_METAFILEPICT, DATA_SYNTH_USER, FALSE, TRUE);
/* Note: We need to render the DIB or DIBV5 format as soon as possible
because pallette information may change */
if (!bHaveDib && bHaveBm)
@@ -934,6 +944,16 @@ NtUserGetClipboardData(UINT fmt, PGETCLIPBDATA pgcd)
IntSynthesizeBitmap(pWinStaObj, pElement);
break;
case CF_METAFILEPICT:
uSourceFmt = CF_ENHMETAFILE;
pElement = IntGetFormatElement(pWinStaObj, uSourceFmt);
break;
case CF_ENHMETAFILE:
uSourceFmt = CF_METAFILEPICT;
pElement = IntGetFormatElement(pWinStaObj, uSourceFmt);
break;
default:
ASSERT(FALSE);
}