Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-07 18:56:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix the remaining wine class tests. Left with more questions.

Browse source 
svn path=/trunk/; revision=60590
This commit is contained in:
James Tabor 2013-10-09 20:25:25 +00:00
parent 85a4547655
commit 649f13b3f2
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
reactos/win32ss/user/ntuser/class.c
View file

@ -999,10 +999,16 @@ IntCreateClass(IN CONST WNDCLASSEXW* lpwcx,
Class->hModule = lpwcx->hInstance; Class->hModule = lpwcx->hInstance;
Class->hIcon = lpwcx->hIcon; Class->hIcon = lpwcx->hIcon;
Class->hIconSm = lpwcx->hIconSm; Class->hIconSm = lpwcx->hIconSm;
Class->hIconSmIntern = lpwcx->hIcon && !lpwcx->hIconSm ? //// Sure W2k3 does not do this..... wine test inconclusive.
co_IntCopyImage( lpwcx->hIcon, IMAGE_ICON, if (lpwcx->hIcon && !lpwcx->hIconSm)
{
Class->hIconSmIntern = co_IntCopyImage( lpwcx->hIcon, IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ), UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; UserGetSystemMetrics( SM_CYSMICON ), 0 );
ERR("IntCreateClass hIconSmIntern %p\n",Class->hIconSmIntern);
Class->CSF_flags |= CSF_CACHEDSMICON;
}
////
Class->hCursor = lpwcx->hCursor; Class->hCursor = lpwcx->hCursor;
Class->hbrBackground = lpwcx->hbrBackground; Class->hbrBackground = lpwcx->hbrBackground;
@ -1865,33 +1871,26 @@ UserSetClassLongPtr(IN PCLS Class,
/* FIXME: Get handle from pointer to ICON object */ /* FIXME: Get handle from pointer to ICON object */
Ret = (ULONG_PTR)Class->hIconSm; Ret = (ULONG_PTR)Class->hIconSm;
if (Class->hIconSm == (HANDLE)NewLong) break; if (Class->hIconSm == (HANDLE)NewLong) break;
/* if (Ret && !NewLong)
{
hIconSmIntern = Class->hIconSmIntern = Class->hIcon ? co_IntCopyImage( Class->hIcon, IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ), 0 ) : NULL;
Class->CSF_flags |= CSF_CACHEDSMICON;
}
else if (!Ret && NewLong && Class->hIconSmIntern)
{
IntClassDestroyIcon(Class->hIconSmIntern);
Class->CSF_flags &= ~CSF_CACHEDSMICON;
Class->hIconSmIntern = NULL;
}
*/
if (Class->CSF_flags & CSF_CACHEDSMICON) if (Class->CSF_flags & CSF_CACHEDSMICON)
{ {
if (Class->hIconSmIntern) IntClassDestroyIcon(Class->hIconSmIntern); if (Class->hIconSmIntern)
Class->CSF_flags &= ~CSF_CACHEDSMICON; {
IntClassDestroyIcon(Class->hIconSmIntern);
Class->hIconSmIntern = NULL; Class->hIconSmIntern = NULL;
Ret = 0; }
Class->CSF_flags &= ~CSF_CACHEDSMICON;
} }
if (Class->hIcon && !Class->hIconSmIntern) if (Class->hIcon && !Class->hIconSmIntern)
{ {
hIconSmIntern = Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON, hIconSmIntern = Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ), UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ), 0 ); UserGetSystemMetrics( SM_CYSMICON ), 0 );
if (hIconSmIntern) Class->CSF_flags |= CSF_CACHEDSMICON; if (hIconSmIntern) Class->CSF_flags |= CSF_CACHEDSMICON;
//// FIXME: Very hacky here but it passes the tests....
//// We should not kill a users handle!!!
if (Class->hIconSm) IntClassDestroyIcon(Class->hIconSm); // Fixes 1013
Ret = 0; // Fixes 1009
} }
Class->hIconSm = (HANDLE)NewLong; Class->hIconSm = (HANDLE)NewLong;