[ros-diffs] [hbelusca] 65569: [OSK] - Fix some coding style (whitespace): this is not win32k!! - Remove unneeded headers.

Author: hbelusca
Date: Fri Dec  5 22:09:10 2014
New Revision: 65569

URL: http://svn.reactos.org/svn/reactos?rev=65569&view=rev
Log:
[OSK]
- Fix some coding style (whitespace): this is not win32k!!
- Remove unneeded headers.

Modified:
    trunk/reactos/base/applications/osk/main.c
    trunk/reactos/base/applications/osk/main.h
    trunk/reactos/base/applications/osk/osk.h
    trunk/reactos/base/applications/osk/osk_res.h

Modified: trunk/reactos/base/applications/osk/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/main…
==============================================================================
--- trunk/reactos/base/applications/osk/main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/osk/main.c	[iso-8859-1] Fri Dec  5 22:09:10 2014
@@ -1,13 +1,16 @@
 /*
- * PROJECT:         ReactOS Kernel
+ * PROJECT:         ReactOS On-Screen Keyboard
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            base/applications/osk/main.c
- * PURPOSE:         On screen keyboard.
+ * PURPOSE:         On-screen keyboard.
  * PROGRAMMERS:     Denis ROBERT
  */
 
-/* INCLUDES ******************************************************************/
+/* INCLUDES *******************************************************************/
+
 #include "osk.h"
+
+/* GLOBALS ********************************************************************/
 
 OSK_GLOBALS Globals;
 
@@ -22,7 +25,7 @@
 INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 int WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int);
 
-
+/* FUNCTIONS ******************************************************************/
 
 /***********************************************************************
  *
@@ -32,21 +35,21 @@
  */
 int OSK_SetImage(int IdDlgItem, int IdResource)
 {
-  HICON hIcon;
-  HWND hWndItem;
-
-  hIcon = (HICON) LoadImage(Globals.hInstance, MAKEINTRESOURCE(IdResource),
-      IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
-  if (hIcon == NULL) return FALSE;
-
-  hWndItem = GetDlgItem(Globals.hMainWnd, IdDlgItem);
-  if (hWndItem == NULL) return FALSE;
-
-  SendMessage(hWndItem, BM_SETIMAGE, (WPARAM) IMAGE_ICON,  (LPARAM) hIcon );
-
-  /* The system automatically deletes these resources when the process that created them
terminates (msdn) */
-
-  return TRUE;
+    HICON hIcon;
+    HWND hWndItem;
+
+    hIcon = (HICON)LoadImage(Globals.hInstance, MAKEINTRESOURCE(IdResource),
+                             IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+    if (hIcon == NULL) return FALSE;
+
+    hWndItem = GetDlgItem(Globals.hMainWnd, IdDlgItem);
+    if (hWndItem == NULL) return FALSE;
+
+    SendMessage(hWndItem, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);
+
+    /* The system automatically deletes these resources when the process that created
them terminates (MSDN) */
+
+    return TRUE;
 }
 
 
@@ -58,57 +61,56 @@
  */
 int OSK_DlgInitDialog(HWND hDlg)
 {
-  HMONITOR  monitor;
-  MONITORINFO info;
-  POINT Pt;
-  RECT rcWindow;
-
-  /* Save handle */
-  Globals.hMainWnd = hDlg;
-
-  /* Get screen info */
-  memset(&Pt, 0, sizeof(Pt));
-  monitor = MonitorFromPoint(Pt, MONITOR_DEFAULTTOPRIMARY );
-  info.cbSize = sizeof(info);
-  GetMonitorInfoW(monitor, &info);
-
-  /* Move the dialog on the bottom of main screen */
-  GetWindowRect(hDlg, &rcWindow);
-  MoveWindow(
-      hDlg,
-      (info.rcMonitor.left + info.rcMonitor.right) / 2 -  // Center of screen
-      (rcWindow.right - rcWindow.left) / 2,  // - half size of dialog
-      info.rcMonitor.bottom -   // Bottom of screen
-      (rcWindow.bottom - rcWindow.top),  // - size of window
-      (rcWindow.right - rcWindow.left),  // Width
-      (rcWindow.bottom - rcWindow.top),  // Height
-      TRUE);
-
-  /* Set icon on visual buttons */
-  OSK_SetImage(SCAN_CODE_15, IDI_BACK);
-  OSK_SetImage(SCAN_CODE_16, IDI_TAB);
-  OSK_SetImage(SCAN_CODE_30, IDI_CAPS_LOCK);
-  OSK_SetImage(SCAN_CODE_43, IDI_RETURN);
-  OSK_SetImage(SCAN_CODE_44, IDI_SHIFT);
-  OSK_SetImage(SCAN_CODE_57, IDI_SHIFT);
-  OSK_SetImage(SCAN_CODE_127, IDI_REACTOS);
-  OSK_SetImage(SCAN_CODE_128, IDI_REACTOS);
-  OSK_SetImage(SCAN_CODE_129, IDI_MENU);
-  OSK_SetImage(SCAN_CODE_80, IDI_HOME);
-  OSK_SetImage(SCAN_CODE_85, IDI_PG_UP);
-  OSK_SetImage(SCAN_CODE_86, IDI_PG_DOWN);
-  OSK_SetImage(SCAN_CODE_79, IDI_LEFT);
-  OSK_SetImage(SCAN_CODE_83, IDI_TOP);
-  OSK_SetImage(SCAN_CODE_84, IDI_BOTTOM);
-  OSK_SetImage(SCAN_CODE_89, IDI_RIGHT);
-
-  /* Create a green brush for leds */
-  Globals.hBrushGreenLed = CreateSolidBrush(RGB(0, 255, 0));
-
-  /* Set a timer for periodics tasks */
-  Globals.iTimer = SetTimer(hDlg, 0, 200, NULL);
-
-  return TRUE;
+    HMONITOR  monitor;
+    MONITORINFO info;
+    POINT Pt;
+    RECT rcWindow;
+
+    /* Save handle */
+    Globals.hMainWnd = hDlg;
+
+    /* Get screen info */
+    memset(&Pt, 0, sizeof(Pt));
+    monitor = MonitorFromPoint(Pt, MONITOR_DEFAULTTOPRIMARY );
+    info.cbSize = sizeof(info);
+    GetMonitorInfoW(monitor, &info);
+
+    /* Move the dialog on the bottom of main screen */
+    GetWindowRect(hDlg, &rcWindow);
+    MoveWindow(hDlg,
+               (info.rcMonitor.left + info.rcMonitor.right) / 2 - // Center of screen
+                   (rcWindow.right - rcWindow.left) / 2,          // - half size of
dialog
+               info.rcMonitor.bottom -               // Bottom of screen
+                   (rcWindow.bottom - rcWindow.top), // - size of window
+               rcWindow.right - rcWindow.left,     // Width
+               rcWindow.bottom - rcWindow.top,     // Height
+               TRUE);
+
+    /* Set icon on visual buttons */
+    OSK_SetImage(SCAN_CODE_15, IDI_BACK);
+    OSK_SetImage(SCAN_CODE_16, IDI_TAB);
+    OSK_SetImage(SCAN_CODE_30, IDI_CAPS_LOCK);
+    OSK_SetImage(SCAN_CODE_43, IDI_RETURN);
+    OSK_SetImage(SCAN_CODE_44, IDI_SHIFT);
+    OSK_SetImage(SCAN_CODE_57, IDI_SHIFT);
+    OSK_SetImage(SCAN_CODE_127, IDI_REACTOS);
+    OSK_SetImage(SCAN_CODE_128, IDI_REACTOS);
+    OSK_SetImage(SCAN_CODE_129, IDI_MENU);
+    OSK_SetImage(SCAN_CODE_80, IDI_HOME);
+    OSK_SetImage(SCAN_CODE_85, IDI_PG_UP);
+    OSK_SetImage(SCAN_CODE_86, IDI_PG_DOWN);
+    OSK_SetImage(SCAN_CODE_79, IDI_LEFT);
+    OSK_SetImage(SCAN_CODE_83, IDI_TOP);
+    OSK_SetImage(SCAN_CODE_84, IDI_BOTTOM);
+    OSK_SetImage(SCAN_CODE_89, IDI_RIGHT);
+
+    /* Create a green brush for leds */
+    Globals.hBrushGreenLed = CreateSolidBrush(RGB(0, 255, 0));
+
+    /* Set a timer for periodics tasks */
+    Globals.iTimer = SetTimer(hDlg, 0, 200, NULL);
+
+    return TRUE;
 }
 
 /***********************************************************************
@@ -119,21 +121,20 @@
  */
 int OSK_DlgClose(void)
 {
-
-  KillTimer(Globals.hMainWnd, Globals.iTimer);
-
-  /* Release ctrl, shift, alt keys */
-  OSK_ReleaseKey(SCAN_CODE_44);   // Left shift
-  OSK_ReleaseKey(SCAN_CODE_57);   // Right shift
-  OSK_ReleaseKey(SCAN_CODE_58);   // Left ctrl
-  OSK_ReleaseKey(SCAN_CODE_60);   // Left alt
-  OSK_ReleaseKey(SCAN_CODE_62);   // Right alt
-  OSK_ReleaseKey(SCAN_CODE_64);   // Right ctrl
-
-  /* delete GDI objects */
-  if (Globals.hBrushGreenLed) DeleteObject(Globals.hBrushGreenLed);
-
-  return TRUE;
+    KillTimer(Globals.hMainWnd, Globals.iTimer);
+
+    /* Release Ctrl, Shift, Alt keys */
+    OSK_ReleaseKey(SCAN_CODE_44); // Left shift
+    OSK_ReleaseKey(SCAN_CODE_57); // Right shift
+    OSK_ReleaseKey(SCAN_CODE_58); // Left ctrl
+    OSK_ReleaseKey(SCAN_CODE_60); // Left alt
+    OSK_ReleaseKey(SCAN_CODE_62); // Right alt
+    OSK_ReleaseKey(SCAN_CODE_64); // Right ctrl
+
+    /* delete GDI objects */
+    if (Globals.hBrushGreenLed) DeleteObject(Globals.hBrushGreenLed);
+
+    return TRUE;
 }
 
 /***********************************************************************
@@ -144,23 +145,21 @@
  */
 int OSK_DlgTimer(void)
 {
-
-  /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */
-  HWND hWndActiveWindow;
-
-  hWndActiveWindow = GetForegroundWindow();
-  if (hWndActiveWindow != NULL && hWndActiveWindow != Globals.hMainWnd)
-  {
-    Globals.hActiveWnd = hWndActiveWindow;
-  }
-  /*******************************************************************/
-
-  /* Always redraw leds because it can be changed by the real keyboard) */
-  InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_NUM), NULL, TRUE);
-  InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_CAPS), NULL, TRUE);
-  InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_SCROLL), NULL, TRUE);
-
-  return TRUE;
+    /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */
+    HWND hWndActiveWindow;
+
+    hWndActiveWindow = GetForegroundWindow();
+    if (hWndActiveWindow != NULL && hWndActiveWindow != Globals.hMainWnd)
+    {
+        Globals.hActiveWnd = hWndActiveWindow;
+    }
+
+    /* Always redraw leds because it can be changed by the real keyboard) */
+    InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_NUM), NULL, TRUE);
+    InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_CAPS), NULL, TRUE);
+    InvalidateRect(GetDlgItem(Globals.hMainWnd, IDC_LED_SCROLL), NULL, TRUE);
+
+    return TRUE;
 }
 
 /***********************************************************************
@@ -171,72 +170,114 @@
  */
 BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl)
 {
-  WORD ScanCode;
-  INPUT Input;
-  BOOL bExtendedKey;
-  BOOL bKeyDown;
-  BOOL bKeyUp;
-  LONG WindowStyle;
-
-
-  /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */
-  if (Globals.hActiveWnd)
-  {
-    MSG msg;
-
-    SetForegroundWindow(Globals.hActiveWnd);
-    while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
-    {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
-  }
-  /*******************************************************************/
-
-  /* KeyDown and/or KeyUp ? */
-  WindowStyle = GetWindowLong(hWndControl, GWL_STYLE);
-  if ((WindowStyle & BS_AUTOCHECKBOX) == BS_AUTOCHECKBOX)
-  {
-    /* 2-states key like Shift, Alt, Ctrl, ... */
-    if (SendMessage(hWndControl, BM_GETCHECK, 0, 0) == BST_CHECKED)
-    {
-      bKeyDown = TRUE;
-      bKeyUp = FALSE;
+    WORD ScanCode;
+    INPUT Input;
+    BOOL bExtendedKey;
+    BOOL bKeyDown;
+    BOOL bKeyUp;
+    LONG WindowStyle;
+
+    /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */
+    if (Globals.hActiveWnd)
+    {
+        MSG msg;
+
+        SetForegroundWindow(Globals.hActiveWnd);
+        while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE))
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
+    }
+
+    /* KeyDown and/or KeyUp ? */
+    WindowStyle = GetWindowLong(hWndControl, GWL_STYLE);
+    if ((WindowStyle & BS_AUTOCHECKBOX) == BS_AUTOCHECKBOX)
+    {
+        /* 2-states key like Shift, Alt, Ctrl, ... */
+        if (SendMessage(hWndControl, BM_GETCHECK, 0, 0) == BST_CHECKED)
+        {
+            bKeyDown = TRUE;
+            bKeyUp = FALSE;
+        }
+        else
+        {
+            bKeyDown = FALSE;
+            bKeyUp = TRUE;
+        }
     }
     else
     {
-      bKeyDown = FALSE;
-      bKeyUp = TRUE;
-    }
-  }
-  else
-  {
-    /* Other key */
-    bKeyDown = TRUE;
-    bKeyUp = TRUE;
-  }
-
-  /* Extended key ? */
-  ScanCode = wCommand;
-  if (ScanCode & 0x0200) bExtendedKey = TRUE;
-  else bExtendedKey = FALSE;
-  ScanCode &= 0xFF;
-
-  /* Press and release the key */
-  if (bKeyDown)
-  {
-    Input.type = INPUT_KEYBOARD;
-    Input.ki.wVk = 0;
-    Input.ki.wScan = ScanCode;
-    Input.ki.time = GetTickCount();
-    Input.ki.dwExtraInfo = GetMessageExtraInfo();
-    Input.ki.dwFlags = KEYEVENTF_SCANCODE;
-    if (bExtendedKey) Input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
-    SendInput(1, &Input, sizeof(Input));
-  }
-
-  if (bKeyUp)
-  {
+        /* Other key */
+        bKeyDown = TRUE;
+        bKeyUp = TRUE;
+    }
+
+    /* Extended key ? */
+    ScanCode = wCommand;
+    if (ScanCode & 0x0200)
+        bExtendedKey = TRUE;
+    else
+        bExtendedKey = FALSE;
+    ScanCode &= 0xFF;
+
+    /* Press and release the key */
+    if (bKeyDown)
+    {
+        Input.type = INPUT_KEYBOARD;
+        Input.ki.wVk = 0;
+        Input.ki.wScan = ScanCode;
+        Input.ki.time = GetTickCount();
+        Input.ki.dwExtraInfo = GetMessageExtraInfo();
+        Input.ki.dwFlags = KEYEVENTF_SCANCODE;
+        if (bExtendedKey) Input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
+        SendInput(1, &Input, sizeof(Input));
+    }
+
+    if (bKeyUp)
+    {
+        Input.type = INPUT_KEYBOARD;
+        Input.ki.wVk = 0;
+        Input.ki.wScan = ScanCode;
+        Input.ki.time = GetTickCount();
+        Input.ki.dwExtraInfo = GetMessageExtraInfo();
+        Input.ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
+        if (bExtendedKey) Input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
+        SendInput(1, &Input, sizeof(Input));
+    }
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *
+ *           OSK_ReleaseKey
+ *
+ *  Release the key of ID wCommand
+ */
+BOOL OSK_ReleaseKey(WORD ScanCode)
+{
+    INPUT Input;
+    BOOL bExtendedKey;
+    LONG WindowStyle;
+    HWND hWndControl;
+
+    /* Is it a 2-states key ? */
+    hWndControl = GetDlgItem(Globals.hMainWnd, ScanCode);
+    WindowStyle = GetWindowLong(hWndControl, GWL_STYLE);
+    if ((WindowStyle & BS_AUTOCHECKBOX) != BS_AUTOCHECKBOX) return FALSE;
+
+    /* Is the key down ? */
+    if (SendMessage(hWndControl, BM_GETCHECK, 0, 0) != BST_CHECKED) return TRUE;
+
+    /* Extended key ? */
+    if (ScanCode & 0x0200)
+        bExtendedKey = TRUE;
+    else
+        bExtendedKey = FALSE;
+    ScanCode &= 0xFF;
+
+    /* Release the key */
     Input.type = INPUT_KEYBOARD;
     Input.ki.wVk = 0;
     Input.ki.wScan = ScanCode;
@@ -245,49 +286,8 @@
     Input.ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
     if (bExtendedKey) Input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
     SendInput(1, &Input, sizeof(Input));
-  }
-
-  return TRUE;
-}
-
-/***********************************************************************
- *
- *           OSK_ReleaseKey
- *
- *  Release the key of ID wCommand
- */
-BOOL OSK_ReleaseKey(WORD ScanCode)
-{
-  INPUT Input;
-  BOOL bExtendedKey;
-  LONG WindowStyle;
-  HWND hWndControl;
-
-
-  /* Is it a 2-states key ? */
-  hWndControl = GetDlgItem(Globals.hMainWnd, ScanCode);
-  WindowStyle = GetWindowLong(hWndControl, GWL_STYLE);
-  if ((WindowStyle & BS_AUTOCHECKBOX) != BS_AUTOCHECKBOX) return FALSE;
-
-  /* Is the key down ? */
-  if (SendMessage(hWndControl, BM_GETCHECK, 0, 0) != BST_CHECKED) return TRUE;
-
-  /* Extended key ? */
-  if (ScanCode & 0x0200) bExtendedKey = TRUE;
-  else bExtendedKey = FALSE;
-  ScanCode &= 0xFF;
-
-  /* Release the key */
-  Input.type = INPUT_KEYBOARD;
-  Input.ki.wVk = 0;
-  Input.ki.wScan = ScanCode;
-  Input.ki.time = GetTickCount();
-  Input.ki.dwExtraInfo = GetMessageExtraInfo();
-  Input.ki.dwFlags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP;
-  if (bExtendedKey) Input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
-  SendInput(1, &Input, sizeof(Input));
-
-  return TRUE;
+
+    return TRUE;
 }
 
 /***********************************************************************
@@ -296,115 +296,100 @@
  */
 INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-  switch (msg)
-  {
-
-  case WM_INITDIALOG:
-    OSK_DlgInitDialog(hDlg);
-    return TRUE;
-
-  case WM_TIMER:
-    OSK_DlgTimer();
-    return TRUE;
-
-  case WM_CTLCOLORSTATIC:
-    if ((HWND) lParam == GetDlgItem(hDlg, IDC_LED_NUM))
-    {
-      if (GetKeyState(VK_NUMLOCK) & 0x0001)
-      {
-        return (INT_PTR) Globals.hBrushGreenLed;
-      }
-      else
-      {
-        return (INT_PTR) GetStockObject(BLACK_BRUSH);
-      }
-    }
-    if ((HWND) lParam == GetDlgItem(hDlg, IDC_LED_CAPS))
-    {
-      if (GetKeyState(VK_CAPITAL) & 0x0001)
-      {
-        return (INT_PTR) Globals.hBrushGreenLed;
-      }
-      else
-      {
-        return (INT_PTR) GetStockObject(BLACK_BRUSH);
-      }
-    }
-    if ((HWND) lParam == GetDlgItem(hDlg, IDC_LED_SCROLL))
-    {
-      if (GetKeyState(VK_SCROLL) & 0x0001)
-      {
-        return (INT_PTR) Globals.hBrushGreenLed;
-      }
-      else
-      {
-        return (INT_PTR) GetStockObject(BLACK_BRUSH);
-      }
-    }
-    break;
-
-  case WM_COMMAND:
-    if (wParam == IDCANCEL) EndDialog(hDlg, FALSE);
-    else if (wParam != IDC_STATIC) OSK_DlgCommand(wParam, (HWND) lParam);
-    break;
-
-  case WM_CLOSE:
-    OSK_DlgClose();
-    break;
-
-  }
-  return 0;
+    switch (msg)
+    {
+        case WM_INITDIALOG:
+            OSK_DlgInitDialog(hDlg);
+            return TRUE;
+
+        case WM_TIMER:
+            OSK_DlgTimer();
+            return TRUE;
+
+        case WM_CTLCOLORSTATIC:
+            if ((HWND)lParam == GetDlgItem(hDlg, IDC_LED_NUM))
+            {
+                if (GetKeyState(VK_NUMLOCK) & 0x0001)
+                    return (INT_PTR)Globals.hBrushGreenLed;
+                else
+                    return (INT_PTR)GetStockObject(BLACK_BRUSH);
+            }
+            if ((HWND)lParam == GetDlgItem(hDlg, IDC_LED_CAPS))
+            {
+                if (GetKeyState(VK_CAPITAL) & 0x0001)
+                    return (INT_PTR)Globals.hBrushGreenLed;
+                else
+                    return (INT_PTR)GetStockObject(BLACK_BRUSH);
+            }
+            if ((HWND)lParam == GetDlgItem(hDlg, IDC_LED_SCROLL))
+            {
+                if (GetKeyState(VK_SCROLL) & 0x0001)
+                    return (INT_PTR)Globals.hBrushGreenLed;
+                else
+                    return (INT_PTR)GetStockObject(BLACK_BRUSH);
+            }
+            break;
+
+        case WM_COMMAND:
+            if (wParam == IDCANCEL)
+                EndDialog(hDlg, FALSE);
+            else if (wParam != IDC_STATIC)
+                OSK_DlgCommand(wParam, (HWND) lParam);
+            break;
+
+        case WM_CLOSE:
+            OSK_DlgClose();
+            break;
+    }
+
+    return 0;
 }
 
 /***********************************************************************
  *
  *       WinMain
  */
-int WINAPI _tWinMain(
-    HINSTANCE hInstance,
-    HINSTANCE prev,
-    LPTSTR cmdline,
-    int show)
-{
-  HANDLE     hMutex;
-
-  UNREFERENCED_PARAMETER(prev);
-  UNREFERENCED_PARAMETER(cmdline);
-  UNREFERENCED_PARAMETER(show);
-
-  ZeroMemory(&Globals, sizeof(Globals));
-  Globals.hInstance = hInstance;
-
-  /* try to open a mutex for a single instance */
-  hMutex = OpenMutexA(MUTEX_ALL_ACCESS, FALSE, "osk");
-
-  if (!hMutex)
-  {
-    /* Mutex doesn’t exist. This is
-     * the first instance so create
-     * the mutex. */
-    hMutex = CreateMutexA(NULL, FALSE, "osk");
-
-    DialogBox(
-        hInstance,
-        MAKEINTRESOURCE(MAIN_DIALOG),
-        GetDesktopWindow(),
-        OSK_DlgProc);
-
-    /* delete the mutex */
-    if (hMutex) CloseHandle(hMutex);
-  }
-  else
-  {
-    /* Programme already launched */
-
-    /* delete the mutex */
-    CloseHandle(hMutex);
-
-    ExitProcess(0);
-  }
-
-  return 0;
+int WINAPI _tWinMain(HINSTANCE hInstance,
+                     HINSTANCE prev,
+                     LPTSTR cmdline,
+                     int show)
+{
+    HANDLE hMutex;
+
+    UNREFERENCED_PARAMETER(prev);
+    UNREFERENCED_PARAMETER(cmdline);
+    UNREFERENCED_PARAMETER(show);
+
+    ZeroMemory(&Globals, sizeof(Globals));
+    Globals.hInstance = hInstance;
+
+    /* Rry to open a mutex for a single instance */
+    hMutex = OpenMutexA(MUTEX_ALL_ACCESS, FALSE, "osk");
+
+    if (!hMutex)
+    {
+        /* Mutex doesn’t exist. This is the first instance so create the mutex. */
+        hMutex = CreateMutexA(NULL, FALSE, "osk");
+
+        DialogBox(hInstance,
+                  MAKEINTRESOURCE(MAIN_DIALOG),
+                  GetDesktopWindow(),
+                  OSK_DlgProc);
+
+        /* Delete the mutex */
+        if (hMutex) CloseHandle(hMutex);
+    }
+    else
+    {
+        /* Programme already launched */
+
+        /* Delete the mutex */
+        CloseHandle(hMutex);
+
+        ExitProcess(0);
+    }
+
+    return 0;
 }
 
 /* EOF */

Modified: trunk/reactos/base/applications/osk/main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/main…
==============================================================================
--- trunk/reactos/base/applications/osk/main.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/osk/main.h	[iso-8859-1] Fri Dec  5 22:09:10 2014
@@ -1,35 +1,36 @@
-#ifndef _OSKMAIN_H
-#define _OSKMAIN_H
 /*
- * PROJECT:         ReactOS Kernel
+ * PROJECT:         ReactOS On-Screen Keyboard
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            base/applications/osk/main.h
  * PURPOSE:         On screen keyboard.
  * PROGRAMMERS:     Denis ROBERT
  */
 
-/* INCLUDES ******************************************************************/
+#ifndef _OSKMAIN_H
+#define _OSKMAIN_H
+
+/* INCLUDES *******************************************************************/
+
 #include "osk_res.h"
 
-/* STRUCTURES ****************************************************************/
+/* TYPES **********************************************************************/
 
 typedef struct
 {
-  HINSTANCE  hInstance;
-  HWND       hMainWnd;
-  HBRUSH     hBrushGreenLed;
-  UINT_PTR   iTimer;
-  /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */
-  HWND       hActiveWnd;
-  /*******************************************************************/
+    HINSTANCE  hInstance;
+    HWND       hMainWnd;
+    HBRUSH     hBrushGreenLed;
+    UINT_PTR   iTimer;
+    /* FIXME: To be deleted when ReactOS will support WS_EX_NOACTIVATE */
+    HWND       hActiveWnd;
 } OSK_GLOBALS;
 
-/* DEFINES *******************************************************************/
+/* DEFINES ********************************************************************/
 
 extern OSK_GLOBALS Globals;
 
 #define countof(x) (sizeof(x) / sizeof((x)[0]))
 
+#endif
 
-#endif
 /* EOF */

Modified: trunk/reactos/base/applications/osk/osk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/osk.…
==============================================================================
--- trunk/reactos/base/applications/osk/osk.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/osk/osk.h	[iso-8859-1] Fri Dec  5 22:09:10 2014
@@ -1,29 +1,23 @@
-#ifndef _OSK_H
-#define _OSK_H
 /*
- * PROJECT:         ReactOS Kernel
+ * PROJECT:         ReactOS On-Screen Keyboard
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            base/applications/osk/osk.h
  * PURPOSE:         On screen keyboard.
  * PROGRAMMERS:     Denis ROBERT
  */
 
-#ifndef STRSAFE_NO_DEPRECATE
-#define STRSAFE_NO_DEPRECATE
-#endif
+#ifndef _OSK_H
+#define _OSK_H
 
 /* INCLUDES ******************************************************************/
-#include <assert.h>
+
 #include <stdio.h>
+#include <tchar.h>
+
 #include <windows.h>
-#include <commdlg.h>
-#include <commctrl.h>
-#include <tchar.h>
-#include <richedit.h>
-#include <malloc.h>
-#include <strsafe.h>
 
 #include "main.h"
 
 #endif
+
 /* EOF */

Modified: trunk/reactos/base/applications/osk/osk_res.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/osk_…
==============================================================================
--- trunk/reactos/base/applications/osk/osk_res.h	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/osk/osk_res.h	[iso-8859-1] Fri Dec  5 22:09:10 2014
@@ -1,5 +1,5 @@
 /*
- * PROJECT:         ReactOS Kernel
+ * PROJECT:         ReactOS On-Screen Keyboard
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            base/applications/osk/osk_res.h
  * PURPOSE:         On screen keyboard.