From c34c3cfae45652bbb6ad9f6620b72ab73dc9d713 Mon Sep 17 00:00:00 2001 From: David Welch Date: Sun, 27 Jan 2002 14:47:44 +0000 Subject: [PATCH] Added missing files Updated .cvsignore files svn path=/trunk/; revision=2571 --- reactos/dk/nkm/.cvsignore | 1 + reactos/dk/psx/.cvsignore | 2 + reactos/dk/w32/.cvsignore | 1 + reactos/drivers/bus/acpi/.cvsignore | 2 + reactos/drivers/bus/pci/.cvsignore | 1 + reactos/drivers/dd/vga/display/.cvsignore | 1 + reactos/drivers/net/tdi/misc/.cvsignore | 1 + reactos/drivers/net/wshtcpip/.cvsignore | 1 + reactos/hal/halx86/.cvsignore | 6 +- reactos/include/reactos/.cvsignore | 1 + reactos/lib/crtdll/.cvsignore | 1 + reactos/lib/fmifs/.cvsignore | 1 + reactos/lib/gdi32/.cvsignore | 1 + reactos/lib/kernel32/.cvsignore | 1 + reactos/lib/msafd/.cvsignore | 1 + reactos/lib/msvcrt/.cvsignore | 1 + reactos/lib/ntdll/def/.cvsignore | 1 + reactos/lib/secur32/.cvsignore | 1 + reactos/lib/user32/.cvsignore | 1 + reactos/lib/version/.cvsignore | 3 + reactos/lib/ws2_32/.cvsignore | 1 + reactos/subsys/win32k/ntuser/callback.c | 58 ++++++ reactos/subsys/win32k/ntuser/keyboard.c | 226 ++++++++++++++++++++++ reactos/tools/wmc/.cvsignore | 1 + 24 files changed, 314 insertions(+), 1 deletion(-) create mode 100644 reactos/dk/nkm/.cvsignore create mode 100644 reactos/dk/psx/.cvsignore create mode 100644 reactos/dk/w32/.cvsignore create mode 100644 reactos/drivers/bus/acpi/.cvsignore create mode 100644 reactos/drivers/bus/pci/.cvsignore create mode 100644 reactos/drivers/net/tdi/misc/.cvsignore create mode 100644 reactos/lib/ntdll/def/.cvsignore create mode 100644 reactos/lib/version/.cvsignore create mode 100644 reactos/subsys/win32k/ntuser/callback.c create mode 100644 reactos/subsys/win32k/ntuser/keyboard.c create mode 100644 reactos/tools/wmc/.cvsignore diff --git a/reactos/dk/nkm/.cvsignore b/reactos/dk/nkm/.cvsignore new file mode 100644 index 00000000000..7951405f85a --- /dev/null +++ b/reactos/dk/nkm/.cvsignore @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/reactos/dk/psx/.cvsignore b/reactos/dk/psx/.cvsignore new file mode 100644 index 00000000000..38a421ca52a --- /dev/null +++ b/reactos/dk/psx/.cvsignore @@ -0,0 +1,2 @@ +lib +include \ No newline at end of file diff --git a/reactos/dk/w32/.cvsignore b/reactos/dk/w32/.cvsignore new file mode 100644 index 00000000000..7951405f85a --- /dev/null +++ b/reactos/dk/w32/.cvsignore @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/reactos/drivers/bus/acpi/.cvsignore b/reactos/drivers/bus/acpi/.cvsignore new file mode 100644 index 00000000000..71c58f809f0 --- /dev/null +++ b/reactos/drivers/bus/acpi/.cvsignore @@ -0,0 +1,2 @@ +acpi.coff +objects \ No newline at end of file diff --git a/reactos/drivers/bus/pci/.cvsignore b/reactos/drivers/bus/pci/.cvsignore new file mode 100644 index 00000000000..d60b9fa3e9b --- /dev/null +++ b/reactos/drivers/bus/pci/.cvsignore @@ -0,0 +1 @@ +pci.coff \ No newline at end of file diff --git a/reactos/drivers/dd/vga/display/.cvsignore b/reactos/drivers/dd/vga/display/.cvsignore index 503637f7be4..ea9f9c0e580 100644 --- a/reactos/drivers/dd/vga/display/.cvsignore +++ b/reactos/drivers/dd/vga/display/.cvsignore @@ -1,2 +1,3 @@ vgaddi.coff vgaddi.dll +vgaddi.nostrip.dll \ No newline at end of file diff --git a/reactos/drivers/net/tdi/misc/.cvsignore b/reactos/drivers/net/tdi/misc/.cvsignore new file mode 100644 index 00000000000..3775129587a --- /dev/null +++ b/reactos/drivers/net/tdi/misc/.cvsignore @@ -0,0 +1 @@ +tdi.coff \ No newline at end of file diff --git a/reactos/drivers/net/wshtcpip/.cvsignore b/reactos/drivers/net/wshtcpip/.cvsignore index 140d8f104f0..6b8b4cbc2c4 100644 --- a/reactos/drivers/net/wshtcpip/.cvsignore +++ b/reactos/drivers/net/wshtcpip/.cvsignore @@ -1,5 +1,6 @@ wshtcpip.a wshtcpip.dll +wshtcpip.nostrip.dll wshtcpip.coff base.tmp junk.tmp diff --git a/reactos/hal/halx86/.cvsignore b/reactos/hal/halx86/.cvsignore index 36de49a073e..7284bed15a9 100644 --- a/reactos/hal/halx86/.cvsignore +++ b/reactos/hal/halx86/.cvsignore @@ -1 +1,5 @@ -*.d \ No newline at end of file +*.d +halx86up.coff +hal.dll +hal.nostrip.dll + diff --git a/reactos/include/reactos/.cvsignore b/reactos/include/reactos/.cvsignore index 01488bb849a..173ec6dffc6 100644 --- a/reactos/include/reactos/.cvsignore +++ b/reactos/include/reactos/.cvsignore @@ -1 +1,2 @@ buildno.h +bugcodes.h \ No newline at end of file diff --git a/reactos/lib/crtdll/.cvsignore b/reactos/lib/crtdll/.cvsignore index 38f835b7966..3488c0cd113 100644 --- a/reactos/lib/crtdll/.cvsignore +++ b/reactos/lib/crtdll/.cvsignore @@ -1,2 +1,3 @@ crtdll.coff crtdll.dll +crtdll.nostrip.dll \ No newline at end of file diff --git a/reactos/lib/fmifs/.cvsignore b/reactos/lib/fmifs/.cvsignore index 8a9b128706b..3ad077fc954 100644 --- a/reactos/lib/fmifs/.cvsignore +++ b/reactos/lib/fmifs/.cvsignore @@ -1,2 +1,3 @@ fmifs.coff fmifs.dll +fmifs.nostrip.dll \ No newline at end of file diff --git a/reactos/lib/gdi32/.cvsignore b/reactos/lib/gdi32/.cvsignore index bac9e278f09..22801be8a40 100644 --- a/reactos/lib/gdi32/.cvsignore +++ b/reactos/lib/gdi32/.cvsignore @@ -1,2 +1,3 @@ gdi32.coff gdi32.dll +gdi32.nostrip.dll \ No newline at end of file diff --git a/reactos/lib/kernel32/.cvsignore b/reactos/lib/kernel32/.cvsignore index 08b1a5fe188..031332b166f 100644 --- a/reactos/lib/kernel32/.cvsignore +++ b/reactos/lib/kernel32/.cvsignore @@ -1,5 +1,6 @@ kernel32.a kernel32.dll +kernel32.nostrip.dll kernel32.lib kernel32.coff base.tmp diff --git a/reactos/lib/msafd/.cvsignore b/reactos/lib/msafd/.cvsignore index 2ec245bbd75..095ef4ef73d 100644 --- a/reactos/lib/msafd/.cvsignore +++ b/reactos/lib/msafd/.cvsignore @@ -1,5 +1,6 @@ msafd.a msafd.dll +msafd.nostrip.dll msafd.coff base.tmp junk.tmp diff --git a/reactos/lib/msvcrt/.cvsignore b/reactos/lib/msvcrt/.cvsignore index b878d28a88f..eae1120a98b 100644 --- a/reactos/lib/msvcrt/.cvsignore +++ b/reactos/lib/msvcrt/.cvsignore @@ -1,2 +1,3 @@ msvcrt.coff msvcrt.dll +msvcrt.nostrip.dll diff --git a/reactos/lib/ntdll/def/.cvsignore b/reactos/lib/ntdll/def/.cvsignore new file mode 100644 index 00000000000..b514f25c01a --- /dev/null +++ b/reactos/lib/ntdll/def/.cvsignore @@ -0,0 +1 @@ +ntdll.coff \ No newline at end of file diff --git a/reactos/lib/secur32/.cvsignore b/reactos/lib/secur32/.cvsignore index 1978f67c0a2..5cd856a905c 100644 --- a/reactos/lib/secur32/.cvsignore +++ b/reactos/lib/secur32/.cvsignore @@ -1,2 +1,3 @@ secur32.dll +secur32.nostrip.dll secur32.coff diff --git a/reactos/lib/user32/.cvsignore b/reactos/lib/user32/.cvsignore index f72b0f7b5ec..4b9aa9668bd 100644 --- a/reactos/lib/user32/.cvsignore +++ b/reactos/lib/user32/.cvsignore @@ -2,3 +2,4 @@ base.tmp junk.tmp user32.coff user32.dll +user32.nostrip.dll \ No newline at end of file diff --git a/reactos/lib/version/.cvsignore b/reactos/lib/version/.cvsignore new file mode 100644 index 00000000000..c189b500ad5 --- /dev/null +++ b/reactos/lib/version/.cvsignore @@ -0,0 +1,3 @@ +version.coff +version.nostrip.dll +version.dll \ No newline at end of file diff --git a/reactos/lib/ws2_32/.cvsignore b/reactos/lib/ws2_32/.cvsignore index 7779bd976cd..1e224b10631 100644 --- a/reactos/lib/ws2_32/.cvsignore +++ b/reactos/lib/ws2_32/.cvsignore @@ -1,5 +1,6 @@ ws2_32.a ws2_32.dll +ws2_32.nostrip.dll ws2_32.coff base.tmp junk.tmp diff --git a/reactos/subsys/win32k/ntuser/callback.c b/reactos/subsys/win32k/ntuser/callback.c new file mode 100644 index 00000000000..bea5098ca10 --- /dev/null +++ b/reactos/subsys/win32k/ntuser/callback.c @@ -0,0 +1,58 @@ +/* $Id: callback.c,v 1.1 2002/01/27 14:47:44 dwelch Exp $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Window classes + * FILE: subsys/win32k/ntuser/wndproc.c + * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) + * REVISION HISTORY: + * 06-06-2001 CSH Created + */ + +/* INCLUDES ******************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define NDEBUG +#include + +/* FUNCTIONS *****************************************************************/ + +LRESULT STDCALL +W32kCallWindowProc(WNDPROC Proc, + HWND Wnd, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + WINDOWPROC_CALLBACK_ARGUMENTS Arguments; + LRESULT Result; + NTSTATUS Status; + PVOID ResultPointer; + + Arguments.Proc = Proc; + Arguments.Wnd = Wnd; + Arguments.Msg = Message; + Arguments.wParam = wParam; + Arguments.lParam = lParam; + ResultPointer = &Result; + Status = NtW32Call(USER32_CALLBACK_WINDOWPROC, + &Arguments, + sizeof(WINDOWPROC_CALLBACK_ARGUMENTS), + &ResultPointer, + sizeof(LRESULT)); + if (!NT_SUCCESS(Status)) + { + return(0xFFFFFFFF); + } + return(Result); +} + +/* EOF */ diff --git a/reactos/subsys/win32k/ntuser/keyboard.c b/reactos/subsys/win32k/ntuser/keyboard.c new file mode 100644 index 00000000000..3b6f10f5d9e --- /dev/null +++ b/reactos/subsys/win32k/ntuser/keyboard.c @@ -0,0 +1,226 @@ +/* $Id: keyboard.c,v 1.1 2002/01/27 14:47:44 dwelch Exp $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Messages + * FILE: subsys/win32k/ntuser/message.c + * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) + * REVISION HISTORY: + * 06-06-2001 CSH Created + */ + +/* INCLUDES ******************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define NDEBUG +#include + +/* FUNCTIONS *****************************************************************/ + +BYTE QueueKeyStateTable[256]; + +struct accent_char +{ + BYTE ac_accent; + BYTE ac_char; + BYTE ac_result; +}; + +static const struct accent_char accent_chars[] = +{ +/* A good idea should be to read /usr/X11/lib/X11/locale/iso8859-x/Compose */ + {'`', 'A', '\300'}, {'`', 'a', '\340'}, + {'\'', 'A', '\301'}, {'\'', 'a', '\341'}, + {'^', 'A', '\302'}, {'^', 'a', '\342'}, + {'~', 'A', '\303'}, {'~', 'a', '\343'}, + {'"', 'A', '\304'}, {'"', 'a', '\344'}, + {'O', 'A', '\305'}, {'o', 'a', '\345'}, + {'0', 'A', '\305'}, {'0', 'a', '\345'}, + {'A', 'A', '\305'}, {'a', 'a', '\345'}, + {'A', 'E', '\306'}, {'a', 'e', '\346'}, + {',', 'C', '\307'}, {',', 'c', '\347'}, + {'`', 'E', '\310'}, {'`', 'e', '\350'}, + {'\'', 'E', '\311'}, {'\'', 'e', '\351'}, + {'^', 'E', '\312'}, {'^', 'e', '\352'}, + {'"', 'E', '\313'}, {'"', 'e', '\353'}, + {'`', 'I', '\314'}, {'`', 'i', '\354'}, + {'\'', 'I', '\315'}, {'\'', 'i', '\355'}, + {'^', 'I', '\316'}, {'^', 'i', '\356'}, + {'"', 'I', '\317'}, {'"', 'i', '\357'}, + {'-', 'D', '\320'}, {'-', 'd', '\360'}, + {'~', 'N', '\321'}, {'~', 'n', '\361'}, + {'`', 'O', '\322'}, {'`', 'o', '\362'}, + {'\'', 'O', '\323'}, {'\'', 'o', '\363'}, + {'^', 'O', '\324'}, {'^', 'o', '\364'}, + {'~', 'O', '\325'}, {'~', 'o', '\365'}, + {'"', 'O', '\326'}, {'"', 'o', '\366'}, + {'/', 'O', '\330'}, {'/', 'o', '\370'}, + {'`', 'U', '\331'}, {'`', 'u', '\371'}, + {'\'', 'U', '\332'}, {'\'', 'u', '\372'}, + {'^', 'U', '\333'}, {'^', 'u', '\373'}, + {'"', 'U', '\334'}, {'"', 'u', '\374'}, + {'\'', 'Y', '\335'}, {'\'', 'y', '\375'}, + {'T', 'H', '\336'}, {'t', 'h', '\376'}, + {'s', 's', '\337'}, {'"', 'y', '\377'}, + {'s', 'z', '\337'}, {'i', 'j', '\377'}, + /* iso-8859-2 uses this */ + {'<', 'L', '\245'}, {'<', 'l', '\265'}, /* caron */ + {'<', 'S', '\251'}, {'<', 's', '\271'}, + {'<', 'T', '\253'}, {'<', 't', '\273'}, + {'<', 'Z', '\256'}, {'<', 'z', '\276'}, + {'<', 'C', '\310'}, {'<', 'c', '\350'}, + {'<', 'E', '\314'}, {'<', 'e', '\354'}, + {'<', 'D', '\317'}, {'<', 'd', '\357'}, + {'<', 'N', '\322'}, {'<', 'n', '\362'}, + {'<', 'R', '\330'}, {'<', 'r', '\370'}, + {';', 'A', '\241'}, {';', 'a', '\261'}, /* ogonek */ + {';', 'E', '\312'}, {';', 'e', '\332'}, + {'\'', 'Z', '\254'}, {'\'', 'z', '\274'}, /* acute */ + {'\'', 'R', '\300'}, {'\'', 'r', '\340'}, + {'\'', 'L', '\305'}, {'\'', 'l', '\345'}, + {'\'', 'C', '\306'}, {'\'', 'c', '\346'}, + {'\'', 'N', '\321'}, {'\'', 'n', '\361'}, +/* collision whith S, from iso-8859-9 !!! */ + {',', 'S', '\252'}, {',', 's', '\272'}, /* cedilla */ + {',', 'T', '\336'}, {',', 't', '\376'}, + {'.', 'Z', '\257'}, {'.', 'z', '\277'}, /* dot above */ + {'/', 'L', '\243'}, {'/', 'l', '\263'}, /* slash */ + {'/', 'D', '\320'}, {'/', 'd', '\360'}, + {'(', 'A', '\303'}, {'(', 'a', '\343'}, /* breve */ + {'\275', 'O', '\325'}, {'\275', 'o', '\365'}, /* double acute */ + {'\275', 'U', '\334'}, {'\275', 'u', '\374'}, + {'0', 'U', '\332'}, {'0', 'u', '\372'}, /* ring above */ + /* iso-8859-3 uses this */ + {'/', 'H', '\241'}, {'/', 'h', '\261'}, /* slash */ + {'>', 'H', '\246'}, {'>', 'h', '\266'}, /* circumflex */ + {'>', 'J', '\254'}, {'>', 'j', '\274'}, + {'>', 'C', '\306'}, {'>', 'c', '\346'}, + {'>', 'G', '\330'}, {'>', 'g', '\370'}, + {'>', 'S', '\336'}, {'>', 's', '\376'}, +/* collision whith G( from iso-8859-9 !!! */ + {'(', 'G', '\253'}, {'(', 'g', '\273'}, /* breve */ + {'(', 'U', '\335'}, {'(', 'u', '\375'}, +/* collision whith I. from iso-8859-3 !!! */ + {'.', 'I', '\251'}, {'.', 'i', '\271'}, /* dot above */ + {'.', 'C', '\305'}, {'.', 'c', '\345'}, + {'.', 'G', '\325'}, {'.', 'g', '\365'}, + /* iso-8859-4 uses this */ + {',', 'R', '\243'}, {',', 'r', '\263'}, /* cedilla */ + {',', 'L', '\246'}, {',', 'l', '\266'}, + {',', 'G', '\253'}, {',', 'g', '\273'}, + {',', 'N', '\321'}, {',', 'n', '\361'}, + {',', 'K', '\323'}, {',', 'k', '\363'}, + {'~', 'I', '\245'}, {'~', 'i', '\265'}, /* tilde */ + {'-', 'E', '\252'}, {'-', 'e', '\272'}, /* macron */ + {'-', 'A', '\300'}, {'-', 'a', '\340'}, + {'-', 'I', '\317'}, {'-', 'i', '\357'}, + {'-', 'O', '\322'}, {'-', 'o', '\362'}, + {'-', 'U', '\336'}, {'-', 'u', '\376'}, + {'/', 'T', '\254'}, {'/', 't', '\274'}, /* slash */ + {'.', 'E', '\314'}, {'.', 'e', '\344'}, /* dot above */ + {';', 'I', '\307'}, {';', 'i', '\347'}, /* ogonek */ + {';', 'U', '\331'}, {';', 'u', '\371'}, + /* iso-8859-9 uses this */ + /* iso-8859-9 has really bad choosen G( S, and I. as they collide + * whith the same letters on other iso-8859-x (that is they are on + * different places :-( ), if you use turkish uncomment these and + * comment out the lines in iso-8859-2 and iso-8859-3 sections + * FIXME: should be dynamic according to chosen language + * if/when Wine has turkish support. + */ +/* collision whith G( from iso-8859-3 !!! */ +/* {'(', 'G', '\320'}, {'(', 'g', '\360'}, */ /* breve */ +/* collision whith S, from iso-8859-2 !!! */ +/* {',', 'S', '\336'}, {',', 's', '\376'}, */ /* cedilla */ +/* collision whith I. from iso-8859-3 !!! */ +/* {'.', 'I', '\335'}, {'.', 'i', '\375'}, */ /* dot above */ +}; + +int STDCALL +ToUnicode(UINT wVirtKey, + UINT wScanCode, + PBYTE lpKeyState, + LPWSTR pwszBuff, + int cchBuff, + UINT wFlags) +{ +} + +BOOL STDCALL +NtUserTranslateMessage(LPMSG lpMsg, + DWORD Unknown1) +{ + LONG UState; + WCHAR wp[2]; + MSG NewMsg; + static INT dead_char; + PUSER_MESSAGE UMsg; + + if (lpMsg->message != WM_KEYDOWN && lpMsg->message != WM_SYSKEYDOWN) + { + return(FALSE); + } + + /* FIXME: Should pass current keyboard layout for this thread. */ + UState = ToUnicode(lpMsg->wParam, HIWORD(lpMsg->lParam), + QueueKeyStateTable, wp, 2, 0); + if (UState == 1) + { + NewMsg.message = (lpMsg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; + if (dead_char) + { + int i; + + if (wp[0] == ' ') wp[0] = dead_char; + if (dead_char == 0xa2) dead_char = '('; + else if (dead_char == 0xa8) dead_char = '"'; + else if (dead_char == 0xb2) dead_char = ';'; + else if (dead_char == 0xb4) dead_char = '\''; + else if (dead_char == 0xb7) dead_char = '<'; + else if (dead_char == 0xb8) dead_char = ','; + else if (dead_char == 0xff) dead_char = '.'; + for (i = 0; i < sizeof(accent_chars)/sizeof(accent_chars[0]); i++) + { + if ((accent_chars[i].ac_accent == dead_char) && + (accent_chars[i].ac_char == wp[0])) + { + wp[0] = accent_chars[i].ac_result; + break; + } + dead_char = 0; + } + NewMsg.hwnd = lpMsg->hwnd; + NewMsg.wParam = wp[0]; + NewMsg.lParam = lpMsg->lParam; + UMsg = MsqCreateMessage(&NewMsg); + MsqPostMessage(PsGetWin32Thread()->MessageQueue, + UMsg, + FALSE); + return(TRUE); + } + } + else if (UState == -1) + { + NewMsg.message = + (lpMsg->message == WM_KEYDOWN) ? WM_DEADCHAR : WM_SYSDEADCHAR; + NewMsg.hwnd = lpMsg->hwnd; + NewMsg.wParam = wp[0]; + NewMsg.lParam = lpMsg->lParam; + dead_char = wp[0]; + UMsg = MsqCreateMessage(&NewMsg); + MsqPostMessage(PsGetWin32Thread()->MessageQueue, + UMsg, + FALSE); + return(TRUE); + } + return(FALSE); +} diff --git a/reactos/tools/wmc/.cvsignore b/reactos/tools/wmc/.cvsignore new file mode 100644 index 00000000000..a2ad645f37e --- /dev/null +++ b/reactos/tools/wmc/.cvsignore @@ -0,0 +1 @@ +wmc \ No newline at end of file