Forward QueryServiceLockStatusA/W to services.exe.

[reactos.git] / rosapps / devutils / zoomin / main.c

diff --git a/rosapps/devutils/zoomin/main.c b/rosapps/devutils/zoomin/main.c
index fb795a0..85b496c 100644 (file)
--- a/rosapps/devutils/zoomin/main.c
+++ b/rosapps/devutils/zoomin/main.c
@@ -25,7 +25,7 @@
 #include <tchar.h>
 #include <stdlib.h>
 #include <stdio.h>
-    
+
 #include "main.h"
 #include "framewnd.h"
 
@@ -34,25 +34,17 @@
 // Global Variables:
 //
 
-HINSTANCE hInst;
 HWND hFrameWnd;
 HMENU hMenuFrame;
 
 TCHAR szTitle[MAX_LOADSTRING];
-TCHAR szFrameClass[MAX_LOADSTRING];
 
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-//
 //   FUNCTION: InitInstance(HANDLE, int)
 //
-//   PURPOSE: Saves instance handle and creates main window
-//
-//   COMMENTS:
-//
-//        In this function, we save the instance handle in a global variable and
-//        create and display the main program window.
+//   PURPOSE: creates main window
 //
 
 BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
@@ -66,9 +58,9 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
         hInstance,
         LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ZOOMIN)),
         LoadCursor(0, IDC_ARROW),
-        0/*hbrBackground*/,
+        0,//(HBRUSH)(COLOR_BTNFACE+1),
         0/*lpszMenuName*/,
-        szFrameClass,
+        WNDCLASS_ZOOMIN,
         (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_ZOOMIN), IMAGE_ICON,
             GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED)
     };
@@ -76,9 +68,9 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 
        hMenuFrame = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_ZOOMIN_MENU));
 
-    hFrameWnd = CreateWindowEx(0, (LPCTSTR)(int)hFrameWndClass, szTitle,
-                    WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE,
-                    CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+    hFrameWnd = CreateWindowEx(0, (LPCTSTR)UlongToPtr(hFrameWndClass), szTitle,
+                    WS_OVERLAPPEDWINDOW | WS_EX_CLIENTEDGE | WS_VSCROLL,
+                    CW_USEDEFAULT, CW_USEDEFAULT, 250, 250,
                     NULL, hMenuFrame, hInstance, NULL/*lpParam*/);
 
     if (!hFrameWnd) {
@@ -87,6 +79,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 
     ShowWindow(hFrameWnd, nCmdShow);
     UpdateWindow(hFrameWnd);
+
     return TRUE;
 }
 
@@ -97,36 +90,30 @@ void ExitInstance(void)
     DestroyMenu(hMenuFrame);
 }
 
-
 int APIENTRY WinMain(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
                      LPSTR     lpCmdLine,
                      int       nCmdShow)
 {
     MSG msg;
-    HACCEL hAccel;
+       HACCEL hAccel;
 
     // Initialize global strings
     LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-    LoadString(hInstance, IDC_ZOOMIN, szFrameClass, MAX_LOADSTRING);
-    
-    // Store instance handle in our global variable
-    hInst = hInstance;
 
     // Perform application initialization:
     if (!InitInstance(hInstance, nCmdShow)) {
         return FALSE;
     }
-    hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_ZOOMIN);
+
+       hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDR_ZOOMIN));
 
     // Main message loop:
     while (GetMessage(&msg, (HWND)NULL, 0, 0)) {
-        if (!TranslateAccelerator(msg.hwnd, hAccel, &msg)) {
+               if (!TranslateAccelerator(msg.hwnd, hAccel, &msg)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
         }
     }
-    ExitInstance();
     return msg.wParam;
 }
-