Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59057: [APPWIZ] * Update the German translation. By Robert Naumann. CORE-7200 #resolve #comment Committed in r59057. Danke !
by akhaldi＠svn.reactos.org 20 May '13

20 May '13

Author: akhaldi Date: Mon May 20 18:25:05 2013 New Revision: 59057 URL: http://svn.reactos.org/svn/reactos?rev=59057&view=rev Log: [APPWIZ] * Update the German translation. By Robert Naumann. CORE-7200 #resolve #comment Committed in r59057. Danke ! Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] Mon May 20 18:25:05 2013 @@ -51,17 +51,17 @@ STRINGTABLE BEGIN - IDS_DOWNLOADING "Downloading..." - IDS_INSTALLING "Installing..." - IDS_INVALID_SHA "Unexpected checksum of downloaded file. Aborting installation of corrupted file." + IDS_DOWNLOADING "Lade herunter..." + IDS_INSTALLING "Installiere..." + IDS_INVALID_SHA "Die heruntergeladene Datei hat eine unerwartete Prüfsumme. Abbruch der Installation aufgrund beschädigter Datei." END ID_DWL_GECKO_DIALOG DIALOG 0, 0, 260, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Wine Gecko Installer" +CAPTION "Wine Gecko Installation" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Wine could not find a Gecko package which is needed for applications embedding HTML to work correctly. Wine can automatically download and install it for you.\n\nNote: it is recommended to use your distribution's packages instead. See <a href=""http://wiki.winehq.org/Gecko"">http://wiki.winehq.org/Gecko</a> for details.", + CONTROL "ReactOS konnte kein Gecko-Paket finden, welches für die korrekte Ausführung von Anwendungen mit eingebettetem HTML benötigt wird. ReactOS kann es automatisch für Sie herunterladen und installieren.\n\nAnmerkung: es wir empfohlen das entsprechende Paket Ihrer Distribution zu verwenden. Weitere Details auf: <a href=""http://wiki.winehq.org/Gecko"">http://wiki.winehq.org/Gecko</a>", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP

1 0

[ekohl] 59056: [WELCOME] Adding RTL support for welcome. Patch by Baruch Rutman. CORE-7123 #resolve #comment Committed in revision 59056.
by ekohl＠svn.reactos.org 20 May '13

20 May '13

Author: ekohl Date: Mon May 20 18:10:30 2013 New Revision: 59056 URL: http://svn.reactos.org/svn/reactos?rev=59056&view=rev Log: [WELCOME] Adding RTL support for welcome. Patch by Baruch Rutman. CORE-7123 #resolve #comment Committed in revision 59056. Modified: trunk/reactos/base/setup/welcome/lang/he-IL.rc trunk/reactos/base/setup/welcome/welcome.c Modified: trunk/reactos/base/setup/welcome/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/he… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/he-IL.rc [iso-8859-1] Mon May 20 18:10:30 2013 @@ -12,7 +12,6 @@ // IDS_CHECKTEXT "××¨×× ×××× ×× ×©××" // IDS_CLOSETEXT "××¦×××" END -/* The topic pane needs to be in the right side because Hebrew is written in opposite of english */ /* Topic buttons */ STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Mon May 20 18:10:30 2013 @@ -36,6 +36,7 @@ #include <winuser.h> #include <reactos/version.h> #include <tchar.h> +#include <winnls.h> #include "resource.h" @@ -115,6 +116,16 @@ UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpszCmdLine); + + switch (GetUserDefaultUILanguage()) + { + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; + + default: + break; + } hInstance = hInst;

1 0

[hbelusca] 59055: [CMD] - Simplify CommandColor and document it. Checking whether one sets the same color for both foreground and background is now only checked inside SetScreenColor. Based on a pa...
by hbelusca＠svn.reactos.org 20 May '13

20 May '13

Author: hbelusca Date: Mon May 20 17:43:37 2013 New Revision: 59055 URL: http://svn.reactos.org/svn/reactos?rev=59055&view=rev Log: [CMD] - Simplify CommandColor and document it. Checking whether one sets the same color for both foreground and background is now only checked inside SetScreenColor. Based on a patch by Victor CORE-7191 #resolve #comment Committed in rev.59055. - Fix handling of /T:<color> option when starting cmd.exe - Remove unneeded error string. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/resource.h trunk/reactos/base/shell/cmd/strtoclr.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon May 20 17:43:37 2013 @@ -1733,9 +1733,9 @@ #ifdef INCLUDE_CMD_COLOR else if (!_tcsnicmp(ptr, _T("/T:"), 3)) { - /* process /t (color) argument */ + /* process /T (color) argument */ wDefColor = (WORD)_tcstoul(&ptr[3], &ptr, 16); - SetScreenColor(wDefColor, TRUE); + SetScreenColor(wDefColor, FALSE); } #endif else if (option == _T('U')) Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Mon May 20 17:43:37 2013 @@ -144,7 +144,7 @@ LPCTSTR GetParsedEnvVar ( LPCTSTR varName, UINT* varNameLen, BOOL ModeSetA ); /* Prototypes for COLOR.C */ -VOID SetScreenColor(WORD wArgColor, BOOL bFill); +BOOL SetScreenColor(WORD wColor, BOOL bNoFill); INT CommandColor (LPTSTR); VOID ConInDummy (VOID); Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/color.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/color.c [iso-8859-1] Mon May 20 17:43:37 2013 @@ -24,34 +24,34 @@ #ifdef INCLUDE_CMD_COLOR -VOID SetScreenColor (WORD wColor, BOOL bNoFill) +BOOL SetScreenColor(WORD wColor, BOOL bNoFill) { HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; + /* Foreground and Background colors can't be the same */ + if ((wColor & 0x0F) == (wColor & 0xF0) >> 4) + return FALSE; - if ((wColor & 0xF) == (wColor &0xF0) >> 4) + /* Fill the whole background if needed */ + if (bNoFill != TRUE) { - ConErrResPuts(STRING_COLOR_ERROR1); + GetConsoleScreenBufferInfo(hConsole, &csbi); + + coPos.X = 0; + coPos.Y = 0; + FillConsoleOutputAttribute(hConsole, + wColor & 0x00FF, + csbi.dwSize.X * csbi.dwSize.Y, + coPos, + &dwWritten); } - else - { - if (bNoFill != TRUE) - { - GetConsoleScreenBufferInfo (hConsole, &csbi); - coPos.X = 0; - coPos.Y = 0; - FillConsoleOutputAttribute (hConsole, - (WORD)(wColor & 0x00FF), - (csbi.dwSize.X)*(csbi.dwSize.Y), - coPos, - &dwWritten); - } - SetConsoleTextAttribute (hConsole, (WORD)(wColor & 0x00FF)); - } + /* Set the text attribute */ + SetConsoleTextAttribute(hConsole, wColor & 0x00FF); + return TRUE; } /* @@ -59,73 +59,77 @@ * * internal dir command */ -INT CommandColor (LPTSTR rest) +INT CommandColor(LPTSTR rest) { - WORD wColor; + WORD wColor = 0x00; - if (_tcsncmp (rest, _T("/?"), 2) == 0) + /* The user asked for help */ + if (_tcsncmp(rest, _T("/?"), 2) == 0) { - ConOutResPaging(TRUE,STRING_COLOR_HELP1); + ConOutResPaging(TRUE, STRING_COLOR_HELP1); return 0; } + /* Let's prepare %ERRORLEVEL% */ nErrorLevel = 0; + /* No parameter. Set the default colors */ if (rest[0] == _T('\0')) { - /* set default color */ - wColor = wDefColor; - SetScreenColor (wColor, FALSE); + SetScreenColor(wDefColor, FALSE); return 0; } - - if ( _tcslen(&rest[0])==1) + /* The parameter is just one character: Set color text */ + if (_tcslen(rest) == 1) { - HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); - if ( (_tcscmp(&rest[0], _T("0")) >=0 ) && (_tcscmp(&rest[0], _T("9")) <=0 ) ) - { - SetConsoleTextAttribute (hConsole, (WORD)_ttoi(rest)); - return 0; - } - else if ( (_tcscmp(&rest[0], _T("a")) >=0 ) && (_tcscmp(&rest[0], _T("f")) <=0 ) ) - { - SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10 - _T('a')) ); - return 0; - } - else if ( (_tcscmp(&rest[0], _T("A")) >=0 ) && (_tcscmp(&rest[0], _T("F")) <=0 ) ) - { - SetConsoleTextAttribute (hConsole, (WORD) (rest[0] + 10 - _T('A')) ); - return 0; - } - ConErrResPuts(STRING_COLOR_ERROR2); - nErrorLevel = 1; - return 1; + if ((rest[0] >= _T('0')) && (rest[0] <= _T('9'))) + { + wColor = (WORD)_ttoi(rest); + } + else if ((rest[0] >= _T('a')) && (rest[0] <= _T('f'))) + { + wColor = (WORD)(rest[0] + 10 - _T('a')); + } + else if ((rest[0] >= _T('A')) && (rest[0] <= _T('F'))) + { + wColor = (WORD)(rest[0] + 10 - _T('A')); + } + else /* Invalid character */ + { + ConOutResPaging(TRUE, STRING_COLOR_HELP1); + nErrorLevel = 1; + return 1; + } } - - if (StringToColor(&wColor, &rest) == FALSE) + /* Color string: advanced choice: two-digits, "Color ON Color" , "Foreground ON Background" */ + else if (StringToColor(&wColor, &rest) == FALSE) { - ConErrResPuts(STRING_COLOR_ERROR2); + /* Invalid color string */ + ConOutResPaging(TRUE, STRING_COLOR_HELP1); nErrorLevel = 1; return 1; } - if (((bc) && (bc->bEcho)) || !bc) + /* Print the chosen color if we are in echo mode (NOTE: Not Windows-compliant) */ + if ((bc && bc->bEcho) || !bc) { ConErrResPrintf(STRING_COLOR_ERROR3, wColor); } - if ((wColor & 0xF) == (wColor &0xF0) >> 4) + /* + * Set the chosen color. Use also the following advanced flag: + * /-F to avoid changing already buffered foreground/background. + */ + if (SetScreenColor(wColor, (_tcsstr(rest, _T("/-F")) || _tcsstr(rest, _T("/-f")))) == FALSE) { - ConErrResPrintf(STRING_COLOR_ERROR4, wColor); + /* Failed because foreground and background colors were the same */ + ConErrResPuts(STRING_COLOR_ERROR1); nErrorLevel = 1; return 1; } - /* set color */ - SetScreenColor(wColor, - (_tcsstr (rest,_T("/-F")) || _tcsstr (rest,_T("/-f")))); - + /* Return success */ return 0; } Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -634,7 +634,6 @@ STRING_COLOR_ERROR1, "Fehler: Hinter- und Vordergrund kÃ¶nnen nicht die selben Farben haben!" STRING_COLOR_ERROR2, "Fehler in der Farbangabe" STRING_COLOR_ERROR3, "Farbe %x\n" -STRING_COLOR_ERROR4, "Fehler: Die selben Farben!" STRING_CONSOLE_ERROR, "Unbekannter Fehler: %d\n" STRING_COPY_ERROR1, "Fehler: Quelle kann nicht geÃ¶ffnet werden - %s!\n" STRING_COPY_ERROR2, "Fehler: Kann nicht Ã¼ber sich selbst kopiert werden.\n" Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -634,7 +634,6 @@ STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" STRING_COLOR_ERROR3, "Color %x\n" -STRING_COLOR_ERROR4, "same colors error!" STRING_CONSOLE_ERROR, "ÎÎ³Î½ÏÏÏÎ¿ ÏÏÎ¬Î»Î¼Î±: %d\n" STRING_COPY_ERROR1, "Î£ÏÎ¬Î»Î¼Î±: ÎÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÏ ÏÎ¿ Î¬Î½Î¿Î¹Î³Î¼Î± ÏÎ·Ï ÏÎ·Î³Î®Ï - %s!\n" STRING_COPY_ERROR2, "Î£ÏÎ¬Î»Î¼Î±: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -637,7 +637,6 @@ STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" STRING_COLOR_ERROR3, "Color %x\n" -STRING_COLOR_ERROR4, "same colors error!" STRING_CONSOLE_ERROR, "Unknown error: %d\n" STRING_COPY_ERROR1, "Error: Cannot open source - %s!\n" STRING_COPY_ERROR2, "Error: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -637,7 +637,6 @@ STRING_COLOR_ERROR1, "Â¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)" STRING_COLOR_ERROR2, "Error en la especificaciÃ³n del color" STRING_COLOR_ERROR3, "Color %x\n" -STRING_COLOR_ERROR4, "Â¡Error: mismos colores!" STRING_CONSOLE_ERROR, "Error desconocido: %d\n" STRING_COPY_ERROR1, "Error: No se puede abrir el origen - %s!\n" STRING_COPY_ERROR2, "Error: Â¡No se puede copiar sobre si mismo!\n" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -652,7 +652,6 @@ STRING_COLOR_ERROR1, "L'arriÃ¨re plan et l'avant plan ne peuvent Ãªtre de la mÃªme couleur" STRING_COLOR_ERROR2, "Erreur dans la spÃ©cification des couleurs" STRING_COLOR_ERROR3, "Couleur %x\n" -STRING_COLOR_ERROR4, "Erreur : mÃªme couleur!" STRING_CONSOLE_ERROR, "Erreur inconnue : %d\n" STRING_COPY_ERROR1, "Erreur : Ne peut ouvrir la source - %s !\n" STRING_COPY_ERROR2, "Erreur : Ne peut copier le fichier sur lui-mÃªme !\n" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -616,7 +616,6 @@ STRING_COLOR_ERROR1, "Ugyanaz a szÃn nem lehet! (Az elÃµ- Ã©s hÃ¡ttÃ©rszÃn nem lehet ugyanolyan)" STRING_COLOR_ERROR2, "HibÃ¡s szÃn megadÃ¡s" STRING_COLOR_ERROR3, "SzÃn %x\n" -STRING_COLOR_ERROR4, "Ugyanaz a szÃn nem lehet!" STRING_CONSOLE_ERROR, "Ismeretlen hiba: %d\n" STRING_COPY_ERROR1, "Hiba: a forrÃ¡s nem nyithatÃ³ meg - %s!\n" STRING_COPY_ERROR2, "Hiba: nem mÃ¡solhatod Ã¶nmagÃ¡ra az Ã¡llomÃ¡nyt!\n" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -636,7 +636,6 @@ STRING_COLOR_ERROR1, "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)" STRING_COLOR_ERROR2, "Kesalahan dalam spesifikasi warna" STRING_COLOR_ERROR3, "Warna %x\n" -STRING_COLOR_ERROR4, "warna sama salah!" STRING_CONSOLE_ERROR, "Kesalahan tidak dikenal: %d\n" STRING_COPY_ERROR1, "Salah: Tidak dapat membuka sumber - %s!\n" STRING_COPY_ERROR2, "Salah: Tidak dapat mengcopy ke dirinya sendiri!\n" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -642,7 +642,6 @@ STRING_COLOR_ERROR1, "Il colore di primo piano e sfondo non possono essere uguali" STRING_COLOR_ERROR2, "errore nella indicazione dei colori" STRING_COLOR_ERROR3, "Colore %x\n" -STRING_COLOR_ERROR4, "i colori non possono essere uguali!" STRING_CONSOLE_ERROR, "errore sconosciuto: %d\n" STRING_COPY_ERROR1, "Errore: Impossibile aprire il file sorgente - %s!\n" STRING_COPY_ERROR2, "Errore: Impossibile copiare un file su se stesso!\n" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -642,7 +642,6 @@ STRING_COLOR_ERROR1, "ã¨ã©ã¼! åãè²ãæå®ããã¾ããã\n (åæ¯è²ã¨èæ¯è²ãåãè²ã«ãããã¨ã¯ã§ãã¾ãã)" STRING_COLOR_ERROR2, "è²ã®æå®ã«åé¡ãããã¾ãã" STRING_COLOR_ERROR3, "Color %x\n" -STRING_COLOR_ERROR4, "ã¨ã©ã¼! åãè²ãæå®ããã¾ããã" STRING_CONSOLE_ERROR, "ä¸æãªã¨ã©ã¼: %d\n" STRING_COPY_ERROR1, "ã¨ã©ã¼: åã®ãã¡ã¤ã« %s ãéãã¾ãã!\n" STRING_COPY_ERROR2, "ã¨ã©ã¼: ã³ãã¼åã¨ã³ãã¼åãä¸ç·ã§ã!\n" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -629,7 +629,6 @@ STRING_COLOR_ERROR1, "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)" STRING_COLOR_ERROR2, "feil i farge spesifikasjon" STRING_COLOR_ERROR3, "Farge %x\n" -STRING_COLOR_ERROR4, "samme farge feil!" STRING_CONSOLE_ERROR, "Ukjent feil: %d\n" STRING_COPY_ERROR1, "Feil: kan ikke Ã¥pne kilden - %s!\n" STRING_COPY_ERROR2, "Feil: kan ikke kopiere til seg selv!\n" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -637,7 +637,6 @@ STRING_COLOR_ERROR1, "BÅÄd! Kolor tÅa i tekstu nie moÅ¼e byÄ taki sam" STRING_COLOR_ERROR2, "BÅÄd w oznaczeniu kolorÃ³w." STRING_COLOR_ERROR3, "Kolor %x\n" -STRING_COLOR_ERROR4, "BÅÄd - kolory takie same!" STRING_CONSOLE_ERROR, "Nieznany bÅÄd: %d\n" STRING_COPY_ERROR1, "BÅÄd: Nie moÅ¼na otworzyÄ ÅºrÃ³dÅa - %s!\n" STRING_COPY_ERROR2, "BÅÄd: Nie moÅ¼na przekopiowaÄ pliku na niego samego!\n" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -681,7 +681,6 @@ STRING_COLOR_ERROR1, "Eroare de culoare identicÄ! (Culorile nu trebuie sÄ fie identice)" STRING_COLOR_ERROR2, "Eroare la specificarea culorii" STRING_COLOR_ERROR3, "Culoare %x\n" -STRING_COLOR_ERROR4, "Eroare de culoare identicÄ!" STRING_CONSOLE_ERROR, "Eroare necunoscutÄ: %d\n" STRING_COPY_ERROR1, "Eroare: Nu se poate deschide fiÈierul - Â«%sÂ»!\n" STRING_COPY_ERROR2, "Eroare: Nu se poate copia peste el Ã®nsuÈi!\n" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -641,7 +641,6 @@ STRING_COLOR_ERROR1, "ÐÐ´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐµ ÑÐ²ÐµÑÐ°! (Ð¦Ð²ÐµÑÐ° ÑÐ¾Ð½Ð° Ð¸ ÑÐµÐºÑÑÐ° Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸)" STRING_COLOR_ERROR2, "Ð¾ÑÐ¸Ð±ÐºÐ° Ð² ÑÐºÐ°Ð·Ð°Ð½Ð¸Ð¸ ÑÐ²ÐµÑÐ°" STRING_COLOR_ERROR3, "Ð¦Ð²ÐµÑ %x\n" -STRING_COLOR_ERROR4, "ÐÐ´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐµ ÑÐ²ÐµÑÐ°!" STRING_CONSOLE_ERROR, "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°: %d\n" STRING_COPY_ERROR1, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº - %s!\n" STRING_COPY_ERROR2, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² ÑÐµÐ±Ñ!\n" Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -641,7 +641,6 @@ STRING_COLOR_ERROR1, "Same colors error! (Background and foreground can't be the same color)" STRING_COLOR_ERROR2, "error in color specification" STRING_COLOR_ERROR3, "Color %x\n" -STRING_COLOR_ERROR4, "same colors error!" STRING_CONSOLE_ERROR, "NeznÃ¡ma chyba: %d\n" STRING_COPY_ERROR1, "Chyba: Cannot open source - %s!\n" STRING_COPY_ERROR2, "Chyba: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -629,7 +629,6 @@ STRING_COLOR_ERROR1, "Samme farge feil! (Bakgrunn och forgrunn kan inte ha samme farge)" STRING_COLOR_ERROR2, "feil i farge spesifikasjon" STRING_COLOR_ERROR3, "Farge %x\n" -STRING_COLOR_ERROR4, "samme farge feil!" STRING_CONSOLE_ERROR, "Ukjent feil: %d\n" STRING_COPY_ERROR1, "Feil: kan inte Ã¥pne kilden - %s!\n" STRING_COPY_ERROR2, "Feil: kan inte kopiere til seg selv!\n" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -643,7 +643,6 @@ STRING_COLOR_ERROR1, "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° - Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²i ÐºÐ¾Ð»ÑÐ¾ÑÐ¸! (ÑÐ»Ð¾ ÑÐ° ÑÐµÐºÑÑ Ð½Ðµ Ð¼Ð¾Ð¶ÑÑÑ Ð±ÑÑÐ¸ Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²Ð¾Ð³Ð¾ ÐºÐ¾Ð»ÑÐ¾ÑÑ)" STRING_COLOR_ERROR2, "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð½i ÐºÐ¾Ð»ÑÐ¾ÑÑ" STRING_COLOR_ERROR3, "ÐÐ¾Ð»iÑ %x\n" -STRING_COLOR_ERROR4, "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° - Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²i ÐºÐ¾Ð»ÑÐ¾ÑÐ¸!" STRING_CONSOLE_ERROR, "ÐÐµÐ²iÐ´Ð¾Ð¼Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°: %d\n" STRING_COPY_ERROR1, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²iÐ´ÐºÑÐ¸ÑÐ¸ Ð´Ð¶ÐµÑÐµÐ»Ð¾ - %s!\n" STRING_COPY_ERROR2, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÐºÐ¾Ð¿iÑÐ²Ð°ÑÐ¸ Ð² ÑÐµÐ±Ðµ!\n" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Mon May 20 17:43:37 2013 @@ -601,7 +601,6 @@ STRING_COLOR_ERROR1, "åæ ·é¢è²éè¯¯ï¼ (èæ¯ååæ¯ä¸è½åè²)" STRING_COLOR_ERROR2, "é¢è²æå®éè¯¯" STRING_COLOR_ERROR3, "é¢è² %x\n" -STRING_COLOR_ERROR4, "åæ ·é¢è²éè¯¯ï¼" STRING_CONSOLE_ERROR, "æªç¥éè¯¯ï¼%d\n" STRING_COPY_ERROR1, "éè¯¯ï¼æ æ³æå¼æº - %sï¼\n" STRING_COPY_ERROR2, "éè¯¯ï¼æ æ³å¤å¶å°èªèº«ï¼\n" Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Mon May 20 17:43:37 2013 @@ -34,13 +34,12 @@ #define STRING_COLOR_ERROR1 314 #define STRING_COLOR_ERROR2 315 #define STRING_COLOR_ERROR3 316 -#define STRING_COLOR_ERROR4 317 -#define STRING_CONSOLE_ERROR 318 -#define STRING_COPY_ERROR1 319 -#define STRING_COPY_ERROR2 320 -#define STRING_COPY_ERROR3 321 -#define STRING_COPY_ERROR4 322 -#define STRING_DATE_ERROR 323 +#define STRING_CONSOLE_ERROR 317 +#define STRING_COPY_ERROR1 320 +#define STRING_COPY_ERROR2 321 +#define STRING_COPY_ERROR3 322 +#define STRING_COPY_ERROR4 323 +#define STRING_DATE_ERROR 324 #define STRING_DEL_ERROR5 328 #define STRING_DEL_ERROR6 329 #define STRING_DEL_ERROR7 330 Modified: trunk/reactos/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/strtoclr.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/strtoclr.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/strtoclr.c [iso-8859-1] Mon May 20 17:43:37 2013 @@ -10,10 +10,12 @@ * */ -/*only -BOOL StringToColor(LPWORD lpColor, LPTSTR*str) -is to be called -other are internal service functions*/ +/* + * Only + * BOOL StringToColor(LPWORD lpColor, LPTSTR*str) + * has to be called. + * Other are internal service functions. + */ #include "precomp.h" @@ -23,14 +25,14 @@ #define _I FOREGROUND_INTENSITY -/*return values for chop_blank*/ -#define CP_OK 0 -#define CP_BLANK_NOT_FOUND 1 -#define CP_END_OF_STRING 2 - +/* Return values for chop_blank */ +#define CP_OK 0 +#define CP_BLANK_NOT_FOUND 1 +#define CP_END_OF_STRING 2 + +/* NOTE: See the description for these flags in the StringToColor()'s description */ #define SC_HEX 0x0100 #define SC_TXT 0x0200 - typedef struct _CLRTABLE @@ -42,58 +44,55 @@ CLRTABLE clrtable[] = { - {_T("bla") ,0 }, - {_T("blu") ,_B }, - {_T("gre") ,_G }, - {_T("cya") ,_B|_G }, - {_T("red") ,_R }, - {_T("mag") ,_B|_R }, - {_T("yel") ,_R|_G }, - {_T("whi") ,_R|_G|_B }, - {_T("gra") ,_I }, - - - {_T("0") ,0 }, - {_T("2") ,_G }, - {_T("3") ,_B|_G }, - {_T("4") ,_R }, - {_T("5") ,_B|_R }, - {_T("6") ,_R|_G }, - {_T("7") ,_R|_G|_B }, - - {_T("8") ,_I }, - {_T("9") ,_I|_B }, - {_T("10") ,_I|_G }, - {_T("11") ,_I|_B|_G }, - {_T("12") ,_I|_R }, - {_T("13") ,_I|_B|_R }, - {_T("14") ,_I|_R|_G }, - {_T("15") ,_I|_R|_G|_B }, - - - /* note that 1 is at the end of list - to avoid to confuse it with 10-15*/ - {_T("1") ,_B }, - - /*cyan synonimous*/ - {_T("aqu") ,_B|_G }, - /*magenta synonimous*/ - {_T("pur") ,_B|_R }, - + {_T("bla"), 0 }, + {_T("blu"), _B }, + {_T("gre"), _G }, + {_T("cya"), _B|_G }, + {_T("red"), _R }, + {_T("mag"), _B|_R }, + {_T("yel"), _R|_G }, + {_T("whi"), _R|_G|_B }, + {_T("gra"), _I }, + + {_T("0") , 0 }, + {_T("2") , _G }, + {_T("3") , _B|_G }, + {_T("4") , _R }, + {_T("5") , _B|_R }, + {_T("6") , _R|_G }, + {_T("7") , _R|_G|_B }, + + {_T("8") , _I }, + {_T("9") , _I|_B }, + {_T("10") , _I|_G }, + {_T("11") , _I|_B|_G }, + {_T("12") , _I|_R }, + {_T("13") , _I|_B|_R }, + {_T("14") , _I|_R|_G }, + {_T("15") , _I|_R|_G|_B }, + + /* + * Note that 1 is at the end of list + * to avoid to confuse it with 10-15 + */ + {_T("1") , _B }, + + /* Cyan synonym */ + {_T("aqu"), _B|_G }, + /* Magenta synonym */ + {_T("pur"), _B|_R }, {_T("") ,0}, }; - -/* -move string pointer to next word (skip all spaces) -on erro retunr nonzero value -*/ +/* + * Move string pointer to next word (skip all spaces). + * On error return nonzero value. + */ static INT chop_blank(LPTSTR *arg_str) { - LPTSTR str; str = _tcschr(*arg_str,_T(' ')); if(!str) @@ -104,8 +103,6 @@ return CP_BLANK_NOT_FOUND; } - - while(_istspace(*str)) str++; @@ -121,11 +118,10 @@ } - -/* -read a color value in hex (like win nt's cmd syntax) -if an error occurs return -1 -*/ +/* + * Read a color value in hex (like win nt's cmd syntax). + * If an error occurs return -1. + */ static WORD hex_clr(LPTSTR str) { @@ -146,7 +142,6 @@ return (WORD)-1; } - ch = str[0]; if(_istdigit(ch)) @@ -166,9 +161,9 @@ /* -read a color value from a string (like 4nt's syntax) -if an error occurs return -1 -*/ + * Read a color value from a string (like 4nt's syntax). + * If an error occurs return -1. + */ static WORD txt_clr(LPTSTR str) { @@ -182,8 +177,7 @@ } - -/*search for x on y*/ +/* Search for "x on y" */ static WORD str_to_color(LPTSTR* arg_str) { @@ -197,8 +191,7 @@ if (!(*str)) return (WORD)-1; - - /*foreground*/ + /* foreground */ bBri = FALSE; if (_tcsnicmp(str,_T("bri"),3) == 0) @@ -214,13 +207,13 @@ return (WORD)-1; } - /*skip spaces and "on"*/ + /* skip spaces and "on" keyword */ if (chop_blank(&str) || chop_blank(&str)) return (WORD)-1; ret_clr = tmp_clr | (bBri << 3); - /*background*/ + /* background */ bBri = FALSE; if(_tcsnicmp(str,_T("bri"),3) == 0 ) @@ -231,7 +224,6 @@ return (WORD)-1; } - if( (tmp_clr = txt_clr(str)) == (WORD)-1 ) return (WORD)-1; @@ -239,29 +231,28 @@ *arg_str = str; - return SC_HEX | ret_clr | tmp_clr << 4 | bBri << 7; -} - - - -/****main function****/ -/* -the only parameter is arg_str, a pointer to a string. -the string is modified so it will begin to first word after -color specification -(only the char* is moved, no chars in the string are modfied) - - -it returns the color in the l.o. byte, plus two flags in the -h.o. byte, they are: -SC_HEX win nt's cmd syntax (for exampl a0) -SC_TXT 4nt's syntax ( "bri gre on bla" or "10 on 0") - -if succedes also move the LPTSTR to end of -string that specify color -*/ - - + /* NOTE: See the note on SC_HEX in the StringToColor()'s description */ + return /* SC_HEX | */ ret_clr | tmp_clr << 4 | bBri << 7; +} + + +/**** Main function ****/ +/* + * The only parameter is arg_str, a pointer to a string. + * The string is modified so it will begin to first word after + * color specification + * (only the char* is moved, no chars in the string are modfied). + * + * **** NOTE: The following functionality is deactivated **** + * it returns the color in the l.o. byte, plus two flags in the + * h.o. byte, they are: + * SC_HEX win nt's cmd syntax (for exampl a0) + * SC_TXT 4nt's syntax ( "bri gre on bla" or "10 on 0") + * ********************************************************** + * + * If succedes also move the LPTSTR to end of + * string that specify color. + */ BOOL StringToColor(LPWORD lpColor, LPTSTR*str) { WORD wRet;

1 0

[tfaber] 59054: [LT2013] - Adjust readme and welcome based on previous CLT releases
by tfaber＠svn.reactos.org 20 May '13

20 May '13

Author: tfaber Date: Mon May 20 17:02:36 2013 New Revision: 59054 URL: http://svn.reactos.org/svn/reactos?rev=59054&view=rev Log: [LT2013] - Adjust readme and welcome based on previous CLT releases Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/bg-BG.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/cs-CZ.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/da-DK.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/el-GR.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/en-US.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/es-ES.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/et-EE.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/fr-FR.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/hu-HU.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/id-ID.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/it-IT.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/ja-JP.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/lt-LT.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/nl-NL.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/no-NO.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/pl-PL.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/pt-BR.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/ro-RO.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/ru-RU.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/sk-SK.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/sv-SE.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/th-TH.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/uk-UA.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/zh-CN.rc Modified: branches/ros-branch-0_3_15-lt2013/ (props changed) branches/ros-branch-0_3_15-lt2013/base/setup/welcome/CMakeLists.txt branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/de-DE.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/rsrc.rc branches/ros-branch-0_3_15-lt2013/base/setup/welcome/welcome.c branches/ros-branch-0_3_15-lt2013/boot/bootdata/readme.txt (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Modified: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Removed: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Modified: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Modified: branches/ros-branch-0_3_15-lt2013/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/s… Modified: branches/ros-branch-0_3_15-lt2013/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/boot/b…

1 0

[tfaber] 59053: [LT2013] - Merge r58989 (kbdhid/moudhid formatting so that r59044 applies cleanly) - Merge r59039 (usb: Fix race condition for status change worker routine) - Merge r59044 (mouhid: ...
by tfaber＠svn.reactos.org 20 May '13

20 May '13

Author: tfaber Date: Mon May 20 16:42:01 2013 New Revision: 59053 URL: http://svn.reactos.org/svn/reactos?rev=59053&view=rev Log: [LT2013] - Merge r58989 (kbdhid/moudhid formatting so that r59044 applies cleanly) - Merge r59039 (usb: Fix race condition for status change worker routine) - Merge r59044 (mouhid: Cleanup code. Fix distinguation between relative and absolute mice) - Merge r59045 (hidclass: Remove assert) - Merge r59049 (hidclass: Fix double irp completion bug in hidclass) Modified: branches/ros-branch-0_3_15-lt2013/ (props changed) branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/fdo.c branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/pdo.c branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.c branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.h branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.c branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.h branches/ros-branch-0_3_15-lt2013/drivers/usb/usbehci/ (props changed) branches/ros-branch-0_3_15-lt2013/drivers/usb/usbehci/hardware.cpp branches/ros-branch-0_3_15-lt2013/drivers/usb/usbohci/ (props changed) branches/ros-branch-0_3_15-lt2013/drivers/usb/usbohci/hardware.cpp Propchange: branches/ros-branch-0_3_15-lt2013/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 20 16:42:01 2013 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58706,58727,58759,58865,59015 +/trunk/reactos:58534,58553,58561,58614,58627-58628,58633,58706,58727,58759,58865,58989,59015,59039,59044-59045,59049 Modified: branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/fdo.c [iso-8859-1] Mon May 20 16:42:01 2013 @@ -181,23 +181,74 @@ IoStack->DeviceObject = DeviceObject; // + // sanity check + // + ASSERT(CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction] != NULL); + + // + // call minidriver (hidusb) + // + Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); + + // + // wait for the request to finish + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // update status + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + +NTSTATUS +HidClassFDO_DispatchRequest( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + + // + // get device extension + // + CommonDeviceExtension = DeviceObject->DeviceExtension; + + ASSERT(Irp->CurrentLocation > 0); + + // + // create stack location + // + IoSetNextIrpStackLocation(Irp); + + // + // get next stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // store device object + // + IoStack->DeviceObject = DeviceObject; + + // + // sanity check + // + ASSERT(CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction] != NULL); + + // // call driver // - DPRINT("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); - - // - // wait for the request to finish - // - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - // - // update status - // - Status = Irp->IoStatus.Status; - } // // done @@ -602,14 +653,8 @@ // // dispatch to mini driver // - IoSkipCurrentIrpStackLocation(Irp); - Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); - - // - // complete request - // - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCopyCurrentIrpStackLocationToNext(Irp); + Status = HidClassFDO_DispatchRequest(DeviceObject, Irp); return Status; } } Modified: branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/hid/hidclass/pdo.c [iso-8859-1] Mon May 20 16:42:01 2013 @@ -565,7 +565,6 @@ case IRP_MN_QUERY_INTERFACE: { DPRINT1("[HIDCLASS] PDO IRP_MN_QUERY_INTERFACE not implemented\n"); - ASSERT(FALSE); // // do nothing Modified: branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Mon May 20 16:42:01 2013 @@ -50,7 +50,7 @@ /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)Context; - for(Index = 0; Index < Length; Index++) + for (Index = 0; Index < Length; Index++) { DPRINT("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); @@ -84,7 +84,7 @@ InputData.MakeCode = NewScanCodes[Index] & 0x7F; /* dispatch scan codes */ - KbdHid_DispatchInputData((PKBDHID_DEVICE_EXTENSION)Context, &InputData); + KbdHid_DispatchInputData(Context, &InputData); } /* done */ @@ -136,24 +136,46 @@ /* get current usages */ ButtonLength = DeviceExtension->UsageListLength; - Status = HidP_GetUsagesEx(HidP_Input, HIDP_LINK_COLLECTION_UNSPECIFIED, DeviceExtension->CurrentUsageList, &ButtonLength, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + Status = HidP_GetUsagesEx(HidP_Input, + HIDP_LINK_COLLECTION_UNSPECIFIED, + DeviceExtension->CurrentUsageList, + &ButtonLength, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); ASSERT(Status == HIDP_STATUS_SUCCESS); /* FIXME check if needs mapping */ /* get usage difference */ - Status = HidP_UsageAndPageListDifference(DeviceExtension->PreviousUsageList, DeviceExtension->CurrentUsageList, DeviceExtension->BreakUsageList, DeviceExtension->MakeUsageList, DeviceExtension->UsageListLength); + Status = HidP_UsageAndPageListDifference(DeviceExtension->PreviousUsageList, + DeviceExtension->CurrentUsageList, + DeviceExtension->BreakUsageList, + DeviceExtension->MakeUsageList, + DeviceExtension->UsageListLength); ASSERT(Status == HIDP_STATUS_SUCCESS); /* replace previous usage list with current list */ - RtlMoveMemory(DeviceExtension->PreviousUsageList, DeviceExtension->CurrentUsageList, sizeof(USAGE_AND_PAGE) * DeviceExtension->UsageListLength); + RtlMoveMemory(DeviceExtension->PreviousUsageList, + DeviceExtension->CurrentUsageList, + sizeof(USAGE_AND_PAGE) * DeviceExtension->UsageListLength); /* translate break usage list */ - HidP_TranslateUsageAndPagesToI8042ScanCodes(DeviceExtension->BreakUsageList, DeviceExtension->UsageListLength, HidP_Keyboard_Break, &DeviceExtension->ModifierState, KbdHid_InsertScanCodes, DeviceExtension); + HidP_TranslateUsageAndPagesToI8042ScanCodes(DeviceExtension->BreakUsageList, + DeviceExtension->UsageListLength, + HidP_Keyboard_Break, + &DeviceExtension->ModifierState, + KbdHid_InsertScanCodes, + DeviceExtension); ASSERT(Status == HIDP_STATUS_SUCCESS); /* translate new usage list */ - HidP_TranslateUsageAndPagesToI8042ScanCodes(DeviceExtension->MakeUsageList, DeviceExtension->UsageListLength, HidP_Keyboard_Make, &DeviceExtension->ModifierState, KbdHid_InsertScanCodes, DeviceExtension); + HidP_TranslateUsageAndPagesToI8042ScanCodes(DeviceExtension->MakeUsageList, + DeviceExtension->UsageListLength, + HidP_Keyboard_Make, + &DeviceExtension->ModifierState, + KbdHid_InsertScanCodes, + DeviceExtension); ASSERT(Status == HIDP_STATUS_SUCCESS); /* re-init read */ @@ -343,166 +365,168 @@ /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_ATTRIBUTES) - { - /* verify output buffer length */ - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) - { - /* invalid request */ - DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + switch (IoStack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: + /* verify output buffer length */ + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) + { + /* invalid request */ + DPRINT1("[MOUHID] IOCTL_MOUSE_QUERY_ATTRIBUTES Buffer too small\n"); + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_BUFFER_TOO_SMALL; + } + + /* get output buffer */ + Attributes = (PKEYBOARD_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; + + /* copy attributes */ + RtlCopyMemory(Attributes, + &DeviceExtension->Attributes, + sizeof(KEYBOARD_ATTRIBUTES)); + + /* complete request */ + Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + case IOCTL_INTERNAL_KEYBOARD_CONNECT: + /* verify input buffer length */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) + { + /* invalid request */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* is it already connected */ + if (DeviceExtension->ClassService) + { + /* already connected */ + Irp->IoStatus.Status = STATUS_SHARING_VIOLATION; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SHARING_VIOLATION; + } + + /* get connect data */ + Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + /* store connect details */ + DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; + DeviceExtension->ClassService = Data->ClassService; + + /* completed successfully */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + case IOCTL_INTERNAL_KEYBOARD_DISCONNECT: + /* not implemented */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - - /* get output buffer */ - Attributes = (PKEYBOARD_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer; - - /* copy attributes */ - RtlCopyMemory(Attributes, &DeviceExtension->Attributes, sizeof(KEYBOARD_ATTRIBUTES)); - - /* complete request */ - Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_CONNECT) - { - /* verify input buffer length */ - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) - { - /* invalid request */ - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - /* is it already connected */ - if (DeviceExtension->ClassService) - { - /* already connected */ - Irp->IoStatus.Status = STATUS_SHARING_VIOLATION; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SHARING_VIOLATION; - } - - /* get connect data */ - Data = (PCONNECT_DATA)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; - - /* store connect details */ - DeviceExtension->ClassDeviceObject = Data->ClassDeviceObject; - DeviceExtension->ClassService = Data->ClassService; - - /* completed successfully */ - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_DISCONNECT) - { - /* not implemented */ - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_ENABLE) - { - /* not supported */ - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_KEYBOARD_DISABLE) - { - /* not supported */ - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATORS) - { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) - { - /* invalid parameter */ - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - /* copy indicators */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DeviceExtension->KeyboardIndicator, sizeof(KEYBOARD_INDICATOR_PARAMETERS)); - - /* complete request */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(KEYBOARD_INDICATOR_PARAMETERS); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_TYPEMATIC) - { - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) - { - /* invalid parameter */ - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - /* copy indicators */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DeviceExtension->KeyboardTypematic, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)); - - /* done */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(KEYBOARD_TYPEMATIC_PARAMETERS); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_INDICATORS) - { - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) - { - /* invalid parameter */ - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - /* copy indicators */ - RtlCopyMemory(&DeviceExtension->KeyboardIndicator, Irp->AssociatedIrp.SystemBuffer, sizeof(KEYBOARD_INDICATOR_PARAMETERS)); - - /* done */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_SET_TYPEMATIC) - { - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) - { - /* invalid parameter */ - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_INVALID_PARAMETER; - } - - /* copy indicators */ - RtlCopyMemory(&DeviceExtension->KeyboardTypematic, Irp->AssociatedIrp.SystemBuffer, sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)); - - /* done */ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION) - { - /* not implemented */ - DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION not implemented\n"); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; + + case IOCTL_INTERNAL_KEYBOARD_ENABLE: + /* not supported */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + + case IOCTL_INTERNAL_KEYBOARD_DISABLE: + /* not supported */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + + case IOCTL_KEYBOARD_QUERY_INDICATORS: + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, + &DeviceExtension->KeyboardIndicator, + sizeof(KEYBOARD_INDICATOR_PARAMETERS)); + + /* complete request */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(KEYBOARD_INDICATOR_PARAMETERS); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; + + case IOCTL_KEYBOARD_QUERY_TYPEMATIC: + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, + &DeviceExtension->KeyboardTypematic, + sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)); + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(KEYBOARD_TYPEMATIC_PARAMETERS); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + case IOCTL_KEYBOARD_SET_INDICATORS: + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_INDICATOR_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(&DeviceExtension->KeyboardIndicator, + Irp->AssociatedIrp.SystemBuffer, + sizeof(KEYBOARD_INDICATOR_PARAMETERS)); + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + case IOCTL_KEYBOARD_SET_TYPEMATIC: + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) + { + /* invalid parameter */ + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_PARAMETER; + } + + /* copy indicators */ + RtlCopyMemory(&DeviceExtension->KeyboardTypematic, + Irp->AssociatedIrp.SystemBuffer, + sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)); + + /* done */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + + case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: + /* not implemented */ + DPRINT1("IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION not implemented\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; } /* unknown control code */ @@ -563,7 +587,15 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); /* build request */ - Irp = IoBuildDeviceIoControlRequest(IoControlCode, DeviceExtension->NextDeviceObject, InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, FALSE, &Event, &IoStatus); + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + DeviceExtension->NextDeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + OutputBufferSize, + FALSE, + &Event, + &IoStatus); if (!Irp) { /* no memory */ @@ -600,7 +632,12 @@ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* query collection information */ - Status = KbdHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, 0, NULL, sizeof(HID_COLLECTION_INFORMATION), &Information); + Status = KbdHid_SubmitRequest(DeviceObject, + IOCTL_HID_GET_COLLECTION_INFORMATION, + 0, + NULL, + sizeof(HID_COLLECTION_INFORMATION), + &Information); if (!NT_SUCCESS(Status)) { /* failed to query collection information */ @@ -618,7 +655,12 @@ } /* now obtain the preparsed data */ - Status = KbdHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, 0, NULL, Information.DescriptorSize, PreparsedData); + Status = KbdHid_SubmitRequest(DeviceObject, + IOCTL_HID_GET_COLLECTION_DESCRIPTOR, + 0, + NULL, + Information.DescriptorSize, + PreparsedData); if (!NT_SUCCESS(Status)) { /* failed to get preparsed data */ @@ -639,7 +681,7 @@ DPRINT("[KBDHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); - /* init input report*/ + /* init input report */ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; ASSERT(DeviceExtension->ReportLength); DeviceExtension->Report = (PCHAR)ExAllocatePool(NonPagedPool, DeviceExtension->ReportLength); @@ -647,7 +689,11 @@ RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); /* build mdl */ - DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, DeviceExtension->ReportLength, FALSE, FALSE, NULL); + DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, + DeviceExtension->ReportLength, + FALSE, + FALSE, + NULL); ASSERT(DeviceExtension->ReportMDL); /* init mdl */ @@ -752,88 +798,86 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT("[KBDHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); - if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || - IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || - IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || - IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE || - IoStack->MinorFunction == IRP_MN_QUERY_REMOVE_DEVICE) - { - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - } - else if (IoStack->MinorFunction == IRP_MN_REMOVE_DEVICE) - { - /* FIXME synchronization */ - - /* cancel irp */ - IoCancelIrp(DeviceExtension->Irp); - - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - - IoFreeIrp(DeviceExtension->Irp); - IoDetachDevice(DeviceExtension->NextDeviceObject); - IoDeleteDevice(DeviceObject); - return Status; - } - else if (IoStack->MinorFunction == IRP_MN_START_DEVICE) - { - /* init event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* copy stack location */ - IoCopyCurrentIrpStackLocationToNext (Irp); - - /* set completion routine */ - IoSetCompletionRoutine(Irp, KbdHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); - Irp->IoStatus.Status = 0; - - /* pass request */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - - if (!NT_SUCCESS(Status)) - { - /* failed */ + switch (IoStack->MinorFunction) + { + case IRP_MN_STOP_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + case IRP_MN_REMOVE_DEVICE: + /* FIXME synchronization */ + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + IoFreeIrp(DeviceExtension->Irp); + IoDetachDevice(DeviceExtension->NextDeviceObject); + IoDeleteDevice(DeviceObject); + return Status; + + case IRP_MN_START_DEVICE: + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* copy stack location */ + IoCopyCurrentIrpStackLocationToNext (Irp); + + /* set completion routine */ + IoSetCompletionRoutine(Irp, KbdHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); + Irp->IoStatus.Status = 0; + + /* pass request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* lets start the device */ + Status = KbdHid_StartDevice(DeviceObject); + DPRINT("KbdHid_StartDevice %x\n", Status); + + /* complete request */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ return Status; - } - - /* lets start the device */ - Status = KbdHid_StartDevice(DeviceObject); - DPRINT("KbdHid_StartDevice %x\n", Status); - - /* complete request */ - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - /* done */ - return Status; - } - else - { - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + default: + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } } @@ -849,7 +893,13 @@ POWER_STATE State; /* create device object */ - Status = IoCreateDevice(DriverObject, sizeof(KBDHID_DEVICE_EXTENSION), NULL, FILE_DEVICE_KEYBOARD, 0, FALSE, &DeviceObject); + Status = IoCreateDevice(DriverObject, + sizeof(KBDHID_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_KEYBOARD, + 0, + FALSE, + &DeviceObject); if (!NT_SUCCESS(Status)) { /* failed to create device object */ Modified: branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Mon May 20 16:42:01 2013 @@ -26,7 +26,7 @@ PIRP Irp; // - // event + // event // KEVENT ReadCompletionEvent; @@ -125,12 +125,12 @@ }KBDHID_DEVICE_EXTENSION, *PKBDHID_DEVICE_EXTENSION; /* defaults from kbfiltr.h */ -#define KEYBOARD_TYPEMATIC_RATE_MINIMUM 2 -#define KEYBOARD_TYPEMATIC_RATE_MAXIMUM 30 -#define KEYBOARD_TYPEMATIC_RATE_DEFAULT 30 -#define KEYBOARD_TYPEMATIC_DELAY_MINIMUM 250 -#define KEYBOARD_TYPEMATIC_DELAY_MAXIMUM 1000 -#define KEYBOARD_TYPEMATIC_DELAY_DEFAULT 250 +#define KEYBOARD_TYPEMATIC_RATE_MINIMUM 2 +#define KEYBOARD_TYPEMATIC_RATE_MAXIMUM 30 +#define KEYBOARD_TYPEMATIC_RATE_DEFAULT 30 +#define KEYBOARD_TYPEMATIC_DELAY_MINIMUM 250 +#define KEYBOARD_TYPEMATIC_DELAY_MAXIMUM 1000 +#define KEYBOARD_TYPEMATIC_DELAY_DEFAULT 250 /* FIXME: write kbd.h */ #define MICROSOFT_KBD_FUNC 12 @@ -143,4 +143,3 @@ NTSTATUS KbdHid_InitiateRead( IN PKBDHID_DEVICE_EXTENSION DeviceExtension); - Modified: branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.c [iso-8859-1] Mon May 20 16:42:01 2013 @@ -10,7 +10,7 @@ #include "mouhid.h" -static USHORT MouHid_ButtonUpFlags[] = +static USHORT MouHid_ButtonUpFlags[] = { 0xFF, /* unused */ MOUSE_LEFT_BUTTON_DOWN, @@ -20,7 +20,7 @@ MOUSE_BUTTON_5_DOWN }; -static USHORT MouHid_ButtonDownFlags[] = +static USHORT MouHid_ButtonDownFlags[] = { 0xFF, /* unused */ MOUSE_LEFT_BUTTON_UP, @@ -30,6 +30,7 @@ MOUSE_BUTTON_5_UP }; + VOID MouHid_GetButtonMove( IN PMOUHID_DEVICE_EXTENSION DeviceExtension, @@ -43,49 +44,134 @@ *LastX = 0; *LastY = 0; - /* get scaled usage value x */ - Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, (PLONG)LastX, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); - if (Status != HIDP_STATUS_SUCCESS) - { - /* FIXME: handle more errors */ - if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + if (!DeviceExtension->MouseAbsolute) + { + /* get scaled usage value x */ + Status = HidP_GetScaledUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_X, + LastX, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + if (Status != HIDP_STATUS_SUCCESS) { - /* FIXME: assume it operates in absolute mode */ - DeviceExtension->MouseAbsolute = TRUE; - - /* get unscaled value */ - Status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, (PULONG)&ValueX, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); - - /* FIXME handle error */ - ASSERT(Status == HIDP_STATUS_SUCCESS); - - /* absolute pointing devices values need be in range 0 - 0xffff */ - ASSERT(DeviceExtension->ValueCapsX.LogicalMax > 0); - - *LastX = (ValueX * 0xFFFF) / DeviceExtension->ValueCapsX.LogicalMax; + /* FIXME: handle more errors */ + if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + { + /* FIXME: assume it operates in absolute mode */ + DeviceExtension->MouseAbsolute = TRUE; + + /* get unscaled value */ + Status = HidP_GetUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_X, + &ValueX, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > DeviceExtension->ValueCapsX.LogicalMin); + + /* convert to logical range */ + *LastX = (ValueX * VIRTUAL_SCREEN_SIZE_X) / DeviceExtension->ValueCapsX.LogicalMax; + } } } - - /* get scaled usage value y */ - Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, (PLONG)LastY, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); - if (Status != HIDP_STATUS_SUCCESS) - { - // FIXME: handle more errors - if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + else + { + /* get unscaled value */ + Status = HidP_GetUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_X, + &ValueX, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsX.LogicalMax > DeviceExtension->ValueCapsX.LogicalMin); + + /* convert to logical range */ + *LastX = (ValueX * VIRTUAL_SCREEN_SIZE_X) / DeviceExtension->ValueCapsX.LogicalMax; + } + + if (!DeviceExtension->MouseAbsolute) + { + /* get scaled usage value y */ + Status = HidP_GetScaledUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_Y, + LastY, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + if (Status != HIDP_STATUS_SUCCESS) { - // assume it operates in absolute mode - DeviceExtension->MouseAbsolute = TRUE; - - // get unscaled value - Status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, (PULONG)&ValueY, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); - - /* FIXME handle error */ - ASSERT(Status == HIDP_STATUS_SUCCESS); - - /* absolute pointing devices values need be in range 0 - 0xffff */ - ASSERT(DeviceExtension->ValueCapsY.LogicalMax); - *LastY = (ValueY * 0xFFFF) / DeviceExtension->ValueCapsY.LogicalMax; + // FIXME: handle more errors + if (Status == HIDP_STATUS_BAD_LOG_PHY_VALUES) + { + // assume it operates in absolute mode + DeviceExtension->MouseAbsolute = TRUE; + + // get unscaled value + Status = HidP_GetUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_Y, + &ValueY, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > DeviceExtension->ValueCapsY.LogicalMin); + + /* convert to logical range */ + *LastY = (ValueY * VIRTUAL_SCREEN_SIZE_Y) / DeviceExtension->ValueCapsY.LogicalMax; + } } + } + else + { + // get unscaled value + Status = HidP_GetUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_Y, + &ValueY, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); + + /* FIXME handle error */ + ASSERT(Status == HIDP_STATUS_SUCCESS); + + /* absolute pointing devices values need be in range 0 - 0xffff */ + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > 0); + ASSERT(DeviceExtension->ValueCapsY.LogicalMax > DeviceExtension->ValueCapsY.LogicalMin); + + /* convert to logical range */ + *LastY = (ValueY * VIRTUAL_SCREEN_SIZE_Y) / DeviceExtension->ValueCapsY.LogicalMax; } } @@ -107,7 +193,14 @@ /* get usages */ CurrentUsageListLength = DeviceExtension->UsageListLength; - Status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, HIDP_LINK_COLLECTION_UNSPECIFIED, DeviceExtension->CurrentUsageList, &CurrentUsageListLength, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + Status = HidP_GetUsages(HidP_Input, + HID_USAGE_PAGE_BUTTON, + HIDP_LINK_COLLECTION_UNSPECIFIED, + DeviceExtension->CurrentUsageList, + &CurrentUsageListLength, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); if (Status != HIDP_STATUS_SUCCESS) { DPRINT1("MouHid_GetButtonFlags failed to get usages with %x\n", Status); @@ -115,7 +208,11 @@ } /* extract usage list difference */ - Status = HidP_UsageListDifference(DeviceExtension->PreviousUsageList, DeviceExtension->CurrentUsageList, DeviceExtension->BreakUsageList, DeviceExtension->MakeUsageList, DeviceExtension->UsageListLength); + Status = HidP_UsageListDifference(DeviceExtension->PreviousUsageList, + DeviceExtension->CurrentUsageList, + DeviceExtension->BreakUsageList, + DeviceExtension->MakeUsageList, + DeviceExtension->UsageListLength); if (Status != HIDP_STATUS_SUCCESS) { DPRINT1("MouHid_GetButtonFlags failed to get usages with %x\n", Status); @@ -140,7 +237,7 @@ /* move to next index*/ Index++; - }while(Index < DeviceExtension->UsageListLength); + } while (Index < DeviceExtension->UsageListLength); } if (DeviceExtension->UsageListLength) @@ -161,7 +258,7 @@ /* move to next index*/ Index++; - }while(Index < DeviceExtension->UsageListLength); + } while (Index < DeviceExtension->UsageListLength); } /* now switch the previous list with current list */ @@ -258,7 +355,14 @@ { /* get usage */ UsageValue = 0; - Status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_WHEEL, &UsageValue, DeviceExtension->PreparsedData, DeviceExtension->Report, DeviceExtension->ReportLength); + Status = HidP_GetScaledUsageValue(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_WHEEL, + &UsageValue, + DeviceExtension->PreparsedData, + DeviceExtension->Report, + DeviceExtension->ReportLength); if (Status == HIDP_STATUS_SUCCESS && UsageValue != 0) { /* store wheel status */ @@ -277,7 +381,7 @@ DeviceExtension->Report[3] & 0xFF, DeviceExtension->Report[4] & 0xFF, DeviceExtension->Report[5] & 0xFF, DeviceExtension->Report[6] & 0xFF); - DPRINT("[MOUHID] LastX %ld LastY %ld Flags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.ButtonFlags, MouseInputData.ButtonData); + DPRINT("[MOUHID] LastX %ld LastY %ld Flags %x ButtonFlags %x ButtonData %x\n", MouseInputData.LastX, MouseInputData.LastY, MouseInputData.Flags, MouseInputData.ButtonFlags, MouseInputData.ButtonData); /* dispatch mouse action */ MouHid_DispatchInputData(DeviceExtension, &MouseInputData); @@ -332,7 +436,7 @@ IN PIRP Irp, IN PVOID Context) { - KeSetEvent((PKEVENT)Context, 0, FALSE); + KeSetEvent(Context, 0, FALSE); return STATUS_MORE_PROCESSING_REQUIRED; } @@ -470,8 +574,9 @@ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* handle requests */ - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_MOUSE_QUERY_ATTRIBUTES) - { + switch (IoStack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_MOUSE_QUERY_ATTRIBUTES: /* verify output buffer length */ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUSE_ATTRIBUTES)) { @@ -507,9 +612,8 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_CONNECT) - { + + case IOCTL_INTERNAL_MOUSE_CONNECT: /* verify input buffer length */ if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { @@ -539,23 +643,20 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_DISCONNECT) - { + + case IOCTL_INTERNAL_MOUSE_DISCONNECT: /* not supported */ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_ENABLE) - { + + case IOCTL_INTERNAL_MOUSE_ENABLE: /* not supported */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_MOUSE_DISABLE) - { + + case IOCTL_INTERNAL_MOUSE_DISABLE: /* not supported */ Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -619,7 +720,15 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); /* build request */ - Irp = IoBuildDeviceIoControlRequest(IoControlCode, DeviceExtension->NextDeviceObject, InputBuffer, InputBufferSize, OutputBuffer, OutputBufferSize, FALSE, &Event, &IoStatus); + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + DeviceExtension->NextDeviceObject, + InputBuffer, + InputBufferSize, + OutputBuffer, + OutputBufferSize, + FALSE, + &Event, + &IoStatus); if (!Irp) { /* no memory */ @@ -658,7 +767,12 @@ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; /* query collection information */ - Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, 0, NULL, sizeof(HID_COLLECTION_INFORMATION), &Information); + Status = MouHid_SubmitRequest(DeviceObject, + IOCTL_HID_GET_COLLECTION_INFORMATION, + 0, + NULL, + sizeof(HID_COLLECTION_INFORMATION), + &Information); if (!NT_SUCCESS(Status)) { /* failed to query collection information */ @@ -676,7 +790,12 @@ } /* now obtain the preparsed data */ - Status = MouHid_SubmitRequest(DeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, 0, NULL, Information.DescriptorSize, PreparsedData); + Status = MouHid_SubmitRequest(DeviceObject, + IOCTL_HID_GET_COLLECTION_DESCRIPTOR, + 0, + NULL, + Information.DescriptorSize, + PreparsedData); if (!NT_SUCCESS(Status)) { /* failed to get preparsed data */ @@ -713,14 +832,20 @@ RtlZeroMemory(DeviceExtension->Report, DeviceExtension->ReportLength); /* build mdl */ - DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, DeviceExtension->ReportLength, FALSE, FALSE, NULL); + DeviceExtension->ReportMDL = IoAllocateMdl(DeviceExtension->Report, + DeviceExtension->ReportLength, + FALSE, + FALSE, + NULL); ASSERT(DeviceExtension->ReportMDL); /* init mdl */ MmBuildMdlForNonPagedPool(DeviceExtension->ReportMDL); /* get max number of buttons */ - Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); + Buttons = HidP_MaxUsageListLength(HidP_Input, + HID_USAGE_PAGE_BUTTON, + PreparsedData); DPRINT("[MOUHID] Buttons %lu\n", Buttons); ASSERT(Buttons > 0); @@ -750,15 +875,33 @@ DeviceExtension->PreparsedData = PreparsedData; ValueCapsLength = 1; - HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_X, &DeviceExtension->ValueCapsX, &ValueCapsLength, PreparsedData); + HidP_GetSpecificValueCaps(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_X, + &DeviceExtension->ValueCapsX, + &ValueCapsLength, + PreparsedData); ValueCapsLength = 1; - HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Y, &DeviceExtension->ValueCapsY, &ValueCapsLength, PreparsedData); + HidP_GetSpecificValueCaps(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_Y, + &DeviceExtension->ValueCapsY, + &ValueCapsLength, + PreparsedData); /* now check for wheel mouse support */ ValueCapsLength = 1; - Status = HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_WHEEL, &ValueCaps, &ValueCapsLength, PreparsedData); - if (Status == HIDP_STATUS_SUCCESS ) + Status = HidP_GetSpecificValueCaps(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_WHEEL, + &ValueCaps, + &ValueCapsLength, + PreparsedData); + if (Status == HIDP_STATUS_SUCCESS) { /* mouse has wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; @@ -769,7 +912,13 @@ { /* check if the mouse has z-axis */ ValueCapsLength = 1; - Status = HidP_GetSpecificValueCaps(HidP_Input, HID_USAGE_PAGE_GENERIC, HIDP_LINK_COLLECTION_UNSPECIFIED, HID_USAGE_GENERIC_Z, &ValueCaps, &ValueCapsLength, PreparsedData); + Status = HidP_GetSpecificValueCaps(HidP_Input, + HID_USAGE_PAGE_GENERIC, + HIDP_LINK_COLLECTION_UNSPECIFIED, + HID_USAGE_GENERIC_Z, + &ValueCaps, + &ValueCapsLength, + PreparsedData); if (Status == HIDP_STATUS_SUCCESS && ValueCapsLength == 1) { /* wheel support */ @@ -779,6 +928,14 @@ } } + /* check if mice is absolute */ + if (DeviceExtension->ValueCapsY.LogicalMax > DeviceExtension->ValueCapsY.LogicalMin || + DeviceExtension->ValueCapsX.LogicalMax > DeviceExtension->ValueCapsX.LogicalMin) + { + /* mice is absolute */ + DeviceExtension->MouseAbsolute = TRUE; + } + /* completed successfully */ return STATUS_SUCCESS; } @@ -838,101 +995,99 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); - if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || - IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || - IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || - IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE || - IoStack->MinorFunction == IRP_MN_QUERY_REMOVE_DEVICE) - { - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - } - else if (IoStack->MinorFunction == IRP_MN_REMOVE_DEVICE) - { - /* FIXME synchronization */ - - /* request stop */ - DeviceExtension->StopReadReport = TRUE; - - /* cancel irp */ - IoCancelIrp(DeviceExtension->Irp); - - /* indicate success */ - Irp->IoStatus.Status = STATUS_SUCCESS; - - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - - /* wait for completion of stop event */ - KeWaitForSingleObject(&DeviceExtension->ReadCompletionEvent, Executive, KernelMode, FALSE, NULL); - - /* free irp */ - IoFreeIrp(DeviceExtension->Irp); - - /* detach device */ - IoDetachDevice(DeviceExtension->NextDeviceObject); - - /* delete device */ - IoDeleteDevice(DeviceObject); - - /* done */ - return Status; - } - else if (IoStack->MinorFunction == IRP_MN_START_DEVICE) - { - /* init event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* copy stack location */ - IoCopyCurrentIrpStackLocationToNext (Irp); - - /* set completion routine */ - IoSetCompletionRoutine(Irp, MouHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); - Irp->IoStatus.Status = 0; - - /* pass request */ - Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Irp->IoStatus.Status; - } - - if (!NT_SUCCESS(Status)) - { - /* failed */ + switch (IoStack->MinorFunction) + { + case IRP_MN_STOP_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + case IRP_MN_REMOVE_DEVICE: + /* FIXME synchronization */ + + /* request stop */ + DeviceExtension->StopReadReport = TRUE; + + /* cancel irp */ + IoCancelIrp(DeviceExtension->Irp); + + /* indicate success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + /* wait for completion of stop event */ + KeWaitForSingleObject(&DeviceExtension->ReadCompletionEvent, Executive, KernelMode, FALSE, NULL); + + /* free irp */ + IoFreeIrp(DeviceExtension->Irp); + + /* detach device */ + IoDetachDevice(DeviceExtension->NextDeviceObject); + + /* delete device */ + IoDeleteDevice(DeviceObject); + + /* done */ + return Status; + + case IRP_MN_START_DEVICE: + /* init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* copy stack location */ + IoCopyCurrentIrpStackLocationToNext (Irp); + + /* set completion routine */ + IoSetCompletionRoutine(Irp, MouHid_StartDeviceCompletion, &Event, TRUE, TRUE, TRUE); + Irp->IoStatus.Status = 0; + + /* pass request */ + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* lets start the device */ + Status = MouHid_StartDevice(DeviceObject); + DPRINT("MouHid_StartDevice %x\n", Status); + + /* complete request */ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* done */ return Status; - } - - /* lets start the device */ - Status = MouHid_StartDevice(DeviceObject); - DPRINT("MouHid_StartDevice %x\n", Status); - - /* complete request */ - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - /* done */ - return Status; - } - else - { - /* skip irp stack location */ - IoSkipCurrentIrpStackLocation(Irp); - - /* dispatch to lower device */ - return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + default: + /* skip irp stack location */ + IoSkipCurrentIrpStackLocation(Irp); + + /* dispatch to lower device */ + return IoCallDriver(DeviceExtension->NextDeviceObject, Irp); } } @@ -948,7 +1103,13 @@ POWER_STATE State; /* create device object */ - Status = IoCreateDevice(DriverObject, sizeof(MOUHID_DEVICE_EXTENSION), NULL, FILE_DEVICE_MOUSE, 0, FALSE, &DeviceObject); + Status = IoCreateDevice(DriverObject, + sizeof(MOUHID_DEVICE_EXTENSION), + NULL, + FILE_DEVICE_MOUSE, + 0, + FALSE, + &DeviceObject); if (!NT_SUCCESS(Status)) { /* failed to create device object */ Modified: branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/hid/mouhid/mouhid.h [iso-8859-1] Mon May 20 16:42:01 2013 @@ -25,7 +25,7 @@ PIRP Irp; // - // event + // event // KEVENT ReadCompletionEvent; @@ -128,6 +128,8 @@ }MOUHID_DEVICE_EXTENSION, *PMOUHID_DEVICE_EXTENSION; #define WHEEL_DELTA 120 +#define VIRTUAL_SCREEN_SIZE_X (65536) +#define VIRTUAL_SCREEN_SIZE_Y (65536) NTSTATUS MouHid_InitiateRead( Propchange: branches/ros-branch-0_3_15-lt2013/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 20 16:42:01 2013 @@ -27,4 +27,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbehci:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new:54809-54998 -/trunk/reactos/drivers/usb/usbehci:58627-58628 +/trunk/reactos/drivers/usb/usbehci:58627-58628,59039,59044-59045,59049 Modified: branches/ros-branch-0_3_15-lt2013/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Mon May 20 16:42:01 2013 @@ -96,7 +96,7 @@ PVOID m_SCEContext; // status change callback routine context BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback - ULONG m_WorkItemActive; // work item status + volatile LONG m_StatusChangeWorkItemStatus; // work item status ULONG m_SyncFramePhysAddr; // periodic frame list physical address BUS_INTERFACE_STANDARD m_BusInterface; // pci bus interface BOOLEAN m_PortResetInProgress[0xF]; // stores reset in progress (vbox hack) @@ -1433,13 +1433,13 @@ // if (QueueSCEWorkItem && This->m_SCECallBack != NULL) { - // work item is now active - This->m_WorkItemActive = TRUE; - - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + if (InterlockedCompareExchange(&This->m_StatusChangeWorkItemStatus, 1, 0) == 0) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + } } } return; @@ -1466,8 +1466,10 @@ This->m_SCECallBack(This->m_SCEContext); } - // work item is completed - This->m_WorkItemActive = FALSE; + // + // reset active status + // + InterlockedDecrement(&This->m_StatusChangeWorkItemStatus); } NTSTATUS Propchange: branches/ros-branch-0_3_15-lt2013/drivers/usb/usbohci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 20 16:42:01 2013 @@ -19,4 +19,4 @@ /branches/usb-bringup-trunk/drivers/usb/usbohci:55019-55543,55548-55554 /branches/wlan-bringup/drivers/usb/usbohci:54809-54998 /trunk/reactos/drivers/usb/usbehci_new:48236-51323 -/trunk/reactos/drivers/usb/usbohci:58627-58628 +/trunk/reactos/drivers/usb/usbohci:58627-58628,59039,59044-59045,59049 Modified: branches/ros-branch-0_3_15-lt2013/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/driver… ============================================================================== --- branches/ros-branch-0_3_15-lt2013/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon May 20 16:42:01 2013 @@ -101,6 +101,7 @@ HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback + volatile LONG m_StatusChangeWorkItemStatus; // work item active status ULONG m_SyncFramePhysAddr; // periodic frame list physical address ULONG m_IntervalValue; // periodic interval value }; @@ -1523,10 +1524,13 @@ // if (QueueSCEWorkItem && This->m_SCECallBack != NULL) { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + if (InterlockedCompareExchange(&This->m_StatusChangeWorkItemStatus, 1, 0) == 0) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + } } } } @@ -1552,6 +1556,10 @@ This->m_SCECallBack(This->m_SCEContext); } + // + // reset active status + // + InterlockedDecrement(&This->m_StatusChangeWorkItemStatus); } NTSTATUS

1 0

[spetreolle] 59052: [CRT] Import _wcslwr_s from Wine.
by spetreolle＠svn.reactos.org 20 May '13

20 May '13

Author: spetreolle Date: Mon May 20 16:28:43 2013 New Revision: 59052 URL: http://svn.reactos.org/svn/reactos?rev=59052&view=rev Log: [CRT] Import _wcslwr_s from Wine. Added: trunk/reactos/lib/sdk/crt/string/_wcslwr_s.c (with props) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/crt.cmake Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Mon May 20 16:28:43 2013 @@ -1026,7 +1026,7 @@ # stub _wcsicoll_l @ cdecl _wcslwr(wstr) # stub _wcslwr_l -# stub _wcslwr_s +@ cdecl _wcslwr_s(wstr long) # stub _wcslwr_s_l @ cdecl _wcsncoll(wstr wstr long) # stub _wcsncoll_l Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Mon May 20 16:28:43 2013 @@ -262,6 +262,7 @@ string/_mbstrnlen.c string/_splitpath.c string/_splitpath_s.c + string/_wcslwr_s.c string/_wsplitpath.c string/_wsplitpath_s.c string/atof.c Added: trunk/reactos/lib/sdk/crt/string/_wcslwr_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_wcslwr… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_wcslwr_s.c (added) +++ trunk/reactos/lib/sdk/crt/string/_wcslwr_s.c [iso-8859-1] Mon May 20 16:28:43 2013 @@ -0,0 +1,38 @@ +/* + * The C RunTime DLL + * + * Implements C run-time functionality as known from UNIX. + * + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997 Uwe Bonnes + */ + +#include <precomp.h> + +/* + * @implemented + */ +int _wcslwr_s(wchar_t* str, size_t n) +{ + wchar_t *ptr=str; + if (!str || !n) + { + if (str) *str = '\0'; + *_errno() = EINVAL; + return EINVAL; + } + + while (n--) + { + if (!*ptr) return 0; + *ptr = towlower(*ptr); + ptr++; + } + + /* MSDN claims that the function should return and set errno to + * ERANGE, which doesn't seem to be true based on the tests. */ + *str = '\0'; + *_errno() = EINVAL; + return EINVAL; +} Propchange: trunk/reactos/lib/sdk/crt/string/_wcslwr_s.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/crt/string/_wcslwr_s.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

[ekohl] 59051: [USRMGR] Improve GUI interface. Patch by Lee Schreoder. CORE-7078 #resolve #comment Committed in revision 59051.
by ekohl＠svn.reactos.org 20 May '13

20 May '13

Author: ekohl Date: Mon May 20 15:44:43 2013 New Revision: 59051 URL: http://svn.reactos.org/svn/reactos?rev=59051&view=rev Log: [USRMGR] Improve GUI interface. Patch by Lee Schreoder. CORE-7078 #resolve #comment Committed in revision 59051. Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc trunk/reactos/dll/cpl/usrmgr/resource.h trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Mon May 20 15:44:43 2013 @@ -477,6 +477,7 @@ switch (LOWORD(wParam)) { case IDM_GROUP_NEW: + case IDC_GROUPS_ADD: GroupNew(hwndDlg); break; @@ -485,10 +486,12 @@ break; case IDM_GROUP_DELETE: + case IDC_GROUPS_REMOVE: GroupDelete(hwndDlg); break; case IDM_GROUP_PROPERTIES: + case IDC_GROUPS_PROPERTIES: if (GroupProperties(hwndDlg) == IDOK) UpdateGroupProperties(hwndDlg); break; Modified: trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED, 100, 16 END @@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/es-ES.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -10,6 +10,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd..", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -20,6 +25,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/fr-FR.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -10,6 +10,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -20,6 +25,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/he-IL.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/pl-PL.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -18,6 +18,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -28,6 +33,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ro-RO.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -10,6 +10,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -20,6 +25,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/ru-RU.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] Mon May 20 15:44:43 2013 @@ -14,6 +14,11 @@ BEGIN CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 + AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "Reset Administrator Password", IDC_USERS_ADMIN_RESET, 142, 200, 103, 14, WS_DISABLED END @@ -24,6 +29,9 @@ BEGIN CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 7, 7, 238, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "A&dd...", IDC_GROUPS_ADD, 87, 98, 50, 14 + PUSHBUTTON "&Remove", IDC_GROUPS_REMOVE, 141, 98, 50, 14 + PUSHBUTTON "Pr&operties", IDC_GROUPS_PROPERTIES, 195, 98, 50, 14 END Modified: trunk/reactos/dll/cpl/usrmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resource.h?… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/resource.h [iso-8859-1] Mon May 20 15:44:43 2013 @@ -41,6 +41,16 @@ #define IDC_USER_GENERAL_NEVER_EXPIRES 316 #define IDC_USER_GENERAL_DISABLED 317 #define IDC_USER_GENERAL_LOCKED 318 + +#define IDC_USERS_ADD 319 +#define IDC_USERS_REMOVE 320 +#define IDC_USERS_PROPERTIES 321 +#define IDC_USERS_STARTUP_REQUIRE 322 +#define IDC_USERS_ADMIN_RESET 323 + +#define IDC_GROUPS_ADD 324 +#define IDC_GROUPS_REMOVE 325 +#define IDC_GROUPS_PROPERTIES 326 #define IDD_GROUP_GENERAL 340 #define IDC_GROUP_GENERAL_NAME 341 Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Mon May 20 15:44:43 2013 @@ -675,14 +675,17 @@ break; case IDM_USER_NEW: + case IDC_USERS_ADD: UserNew(hwndDlg); break; case IDM_USER_DELETE: + case IDC_USERS_REMOVE: UserDelete(hwndDlg); break; case IDM_USER_PROPERTIES: + case IDC_USERS_PROPERTIES: if (UserProperties(hwndDlg)) { UpdateUserProperties(hwndDlg);

1 0

[akhaldi] 59050: [MSHTML_WINETEST] * Skip some tests that result in timeouts. ROSTESTS-113 ROSTESTS-114
by akhaldi＠svn.reactos.org 20 May '13

20 May '13

Author: akhaldi Date: Mon May 20 11:17:23 2013 New Revision: 59050 URL: http://svn.reactos.org/svn/reactos?rev=59050&view=rev Log: [MSHTML_WINETEST] * Skip some tests that result in timeouts. ROSTESTS-113 ROSTESTS-114 Modified: trunk/rostests/winetests/mshtml/activex.c trunk/rostests/winetests/mshtml/htmldoc.c Modified: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… ============================================================================== --- trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] Mon May 20 11:17:23 2013 @@ -2435,10 +2435,14 @@ /* Set in DoVerb */ CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(SetObjectRects); - +#if ROSTESTS_114_IS_FIXED test_ui_activate(); test_container(notif_doc); test_object_elem(notif_doc); +#endif + win_skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); + win_skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); + win_skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED); @@ -2553,7 +2557,10 @@ CHECK_CALLED(FindConnectionPoint); CHECK_CALLED(Advise); +#if ROSTESTS_114_IS_FIXED test_event_call(); +#endif + win_skip("Skipping test_event_call(). ROSTESTS-114.\n"); SET_EXPECT(InPlaceDeactivate); SET_EXPECT(Close); Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Mon May 20 11:17:23 2013 @@ -7574,10 +7574,18 @@ test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); +#if ROSTESTS_113_IS_FIXED test_editing_mode(FALSE); +#endif + win_skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); test_editing_mode(TRUE); +#if ROSTESTS_113_IS_FIXED test_HTMLDocument_http(FALSE); test_HTMLDocument_http(TRUE); +#endif + win_skip("Skipping test_HTMLDocument_http(FALSE). ROSTESTS-113.\n"); + win_skip("Skipping test_HTMLDocument_http(TRUE). ROSTESTS-113.\n"); + test_UIActivate(FALSE, FALSE, FALSE); test_UIActivate(FALSE, TRUE, FALSE); test_UIActivate(FALSE, TRUE, TRUE);

1 0

[janderwald] 59049: [HIDCLASS] - Fix double irp completion bug in hidclass - Hidclass now properly initializes and works in WinServer2003 - Tested excessively by Vic (Blame him ; ))
by janderwald＠svn.reactos.org 19 May '13

19 May '13

Author: janderwald Date: Sun May 19 21:33:08 2013 New Revision: 59049 URL: http://svn.reactos.org/svn/reactos?rev=59049&view=rev Log: [HIDCLASS] - Fix double irp completion bug in hidclass - Hidclass now properly initializes and works in WinServer2003 - Tested excessively by Vic (Blame him ;)) Modified: trunk/reactos/drivers/hid/hidclass/fdo.c Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun May 19 21:33:08 2013 @@ -182,23 +182,74 @@ IoStack->DeviceObject = DeviceObject; // + // sanity check + // + ASSERT(CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction] != NULL); + + // + // call minidriver (hidusb) + // + Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); + + // + // wait for the request to finish + // + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // update status + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + +NTSTATUS +HidClassFDO_DispatchRequest( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + + // + // get device extension + // + CommonDeviceExtension = DeviceObject->DeviceExtension; + + ASSERT(Irp->CurrentLocation > 0); + + // + // create stack location + // + IoSetNextIrpStackLocation(Irp); + + // + // get next stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // store device object + // + IoStack->DeviceObject = DeviceObject; + + // + // sanity check + // + ASSERT(CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction] != NULL); + + // // call driver // - DPRINT("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); - - // - // wait for the request to finish - // - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - // - // update status - // - Status = Irp->IoStatus.Status; - } // // done @@ -620,14 +671,8 @@ // // dispatch to mini driver // - IoSkipCurrentIrpStackLocation(Irp); - Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); - - // - // complete request - // - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCopyCurrentIrpStackLocationToNext(Irp); + Status = HidClassFDO_DispatchRequest(DeviceObject, Irp); return Status; } }

1 0

[akhaldi] 59048: [MSHTML_WINETEST] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 19 May '13

19 May '13

Author: akhaldi Date: Sun May 19 21:22:21 2013 New Revision: 59048 URL: http://svn.reactos.org/svn/reactos?rev=59048&view=rev Log: [MSHTML_WINETEST] * Sync with Wine 1.5.26. Added: trunk/rostests/winetests/mshtml/activex.c (with props) trunk/rostests/winetests/mshtml/events.html (with props) trunk/rostests/winetests/mshtml/exectest.html (with props) trunk/rostests/winetests/mshtml/externscr.js (with props) trunk/rostests/winetests/mshtml/style.c (with props) trunk/rostests/winetests/mshtml/test_tlb.idl (with props) trunk/rostests/winetests/mshtml/vbtest.html (with props) Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/htmllocation.c trunk/rostests/winetests/mshtml/jstest.html trunk/rostests/winetests/mshtml/misc.c trunk/rostests/winetests/mshtml/protocol.c trunk/rostests/winetests/mshtml/rsrc.rc trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/mshtml/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… Added: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… Added: trunk/rostests/winetests/mshtml/events.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.h… Added: trunk/rostests/winetests/mshtml/exectest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/exectest… Added: trunk/rostests/winetests/mshtml/externscr.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/externsc… Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Modified: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… Modified: trunk/rostests/winetests/mshtml/jstest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/jstest.h… Modified: trunk/rostests/winetests/mshtml/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/misc.c?r… Modified: trunk/rostests/winetests/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/protocol… Modified: trunk/rostests/winetests/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/rsrc.rc?… Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… Added: trunk/rostests/winetests/mshtml/style.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/style.c?… Added: trunk/rostests/winetests/mshtml/test_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/test_tlb… Modified: trunk/rostests/winetests/mshtml/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/testlist… Added: trunk/rostests/winetests/mshtml/vbtest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/vbtest.h…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs