user32: Moved some 16-bit functions.
This commit is contained in:
parent
263cb44d76
commit
6e9fea22f8
|
@ -485,35 +485,6 @@ BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
* SetClipboardData (USER.141)
|
|
||||||
*/
|
|
||||||
HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData)
|
|
||||||
{
|
|
||||||
CLIPBOARDINFO cbinfo;
|
|
||||||
HANDLE16 hResult = 0;
|
|
||||||
|
|
||||||
TRACE("(%04X, %04x) !\n", wFormat, hData);
|
|
||||||
|
|
||||||
/* If it's not owned, data can only be set if the format doesn't exists
|
|
||||||
and its rendering is not delayed */
|
|
||||||
if (!CLIPBOARD_GetClipboardInfo(&cbinfo) ||
|
|
||||||
(!(cbinfo.flags & CB_OWNER) && !hData))
|
|
||||||
{
|
|
||||||
WARN("Clipboard not owned by calling task. Operation failed.\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (USER_Driver->pSetClipboardData(wFormat, hData, 0, cbinfo.flags & CB_OWNER))
|
|
||||||
{
|
|
||||||
hResult = hData;
|
|
||||||
bCBHasChanged = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* SetClipboardData (USER32.@)
|
* SetClipboardData (USER32.@)
|
||||||
*/
|
*/
|
||||||
|
@ -585,28 +556,6 @@ BOOL WINAPI IsClipboardFormatAvailable(UINT wFormat)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
|
||||||
* GetClipboardData (USER.142)
|
|
||||||
*/
|
|
||||||
HANDLE16 WINAPI GetClipboardData16(UINT16 wFormat)
|
|
||||||
{
|
|
||||||
HANDLE16 hData = 0;
|
|
||||||
CLIPBOARDINFO cbinfo;
|
|
||||||
|
|
||||||
if (!CLIPBOARD_GetClipboardInfo(&cbinfo) ||
|
|
||||||
(~cbinfo.flags & CB_OPEN))
|
|
||||||
{
|
|
||||||
WARN("Clipboard not opened by calling task.\n");
|
|
||||||
SetLastError(ERROR_CLIPBOARD_NOT_OPEN);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!USER_Driver->pGetClipboardData(wFormat, &hData, NULL)) hData = 0;
|
|
||||||
|
|
||||||
return hData;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* GetClipboardData (USER32.@)
|
* GetClipboardData (USER32.@)
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -187,15 +187,6 @@ BOOL16 WINAPI SetDeskPattern(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* SetDeskWallPaper (USER.285)
|
|
||||||
*/
|
|
||||||
BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename )
|
|
||||||
{
|
|
||||||
return SetDeskWallPaper( filename );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* SetDeskWallPaper (USER32.@)
|
* SetDeskWallPaper (USER32.@)
|
||||||
*
|
*
|
||||||
|
|
|
@ -446,6 +446,24 @@ BOOL16 WINAPI EmptyClipboard16(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**************************************************************************
|
||||||
|
* SetClipboardData (USER.141)
|
||||||
|
*/
|
||||||
|
HANDLE16 WINAPI SetClipboardData16(UINT16 wFormat, HANDLE16 hData)
|
||||||
|
{
|
||||||
|
return HANDLE_16(SetClipboardData(wFormat, HANDLE_32(hData)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**************************************************************************
|
||||||
|
* GetClipboardData (USER.142)
|
||||||
|
*/
|
||||||
|
HANDLE16 WINAPI GetClipboardData16(UINT16 wFormat)
|
||||||
|
{
|
||||||
|
return HANDLE_16(GetClipboardData(wFormat));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**************************************************************************
|
/**************************************************************************
|
||||||
* CountClipboardFormats (USER.143)
|
* CountClipboardFormats (USER.143)
|
||||||
*/
|
*/
|
||||||
|
@ -982,6 +1000,15 @@ WORD WINAPI GetFreeSystemResources16( WORD resType )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* SetDeskWallPaper (USER.285)
|
||||||
|
*/
|
||||||
|
BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename )
|
||||||
|
{
|
||||||
|
return SetDeskWallPaper( filename );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* GetClipCursor (USER.309)
|
* GetClipCursor (USER.309)
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue