Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[gedmurphy] 20387: display correct Min RTT

by gedmurphy＠svn.reactos.com

display correct Min RTT Fixes bug 1194 Modified: trunk/reactos/apps/utils/net/ping/ping.c _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-12-28 00:17:21 UTC (rev 20386) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-12-28 01:08:04 UTC (rev 20387) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS ping utility * FILE: apps/net/ping/ping.c @@ -8,18 +7,15 @@ * REVISIONS: * CSH 01/09/2000 Created */ -//#include <windows.h> + #include <winsock2.h> #include <tchar.h> #include <stdarg.h> #include <string.h> #include <stdio.h> + #ifndef _MSC_VER -#ifdef DBG -#undef DBG -#endif - /* FIXME: Where should this be? */ #ifdef CopyMemory #undef CopyMemory @@ -35,9 +31,12 @@ char * _i64toa(__int64 value, char *string, int radix); +#endif /* _MSC_VER */ + +#ifdef DBG +#undef DBG #endif - /* General ICMP constants */ #define ICMP_MINSIZE 8 /* Minimum ICMP packet size */ #define ICMP_MAXSIZE 65535 /* Maximum ICMP packet size */ @@ -453,12 +452,13 @@ printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); - if (RelativeTime.QuadPart < MinRTT.QuadPart) { - MinRTT.QuadPart = RelativeTime.QuadPart; - MinRTTSet = TRUE; + if (RelativeTime.QuadPart < MinRTT.QuadPart || !MinRTTSet) { + MinRTT.QuadPart = RelativeTime.QuadPart; + MinRTTSet = TRUE; } - if (RelativeTime.QuadPart > MaxRTT.QuadPart) - MaxRTT.QuadPart = RelativeTime.QuadPart; + if (RelativeTime.QuadPart > MaxRTT.QuadPart) + MaxRTT.QuadPart = RelativeTime.QuadPart; + SumRTT.QuadPart += RelativeTime.QuadPart; return TRUE;

18 years, 8 months

[gedmurphy] 20386: silence MSVC warning

by gedmurphy＠svn.reactos.com

silence MSVC warning Modified: trunk/reactos/apps/utils/net/ping/ping.c _____ Modified: trunk/reactos/apps/utils/net/ping/ping.c --- trunk/reactos/apps/utils/net/ping/ping.c 2005-12-27 23:25:04 UTC (rev 20385) +++ trunk/reactos/apps/utils/net/ping/ping.c 2005-12-28 00:17:21 UTC (rev 20386) @@ -182,7 +182,7 @@ ULONG Value; i = 0; - Length = strlen(String); + Length = (UINT)_tcslen(String); while ((i < Length) && ((String[i] < '0') || (String[i] > '9'))) i++; if ((i >= Length) || ((String[i] < '0') || (String[i] > '9'))) { InvalidOption = TRUE;

18 years, 8 months

[gedmurphy] 20385: correct spelling

by gedmurphy＠svn.reactos.com

correct spelling Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-12-27 23:17:43 UTC (rev 20384) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2005-12-27 23:25:04 UTC (rev 20385) @@ -346,7 +346,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_STARTMENU "Startmenu" - IDS_MINIMIZE_ALL "mimimize all windows" + IDS_MINIMIZE_ALL "minimize all windows" IDS_DESKTOP_NUM "Desktop %d" IDS_VOLUME "Volume" IDS_ITEMS_CUR "current items"

18 years, 8 months

[weiden] 20384: minor error handling fixes

by weiden＠svn.reactos.com

minor error handling fixes Modified: trunk/reactos/lib/devmgr/advprop.c _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-27 23:05:34 UTC (rev 20383) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-27 23:17:43 UTC (rev 20384) @@ -808,17 +808,13 @@ else { /* cleanup, we were unable to get the device property sheets */ + iPage = nDriverPages; dap->nDevPropSheets -= nDriverPages; nDriverPages = 0; - if (dap->nDevPropSheets == 0) - { - HeapFree(GetProcessHeap(), - 0, - dap->DevPropSheets); - dap->DevPropSheets = NULL; - } } } + else + iPage = 0; /* add the driver page if necessary */ if (dap->HasDriverPage) @@ -841,6 +837,7 @@ else { dap->pDestroyPropertySheetPage(dap->DevPropSheets[iPage]); + dap->DevPropSheets[iPage] = NULL; } } } @@ -1105,7 +1102,7 @@ DevIdSize = (DWORD)wcslen(lpDeviceID) + 1; } - if (lpMachineName != NULL) + if (lpMachineName != NULL && lpMachineName[0] != L'\0') { CONFIGRET cr = CM_Connect_Machine(lpMachineName, &hMachine);

18 years, 8 months

[greatlrd] 20383: update hu langues file patch from talley.

by greatlrd＠svn.reactos.com

update hu langues file patch from talley. Modified: trunk/reactos/lib/devmgr/Hu.rc _____ Modified: trunk/reactos/lib/devmgr/Hu.rc --- trunk/reactos/lib/devmgr/Hu.rc 2005-12-27 23:05:22 UTC (rev 20382) +++ trunk/reactos/lib/devmgr/Hu.rc 2005-12-27 23:05:34 UTC (rev 20383) @@ -1,6 +1,6 @@ //Hungarian language resource file (Robert Horvath, talley at cubeclub dot hu) -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN @@ -20,9 +20,9 @@ IDS_DEVONPARENT "on %1" IDS_TROUBLESHOOTDEV "&HibakeresÚs..." IDS_ENABLEDEV "Eszk÷z &bekapcsolßsa" - IDS_REINSTALLDRV "Meghajt¾programok ·j&ratelepÝtÚse" + IDS_REINSTALLDRV "Illeszt§programok ·j&ratelepÝtÚse" IDS_PROPERTIES "&Tulajdonsßgok" - IDS_UPDATEDRV "Meghajt¾programok &frissÝtÚse..." + IDS_UPDATEDRV "Illeszt§programok &frissÝtÚse..." IDS_REBOOT "SzßmÝt¾gÚp &·jraindÝtßsa..." END @@ -45,47 +45,47 @@ IDS_DEV_FAILED_START "Ez az eszk÷z mßr nincs jelen, elromlott vagy nincs minden meghajt¾program feltelepÝtve hozzß." IDS_DEV_LIAR "A ReactOS megßllt mik÷zben megpr¾bßlta elindÝtani ezt az eszk÷zt, ezÚrt nem fogja mÚgegyszer megpr¾bßlni." IDS_DEV_NORMAL_CONFLICT "Az eszk÷z nem tud szabad $1 er§forrßst talßlni." - IDS_DEV_NOT_VERIFIED "Az eszk÷z meghajt¾programja nem talßlja az eszk÷zt." + IDS_DEV_NOT_VERIFIED "Az eszk÷z illeszt§programja nem talßlja az eszk÷zt." IDS_DEV_NEED_RESTART "Ez az eszk÷z nem tud megfelel§en m¹k÷dni, amÝg nem indÝtod ·jra a gÚpet." IDS_DEV_REENUMERATION "Az eszk÷z er§forrßs ³tk÷zÚst okozott el§." IDS_DEV_PARTIAL_LOG_CONF "A ReactOS nem tudja azonosÝtani az eszk÷z ßltal hasznßlt er§forrßsokat." - IDS_DEV_UNKNOWN_RESOURCE "A meghajt¾program olyan er§forrßs hasznßlatßra kÚnyszerÝti az eszk÷zt, amelyet nem tud kezelni a szßmÝt¾gÚp eszk÷zvezÚrl§je." - IDS_DEV_REINSTALL "Az eszk÷z meghajt¾programjait ·jra kell telepÝteni." + IDS_DEV_UNKNOWN_RESOURCE "Az illeszt§program olyan er§forrßs hasznßlatßra kÚnyszerÝti az eszk÷zt, amelyet nem tud kezelni a szßmÝt¾gÚp eszk÷zvezÚrl§je." + IDS_DEV_REINSTALL "Az eszk÷z illeszt§programjait ·jra kell telepÝteni." IDS_DEV_REGISTRY "A rendszerleÝr¾ hibßs lehet." IDS_DEV_WILL_BE_REMOVED "A ReactOS eltßvolÝtja ezt az eszk÷zt." IDS_DEV_DISABLED "Az eszk÷z nincs bekapcsolva." IDS_DEV_DISABLED2 "Az eszk÷z nincs bekapcsolva." - IDS_DEV_DEVLOADER_NOT_READY "Nem lehet bet÷lteni az igÚnyelt eszk÷z meghajt¾ programokat." + IDS_DEV_DEVLOADER_NOT_READY "Nem lehet bet÷lteni az igÚnyelt eszk÷z illeszt§programjait." IDS_DEV_DEVLOADER_NOT_READY2 "Ez a megjelenÝt§ megfelel§en m¹k÷dik." - IDS_DEV_DEVLOADER_NOT_READY3 "Nem lehet bet÷lteni az igÚnyelt eszk÷z meghajt¾ programokat." - IDS_DEV_DEVICE_NOT_THERE "Ez az eszk÷z mßr nincs jelen, elromlott vagy nincs minden meghajt¾program feltelepÝtve hozzß." + IDS_DEV_DEVLOADER_NOT_READY3 "Nem lehet bet÷lteni az igÚnyelt eszk÷z illeszt§programjait." + IDS_DEV_DEVICE_NOT_THERE "Ez az eszk÷z mßr nincs jelen, elromlott vagy nincs minden illeszt§program feltelepÝtve hozzß." IDS_DEV_MOVED "A ReactOS Úpp az eszk÷zt telepÝti." IDS_DEV_TOO_EARLY "A ReactOS Úpp az eszk÷zt telepÝti." IDS_DEV_NO_VALID_LOG_CONF "A ReactOS nemtudja megßllapÝtani, hogy milyen er§forrßsokat igÚnyel az eszk÷z." - IDS_DEV_FAILED_INSTALL "Az eszk÷zhoz nincsenek meghajt¾programok telepÝtve." + IDS_DEV_FAILED_INSTALL "Az eszk÷zhoz nincsenek illeszt§programok telepÝtve." IDS_DEV_HARDWARE_DISABLED "Az eszk÷z levan tiltva, mivel a BIOS-a nem adott neki er§forrßst." IDS_DEV_CANT_SHARE_IRQ "Ez az eszk÷z egy olyan megszakÝtßst (IRQ) igÚnyelt, amit egy mßsik eszk÷z hasznßl Ús nem oszthatja meg. "\ - "Meg kell vßltoztatnod az er§forrßs kiosztßst, vagy eltßvolÝtanod a real-mode (16 bites) meghajt¾programot." + "Meg kell vßltoztatnod az er§forrßs kiosztßst, vagy eltßvolÝtanod a real-mode (16 bites) illeszt§programot." IDS_DEV_FAILED_ADD "Ez az eszk÷z nem tud megfelel§en m¹k÷dni, mivel a(z) $1 sem m¹k÷dik megfelel§en." - IDS_DEV_DISABLED_SERVICE "A ReactOS nem tudja feltelepÝteni az eszk÷z meghajt¾programjait, mivel a programokat tartalmaz¾ hely nem elÚrhet§." - IDS_DEV_TRANSLATION_FAILED "Ez az eszk÷z nem vßlaszol a meghajt¾programjßnak." + IDS_DEV_DISABLED_SERVICE "A ReactOS nem tudja feltelepÝteni az eszk÷z illeszt§programjait, mivel a programokat tartalmaz¾ hely nem elÚrhet§." + IDS_DEV_TRANSLATION_FAILED "Ez az eszk÷z nem vßlaszol a illeszt§programjßnak." IDS_DEV_NO_SOFTCONFIG "A ReactOS nem tudja kitalßlni a beßllÝtßsokat ehhez az eszk÷zh÷z. Hasznßld a felhasznßl¾i utasÝtßst, ami ehhez az eszk÷zh÷z jßr, Ús ßllÝtsd be az er§forrßsait." IDS_DEV_BIOS_TABLE "A szßmÝt¾gÚp nem tud elÚg informßci¾t adni, hogy ezt az eszk÷zt megfelel§en hasznßlja. "\ "Konzultßlj a gÚp karbantart¾jßval, illetve a cÚggel aki szßllÝtotta, hogy igÚnyelj egy firmware vagy BIOS frissÝtÚst." IDS_DEV_IRQ_TRANSLATION_FAILED "Ez az eszk÷z egy PCI megszakÝtßst igÚnyelt de ISA megszakÝtßst hasznßl (vagy fordÝtva). "\ - "Hasznßld a gÚphez kapott meghajt¾programokat, hogy beßllÝthasd megfelel§en." - IDS_DEV_FAILED_DRIVER_ENTRY "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt." - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt mivel egy el§z§ meghajt¾program mßr bevan t÷ltve a mem¾rißban." - IDS_DEV_DRIVER_FAILED_LOAD "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt. A meghajt¾program sÚr³lt vagy hißnyzik." + "Hasznßld a gÚphez kapott illeszt§programokat, hogy beßllÝthasd megfelel§en." + IDS_DEV_FAILED_DRIVER_ENTRY "A ReactOS nem tudja elindÝtani az eszk÷z illeszt§programjßt." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "A ReactOS nem tudja elindÝtani az eszk÷z illeszt§programjßt mivel egy el§z§ illeszt§program mßr bevan t÷ltve a mem¾rißban." + IDS_DEV_DRIVER_FAILED_LOAD "A ReactOS nem tudja elindÝtani az eszk÷z illeszt§programjßt. Az illeszt§program sÚr³lt vagy hißnyzik." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "A ReactOS nem tudja elÚrni ezt az eszk÷zt, mivel a szervÝz beßllÝtßsai a rendszerleÝr¾ban hibßsak vagy hißnyoznak." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "A ReactOS betudta t÷lteni az eszk÷z meghajt¾programjßt, de nem talßlja az eszk÷zt." - IDS_DEV_DUPLICATE_DEVICE "A ReactOS nem tudja elindÝtani az eszk÷z meghajt¾programjßt mivel mßr fut egy ilyen meghajt¾program." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "A ReactOS betudta t÷lteni az eszk÷z illeszt§programjßt, de nem talßlja az eszk÷zt." + IDS_DEV_DUPLICATE_DEVICE "A ReactOS nem tudja elindÝtani az eszk÷z illeszt§programjßt mivel mßr fut egy ilyen illeszt§program." IDS_DEV_FAILED_POST_START "A ReactOS leßllÝtotta ezt az eszk÷zt mert problÚmßk lÚptek fel." IDS_DEV_HALTED "Egy alkalmazßs vagy szolgßltatßs leßllÝtotta ezt az eszk÷zt." IDS_DEV_PHANTOM "Jelenleg ez az eszk÷z nincs a szßmÝt¾gÚphez csatlakoztatva." IDS_DEV_SYSTEM_SHUTDOWN "A ReactOS nem tud hozzßfÚrni ehhez az eszk÷zh÷z, mivel a rendszer a leßllÝtßs folyamatßban van." IDS_DEV_HELD_FOR_EJECT "A ReactOS nem tudja hasznßlni ezt az eszk÷zt, mivel a \"Biztonsßgos eltßvolÝtßs\" fßzisba ker³lt de mÚg nem lett eltßvolÝtva." - IDS_DEV_DRIVER_BLOCKED "Az eszk÷zh÷z tartoz¾ szoftver nem lett elindÝtva mivel nem m¹k÷dik a ReactOS-al. KÚrj egy friss meghajt¾program csomagot a gyßrt¾jßt¾l." + IDS_DEV_DRIVER_BLOCKED "Az eszk÷zh÷z tartoz¾ szoftver nem lett elindÝtva mivel nem m¹k÷dik a ReactOS-al. KÚrj egy friss illeszt§program csomagot a gyßrt¾jßt¾l." IDS_DEV_REGISTRY_TOO_LARGE "A ReactOS nem tudja elindÝtani ezt az eszk÷zt mert a rendszerleÝr¾ elÚrte a maximum mÚretÚt." IDS_DEV_SETPROPERTIES_FAILED "A ReactOS nem tudta megvßltoztatni az eszk÷z beßllÝtßsait." END @@ -129,16 +129,16 @@ IDD_DEVICEDRIVER DIALOG DISCARDABLE 0, 0, 252, 218 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Driver" +CAPTION "Illeszt§program" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Driver provider:", -1, 37, 39, 60, 8, SS_NOPREFIX + LTEXT "Illeszt§program szßllÝt¾ja:", -1, 37, 39, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Driver date:", -1, 37, 53, 60, 8, SS_NOPREFIX + LTEXT "Illeszt§program kiadßsa:", -1, 37, 53, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Driver version:", -1, 37, 67, 60, 8, SS_NOPREFIX + LTEXT "Illeszt§program verzi¾ja:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY END

18 years, 8 months

[ekohl] 20382: Report a logged-on user to the PnP-Manager.

by ekohl＠svn.reactos.com

Report a logged-on user to the PnP-Manager. This should trigger the driver installation. Modified: trunk/reactos/subsys/system/userinit/userinit.c _____ Modified: trunk/reactos/subsys/system/userinit/userinit.c --- trunk/reactos/subsys/system/userinit/userinit.c 2005-12-27 22:28:45 UTC (rev 20381) +++ trunk/reactos/subsys/system/userinit/userinit.c 2005-12-27 23:05:22 UTC (rev 20382) @@ -16,14 +16,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Userinit Logon Application * FILE: subsys/system/userinit/userinit.c * PROGRAMMERS: Thomas Weidenmueller (w3seek(a)users.sourceforge.net) */ #include <windows.h> +#include <cfgmgr32.h> #include "resource.h" @@ -142,16 +142,38 @@ } } + +typedef DWORD (WINAPI *PCMP_REPORT_LOGON)(DWORD, DWORD); + +static VOID +NotifyLogon(VOID) +{ + HINSTANCE hModule; + PCMP_REPORT_LOGON CMP_Report_LogOn; + + hModule = LoadLibrary(L"setupapi.dll"); + if (hModule) + { + CMP_Report_LogOn = (PCMP_REPORT_LOGON)GetProcAddress(hModule, "CMP_Report_LogOn"); + if (CMP_Report_LogOn) + CMP_Report_LogOn(CMP_MAGIC, GetCurrentProcessId()); + + FreeLibrary(hModule); + } +} + + #ifdef _MSC_VER #pragma warning(disable : 4100) #endif /* _MSC_VER */ int WINAPI WinMain(HINSTANCE hInst, - HINSTANCE hPrevInstance, - LPSTR lpszCmdLine, - int nCmdShow) + HINSTANCE hPrevInstance, + LPSTR lpszCmdLine, + int nCmdShow) { + NotifyLogon(); SetUserSettings(); StartShell(); return 0;

18 years, 8 months

[weiden] 20381: Patch by Andreas Ntakas <freedatanow@yahoo.com>:

by weiden＠svn.reactos.com

Patch by Andreas Ntakas <freedatanow(a)yahoo.com>: - Greek translation of aclui.dll Modified: trunk/reactos/lib/aclui/aclui.rc Added: trunk/reactos/lib/aclui/aclui_El.rc _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2005-12-27 22:00:43 UTC (rev 20380) +++ trunk/reactos/lib/aclui/aclui.rc 2005-12-27 22:28:45 UTC (rev 20381) @@ -10,6 +10,7 @@ IDB_USRGRPIMAGES BITMAP "res/usrgrp.bmp" #include "aclui_Ja.rc" +#include "aclui_El.rc" #include "aclui_En.rc" #include "aclui_De.rc" #include "aclui_Hu.rc" _____ Added: trunk/reactos/lib/aclui/aclui_El.rc --- trunk/reactos/lib/aclui/aclui_El.rc 2005-12-27 22:00:43 UTC (rev 20380) +++ trunk/reactos/lib/aclui/aclui_El.rc 2005-12-27 22:28:45 UTC (rev 20381) @@ -0,0 +1,28 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "?¾÷?ÙÕÚß" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&¤Ý³ýß¶ß ´ý?õ¨Ý ÛßÚ ¸±þ¾¶?Ý:", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "ð&±´¾ÞÌÛþ...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&?÷ß?±Õ¾þ", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "?Ú¶±¦Õ¶ßÚ", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "?´ÛÙÕ?Õ¶ßÚ", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "?Úß ÕÚõÚÛ? õÚÛßÚ?ýß¶ß Ì ±´¸¨±þý¦ÝÕ? ±§Þý?¾ÕÚ?, ß¶Ì¾¶Õ ¾¶´ ? Úß ð±´¸¨±þý¦Ý´§?.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "?&Úß ð±´¸¨±þý¦Ý´§?", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "?ÚÛßÚ?ýß¶ß ÒÚß ¶´ %1" + IDS_UNKNOWN "óÒÝ¨¾¶´" + IDS_SPECIAL_PERMISSIONS "?ÚõÚÛ? ?ÚÛßÚ?ýß¶ß" + IDS_PERMISSIONS_FOR "?ÚÛßÚ?ýß¶ß ÒÚß ¶´ %1" + IDS_PERMISSIONS "?ÚÛßÚ?ýß¶ß" +} + Property changes on: trunk/reactos/lib/aclui/aclui_El.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

18 years, 8 months

[fireball] 20380: Artem Reznikov: Ukrainian keyboard layout (bug 1200).

by fireball＠svn.reactos.com

Artem Reznikov: Ukrainian keyboard layout (bug 1200). Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/txtsetup.sif Modified: trunk/reactos/lib/keyboard/directory.xml Added: trunk/reactos/lib/keyboard/kbdur/ Added: trunk/reactos/lib/keyboard/kbdur/kbdur.c Added: trunk/reactos/lib/keyboard/kbdur/kbdur.def Added: trunk/reactos/lib/keyboard/kbdur/kbdur.rc Added: trunk/reactos/lib/keyboard/kbdur/kbdur.xml _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-12-27 21:22:27 UTC (rev 20379) +++ trunk/reactos/bootdata/hivesys.inf 2005-12-27 22:00:43 UTC (rev 20380) @@ -54,6 +54,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout Text",0x00000000,"Russian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layou t File",0x00000000,"kbdur.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layou t Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout Text",0x00000000,"UK" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000807","Layout File",0x00000000,"kbdsg.dll" _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-12-27 21:22:27 UTC (rev 20379) +++ trunk/reactos/bootdata/txtsetup.sif 2005-12-27 22:00:43 UTC (rev 20380) @@ -98,6 +98,7 @@ 0000041D = "Swedish (Sweden)" 00000807 = "German (Swiss)" 00000408 = "Greek" +00000422 = "Ukrainian" 00010408 = "Greek 220" [Files.KeyboardLayout] @@ -110,6 +111,7 @@ 0000040E = kbdhu.dll 00000419 = kbdru.dll 0000041D = kbdse.dll +00000422 = kbdur.dll 00000809 = kbduk.dll 00000807 = kbdsg.dll 00000813 = kbdbe.dll _____ Modified: trunk/reactos/lib/keyboard/directory.xml --- trunk/reactos/lib/keyboard/directory.xml 2005-12-27 21:22:27 UTC (rev 20379) +++ trunk/reactos/lib/keyboard/directory.xml 2005-12-27 22:00:43 UTC (rev 20380) @@ -41,4 +41,7 @@ <directory name="kbdbe"> <xi:include href="kbdbe/kbdbe.xml" /> </directory> + <directory name="kbdur"> + <xi:include href="kbdur/kbdur.xml" /> + </directory> </group> _____ Added: trunk/reactos/lib/keyboard/kbdur/kbdur.c --- trunk/reactos/lib/keyboard/kbdur/kbdur.c 2005-12-27 21:22:27 UTC (rev 20379) +++ trunk/reactos/lib/keyboard/kbdur/kbdur.c 2005-12-27 22:00:43 UTC (rev 20380) @@ -0,0 +1,407 @@ +/* + * ReactOS Ukrainian ASCII Keyboard layout + * Copyright (C) 2005 ReactOS + * Author: Artem Reznikov + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + /* - 37 - */ + /* Bottom Row */ + 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ + VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + /* - 72 - */ + VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ + 0, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 3, + { 0, 1, 2, 3, 0, 0, 0xC0 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + {VK_OEM_3, CAPS, {0x451, 0x401} }, + { '1', NOCAPS, {'1', '!'} }, + { '3', NOCAPS, {'3', 0x2116} }, + { '4', NOCAPS, {'4', ';'} }, + { '5', NOCAPS, {'5', '%'} }, + { '7', NOCAPS, {'7', '?'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + { VK_OEM_PLUS, NOCAPS, {'=', '+'} }, + + /* First letter row */ + { 'Q', CAPS, {0x439, 0x419} }, + { 'W', CAPS, {0x446, 0x426} }, + { 'E', CAPS, {0x443, 0x423} }, + { 'R', CAPS, {0x43a, 0x41a} }, + { 'T', CAPS, {0x435, 0x415} }, + { 'Y', CAPS, {0x43d, 0x41d} }, + { 'U', CAPS, {0x433, 0x413} }, + { 'I', CAPS, {0x448, 0x428} }, + { 'O', CAPS, {0x449, 0x429} }, + { 'P', CAPS, {0x437, 0x417} }, + { VK_OEM_4, CAPS, {0x445, 0x425} }, + { VK_OEM_6, CAPS, {0x457, 0x407} }, + + /* Second letter row */ + { 'A', CAPS, {0x444, 0x424} }, + { 'S', CAPS, {0x456, 0x406} }, + { 'D', CAPS, {0x432, 0x412} }, + { 'F', CAPS, {0x430, 0x410} }, + { 'G', CAPS, {0x43f, 0x41f} }, + { 'H', CAPS, {0x440, 0x420} }, + { 'J', CAPS, {0x43e, 0x41e} }, + { 'K', CAPS, {0x43b, 0x41b} }, + { 'L', CAPS, {0x434, 0x414} }, + { VK_OEM_1, CAPS, {0x436, 0x416} }, + { VK_OEM_7, CAPS, {0x454, 0x404} }, + + /* Third letter row */ + { 'Z', CAPS, {0x44f, 0x42f} }, + { 'X', CAPS, {0x447, 0x427} }, + { 'C', CAPS, {0x441, 0x421} }, + { 'V', CAPS, {0x43c, 0x41c} }, + { 'B', CAPS, {0x438, 0x418} }, + { 'N', CAPS, {0x442, 0x422} }, + { 'M', CAPS, {0x44c, 0x42c} }, + { VK_OEM_COMMA,CAPS, {0x431, 0x411} }, + { VK_OEM_PERIOD,CAPS, {0x44e, 0x42e} }, + { VK_OEM_2, NOCAPS, {'.', ','} }, + + /* Specials */ + { 0x6e, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {9, 9} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_5, NOCAPS, {0x5c, 0x2f, 0x1c} }, + { VK_OEM_102, NOCAPS, {0x5c, 0x2f, 0x1c} }, + { VK_BACK, NOCAPS, {0x8, 0x8, 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ + { '2', NOCAPS, {'2', '\"', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', ':', WCH_NONE, 0x001e} }, + { 'U', CAPS, {0x433, 0x413, 0x0491, 0x0490} }, + { VK_OEM_MINUS, NOCAPS, {0x2d, '_', WCH_NONE, 0x001f} }, // different '-' + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0,0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + vk_master(2,key_to_chars_2mod), + vk_master(1,keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL } +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Control" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4b, L"Left" }, +//{ 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"Help" }, + { 0x5b, L"Left <ReactOS>" }, + { 0x5c, L"Right <ReactOS>" }, + { 0x5d, L"Application" }, + { 0, NULL } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Ukrainian doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor() { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + return 1; +} + Property changes on: trunk/reactos/lib/keyboard/kbdur/kbdur.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/keyboard/kbdur/kbdur.def --- trunk/reactos/lib/keyboard/kbdur/kbdur.def 2005-12-27 21:22:27 UTC (rev 20379) +++ trunk/reactos/lib/keyboard/kbdur/kbdur.def 2005-12-27 22:00:43 UTC (rev 20380) @@ -0,0 +1,8 @@ +; +; ReactOS Operating System +; +LIBRARY kbdur.dll + +EXPORTS +KbdLayerDescriptor@0 +;EOF Property changes on: trunk/reactos/lib/keyboard/kbdur/kbdur.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/keyboard/kbdur/kbdur.rc --- trunk/reactos/lib/keyboard/kbdur/kbdur.rc 2005-12-27 21:22:27 UTC (rev 20379) +++ trunk/reactos/lib/keyboard/kbdur/kbdur.rc 2005-12-27 22:00:43 UTC (rev 20380) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Ukrainian Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdur\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdur.dll\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/lib/keyboard/kbdur/kbdur.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/keyboard/kbdur/kbdur.xml --- trunk/reactos/lib/keyboard/kbdur/kbdur.xml 2005-12-27 21:22:27 UTC (rev 20379) +++ trunk/reactos/lib/keyboard/kbdur/kbdur.xml 2005-12-27 22:00:43 UTC (rev 20380) @@ -0,0 +1,9 @@ +<module name="kbdur" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdur.dll" allowwarnings="true"> + <importlibrary definition="kbdur.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdur.c</file> + <file>kbdur.rc</file> +</module> Property changes on: trunk/reactos/lib/keyboard/kbdur/kbdur.xml ___________________________________________________________________ Name: svn:eol-style + native

18 years, 8 months

[fireball] 20379: USB 2.5.0 -> 2.6.14.3 upgrade: Add some interrupt-related stuff into device extension (will be used after future commits)

by fireball＠svn.reactos.com

USB 2.5.0 -> 2.6.14.3 upgrade: Add some interrupt-related stuff into device extension (will be used after future commits) Modified: trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h _____ Modified: trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h --- trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h 2005-12-27 21:01:58 UTC (rev 20378) +++ trunk/reactos/drivers/usb/miniport/common/usbcommon_types.h 2005-12-27 21:22:27 UTC (rev 20379) @@ -17,11 +17,17 @@ PDEVICE_OBJECT NextDeviceObject; //UNICODE_STRING RegistryPath; UNICODE_STRING HcdInterfaceName; - //PKINTERRUPT InterruptObject; //KSPIN_LOCK InterruptSpinLock; PCM_RESOURCE_LIST AllocatedResources; + + /* Interrupt-related info */ + PKINTERRUPT InterruptObject; ULONG InterruptVector; ULONG InterruptLevel; + KINTERRUPT_MODE InterruptMode; + BOOLEAN InterruptShare; + KAFFINITY InterruptAffinity; + PHYSICAL_ADDRESS BaseAddress; ULONG BaseAddrLength; ULONG Flags;

18 years, 8 months

[fireball] 20378: USB 2.5.0 -> 2.6.14.3 upgrade: Store actual bus number by querying upper-laying driver.

by fireball＠svn.reactos.com

USB 2.5.0 -> 2.6.14.3 upgrade: Store actual bus number by querying upper-laying driver. Modified: trunk/reactos/drivers/usb/miniport/common/fdo.c _____ Modified: trunk/reactos/drivers/usb/miniport/common/fdo.c --- trunk/reactos/drivers/usb/miniport/common/fdo.c 2005-12-27 21:00:19 UTC (rev 20377) +++ trunk/reactos/drivers/usb/miniport/common/fdo.c 2005-12-27 21:01:58 UTC (rev 20378) @@ -58,6 +58,8 @@ PUSBMP_DRIVER_EXTENSION DriverExtension; PUSBMP_DEVICE_EXTENSION DeviceExtension; PCM_RESOURCE_LIST AllocatedResources; + ULONG Size; + NTSTATUS Status; if (DeviceObject == KeyboardFdo || DeviceObject == MouseFdo) return STATUS_SUCCESS; @@ -142,6 +144,23 @@ DeviceExtension->BaseAddress, DeviceExtension->BaseAddrLength); + /* Get bus number from the upper level bus driver. */ + Size = sizeof(ULONG); + Status = IoGetDeviceProperty( + DeviceExtension->PhysicalDeviceObject, + DevicePropertyBusNumber, + Size, + &DeviceExtension->SystemIoBusNumber, + &Size); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBMP: IoGetDeviceProperty DevicePropertyBusNumber failed\n"); + DeviceExtension->SystemIoBusNumber = 0; + } + + DPRINT("USBMP: Busnumber %d\n", DeviceExtension->SystemIoBusNumber); + /* Init wrapper with this object */ return InitLinuxWrapper(DeviceObject); }

18 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005