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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 33d5da5bda5530f46d1c6c15f9edc6f373204393
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=33d5da5bda5530f46d1c6c15f9...

Author: Dmitry Timoshkov 
Date:   Mon Oct 23 19:06:59 2006 +0900

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

---

dlls/user/class.c       |   31 +++++++++++++++++++++++++++----
 dlls/user/tests/class.c |    4 ++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/dlls/user/class.c b/dlls/user/class.c
index b158ece..855bbe9 100644
--- a/dlls/user/class.c
+++ b/dlls/user/class.c
@@ -63,6 +63,7 @@ typedef struct tagCLASS
 static struct list class_list = LIST_INIT( class_list );

#define CLASS_OTHER_PROCESS ((CLASS *)1)
+#define MAX_ATOM_LEN 255 /* from dlls/kernel32/atom.c */

/***********************************************************************
  *           get_class_ptr
@@ -956,9 +957,20 @@ DWORD WINAPI SetClassLongA( HWND hwnd, I
  */
 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;
 }

@@ -968,9 +980,20 @@ INT WINAPI GetClassNameA( HWND hwnd, LPS
  */
 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;
 }

diff --git a/dlls/user/tests/class.c b/dlls/user/tests/class.c
index 5a6a979..d3c173a 100644
--- a/dlls/user/tests/class.c
+++ b/dlls/user/tests/class.c
@@ -414,8 +414,8 @@ static void test_instances(void)
     DestroyWindow( hwnd2 );

r = GetClassName( hwnd, buffer, 4 );
-    todo_wine ok( r == 3, "return wrong\n");
-    ok( !strcmp( buffer, "__t"), "name wrong\n");
+    ok( r == 3, "expected 3, got %d\n", r );
+    ok( !strcmp( buffer, "__t"), "name wrong: %s\n", buffer );

ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" );