[ros-diffs] [gschneider] 47459: Various application fixes by Jan Roeloffzen, bug #5182, part 2 fontview: remove unused variable kbswitch: remove unused variables magnify: remove unused variable mplay32: DWORD -> MCIERROR, tabs -> spaces eventvwr: remove unused variable

Author: gschneider
Date: Sun May 30 22:25:46 2010
New Revision: 47459

URL: http://svn.reactos.org/svn/reactos?rev=47459&view=rev
Log:
Various application fixes by Jan Roeloffzen, bug #5182, part 2
fontview: remove unused variable
kbswitch: remove unused variables
magnify: remove unused variable
mplay32: DWORD -> MCIERROR, tabs -> spaces
eventvwr: remove unused variable

Modified:
    trunk/reactos/base/applications/fontview/fontview.c
    trunk/reactos/base/applications/kbswitch/kbswitch.c
    trunk/reactos/base/applications/magnify/magnifier.c
    trunk/reactos/base/applications/mplay32/mplay32.c
    trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c

Modified: trunk/reactos/base/applications/fontview/fontview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview…
==============================================================================
--- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Sun May 30 22:25:46
2010
@@ -60,12 +60,9 @@
 static void
 ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...)
 {
-	HMODULE hModule;
 	HLOCAL hMemCaption = NULL;
 	HLOCAL hMemText = NULL;
 	va_list args;
-
-	hModule = GetModuleHandle(NULL);
 
 	va_start(args, dwMessageId);
 	FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER,

Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
==============================================================================
--- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun May 30 22:25:46
2010
@@ -33,7 +33,6 @@
     HDC hdc, hdcsrc;
     HBITMAP hBitmap, hBmpNew, hBmpOld;
     RECT rect;
-    DWORD bkColor, bkText;
     HFONT hFontOld, hFont = NULL;
     ICONINFO IconInfo;
     HICON hIcon = NULL;
@@ -63,8 +62,8 @@
             rect.bottom = 16;
             rect.top = 0;
 
-            bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
-            bkText  = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
+            SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
+            SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
 
             ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""),
0, NULL);
 

Modified: trunk/reactos/base/applications/magnify/magnifier.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/…
==============================================================================
--- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Sun May 30 22:25:46
2010
@@ -295,7 +295,7 @@
 //
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    int wmId, wmEvent;
+    int wmId;
 
     switch (message)
     {
@@ -354,7 +354,6 @@
         break;
     case WM_COMMAND:
         wmId    = LOWORD(wParam);
-        wmEvent = HIWORD(wParam);
         // Parse the menu selections:
         switch (wmId)
         {

Modified: trunk/reactos/base/applications/mplay32/mplay32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/…
==============================================================================
--- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun May 30 22:25:46
2010
@@ -407,7 +407,7 @@
     MCI_PLAY_PARMS mciPlay;
     TCHAR szLocalFileName[MAX_PATH];
     UINT FileType;
-    DWORD dwError;
+    MCIERROR mciError;
 
     if (lpFileName == NULL)
     {
@@ -449,14 +449,14 @@
 
     SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc);
 
-    dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
+    mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
 
     mciPlay.dwCallback = (DWORD_PTR)hwnd;
     mciPlay.dwFrom = 0;
     mciPlay.dwTo = MaxFilePos;
 
-    dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO,
(DWORD_PTR)&mciPlay);
-    if (dwError != 0)
+    mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO,
(DWORD_PTR)&mciPlay);
+    if (mciError != 0)
     {
         MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);
     }
@@ -641,12 +641,12 @@
                     break;
 
                 case IDM_ABOUT:
-		{
+        {
                     HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
                     ShellAbout(hwnd, szAppTitle, 0, mplayIcon);
-		    DeleteObject(mplayIcon);
-                    break;
-		}
+            DeleteObject(mplayIcon);
+                    break;
+        }
                 case IDM_EXIT:
                     PostMessage(hwnd, WM_CLOSE, 0, 0);
                     return 0;

Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun May 30
22:25:46 2010
@@ -506,7 +506,6 @@
     DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1,
dwRecordsToRead = 0, dwFlags;
     LPWSTR lpSourceName;
     LPWSTR lpComputerName;
-    LPWSTR lpEventStr;
     LPWSTR lpData;
     BOOL bResult = TRUE; /* Read succeeded. */
 
@@ -608,9 +607,6 @@
 
             // This ist the data section of the current event
             lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset);
-
-            // This is the text of the current event
-            lpEventStr = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset);
 
             // Compute the event type
             EventTimeToSystemTime(pevlr->TimeWritten, &time);