reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 06:30:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

user: Moved Get/SetClassLong16 to wnd16.c.

Browse Source
This commit is contained in:
Alexandre Julliard 2006-05-10 17:08:05 +02:00
parent 56220c246b
commit a9c5fd2612
2 changed files with 41 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
dlls/user/class.c
View File

@ -53,7 +53,6 @@ typedef struct tagCLASS
INT cbClsExtra; /* Class extra bytes */ INT cbClsExtra; /* Class extra bytes */
INT cbWndExtra; /* Window extra bytes */ INT cbWndExtra; /* Window extra bytes */
LPWSTR menuName; /* Default menu name (Unicode followed by ASCII) */ LPWSTR menuName; /* Default menu name (Unicode followed by ASCII) */
SEGPTR segMenuName; /* Default menu name as SEGPTR */
HINSTANCE hInstance; /* Module that created the task */ HINSTANCE hInstance; /* Module that created the task */
HICON hIcon; /* Default icon */ HICON hIcon; /* Default icon */
HICON hIconSm; /* Default small icon */ HICON hIconSm; /* Default small icon */
@ -144,18 +143,6 @@ static BOOL set_server_info( HWND hwnd, INT offset, LONG newval )
} }
/***********************************************************************
* CLASS_GetProc
*
* Get the class winproc for a given proc type
*/
static WNDPROC16 CLASS_GetProc16( CLASS *classPtr )
{
if (classPtr->winprocA) return WINPROC_GetProc16( classPtr->winprocA, FALSE );
else return WINPROC_GetProc16( classPtr->winprocW, TRUE );
}
/*********************************************************************** /***********************************************************************
* CLASS_GetProc * CLASS_GetProc
* *
@ -176,29 +163,6 @@ static WNDPROC CLASS_GetProc( CLASS *classPtr, BOOL unicode )
} }
/***********************************************************************
* CLASS_SetProc16
*
* Set the class winproc for a given proc type.
* Returns the previous window proc.
*/
static void CLASS_SetProc16( CLASS *classPtr, WNDPROC16 newproc )
{
WNDPROC proc = WINPROC_AllocProc16( newproc );
if (WINPROC_IsUnicode( proc, FALSE ))
{
classPtr->winprocA = 0;
classPtr->winprocW = proc;
}
else
{
classPtr->winprocA = proc;
classPtr->winprocW = 0;
}
}
/*********************************************************************** /***********************************************************************
* CLASS_SetProc * CLASS_SetProc
* *
@ -234,20 +198,6 @@ inline static LPSTR CLASS_GetMenuNameA( CLASS *classPtr )
} }
/***********************************************************************
* CLASS_GetMenuName16
*
* Get the menu name as a SEGPTR.
*/
inline static SEGPTR CLASS_GetMenuName16( CLASS *classPtr )
{
if (!HIWORD(classPtr->menuName)) return (SEGPTR)classPtr->menuName;
if (!classPtr->segMenuName)
classPtr->segMenuName = MapLS( CLASS_GetMenuNameA(classPtr) );
return classPtr->segMenuName;
}
/*********************************************************************** /***********************************************************************
* CLASS_GetMenuNameW * CLASS_GetMenuNameW
* *
@ -266,8 +216,6 @@ inline static LPWSTR CLASS_GetMenuNameW( CLASS *classPtr )
*/ */
static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name ) static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name )
{ {
UnMapLS( classPtr->segMenuName );
classPtr->segMenuName = 0;
if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName );
if (HIWORD(name)) if (HIWORD(name))
{ {
@ -288,8 +236,6 @@ static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name )
*/ */
static void CLASS_SetMenuNameW( CLASS *classPtr, LPCWSTR name ) static void CLASS_SetMenuNameW( CLASS *classPtr, LPCWSTR name )
{ {
UnMapLS( classPtr->segMenuName );
classPtr->segMenuName = 0;
if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName );
if (HIWORD(name)) if (HIWORD(name))
{ {
@ -318,7 +264,6 @@ static void CLASS_FreeClass( CLASS *classPtr )
list_remove( &classPtr->entry ); list_remove( &classPtr->entry );
if (classPtr->hbrBackground > (HBRUSH)(COLOR_GRADIENTINACTIVECAPTION + 1)) if (classPtr->hbrBackground > (HBRUSH)(COLOR_GRADIENTINACTIVECAPTION + 1))
DeleteObject( classPtr->hbrBackground ); DeleteObject( classPtr->hbrBackground );
UnMapLS( classPtr->segMenuName );
HeapFree( GetProcessHeap(), 0, classPtr->menuName ); HeapFree( GetProcessHeap(), 0, classPtr->menuName );
HeapFree( GetProcessHeap(), 0, classPtr ); HeapFree( GetProcessHeap(), 0, classPtr );
USER_Unlock(); USER_Unlock();
@ -741,40 +686,6 @@ WORD WINAPI GetClassWord( HWND hwnd, INT offset )
} }
/***********************************************************************
* GetClassLong (USER.131)
*/
LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset )
{
CLASS *class;
LONG ret;
HWND hwnd = (HWND)(ULONG_PTR)hwnd16; /* no need for full handle */
TRACE("%p %d\n",hwnd, offset);
switch( offset )
{
case GCLP_WNDPROC:
if (!(class = get_class_ptr( hwnd, FALSE ))) return 0;
if (class == CLASS_OTHER_PROCESS) break;
ret = (LONG)CLASS_GetProc16( class );
release_class_ptr( class );
return ret;
case GCLP_MENUNAME:
if (!(class = get_class_ptr( hwnd, FALSE ))) return 0;
if (class == CLASS_OTHER_PROCESS) break;
ret = (LONG)CLASS_GetMenuName16( class );
release_class_ptr( class );
return ret;
default:
return GetClassLongA( hwnd, offset );
}
FIXME( "offset %d not supported on other process window %p\n", offset, hwnd );
SetLastError( ERROR_INVALID_HANDLE );
return 0;
}
/*********************************************************************** /***********************************************************************
* GetClassLongW (USER32.@) * GetClassLongW (USER32.@)
*/ */
@ -954,34 +865,6 @@ WORD WINAPI SetClassWord( HWND hwnd, INT offset, WORD newval )
} }
/***********************************************************************
* SetClassLong (USER.132)
*/
LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval )
{
CLASS *class;
LONG retval;
HWND hwnd = (HWND)(ULONG_PTR)hwnd16; /* no need for full handle */
TRACE("%p %d %lx\n", hwnd, offset, newval);
switch(offset)
{
case GCLP_WNDPROC:
if (!(class = get_class_ptr( hwnd, TRUE ))) return 0;
retval = (LONG)CLASS_GetProc16( class );
CLASS_SetProc16( class, (WNDPROC16)newval );
release_class_ptr( class );
return retval;
case GCLP_MENUNAME:
newval = (LONG)MapSL( newval );
/* fall through */
default:
return SetClassLongA( hwnd, offset, newval );
}
}
/*********************************************************************** /***********************************************************************
* SetClassLongW (USER32.@) * SetClassLongW (USER32.@)
*/ */

41
dlls/user/wnd16.c
View File

@ -661,6 +661,47 @@ WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval )
} }
/***********************************************************************
* GetClassLong (USER.131)
*/
LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset )
{
LONG_PTR ret = GetClassLongA( WIN_Handle32(hwnd16), offset );
switch( offset )
{
case GCLP_WNDPROC:
return (LONG_PTR)WINPROC_GetProc16( (WNDPROC)ret, FALSE );
case GCLP_MENUNAME:
return MapLS( (void *)ret ); /* leak */
default:
return ret;
}
}
/***********************************************************************
* SetClassLong (USER.132)
*/
LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval )
{
switch( offset )
{
case GCLP_WNDPROC:
{
WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval );
WNDPROC old_proc = (WNDPROC)SetClassLongA( WIN_Handle32(hwnd16), offset, (LONG_PTR)new_proc );
return (LONG)WINPROC_GetProc16( (WNDPROC)old_proc, FALSE );
}
case GCLP_MENUNAME:
newval = (LONG)MapSL( newval );
/* fall through */
default:
return SetClassLongA( WIN_Handle32(hwnd16), offset, newval );
}
}
/************************************************************************** /**************************************************************************
* GetWindowWord (USER.133) * GetWindowWord (USER.133)
*/ */