* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: Window classes
- * FILE: subsystems/win32/win32k/ntuser/class.c
+ * FILE: win32ss/user/ntuser/class.c
* PROGRAMER: Thomas Weidenmueller <w3seek@reactos.com>
*/
CS_GLOBALCLASS|CS_DBLCLKS,
NULL, // Use User32 procs
sizeof(ULONG)*2,
- (HICON)IDC_ARROW,
+ (HICON)OCR_NORMAL,
(HBRUSH)(COLOR_BACKGROUND),
FNID_DESKTOP,
ICLS_DESKTOP
CS_VREDRAW|CS_HREDRAW|CS_SAVEBITS,
NULL, // Use User32 procs
sizeof(LONG),
- (HICON)IDC_ARROW,
+ (HICON)OCR_NORMAL,
NULL,
FNID_SWITCH,
ICLS_SWITCH
CS_DBLCLKS|CS_SAVEBITS,
NULL, // Use User32 procs
sizeof(LONG),
- (HICON)IDC_ARROW,
+ (HICON)OCR_NORMAL,
(HBRUSH)(COLOR_MENU + 1),
FNID_MENU,
ICLS_MENU
CS_DBLCLKS|CS_VREDRAW|CS_HREDRAW|CS_PARENTDC,
NULL, // Use User32 procs
sizeof(SBWND)-sizeof(WND),
- (HICON)IDC_ARROW,
+ (HICON)OCR_NORMAL,
NULL,
FNID_SCROLLBAR,
ICLS_SCROLLBAR
CS_PARENTDC|CS_DBLCLKS,
NULL, // Use User32 procs
0,
- (HICON)IDC_ARROW,
+ (HICON)OCR_NORMAL,
0,
FNID_TOOLTIPS,
ICLS_TOOLTIPS
0,
NULL, // Use User32 procs
0,
- (HICON)IDC_ARROW,
+ (HICON)OCR_NORMAL,
0,
FNID_ICONTITLE,
ICLS_ICONTITLE
CS_GLOBALCLASS,
NULL, // Use User32 procs
0,
- (HICON)IDC_ARROW,
+ (HICON)OCR_NORMAL,
NULL,
FNID_MESSAGEWND,
ICLS_HWNDMESSAGE
IntFreeClassMenuName(Class);
}
-#ifdef NEW_CURSORICON
if (Class->spicn)
UserDereferenceObject(Class->spicn);
if (Class->spcur)
&& !(UserObjectInDestroy(UserHMGetHandle(Class->spicnSm))))
IntDestroyCurIconObject(Class->spicnSm);
}
-#else
- if (Class->hIconSmIntern)
- IntClassDestroyIcon(Class->hIconSmIntern);
-#endif
pDesk = Class->rpdeskParent;
Class->rpdeskParent = NULL;
RTL_ATOM Atom;
UNICODE_STRING ClassName;
INT i = 0;
-
+
while ( i < ICLS_DESKTOP)
{
RtlInitUnicodeString(&ClassName, ControlsList[i]);
if (IntRegisterClassAtom(&ClassName, &Atom))
{
gpsi->atomSysClass[i] = Atom;
- ERR("Reg Control Atoms 0x%x\n",Atom);
+ TRACE("Reg Control Atom %ls: 0x%x\n", ControlsList[i], Atom);
}
i++;
}
/* Simply clone the class */
RtlCopyMemory( Class, BaseClass, ClassSize);
-#ifdef NEW_CURSORICON
/* Reference our objects */
if (Class->spcur)
UserReferenceObject(Class->spcur);
UserReferenceObject(Class->spicn);
if (Class->spicnSm)
UserReferenceObject(Class->spicnSm);
-#endif
TRACE("Clone Class 0x%p hM 0x%p\n %S\n",Class, Class->hModule, Class->lpszClientUnicodeMenuName);
NewClass->rpdeskParent = NULL;
NewClass->pclsBase = NewClass;
-#ifdef NEW_CURSORICON
if (NewClass->spcur)
UserReferenceObject(NewClass->spcur);
if (NewClass->spicn)
UserReferenceObject(NewClass->spicn);
if (NewClass->spicnSm)
UserReferenceObject(NewClass->spicnSm);
-#endif
-
/* Replace the class in the list */
(void)InterlockedExchangePointer((PVOID*)*ClassLinkPtr,
/* FIXME: The class was created before being connected
to a desktop. It is possible for the desktop window,
but should it be allowed for any other case? */
- TRACE("This CLASS has no Desktop to heap from! Atom %d\n",Atom);
+ TRACE("This CLASS has no Desktop to heap from! Atom %u\n",Atom);
Class = UserHeapAlloc(ClassSize);
}
Class->cbclsExtra = lpwcx->cbClsExtra;
Class->cbwndExtra = lpwcx->cbWndExtra;
Class->hModule = lpwcx->hInstance;
-#ifdef NEW_CURSORICON
Class->spicn = lpwcx->hIcon ? UserGetCurIconObject(lpwcx->hIcon) : NULL;
Class->spcur = lpwcx->hCursor ? UserGetCurIconObject(lpwcx->hCursor) : NULL;
Class->spicnSm = lpwcx->hIconSm ? UserGetCurIconObject(lpwcx->hIconSm) : NULL;
-#else
- Class->hIcon = lpwcx->hIcon;
- Class->hIconSm = lpwcx->hIconSm;
- Class->hCursor = lpwcx->hCursor;
-#endif
////
Class->hbrBackground = lpwcx->hbrBackground;
return Class;
}
+_Success_(return)
BOOL
NTAPI
IntGetAtomFromStringOrAtom(
ASSERT(BaseClass != NULL);
- if (IntGetAtomFromStringOrAtom(ClassName,
- &Atom) &&
+ if (IntGetAtomFromStringOrAtom(ClassName, &Atom) &&
Atom != (RTL_ATOM)0)
{
PCLS Class;
FoundClass:
*BaseClass = Class;
}
+ else
+ {
+ Atom = 0;
+ }
return Atom;
}
return Ret;
}
-#ifndef NEW_CURSORICON
-BOOL FASTCALL
-IntClassDestroyIcon(HANDLE hCurIcon)
-{
- PCURICON_OBJECT CurIcon;
- BOOL Ret;
-
- if (!(CurIcon = UserGetCurIconObject(hCurIcon)))
- {
-
- ERR("hCurIcon was not found!\n");
- return FALSE;
- }
- /* Note: IntDestroyCurIconObject will remove our reference for us! */
- Ret = IntDestroyCurIconObject(CurIcon, GetW32ProcessInfo());
- if (!Ret)
- {
- ERR("hCurIcon was not Destroyed!\n");
- }
- return Ret;
-}
-#endif
-
ULONG_PTR
UserSetClassLongPtr(IN PCLS Class,
IN INT Index,
IN BOOL Ansi)
{
ULONG_PTR Ret = 0;
-#ifndef NEW_CURSORICON
- HANDLE hIconSmIntern = NULL;
-#endif
/* NOTE: For GCLP_MENUNAME and GCW_ATOM this function may raise an exception! */
}
break;
-#ifdef NEW_CURSORICON
case GCLP_HCURSOR:
{
PCURICON_OBJECT NewCursor = NULL;
break;
}
-#else
- case GCLP_HCURSOR:
- /* FIXME: Get handle from pointer to CURSOR object */
- Ret = (ULONG_PTR)Class->hCursor;
- Class->hCursor = (HANDLE)NewLong;
-
- /* Update the clones */
- Class = Class->pclsClone;
- while (Class != NULL)
- {
- Class->hCursor = (HANDLE)NewLong;
- Class = Class->pclsNext;
- }
- break;
-#endif
// MSDN:
// hIconSm, A handle to a small icon that is associated with the window class.
// the hIcon member for an icon of the appropriate size to use as the small icon.
//
case GCLP_HICON:
-#ifdef NEW_CURSORICON
{
PCURICON_OBJECT NewIcon = NULL;
PCURICON_OBJECT NewSmallIcon = NULL;
}
break;
}
-#else
- /* FIXME: Get handle from pointer to ICON object */
- Ret = (ULONG_PTR)Class->hIcon;
- if (Class->hIcon == (HANDLE)NewLong) break;
- if (Ret && Class->hIconSmIntern)
- {
- IntClassDestroyIcon(Class->hIconSmIntern);
- Class->CSF_flags &= ~CSF_CACHEDSMICON;
- Class->hIconSmIntern = NULL;
- }
- if (NewLong && !Class->hIconSm)
- {
- hIconSmIntern = Class->hIconSmIntern = co_IntCopyImage( (HICON)NewLong, IMAGE_ICON,
- UserGetSystemMetrics( SM_CXSMICON ),
- UserGetSystemMetrics( SM_CYSMICON ), 0 );
- Class->CSF_flags |= CSF_CACHEDSMICON;
- }
- Class->hIcon = (HANDLE)NewLong;
-
- /* Update the clones */
- Class = Class->pclsClone;
- while (Class != NULL)
- {
- Class->hIcon = (HANDLE)NewLong;
- Class->hIconSmIntern = hIconSmIntern;
- Class = Class->pclsNext;
- }
- break;
-#endif
case GCLP_HICONSM:
-#ifdef NEW_CURSORICON
{
PCURICON_OBJECT NewSmallIcon = NULL;
BOOLEAN NewIconFromCache = FALSE;
}
}
break;
-#else
- /* FIXME: Get handle from pointer to ICON object */
- Ret = (ULONG_PTR)Class->hIconSm;
- if (Class->hIconSm == (HANDLE)NewLong) break;
- if (Class->CSF_flags & CSF_CACHEDSMICON)
- {
- if (Class->hIconSmIntern)
- {
- IntClassDestroyIcon(Class->hIconSmIntern);
- Class->hIconSmIntern = NULL;
- }
- Class->CSF_flags &= ~CSF_CACHEDSMICON;
- }
- if (Class->hIcon && !Class->hIconSmIntern)
- {
- hIconSmIntern = Class->hIconSmIntern = co_IntCopyImage( Class->hIcon, IMAGE_ICON,
- UserGetSystemMetrics( SM_CXSMICON ),
- UserGetSystemMetrics( SM_CYSMICON ), 0 );
-
- if (hIconSmIntern) Class->CSF_flags |= CSF_CACHEDSMICON;
- //// FIXME: Very hacky here but it passes the tests....
- Ret = 0; // Fixes 1009
- }
- Class->hIconSm = (HANDLE)NewLong;
-
- /* Update the clones */
- Class = Class->pclsClone;
- while (Class != NULL)
- {
- Class->hIconSm = (HANDLE)NewLong;
- Class->hIconSmIntern = hIconSmIntern;
- Class = Class->pclsNext;
- }
- break;
-#endif
case GCLP_HMODULE:
Ret = (ULONG_PTR)Class->hModule;
lpwcx->cbClsExtra = Class->cbclsExtra;
lpwcx->cbWndExtra = Class->cbwndExtra;
-#ifdef NEW_CURSORICON
lpwcx->hIcon = Class->spicn ? UserHMGetHandle(Class->spicn) : NULL;
lpwcx->hCursor = Class->spcur ? UserHMGetHandle(Class->spcur) : NULL;
lpwcx->hIconSm = Class->spicnSm ? UserHMGetHandle(Class->spicnSm) : NULL;
-#else
- lpwcx->hIcon = Class->hIcon; /* FIXME: Get handle from pointer */
- lpwcx->hCursor = Class->hCursor; /* FIXME: Get handle from pointer */
- /* FIXME: Get handle from pointer */
- lpwcx->hIconSm = Class->hIconSm ? Class->hIconSm : Class->hIconSmIntern;
-#endif
lpwcx->hbrBackground = Class->hbrBackground;
/* Copy non-string to user first. */
wc.cbClsExtra = 0;
wc.cbWndExtra = DefaultServerClasses[i].ExtraBytes;
wc.hIcon = NULL;
- wc.hCursor = DefaultServerClasses[i].hCursor;
+
+ //// System Cursors should be initilized!!!
+ wc.hCursor = NULL;
+ if (DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL)
+ {
+ if (SYSTEMCUR(ARROW) == NULL)
+ {
+ ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n");
+ }
+ else
+ {
+ wc.hCursor = UserHMGetHandle(SYSTEMCUR(ARROW));
+ }
+ }
+
hBrush = DefaultServerClasses[i].hBrush;
if (hBrush <= (HBRUSH)COLOR_MENUBAR)
{
Offset,
dwNewLong,
Ansi);
+ switch(Offset)
+ {
+ case GCLP_HICONSM:
+ case GCLP_HICON:
+ {
+ if (Ret && Ret != dwNewLong)
+ UserPaintCaption(Window, DC_ICON);
+ }
+ }
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
// If null instance use client.
if (!hInstance) hInstance = hModClient;
- TRACE("GetClassInfo(%wZ, %p)\n", SafeClassName, hInstance);
+ TRACE("GetClassInfo(%wZ, %p)\n", &SafeClassName, hInstance);
/* NOTE: Need exclusive lock because getting the wndproc might require the
creation of a call procedure handle */
projects / reactos.git / blobdiff