[ROSTESTS]: Add "sysicon" test back, and augment it.

svn path=/trunk/; revision=70710

rostests/CMakeLists.txt

@@ -13,7 +13,7 @@ add_subdirectory(kmtests)
 #add_subdirectory(regtests)
 add_subdirectory(rosautotest)
 add_subdirectory(tests)
-#add_subdirectory(win32)
+add_subdirectory(win32)
 add_subdirectory(winetests)
 
 

rostests/win32/CMakeLists.txt

@@ -1 +1,2 @@
 add_subdirectory(kernel32)
+add_subdirectory(user32)

rostests/win32/user32/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(sysicon)

rostests/win32/user32/sysicon/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+list(APPEND SOURCE
+    sysicon.c
+    sysicon.rc)
+
+add_executable(sysicon ${SOURCE})
+target_link_libraries(sysicon ${PSEH_LIB})
+set_module_type(sysicon win32gui UNICODE)
+add_importlibs(sysicon gdi32 user32 msvcrt kernel32)
+add_cd_file(TARGET sysicon DESTINATION reactos/bin FOR all)

rostests/win32/user32/sysicon/sysicon.c

@@ -21,21 +21,19 @@
   * about WS_EX_DLGMODALFRAME and WS_EX_TOOLWINDOW
   */
 
-#include "windows.h"
+#include <windows.h>
-#include "stdio.h"
+#include <stdio.h>
-#include "resource.h"
 
 WCHAR WndClass[] = L"sysicon_class";
+HICON hIcon = NULL, hIconSm = NULL;
 
 LRESULT CALLBACK WndProc(HWND hWnd,
                          UINT msg,
                          WPARAM wParam,
                          LPARAM lParam)
 {
-
     switch (msg)
     {
-
         case WM_PAINT:
         {
             HDC hDc;
@@ -45,11 +43,11 @@ LRESULT CALLBACK WndProc(HWND hWnd,
 
             Rect.left = 10;
             Rect.top = 10;
-	    Rect.right-=10;
+            Rect.right -= 10;
             Rect.bottom = 25;
 
             hDc = BeginPaint(hWnd, &Ps);
-			SetBkMode( hDc, TRANSPARENT );
+            SetBkMode(hDc, TRANSPARENT);
 
             DrawCaption(hWnd, hDc, &Rect, DC_GRADIENT | DC_ACTIVE | DC_TEXT | DC_ICON);
 
@@ -63,7 +61,7 @@ LRESULT CALLBACK WndProc(HWND hWnd,
             return 0;
     }
 
-	return DefWindowProc(hWnd, msg, wParam, lParam);
+    return DefWindowProcW(hWnd, msg, wParam, lParam);
 }
 
 int APIENTRY wWinMain(HINSTANCE hInst,
@@ -71,9 +69,9 @@ int APIENTRY wWinMain(HINSTANCE hInst,
                       LPWSTR lpCmdLine,
                       int nCmdShow)
 {
-	HWND hWnd1, hWnd2, hWnd3;
+    HWND hWnd1a, hWnd1b, hWnd2a, hWnd2b, hWnd3a, hWnd3b;
     MSG msg;
-	WNDCLASSEX wcx;
+    WNDCLASSEXW wcx;
     UINT result;
 
     memset(&wcx, 0, sizeof(wcx));
@@ -83,81 +81,115 @@ int APIENTRY wWinMain(HINSTANCE hInst,
     wcx.hbrBackground = (HBRUSH)COLOR_WINDOW;
     wcx.lpszClassName = WndClass;
 
-	if(!(result = RegisterClassEx(&wcx)))
+    if (!(result = RegisterClassExW(&wcx)))
-	{
         return 1;
-	}
+
+    /* Load the user icons */
+    hIcon   = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(100), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE);
+    hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE);
 
     /* WS_EX_DLGMODALFRAME */
-	hWnd1 = CreateWindowEx(WS_EX_DLGMODALFRAME,
+    hWnd1a = CreateWindowExW(WS_EX_DLGMODALFRAME,
                              WndClass,
-				L"WS_SYSMENU | WS_EX_DLGMODALFRAME",
+                             L"WS_SYSMENU | WS_EX_DLGMODALFRAME without user icon",
                              WS_CAPTION | WS_SYSMENU ,
-				CW_USEDEFAULT,
+                             CW_USEDEFAULT, CW_USEDEFAULT,
-				CW_USEDEFAULT,
+                             400, 100,
-				400,
+                             NULL, 0,
-				100,
+                             hInst, NULL);
-				NULL,
+    if (!hWnd1a)
-				0,
-				hInst,
-				NULL);
-
-	if(!hWnd1)
-	{
         return 1;
-	}
 
-	ShowWindow(hWnd1, SW_SHOW);
+    ShowWindow(hWnd1a, SW_SHOW);
-	UpdateWindow(hWnd1);
+    UpdateWindow(hWnd1a);
 
-	hWnd2 = CreateWindowEx(WS_EX_TOOLWINDOW,
+    /* WS_EX_DLGMODALFRAME */
+    hWnd1b = CreateWindowExW(WS_EX_DLGMODALFRAME,
                              WndClass,
-				L"WS_SYSMENU | WS_EX_TOOLWINDOW",
+                             L"WS_SYSMENU | WS_EX_DLGMODALFRAME with user icon",
                              WS_CAPTION | WS_SYSMENU ,
-				CW_USEDEFAULT,
+                             CW_USEDEFAULT, CW_USEDEFAULT,
-				CW_USEDEFAULT,
+                             400, 100,
-				400,
+                             NULL, 0,
-				100,
+                             hInst, NULL);
-				NULL,
-				0,
-				hInst,
-				NULL);
 
-	if(!hWnd2)
+    if (!hWnd1b)
-	{
         return 1;
-	}
 
-	ShowWindow(hWnd2, SW_SHOW);
+    ShowWindow(hWnd1b, SW_SHOW);
-	UpdateWindow(hWnd2);
+    UpdateWindow(hWnd1b);
+    SendMessageW(hWnd1b, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm);
+    SendMessageW(hWnd1b, WM_SETICON, ICON_BIG,   (LPARAM)hIcon);
 
-	hWnd3 = CreateWindowEx(0,
+    hWnd2a = CreateWindowExW(WS_EX_TOOLWINDOW,
                              WndClass,
-				L"WS_SYSMENU ",
+                             L"WS_SYSMENU | WS_EX_TOOLWINDOW without user icon",
                              WS_CAPTION | WS_SYSMENU ,
-				CW_USEDEFAULT,
+                             CW_USEDEFAULT, CW_USEDEFAULT,
-				CW_USEDEFAULT,
+                             400, 100,
-				400,
+                             NULL, 0,
-				100,
+                             hInst, NULL);
-				NULL,
+    if (!hWnd2a)
-				0,
-				hInst,
-				NULL);
-
-	if(!hWnd3)
-	{
         return 1;
-	}
 
-	ShowWindow(hWnd3, SW_SHOW);
+    ShowWindow(hWnd2a, SW_SHOW);
-	UpdateWindow(hWnd3);
+    UpdateWindow(hWnd2a);
 
-	while(GetMessage(&msg, NULL, 0, 0 ))
+    hWnd2b = CreateWindowExW(WS_EX_TOOLWINDOW,
+                             WndClass,
+                             L"WS_SYSMENU | WS_EX_TOOLWINDOW with user icon",
+                             WS_CAPTION | WS_SYSMENU ,
+                             CW_USEDEFAULT, CW_USEDEFAULT,
+                             400, 100,
+                             NULL, 0,
+                             hInst, NULL);
+    if (!hWnd2b)
+        return 1;
+
+    ShowWindow(hWnd2b, SW_SHOW);
+    UpdateWindow(hWnd2b);
+    SendMessageW(hWnd2b, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm);
+    SendMessageW(hWnd2b, WM_SETICON, ICON_BIG,   (LPARAM)hIcon);
+
+    hWnd3a = CreateWindowExW(0,
+                             WndClass,
+                             L"WS_SYSMENU without user icon",
+                             WS_CAPTION | WS_SYSMENU,
+                             CW_USEDEFAULT, CW_USEDEFAULT,
+                             400, 100,
+                             NULL, 0,
+                             hInst, NULL);
+    if (!hWnd3a)
+        return 1;
+
+    ShowWindow(hWnd3a, SW_SHOW);
+    UpdateWindow(hWnd3a);
+
+    hWnd3b = CreateWindowExW(0,
+                             WndClass,
+                             L"WS_SYSMENU with user icon",
+                             WS_CAPTION | WS_SYSMENU,
+                             CW_USEDEFAULT, CW_USEDEFAULT,
+                             400, 100,
+                             NULL, 0,
+                             hInst, NULL);
+    if (!hWnd3b)
+        return 1;
+
+    ShowWindow(hWnd3b, SW_SHOW);
+    UpdateWindow(hWnd3b);
+    SendMessageW(hWnd3b, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm);
+    SendMessageW(hWnd3b, WM_SETICON, ICON_BIG,   (LPARAM)hIcon);
+
+    while(GetMessageW(&msg, NULL, 0, 0 ))
     {
         TranslateMessage(&msg);
-		DispatchMessage(&msg);
+        DispatchMessageW(&msg);
     }
 
-	UnregisterClass(WndClass, hInst);
+    if (hIcon)   DestroyIcon(hIcon);
+    if (hIconSm) DestroyIcon(hIconSm);
+
+    UnregisterClassW(WndClass, hInst);
     return 0;
 }