Author: fireball Date: Thu Jul 30 19:38:48 2009 New Revision: 42304
URL: http://svn.reactos.org/svn/reactos?rev=42304&view=rev Log: - Implement CURSORICON_Copy.
Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c
Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Thu Jul 30 19:38:48 2009 @@ -1221,26 +1221,19 @@ */ static HICON CURSORICON_Copy( HINSTANCE16 hInst16, HICON hIcon ) { -#if 0 char *ptrOld, *ptrNew; int size; - HICON16 hOld = HICON_16(hIcon); - HICON16 hNew; - - if (!(ptrOld = GlobalLock16( hOld ))) return 0; - if (hInst16 && !(hInst16 = GetExePtr( hInst16 ))) return 0; - size = GlobalSize16( hOld ); - hNew = GlobalAlloc16( GMEM_MOVEABLE, size ); - FarSetOwner16( hNew, hInst16 ); - ptrNew = GlobalLock16( hNew ); + HICON hOld = hIcon; + HICON hNew; + + if (!(ptrOld = GlobalLock( hOld ))) return 0; + size = GlobalSize( hOld ); + hNew = GlobalAlloc( GMEM_MOVEABLE, size ); + ptrNew = GlobalLock( hNew ); memcpy( ptrNew, ptrOld, size ); - GlobalUnlock16( hOld ); - GlobalUnlock16( hNew ); - return HICON_32(hNew); -#else - ERR("CURSORICON_Copy unimplemented!\n"); - return 0; -#endif + GlobalUnlock( hOld ); + GlobalUnlock( hNew ); + return hNew; }
/*************************************************************************