Dmitry Timoshkov : win32u: Limit GDI object generation to 128.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 408569cb33b9060577b56223064e346eed1bc4c2
URL:    https://gitlab.winehq.org/wine/wine/-/commit/408569cb33b9060577b56223064e346...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Mon Jun  3 13:52:26 2024 +0300

win32u: Limit GDI object generation to 128.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>

---

 dlls/gdi32/tests/gdiobj.c | 2 ++
 dlls/win32u/gdiobj.c      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c
index b9671c0fb9f..ffe376abed7 100644
--- a/dlls/gdi32/tests/gdiobj.c
+++ b/dlls/gdi32/tests/gdiobj.c
@@ -403,6 +403,7 @@ static void test_shared_handle_entry( HGDIOBJ obj, unsigned int type, BOOL is_st
        "Type = %x, expected %x\n", entry->Type, type & 0x1f);
     ok(entry->Object, "Object = NULL\n");
     ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count);
+    ok(entry->Generation <= (sizeof(void *) == 8) ? 127 : 255, "Generation = %u\n", entry->Generation);
 }
 
 static void test_shared_handle_table(void)
@@ -445,6 +446,7 @@ static void test_shared_handle_table(void)
     ok(entry->Owner.ProcessId == GetCurrentProcessId(), "ProcessId = %x, expected %lx\n",
        entry->Owner.ProcessId, GetCurrentProcessId());
     ok(entry->Owner.Count == 0, "Count = %u\n", entry->Owner.Count);
+    ok(entry->Generation <= (sizeof(void *) == 8) ? 127 : 255, "Generation = %u\n", entry->Generation);
 
     test_shared_handle_entry( GetStockObject( WHITE_PEN ), NTGDI_OBJ_PEN, TRUE );
     test_shared_handle_entry( GetStockObject( WHITE_BRUSH ), NTGDI_OBJ_BRUSH, TRUE );
diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c
index 057988e99e9..5cf99e39ff0 100644
--- a/dlls/win32u/gdiobj.c
+++ b/dlls/win32u/gdiobj.c
@@ -743,7 +743,7 @@ HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct g
     entry->Object  = (UINT_PTR)obj;
     entry->ExtType = type >> NTGDI_HANDLE_TYPE_SHIFT;
     entry->Type    = entry->ExtType & 0x1f;
-    if (++entry->Generation == 0xff) entry->Generation = 1;
+    if (++entry->Generation == 0x80) entry->Generation = 1;
     ret = entry_to_handle( entry );
     pthread_mutex_unlock( &gdi_lock );
     TRACE( "allocated %s %p %u/%u\n", gdi_obj_type(type), ret,