diff --git a/reactos/base/applications/osk/main.c b/reactos/base/applications/osk/main.c index 8bcce23253b..1d05285ac23 100644 --- a/reactos/base/applications/osk/main.c +++ b/reactos/base/applications/osk/main.c @@ -1,14 +1,17 @@ /* - * 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; /* Functions */ @@ -22,7 +25,7 @@ BOOL OSK_ReleaseKey(WORD ScanCode); 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 WINAPI _tWinMain(HINSTANCE, HINSTANCE, LPTSTR, int); */ int OSK_SetImage(int IdDlgItem, int IdResource) { - HICON hIcon; - HWND hWndItem; + HICON hIcon; + HWND hWndItem; - hIcon = (HICON) LoadImage(Globals.hInstance, MAKEINTRESOURCE(IdResource), - IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); - if (hIcon == NULL) return FALSE; + 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; + hWndItem = GetDlgItem(Globals.hMainWnd, IdDlgItem); + if (hWndItem == NULL) return FALSE; - SendMessage(hWndItem, BM_SETIMAGE, (WPARAM) IMAGE_ICON, (LPARAM) hIcon ); + SendMessage(hWndItem, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon); - /* The system automatically deletes these resources when the process that created them terminates (msdn) */ + /* The system automatically deletes these resources when the process that created them terminates (MSDN) */ - return TRUE; + return TRUE; } @@ -58,57 +61,56 @@ int OSK_SetImage(int IdDlgItem, int IdResource) */ int OSK_DlgInitDialog(HWND hDlg) { - HMONITOR monitor; - MONITORINFO info; - POINT Pt; - RECT rcWindow; + HMONITOR monitor; + MONITORINFO info; + POINT Pt; + RECT rcWindow; - /* Save handle */ - Globals.hMainWnd = hDlg; + /* 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); + /* 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); + /* 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); + /* 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)); + /* 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); + /* Set a timer for periodics tasks */ + Globals.iTimer = SetTimer(hDlg, 0, 200, NULL); - return TRUE; + return TRUE; } /*********************************************************************** @@ -119,21 +121,20 @@ int OSK_DlgInitDialog(HWND hDlg) */ int OSK_DlgClose(void) { + KillTimer(Globals.hMainWnd, Globals.iTimer); - 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 - /* 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); - /* delete GDI objects */ - if (Globals.hBrushGreenLed) DeleteObject(Globals.hBrushGreenLed); - - return TRUE; + return TRUE; } /*********************************************************************** @@ -144,23 +145,21 @@ int OSK_DlgClose(void) */ int OSK_DlgTimer(void) { + /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */ + HWND hWndActiveWindow; - /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */ - HWND hWndActiveWindow; + hWndActiveWindow = GetForegroundWindow(); + if (hWndActiveWindow != NULL && hWndActiveWindow != Globals.hMainWnd) + { + Globals.hActiveWnd = 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); - /* 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; + return TRUE; } /*********************************************************************** @@ -171,83 +170,83 @@ int OSK_DlgTimer(void) */ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl) { - WORD ScanCode; - INPUT Input; - BOOL bExtendedKey; - BOOL bKeyDown; - BOOL bKeyUp; - LONG WindowStyle; + 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)) + /* FIXME: To be deleted when Reactos will support WS_EX_NOACTIVATE */ + if (Globals.hActiveWnd) { - TranslateMessage(&msg); - DispatchMessage(&msg); + 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) + /* KeyDown and/or KeyUp ? */ + WindowStyle = GetWindowLong(hWndControl, GWL_STYLE); + if ((WindowStyle & BS_AUTOCHECKBOX) == BS_AUTOCHECKBOX) { - bKeyDown = TRUE; - bKeyUp = FALSE; + /* 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; + /* Other key */ + bKeyDown = TRUE; + bKeyUp = TRUE; } - } - else - { - /* Other key */ - bKeyDown = TRUE; - bKeyUp = TRUE; - } - /* Extended key ? */ - ScanCode = wCommand; - if (ScanCode & 0x0200) bExtendedKey = TRUE; - else bExtendedKey = FALSE; - ScanCode &= 0xFF; + /* 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)); - } + /* 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)); - } + 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; + return TRUE; } /*********************************************************************** @@ -258,36 +257,37 @@ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl) */ BOOL OSK_ReleaseKey(WORD ScanCode) { - INPUT Input; - BOOL bExtendedKey; - LONG WindowStyle; - HWND hWndControl; + 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 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; - /* 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; - /* 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)); - /* 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 @@ BOOL OSK_ReleaseKey(WORD ScanCode) */ 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)) + switch (msg) { - 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_INITDIALOG: + OSK_DlgInitDialog(hDlg); + return TRUE; - case WM_COMMAND: - if (wParam == IDCANCEL) EndDialog(hDlg, FALSE); - else if (wParam != IDC_STATIC) OSK_DlgCommand(wParam, (HWND) lParam); - break; + case WM_TIMER: + OSK_DlgTimer(); + return TRUE; - case WM_CLOSE: - OSK_DlgClose(); - break; + 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; - } - return 0; + 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) +int WINAPI _tWinMain(HINSTANCE hInstance, + HINSTANCE prev, + LPTSTR cmdline, + int show) { - HANDLE hMutex; + HANDLE hMutex; - UNREFERENCED_PARAMETER(prev); - UNREFERENCED_PARAMETER(cmdline); - UNREFERENCED_PARAMETER(show); + UNREFERENCED_PARAMETER(prev); + UNREFERENCED_PARAMETER(cmdline); + UNREFERENCED_PARAMETER(show); - ZeroMemory(&Globals, sizeof(Globals)); - Globals.hInstance = hInstance; + ZeroMemory(&Globals, sizeof(Globals)); + Globals.hInstance = hInstance; - /* try to open a mutex for a single instance */ - hMutex = OpenMutexA(MUTEX_ALL_ACCESS, FALSE, "osk"); + /* 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"); + 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); + DialogBox(hInstance, + MAKEINTRESOURCE(MAIN_DIALOG), + GetDesktopWindow(), + OSK_DlgProc); - /* delete the mutex */ - if (hMutex) CloseHandle(hMutex); - } - else - { - /* Programme already launched */ + /* Delete the mutex */ + if (hMutex) CloseHandle(hMutex); + } + else + { + /* Programme already launched */ - /* delete the mutex */ - CloseHandle(hMutex); + /* Delete the mutex */ + CloseHandle(hMutex); - ExitProcess(0); - } + ExitProcess(0); + } - return 0; + return 0; } /* EOF */ diff --git a/reactos/base/applications/osk/main.h b/reactos/base/applications/osk/main.h index 3d6332304bf..9c698e6aa7e 100644 --- a/reactos/base/applications/osk/main.h +++ b/reactos/base/applications/osk/main.h @@ -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 + /* EOF */ diff --git a/reactos/base/applications/osk/osk.h b/reactos/base/applications/osk/osk.h index 70d4a55497b..7e048489e00 100644 --- a/reactos/base/applications/osk/osk.h +++ b/reactos/base/applications/osk/osk.h @@ -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 + #include -#include -#include -#include #include -#include -#include -#include + +#include #include "main.h" #endif + /* EOF */ diff --git a/reactos/base/applications/osk/osk_res.h b/reactos/base/applications/osk/osk_res.h index c15eb2c3532..3c88d8bafcd 100644 --- a/reactos/base/applications/osk/osk_res.h +++ b/reactos/base/applications/osk/osk_res.h @@ -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.