Changeset 4576 for trunk/include/win

Timestamp:

Nov 9, 2000, 7:23:42 PM (25 years ago)

Author:

sandervl

Message:

header update

Location:

trunk/include/win

Files:

• bitmap.h (modified) (5 diffs)
• cursoricon.h (modified) (4 diffs)
• wine/winuser16.h (modified) (4 diffs)

trunk/include/win/bitmap.h

@@ -1 @@
-/* $Id: bitmap.h,v 1.1 1999-05-24 20:19:08 ktk Exp $ */
+/* $Id: bitmap.h,v 1.2 2000-11-09 18:23:22 sandervl Exp $ */
 
 /*
@@ -10 +10 @@
 #define __WINE_BITMAP_H
 
-#include "gdi.h"
+////#include "gdi.h"
 
 struct tagGDI_BITMAP_DRIVER;
@@ -26 +26 @@
 } DDBITMAP;
 
+#if 0
   /* GDI logical bitmap object */
 typedef struct tagBITMAPOBJ
@@ -52 +53 @@
 extern INT   BITMAP_GetObject( BITMAPOBJ * bmp, INT count, LPVOID buffer );
 extern BOOL  BITMAP_DeleteObject( HBITMAP16 hbitmap, BITMAPOBJ * bitmap );
+#endif
+
 extern INT   BITMAP_GetWidthBytes( INT width, INT depth );
 extern HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, UINT loadflags );
@@ -62 +65 @@
 extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, DWORD *width,
                               int *height, WORD *bpp, WORD *compr );
-extern void DIB_UpdateDIBSection( DC *dc, BOOL toDIB );
-extern void DIB_DeleteDIBSection( BITMAPOBJ *bmp );
-extern void DIB_SelectDIBSection( DC *dc, BITMAPOBJ *bmp );
+//extern void DIB_UpdateDIBSection( DC *dc, BOOL toDIB );
+//extern void DIB_DeleteDIBSection( BITMAPOBJ *bmp );
+//extern void DIB_SelectDIBSection( DC *dc, BITMAPOBJ *bmp );
 extern void DIB_FixColorsToLoadflags(BITMAPINFO * bmi, UINT loadflags,
   BYTE pix);

trunk/include/win/cursoricon.h

@@ -1 @@
-/* $Id: cursoricon.h,v 1.2 1999-11-28 12:33:11 sandervl Exp $ */
+/* $Id: cursoricon.h,v 1.3 2000-11-09 18:23:22 sandervl Exp $ */
 
 /*
@@ -66 +66 @@
 } CURSORICONFILEDIR;
 
+typedef struct tagCURSORICONINFO
+{
+    POINT16 ptHotSpot;
+    WORD    nWidth;
+    WORD    nHeight;
+    WORD    nWidthBytes;
+    BYTE    bPlanes;
+    BYTE    bBitsPerPixel;
+    HBITMAP hColorBmp;
+} CURSORICONINFO;
+
 
 #include "poppack.h"
@@ -82 +93 @@
                                 BOOL fCursor, UINT loadflags);
 
-extern WORD WINAPI CURSORICON_Destroy( HGLOBAL16 handle, UINT16 flags );
+extern WORD WIN32API CURSORICON_Destroy( HGLOBAL handle, UINT flags );
 
 extern void CURSORICON_FreeModuleIcons( HMODULE hModule );
@@ -89 +100 @@
                        INT iDesiredCX, INT iDesiredCY, 
                        UINT nFlags);
+
+HGLOBAL WIN32API CreateCursorIconIndirect( HINSTANCE hInstance,
+                                           CURSORICONINFO *info,
+                                           LPCVOID lpANDbits,
+                                           LPCVOID lpXORbits );
+
+HGLOBAL CURSORICON_ExtCopy(HGLOBAL Handle, UINT nType,
+                           INT iDesiredCX, INT iDesiredCY,
+                           UINT nFlags);
                                     
 #endif /* __WINE_CURSORICON_H */

trunk/include/win/wine/winuser16.h

@@ -1 @@
-/* $Id: winuser16.h,v 1.6 2000-08-30 13:56:39 sandervl Exp $ */
+/* $Id: winuser16.h,v 1.7 2000-11-09 18:23:42 sandervl Exp $ */
 #ifndef __WINE_WINE_WINUSER16_H
 #define __WINE_WINE_WINUSER16_H
@@ -117 +117 @@
 /* Cursors / Icons */
 
+#if 0
 typedef struct tagCURSORICONINFO
 {
@@ -126 +127 @@
     BYTE    bBitsPerPixel;
 } CURSORICONINFO;
+#endif
 
 typedef struct {
@@ -583 +585 @@
 VOID        WINAPI CascadeChildWindows16(HWND16,WORD);
 INT16       WINAPI CloseComm16(INT16);
-HGLOBAL16   WINAPI CreateCursorIconIndirect16(HINSTANCE16,CURSORICONINFO*,
-                                            LPCVOID,LPCVOID);
+//HGLOBAL16   WINAPI CreateCursorIconIndirect16(HINSTANCE16,CURSORICONINFO*,
+//                                            LPCVOID,LPCVOID);
 BOOL16      WINAPI DCHook16(HDC16,WORD,DWORD,LPARAM);
 BOOL16      WINAPI DlgDirSelect16(HWND16,LPSTR,INT16);