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

user32: RegisterClassEx should check for invalid cbSize field.

This commit is contained in:
Dylan Smith 2010-07-18 00:59:34 -04:00 committed by Alexandre Julliard
parent be3073fce1
commit 41dbacdc71
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/user32/class.c
View File

@ -486,7 +486,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc )
CLASS *classPtr; CLASS *classPtr;
HINSTANCE instance; HINSTANCE instance;
if (wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 ||
wc->hInstance == user32_module) /* we can't register a class for user32 */ wc->hInstance == user32_module) /* we can't register a class for user32 */
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );
@ -535,7 +535,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc )
CLASS *classPtr; CLASS *classPtr;
HINSTANCE instance; HINSTANCE instance;
if (wc->cbClsExtra < 0 || wc->cbWndExtra < 0 || if (wc->cbSize != sizeof(*wc) || wc->cbClsExtra < 0 || wc->cbWndExtra < 0 ||
wc->hInstance == user32_module) /* we can't register a class for user32 */ wc->hInstance == user32_module) /* we can't register a class for user32 */
{ {
SetLastError( ERROR_INVALID_PARAMETER ); SetLastError( ERROR_INVALID_PARAMETER );

20
dlls/user32/tests/class.c
View File

@ -315,6 +315,7 @@ static void check_thread_instance( const char *name, HINSTANCE inst, HINSTANCE i
static void test_instances(void) static void test_instances(void)
{ {
WNDCLASSA cls, wc; WNDCLASSA cls, wc;
WNDCLASSEXA wcexA;
HWND hwnd, hwnd2; HWND hwnd, hwnd2;
const char *name = "__test__"; const char *name = "__test__";
HINSTANCE kernel32 = GetModuleHandleA("kernel32"); HINSTANCE kernel32 = GetModuleHandleA("kernel32");
@ -348,6 +349,25 @@ static void test_instances(void)
check_thread_instance( name, kernel32, kernel32, kernel32 ); check_thread_instance( name, kernel32, kernel32, kernel32 );
ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" ); ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" );
ZeroMemory(&wcexA, sizeof(wcexA));
wcexA.lpfnWndProc = DefWindowProcA;
wcexA.lpszClassName = "__classex_test__";
SetLastError(0xdeadbeef);
wcexA.cbSize = sizeof(wcexA) - 1;
ok( ((RegisterClassExA( &wcexA ) == 0) && (GetLastError() == ERROR_INVALID_PARAMETER)),
"Succeeded with invalid number of cbSize bytes\n");
SetLastError(0xdeadbeef);
wcexA.cbSize = sizeof(wcexA) + 1;
ok( ((RegisterClassExA( &wcexA ) == 0) && (GetLastError() == ERROR_INVALID_PARAMETER)),
"Succeeded with invalid number of cbSize bytes\n");
SetLastError(0xdeadbeef);
wcexA.cbSize = sizeof(wcexA);
ok( RegisterClassExA( &wcexA ), "Failed with valid number of cbSize bytes\n");
wcexA.cbSize = 0xdeadbeef;
ok( GetClassInfoEx(main_module, wcexA.lpszClassName, &wcexA), "GetClassInfoEx failed\n");
ok( wcexA.cbSize == 0xdeadbeef, "GetClassInfoEx returned wrong cbSize value %d\n", wcexA.cbSize);
UnregisterClassA(wcexA.lpszClassName, main_module);
/* Bug 2631 - Supplying an invalid number of bytes fails */ /* Bug 2631 - Supplying an invalid number of bytes fails */
cls.cbClsExtra = 0; cls.cbClsExtra = 0;
cls.cbWndExtra = -1; cls.cbWndExtra = -1;