Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[mpiulachs] 29831: - various fixes to the spanish language resources

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue Oct 23 19:24:40 2007 New Revision: 29831 URL: http://svn.reactos.org/svn/reactos?rev=29831&view=rev Log: - various fixes to the spanish language resources Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Tue Oct 23 19:24:40 2007 @@ -20,6 +20,7 @@ /* *Spanish Language resource file *ReactOs (c) 2005 Samuel Serapión Vega + *ReactOs (c) 2007 Marc Piulachs */ @@ -32,10 +33,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenido al asistente de instalación the ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Este asistente instala ReactOS en tu computadora. El asistente "\ - "necesita recoger alguna información sobre usted y su computadora "\ + LTEXT "Este asistente instalará ReactOS en su equipo. El asistente "\ + "necesita recopilar alguna información sobre usted y su equipo "\ "para configurar ReactOS apropiadamente.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Pulse Próximo para continuar la instalación.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Pulse Siguiente para continuar la instalación.", IDC_STATIC, 115, 169, 195, 17 END @@ -77,13 +78,13 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Escriba un nombre para su computadora que sea de 63 characteres o menos. "\ - "Si se encuentra conectado a una red, el nombre debe ser unico.", + LTEXT "Escriba un nombre para su equipo que sea de 63 characteres o menos. "\ + "Si se encuentra conectado a una red, el nombre debe ser único.", IDC_STATIC, 54, 7, 250, 24 LTEXT "Nombre de la &Computadora:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE - LTEXT "El instalador creara un perfil en su computadora llamado Administrator. "\ - "Puede utilizar este perfil si necesita acceso completo a su computadora.", + LTEXT "El instalador creara un perfil de usuario en su equipo llamado Administrator. "\ + "Puede utilizar este perfil si necesita acceso completo a su equipo.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Escriba una contraseña para este perfil de 14 characteres o menos.", IDC_STATIC, 54, 87, 250, 8 @@ -99,17 +100,17 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "La localidad del sistema de ser compatible con la de las aplicaciones "\ - "que usted desea usar. La localidad del usuario controla como se representan los numeros, "\ - "monedas, y fechas que aparecen en el sistema.", IDC_STATIC, 53, 7, 253, 20 + LTEXT "Las opciones regionales y de idioma permiten configurar la manera en que se representan "\ + "fechas , número , monedas y horas. También puede agregar compatibilidad con otros idiomas "\ + "y cambiar la configuración de su ubicación.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Para cambiar la localidad del sistema o de los usuarios, pulse Modificar.", + LTEXT "Para modificar esta configuración, pulse Modificar.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 - LTEXT "La disposición de teclado controla los characteres que aparesen cuando usted escribe.", + LTEXT "La disposición de teclado especifica los characteres que aparecen cuando usted escribe.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Para cambiar la disposición de teclad, pulse Modificar.", + LTEXT "Para cambiar la disposición de teclado, pulse Modificar.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END @@ -120,15 +121,15 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Fecha y Tiempo", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Fecha y Hora", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Zona de tiempo", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Zona horaria", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - AUTOCHECKBOX "Ajustar el reloj automaticamente en temporada de &ahorro de la luz del día", + AUTOCHECKBOX "Ajustar el reloj automáticamente durante el horario de verano", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END @@ -150,10 +151,10 @@ CAPTION "Finalización de la Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Terminando el asistente de Instalación de ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 - LTEXT "Usted a terminado con éxito la instalación de ReactOS.\n\n" \ - "Cuando Pulse Terminar, su computadora sera recargada.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Si hay un DC en su lector, remuevalo. Luego, recarge su computadora "\ + LTEXT "El asistente de Instalación de ReactOS ha terminado", IDC_FINISHTITLE, 115, 8, 195, 24 + LTEXT "Usted ha finalizado con éxito la instalación de ReactOS.\n\n" \ + "Cuando Pulse Terminar, su equipo será reiniciado.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Si hay un CD en su lector, quítelo. Luego, recarge su computadora "\ "pulse Terminar.", IDC_STATIC, 115, 169, 195, 17 END @@ -163,9 +164,9 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Usted a terminado con éxito la instalación de ReactOS.", IDC_STATIC, 13, 12, 212, 16 - LTEXT "Para poder proseguir, el programa de instalación necesita recargar su computadora. "\ - "La computadora sera recargada automaticamente en 15 segundos o si presiona el "\ + LTEXT "Usted ha terminado con éxito la instalación de ReactOS.", IDC_STATIC, 13, 12, 212, 16 + LTEXT "Para poder proseguir, el programa de instalación necesita reiniciar su equipo. "\ + "El equipo será automáticamente reiniciado en 15 segundos o si presiona el "\ "boton de recargar.", IDC_STATIC, 13, 33, 212, 32 /* GROUPBOX "", -1, 7, 3, 231, 106 */ CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 13, 70, 212, 8 @@ -186,7 +187,7 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Please wait..." +CAPTION "Por favor espere..." FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS @@ -205,8 +206,8 @@ IDS_LOCALESUBTITLE "You can customize ReactOS for different regions and languages." IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." - IDS_PROCESSTITLE "Process page title" - IDS_PROCESSSUBTITLE "Process page subtitle" + IDS_PROCESSTITLE "Registrando Componentes" + IDS_PROCESSSUBTITLE "Por favor , espere..." END STRINGTABLE @@ -216,7 +217,7 @@ STRINGTABLE BEGIN - IDS_ACCESSORIES "Accessories" + IDS_ACCESSORIES "Accessorios" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -230,69 +231,69 @@ STRINGTABLE BEGIN - IDS_GAMES "Games" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "CharMap" -END - - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_GAMES "Juegos" + IDS_CMT_SOLITAIRE "Solitario" + IDS_CMT_WINEMINE "Buscaminas" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Herramientas del systema" + IDS_CMT_CHARMAP "Mapa de caracteres" +END + + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibilidad" IDS_CMT_MAGNIFY "Magnify" END STRINGTABLE BEGIN - IDS_REACTOS_SETUP "ReactOS Setup" - IDS_UNKNOWN_ERROR "Unknown error" - IDS_REGISTERING_COMPONENTS "Registering components..." - IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " - IDS_GETPROCADDR_FAILED "GetProcAddr failed: " - IDS_REGSVR_FAILED "DllRegisterServer failed: " - IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_REACTOS_SETUP "Instalación de ReactOS" + IDS_UNKNOWN_ERROR "Error desconocido" + IDS_REGISTERING_COMPONENTS "Registrando componentes..." + IDS_LOADLIBRARY_FAILED "LoadLibrary falló: " + IDS_GETPROCADDR_FAILED "GetProcAddr falló: " + IDS_REGSVR_FAILED "DllRegisterServer falló: " + IDS_DLLINSTALL_FAILED "DllInstall falló: " IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" END STRINGTABLE BEGIN - IDS_SHORT_CMD "Command Prompt.lnk" - IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" + IDS_SHORT_CMD "Símbolo del sistema.lnk" + IDS_SHORT_EXPLORER "Explorador de ReactOS.lnk" IDS_SHORT_DOWNLOADER "Download !.lnk" - IDS_SHORT_SERVICE "Service Manager.lnk" - IDS_SHORT_DEVICE "Device Manager.lnk" - IDS_SHORT_CALC "Calculator.lnk" - IDS_SHORT_REGEDIT "Regedit.lnk" - IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_SERVICE "Administrador de Servicios.lnk" + IDS_SHORT_DEVICE "Administrador de Dispositivos.lnk" + IDS_SHORT_CALC "Calculadora.lnk" + IDS_SHORT_REGEDIT "Editor de registro.lnk" + IDS_SHORT_NOTEPAD "Bloc de notas.lnk" IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNAP "SnapShot.lnk" - IDS_SHORT_SOLITAIRE "Solitaire.lnk" - IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_SOLITAIRE "Solitario.lnk" + IDS_SHORT_WINEMINE "Buscaminas.lnk" + IDS_SHORT_CHARMAP "Mapa de caracteres.lnk" IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE BEGIN - IDS_WZD_NAME "Setup cannot continue until you enter your name." - IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." - IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" - IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." - IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." - IDS_WZD_LOCALTIME "Setup was unable to set the local time." -END - -STRINGTABLE -BEGIN - IDS_STATUS_INSTALL_DEV "Installing devices..." + IDS_WZD_NAME "El proceso de instalación no puede continuar hasta que no escriba su nombre." + IDS_WZD_SETCOMPUTERNAME "El proceso de instalación no pudo configurar el nombre del equipo." + IDS_WZD_COMPUTERNAME "El proceso de instalación no puede continuar hasta que no escriba un nombre para su equipo." + IDS_WZD_PASSWORDEMPTY "Debe establecer un password !" + IDS_WZD_PASSWORDMATCH "La verificación no concuerda con el password introducido. Por favor introduzca de nuevo el password deseado." + IDS_WZD_PASSWORDCHAR "El password que ha introducido contiene carácteres inválidos. Por favor, introduzca uno de nuevo." + IDS_WZD_LOCALTIME "El proceso de instalación no pudo configurar la hora del equipo." +END + +STRINGTABLE +BEGIN + IDS_STATUS_INSTALL_DEV "Instalando dispositivos..." END /* EOF */

16 years, 12 months

[hpoussin] 29830: IExtractIcon::GetIconLocation is not documented to support a NULL pointer as last parameter

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Oct 23 18:26:53 2007 New Revision: 29830 URL: http://svn.reactos.org/svn/reactos?rev=29830&view=rev Log: IExtractIcon::GetIconLocation is not documented to support a NULL pointer as last parameter Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c Tue Oct 23 18:26:53 2007 @@ -1920,6 +1920,7 @@ LPWSTR pszIconPath, int cchIconPath, int* piIcon) { LPCITEMIDLIST pidlLast; + UINT wFlags; HRESULT hr = SHBindToParent(pidl, &IID_IShellFolder, (LPVOID*)&psf, &pidlLast); @@ -1929,7 +1930,7 @@ hr = IShellFolder_GetUIObjectOf(psf, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, NULL, (LPVOID*)&pei); if (SUCCEEDED(hr)) { - hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, NULL); + hr = IExtractIconW_GetIconLocation(pei, 0, pszIconPath, MAX_PATH, piIcon, &wFlags); IExtractIconW_Release(pei); }

16 years, 12 months

[mpiulachs] 29829: - Added a new start menu folder "Accessibility" (IDS_SYS_ACCESSIBILITY) - Install magnify on the start menu See issue #2742 for more details.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Tue Oct 23 17:25:26 2007 New Revision: 29829 URL: http://svn.reactos.org/svn/reactos?rev=29829&view=rev Log: - Added a new start menu folder "Accessibility" (IDS_SYS_ACCESSIBILITY) - Install magnify on the start menu See issue #2742 for more details. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Tue Oct 23 17:25:26 2007 @@ -617,6 +617,12 @@ CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, FALSE); } + /* Creacte Accessibility subfolder and fill if the exe is available */ + if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ACCESSIBILITY, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) + { + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MAGNIFY, _T("%SystemRoot%\\system32\\magnify.exe"), IDS_CMT_MAGNIFY, FALSE); + } + /* Create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc Tue Oct 23 17:25:26 2007 @@ -219,6 +219,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Instalátor" @@ -247,6 +254,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Tue Oct 23 17:25:26 2007 @@ -220,6 +220,13 @@ IDS_CMT_CHARMAP "Zeichentabelle" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" @@ -248,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitär.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Zeichentabelle.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc Tue Oct 23 17:25:26 2007 @@ -221,6 +221,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ÅãêáôÜóôáóç ôïõ ReactOS" @@ -249,6 +256,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Character Map.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Tue Oct 23 17:25:26 2007 @@ -241,6 +241,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" @@ -269,6 +276,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "Table des Caractères.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc Tue Oct 23 17:25:26 2007 @@ -233,6 +233,13 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Telepítõ" @@ -261,6 +268,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc Tue Oct 23 17:25:26 2007 @@ -221,6 +221,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Setup ReactOS" IDS_UNKNOWN_ERROR "Kesalahan tidak dikenal" IDS_REGISTERING_COMPONENTS "Meregister komponen..." @@ -247,6 +253,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc Tue Oct 23 17:25:26 2007 @@ -214,6 +214,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "Installazione di ReactOS" IDS_UNKNOWN_ERROR "Errore sconosciuto" IDS_REGISTERING_COMPONENTS "Registrazione dei componenti..." @@ -240,6 +246,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nb… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nb-NO.rc Tue Oct 23 17:25:26 2007 @@ -226,6 +226,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." @@ -252,6 +258,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc Tue Oct 23 17:25:26 2007 @@ -223,6 +223,12 @@ STRINGTABLE BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." @@ -249,6 +255,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Tue Oct 23 17:25:26 2007 @@ -211,6 +211,13 @@ IDS_CMT_SERVMAN "Uruchom Mened¿er us³ug" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_GAMES "Gry" @@ -245,6 +252,7 @@ IDS_SHORT_SNAP "Zrzut ekranu.lnk" IDS_SHORT_SOLITAIRE "Pasjans.lnk" IDS_SHORT_WINEMINE "Saper.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Tue Oct 23 17:25:26 2007 @@ -202,6 +202,13 @@ IDS_CMT_CHARMAP "Òàáëèöà ñèìâîëîâ" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" @@ -230,6 +237,7 @@ IDS_SHORT_SOLITAIRE "Ïàñüÿíñ.lnk" IDS_SHORT_WINEMINE "Ñàïåð.lnk" IDS_SHORT_CHARMAP "Òàáëèöà ñèìâîëîâ.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Tue Oct 23 17:25:26 2007 @@ -210,6 +210,13 @@ IDS_CMT_CHARMAP "Òàáëèöÿ ñèìâîë³â" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + STRINGTABLE BEGIN IDS_REACTOS_SETUP "Óñòàíîâêà ReactOS" @@ -238,6 +245,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc Tue Oct 23 17:25:26 2007 @@ -209,6 +209,12 @@ IDS_CMT_CHARMAP "CharMap" END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" @@ -237,6 +243,7 @@ IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_CHARMAP "CharMap.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h (original) +++ trunk/reactos/dll/win32/syssetup/resource.h Tue Oct 23 17:25:26 2007 @@ -90,6 +90,7 @@ #define IDS_ACCESSORIES 3200 #define IDS_GAMES 3201 #define IDS_SYS_TOOLS 3202 +#define IDS_SYS_ACCESSIBILITY 3203 #define IDS_CMT_CMD 3210 #define IDS_CMT_EXPLORER 3211 @@ -104,6 +105,7 @@ #define IDS_CMT_DOWNLOADER 3222 #define IDS_CMT_DEVMGMT 3223 #define IDS_CMT_CHARMAP 3224 +#define IDS_CMT_MAGNIFY 3225 #define IDS_REACTOS_SETUP 3300 #define IDS_UNKNOWN_ERROR 3301 @@ -128,6 +130,7 @@ #define IDS_SHORT_SOLITAIRE 3411 #define IDS_SHORT_WINEMINE 3412 #define IDS_SHORT_CHARMAP 3413 +#define IDS_SHORT_MAGNIFY 3414 #define IDS_WZD_NAME 3450 #define IDS_WZD_SETCOMPUTERNAME 3451

16 years, 12 months

[mnordell] 29828: Unbreak build (unused local var's warnings when not using the quota code).

by mnordell＠svn.reactos.org

Author: mnordell Date: Tue Oct 23 16:31:21 2007 New Revision: 29828 URL: http://svn.reactos.org/svn/reactos?rev=29828&view=rev Log: Unbreak build (unused local var's warnings when not using the quota code). Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Tue Oct 23 16:31:21 2007 @@ -182,7 +182,10 @@ IN POOL_TYPE PoolType, IN ULONG Amount) { +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE INT PoolIndex; +#endif + /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; @@ -220,7 +223,10 @@ IN POOL_TYPE PoolType, IN ULONG_PTR Amount) { +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE INT PoolIndex; +#endif + /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return;

16 years, 12 months

[mnordell] 29827: [FORMATTING] Consistency.

by mnordell＠svn.reactos.org

Author: mnordell Date: Tue Oct 23 15:08:18 2007 New Revision: 29827 URL: http://svn.reactos.org/svn/reactos?rev=29827&view=rev Log: [FORMATTING] Consistency. Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Tue Oct 23 15:08:18 2007 @@ -33,241 +33,248 @@ * RETURNS: Status */ { - /* This should be implemented once we support network filesystems */ - DPRINT("NtFlushVirtualMemory is UNIMPLEMENTED\n"); - return(STATUS_SUCCESS); + /* This should be implemented once we support network filesystems */ + DPRINT("NtFlushVirtualMemory is UNIMPLEMENTED\n"); + return(STATUS_SUCCESS); } NTSTATUS STDCALL MiLockVirtualMemory(HANDLE ProcessHandle, - PVOID BaseAddress, - ULONG NumberOfBytesToLock, - PULONG NumberOfBytesLocked, - PObReferenceObjectByHandle pObReferenceObjectByHandle, - PMmCreateMdl pMmCreateMdl, - PObDereferenceObject pObDereferenceObject, - PMmProbeAndLockPages pMmProbeAndLockPages, - PExFreePool pExFreePool) -{ - PEPROCESS Process; - NTSTATUS Status; - PMDL Mdl; - - Status = pObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - return(Status); - - Mdl = pMmCreateMdl(NULL, - BaseAddress, - NumberOfBytesToLock); - if (Mdl == NULL) - { - pObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - - pMmProbeAndLockPages(Mdl, - UserMode, - IoWriteAccess); - - pExFreePool(Mdl); - - pObDereferenceObject(Process); - - *NumberOfBytesLocked = NumberOfBytesToLock; - return(STATUS_SUCCESS); + PVOID BaseAddress, + ULONG NumberOfBytesToLock, + PULONG NumberOfBytesLocked, + PObReferenceObjectByHandle pObReferenceObjectByHandle, + PMmCreateMdl pMmCreateMdl, + PObDereferenceObject pObDereferenceObject, + PMmProbeAndLockPages pMmProbeAndLockPages, + PExFreePool pExFreePool) +{ + PEPROCESS Process; + NTSTATUS Status; + PMDL Mdl; + + Status = pObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + return(Status); + + Mdl = pMmCreateMdl(NULL, + BaseAddress, + NumberOfBytesToLock); + if (Mdl == NULL) + { + pObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + + pMmProbeAndLockPages(Mdl, + UserMode, + IoWriteAccess); + + pExFreePool(Mdl); + + pObDereferenceObject(Process); + + *NumberOfBytesLocked = NumberOfBytesToLock; + return(STATUS_SUCCESS); } NTSTATUS STDCALL NtLockVirtualMemory(HANDLE ProcessHandle, - PVOID BaseAddress, - ULONG NumberOfBytesToLock, - PULONG NumberOfBytesLocked) -{ - DPRINT("NtLockVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "NumberOfBytesToLock %d, NumberOfBytesLocked %x)\n", - ProcessHandle, - BaseAddress, - NumberOfBytesToLock, - NumberOfBytesLocked); - - return MiLockVirtualMemory(ProcessHandle, - BaseAddress, - NumberOfBytesToLock, - NumberOfBytesLocked, - ObReferenceObjectByHandle, - MmCreateMdl, - (PVOID)ObfDereferenceObject, - MmProbeAndLockPages, - ExFreePool); + PVOID BaseAddress, + ULONG NumberOfBytesToLock, + PULONG NumberOfBytesLocked) +{ + DPRINT("NtLockVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "NumberOfBytesToLock %d, NumberOfBytesLocked %x)\n", + ProcessHandle, + BaseAddress, + NumberOfBytesToLock, + NumberOfBytesLocked); + + return MiLockVirtualMemory(ProcessHandle, + BaseAddress, + NumberOfBytesToLock, + NumberOfBytesLocked, + ObReferenceObjectByHandle, + MmCreateMdl, + (PVOID)ObfDereferenceObject, + MmProbeAndLockPages, + ExFreePool); } NTSTATUS FASTCALL -MiQueryVirtualMemory (IN HANDLE ProcessHandle, - IN PVOID Address, - IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, - OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG ResultLength) -{ - NTSTATUS Status; - PEPROCESS Process; - MEMORY_AREA* MemoryArea; - PMADDRESS_SPACE AddressSpace; - - if (Address < MmSystemRangeStart) - { - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_QUERY_INFORMATION, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT("NtQueryVirtualMemory() = %x\n",Status); - return(Status); - } - AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; - } - else - { - AddressSpace = MmGetKernelAddressSpace(); - } - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); - switch(VirtualMemoryInformationClass) - { - case MemoryBasicInformation: - { - PMEMORY_BASIC_INFORMATION Info = - (PMEMORY_BASIC_INFORMATION)VirtualMemoryInformation; +MiQueryVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID Address, + IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, + OUT PVOID VirtualMemoryInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + NTSTATUS Status; + PEPROCESS Process; + MEMORY_AREA* MemoryArea; + PMADDRESS_SPACE AddressSpace; + + if (Address < MmSystemRangeStart) + { + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT("NtQueryVirtualMemory() = %x\n",Status); + return(Status); + } + AddressSpace = (PMADDRESS_SPACE)&Process->VadRoot; + } + else + { + AddressSpace = MmGetKernelAddressSpace(); + } + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); + switch(VirtualMemoryInformationClass) + { + case MemoryBasicInformation: + { + PMEMORY_BASIC_INFORMATION Info = + (PMEMORY_BASIC_INFORMATION)VirtualMemoryInformation; if (Length != sizeof(MEMORY_BASIC_INFORMATION)) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_INFO_LENGTH_MISMATCH); + MmUnlockAddressSpace(AddressSpace); + ObDereferenceObject(Process); + return(STATUS_INFO_LENGTH_MISMATCH); } if (MemoryArea == NULL) { - Info->Type = 0; - Info->State = MEM_FREE; - Info->Protect = PAGE_NOACCESS; - Info->AllocationProtect = 0; - Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); - Info->AllocationBase = NULL; - Info->RegionSize = MmFindGapAtAddress(AddressSpace, Info->BaseAddress); - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - } + Info->Type = 0; + Info->State = MEM_FREE; + Info->Protect = PAGE_NOACCESS; + Info->AllocationProtect = 0; + Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); + Info->AllocationBase = NULL; + Info->RegionSize = MmFindGapAtAddress(AddressSpace, Info->BaseAddress); + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + } else - { - switch(MemoryArea->Type) - { - case MEMORY_AREA_VIRTUAL_MEMORY: - case MEMORY_AREA_PEB_OR_TEB: - Status = MmQueryAnonMem(MemoryArea, Address, Info, - ResultLength); - break; - case MEMORY_AREA_SECTION_VIEW: - Status = MmQuerySectionView(MemoryArea, Address, Info, - ResultLength); - break; - case MEMORY_AREA_NO_ACCESS: - Info->Type = MEM_PRIVATE; - Info->State = MEM_RESERVE; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_SHARED_DATA: - Info->Type = MEM_PRIVATE; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_SYSTEM: - Info->Type = 0; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_KERNEL_STACK: - Info->Type = 0; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - case MEMORY_AREA_PAGED_POOL: - Info->Type = 0; - Info->State = MEM_COMMIT; - Info->Protect = MemoryArea->Protect; - Info->AllocationProtect = MemoryArea->Protect; - Info->BaseAddress = MemoryArea->StartingAddress; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - Status = STATUS_SUCCESS; - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - break; - default: - DPRINT1("unhandled memory area type: 0x%x\n", MemoryArea->Type); - Status = STATUS_UNSUCCESSFUL; - *ResultLength = 0; - } - } + { + switch(MemoryArea->Type) + { + case MEMORY_AREA_VIRTUAL_MEMORY: + case MEMORY_AREA_PEB_OR_TEB: + Status = MmQueryAnonMem(MemoryArea, Address, Info, + ResultLength); + break; + + case MEMORY_AREA_SECTION_VIEW: + Status = MmQuerySectionView(MemoryArea, Address, Info, + ResultLength); + break; + + case MEMORY_AREA_NO_ACCESS: + Info->Type = MEM_PRIVATE; + Info->State = MEM_RESERVE; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_SHARED_DATA: + Info->Type = MEM_PRIVATE; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_SYSTEM: + Info->Type = 0; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_KERNEL_STACK: + Info->Type = 0; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + case MEMORY_AREA_PAGED_POOL: + Info->Type = 0; + Info->State = MEM_COMMIT; + Info->Protect = MemoryArea->Protect; + Info->AllocationProtect = MemoryArea->Protect; + Info->BaseAddress = MemoryArea->StartingAddress; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->RegionSize = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + Status = STATUS_SUCCESS; + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + break; + + default: + DPRINT1("unhandled memory area type: 0x%x\n", MemoryArea->Type); + Status = STATUS_UNSUCCESSFUL; + *ResultLength = 0; + } + } break; - } - - default: - { + } + + default: + { Status = STATUS_INVALID_INFO_CLASS; *ResultLength = 0; break; - } - } - - MmUnlockAddressSpace(AddressSpace); - if (Address < MmSystemRangeStart) - { - ASSERT(Process); - ObDereferenceObject(Process); - } - - return Status; + } + } + + MmUnlockAddressSpace(AddressSpace); + if (Address < MmSystemRangeStart) + { + ASSERT(Process); + ObDereferenceObject(Process); + } + + return Status; } /* (tMk 2004.II.4) @@ -276,102 +283,102 @@ * */ NTSTATUS STDCALL -NtQueryVirtualMemory (IN HANDLE ProcessHandle, - IN PVOID Address, - IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, - OUT PVOID VirtualMemoryInformation, - IN ULONG Length, - OUT PULONG UnsafeResultLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - ULONG ResultLength = 0; - KPROCESSOR_MODE PreviousMode; - union - { - MEMORY_BASIC_INFORMATION BasicInfo; - } - VirtualMemoryInfo; - - DPRINT("NtQueryVirtualMemory(ProcessHandle %x, Address %x, " - "VirtualMemoryInformationClass %d, VirtualMemoryInformation %x, " - "Length %lu ResultLength %x)\n",ProcessHandle,Address, - VirtualMemoryInformationClass,VirtualMemoryInformation, - Length,ResultLength); - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode && UnsafeResultLength != NULL) - { - _SEH_TRY - { - ProbeForWriteUlong(UnsafeResultLength); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - - if (Address >= MmSystemRangeStart) - { - DPRINT1("Invalid parameter\n"); - return STATUS_INVALID_PARAMETER; - } - - Status = MiQueryVirtualMemory ( ProcessHandle, - Address, - VirtualMemoryInformationClass, - &VirtualMemoryInfo, - Length, - &ResultLength ); - - if (NT_SUCCESS(Status)) - { - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - if (ResultLength > 0) +NtQueryVirtualMemory(IN HANDLE ProcessHandle, + IN PVOID Address, + IN MEMORY_INFORMATION_CLASS VirtualMemoryInformationClass, + OUT PVOID VirtualMemoryInformation, + IN ULONG Length, + OUT PULONG UnsafeResultLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG ResultLength = 0; + KPROCESSOR_MODE PreviousMode; + union + { + MEMORY_BASIC_INFORMATION BasicInfo; + } + VirtualMemoryInfo; + + DPRINT("NtQueryVirtualMemory(ProcessHandle %x, Address %x, " + "VirtualMemoryInformationClass %d, VirtualMemoryInformation %x, " + "Length %lu ResultLength %x)\n",ProcessHandle,Address, + VirtualMemoryInformationClass,VirtualMemoryInformation, + Length,ResultLength); + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode && UnsafeResultLength != NULL) + { + _SEH_TRY + { + ProbeForWriteUlong(UnsafeResultLength); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + + if (Address >= MmSystemRangeStart) + { + DPRINT1("Invalid parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + Status = MiQueryVirtualMemory(ProcessHandle, + Address, + VirtualMemoryInformationClass, + &VirtualMemoryInfo, + Length, + &ResultLength ); + + if (NT_SUCCESS(Status)) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + if (ResultLength > 0) { - ProbeForWrite(VirtualMemoryInformation, - ResultLength, - 1); - RtlCopyMemory(VirtualMemoryInformation, - &VirtualMemoryInfo, - ResultLength); + ProbeForWrite(VirtualMemoryInformation, + ResultLength, + 1); + RtlCopyMemory(VirtualMemoryInformation, + &VirtualMemoryInfo, + ResultLength); } - if (UnsafeResultLength != NULL) + if (UnsafeResultLength != NULL) { - *UnsafeResultLength = ResultLength; + *UnsafeResultLength = ResultLength; } } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - if (ResultLength > 0) - { - RtlCopyMemory(VirtualMemoryInformation, - &VirtualMemoryInfo, - ResultLength); - } - - if (UnsafeResultLength != NULL) - { - *UnsafeResultLength = ResultLength; - } - } - } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + if (ResultLength > 0) + { + RtlCopyMemory(VirtualMemoryInformation, + &VirtualMemoryInfo, + ResultLength); + } + + if (UnsafeResultLength != NULL) + { + *UnsafeResultLength = ResultLength; + } + } + } return(Status); } @@ -384,51 +391,51 @@ IN ULONG NewAccessProtection, OUT PULONG OldAccessProtection OPTIONAL) { - PMEMORY_AREA MemoryArea; - PMADDRESS_SPACE AddressSpace; - ULONG OldAccessProtection_; - NTSTATUS Status; - - *NumberOfBytesToProtect = - PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - - PAGE_ROUND_DOWN(*BaseAddress); - *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); - - AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; - - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); - if (MemoryArea == NULL) - { - MmUnlockAddressSpace(AddressSpace); - return STATUS_UNSUCCESSFUL; - } - - if (OldAccessProtection == NULL) - OldAccessProtection = &OldAccessProtection_; - - if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) - { - Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, NewAccessProtection, - OldAccessProtection); - } - else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) - { - Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); - } - else - { - /* FIXME: Should we return failure or success in this case? */ - Status = STATUS_CONFLICTING_ADDRESSES; - } - - MmUnlockAddressSpace(AddressSpace); - - return Status; + PMEMORY_AREA MemoryArea; + PMADDRESS_SPACE AddressSpace; + ULONG OldAccessProtection_; + NTSTATUS Status; + + *NumberOfBytesToProtect = + PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - + PAGE_ROUND_DOWN(*BaseAddress); + *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress); + + AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; + + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, *BaseAddress); + if (MemoryArea == NULL) + { + MmUnlockAddressSpace(AddressSpace); + return STATUS_UNSUCCESSFUL; + } + + if (OldAccessProtection == NULL) + OldAccessProtection = &OldAccessProtection_; + + if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) + { + Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, + *NumberOfBytesToProtect, NewAccessProtection, + OldAccessProtection); + } + else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) + { + Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, + *NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); + } + else + { + /* FIXME: Should we return failure or success in this case? */ + Status = STATUS_CONFLICTING_ADDRESSES; + } + + MmUnlockAddressSpace(AddressSpace); + + return Status; } @@ -444,100 +451,100 @@ IN ULONG NewAccessProtection, OUT PULONG UnsafeOldAccessProtection) { - PEPROCESS Process; - ULONG OldAccessProtection; - PVOID BaseAddress = NULL; - ULONG NumberOfBytesToProtect = 0; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWritePointer(UnsafeBaseAddress); - ProbeForWriteUlong(UnsafeNumberOfBytesToProtect); - ProbeForWriteUlong(UnsafeOldAccessProtection); - - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - BaseAddress = *UnsafeBaseAddress; - NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; - } - - if ((ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 < (ULONG_PTR)BaseAddress || - (ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 >= MmUserProbeAddress) - { - /* Don't allow to change the protection of a kernel mode address */ - return STATUS_INVALID_PARAMETER_2; - } - - /* (tMk 2004.II.5) in Microsoft SDK I read: - * 'if this parameter is NULL or does not point to a valid variable, the function fails' - */ - if(UnsafeOldAccessProtection == NULL) - { - return(STATUS_INVALID_PARAMETER); - } - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT("NtProtectVirtualMemory() = %x\n",Status); - return(Status); - } - - Status = MiProtectVirtualMemory(Process, - &BaseAddress, - &NumberOfBytesToProtect, - NewAccessProtection, - &OldAccessProtection); - - ObDereferenceObject(Process); - - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - *UnsafeOldAccessProtection = OldAccessProtection; - *UnsafeBaseAddress = BaseAddress; - *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - *UnsafeOldAccessProtection = OldAccessProtection; - *UnsafeBaseAddress = BaseAddress; - *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; - } - - return(Status); + PEPROCESS Process; + ULONG OldAccessProtection; + PVOID BaseAddress = NULL; + ULONG NumberOfBytesToProtect = 0; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWritePointer(UnsafeBaseAddress); + ProbeForWriteUlong(UnsafeNumberOfBytesToProtect); + ProbeForWriteUlong(UnsafeOldAccessProtection); + + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + BaseAddress = *UnsafeBaseAddress; + NumberOfBytesToProtect = *UnsafeNumberOfBytesToProtect; + } + + if ((ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 < (ULONG_PTR)BaseAddress || + (ULONG_PTR)BaseAddress + NumberOfBytesToProtect - 1 >= MmUserProbeAddress) + { + /* Don't allow to change the protection of a kernel mode address */ + return STATUS_INVALID_PARAMETER_2; + } + + /* (tMk 2004.II.5) in Microsoft SDK I read: + * 'if this parameter is NULL or does not point to a valid variable, the function fails' + */ + if(UnsafeOldAccessProtection == NULL) + { + return(STATUS_INVALID_PARAMETER); + } + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtProtectVirtualMemory() = %x\n",Status); + return(Status); + } + + Status = MiProtectVirtualMemory(Process, + &BaseAddress, + &NumberOfBytesToProtect, + NewAccessProtection, + &OldAccessProtection); + + ObDereferenceObject(Process); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + *UnsafeOldAccessProtection = OldAccessProtection; + *UnsafeBaseAddress = BaseAddress; + *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + *UnsafeOldAccessProtection = OldAccessProtection; + *UnsafeBaseAddress = BaseAddress; + *UnsafeNumberOfBytesToProtect = NumberOfBytesToProtect; + } + + return(Status); } @@ -554,150 +561,153 @@ IN ULONG NumberOfBytesToRead, OUT PULONG NumberOfBytesRead OPTIONAL) { - PMDL Mdl; - PVOID SystemAddress; - KPROCESSOR_MODE PreviousMode; - PEPROCESS Process, CurrentProcess; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("NtReadVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "Buffer %x, NumberOfBytesToRead %d)\n",ProcessHandle,BaseAddress, - Buffer,NumberOfBytesToRead); - - if ((ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 < (ULONG_PTR)BaseAddress || - (ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 >= MmUserProbeAddress) - { - /* Don't allow to read from kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - if ((ULONG_PTR)Buffer + NumberOfBytesToRead - 1 < (ULONG_PTR)Buffer || - (ULONG_PTR)Buffer + NumberOfBytesToRead - 1 >= MmUserProbeAddress) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - } - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_READ, - NULL, - PreviousMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - CurrentProcess = PsGetCurrentProcess(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - if(NumberOfBytesRead != NULL) - { - ProbeForWriteUlong(NumberOfBytesRead); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - - if (Process == CurrentProcess) - { - _SEH_TRY - { - RtlCopyMemory(Buffer, BaseAddress, NumberOfBytesToRead); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - Mdl = MmCreateMdl(NULL, - Buffer, - NumberOfBytesToRead); - if(Mdl == NULL) - { - ObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - _SEH_TRY - { - MmProbeAndLockPages(Mdl, - PreviousMode, - IoWriteAccess); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(NT_SUCCESS(Status)) - { - KeAttachProcess(&Process->Pcb); - - SystemAddress = MmGetSystemAddressForMdl(Mdl); - - Status = STATUS_SUCCESS; - _SEH_TRY { - Status = STATUS_PARTIAL_COPY; - RtlCopyMemory(SystemAddress, BaseAddress, NumberOfBytesToRead); - Status = STATUS_SUCCESS; - } _SEH_HANDLE { - if(Status != STATUS_PARTIAL_COPY) - Status = _SEH_GetExceptionCode(); - } _SEH_END; - - KeDetachProcess(); - - if (Mdl->MappedSystemVa != NULL) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - MmUnlockPages(Mdl); - } - ExFreePool(Mdl); - } - - ObDereferenceObject(Process); - - if((NT_SUCCESS(Status) || Status == STATUS_PARTIAL_COPY) && - NumberOfBytesRead != NULL) - { - _SEH_TRY - { - *NumberOfBytesRead = NumberOfBytesToRead; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return(Status); + PMDL Mdl; + PVOID SystemAddress; + KPROCESSOR_MODE PreviousMode; + PEPROCESS Process, CurrentProcess; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + DPRINT("NtReadVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "Buffer %x, NumberOfBytesToRead %d)\n",ProcessHandle,BaseAddress, + Buffer,NumberOfBytesToRead); + + if ((ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 < (ULONG_PTR)BaseAddress || + (ULONG_PTR)BaseAddress + NumberOfBytesToRead - 1 >= MmUserProbeAddress) + { + /* Don't allow to read from kernel space */ + return STATUS_ACCESS_VIOLATION; + } + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + if ((ULONG_PTR)Buffer + NumberOfBytesToRead - 1 < (ULONG_PTR)Buffer || + (ULONG_PTR)Buffer + NumberOfBytesToRead - 1 >= MmUserProbeAddress) + { + /* Don't allow to write into kernel space */ + return STATUS_ACCESS_VIOLATION; + } + } + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_READ, + NULL, + PreviousMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + CurrentProcess = PsGetCurrentProcess(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY + { + if(NumberOfBytesRead != NULL) + { + ProbeForWriteUlong(NumberOfBytesRead); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + + if (Process == CurrentProcess) + { + _SEH_TRY + { + RtlCopyMemory(Buffer, BaseAddress, NumberOfBytesToRead); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + Mdl = MmCreateMdl(NULL, + Buffer, + NumberOfBytesToRead); + if(Mdl == NULL) + { + ObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + + _SEH_TRY + { + MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(NT_SUCCESS(Status)) + { + KeAttachProcess(&Process->Pcb); + + SystemAddress = MmGetSystemAddressForMdl(Mdl); + + Status = STATUS_SUCCESS; + _SEH_TRY + { + Status = STATUS_PARTIAL_COPY; + RtlCopyMemory(SystemAddress, BaseAddress, NumberOfBytesToRead); + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + if(Status != STATUS_PARTIAL_COPY) + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + KeDetachProcess(); + + if (Mdl->MappedSystemVa != NULL) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + MmUnlockPages(Mdl); + } + ExFreePool(Mdl); + } + + ObDereferenceObject(Process); + + if ((NT_SUCCESS(Status) || Status == STATUS_PARTIAL_COPY) && + NumberOfBytesRead != NULL) + { + _SEH_TRY + { + *NumberOfBytesRead = NumberOfBytesToRead; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return(Status); } /* (tMk 2004.II.05) @@ -710,49 +720,49 @@ ULONG NumberOfBytesToUnlock, PULONG NumberOfBytesUnlocked OPTIONAL) { - // AG [08-20-03] : I have *no* idea if this is correct, I just used the - // other functions as a template and made a few intelligent guesses... - - NTSTATUS Status; - PMDL Mdl; - PEPROCESS Process; - - DPRINT("NtUnlockVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "NumberOfBytesToUnlock %d), NumberOfBytesUnlocked %x\n",ProcessHandle,BaseAddress, - NumberOfBytesToUnlock, NumberOfBytesUnlocked); - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Mdl = MmCreateMdl(NULL, - BaseAddress, - NumberOfBytesToUnlock); - if(Mdl == NULL) - { - ObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - - ObDereferenceObject(Process); - - if (Mdl->MappedSystemVa != NULL) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - MmUnlockPages(Mdl); - ExFreePool(Mdl); - - *NumberOfBytesUnlocked = NumberOfBytesToUnlock; - - return(STATUS_SUCCESS); + // AG [08-20-03] : I have *no* idea if this is correct, I just used the + // other functions as a template and made a few intelligent guesses... + + NTSTATUS Status; + PMDL Mdl; + PEPROCESS Process; + + DPRINT("NtUnlockVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "NumberOfBytesToUnlock %d), NumberOfBytesUnlocked %x\n",ProcessHandle,BaseAddress, + NumberOfBytesToUnlock, NumberOfBytesUnlocked); + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + Mdl = MmCreateMdl(NULL, + BaseAddress, + NumberOfBytesToUnlock); + if(Mdl == NULL) + { + ObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + + ObDereferenceObject(Process); + + if (Mdl->MappedSystemVa != NULL) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + MmUnlockPages(Mdl); + ExFreePool(Mdl); + + *NumberOfBytesUnlocked = NumberOfBytesToUnlock; + + return(STATUS_SUCCESS); } @@ -769,166 +779,164 @@ IN ULONG NumberOfBytesToWrite, OUT PULONG NumberOfBytesWritten OPTIONAL) { - PMDL Mdl; - PVOID SystemAddress; - PEPROCESS Process; - KPROCESSOR_MODE PreviousMode; - NTSTATUS CopyStatus, Status = STATUS_SUCCESS; - - DPRINT("NtWriteVirtualMemory(ProcessHandle %x, BaseAddress %x, " - "Buffer %x, NumberOfBytesToWrite %d)\n",ProcessHandle,BaseAddress, - Buffer,NumberOfBytesToWrite); - - if ((ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 < (ULONG_PTR)BaseAddress || - (ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) - { - /* Don't allow to write into kernel space */ - return STATUS_ACCESS_VIOLATION; - } - - PreviousMode = ExGetPreviousMode(); - - if (PreviousMode != KernelMode) - { - if ((ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 < (ULONG_PTR)Buffer || - (ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) - { - /* Don't allow to read from kernel space */ - return STATUS_ACCESS_VIOLATION; - } - if (NumberOfBytesWritten != NULL) - { - _SEH_TRY - { - ProbeForWriteUlong(NumberOfBytesWritten); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } - } - } - - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, - NULL, - UserMode, - (PVOID*)(&Process), - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - CopyStatus = STATUS_SUCCESS; - - /* Write memory */ - if (Process == PsGetCurrentProcess()) - { - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); - } - _SEH_HANDLE - { - CopyStatus = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); - } - } - else - { - /* Create MDL describing the source buffer. */ - Mdl = MmCreateMdl(NULL, - Buffer, - NumberOfBytesToWrite); - if(Mdl == NULL) - { - ObDereferenceObject(Process); - return(STATUS_NO_MEMORY); - } - _SEH_TRY - { - /* Map the MDL. */ - MmProbeAndLockPages(Mdl, - UserMode, - IoReadAccess); - } - _SEH_HANDLE - { - CopyStatus = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (NT_SUCCESS(CopyStatus)) - { - /* Copy memory from the mapped MDL into the target buffer. */ - KeAttachProcess(&Process->Pcb); - - SystemAddress = MmGetSystemAddressForMdl(Mdl); - if (PreviousMode != KernelMode) - { - _SEH_TRY + PMDL Mdl; + PVOID SystemAddress; + PEPROCESS Process; + KPROCESSOR_MODE PreviousMode; + NTSTATUS CopyStatus, Status = STATUS_SUCCESS; + + DPRINT("NtWriteVirtualMemory(ProcessHandle %x, BaseAddress %x, " + "Buffer %x, NumberOfBytesToWrite %d)\n",ProcessHandle,BaseAddress, + Buffer,NumberOfBytesToWrite); + + if ((ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 < (ULONG_PTR)BaseAddress || + (ULONG_PTR)BaseAddress + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) + { + /* Don't allow to write into kernel space */ + return STATUS_ACCESS_VIOLATION; + } + + PreviousMode = ExGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + if ((ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 < (ULONG_PTR)Buffer || + (ULONG_PTR)Buffer + NumberOfBytesToWrite - 1 >= MmUserProbeAddress) + { + /* Don't allow to read from kernel space */ + return STATUS_ACCESS_VIOLATION; + } + if (NumberOfBytesWritten != NULL) + { + _SEH_TRY + { + ProbeForWriteUlong(NumberOfBytesWritten); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + } + + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_WRITE, + NULL, + UserMode, + (PVOID*)(&Process), + NULL); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + CopyStatus = STATUS_SUCCESS; + + /* Write memory */ + if (Process == PsGetCurrentProcess()) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); + } + _SEH_HANDLE + { + CopyStatus = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + memcpy(BaseAddress, Buffer, NumberOfBytesToWrite); + } + } + else + { + /* Create MDL describing the source buffer. */ + Mdl = MmCreateMdl(NULL, + Buffer, + NumberOfBytesToWrite); + if (Mdl == NULL) + { + ObDereferenceObject(Process); + return(STATUS_NO_MEMORY); + } + _SEH_TRY + { + /* Map the MDL. */ + MmProbeAndLockPages(Mdl, UserMode, IoReadAccess); + } + _SEH_HANDLE + { + CopyStatus = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (NT_SUCCESS(CopyStatus)) + { + /* Copy memory from the mapped MDL into the target buffer. */ + KeAttachProcess(&Process->Pcb); + + SystemAddress = MmGetSystemAddressForMdl(Mdl); + if (PreviousMode != KernelMode) + { + _SEH_TRY { - memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); + memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); } - _SEH_HANDLE + _SEH_HANDLE { - CopyStatus = _SEH_GetExceptionCode(); + CopyStatus = _SEH_GetExceptionCode(); } - _SEH_END; - } - else - { - memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); - } - - KeDetachProcess(); - } - - /* Free the MDL. */ - if (Mdl->MappedSystemVa != NULL) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - MmUnlockPages(Mdl); - ExFreePool(Mdl); - } - ObDereferenceObject(Process); - - if (NT_SUCCESS(CopyStatus) && NumberOfBytesWritten != NULL) - { - if (PreviousMode != KernelMode) - { - _SEH_TRY - { - *NumberOfBytesWritten = NumberOfBytesToWrite; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - else - { - *NumberOfBytesWritten = NumberOfBytesToWrite; - } - } - - return(NT_SUCCESS(CopyStatus) ? Status : CopyStatus); + _SEH_END; + } + else + { + memcpy(BaseAddress, SystemAddress, NumberOfBytesToWrite); + } + + KeDetachProcess(); + } + + /* Free the MDL. */ + if (Mdl->MappedSystemVa != NULL) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + MmUnlockPages(Mdl); + ExFreePool(Mdl); + } + ObDereferenceObject(Process); + + if (NT_SUCCESS(CopyStatus) && NumberOfBytesWritten != NULL) + { + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + *NumberOfBytesWritten = NumberOfBytesToWrite; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + *NumberOfBytesWritten = NumberOfBytesToWrite; + } + } + + return(NT_SUCCESS(CopyStatus) ? Status : CopyStatus); } /* @@ -937,12 +945,12 @@ PVOID STDCALL -MmGetVirtualForPhysical ( +MmGetVirtualForPhysical( IN PHYSICAL_ADDRESS PhysicalAddress ) { - UNIMPLEMENTED; - return 0; + UNIMPLEMENTED; + return 0; } /* FUNCTION: @@ -950,19 +958,19 @@ * @unimplemented */ PVOID STDCALL -MmSecureVirtualMemory (PVOID Address, - SIZE_T Length, - ULONG Mode) -{ - /* Only works for user space */ - if (MmHighestUserAddress < Address) - { - return NULL; - } - - UNIMPLEMENTED; - - return 0; +MmSecureVirtualMemory(PVOID Address, + SIZE_T Length, + ULONG Mode) +{ + /* Only works for user space */ + if (MmHighestUserAddress < Address) + { + return NULL; + } + + UNIMPLEMENTED; + + return 0; } @@ -973,12 +981,12 @@ VOID STDCALL MmUnsecureVirtualMemory(PVOID SecureMem) { - if (NULL == SecureMem) - { - return; - } - - UNIMPLEMENTED; + if (NULL == SecureMem) + { + return; + } + + UNIMPLEMENTED; } @@ -986,34 +994,34 @@ * @implemented */ VOID STDCALL -ProbeForRead (IN CONST VOID *Address, +ProbeForRead(IN CONST VOID *Address, + IN ULONG Length, + IN ULONG Alignment) +{ + if (Length != 0) + { + ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); + + if (((ULONG_PTR)Address & (Alignment - 1)) != 0) + { + ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); + } + else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || + (ULONG_PTR)Address + Length - 1 >= (ULONG_PTR)MmUserProbeAddress) + { + ExRaiseStatus (STATUS_ACCESS_VIOLATION); + } + } +} + + +/* + * @implemented + */ +VOID STDCALL +ProbeForWrite(IN PVOID Address, IN ULONG Length, IN ULONG Alignment) -{ - if (Length != 0) - { - ASSERT(Alignment == 1 || Alignment == 2 || Alignment == 4 || Alignment == 8); - - if (((ULONG_PTR)Address & (Alignment - 1)) != 0) - { - ExRaiseStatus (STATUS_DATATYPE_MISALIGNMENT); - } - else if ((ULONG_PTR)Address + Length - 1 < (ULONG_PTR)Address || - (ULONG_PTR)Address + Length - 1 >= (ULONG_PTR)MmUserProbeAddress) - { - ExRaiseStatus (STATUS_ACCESS_VIOLATION); - } - } -} - - -/* - * @implemented - */ -VOID STDCALL -ProbeForWrite (IN PVOID Address, - IN ULONG Length, - IN ULONG Alignment) { volatile CHAR *Current; PCHAR Last;

16 years, 12 months

[mnordell] 29826: First small attempt at implementing process memory quota. Currently disabled without explicit code modification (enabled by macro) to not modify behaviour of trunk.

by mnordell＠svn.reactos.org

Author: mnordell Date: Tue Oct 23 14:05:40 2007 New Revision: 29826 URL: http://svn.reactos.org/svn/reactos?rev=29826&view=rev Log: First small attempt at implementing process memory quota. Currently disabled without explicit code modification (enabled by macro) to not modify behaviour of trunk. Modified: trunk/reactos/ntoskrnl/ps/quota.c Modified: trunk/reactos/ntoskrnl/ps/quota.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/quota.c?rev=29… ============================================================================== --- trunk/reactos/ntoskrnl/ps/quota.c (original) +++ trunk/reactos/ntoskrnl/ps/quota.c Tue Oct 23 14:05:40 2007 @@ -15,6 +15,12 @@ EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; + +/* Define this macro to enable quota code testing. Once quota code is */ +/* stable and verified, remove this macro and checks for it. */ +/*#define PS_QUOTA_ENABLE_QUOTA_CODE*/ + + /* FUNCTIONS ***************************************************************/ VOID @@ -66,9 +72,29 @@ { /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; - + +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + if (Process) + { + /* TODO: Check with Process->QuotaBlock if this can be satisfied, */ + /* assuming this indeed is the place to check it. */ + /* Probably something like: + if (Process->QuotaUsage[2] + Amount > + Process->QuotaBlock->QuotaEntry[2].Limit) + { + refuse + } + */ + Process->QuotaUsage[2] += Amount; + if (Process->QuotaPeak[2] < Process->QuotaUsage[2]) + { + Process->QuotaPeak[2] = Process->QuotaUsage[2]; + } + } +#else /* Otherwise, not implemented */ UNIMPLEMENTED; +#endif return STATUS_SUCCESS; } @@ -115,6 +141,38 @@ return PsChargeProcessPoolQuota(Process, PagedPool, Amount); } +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE +/* + * Internal helper function. + * Returns the index of the Quota* member in EPROCESS for + * a specified pool type, or -1 on failure. + */ +static +INT +PspPoolQuotaIndexFromPoolType(POOL_TYPE PoolType) +{ + switch (PoolType) + { + case NonPagedPool: + case NonPagedPoolMustSucceed: + case NonPagedPoolCacheAligned: + case NonPagedPoolCacheAlignedMustS: + case NonPagedPoolSession: + case NonPagedPoolMustSucceedSession: + case NonPagedPoolCacheAlignedSession: + case NonPagedPoolCacheAlignedMustSSession: + return 1; + case PagedPool: + case PagedPoolCacheAligned: + case PagedPoolSession: + case PagedPoolCacheAlignedSession: + return 0; + default: + return -1; + } +} +#endif + /* * @implemented */ @@ -124,10 +182,32 @@ IN POOL_TYPE PoolType, IN ULONG Amount) { + INT PoolIndex; /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; - UNIMPLEMENTED; +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + PoolIndex = PspPoolQuotaIndexFromPoolType(PoolType); + if (Process && PoolIndex != -1) + { + /* TODO: Check with Process->QuotaBlock if this can be satisfied, */ + /* assuming this indeed is the place to check it. */ + /* Probably something like: + if (Process->QuotaUsage[PoolIndex] + Amount > + Process->QuotaBlock->QuotaEntry[PoolIndex].Limit) + { + refuse + } + */ + Process->QuotaUsage[PoolIndex] += Amount; + if (Process->QuotaPeak[PoolIndex] < Process->QuotaUsage[PoolIndex]) + { + Process->QuotaPeak[PoolIndex] = Process->QuotaUsage[PoolIndex]; + } + } +#else + UNIMPLEMENTED; +#endif return STATUS_SUCCESS; } @@ -140,10 +220,26 @@ IN POOL_TYPE PoolType, IN ULONG_PTR Amount) { + INT PoolIndex; /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return; - UNIMPLEMENTED; +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + PoolIndex = PspPoolQuotaIndexFromPoolType(PoolType); + if (Process && PoolIndex != -1) + { + if (Process->QuotaUsage[PoolIndex] < Amount) + { + DPRINT1("WARNING: Process->QuotaUsage sanity check failed.\n"); + } + else + { + Process->QuotaUsage[PoolIndex] -= Amount; + } + } +#else + UNIMPLEMENTED; +#endif } /* @@ -157,7 +253,11 @@ /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return; - UNIMPLEMENTED; +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + PsReturnPoolQuota(Process, NonPagedPool, Amount); +#else + UNIMPLEMENTED; +#endif } /* @@ -171,7 +271,11 @@ /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return; - UNIMPLEMENTED; +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + PsReturnPoolQuota(Process, PagedPool, Amount); +#else + UNIMPLEMENTED; +#endif } NTSTATUS @@ -182,8 +286,22 @@ /* Don't do anything for the system process */ if (Process == PsInitialSystemProcess) return STATUS_SUCCESS; +#ifdef PS_QUOTA_ENABLE_QUOTA_CODE + if (Process) + { + if (Process->QuotaUsage[2] < Amount) + { + DPRINT1("WARNING: Process PageFileQuotaUsage sanity check failed.\n"); + } + else + { + Process->QuotaUsage[2] -= Amount; + } + } +#else /* Otherwise, not implemented */ UNIMPLEMENTED; +#endif return STATUS_SUCCESS; }

16 years, 12 months

[mnordell] 29825: [FORMATTING] Tab -> spc consistency.

by mnordell＠svn.reactos.org

Author: mnordell Date: Tue Oct 23 13:49:16 2007 New Revision: 29825 URL: http://svn.reactos.org/svn/reactos?rev=29825&view=rev Log: [FORMATTING] Tab -> spc consistency. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Tue Oct 23 13:49:16 2007 @@ -2172,7 +2172,7 @@ #define FILE_DEVICE_SERENUM 0x00000037 #define FILE_DEVICE_TERMSRV 0x00000038 #define FILE_DEVICE_KSEC 0x00000039 -#define FILE_DEVICE_FIPS 0x0000003a +#define FILE_DEVICE_FIPS 0x0000003a typedef struct _DEVICE_OBJECT { CSHORT Type; @@ -4195,14 +4195,14 @@ NonPagedPoolCacheAligned, PagedPoolCacheAligned, NonPagedPoolCacheAlignedMustS, - MaxPoolType, - NonPagedPoolSession = 32, - PagedPoolSession, - NonPagedPoolMustSucceedSession, - DontUseThisTypeSession, - NonPagedPoolCacheAlignedSession, - PagedPoolCacheAlignedSession, - NonPagedPoolCacheAlignedMustSSession + MaxPoolType, + NonPagedPoolSession = 32, + PagedPoolSession, + NonPagedPoolMustSucceedSession, + DontUseThisTypeSession, + NonPagedPoolCacheAlignedSession, + PagedPoolCacheAlignedSession, + NonPagedPoolCacheAlignedMustSSession } POOL_TYPE; #define POOL_COLD_ALLOCATION 256 @@ -8181,7 +8181,7 @@ * IN NTSTATUS Status); */ #define IoIsErrorUserInduced(Status) \ - ((BOOLEAN)(((Status) == STATUS_DEVICE_NOT_READY) || \ + ((BOOLEAN)(((Status) == STATUS_DEVICE_NOT_READY) || \ ((Status) == STATUS_IO_TIMEOUT) || \ ((Status) == STATUS_MEDIA_WRITE_PROTECTED) || \ ((Status) == STATUS_NO_MEDIA_IN_DEVICE) || \ @@ -8496,7 +8496,7 @@ _CompletionRoutine != NULL : TRUE); \ _IrpSp = IoGetNextIrpStackLocation(_Irp); \ _IrpSp->CompletionRoutine = (PIO_COMPLETION_ROUTINE)(_CompletionRoutine); \ - _IrpSp->Context = (_Context); \ + _IrpSp->Context = (_Context); \ _IrpSp->Control = 0; \ if (_InvokeOnSuccess) _IrpSp->Control = SL_INVOKE_ON_SUCCESS; \ if (_InvokeOnError) _IrpSp->Control |= SL_INVOKE_ON_ERROR; \

16 years, 12 months

[hpoussin] 29824: When creating the context menu, take care of attributes returned by the shell folder implementation

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Oct 23 13:43:23 2007 New Revision: 29824 URL: http://svn.reactos.org/svn/reactos?rev=29824&view=rev Log: When creating the context menu, take care of attributes returned by the shell folder implementation Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Tue Oct 23 13:43:23 2007 @@ -58,6 +58,7 @@ UINT ecount; UINT iIdSHEFirst; UINT iIdSHELast; + SFGAOF rfg; } ItemCmImpl; UINT @@ -98,7 +99,15 @@ cm->pidl = ILClone(pidl); cm->pSFParent = pSFParent; - if(pSFParent) IShellFolder_AddRef(pSFParent); + if(pSFParent) + { + HRESULT hr; + IShellFolder_AddRef(pSFParent); + cm->rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET; + hr = IShellFolder_GetAttributesOf(pSFParent, cidl, apidl, &cm->rfg); + if (!SUCCEEDED(hr)) + cm->rfg = 0; /* No action available */ + } cm->apidl = _ILCopyaPidl(apidl, cidl); cm->cidl = cidl; @@ -369,31 +378,45 @@ if(!(uFlags & CMF_EXPLORE)) _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Select", MFS_ENABLED); - if(This->bAllValues) + if (This->rfg & SFGAO_BROWSABLE) { - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); + if(This->bAllValues) + { + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); + } + else + { + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); + } } - else + + SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); + + if (This->rfg & (SFGAO_CANCOPY | SFGAO_CANMOVE)) { - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_EXPLORE, MFT_STRING, "&Explore", MFS_ENABLED); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_OPEN, MFT_STRING, "&Open", MFS_ENABLED); + _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + if (This->rfg & SFGAO_CANCOPY) + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, "&Copy", MFS_ENABLED); + if (This->rfg & SFGAO_CANMOVE) + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, "&Cut", MFS_ENABLED); } - SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); - - _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_COPY, MFT_STRING, "&Copy", MFS_ENABLED); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_CUT, MFT_STRING, "&Cut", MFS_ENABLED); - - _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, "&Delete", MFS_ENABLED); - - if(uFlags & CMF_CANRENAME) - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, "&Rename", ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); - - _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); - _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); + if (This->rfg & SFGAO_CANDELETE) + { + _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_DELETE, MFT_STRING, "&Delete", MFS_ENABLED); + } + + if ((uFlags & CMF_CANRENAME) && (This->rfg & SFGAO_CANRENAME)) + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_RENAME, MFT_STRING, "&Rename", ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); + + if (This->rfg & SFGAO_HASPROPSHEET) + { + _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); + _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); + } lastindex = FCIDM_SHVIEWLAST; }

16 years, 12 months

[hpoussin] 29823: Use SHCreateDefaultExtractIcon to simplify code

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Oct 23 13:09:46 2007 New Revision: 29823 URL: http://svn.reactos.org/svn/reactos?rev=29823&view=rev Log: Use SHCreateDefaultExtractIcon to simplify code Modified: trunk/reactos/dll/win32/shell32/folders.c Modified: trunk/reactos/dll/win32/shell32/folders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.c (original) +++ trunk/reactos/dll/win32/shell32/folders.c Tue Oct 23 13:09:46 2007 @@ -43,128 +43,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -/*********************************************************************** -* IExtractIconW implementation -*/ -typedef struct -{ - const IExtractIconWVtbl *lpVtbl; - LONG ref; - const IPersistFileVtbl *lpvtblPersistFile; - const IExtractIconAVtbl *lpvtblExtractIconA; - LPITEMIDLIST pidl; -} IExtractIconWImpl; - -static const IExtractIconAVtbl eiavt; -static const IExtractIconWVtbl eivt; -static const IPersistFileVtbl pfvt; - -static inline IExtractIconW *impl_from_IPersistFile( IPersistFile *iface ) -{ - return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblPersistFile)); -} - -static inline IExtractIconW *impl_from_IExtractIconA( IExtractIconA *iface ) -{ - return (IExtractIconW *)((char*)iface - FIELD_OFFSET(IExtractIconWImpl, lpvtblExtractIconA)); -} - - -/************************************************************************** -* IExtractIconW_Constructor -*/ -IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) -{ - IExtractIconWImpl* ei; - - TRACE("%p\n", pidl); - - ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); - ei->ref=1; - ei->lpVtbl = &eivt; - ei->lpvtblPersistFile = &pfvt; - ei->lpvtblExtractIconA = &eiavt; - ei->pidl=ILClone(pidl); - - pdump(pidl); - - TRACE("(%p)\n", ei); - return (IExtractIconW *)ei; -} -/************************************************************************** - * IExtractIconW_QueryInterface - */ -static HRESULT WINAPI IExtractIconW_fnQueryInterface(IExtractIconW *iface, REFIID riid, LPVOID *ppvObj) -{ - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; - - TRACE("(%p)->(\n\tIID:\t%s,%p)\n", This, debugstr_guid(riid), ppvObj); - - *ppvObj = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - { - *ppvObj = This; - } - else if (IsEqualIID(riid, &IID_IPersistFile)) /*IExtractIcon*/ - { - *ppvObj = (IPersistFile*)&(This->lpvtblPersistFile); - } - else if (IsEqualIID(riid, &IID_IExtractIconA)) /*IExtractIcon*/ - { - *ppvObj = (IExtractIconA*)&(This->lpvtblExtractIconA); - } - else if (IsEqualIID(riid, &IID_IExtractIconW)) /*IExtractIcon*/ - { - *ppvObj = (IExtractIconW*)This; - } - - if(*ppvObj) - { - IExtractIconW_AddRef((IExtractIconW*) *ppvObj); - TRACE("-- Interface: (%p)->(%p)\n",ppvObj,*ppvObj); - return S_OK; - } - TRACE("-- Interface: E_NOINTERFACE\n"); - return E_NOINTERFACE; -} - -/************************************************************************** -* IExtractIconW_AddRef -*/ -static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) -{ - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->ref); - - TRACE("(%p)->(count=%u)\n", This, refCount - 1); - - return refCount; -} -/************************************************************************** -* IExtractIconW_Release -*/ -static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) -{ - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; - ULONG refCount = InterlockedDecrement(&This->ref); - - TRACE("(%p)->(count=%u)\n", This, refCount + 1); - - if (!refCount) - { - TRACE(" destroying IExtractIcon(%p)\n",This); - SHFree(This->pidl); - HeapFree(GetProcessHeap(),0,This); - return 0; - } - return refCount; -} - -static HRESULT getIconLocationForFolder(IExtractIconW *iface, UINT uFlags, +WCHAR swShell32Name[MAX_PATH]; + +static HRESULT getIconLocationForFolder(LPCITEMIDLIST pidl, UINT uFlags, LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; int icon_idx; WCHAR wszPath[MAX_PATH]; WCHAR wszCLSIDValue[CHARS_IN_GUID]; @@ -174,21 +57,21 @@ static const WCHAR clsid2[] = { 'C','L','S','I','D','2',0 }; static const WCHAR iconIndex[] = { 'I','c','o','n','I','n','d','e','x',0 }; - if (SHELL32_GetCustomFolderAttribute(This->pidl, shellClassInfo, iconFile, + if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile, wszPath, MAX_PATH)) { WCHAR wszIconIndex[10]; - SHELL32_GetCustomFolderAttribute(This->pidl, shellClassInfo, iconIndex, + SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex, wszIconIndex, 10); *piIndex = atoiW(wszIconIndex); } - else if (SHELL32_GetCustomFolderAttribute(This->pidl, shellClassInfo, clsid, + else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid, wszCLSIDValue, CHARS_IN_GUID) && HCR_GetDefaultIconW(wszCLSIDValue, szIconFile, cchMax, &icon_idx)) { *piIndex = icon_idx; } - else if (SHELL32_GetCustomFolderAttribute(This->pidl, shellClassInfo, clsid2, + else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2, wszCLSIDValue, CHARS_IN_GUID) && HCR_GetDefaultIconW(wszCLSIDValue, szIconFile, cchMax, &icon_idx)) { @@ -213,372 +96,204 @@ return S_OK; } -WCHAR swShell32Name[MAX_PATH]; - /************************************************************************** -* IExtractIconW_GetIconLocation -* -* mapping filetype to icon +* IExtractIconW_Constructor */ -static HRESULT WINAPI IExtractIconW_fnGetIconLocation( - IExtractIconW * iface, - UINT uFlags, /* GIL_ flags */ - LPWSTR szIconFile, - UINT cchMax, - int * piIndex, - UINT * pwFlags) /* returned GIL_ flags */ +IExtractIconW* IExtractIconW_Constructor(LPCITEMIDLIST pidl) { - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; - - char sTemp[MAX_PATH]; - int icon_idx; - GUID const * riid; - LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - - TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); - - if (pwFlags) - *pwFlags = 0; - - if (_ILIsDesktop(pSimplePidl)) - { - lstrcpynW(szIconFile, swShell32Name, cchMax); - *piIndex = -IDI_SHELL_DESKTOP; - } - - /* my computer and other shell extensions */ - else if ((riid = _ILGetGUIDPointer(pSimplePidl))) - { - static const WCHAR fmt[] = { 'C','L','S','I','D','\\', - '{','%','0','8','l','x','-','%','0','4','x','-','%','0','4','x','-', - '%','0','2','x','%','0','2','x','-','%','0','2','x', '%','0','2','x', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0 }; - WCHAR xriid[50]; - - sprintfW(xriid, fmt, - riid->Data1, riid->Data2, riid->Data3, - riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], - riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - if (HCR_GetDefaultIconW(xriid, szIconFile, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - } - else - { - lstrcpynW(szIconFile, swShell32Name, cchMax); - if(IsEqualGUID(riid, &CLSID_MyComputer)) - *piIndex = -IDI_SHELL_MY_COMPUTER; - else if(IsEqualGUID(riid, &CLSID_MyDocuments)) - *piIndex = -IDI_SHELL_MY_DOCUMENTS; - else if(IsEqualGUID(riid, &CLSID_NetworkPlaces)) - *piIndex = -IDI_SHELL_MY_NETWORK_PLACES; - else if(IsEqualGUID(riid, &CLSID_UnixFolder) || - IsEqualGUID(riid, &CLSID_UnixDosFolder)) - *piIndex = -IDI_SHELL_DRIVE; + IDefaultExtractIconInit *initIcon; + IExtractIconW *extractIcon; + GUID const * riid; + int icon_idx; + UINT flags; + CHAR sTemp[MAX_PATH]; + WCHAR wTemp[MAX_PATH]; + LPITEMIDLIST pSimplePidl = ILFindLastID(pidl); + HRESULT hr; + + hr = SHCreateDefaultExtractIcon(&IID_IDefaultExtractIconInit, (void **)&initIcon); + if (!SUCCEEDED(hr)) + return NULL; + + hr = IDefaultExtractIconInit_QueryInterface(initIcon, &IID_IExtractIconW, (void **)&extractIcon); + IDefaultExtractIconInit_Release(initIcon); + if (!SUCCEEDED(hr)) + return NULL; + + if (_ILIsDesktop(pSimplePidl)) + { + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -IDI_SHELL_DESKTOP); + } + else if ((riid = _ILGetGUIDPointer(pSimplePidl))) + { + /* my computer and other shell extensions */ + static const WCHAR fmt[] = { 'C','L','S','I','D','\\', + '{','%','0','8','l','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x', '%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0 }; + WCHAR xriid[50]; + + sprintfW(xriid, fmt, + riid->Data1, riid->Data2, riid->Data3, + riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], + riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + if (HCR_GetDefaultIconW(xriid, wTemp, MAX_PATH, &icon_idx)) + { + IDefaultExtractIconInit_SetNormalIcon(initIcon, wTemp, icon_idx); + } else - *piIndex = -IDI_SHELL_FOLDER; - } - } - - else if (_ILIsDrive (pSimplePidl)) - { - static const WCHAR drive[] = { 'D','r','i','v','e',0 }; - - int icon_idx = -1; - - if (_ILGetDrive(pSimplePidl, sTemp, MAX_PATH)) - { - switch(GetDriveTypeA(sTemp)) - { - case DRIVE_REMOVABLE: icon_idx = IDI_SHELL_FLOPPY; break; - case DRIVE_CDROM: icon_idx = IDI_SHELL_CDROM; break; - case DRIVE_REMOTE: icon_idx = IDI_SHELL_NETDRIVE; break; - case DRIVE_RAMDISK: icon_idx = IDI_SHELL_RAMDISK; break; - } - } - - if (icon_idx != -1) - { - lstrcpynW(szIconFile, swShell32Name, cchMax); - *piIndex = -icon_idx; - } - else - { - if (HCR_GetDefaultIconW(drive, szIconFile, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - } - else - { - lstrcpynW(szIconFile, swShell32Name, cchMax); - *piIndex = -IDI_SHELL_DRIVE; - } - } - } - else if (_ILIsFolder (pSimplePidl)) - { - getIconLocationForFolder(iface, uFlags, szIconFile, cchMax, piIndex, - pwFlags); - } - else - { - BOOL found = FALSE; - - if (_ILIsCPanelStruct(pSimplePidl)) - { - if (SUCCEEDED(CPanel_GetIconLocationW(pSimplePidl, szIconFile, cchMax, piIndex))) - found = TRUE; - } - else if (_ILGetExtension(pSimplePidl, sTemp, MAX_PATH)) - { - if (HCR_MapTypeToValueA(sTemp, sTemp, MAX_PATH, TRUE) - && HCR_GetDefaultIconA(sTemp, sTemp, MAX_PATH, &icon_idx)) - { - if (!lstrcmpA("%1", sTemp)) /* icon is in the file */ - { - SHGetPathFromIDListW(This->pidl, szIconFile); - *piIndex = 0; - } - else - { - MultiByteToWideChar(CP_ACP, 0, sTemp, -1, szIconFile, cchMax); - *piIndex = icon_idx; - } - - found = TRUE; - } - else if (!lstrcmpiA(sTemp, "lnkfile")) - { - /* extract icon from shell shortcut */ - IShellFolder* dsf; - IShellLinkW* psl; - - if (SUCCEEDED(SHGetDesktopFolder(&dsf))) - { - HRESULT hr = IShellFolder_GetUIObjectOf(dsf, NULL, 1, (LPCITEMIDLIST*)&This->pidl, &IID_IShellLinkW, NULL, (LPVOID*)&psl); - - if (SUCCEEDED(hr)) - { - hr = IShellLinkW_GetIconLocation(psl, szIconFile, MAX_PATH, piIndex); - - if (SUCCEEDED(hr) && *szIconFile) - found = TRUE; - - IShellLinkW_Release(psl); - } - - IShellFolder_Release(dsf); - } - } - } - - if (!found) /* default icon */ - { - lstrcpynW(szIconFile, swShell32Name, cchMax); - *piIndex = 0; - } - } - - TRACE("-- %s %x\n", debugstr_w(szIconFile), *piIndex); - return NOERROR; + { + if (IsEqualGUID(riid, &CLSID_MyComputer)) + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -IDI_SHELL_MY_COMPUTER); + else if (IsEqualGUID(riid, &CLSID_MyDocuments)) + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -IDI_SHELL_MY_DOCUMENTS); + else if (IsEqualGUID(riid, &CLSID_NetworkPlaces)) + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -IDI_SHELL_MY_NETWORK_PLACES); + else if (IsEqualGUID(riid, &CLSID_UnixFolder) || + IsEqualGUID(riid, &CLSID_UnixDosFolder)) + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -IDI_SHELL_DRIVE); + else + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -IDI_SHELL_FOLDER); + } + } + + else if (_ILIsDrive (pSimplePidl)) + { + static const WCHAR drive[] = { 'D','r','i','v','e',0 }; + int icon_idx = -1; + + if (_ILGetDrive(pSimplePidl, sTemp, MAX_PATH)) + { + switch(GetDriveTypeA(sTemp)) + { + case DRIVE_REMOVABLE: icon_idx = IDI_SHELL_FLOPPY; break; + case DRIVE_CDROM: icon_idx = IDI_SHELL_CDROM; break; + case DRIVE_REMOTE: icon_idx = IDI_SHELL_NETDRIVE; break; + case DRIVE_RAMDISK: icon_idx = IDI_SHELL_RAMDISK; break; + } + } + + if (icon_idx != -1) + { + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -icon_idx); + } + else + { + if (HCR_GetDefaultIconW(drive, wTemp, MAX_PATH, &icon_idx)) + IDefaultExtractIconInit_SetNormalIcon(initIcon, wTemp, icon_idx); + else + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, -IDI_SHELL_DRIVE); + } + } + + else if (_ILIsFolder (pSimplePidl)) + { + if (SUCCEEDED(getIconLocationForFolder( + pidl, 0, wTemp, MAX_PATH, + &icon_idx, + &flags))) + { + IDefaultExtractIconInit_SetNormalIcon(initIcon, wTemp, icon_idx); + } + if (SUCCEEDED(getIconLocationForFolder( + pidl, GIL_DEFAULTICON, wTemp, MAX_PATH, + &icon_idx, + &flags))) + { + IDefaultExtractIconInit_SetDefaultIcon(initIcon, wTemp, icon_idx); + } + if (SUCCEEDED(getIconLocationForFolder( + pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH, + &icon_idx, + &flags))) + { + IDefaultExtractIconInit_SetShortcutIcon(initIcon, wTemp, icon_idx); + } + if (SUCCEEDED(getIconLocationForFolder( + pidl, GIL_OPENICON, wTemp, MAX_PATH, + &icon_idx, + &flags))) + { + IDefaultExtractIconInit_SetOpenIcon(initIcon, wTemp, icon_idx); + } + } + else + { + BOOL found = FALSE; + + if (_ILIsCPanelStruct(pSimplePidl)) + { + if (SUCCEEDED(CPanel_GetIconLocationW(pSimplePidl, wTemp, MAX_PATH, &icon_idx))) + found = TRUE; + } + else if (_ILGetExtension(pSimplePidl, sTemp, MAX_PATH)) + { + if (HCR_MapTypeToValueA(sTemp, sTemp, MAX_PATH, TRUE) + && HCR_GetDefaultIconA(sTemp, sTemp, MAX_PATH, &icon_idx)) + { + if (!lstrcmpA("%1", sTemp)) /* icon is in the file */ + { + SHGetPathFromIDListW(pidl, wTemp); + icon_idx = 0; + } + else + { + MultiByteToWideChar(CP_ACP, 0, sTemp, -1, wTemp, MAX_PATH); + } + + found = TRUE; + } + else if (!lstrcmpiA(sTemp, "lnkfile")) + { + /* extract icon from shell shortcut */ + IShellFolder* dsf; + IShellLinkW* psl; + + if (SUCCEEDED(SHGetDesktopFolder(&dsf))) + { + HRESULT hr = IShellFolder_GetUIObjectOf(dsf, NULL, 1, (LPCITEMIDLIST*)&pidl, &IID_IShellLinkW, NULL, (LPVOID*)&psl); + + if (SUCCEEDED(hr)) + { + hr = IShellLinkW_GetIconLocation(psl, wTemp, MAX_PATH, &icon_idx); + + if (SUCCEEDED(hr) && *sTemp) + found = TRUE; + + IShellLinkW_Release(psl); + } + + IShellFolder_Release(dsf); + } + } + } + + if (!found) + /* default icon */ + IDefaultExtractIconInit_SetNormalIcon(initIcon, swShell32Name, 0); + else + IDefaultExtractIconInit_SetNormalIcon(initIcon, wTemp, icon_idx); + } + + return extractIcon; } - -/************************************************************************** -* IExtractIconW_Extract -*/ -static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) -{ - IExtractIconWImpl *This = (IExtractIconWImpl *)iface; - int index; - - FIXME("(%p) (file=%p index=%d %p %p size=%08x) semi-stub\n", This, debugstr_w(pszFile), (signed)nIconIndex, - phiconLarge, phiconSmall, nIconSize); - - index = SIC_GetIconIndex(pszFile, nIconIndex, 0); - - if (phiconLarge) - *phiconLarge = ImageList_GetIcon(ShellBigIconList, index, ILD_TRANSPARENT); - - if (phiconSmall) - *phiconSmall = ImageList_GetIcon(ShellSmallIconList, index, ILD_TRANSPARENT); - - return S_OK; -} - -static const IExtractIconWVtbl eivt = -{ - IExtractIconW_fnQueryInterface, - IExtractIconW_fnAddRef, - IExtractIconW_fnRelease, - IExtractIconW_fnGetIconLocation, - IExtractIconW_fnExtract -}; /************************************************************************** * IExtractIconA_Constructor */ IExtractIconA* IExtractIconA_Constructor(LPCITEMIDLIST pidl) { - IExtractIconWImpl *This = (IExtractIconWImpl *)IExtractIconW_Constructor(pidl); - IExtractIconA *eia = (IExtractIconA *)&This->lpvtblExtractIconA; - - TRACE("(%p)->(%p)\n", This, eia); - return eia; + IExtractIconW *extractIconW; + IExtractIconA *extractIconA; + HRESULT hr; + + extractIconW = IExtractIconW_Constructor(pidl); + if (!extractIconW) + return NULL; + hr = IExtractIconW_QueryInterface(extractIconW, &IID_IExtractIconA, (void **)&extractIconA); + IExtractIconW_Release(extractIconW); + if (!SUCCEEDED(hr)) + return NULL; + return extractIconA; } -/************************************************************************** - * IExtractIconA_QueryInterface - */ -static HRESULT WINAPI IExtractIconA_fnQueryInterface(IExtractIconA * iface, REFIID riid, LPVOID *ppvObj) -{ - IExtractIconW *This = impl_from_IExtractIconA(iface); - - return IExtractIconW_QueryInterface(This, riid, ppvObj); -} - -/************************************************************************** -* IExtractIconA_AddRef -*/ -static ULONG WINAPI IExtractIconA_fnAddRef(IExtractIconA * iface) -{ - IExtractIconW *This = impl_from_IExtractIconA(iface); - - return IExtractIconW_AddRef(This); -} -/************************************************************************** -* IExtractIconA_Release -*/ -static ULONG WINAPI IExtractIconA_fnRelease(IExtractIconA * iface) -{ - IExtractIconW *This = impl_from_IExtractIconA(iface); - - return IExtractIconW_AddRef(This); -} -/************************************************************************** -* IExtractIconA_GetIconLocation -* -* mapping filetype to icon -*/ -static HRESULT WINAPI IExtractIconA_fnGetIconLocation( - IExtractIconA * iface, - UINT uFlags, - LPSTR szIconFile, - UINT cchMax, - int * piIndex, - UINT * pwFlags) -{ - HRESULT ret; - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, cchMax * sizeof(WCHAR)); - IExtractIconW *This = impl_from_IExtractIconA(iface); - - TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); - - ret = IExtractIconW_GetIconLocation(This, uFlags, lpwstrFile, cchMax, piIndex, pwFlags); - WideCharToMultiByte(CP_ACP, 0, lpwstrFile, -1, szIconFile, cchMax, NULL, NULL); - HeapFree(GetProcessHeap(), 0, lpwstrFile); - - TRACE("-- %s %x\n", szIconFile, *piIndex); - return ret; -} -/************************************************************************** -* IExtractIconA_Extract -*/ -static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) -{ - HRESULT ret; - INT len = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - IExtractIconW *This = impl_from_IExtractIconA(iface); - - TRACE("(%p) (file=%p index=%u %p %p size=%u)\n", This, pszFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); - - MultiByteToWideChar(CP_ACP, 0, pszFile, -1, lpwstrFile, len); - ret = IExtractIconW_Extract(This, lpwstrFile, nIconIndex, phiconLarge, phiconSmall, nIconSize); - HeapFree(GetProcessHeap(), 0, lpwstrFile); - return ret; -} - -static const IExtractIconAVtbl eiavt = -{ - IExtractIconA_fnQueryInterface, - IExtractIconA_fnAddRef, - IExtractIconA_fnRelease, - IExtractIconA_fnGetIconLocation, - IExtractIconA_fnExtract -}; - -/************************************************************************ - * IEIPersistFile_QueryInterface (IUnknown) - */ -static HRESULT WINAPI IEIPersistFile_fnQueryInterface( - IPersistFile *iface, - REFIID iid, - LPVOID *ppvObj) -{ - IExtractIconW *This = impl_from_IPersistFile(iface); - - return IExtractIconW_QueryInterface(This, iid, ppvObj); -} - -/************************************************************************ - * IEIPersistFile_AddRef (IUnknown) - */ -static ULONG WINAPI IEIPersistFile_fnAddRef( - IPersistFile *iface) -{ - IExtractIconW *This = impl_from_IPersistFile(iface); - - return IExtractIconW_AddRef(This); -} - -/************************************************************************ - * IEIPersistFile_Release (IUnknown) - */ -static ULONG WINAPI IEIPersistFile_fnRelease( - IPersistFile *iface) -{ - IExtractIconW *This = impl_from_IPersistFile(iface); - - return IExtractIconW_Release(This); -} - -/************************************************************************ - * IEIPersistFile_GetClassID (IPersist) - */ -static HRESULT WINAPI IEIPersistFile_fnGetClassID( - IPersistFile *iface, - LPCLSID lpClassId) -{ - CLSID StdFolderID = { 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} }; - - if (lpClassId==NULL) - return E_POINTER; - - memcpy(lpClassId, &StdFolderID, sizeof(StdFolderID)); - - return S_OK; -} - -/************************************************************************ - * IEIPersistFile_Load (IPersistFile) - */ -static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFileName, DWORD dwMode) -{ - IExtractIconW *This = impl_from_IPersistFile(iface); - FIXME("%p\n", This); - return E_NOTIMPL; - -} - -static const IPersistFileVtbl pfvt = -{ - IEIPersistFile_fnQueryInterface, - IEIPersistFile_fnAddRef, - IEIPersistFile_fnRelease, - IEIPersistFile_fnGetClassID, - (void *) 0xdeadbeef /* IEIPersistFile_fnIsDirty */, - IEIPersistFile_fnLoad, - (void *) 0xdeadbeef /* IEIPersistFile_fnSave */, - (void *) 0xdeadbeef /* IEIPersistFile_fnSaveCompleted */, - (void *) 0xdeadbeef /* IEIPersistFile_fnGetCurFile */ -};

16 years, 12 months

[hpoussin] 29822: Implement SHCreateDefaultExtractIcon Export SHCreateDefaultContextMenu

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Oct 23 13:01:39 2007 New Revision: 29822 URL: http://svn.reactos.org/svn/reactos?rev=29822&view=rev Log: Implement SHCreateDefaultExtractIcon Export SHCreateDefaultContextMenu Added: trunk/reactos/dll/win32/shell32/extracticon.c (with props) Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32.spec Added: trunk/reactos/dll/win32/shell32/extracticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/extracti… ============================================================================== --- trunk/reactos/dll/win32/shell32/extracticon.c (added) +++ trunk/reactos/dll/win32/shell32/extracticon.c Tue Oct 23 13:01:39 2007 @@ -1,0 +1,512 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Registry namespace extension + * FILE: dll/win32/shell32/extracticon.c + * PURPOSE: Icon extraction + * + * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) + */ + +#define COBJMACROS +#define CONST_VTABLE +#include <shlobj.h> +#include <debug.h> + +struct IconLocation +{ + LPWSTR file; + UINT index; +}; + +struct IconExtraction +{ + ULONG ref; + IDefaultExtractIconInit defaultExtractIconInitImpl; + IExtractIconW extractIconWImpl; + IExtractIconA extractIconAImpl; + IPersistFile persistFileImpl; + + UINT flags; + struct IconLocation defaultIcon; + struct IconLocation normalIcon; + struct IconLocation openIcon; + struct IconLocation shortcutIcon; +}; + +static VOID +DuplicateString( + LPCWSTR Source, + LPWSTR *Destination) +{ + SIZE_T cb; + + if (*Destination) + CoTaskMemFree(*Destination); + + cb = (wcslen(Source) + 1) * sizeof(WCHAR); + *Destination = CoTaskMemAlloc(cb); + if (!*Destination) + return; + CopyMemory(*Destination, Source, cb); +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_QueryInterface( + IDefaultExtractIconInit *This, + REFIID riid, + void **ppvObject) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + + if (!ppvObject) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ppvObject = &s->defaultExtractIconInitImpl; + else if (IsEqualIID(riid, &IID_IDefaultExtractIconInit)) + *ppvObject = &s->defaultExtractIconInitImpl; + else if (IsEqualIID(riid, &IID_IExtractIconW)) + *ppvObject = &s->extractIconWImpl; + else if (IsEqualIID(riid, &IID_IExtractIconA)) + *ppvObject = &s->extractIconAImpl; + else if (IsEqualIID(riid, &IID_IPersist)) + *ppvObject = &s->persistFileImpl; + else if (IsEqualIID(riid, &IID_IPersistFile)) + *ppvObject = &s->persistFileImpl; + else + { + *ppvObject = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef(This); + return S_OK; +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_AddRef( + IDefaultExtractIconInit *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + ULONG refCount = InterlockedIncrement((PLONG)&s->ref); + return refCount; +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_Release( + IDefaultExtractIconInit *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + ULONG refCount; + + if (!This) + return E_POINTER; + + refCount = InterlockedDecrement((PLONG)&s->ref); + if (refCount == 0) + { + if (s->defaultIcon.file) CoTaskMemFree(s->defaultIcon.file); + if (s->normalIcon.file) CoTaskMemFree(s->normalIcon.file); + if (s->openIcon.file) CoTaskMemFree(s->openIcon.file); + if (s->shortcutIcon.file) CoTaskMemFree(s->shortcutIcon.file); + CoTaskMemFree(s); + } + + return refCount; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_SetDefaultIcon( + IDefaultExtractIconInit *This, + LPCWSTR pszFile, + int iIcon) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + DuplicateString(pszFile, &s->defaultIcon.file); + if (!s->defaultIcon.file) + return E_OUTOFMEMORY; + s->defaultIcon.index = iIcon; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_SetFlags( + IDefaultExtractIconInit *This, + UINT uFlags) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + s->flags = uFlags; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_SetKey( + IDefaultExtractIconInit *This, + HKEY hkey) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_SetNormalIcon( + IDefaultExtractIconInit *This, + LPCWSTR pszFile, + int iIcon) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + DuplicateString(pszFile, &s->normalIcon.file); + if (!s->normalIcon.file) + return E_OUTOFMEMORY; + s->normalIcon.index = iIcon; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_SetOpenIcon( + IDefaultExtractIconInit *This, + LPCWSTR pszFile, + int iIcon) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + DuplicateString(pszFile, &s->openIcon.file); + if (!s->openIcon.file) + return E_OUTOFMEMORY; + s->openIcon.index = iIcon; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_DefaultExtractIconInit_SetShortcutIcon( + IDefaultExtractIconInit *This, + LPCWSTR pszFile, + int iIcon) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, defaultExtractIconInitImpl); + DuplicateString(pszFile, &s->shortcutIcon.file); + if (!s->shortcutIcon.file) + return E_OUTOFMEMORY; + s->shortcutIcon.index = iIcon; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_ExtractIconW_QueryInterface( + IExtractIconW *This, + REFIID riid, + void **ppvObject) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconWImpl); + return IconExtraction_DefaultExtractIconInit_QueryInterface(&s->defaultExtractIconInitImpl, riid, ppvObject); +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_ExtractIconW_AddRef( + IExtractIconW *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconWImpl); + return IconExtraction_DefaultExtractIconInit_AddRef(&s->defaultExtractIconInitImpl); +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_ExtractIconW_Release( + IExtractIconW *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconWImpl); + return IconExtraction_DefaultExtractIconInit_Release(&s->defaultExtractIconInitImpl); +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_ExtractIconW_GetIconLocation( + IExtractIconW *This, + UINT uFlags, + LPWSTR szIconFile, + UINT cchMax, + int *piIndex, + UINT *pwFlags) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconWImpl); + const struct IconLocation *icon = NULL; + SIZE_T cb; + + if (uFlags & GIL_DEFAULTICON) + icon = s->defaultIcon.file ? &s->defaultIcon : &s->normalIcon; + else if (uFlags & GIL_FORSHORTCUT) + icon = s->shortcutIcon.file ? &s->shortcutIcon : &s->normalIcon; + else if (uFlags & GIL_OPENICON) + icon = s->openIcon.file ? &s->openIcon : &s->normalIcon; + else + icon = &s->normalIcon; + + if (!icon->file) + return E_FAIL; + + cb = wcslen(icon->file) + 1; + if (cchMax < (UINT)cb) + return E_FAIL; + CopyMemory(szIconFile, icon->file, cb * sizeof(WCHAR)); + *piIndex = icon->index; + *pwFlags = s->flags; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_ExtractIconW_Extract( + IExtractIconW *This, + LPCWSTR pszFile, + UINT nIconIndex, + HICON *phiconLarge, + HICON *phiconSmall, + UINT nIconSize) +{ + /* Nothing to do, ExtractIconW::GetIconLocation should be enough */ + return S_FALSE; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_ExtractIconA_QueryInterface( + IExtractIconA *This, + REFIID riid, + void **ppvObject) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconAImpl); + return IconExtraction_DefaultExtractIconInit_QueryInterface(&s->defaultExtractIconInitImpl, riid, ppvObject); +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_ExtractIconA_AddRef( + IExtractIconA *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconAImpl); + return IconExtraction_DefaultExtractIconInit_AddRef(&s->defaultExtractIconInitImpl); +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_ExtractIconA_Release( + IExtractIconA *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconAImpl); + return IconExtraction_DefaultExtractIconInit_Release(&s->defaultExtractIconInitImpl); +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_ExtractIconA_GetIconLocation( + IExtractIconA *This, + UINT uFlags, + LPSTR szIconFile, + UINT cchMax, + int *piIndex, + UINT *pwFlags) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconAImpl); + LPWSTR szIconFileW = NULL; + HRESULT hr; + + if (cchMax > 0) + { + szIconFileW = CoTaskMemAlloc(cchMax * sizeof(WCHAR)); + if (!szIconFileW) + return E_OUTOFMEMORY; + } + + hr = IconExtraction_ExtractIconW_GetIconLocation( + &s->extractIconWImpl, uFlags, szIconFileW, cchMax, piIndex, pwFlags); + if (SUCCEEDED(hr) && cchMax > 0) + if (0 == WideCharToMultiByte(CP_ACP, 0, szIconFileW, cchMax, szIconFile, cchMax, NULL, NULL)) + hr = E_FAIL; + + if (szIconFileW) + CoTaskMemFree(szIconFileW); + return hr; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_ExtractIconA_Extract( + IExtractIconA *This, + LPCSTR pszFile, + UINT nIconIndex, + HICON *phiconLarge, + HICON *phiconSmall, + UINT nIconSize) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, extractIconAImpl); + LPWSTR pszFileW = NULL; + int nLength; + HRESULT hr; + + if (pszFile) + { + nLength = MultiByteToWideChar(CP_ACP, 0, pszFile, -1, NULL, 0); + if (nLength == 0) + return E_FAIL; + pszFileW = CoTaskMemAlloc(nLength * sizeof(WCHAR)); + if (!pszFileW) + return E_OUTOFMEMORY; + if (!MultiByteToWideChar(CP_ACP, 0, pszFile, nLength, pszFileW, nLength)) + { + CoTaskMemFree(pszFileW); + return E_FAIL; + } + } + + hr = IconExtraction_ExtractIconW_Extract( + &s->extractIconWImpl, pszFileW, nIconIndex, phiconLarge, phiconSmall, nIconSize); + + if (pszFileW) + CoTaskMemFree(pszFileW); + return hr; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_PersistFile_QueryInterface( + IPersistFile *This, + REFIID riid, + void **ppvObject) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, persistFileImpl); + return IconExtraction_DefaultExtractIconInit_QueryInterface(&s->defaultExtractIconInitImpl, riid, ppvObject); +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_PersistFile_AddRef( + IPersistFile *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, persistFileImpl); + return IconExtraction_DefaultExtractIconInit_AddRef(&s->defaultExtractIconInitImpl); +} + +static ULONG STDMETHODCALLTYPE +IconExtraction_PersistFile_Release( + IPersistFile *This) +{ + struct IconExtraction *s = CONTAINING_RECORD(This, struct IconExtraction, persistFileImpl); + return IconExtraction_DefaultExtractIconInit_Release(&s->defaultExtractIconInitImpl); +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_PersistFile_GetClassID( + IPersistFile *This, + CLSID *pClassID) +{ + if (!pClassID) + return E_POINTER; + + *pClassID = GUID_NULL; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_PersistFile_IsDirty( + IPersistFile *This) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_PersistFile_Load( + IPersistFile *This, + LPCOLESTR pszFileName, + DWORD dwMode) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_PersistFile_Save( + IPersistFile *This, + LPCOLESTR pszFileName, + BOOL fRemember) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_PersistFile_SaveCompleted( + IPersistFile *This, + LPCOLESTR pszFileName) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +IconExtraction_PersistFile_GetCurFile( + IPersistFile *This, + LPOLESTR *ppszFileName) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +static const IDefaultExtractIconInitVtbl IconExtractionDefaultExtractIconInitVtbl = +{ + IconExtraction_DefaultExtractIconInit_QueryInterface, + IconExtraction_DefaultExtractIconInit_AddRef, + IconExtraction_DefaultExtractIconInit_Release, + IconExtraction_DefaultExtractIconInit_SetDefaultIcon, + IconExtraction_DefaultExtractIconInit_SetFlags, + IconExtraction_DefaultExtractIconInit_SetKey, + IconExtraction_DefaultExtractIconInit_SetNormalIcon, + IconExtraction_DefaultExtractIconInit_SetOpenIcon, + IconExtraction_DefaultExtractIconInit_SetShortcutIcon, +}; + +static const IExtractIconWVtbl IconExtractionExtractIconWVtbl = +{ + IconExtraction_ExtractIconW_QueryInterface, + IconExtraction_ExtractIconW_AddRef, + IconExtraction_ExtractIconW_Release, + IconExtraction_ExtractIconW_GetIconLocation, + IconExtraction_ExtractIconW_Extract, +}; + +static const IExtractIconAVtbl IconExtractionExtractIconAVtbl = +{ + IconExtraction_ExtractIconA_QueryInterface, + IconExtraction_ExtractIconA_AddRef, + IconExtraction_ExtractIconA_Release, + IconExtraction_ExtractIconA_GetIconLocation, + IconExtraction_ExtractIconA_Extract, +}; + +static const IPersistFileVtbl IconExtractionPersistFileVtbl = +{ + IconExtraction_PersistFile_QueryInterface, + IconExtraction_PersistFile_AddRef, + IconExtraction_PersistFile_Release, + IconExtraction_PersistFile_GetClassID, + IconExtraction_PersistFile_IsDirty, + IconExtraction_PersistFile_Load, + IconExtraction_PersistFile_Save, + IconExtraction_PersistFile_SaveCompleted, + IconExtraction_PersistFile_GetCurFile, +}; + +HRESULT WINAPI +SHCreateDefaultExtractIcon( + REFIID riid, + void **ppv) +{ + struct IconExtraction *s; + + if (!ppv) + return E_POINTER; + + *ppv = NULL; + + s = CoTaskMemAlloc(sizeof(struct IconExtraction)); + if (!s) + return E_OUTOFMEMORY; + memset(s, 0, sizeof(struct IconExtraction)); + s->defaultExtractIconInitImpl.lpVtbl = &IconExtractionDefaultExtractIconInitVtbl; + s->extractIconAImpl.lpVtbl = &IconExtractionExtractIconAVtbl; + s->extractIconWImpl.lpVtbl = &IconExtractionExtractIconWVtbl; + s->persistFileImpl.lpVtbl = &IconExtractionPersistFileVtbl; + s->ref = 1; + *ppv = &s->defaultExtractIconInitImpl; + + return S_OK; +} Propchange: trunk/reactos/dll/win32/shell32/extracticon.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Tue Oct 23 13:01:39 2007 @@ -4,7 +4,6 @@ <include base="shell32">.</include> <include base="recyclebin">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x600</define> @@ -39,6 +38,7 @@ <file>dialogs.c</file> <file>dragdrophelper.c</file> <file>enumidlist.c</file> + <file>extracticon.c</file> <file>folders.c</file> <file>iconcache.c</file> <file>pidl.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec Tue Oct 23 13:01:39 2007 @@ -320,6 +320,8 @@ @ stdcall SHBrowseForFolderW(ptr) @ stdcall SHChangeNotify (long long ptr ptr) @ stub SHChangeNotifySuspendResume +@ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) +@ stdcall SHCreateDefaultExtractIcon(ptr ptr) @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @ stub SHCreateProcessAsUserW

16 years, 12 months

← Newer
1
...
18
19
20
21
22
23
24
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007