Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[gadamopoulos] 55758: [win32k] - Fix SPI_SETMOUSESPEED - Patch by Edijs Kolesnikovics, terminedijs@yahoo.com

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 18:05:33 2012 New Revision: 55758 URL: http://svn.reactos.org/svn/reactos?rev=55758&view=rev Log: [win32k] - Fix SPI_SETMOUSESPEED - Patch by Edijs Kolesnikovics, terminedijs(a)yahoo.com Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Feb 20 18:05:33 2012 @@ -45,7 +45,7 @@ static const WCHAR* VAL_HOVERTIME = L"MouseHoverTime"; static const WCHAR* VAL_HOVERWIDTH = L"MouseHoverWidth"; static const WCHAR* VAL_HOVERHEIGHT = L"MouseHoverHeight"; -//static const WCHAR* VAL_SENSITIVITY = L"MouseSensitivity"; +static const WCHAR* VAL_SENSITIVITY = L"MouseSensitivity"; static const WCHAR* KEY_DESKTOP = L"Control Panel\\Desktop"; static const WCHAR* VAL_SCRTO = L"ScreenSaveTimeOut"; @@ -220,7 +220,8 @@ /* Load mouse settings */ gspv.caiMouse.FirstThreshold = SpiLoadMouse(VAL_MOUSE1, 6); gspv.caiMouse.SecondThreshold = SpiLoadMouse(VAL_MOUSE2, 10); - gspv.caiMouse.Acceleration = gspv.iMouseSpeed = SpiLoadMouse(VAL_MOUSE3, 1); + gspv.caiMouse.Acceleration = SpiLoadMouse(VAL_MOUSE3, 1); + gspv.iMouseSpeed = SpiLoadMouse(VAL_SENSITIVITY, 10); gspv.bMouseBtnSwap = SpiLoadMouse(VAL_SWAP, 0); gspv.bSnapToDefBtn = SpiLoadMouse(VAL_SNAPDEFBTN, 0); gspv.iMouseTrails = SpiLoadMouse(VAL_MOUSETRAILS, 0); @@ -1262,8 +1263,13 @@ return SpiGetInt(pvParam, &gspv.iMouseSpeed, fl); case SPI_SETMOUSESPEED: - // vgl SETMOUSE - return SpiSetInt(&gspv.iMouseSpeed, uiParam, KEY_MOUSE, VAL_MOUSE3, fl); + { + /* Allowed range is [1:20] */ + if ((INT_PTR)pvParam < 1 || (INT_PTR)pvParam > 20) + return 0; + else + return SpiSetInt(&gspv.iMouseSpeed, (INT_PTR)pvParam, KEY_MOUSE, VAL_SENSITIVITY, fl); + } case SPI_GETSCREENSAVERRUNNING: return SpiGetInt(pvParam, &gspv.bScrSaverRunning, fl);

12 years, 7 months

[khornicek] 55757: [TRANSLATION] Renaming to match the CHINESE_TRADITIONAL sub lang.

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Feb 20 16:49:48 2012 New Revision: 55757 URL: http://svn.reactos.org/svn/reactos?rev=55757&view=rev Log: [TRANSLATION] Renaming to match the CHINESE_TRADITIONAL sub lang. Added: trunk/reactos/dll/win32/comdlg32/cdlg_Tw.rc - copied unchanged from r55756, trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc Removed: trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Cn… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc (removed) @@ -1,490 +1,0 @@ -/* - * Resources for Common Dialogs - * - * Copyright 1999 Bertho Stultiens - * Copyright 1999 Klaas van Gend - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "cdlg.h" -#include "filedlgbrowser.h" - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL - -STRINGTABLE -{ - IDS_FILENOTFOUND "æ¾ä¸å°æªæ¡" - IDS_VERIFYFILE "è«æª¢é©æ¯å¦çµ¦äºæ£ç¢ºçæªæ¡åç¨±ã" - IDS_CREATEFILE "æ¾ä¸å°æªæ¡\n\ -æ¯å¦åµå»ºæ°æªæ¡?" - IDS_OVERWRITEFILE "æªæ¡å·²ç¶åå¨ã\n\ -è¦æ¿æå?" - IDS_INVALID_FILENAME_TITLE "æªæ¡åä¸åå¨ç¡æçåç¬¦" - IDS_INVALID_FILENAME "æªæ¡åä¸ä¸è½åå«ä»»ä½ä¸ä¸åç¬¦::\n\ - / : < > |" - IDS_PATHNOTEXISTING "è³æå¤¾ä¸åå¨" - IDS_FILENOTEXISTING "æªæ¡ä¸åå¨" -} - -STRINGTABLE -{ - IDS_UPFOLDER "åä¸ä¸å±¤" - IDS_NEWFOLDER "å»ºç«æ°è³æå¤¾" - IDS_LISTVIEW "æ¸å®" - IDS_REPORTVIEW "è©³ç´°è³æ" - IDS_TODESKTOP "é¡¯ç¤ºæ¡é¢" -} - -STRINGTABLE -{ - PD32_PRINT_TITLE "åå°" - - PD32_VALUE_UREADABLE "æ¸å¼ä¸å¯è®" - PD32_INVALID_PAGE_RANGE "éåå¼ä¸å¨é æ¸ç¯åã\n\ - è«è¼¸å¥ä¸å %d å %d ä¹éçæ¸ã" - PD32_FROM_NOT_ABOVE_TO "'å¾'é çå¼ä¸è½å¤§æ¼'å°'é çå¼ã" - PD32_MARGINS_OVERLAP "éç·£ç©ºç½éè¿æè½æ¼ç´å¤,\n\ -è«éæ°è¼¸å¥éç·£ç©ºç½ã" - PD32_NR_OF_COPIES_EMPTY "'ä»½æ¸' é ä¸è½ç©º." - PD32_TOO_LARGE_COPIES "ä½ çå°è¡¨æ©ä¸æ¯æééº¼å¤§çä»½æ¸ã\n\ - è«è¼¸å¥ä¸å 1 å %d ä¹éçæ¸ã" - PD32_PRINT_ERROR "å°è¡¨æ©é¯èª¤ã" - PD32_NO_DEFAULT_PRINTER "æ²æé»èªå°è¡¨æ©ã" - PD32_CANT_FIND_PRINTER "æ¾ä¸å°å°è¡¨æ©ã" - PD32_OUT_OF_MEMORY "å§åä¸å¤ ã" - PD32_GENERIC_ERROR "åºç¾ä¸äºé¯èª¤ã" - PD32_DRIVER_UNKNOWN "æ¾ä¸å°å°è¡¨æ©é©åå¨ã" - PD32_NO_DEVICES "å¨ä½¿ç¨èå°è¡¨æ©æéåè½(çé¢è¨å®, åå°æªæ¡)ä¹å, ä½ å¿é åè£å°è¡¨æ©ãè«è£ä¸åå°è¡¨æ©åè©¦ã" - - PD32_DEFAULT_PRINTER "é»èªå°è¡¨æ©; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "æ %d åææªæ£å¨çå¾åå°" - PD32_MARGINS_IN_INCHES "éç·£ç©ºç½ [è±å¯¸]" - PD32_MARGINS_IN_MILLIMETERS "éç·£ç©ºç½ [æ¯«ç±³]" - PD32_MILLIMETERS "æ¯«ç±³" - - PD32_PRINTER_STATUS_READY "å¾å½" - PD32_PRINTER_STATUS_PAUSED "æ«å; " - PD32_PRINTER_STATUS_ERROR "é¯èª¤; " - PD32_PRINTER_STATUS_PENDING_DELETION "çå¾åªé¤; " - PD32_PRINTER_STATUS_PAPER_JAM "å¡ç´; " - PD32_PRINTER_STATUS_PAPER_OUT "ç¡ç´; " - PD32_PRINTER_STATUS_MANUAL_FEED "æåé²ç´; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "ç´çåé¡; " - PD32_PRINTER_STATUS_OFFLINE "å°è¡¨æ©é¢ç·; " - PD32_PRINTER_STATUS_IO_ACTIVE "I/O æ´»å; " - PD32_PRINTER_STATUS_BUSY "ç¹å¿; " - PD32_PRINTER_STATUS_PRINTING "æ£å¨åå°; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "åºç´æç¤å·²æ»¿; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "ä¸å¯ç¨; " - PD32_PRINTER_STATUS_WAITING "çå¾; " - PD32_PRINTER_STATUS_PROCESSING "æ£å¨èç; " - PD32_PRINTER_STATUS_INITIALIZING "æ£å¨åå; " - PD32_PRINTER_STATUS_WARMING_UP "é ç±; " - PD32_PRINTER_STATUS_TONER_LOW "å¢¨ä½; " - PD32_PRINTER_STATUS_NO_TONER "æ²å¢¨; " - PD32_PRINTER_STATUS_PAGE_PUNT "é èçå§åè¶æ¯; " - PD32_PRINTER_STATUS_USER_INTERVENTION "ç¨æ¶å¹²é ; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "å§åä¸å¤ ; " - PD32_PRINTER_STATUS_DOOR_OPEN "å°è¡¨æ©èæ¯æéç; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "æ¾ä¸å°åå°æåå¨; " - PD32_PRINTER_STATUS_POWER_SAVE "çé»çæ; " -} - -STRINGTABLE /* Font styles */ -{ - IDS_FONT_REGULAR "" - IDS_FONT_BOLD "" - IDS_FONT_ITALIC "" - IDS_FONT_BOLD_ITALIC "" -} - -STRINGTABLE /* Color names */ -{ - IDS_COLOR_BLACK "" - IDS_COLOR_MAROON "" - IDS_COLOR_GREEN "" - IDS_COLOR_OLIVE "" - IDS_COLOR_NAVY "" - IDS_COLOR_PURPLE "" - IDS_COLOR_TEAL "" - IDS_COLOR_GRAY "" - IDS_COLOR_SILVER "" - IDS_COLOR_RED "åå" - IDS_COLOR_LIME "" - IDS_COLOR_YELLOW "" - IDS_COLOR_BLUE "" - IDS_COLOR_FUCHSIA "" - IDS_COLOR_AQUA "" - IDS_COLOR_WHITE "" -} - -STRINGTABLE -{ - IDS_FONT_SIZE "" - IDS_SAVE_BUTTON "" - IDS_SAVE_IN "å¦åçº(&A)..." - IDS_SAVE "å²å HTML" - IDS_SAVE_AS "å¦åæ°æª" - IDS_OPEN_FILE "Wineå°é·" -} - -/* - * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. - */ - -OPEN_FILE DIALOG 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "éå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æªæ¡åç¨±(&N):", stc3, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "ç®é(&D):", -1, 110, 6, 92, 9 - LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "æªæ¡é¡å(&T):", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "ç£ç¢æ©(&V):", stc4, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "éå", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "å¯è®(&R)", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -SAVE_FILE DIALOG 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "å¦åæ°æª..." -FONT 8, "MS Shell Dlg" -{ - LTEXT "æªæ¡åç¨±(&N):", stc3, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX lst1, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "ç®é(&D):", -1, 110, 6, 92, 9 - LTEXT "", stc1, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX lst2, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "æªæ¡é¡å(&T):", stc2, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "ç£ç¢æ©(&V):", stc4, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "å¦åæ°æª", IDOK, 208, 6, 60, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 208, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp, 208, 46, 60, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "å¯è®(&R)", chx1, 208, 68, 65, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT DIALOG 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åå°" -FONT 8, "MS Shell Dlg" -{ - LTEXT "åå°", stc1, 6, 6, 40, 9 - LTEXT "", stc2, 60, 6, 150, 9 - GROUPBOX "åå°ç®æ¨(&P)", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "å¨é¨(&A)", rad1, 16, 45, 60, 12 - RADIOBUTTON "é¸æ©åæå", rad2, 16, 60, 60, 12 - RADIOBUTTON "åä¸ç¿»é ", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "åå°", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "çé¢è¨å®", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "", stc3, 60, 80, 30, 9 - LTEXT "", stc4, 120, 80, 30, 9 - LTEXT "å£ç¸®è³ªé(&Q):", stc5, 6, 100, 76, 9 - COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "åå°å°æªæ¡", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT_SETUP DIALOG 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åå°è¨å®(&R)..." -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "åå°", grp1, 6, 6, 180, 72, BS_GROUPBOX - RADIOBUTTON "é»èªå°è¡¨æ©; ", rad1, 16, 16, 150, 12 - LTEXT "", stc1, 35, 30, 120, 9 - RADIOBUTTON "", rad2, 16, 44, 150, 12 - COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "ç¢ºå®", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "çé¢è¨å®", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "æ¹å", grp2, 6, 82, 100, 50, BS_GROUPBOX - RADIOBUTTON "ç¸±å(&P)", rad3, 50, 95, 50, 12 - RADIOBUTTON "æ©«å(&L)", rad4, 50, 110, 50, 12 - ICON "LANDSCAP", stc10, 10, 95, 32, 32 - ICON "PORTRAIT", stc11, 10, 95, 32, 32 - GROUPBOX "ç´å¼µ", grp3, 116, 82, 178, 50, BS_GROUPBOX - LTEXT "å¤§å°(&z)ï¼", stc2, 126, 95, 35, 9 - LTEXT "åå§æªæ¡:", stc3, 126, 110, 35, 9 - COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_FONT DIALOG 13, 54, 274, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "åå(&F):",stc1 ,6,3,90,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "ååæ¨£å¼(&Y):",stc2 ,108,3,60,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "å¤§å°(&S)ï¼",stc3,179,3,32,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "ç¢ºå®",IDOK,218,6,50,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶",IDCANCEL,218,23,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¥ç¨(&A)", psh3,218,40,50,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)" , pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP - GROUPBOX "ææ",grp1,6,72,84,36,WS_GROUP - CHECKBOX "åªé¤ç·(&K)", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "åºç·(&U)", chx2, 10,94,78,10, BS_AUTOCHECKBOX - LTEXT "éè²(&C)ï¼", stc4 ,6,114,80,9 - COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "ç¯ä¾",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "è¯è¨:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG 36, 24, 300, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "è²å½©" -FONT 8, "MS Shell Dlg" -{ - LTEXT "åºæ¬è²å½©(&B):", stc1, 4, 4, 140, 10 - LTEXT "èªå®è²å½©(&C):", stc2, 4, 106, 140, 10 - LTEXT "è²å½© | å¯¦å¿(&I)", stc3, 150, 151, 48, 10 - LTEXT "ç´(&R):", 726 /*1094*/,247,126,27,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "ç¶ (&G):",727/*1095*/,247,140,27,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "è(&B):",728 /*1096*/,247,154,27,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "è²èª¿(&H):" ,723 /*1091*/,200,126,24,10 - EDITTEXT 703, 224,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "æ¿åº¦(&S):" ,724 /*1092*/,200,140,24,10 - EDITTEXT 704, 224,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "äº®åº¦(&L):" ,725 /*1093*/,200,154,24,10 - EDITTEXT 705, 224,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "ç¢ºå®", IDOK, 4, 167, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©", pshHelp,100,166, 44, 14 - PUSHBUTTON "æ°å¢èªå®è²å½©(&A)", 712/*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å®ç¾©èªå®è²å½©(&D) >>", 719/*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "è²å½© | å¯¦å¿(&I)",713,300,200,4,14 /* just a dummy */ -} - - -FINDDLGORD DIALOG 36, 24, 276, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "æ¥æ¾" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æå°ç®æ¨(&N):", -1, 4, 8, 52, 8 - EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "å¨åæ¼å¯«é ç¬¦å(&W)", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "å¤§å°å¯«è¦çºç¸ç°(&C)", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "æ¹å", grp1, 127, 26, 78, 28 - CONTROL "ä¸(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 35, 12 - CONTROL "ä¸(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 163, 38, 35, 12 - - DEFPUSHBUTTON "æ¾ä¸ä¸å(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG 36, 24, 276, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "åä»£" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æå°ç®æ¨(&N):", -1, 4, 8, 52, 8 - EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "åä»£çº(&P):", -1, 4, 26, 52, 8 - EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "å¨åæ¼å¯«é ç¬¦å(&W)", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "å¤§å°å¯«è¦çºç¸ç°(&C)", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "æ¾ä¸ä¸å(&F)", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "åä»£(&R)", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "åä»£å¨é¨(&A)", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "åæ¶", IDCANCEL , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "å¹«å©(&H)", pshHelp , 212, 78, 60, 14, WS_GROUP | WS_TABSTOP -} - - -PRINT32 DIALOG 32, 32, 288, 186 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "åå°" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "ç¢ºå®", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 230,164, 50,14, WS_GROUP - PUSHBUTTON "å¹«å©(&H)", pshHelp, 50, 161, 50,14, WS_GROUP - - GROUPBOX "åå°", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "åå°å°æªæ¡", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 - PUSHBUTTON "å±¬æ§(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "åç¨±(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "çææ¬(&S)", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 120,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "é¡å(&T)ï¼", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "åè¨»:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "",stc5,168,105,68,8 - ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 - EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - - GROUPBOX "åå°ç®æ¨(&P)", grp1, 8,92, 144,64, WS_GROUP - CONTROL "å¨é¨(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "é¸æ(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "", stc2, 52,124, 20,8 - RTEXT "", stc3, 99,124, 20,8 -} - -PRINT32_SETUP DIALOG 32, 32, 288, 178 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "åå°è¨å®(&R)..." -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "ç¢ºå®",IDOK,176,156,50,14,WS_GROUP - PUSHBUTTON "åæ¶",IDCANCEL,230,156,50,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - - GROUPBOX "åå°", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "å±¬æ§(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "åç¨±(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "çææ¬(&S)", stc8, 16, 36, 47,10, SS_NOPREFIX - LTEXT "", stc12, 65, 36, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "é¡å(&T)ï¼", stc7, 16, 48, 47,10, SS_NOPREFIX - LTEXT "", stc11, 65, 48, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "", stc10, 16, 60, 47,10, SS_NOPREFIX - LTEXT "", stc14, 65, 60, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "åè¨»:", stc9, 16, 72, 47,10, SS_NOPREFIX - LTEXT "", stc13, 65, 72, 212,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "ç´å¼µ", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "å¤§å°(&z)ï¼", stc2, 16,108, 36, 8 - COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "åå§æªæ¡:", stc3, 16,128, 36, 8 - COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - - GROUPBOX "æ¹å", grp1, 180, 92, 100,56, WS_GROUP - ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "ç¸±å(&P)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "æ©«å(&L)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 -END - -PAGESETUPDLGORD DIALOG 32, 32, 240, 240 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "ç´å¼µ", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "å¤§å°(&S)ï¼", stc2, 16, 112, 36, 8 - COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "", stc3, 16, 132, 36, 8 - COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "æ¹å", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "ç¸±å(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "æ©«å(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "ç¶åæ¨é¡æ¬", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "å·¦(&L):", stc15, 88, 172, 30, 8 - EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "å³(&R):", stc16, 159, 172, 30, 8 - EDITTEXT edt6, 190, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "", stc17, 88, 192, 30, 8 - EDITTEXT edt5, 119, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "ä¸(&B):", stc18, 159, 192, 30, 8 - EDITTEXT edt7, 190, 190, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - DEFPUSHBUTTON "ç¢ºå®", IDOK, 70, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "åæ¶", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "åå°", psh3, 182, 220, 50, 14 -END - -NEWFILEOPENORD DIALOG 0, 0, 280, 164 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "éå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æå°ä½ç½®(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY - COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - - LTEXT "æªæ¡åç¨±(&N):",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY - EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL - - LTEXT "æªæ¡é¡å(&T):",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY - COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "éåæå¯è®(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 - - DEFPUSHBUTTON "éå(&O)", IDOK,222,110,54,14 - PUSHBUTTON "åæ¶", IDCANCEL,222,128,54,14 - PUSHBUTTON "å¹«å©(&H)", pshHelp,222,145,54,14 -} - -NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | - WS_THICKFRAME -CAPTION "éå" -FONT 8, "MS Shell Dlg" -{ - LTEXT "æªæ¡å(&F):", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT - EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP - - LTEXT "æªæ¡é¡å(&T):", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT - COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | - CBS_HASSTRINGS | CBS_DROPDOWNLIST - - DEFPUSHBUTTON "éå(&O)", IDOK, 350, 240, 40, 14, WS_GROUP - PUSHBUTTON "åæ¶", IDCANCEL, 395, 240, 40, 14 - PUSHBUTTON "å¹«å©(&H)", pshHelp, 350, 272, 40, 14 -} Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/rsrc.rc [iso-8859-1] Mon Feb 20 16:49:48 2012 @@ -46,7 +46,6 @@ #include "cdlg_Bg.rc" #include "cdlg_Ca.rc" -#include "cdlg_Cn.rc" #include "cdlg_Cs.rc" #include "cdlg_Da.rc" #include "cdlg_De.rc" @@ -74,5 +73,6 @@ #include "cdlg_Sv.rc" #include "cdlg_Th.rc" #include "cdlg_Tr.rc" +#include "cdlg_Tw.rc" #include "cdlg_Uk.rc" #include "cdlg_Zh.rc"

12 years, 7 months

[janderwald] 55756: [USBHUB] - Check if the request is for a valid PDO

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 20 15:54:19 2012 New Revision: 55756 URL: http://svn.reactos.org/svn/reactos?rev=55756&view=rev Log: [USBHUB] - Check if the request is for a valid PDO Modified: trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Mon Feb 20 15:54:19 2012 @@ -123,6 +123,33 @@ return STATUS_PENDING; } +BOOLEAN +IsValidPDO( + IN PDEVICE_OBJECT DeviceObject) +{ + ULONG Index; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + + + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + + for(Index = 0; Index < USB_MAXCHILDREN; Index++) + { + if (HubDeviceExtension->ChildDeviceObject[Index] == DeviceObject) + { + /* PDO exists */ + return TRUE; + } + } + + /* invalid pdo */ + return FALSE; +} + + NTSTATUS USBHUB_PdoHandleInternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, @@ -153,6 +180,15 @@ ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); HubDeviceExtension = (PHUB_DEVICE_EXTENSION)ChildDeviceExtension->ParentDeviceObject->DeviceExtension; RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; + + if(!IsValidPDO(DeviceObject)) + { + DPRINT1("[USBHUB] Request for removed device object %p\n", DeviceObject); + Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_DEVICE_NOT_CONNECTED; + } switch (Stack->Parameters.DeviceIoControl.IoControlCode) {

12 years, 7 months

[gadamopoulos] 55755: [win32k] - Do not store the PDEVOBJ and a fake name in MONITOR struct. Use MONITOR.HDEV instead (which is an opaque pointer to a PDEVOBJ)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 13:23:32 2012 New Revision: 55755 URL: http://svn.reactos.org/svn/reactos?rev=55755&view=rev Log: [win32k] - Do not store the PDEVOBJ and a fake name in MONITOR struct. Use MONITOR.HDEV instead (which is an opaque pointer to a PDEVOBJ) Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -21,18 +21,13 @@ SHORT cFullScreen; SHORT cWndStack; HDEV hDev; - - // ReactOS specific fields: - UNICODE_STRING DeviceName; /* Name of the monitor */ - PDEVOBJ *GdiDevice; /* Pointer to the GDI device to - which this monitor is attached */ } MONITOR, *PMONITOR; -NTSTATUS IntAttachMonitor(PDEVOBJ *pGdiDevice, ULONG DisplayNumber); -NTSTATUS IntDetachMonitor(PDEVOBJ *pGdiDevice); -NTSTATUS IntUpdateMonitorSize(IN PDEVOBJ *pGdiDevice); -PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR); -PMONITOR FASTCALL IntGetPrimaryMonitor(VOID); -PMONITOR FASTCALL IntMonitorFromRect(PRECTL,DWORD); +NTSTATUS NTAPI UserAttachMonitor(IN HDEV hDev); +NTSTATUS NTAPI UserDetachMonitor(HDEV hDev); +NTSTATUS NTAPI UserUpdateMonitorSize(IN HDEV hDev); +PMONITOR NTAPI UserGetMonitorObject(IN HMONITOR); +PMONITOR NTAPI UserGetPrimaryMonitor(VOID); +PMONITOR NTAPI UserMonitorFromRect(PRECTL,DWORD); /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -565,9 +565,8 @@ } else { - HDEV hDev; - hDev = (HDEV)pPrimarySurface; - DesktopHDC = IntGdiCreateDisplayDC(hDev, DcType, EmptyDC); + PMONITOR pMonitor = UserGetPrimaryMonitor(); + DesktopHDC = IntGdiCreateDisplayDC(pMonitor->hDev, DcType, EmptyDC); } return DesktopHDC; @@ -860,7 +859,7 @@ /* * Try to open already existing desktop */ - + TRACE("Trying to open desktop (%wZ)\n", &DesktopName); Status = ObOpenObjectByName( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -779,7 +779,7 @@ //IntvGetDeviceCaps(&PrimarySurface, &GdiHandleTable->DevCaps); /* Set new size of the monitor */ - IntUpdateMonitorSize(ppdev); + UserUpdateMonitorSize((HDEV)ppdev); /* Remove all cursor clipping */ UserClipCursor(NULL); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -49,9 +49,6 @@ void IntDestroyMonitorObject(IN PMONITOR pMonitor) { - /* Free monitor name */ - RtlFreeUnicodeString(&pMonitor->DeviceName); - /* Remove monitor region */ if (pMonitor->hrgnMonitor) { @@ -73,7 +70,7 @@ * hMonitor * Handle of MONITOR object */ -PMONITOR FASTCALL +PMONITOR NTAPI UserGetMonitorObject(IN HMONITOR hMonitor) { PMONITOR pMonitor; @@ -94,16 +91,15 @@ return pMonitor; } -/* IntGetPrimaryMonitor +/* UserGetPrimaryMonitor * * Returns a PMONITOR for the primary monitor * * Return value * PMONITOR */ -PMONITOR -FASTCALL -IntGetPrimaryMonitor() +PMONITOR NTAPI +UserGetPrimaryMonitor() { PMONITOR pMonitor; @@ -117,7 +113,7 @@ return pMonitor; } -/* IntAttachMonitor +/* UserAttachMonitor * * Creates a new MONITOR and appends it to the list of monitors. * @@ -129,12 +125,10 @@ * Return value * Returns a NTSTATUS */ -NTSTATUS -IntAttachMonitor(IN PDEVOBJ *pGdiDevice, - IN ULONG DisplayNumber) +NTSTATUS NTAPI +UserAttachMonitor(IN HDEV hDev) { PMONITOR pMonitor; - WCHAR Buffer[CCHDEVICENAME]; TRACE("Attaching monitor...\n"); @@ -145,17 +139,8 @@ TRACE("Couldnt create monitor object\n"); return STATUS_INSUFFICIENT_RESOURCES; } - - _snwprintf(Buffer, CCHDEVICENAME, L"\\\\.\\DISPLAY%d", DisplayNumber + 1); - if (!RtlCreateUnicodeString(&pMonitor->DeviceName, Buffer)) - { - TRACE("Couldn't duplicate monitor name!\n"); - UserDereferenceObject(pMonitor); - UserDeleteObject(UserHMGetHandle(pMonitor), otMonitor); - return STATUS_INSUFFICIENT_RESOURCES; - } - - pMonitor->GdiDevice = pGdiDevice; + + pMonitor->hDev = hDev; pMonitor->cWndStack = 0; if (gMonitorList == NULL) @@ -174,12 +159,12 @@ pmonLast->pMonitorNext = pMonitor; } - IntUpdateMonitorSize(pGdiDevice); + UserUpdateMonitorSize(hDev); return STATUS_SUCCESS; } -/* IntDetachMonitor +/* UserDetachMonitor * * Deletes a MONITOR and removes it from the list of monitors. * @@ -190,15 +175,15 @@ * Return value * Returns a NTSTATUS */ -NTSTATUS -IntDetachMonitor(IN PDEVOBJ *pGdiDevice) +NTSTATUS NTAPI +UserDetachMonitor(IN HDEV hDev) { PMONITOR pMonitor = gMonitorList, *pLink = &gMonitorList; /* Find monitor attached to given device */ while (pMonitor != NULL) { - if (pMonitor->GdiDevice == pGdiDevice) + if (pMonitor->hDev == hDev) break; pLink = &pMonitor->pMonitorNext; @@ -224,7 +209,7 @@ return STATUS_SUCCESS; } -/* IntUpdateMonitorSize +/* UserUpdateMonitorSize * * Reset size of the monitor using atached device * @@ -236,15 +221,16 @@ * Return value * Returns a NTSTATUS */ -NTSTATUS -IntUpdateMonitorSize(IN PDEVOBJ *pGdiDevice) +NTSTATUS NTAPI +UserUpdateMonitorSize(IN HDEV hDev) { PMONITOR pMonitor; + SIZEL DeviceSize; /* Find monitor attached to given device */ for (pMonitor = gMonitorList; pMonitor != NULL; pMonitor = pMonitor->pMonitorNext) { - if (pMonitor->GdiDevice == pGdiDevice) + if (pMonitor->hDev == hDev) break; } @@ -253,12 +239,15 @@ /* No monitor has been found */ return STATUS_INVALID_PARAMETER; } + + /* Get the size of the hdev */ + PDEVOBJ_sizl((PPDEVOBJ)hDev, &DeviceSize); /* Update monitor size */ pMonitor->rcMonitor.left = 0; pMonitor->rcMonitor.top = 0; - pMonitor->rcMonitor.right = pMonitor->rcMonitor.left + pMonitor->GdiDevice->gdiinfo.ulHorzRes; - pMonitor->rcMonitor.bottom = pMonitor->rcMonitor.top + pMonitor->GdiDevice->gdiinfo.ulVertRes; + pMonitor->rcMonitor.right = pMonitor->rcMonitor.left + DeviceSize.cx; + pMonitor->rcMonitor.bottom = pMonitor->rcMonitor.top + DeviceSize.cy; pMonitor->rcWork = pMonitor->rcMonitor; /* Destroy monitor region... */ @@ -403,9 +392,8 @@ return cMonitors; } -PMONITOR -FASTCALL -IntMonitorFromRect( +PMONITOR NTAPI +UserMonitorFromRect( PRECTL pRect, DWORD dwFlags) { @@ -703,6 +691,7 @@ MONITORINFOEXW MonitorInfo; NTSTATUS Status; BOOL bRet = FALSE; + PWCHAR pwstrDeviceName; TRACE("Enter NtUserGetMonitorInfo\n"); UserEnterShared(); @@ -721,6 +710,8 @@ SetLastNtError(STATUS_INVALID_PARAMETER); goto cleanup; } + + pwstrDeviceName = ((PPDEVOBJ)(pMonitor->hDev))->pGraphicsDevice->szWinDeviceName; /* Get size of pMonitorInfoUnsafe */ Status = MmCopyFromCaller(&MonitorInfo.cbSize, &pMonitorInfoUnsafe->cbSize, sizeof(MonitorInfo.cbSize)); @@ -750,8 +741,8 @@ { RtlStringCbCopyNExW(MonitorInfo.szDevice, sizeof(MonitorInfo.szDevice), - pMonitor->DeviceName.Buffer, - pMonitor->DeviceName.Length, + pwstrDeviceName, + (wcslen(pwstrDeviceName)+1) * sizeof(WCHAR), NULL, NULL, STRSAFE_FILL_BEHIND_NULL); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -947,7 +947,7 @@ case SPI_GETWORKAREA: { - PMONITOR pmonitor = IntGetPrimaryMonitor(); + PMONITOR pmonitor = UserGetPrimaryMonitor(); if(!pmonitor) return 0; @@ -959,7 +959,7 @@ { /* FIXME: We should set the work area of the monitor that contains the specified rectangle */ - PMONITOR pmonitor = IntGetPrimaryMonitor(); + PMONITOR pmonitor = UserGetPrimaryMonitor(); RECT rcWorkArea; if(!pmonitor) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -1463,7 +1463,7 @@ PMONITOR pMonitor; PRTL_USER_PROCESS_PARAMETERS ProcessParams; - pMonitor = IntGetPrimaryMonitor(); + pMonitor = UserGetPrimaryMonitor(); /* Check if we don't have a monitor attached yet */ if(pMonitor == NULL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -323,7 +323,7 @@ else { RECTL WorkArea; - PMONITOR pmonitor = IntMonitorFromRect(&Rect, MONITOR_DEFAULTTOPRIMARY ); + PMONITOR pmonitor = UserMonitorFromRect(&Rect, MONITOR_DEFAULTTOPRIMARY ); // FIXME: support DPI aware, rcWorkDPI/Real etc.. if (!(Wnd->style & WS_MAXIMIZEBOX) || (Wnd->state & WNDS_HASCAPTION) || pmonitor->cFullScreen) @@ -389,7 +389,7 @@ if ( Wnd->spwndParent == Wnd->head.rpdesk->pDeskInfo->spwnd && !(Wnd->ExStyle & WS_EX_TOOLWINDOW)) { - PMONITOR pmonitor = IntMonitorFromRect(&lpwndpl->rcNormalPosition, MONITOR_DEFAULTTOPRIMARY ); + PMONITOR pmonitor = UserMonitorFromRect(&lpwndpl->rcNormalPosition, MONITOR_DEFAULTTOPRIMARY ); // FIXME: support DPI aware, rcWorkDPI/Real etc.. if (Wnd->InternalPos.flags & WPF_MININIT) @@ -414,7 +414,7 @@ /* make sure the specified rect is visible on screen */ static void make_rect_onscreen( RECT *rect ) { - PMONITOR pmonitor = IntMonitorFromRect( rect, MONITOR_DEFAULTTONEAREST ); // Wine uses this. + PMONITOR pmonitor = UserMonitorFromRect( rect, MONITOR_DEFAULTTONEAREST ); // Wine uses this. // FIXME: support DPI aware, rcWorkDPI/Real etc.. if (!pmonitor) return; @@ -744,7 +744,7 @@ co_IntSendMessage(Window->head.h, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax); /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = IntGetPrimaryMonitor())) + if ((monitor = UserGetPrimaryMonitor())) { RECT rc_work; Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Feb 20 13:23:32 2012 @@ -30,16 +30,9 @@ { SIZEL SurfSize; SURFOBJ *pso; - BOOL calledFromUser; - - calledFromUser = UserIsEntered(); // FIXME: Possibly upgrade a shared lock - if (!calledFromUser) - { - UserEnterExclusive(); - } /* Attach monitor */ - IntAttachMonitor(gppdevPrimary, 0); + UserAttachMonitor((HDEV)gppdevPrimary); DPRINT("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", pPrimarySurface, pPrimarySurface->pSurface); @@ -56,11 +49,6 @@ // Init Primary Displays Device Capabilities. PDEVOBJ_vGetDeviceCaps(pPrimarySurface, &GdiHandleTable->DevCaps); - - if (!calledFromUser) - { - UserLeave(); - } return TRUE; }

12 years, 7 months

[khornicek] 55754: missed this one, sorry

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Feb 20 12:21:43 2012 New Revision: 55754 URL: http://svn.reactos.org/svn/reactos?rev=55754&view=rev Log: missed this one, sorry Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Mon Feb 20 12:21:43 2012 @@ -31,7 +31,7 @@ #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" -#include "lang/pt-PT.rc" +#include "lang/pt-BR.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/Sr.rc"

12 years, 7 months

[khornicek] 55753: [TRANSLATION] Rename pt-pt to match the pt-br sublang.

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Feb 20 12:20:42 2012 New Revision: 55753 URL: http://svn.reactos.org/svn/reactos?rev=55753&view=rev Log: [TRANSLATION] Rename pt-pt to match the pt-br sublang. Added: trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc - copied unchanged from r55043, trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc Removed: trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc Removed: trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pt-PT… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pt-PT.rc (removed) @@ -1,76 +1,0 @@ -/* - * Portuguese resources for the Internet control panel applet - * - * Copyright 2010 Gustavo Henrique MilarÃ© - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "inetcpl.h" - -#pragma code_page(65001) - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN - -/* "General" propsheet */ -IDD_GENERAL DIALOG 0, 0, 320, 220 -STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "MS Shell Dlg" -CAPTION "Geral" -BEGIN - - GROUPBOX " PÃ¡gina inicial ", IDC_STATIC, 4, 4, 312, 52 - LTEXT "Escolha o endereÃ§o que serÃ¡ usado como pÃ¡gina inicial.", - IDC_STATIC, 58, 10, 252, 10 - EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL - PUSHBUTTON "PÃ¡gina &atual", IDC_HOME_CURRENT, 58, 36, 80, 14 - PUSHBUTTON "PÃ¡gina &padrÃ£o", IDC_HOME_DEFAULT, 144, 36, 80, 14 - PUSHBUTTON "PÃ¡gina em &branco", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 - -END - -/* "Content" propsheet */ -IDD_CONTENT DIALOG 0, 0, 320, 220 -STYLE WS_CAPTION | WS_CHILD | WS_DISABLED -FONT 8, "MS Shell Dlg" -CAPTION "ConteÃºdo" -BEGIN - - GROUPBOX " Certificados ", IDC_STATIC, 4, 4, 312, 50 - LTEXT "Certificados sÃ£o usados para sua identificaÃ§Ã£o pessoal e para identificar certificados de autoridades e editores.", - IDC_STATIC, 58, 14, 252, 18 - PUSHBUTTON "Certificados...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Editores...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 - -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_CPL_NAME "Internet Settings" - IDS_CPL_INFO "Configure Wine Internet Browser and related settings" - IDS_SEC_SETTINGS "Security settings for zone: " - IDS_SEC_LEVEL0 "Custom" - IDS_SEC_LEVEL1 "Very Low" - IDS_SEC_LEVEL2 "Low" - IDS_SEC_LEVEL3 "Medium" - IDS_SEC_LEVEL4 "Increased" - IDS_SEC_LEVEL5 "High" -END

12 years, 7 months

[cgutman] 55752: [KBDCLASS][MOUCLASS] - Demote an assertion into a warning

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 12:08:35 2012 New Revision: 55752 URL: http://svn.reactos.org/svn/reactos?rev=55752&view=rev Log: [KBDCLASS][MOUCLASS] - Demote an assertion into a warning Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Mon Feb 20 12:08:35 2012 @@ -749,8 +749,7 @@ } else { - /* Hm, this shouldn't happen */ - ASSERT(FALSE); + DPRINT1("Cancelled IRP is not pending. Race condition?\n"); } } Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c [iso-8859-1] Mon Feb 20 12:08:35 2012 @@ -725,8 +725,7 @@ } else { - /* Hm, this shouldn't happen */ - ASSERT(FALSE); + DPRINT1("Cancelled IRP is not pending. Race condition?\n"); } }

12 years, 7 months

[cgutman] 55751: [KBDCLASS] - Kill the rest of the input stack hack of doom

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 11:47:46 2012 New Revision: 55751 URL: http://svn.reactos.org/svn/reactos?rev=55751&view=rev Log: [KBDCLASS] - Kill the rest of the input stack hack of doom Removed: trunk/reactos/drivers/input/kbdclass/setup.c Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Modified: trunk/reactos/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/CMa… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -2,7 +2,6 @@ add_library(kbdclass SHARED kbdclass.c misc.c - setup.c kbdclass.rc) set_module_type(kbdclass kernelmodedriver) Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -1009,10 +1009,6 @@ /* FIXME: Log the error */ WARN_(CLASS_NAME, "ClassAddDevice() failed with status 0x%08lx\n", Status); } - - /* A special hack for 1st stage setup: manually send start device to i8042prt */ - if (IsFirstStageSetup()) - Send8042StartDevice(DriverObject, PortDeviceObject); } cleanup: Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -81,13 +81,3 @@ IN ULONG Flags, IN PCUNICODE_STRING SourceString, OUT PUNICODE_STRING DestinationString); - -/* setup.c */ -BOOLEAN -IsFirstStageSetup( - VOID); - -VOID NTAPI -Send8042StartDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo); Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Mon Feb 20 11:47:46 2012 @@ -7,7 +7,6 @@ <library>hal</library> <file>kbdclass.c</file> <file>misc.c</file> - <file>setup.c</file> <file>kbdclass.rc</file> <pch>kbdclass.h</pch> </module> Removed: trunk/reactos/drivers/input/kbdclass/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/set… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/setup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/kbdclass/setup.c (removed) @@ -1,161 +1,0 @@ -/* - * PROJECT: ReactOS Keyboard class driver - * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/input/kbdclass/setup.c - * PURPOSE: Create a legacy PDO during ReactOS installation - * PROGRAMMERS: Copyright 2006-2007 Hervé Poussineau (hpoussin(a)reactos.org) - */ - -/* NOTE: - * All this file is a big hack and should be removed one day... - */ - -/* INCLUDES ******************************************************************/ - -#include "kbdclass.h" - -/* GLOBALS *******************************************************************/ - -#define KEYBOARD_DATA_PORT 0x60 -#define KEYBOARD_CONTROL_PORT 0x64 -#define KEYBOARD_IRQ 1 - -/* FUNCTIONS *****************************************************************/ - -BOOLEAN -IsFirstStageSetup( - VOID) -{ - UNICODE_STRING PathU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\Setup"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hSetupKey = (HANDLE)NULL; - NTSTATUS Status; - BOOLEAN ret = TRUE; - - InitializeObjectAttributes(&ObjectAttributes, &PathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&hSetupKey, KEY_QUERY_VALUE, &ObjectAttributes); - - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - ret = TRUE; - else - ret = FALSE; - - if (hSetupKey != (HANDLE)NULL) - ZwClose(hSetupKey); - INFO_(CLASS_NAME, "IsFirstStageSetup() returns %s\n", ret ? "YES" : "NO"); - return ret; -} - -VOID NTAPI -Send8042StartDevice( - IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT Pdo) -{ - PCM_RESOURCE_LIST AllocatedResources = NULL; - PCM_RESOURCE_LIST AllocatedResourcesTranslated = NULL; - PDEVICE_OBJECT TopDeviceObject = NULL; - KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - PIO_STACK_LOCATION Stack; - ULONG ResourceListSize; - NTSTATUS Status; - - TRACE_(CLASS_NAME, "SendStartDevice(%p)\n", Pdo); - - /* Create default resource list */ - ResourceListSize = sizeof(CM_RESOURCE_LIST) + 3 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - AllocatedResources = ExAllocatePoolWithTag(PagedPool, ResourceListSize, CLASS_TAG); - if (!AllocatedResources) - { - WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - AllocatedResources->Count = 1; - AllocatedResources->List[0].PartialResourceList.Version = 1; - AllocatedResources->List[0].PartialResourceList.Revision = 1; - AllocatedResources->List[0].PartialResourceList.Count = 3; - /* Data port */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Type = CmResourceTypePort; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareDeviceExclusive; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].Flags = 0; /* FIXME */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.HighPart = 0; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Start.u.LowPart = KEYBOARD_DATA_PORT; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[0].u.Port.Length = 1; - /* Control port */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Type = CmResourceTypePort; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].ShareDisposition = CmResourceShareDeviceExclusive; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].Flags = 0; /* FIXME */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.HighPart = 0; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Start.u.LowPart = KEYBOARD_CONTROL_PORT; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[1].u.Port.Length = 1; - /* Interrupt */ - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Type = CmResourceTypeInterrupt; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].ShareDisposition = CmResourceShareDeviceExclusive; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level = KEYBOARD_IRQ; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = 0; - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity = (KAFFINITY)-1; - - /* Create default resource list translated */ - AllocatedResourcesTranslated = ExAllocatePoolWithTag(PagedPool, ResourceListSize, CLASS_TAG); - if (!AllocatedResourcesTranslated) - { - WARN_(CLASS_NAME, "ExAllocatePoolWithTag() failed\n"); - Status = STATUS_NO_MEMORY; - goto cleanup; - } - RtlCopyMemory(AllocatedResourcesTranslated, AllocatedResources, ResourceListSize); - AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector = HalGetInterruptVector( - Internal, 0, - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level, - AllocatedResources->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Vector, - (PKIRQL)&AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Level, - &AllocatedResourcesTranslated->List[0].PartialResourceList.PartialDescriptors[2].u.Interrupt.Affinity); - - /* Send IRP_MN_START_DEVICE */ - TopDeviceObject = IoGetAttachedDeviceReference(Pdo); - KeInitializeEvent( - &Event, - NotificationEvent, - FALSE); - Irp = IoBuildSynchronousFsdRequest( - IRP_MJ_PNP, - TopDeviceObject, - NULL, - 0, - NULL, - &Event, - &IoStatusBlock); - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - Irp->IoStatus.Information = 0; - Stack = IoGetNextIrpStackLocation(Irp); - Stack->MinorFunction = IRP_MN_START_DEVICE; - Stack->Parameters.StartDevice.AllocatedResources = AllocatedResources; - Stack->Parameters.StartDevice.AllocatedResourcesTranslated = AllocatedResourcesTranslated; - Status = IoCallDriver(TopDeviceObject, Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject( - &Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - if (!NT_SUCCESS(Status)) - { - WARN_(CLASS_NAME, "IoCallDriver() failed with status 0x%08lx\n", Status); - goto cleanup; - } - -cleanup: - if (TopDeviceObject) - ObDereferenceObject(TopDeviceObject); - if (AllocatedResources) - ExFreePoolWithTag(AllocatedResources, CLASS_TAG); - if (AllocatedResourcesTranslated) - ExFreePoolWithTag(AllocatedResourcesTranslated, CLASS_TAG); -}

12 years, 7 months

[gadamopoulos] 55749: [win32k] - There is no need to cache the current window station in SystemParametersInfo. Query it directly when needed

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 11:35:14 2012 New Revision: 55749 URL: http://svn.reactos.org/svn/reactos?rev=55749&view=rev Log: [win32k] - There is no need to cache the current window station in SystemParametersInfo. Query it directly when needed Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon Feb 20 11:35:14 2012 @@ -16,7 +16,6 @@ SPIVALUES gspv; BOOL gbSpiInitialized = FALSE; -PWINSTATION_OBJECT gpwinstaCurrent = NULL; BOOL g_PaintDesktopVersion = FALSE; // HACK! We initialize SPI before we have a proper surface to get this from. @@ -26,7 +25,7 @@ #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi)) #define REQ_INTERACTIVE_WINSTA(err) \ - if (gpwinstaCurrent != InputWindowStation) \ + if ( GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ { \ ERR("NtUserSystemParametersInfo requires interactive window station\n"); \ EngSetLastError(err); \ @@ -592,6 +591,7 @@ HBITMAP hbmp, hOldBitmap; SURFACE *psurfBmp; ULONG ulTile, ulStyle; + PWINSTATION_OBJECT gpwinstaCurrent = GetW32ProcessInfo()->prpwinsta; REQ_INTERACTIVE_WINSTA(ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION); @@ -1541,6 +1541,9 @@ UINT fWinIni) { ULONG_PTR ulResult; + PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); + + ASSERT(ppi); if (!gbSpiInitialized) { @@ -1550,9 +1553,7 @@ } /* Get a pointer to the current Windowstation */ - gpwinstaCurrent = IntGetWinStaObj(); - - if (!gpwinstaCurrent) + if (!ppi->prpwinsta) { ERR("UserSystemParametersInfo called without active windowstation.\n"); //ASSERT(FALSE); @@ -1584,14 +1585,7 @@ } ulResult = 1; } - - /* Dereference the windowstation */ - if (gpwinstaCurrent) - { - ObDereferenceObject(gpwinstaCurrent); - gpwinstaCurrent = NULL; - } - + return ulResult; }

12 years, 7 months

[cgutman] 55748: - Fix copy paste error

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 11:33:11 2012 New Revision: 55748 URL: http://svn.reactos.org/svn/reactos?rev=55748&view=rev Log: - Fix copy paste error Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Mon Feb 20 11:33:11 2012 @@ -467,25 +467,6 @@ if (NT_SUCCESS(Status)) NtClose(TreeHandle); } - /* Open the root key now */ - RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); - Status = IopOpenRegistryKeyEx(&EnumHandle, - NULL, - &KeyName, - KEY_ALL_ACCESS); - if (NT_SUCCESS(Status)) - { - /* Create the root dev node */ - RtlInitUnicodeString(&KeyName, REGSTR_VAL_ROOT_DEVNODE); - Status = IopCreateRegistryKeyEx(&TreeHandle, - EnumHandle, - &KeyName, - KEY_ALL_ACCESS, - REG_OPTION_NON_VOLATILE, - NULL); - NtClose(EnumHandle); - if (NT_SUCCESS(Status)) NtClose(TreeHandle); - } /* Create the root driver */ Status = IoCreateDriver(NULL, PnpRootDriverEntry); if (!NT_SUCCESS(Status))

12 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012