mirror of
https://github.com/reactos/wine.git
synced 2025-02-20 12:50:53 +00:00
user32/tests: Do not cast the (IDC|IDI|RT)_* defines to LPSTR.
This commit is contained in:
parent
898d795fdd
commit
e202baabd5
@ -80,7 +80,7 @@ static BOOL init_procs(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "MainWindowClass";
|
||||
|
@ -402,7 +402,7 @@ START_TEST(dce)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "cache_class";
|
||||
|
@ -872,7 +872,7 @@ static void InitialFocusTest (void)
|
||||
HANDLE hTemplate;
|
||||
DLGTEMPLATE* pTemplate;
|
||||
|
||||
hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", (LPSTR)RT_DIALOG);
|
||||
hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG", RT_DIALOG);
|
||||
hTemplate = LoadResource(g_hinst, hResource);
|
||||
pTemplate = LockResource(hTemplate);
|
||||
|
||||
|
@ -1973,7 +1973,7 @@ static BOOL RegisterWindowClasses (void)
|
||||
test3.cbWndExtra = 0;
|
||||
test3.hInstance = hinst;
|
||||
test3.hIcon = 0;
|
||||
test3.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
test3.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
test3.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
test3.lpszMenuName = NULL;
|
||||
test3.lpszClassName = szEditTest3Class;
|
||||
|
@ -339,9 +339,9 @@ static void test_Input_whitebox(void)
|
||||
wclass.style = CS_HREDRAW | CS_VREDRAW;
|
||||
wclass.lpfnWndProc = WndProc;
|
||||
wclass.hInstance = hInstance;
|
||||
wclass.hIcon = LoadIconA( 0, (LPSTR)IDI_APPLICATION );
|
||||
wclass.hCursor = LoadCursorA( NULL, IDC_ARROW);
|
||||
wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1);
|
||||
wclass.hIcon = LoadIconA( 0, IDI_APPLICATION );
|
||||
wclass.hCursor = LoadCursorA( NULL, IDC_ARROW );
|
||||
wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 );
|
||||
wclass.lpszMenuName = 0;
|
||||
wclass.cbClsExtra = 0;
|
||||
wclass.cbWndExtra = 0;
|
||||
|
@ -287,7 +287,7 @@ static void test_ownerdraw(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandle(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursor(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursor(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "main_window_class";
|
||||
|
@ -1852,9 +1852,9 @@ static void test_menu_input(void) {
|
||||
wclass.style = CS_HREDRAW | CS_VREDRAW;
|
||||
wclass.lpfnWndProc = WndProc;
|
||||
wclass.hInstance = hInstance;
|
||||
wclass.hIcon = LoadIconA( 0, (LPSTR)IDI_APPLICATION );
|
||||
wclass.hCursor = LoadCursorA( NULL, (LPSTR)IDC_ARROW);
|
||||
wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1);
|
||||
wclass.hIcon = LoadIconA( 0, IDI_APPLICATION );
|
||||
wclass.hCursor = LoadCursorA( NULL, IDC_ARROW );
|
||||
wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 );
|
||||
wclass.lpszMenuName = 0;
|
||||
wclass.cbClsExtra = 0;
|
||||
wclass.cbWndExtra = 0;
|
||||
@ -1933,9 +1933,9 @@ static void test_menu_hilitemenuitem( void )
|
||||
wclass.style = CS_HREDRAW | CS_VREDRAW;
|
||||
wclass.lpfnWndProc = WndProc;
|
||||
wclass.hInstance = GetModuleHandleA( NULL );
|
||||
wclass.hIcon = LoadIconA( 0, (LPSTR)IDI_APPLICATION );
|
||||
wclass.hCursor = LoadCursorA( NULL, (LPSTR)IDC_ARROW);
|
||||
wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1);
|
||||
wclass.hIcon = LoadIconA( 0, IDI_APPLICATION );
|
||||
wclass.hCursor = LoadCursorA( NULL, IDC_ARROW );
|
||||
wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 );
|
||||
wclass.lpszMenuName = 0;
|
||||
wclass.cbClsExtra = 0;
|
||||
wclass.cbWndExtra = 0;
|
||||
|
@ -3211,7 +3211,7 @@ static BOOL mdi_RegisterWindowClasses(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "MDI_frame_class";
|
||||
@ -7094,7 +7094,7 @@ static BOOL RegisterWindowClasses(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "TestWindowClass";
|
||||
@ -11078,7 +11078,7 @@ static void test_menu_messages(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "TestMenuClass";
|
||||
|
@ -2697,9 +2697,9 @@ START_TEST(sysparams)
|
||||
wc.lpfnWndProc = SysParamsTestWndProc;
|
||||
wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
|
||||
wc.hInstance = hInstance;
|
||||
wc.hIcon = LoadIconA( 0, (LPSTR)IDI_APPLICATION );
|
||||
wc.hCursor = LoadCursorA( 0, (LPSTR)IDC_ARROW );
|
||||
wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1 );
|
||||
wc.hIcon = LoadIconA( 0, IDI_APPLICATION );
|
||||
wc.hCursor = LoadCursorA( 0, IDC_ARROW );
|
||||
wc.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 );
|
||||
wc.lpszMenuName = 0;
|
||||
wc.cbClsExtra = 0;
|
||||
wc.cbWndExtra = 0;
|
||||
|
@ -696,7 +696,7 @@ static BOOL RegisterWindowClasses(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "MainWindowClass";
|
||||
@ -709,7 +709,7 @@ static BOOL RegisterWindowClasses(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "ToolWindowClass";
|
||||
@ -1692,7 +1692,7 @@ static BOOL mdi_RegisterWindowClasses(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "MDI_parent_Class";
|
||||
@ -1737,9 +1737,9 @@ static void test_icons(void)
|
||||
{
|
||||
WNDCLASSEXA cls;
|
||||
HWND hwnd;
|
||||
HICON icon = LoadIconA(0, (LPSTR)IDI_APPLICATION);
|
||||
HICON icon2 = LoadIconA(0, (LPSTR)IDI_QUESTION);
|
||||
HICON small_icon = LoadImageA(0, (LPSTR)IDI_APPLICATION, IMAGE_ICON,
|
||||
HICON icon = LoadIconA(0, IDI_APPLICATION);
|
||||
HICON icon2 = LoadIconA(0, IDI_QUESTION);
|
||||
HICON small_icon = LoadImageA(0, IDI_APPLICATION, IMAGE_ICON,
|
||||
GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED );
|
||||
HICON res;
|
||||
|
||||
@ -1749,9 +1749,9 @@ static void test_icons(void)
|
||||
cls.cbClsExtra = 0;
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = 0;
|
||||
cls.hIcon = LoadIconA(0, (LPSTR)IDI_HAND);
|
||||
cls.hIcon = LoadIconA(0, IDI_HAND);
|
||||
cls.hIconSm = small_icon;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "IconWindowClass";
|
||||
@ -3567,7 +3567,7 @@ static void test_redrawnow(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "RedrawWindowClass";
|
||||
@ -3736,7 +3736,7 @@ static void test_csparentdc(void)
|
||||
clsMain.cbWndExtra = 0;
|
||||
clsMain.hInstance = GetModuleHandleA(0);
|
||||
clsMain.hIcon = 0;
|
||||
clsMain.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
clsMain.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
clsMain.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
clsMain.lpszMenuName = NULL;
|
||||
clsMain.lpszClassName = "ParentDcMainWindowClass";
|
||||
@ -3752,7 +3752,7 @@ static void test_csparentdc(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "ParentDcWindowClass";
|
||||
@ -4249,7 +4249,7 @@ static void test_CreateWindow(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandle(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "MinMax_WndClass";
|
||||
@ -4660,7 +4660,7 @@ static void test_GetUpdateRect(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = classNameA;
|
||||
@ -5083,7 +5083,7 @@ static void test_fullscreen(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandle(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "fullscreen_class";
|
||||
@ -5296,7 +5296,7 @@ static void test_thick_child_size(HWND parentWindow)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = className;
|
||||
|
@ -53,7 +53,7 @@ static void register_class(void)
|
||||
cls.cbWndExtra = 0;
|
||||
cls.hInstance = GetModuleHandleA(0);
|
||||
cls.hIcon = 0;
|
||||
cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
|
||||
cls.hCursor = LoadCursorA(0, IDC_ARROW);
|
||||
cls.hbrBackground = GetStockObject(WHITE_BRUSH);
|
||||
cls.lpszMenuName = NULL;
|
||||
cls.lpszClassName = "WinStationClass";
|
||||
|
Loading…
x
Reference in New Issue
Block a user