Alexandre Julliard : gdi32: Move a few more gdiobj functions to gdi16.c.
Alexandre Julliard
julliard at winehq.org
Tue Feb 19 08:05:11 CST 2008
Module: wine
Branch: master
Commit: 30e2cb1616b9c5f0e888e6e58d463cf1ca34c19f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e2cb1616b9c5f0e888e6e58d463cf1ca34c19f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Feb 18 17:53:43 2008 +0100
gdi32: Move a few more gdiobj functions to gdi16.c.
---
dlls/gdi32/gdi16.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
dlls/gdi32/gdiobj.c | 74 -------------------------------------------------
2 files changed, 77 insertions(+), 74 deletions(-)
diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c
index 8e9d90d..069c528 100644
--- a/dlls/gdi32/gdi16.c
+++ b/dlls/gdi32/gdi16.c
@@ -2268,6 +2268,31 @@ BOOL16 WINAPI FastWindowFrame16( HDC16 hdc, const RECT16 *rect,
/***********************************************************************
+ * GdiInit2 (GDI.403)
+ *
+ * See "Undocumented Windows"
+ *
+ * PARAMS
+ * h1 [I] GDI object
+ * h2 [I] global data
+ */
+HANDLE16 WINAPI GdiInit216( HANDLE16 h1, HANDLE16 h2 )
+{
+ FIXME("(%04x, %04x), stub.\n", h1, h2);
+ if (h2 == 0xffff) return 0xffff; /* undefined return value */
+ return h1; /* FIXME: should be the memory handle of h1 */
+}
+
+
+/***********************************************************************
+ * FinalGdiInit (GDI.405)
+ */
+void WINAPI FinalGdiInit16( HBRUSH16 hPattern /* [in] fill pattern of desktop */ )
+{
+}
+
+
+/***********************************************************************
* CreateUserBitmap (GDI.407)
*/
HBITMAP16 WINAPI CreateUserBitmap16( INT16 width, INT16 height, UINT16 planes,
@@ -2456,6 +2481,39 @@ HRGN16 WINAPI CreatePolyPolygonRgn16( const POINT16 *points,
/***********************************************************************
+ * GdiSeeGdiDo (GDI.452)
+ */
+DWORD WINAPI GdiSeeGdiDo16( WORD wReqType, WORD wParam1, WORD wParam2,
+ WORD wParam3 )
+{
+ DWORD ret = ~0U;
+
+ switch (wReqType)
+ {
+ case 0x0001: /* LocalAlloc */
+ WARN("LocalAlloc16(%x, %x): ignoring\n", wParam1, wParam3);
+ ret = 0;
+ break;
+ case 0x0002: /* LocalFree */
+ WARN("LocalFree16(%x): ignoring\n", wParam1);
+ ret = 0;
+ break;
+ case 0x0003: /* LocalCompact */
+ WARN("LocalCompact16(%x): ignoring\n", wParam3);
+ ret = 65000; /* lie about the amount of free space */
+ break;
+ case 0x0103: /* LocalHeap */
+ WARN("LocalHeap16(): ignoring\n");
+ break;
+ default:
+ WARN("(wReqType=%04x): Unknown\n", wReqType);
+ break;
+ }
+ return ret;
+}
+
+
+/***********************************************************************
* SetObjectOwner (GDI.461)
*/
void WINAPI SetObjectOwner16( HGDIOBJ16 handle, HANDLE16 owner )
@@ -3021,6 +3079,25 @@ DWORD WINAPI GetRegionData16( HRGN16 hrgn, DWORD count, LPRGNDATA rgndata )
/***********************************************************************
+ * GdiFreeResources (GDI.609)
+ */
+WORD WINAPI GdiFreeResources16( DWORD reserve )
+{
+ return 90; /* lie about it, it shouldn't matter */
+}
+
+
+/***********************************************************************
+ * GdiSignalProc32 (GDI.610)
+ */
+WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
+ DWORD dwFlags, HMODULE16 hModule )
+{
+ return 0;
+}
+
+
+/***********************************************************************
* GetTextCharset (GDI.612)
*/
UINT16 WINAPI GetTextCharset16( HDC16 hdc )
diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c
index e05c1b9..34dafaf 100644
--- a/dlls/gdi32/gdiobj.c
+++ b/dlls/gdi32/gdiobj.c
@@ -1292,80 +1292,6 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit )
}
-/***********************************************************************
- * GdiSeeGdiDo (GDI.452)
- */
-DWORD WINAPI GdiSeeGdiDo16( WORD wReqType, WORD wParam1, WORD wParam2,
- WORD wParam3 )
-{
- DWORD ret = ~0U;
-
- switch (wReqType)
- {
- case 0x0001: /* LocalAlloc */
- WARN("LocalAlloc16(%x, %x): ignoring\n", wParam1, wParam3);
- ret = 0;
- break;
- case 0x0002: /* LocalFree */
- WARN("LocalFree16(%x): ignoring\n", wParam1);
- ret = 0;
- break;
- case 0x0003: /* LocalCompact */
- WARN("LocalCompact16(%x): ignoring\n", wParam3);
- ret = 65000; /* lie about the amount of free space */
- break;
- case 0x0103: /* LocalHeap */
- WARN("LocalHeap16(): ignoring\n");
- break;
- default:
- WARN("(wReqType=%04x): Unknown\n", wReqType);
- break;
- }
- return ret;
-}
-
-/***********************************************************************
- * GdiSignalProc32 (GDI.610)
- */
-WORD WINAPI GdiSignalProc( UINT uCode, DWORD dwThreadOrProcessID,
- DWORD dwFlags, HMODULE16 hModule )
-{
- return 0;
-}
-
-/***********************************************************************
- * GdiInit2 (GDI.403)
- *
- * See "Undocumented Windows"
- *
- * PARAMS
- * h1 [I] GDI object
- * h2 [I] global data
- */
-HANDLE16 WINAPI GdiInit216( HANDLE16 h1, HANDLE16 h2 )
-{
- FIXME("(%04x, %04x), stub.\n", h1, h2);
- if (h2 == 0xffff)
- return 0xffff; /* undefined return value */
- return h1; /* FIXME: should be the memory handle of h1 */
-}
-
-/***********************************************************************
- * FinalGdiInit (GDI.405)
- */
-void WINAPI FinalGdiInit16( HBRUSH16 hPattern /* [in] fill pattern of desktop */ )
-{
-}
-
-/***********************************************************************
- * GdiFreeResources (GDI.609)
- */
-WORD WINAPI GdiFreeResources16( DWORD reserve )
-{
- return 90; /* lie about it, it shouldn't matter */
-}
-
-
/*******************************************************************
* GetColorAdjustment [GDI32.@]
*
More information about the wine-cvs
mailing list