Made all 16<->32 HWND conversions use explicit functions instead of
implicit type casts.
Moved a lot of 16-bit functions to the new wnd16.c file.
Changed DIALOGINFO structure handling to support 32-bit handles.
diff --git a/windows/clipboard.c b/windows/clipboard.c
index cc321e1..fc969cd 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -711,15 +711,6 @@
**************************************************************************/
/**************************************************************************
- * OpenClipboard (USER.137)
- */
-BOOL16 WINAPI OpenClipboard16( HWND16 hWnd )
-{
- return OpenClipboard( hWnd );
-}
-
-
-/**************************************************************************
* OpenClipboard (USER32.@)
*
* Note: Netscape uses NULL hWnd to open the clipboard.
@@ -817,17 +808,6 @@
/**************************************************************************
- * GetClipboardOwner (USER.140)
- * FIXME: Can't return the owner if the clipbard is owned by an external app
- */
-HWND16 WINAPI GetClipboardOwner16(void)
-{
- TRACE("()\n");
- return hWndClipOwner;
-}
-
-
-/**************************************************************************
* GetClipboardOwner (USER32.@)
* FIXME: Can't return the owner if the clipbard is owned by an external app
*/
@@ -1300,16 +1280,6 @@
/**************************************************************************
- * SetClipboardViewer (USER.147)
- */
-HWND16 WINAPI SetClipboardViewer16( HWND16 hWnd )
-{
- TRACE("(%04x)\n", hWnd);
- return SetClipboardViewer( hWnd );
-}
-
-
-/**************************************************************************
* SetClipboardViewer (USER32.@)
*/
HWND WINAPI SetClipboardViewer( HWND hWnd )
@@ -1324,16 +1294,6 @@
/**************************************************************************
- * GetClipboardViewer (USER.148)
- */
-HWND16 WINAPI GetClipboardViewer16(void)
-{
- TRACE("()\n");
- return hWndViewer;
-}
-
-
-/**************************************************************************
* GetClipboardViewer (USER32.@)
*/
HWND WINAPI GetClipboardViewer(void)
@@ -1344,15 +1304,6 @@
/**************************************************************************
- * ChangeClipboardChain (USER.149)
- */
-BOOL16 WINAPI ChangeClipboardChain16(HWND16 hWnd, HWND16 hWndNext)
-{
- return ChangeClipboardChain(hWnd, hWndNext);
-}
-
-
-/**************************************************************************
* ChangeClipboardChain (USER32.@)
*/
BOOL WINAPI ChangeClipboardChain(HWND hWnd, HWND hWndNext)
@@ -1404,17 +1355,6 @@
/**************************************************************************
- * GetOpenClipboardWindow (USER.248)
- * FIXME: This wont work if an external app owns the selection
- */
-HWND16 WINAPI GetOpenClipboardWindow16(void)
-{
- TRACE("()\n");
- return hWndClipWindow;
-}
-
-
-/**************************************************************************
* GetOpenClipboardWindow (USER32.@)
* FIXME: This wont work if an external app owns the selection
*/
@@ -1426,34 +1366,17 @@
/**************************************************************************
- * GetPriorityClipboardFormat (USER.402)
- */
-INT16 WINAPI GetPriorityClipboardFormat16( UINT16 *lpPriorityList, INT16 nCount)
-{
- FIXME("(%p,%d): stub\n", lpPriorityList, nCount );
- return 0;
-}
-
-
-/**************************************************************************
* GetPriorityClipboardFormat (USER32.@)
*/
-INT WINAPI GetPriorityClipboardFormat( UINT *lpPriorityList, INT nCount )
+INT WINAPI GetPriorityClipboardFormat( UINT *list, INT nCount )
{
- int Counter;
+ int i;
TRACE("()\n");
- if(CountClipboardFormats() == 0)
- {
- return 0;
- }
+ if(CountClipboardFormats() == 0) return 0;
- for(Counter = 0; Counter <= nCount; Counter++)
- {
- if(IsClipboardFormatAvailable(*(lpPriorityList+sizeof(INT)*Counter)))
- return *(lpPriorityList+sizeof(INT)*Counter);
- }
-
+ for (i = 0; i < nCount; i++)
+ if (IsClipboardFormatAvailable( list[i] )) return list[i];
return -1;
}
