From dac19768fa057af98f6c28bf8afde12f36b1d49b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 20 Jul 2005 10:31:37 +0000 Subject: [PATCH] Get rid of cursoricon.h. --- dlls/oleaut32/olepicture.c | 24 +++++++++- dlls/user/cursoricon.c | 27 +++++++++++- dlls/user/exticon.c | 2 +- dlls/user/user16.c | 1 - dlls/user/user_private.h | 39 +++++++++++++++++ include/cursoricon.h | 89 -------------------------------------- 6 files changed, 89 insertions(+), 93 deletions(-) delete mode 100644 include/cursoricon.h diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2c86632d432..171ee0313cd 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -76,7 +76,6 @@ #include "wine/unicode.h" #include "wine/wingdi16.h" -#include "cursoricon.h" #ifdef HAVE_JPEGLIB_H /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ @@ -93,6 +92,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +#include "pshpack1.h" + +typedef struct { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + +#include "poppack.h" + /************************************************************************* * Declaration of implementation class */ diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index 674887e501c..5e0d02d3981 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -60,7 +60,6 @@ #include "wine/winbase16.h" #include "wine/winuser16.h" #include "wine/exception.h" -#include "cursoricon.h" #include "wine/debug.h" #include "user_private.h" @@ -68,6 +67,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(cursor); WINE_DECLARE_DEBUG_CHANNEL(icon); WINE_DECLARE_DEBUG_CHANNEL(resource); +#include "pshpack1.h" + +typedef struct { + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD xHotspot; + WORD yHotspot; + DWORD dwDIBSize; + DWORD dwDIBOffset; +} CURSORICONFILEDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONFILEDIRENTRY idEntries[1]; +} CURSORICONFILEDIR; + +#include "poppack.h" + +#define CID_RESOURCE 0x0001 +#define CID_WIN32 0x0004 +#define CID_NONSHARED 0x0008 static RECT CURSOR_ClipRect; /* Cursor clipping rect */ diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c index ee521cee477..add3c60f757 100644 --- a/dlls/user/exticon.c +++ b/dlls/user/exticon.c @@ -39,7 +39,7 @@ #include "winerror.h" #include "winuser.h" #include "wine/winbase16.h" -#include "cursoricon.h" +#include "user_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(icon); diff --git a/dlls/user/user16.c b/dlls/user/user16.c index e371bf80ac1..07bc767b1b8 100644 --- a/dlls/user/user16.c +++ b/dlls/user/user16.c @@ -31,7 +31,6 @@ #include "user_private.h" #include "win.h" #include "winproc.h" -#include "cursoricon.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(user); diff --git a/dlls/user/user_private.h b/dlls/user/user_private.h index bb828590ba3..ed83cf466f9 100644 --- a/dlls/user/user_private.h +++ b/dlls/user/user_private.h @@ -240,4 +240,43 @@ extern int SPY_Init(void); #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) #define HMODULE_32(h16) ((HMODULE)(ULONG_PTR)(h16)) +#include "pshpack1.h" + +typedef struct +{ + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; +} ICONRESDIR; + +typedef struct +{ + WORD wWidth; + WORD wHeight; +} CURSORDIR; + +typedef struct +{ union + { ICONRESDIR icon; + CURSORDIR cursor; + } ResInfo; + WORD wPlanes; + WORD wBitCount; + DWORD dwBytesInRes; + WORD wResId; +} CURSORICONDIRENTRY; + +typedef struct +{ + WORD idReserved; + WORD idType; + WORD idCount; + CURSORICONDIRENTRY idEntries[1]; +} CURSORICONDIR; + +#include "poppack.h" + +extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ); + #endif /* __WINE_USER_PRIVATE_H */ diff --git a/include/cursoricon.h b/include/cursoricon.h deleted file mode 100644 index 78fc63140cc..00000000000 --- a/include/cursoricon.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Cursor and icon definitions - * - * Copyright 1995 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __WINE_CURSORICON_H -#define __WINE_CURSORICON_H - -#include - -#include - -typedef struct -{ - BYTE bWidth; - BYTE bHeight; - BYTE bColorCount; - BYTE bReserved; -} ICONRESDIR; - -typedef struct -{ - WORD wWidth; - WORD wHeight; -} CURSORDIR; - -typedef struct -{ union - { ICONRESDIR icon; - CURSORDIR cursor; - } ResInfo; - WORD wPlanes; - WORD wBitCount; - DWORD dwBytesInRes; - WORD wResId; -} CURSORICONDIRENTRY; - -typedef struct -{ - WORD idReserved; - WORD idType; - WORD idCount; - CURSORICONDIRENTRY idEntries[1]; -} CURSORICONDIR; - -typedef struct { - BYTE bWidth; - BYTE bHeight; - BYTE bColorCount; - BYTE bReserved; - WORD xHotspot; - WORD yHotspot; - DWORD dwDIBSize; - DWORD dwDIBOffset; -} CURSORICONFILEDIRENTRY; - -typedef struct -{ - WORD idReserved; - WORD idType; - WORD idCount; - CURSORICONFILEDIRENTRY idEntries[1]; -} CURSORICONFILEDIR; - - -#include - -#define CID_RESOURCE 0x0001 -#define CID_WIN32 0x0004 -#define CID_NONSHARED 0x0008 - -extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ); - -#endif /* __WINE_CURSORICON_H */