ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Make the test pass for GetClassName called on a small buffer.

This commit is contained in:
Dmitry Timoshkov 2006-10-23 19:06:59 +09:00 committed by Alexandre Julliard
parent 20c40e0659
commit 33d5da5bda
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/user/class.c
View File

@ -63,6 +63,7 @@ typedef struct tagCLASS
static struct list class_list = LIST_INIT( class_list ); static struct list class_list = LIST_INIT( class_list );
#define CLASS_OTHER_PROCESS ((CLASS *)1) #define CLASS_OTHER_PROCESS ((CLASS *)1)
#define MAX_ATOM_LEN 255 /* from dlls/kernel32/atom.c */
/*********************************************************************** /***********************************************************************
* get_class_ptr * get_class_ptr
@ -956,9 +957,20 @@ DWORD WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval )
*/ */
INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
{ {
INT ret = GlobalGetAtomNameA( GetClassLongA( hwnd, GCW_ATOM ), buffer, count ); char tmpbuf[MAX_ATOM_LEN + 1];
INT ret;
TRACE("%p %s %x\n",hwnd, debugstr_a(buffer), count); TRACE("%p %p %d\n", hwnd, buffer, count);
if (count <= 0) return 0;
ret = GlobalGetAtomNameA( GetClassLongW( hwnd, GCW_ATOM ), tmpbuf, MAX_ATOM_LEN + 1 );
if (ret)
{
ret = min(count - 1, ret);
memcpy(buffer, tmpbuf, ret);
buffer[ret] = 0;
}
return ret; return ret;
} }
@ -968,9 +980,20 @@ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count )
*/ */
INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count )
{ {
INT ret = GlobalGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), buffer, count ); WCHAR tmpbuf[MAX_ATOM_LEN + 1];
INT ret;
TRACE("%p %s %x\n",hwnd, debugstr_w(buffer), count); TRACE("%p %p %d\n", hwnd, buffer, count);
if (count <= 0) return 0;
ret = GlobalGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), tmpbuf, MAX_ATOM_LEN + 1 );
if (ret)
{
ret = min(count - 1, ret);
memcpy(buffer, tmpbuf, ret * sizeof(WCHAR));
buffer[ret] = 0;
}
return ret; return ret;
} }

4
dlls/user/tests/class.c
View File

@ -414,8 +414,8 @@ static void test_instances(void)
DestroyWindow( hwnd2 ); DestroyWindow( hwnd2 );
r = GetClassName( hwnd, buffer, 4 ); r = GetClassName( hwnd, buffer, 4 );
todo_wine ok( r == 3, "return wrong\n"); ok( r == 3, "expected 3, got %d\n", r );
ok( !strcmp( buffer, "__t"), "name wrong\n"); ok( !strcmp( buffer, "__t"), "name wrong: %s\n", buffer );
ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" ); ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" );