2003-07-11 Casper S. Hornstrup <chorns@users.sourceforge.net>

	* apps/tests/bitblt/bitblt.c (MainWndProc): Declare variables
	before any statements are processed in the scope.
	* apps/tests/icontest/icontest.c (WinMain): Ditto.
	* apps/tests/wm_paint/wm_paint.c (WinMain, MainWndProc): Ditto.

svn path=/trunk/; revision=5080

diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 662795f..a959c89 100644 (file)
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-11  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+       * apps/tests/bitblt/bitblt.c (MainWndProc): Declare variables
+       before any statements are processed in the scope.
+       * apps/tests/icontest/icontest.c (WinMain): Ditto.
+       * apps/tests/wm_paint/wm_paint.c (WinMain, MainWndProc): Ditto.
+
 2003-07-11  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
        * lib/user32/controls/button.c (PB_Paint, GB_Paint): Declare variables

diff --git a/reactos/apps/tests/bitblt/bitblt.c b/reactos/apps/tests/bitblt/bitblt.c
index d8d2424..90f4d2f 100644 (file)
--- a/reactos/apps/tests/bitblt/bitblt.c
+++ b/reactos/apps/tests/bitblt/bitblt.c
@@ -22,9 +22,11 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam,
 int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance,
     LPTSTR lpCmdLine, int nCmdShow)
 {
+   WNDCLASS wc;
+   MSG msg;
+
    HInst = HInstance;
 
-   WNDCLASS wc;
    memset(&wc, 0, sizeof(WNDCLASS));
     
    wc.style = CS_VREDRAW | CS_HREDRAW | CS_DBLCLKS;
@@ -51,7 +53,6 @@ int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance,
          ShowWindow(HWnd, nCmdShow);
          UpdateWindow(HWnd);
 
-         MSG msg;
          while (GetMessage(&msg, NULL, 0, 0))
          {
              TranslateMessage(&msg);

diff --git a/reactos/apps/tests/icontest/icontest.c b/reactos/apps/tests/icontest/icontest.c
index 2d0fe0d..32ad1f7 100644 (file)
--- a/reactos/apps/tests/icontest/icontest.c
+++ b/reactos/apps/tests/icontest/icontest.c
@@ -18,11 +18,12 @@ WinMain(HINSTANCE hInstance,
     LPSTR lpszCmdLine,
     int nCmdShow)
 {
-  hInst = hInstance;
   WNDCLASS wc;
   MSG msg;
   HWND hWnd;
 
+  hInst = hInstance;
+
   wc.lpszClassName = "IconTestClass";
   wc.lpfnWndProc = MainWndProc;
   wc.style = CS_VREDRAW | CS_HREDRAW;

diff --git a/reactos/apps/tests/wm_paint/wm_paint.c b/reactos/apps/tests/wm_paint/wm_paint.c
index d0d035d..7347848 100644 (file)
--- a/reactos/apps/tests/wm_paint/wm_paint.c
+++ b/reactos/apps/tests/wm_paint/wm_paint.c
@@ -24,6 +24,7 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam,
 int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance,
     LPTSTR lpCmdLine, int nCmdShow)
 {
+   MSG msg;
    WNDCLASS wc;
    memset(&wc, 0, sizeof(WNDCLASS));
     
@@ -47,7 +48,6 @@ int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance,
          ShowWindow(HWnd, nCmdShow);
          UpdateWindow(HWnd);
 
-         MSG msg;
          while (GetMessage(&msg, NULL, 0, 0))
          {
              TranslateMessage(&msg);
@@ -63,17 +63,20 @@ int APIENTRY WinMain(HINSTANCE HInstance, HINSTANCE HPrevInstance,
 LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam, 
    LPARAM LParam)
 {
+  const char* text = "Persistent Text"; 
+
    switch (Msg)
    {
       case WM_PAINT:
       {
          // determine the invalidated area of the window            
-         RECT RUpdate;            
+         RECT RUpdate;
+         HDC Hdc;
          GetUpdateRect(HWnd, &RUpdate, NULL);
 
          // grab a handle to our window's
          // common display device context
-         HDC Hdc = GetDC(HWnd);
+         Hdc = GetDC(HWnd);
 #if 0
          try
 #endif
@@ -93,7 +96,6 @@ LRESULT CALLBACK MainWndProc(HWND HWnd, UINT Msg, WPARAM WParam,
             FillRect(Hdc, &RClient, NULL);
             
             // render the persistent text
-            const char* text = "Persistent Text"; 
             SetTextColor(Hdc, PALETTERGB(0, 0, 255));
             DrawText(Hdc, text, strlen(text), &RClient,
                      DT_CENTER | DT_VCENTER | DT_SINGLELINE);