Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[gedmurphy] 68267: [DEVMGR] - When disabling a device, show the user a message box to confirm before disabling - Some code cleanup

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 25 20:34:57 2015 New Revision: 68267 URL: http://svn.reactos.org/svn/reactos?rev=68267&view=rev Log: [DEVMGR] - When disabling a device, show the user a message box to confirm before disabling - Some code cleanup Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Thu Jun 25 20:34:57 2015 @@ -340,6 +340,8 @@ if (Enable) { + // config specific enablling first, then global enabling. + // The global appears to be the one that starts the device pcp.Scope = DICS_FLAG_GLOBAL; if (SetupDiSetClassInstallParamsW(m_hDevInfo, &m_DevinfoData, Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Thu Jun 25 20:34:57 2015 @@ -311,6 +311,21 @@ CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); if (Node) { + if (Enable == false) + { + CAtlStringW str; + if (str.LoadStringW(g_hInstance, IDS_CONFIRM_DISABLE)) + { + if (MessageBoxW(m_hMainWnd, + str, + Node->GetDisplayName(), + MB_YESNO | MB_ICONWARNING | MB_DEFBUTTON2) != IDYES) + { + return false; + } + } + } + if (Node->EnableDevice(Enable, NeedsReboot)) { Refresh(m_ViewType, true, true); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Thu Jun 25 20:34:57 2015 @@ -49,19 +49,6 @@ }; - - - -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 -#define IDS_HINT_ADD 20007 -#define IDS_HINT_ABOUT 20008 -#define IDS_HINT_EXIT 20009 // system menu hints static const MENU_HINT SystemMenuHintTable[] = Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] Thu Jun 25 20:34:57 2015 @@ -1,4 +1,6 @@ #define IDC_STATIC -1 + +#define IDS_APPNAME 10 #define IDI_MAIN_ICON 20 #define IDB_ROOT_IMAGE 21 @@ -29,31 +31,27 @@ #define IDC_RESBYCONN 203 #define IDC_SHOWHIDDEN 204 -/* about box info */ -#define IDD_ABOUTBOX 300 -#define IDC_LICENSE_EDIT 301 -#define IDS_APPNAME 302 -#define IDS_LICENSE 303 /* tooltips */ -#define IDS_TOOLTIP_PROPERTIES 6000 -#define IDS_TOOLTIP_SCAN 6001 -#define IDS_TOOLTIP_ENABLE 6002 -#define IDS_TOOLTIP_DIABLE 6003 -#define IDS_TOOLTIP_UPDATE 6004 -#define IDS_TOOLTIP_UNINSTALL 6005 +#define IDS_TOOLTIP_PROPERTIES 300 +#define IDS_TOOLTIP_SCAN 301 +#define IDS_TOOLTIP_ENABLE 302 +#define IDS_TOOLTIP_DIABLE 303 +#define IDS_TOOLTIP_UPDATE 304 +#define IDS_TOOLTIP_UNINSTALL 305 - +/* General strings */ +#define IDS_CONFIRM_DISABLE 400 /* menu hints */ -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 -#define IDS_HINT_ADD 20007 +#define IDS_HINT_BLANK 1000 +#define IDS_HINT_PROPERTIES 1001 +#define IDS_HINT_SCAN 1002 +#define IDS_HINT_ENABLE 1003 +#define IDS_HINT_DISABLE 1004 +#define IDS_HINT_UPDATE 1005 +#define IDS_HINT_UNINSTALL 1006 +#define IDS_HINT_ADD 1007 #define IDS_HINT_ABOUT 20008 #define IDS_HINT_EXIT 20009 Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] Thu Jun 25 20:34:57 2015 @@ -49,12 +49,12 @@ END END -#define IDS_HINT_PROPERTIES 20001 -#define IDS_HINT_SCAN 20002 -#define IDS_HINT_ENABLE 20003 -#define IDS_HINT_DISABLE 20004 -#define IDS_HINT_UPDATE 20005 -#define IDS_HINT_UNINSTALL 20006 + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONFIRM_DISABLE "Disabling this device will cause it to stop functioning.\r\nDo you really want to disable it?" +END STRINGTABLE DISCARDABLE BEGIN

9 years, 6 months

[ekohl] 68266: [USETUP] Remove obsolete restriction info.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 25 20:20:21 2015 New Revision: 68266 URL: http://svn.reactos.org/svn/reactos?rev=68266&view=rev Log: [USETUP] Remove obsolete restriction info. Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -166,42 +166,12 @@ { 8, 13, - "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ à ¡®â¨ á ¯®¢¥ç¥ ®â ¥¤¨ ¤ï« ¤¨áª.", + "- áâà®©¢ çêâ ¯®¤¤êà¦ á ¬® FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ ¨§âà¨e ¯êà¢¨çe ¤ï«,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " ª® ¤¨áª ¨¬ à §è¨à¥ ¤ï«." , - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- áâà®©¢ çêâ ¥ ¬®¦¥ ¤ ¨§âà¨¥ ¯êà¢¨ï à §è¨à¥ ¤ï« ®â ¤¨áª , ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " ª® ¤¨áª ¨¬ ¨ ¤àã£¨ à §è¨à¥¨ ¤ï«®¢¥.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- áâà®©¢ çêâ ¯®¤¤êà¦ á ¬® FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- à®¢¥àª â ä ©«®¢ â ãà¥¤¡ ¢á¥ ®é¥ ¥ ¥ £®â®¢ .", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,42 +157,12 @@ { 8, 13, - "- Setup can not handle more than one primary partition per disk.", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup can not delete a primary partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " as long as extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -165,42 +165,12 @@ { 8, 13, - "- Instalace nedok §e zpracovat v¡ce ne§ jeden prim rn¡ odd¡l na disku.", + "- Instalace podporuje pouze souborovì systm FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Instalace nedok §e vymazat prim rn¡ odd¡l z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " pokud na tomto disku existuj¡ rozç¡ýen odd¡ly.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Instalace nedok §e vymazat prvn¡ rozç¡ýenì odd¡l z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " pokud na tomto disku existuj¡ dalç¡ rozç¡ýen odd¡ly.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Instalace podporuje pouze souborovì systm FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontroly souborovìch systm zat¡m nejsou implementov ny.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - "- Nur primre Festplattenpartitionen knnen verwaltet werden.", + "- Es werden nur FAT-Dateisysteme untersttzt.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Eine primre Partition kann nicht gelscht werden,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " solange erweiterte Partitionen auf der Festplatte existieren.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Die jeweils erste erweiterte Partition kann nicht gelscht werden,", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " solange weitere erweiterte Partitionen auf der Festplatte existieren.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Es werden nur FAT-Dateisysteme untersttzt.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Die Dateisystemberprfung ist noch nicht implementiert.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,48 +158,12 @@ { 8, 12, - "- ¡«á©«© £§¦¨å ¤ ® ¨ ©«å §á¤à §æ â¤ §¨à«ç¦¤", + "- ¡«á©«© ¬§¦©«¨å £æ¤¦ FAT ©¬©«ã£« ¨®åà¤.", TEXT_STYLE_NORMAL }, { 8, 13, - " £â¨ ©£ ¤á å©¡¦.", - TEXT_STYLE_NORMAL - }, - { - 8, - 14, - "- ¡«á©«© £§¦¨å ¤ ¨á¯ â¤ §¨à«ç¦¤ £â¨ ©£ ", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " §æ â¤ å©¡¦ æ©¦¤ ¬§á¨®¦¬¤ ¡««£â¤ £¨å©£« ©«¦ å©¡¦ ¬«æ.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- ¡«á©© £§¦¨å ¤ ¨á¯ «¦ §¨é«¦ ¡««£â¤¦ £â¨ ©£ ¤æª ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " å©¡¦¬ æ©¦¤ ¬§á¨®¦¬¤ ¡ á¢¢ ¡««£â¤ £¨å©£« ©«¦ å©¡¦ ¬«æ.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- ¡«á©«© ¬§¦©«¨å £æ¤¦ FAT ©¬©«ã£« ¨®åà¤.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- ¤ ¬§¦©«¨å« ¡æ£ â¢®¦ª ©¢£á«à¤ ©« ©¬«ã£« ¨®åà¤.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,42 +157,12 @@ { 8, 13, - "- Setup can not handle more than one primary partition per disk.", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup can not delete a primary partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " as long as extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,48 +158,18 @@ { 8, 13, - "- El instalador no soporta m s de una partici¢n primaria por disco.", + "- El instalador soporta solamente el sistema de archivos FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- El instalador no puede eliminar una partici¢n primaria de un disco", + "- El comprobador de integridad del sistema de archivos no est a£n", TEXT_STYLE_NORMAL }, { 8, 15, - " si hay particiones extendidas en el mismo.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- El instalador no puede eliminar la primer partici¢n extendida", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " si existen otras particiones extendidas en el disco.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- El instalador soporta solamente el sistema de archivos FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - "- El comprobador de integridad del sistema de archivos no est a£n", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, " implementado.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,42 +157,12 @@ { 8, 13, - "- Sihtkettal väib olla ainult ks peamine partitsioon.", + "- Toetatud on ainult FAT failissteem.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Peamist partitsiooni ei saa kettalt kustutada", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " kui kettal on ka laiendatud partitsioone.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Esimest laiendatud partitsiooni ei saa kettalt kustutada", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " kui kettal on ka teisi laiendatud partitsioone.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Toetatud on ainult FAT failissteem.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Failissteemi kontrollimist veel ei tehta.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -164,42 +164,12 @@ { 8, 13, - "- L'installation ne peut grer plus d'une partition primaire par disque.", + "- L'installation supporte uniquement le systme de fichiers FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- L'installation ne peut effacer une partition primaire d'un disque", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " tant que des partitions secondaires existent sur ce disque.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- L'installation ne peut effacer la premire partition secondaire", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " tant que des autres partitions secondaires existent sur ce disque.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- L'installation supporte uniquement le systme de fichiers FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Les vrifications de systme de fichers ne sont pas implmentes.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - ". -", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - " -", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - ". ", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -163,38 +163,14 @@ }, { 8, - 13, - "- Il setup non gestisce pi di una partizione primaria per disco.", + 13, + "- Il setup supporta solamente il sistema FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Il setup non pu eliminare una partizione primaria", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " se ci sono partizioni estese nel disco fisso.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Il setup non pu eliminare la prima partizione estesa", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " se ci sono altre partizioni estese nel disco fisso.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Il setup supporta solamente il sistema FAT.", + "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - "- ¾¯Ä±¯ÌßÊ 1ÂÉ ÃÞ¨½¸Æ Â· 1Â²¼Þ®³É Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ±Â¶³ºÄ¶Þ ÃÞ·Ï¾Ý¡", + "- ¾¯Ä±¯ÌßÊ FAT Ì§²Ù¼½ÃÑ ÉÐ »Îß°Ä ¼Ï½¡", TEXT_STYLE_NORMAL }, { 8, 14, - "- ¶¸Á®³ Êß°Ã¨¼®Ý¶Þ ºÉ ÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ²½Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ÃÞ¨½¸¶× »¸¼Þ® ÃÞ·Ï¾Ý¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- ÀÉ ¶¸Á®³ Ø®³²·¶Þ ºÉ ÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ² ¼Ã²Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " »²¼®É ¶¸Á®³ Ø®³²·¦ ÃÞ¨½¸¶× »¸¼Þ® ÃÞ·Ï¾Ý¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- ¾¯Ä±¯ÌßÊ FAT Ì§²Ù¼½ÃÑ ÉÐ »Îß°Ä ¼Ï½¡", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Ì§²Ù¼½ÃÑÉ Áª¯¸·É³Ê ÏÀÞ ¼Þ¯¿³ »ÚÃ ²Ï¾Ý¡", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -167,42 +167,12 @@ { 8, 13, - "- Setup can not handle more than one primary partition per disk.", + "- Setup supports FAT file systems only.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup can not delete a primary partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " as long as extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup can not delete the first extended partition from a disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " as long as other extended partitions exist on this disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup supports FAT file systems only.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- File system checks are not implemented yet.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -179,48 +179,12 @@ { 8, 13, - "\x07 Setup kan niet meer dan 1 primaire partitie per vaste schijf aan.", + "\x07 Setup ondersteunt alleen FAT bestandssystemen.", TEXT_STYLE_NORMAL }, { 8, 14, - "\x07 Setup kan geen primaire partitie van een schijf verwijderen", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " zo lang er nog uitgebreide partities bestaan op deze schijf.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "\x07 Setup kan de eerste uitgebreide partitie van een schijf niet", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " verwijderen zolang er nog andere uitgebreide partities", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - " op deze schijf bestaan.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - "\x07 Setup ondersteunt alleen FAT bestandssystemen.", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, "\x07 Bestandssysteemcontrole is nog niet ge\x8Bmplementeerd.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -167,42 +167,12 @@ { 8, 13, - "- Instalator obsuguje jedn¥ partycj© Podstawow¥ na dysku.", + "- Instalator obsuguje jedynie system plik¢w FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Instalator nie mo¾e skasowa partycji podstawowej z dysku", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " o ile nadal znajduje si© na nim tak¾e partycja Rozszerzona.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Instalator nie mo¾e skasowa pierwszej partycji Rozszerzonej z dysku", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " o ile nadal znajduj¥ si© na nim kolejne partycje Rozszerzone.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Instalator obsuguje jedynie system plik¢w FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Brakuje sprawdzenia poprawnoci systemu plik¢w.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -157,49 +157,19 @@ }, { 8, + 12, + "- O instalador suporta somente o sistema de arquivos FAT.", + TEXT_STYLE_NORMAL + }, + { + 8, 13, - "- O instalador nÆo suporta mais de uma partiÆo prim ria por disco.", + "- O verificador de integridade de sistema de arquivos ainda nÆo est ", TEXT_STYLE_NORMAL }, { 8, 14, - "- O instalador nÆo pode excluir uma partiÆo prim ria de um disco", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " se houverem partiäes estendidas no mesmo disco.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- O instalador nÆo pode remover a primeira partiÆo estendida de um", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " disco se existirem outras partiäes estendidas no mesmo disco.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- O instalador suporta somente o sistema de arquivos FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - "- O verificador de integridade de sistema de arquivos ainda nÆo est ", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, " implementado.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -177,60 +177,24 @@ { 8, 14, - "- Programul curent de instalare nu e capabil de mai mult", + "- Programul curent de instalare poate opera doar cu sisteme", TEXT_STYLE_NORMAL }, { 8, 15, - " de o partiîie per disc.", + " de fiiere FAT.", TEXT_STYLE_NORMAL }, { 8, 16, - "- Programul curent de instalare nu poate terge o partiîie", + "- VerificÇrile de integritate pentru fiiere nu sunt", TEXT_STYLE_NORMAL }, { 8, 17, - " primarÇ ct timp existÇ partiîii extinse.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Programul curent de instalare nu poate terge prima partiîie", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, - " extinsÇ, ct timp existÇ alte partiîii extinse.", - TEXT_STYLE_NORMAL - }, - { - 8, - 20, - "- Programul curent de instalare poate opera doar cu sisteme", - TEXT_STYLE_NORMAL - }, - { - 8, - 21, - " de fiiere FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 22, - "- VerificÇrile de integritate pentru fiiere nu sunt", - TEXT_STYLE_NORMAL - }, - { - 8, - 23, " ncÇ implementate.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -158,42 +158,12 @@ { 8, 13, - "- áâ ®¢ª ¢®§¬®¦ â®«ìª® ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- à¨ ãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï â®«ìª® ä ©«®¢ ï á¨áâ¥¬ FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢¨çë© à §¤¥« ¤¨áª ", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " ¯®ª ¨¬¥¥âáï à áè¨à¥ë© à §¤¥«.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- à¨ ãáâ ®¢ª¥ ¥«ì§ï ã¤ «¨âì ¯¥à¢ë© à áè¨à¥ë© à §¤¥« á ¤¨áª ", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " ¯®ª áãé¥áâ¢ãîâ ¤àã£¨¥ à áè¨à¥ë¥ à §¤¥«ë.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- à¨ ãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï â®«ìª® ä ©«®¢ ï á¨áâ¥¬ FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- à®¢¥àª ä ©«®¢®© á¨áâ¥¬ë ¥ ®áãé¥áâ¢«ï¥âáï.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -165,42 +165,12 @@ { 8, 13, - "- Inçtal tor nepracuje s viac ako 1 prim rnou oblasou na 1 disku.", + "- Inçtal tor podporuje iba s£borovì systm FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Inçtal tor nevie odstr ni prim rnu oblas z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " pokia existuj£ rozç¡ren oblasti na disku.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Inçtal tor nevie odstr ni prv£ rozç¡ren£ oblas z disku,", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " pokia existuj£ in rozç¡ren oblasti na disku.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Inçtal tor podporuje iba s£borovì systm FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontrola s£borovho systmu zatia nie je implementovan .", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -161,42 +161,12 @@ { 8, 13, - "- Instalimi nuk prballoje m shum se nj particion primare pr disk.", + "- Instalimi suporton vetm dokumentat FAT t sistemit.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Instalimi nuk mund t fshij nj particion primare nga hard disku", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " pr aq koh sa nj particion i zgjatur ekziston n kt hard disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Instalimi nuk mund t fshij particionin e pare nga nj hard disk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " pr aq koh sa particione t tjera t zgjatura ekzistojne n hard disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Instalimi suporton vetm dokumentat FAT t sistemit.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontrollet e dokumentave t sistemit nuk jan implementuar ende.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -164,42 +164,12 @@ { 8, 13, - "- Setup kan ej hantera mer n 1 primr partition per hrddisk.", + "- Setup stder endast filsystem av typen FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup kan ej radera en primr partition frn en hrddisk", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " om utkade partitioner existerar p hrddisken.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Setup kan ej radera den frsta utkade partitionen frn en hrddisk", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " om andra utkade partitioner existerar p hrddisken.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Setup stder endast filsystem av typen FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Kontrollering av hrddiskens filsystem stds (nnu) ej.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -161,42 +161,12 @@ { 8, 13, - "- Kur, bir diskte birden ok ana blm ynetemez.", + "- Kur, yalnzca FAT ktk dizgelerini destekler.", TEXT_STYLE_NORMAL }, { 8, 14, - "- Kur, bir diskte geniletilmi blmler oldu§u srece", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " o diskten bir ana blm silemez.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- Kur, bir diskte baka geniletilmi blmlerin oldu§u srece", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " o diskten ilk geniletilmi blm silemez.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- Kur, yalnzca FAT ktk dizgelerini destekler.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- Ktk dizgesi denetimi daha bitirilmemitir.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Thu Jun 25 20:20:21 2015 @@ -163,42 +163,12 @@ { 8, 13, - "- áâ ®¢«î¢ ç ¥ ¯i¤âà¨¬ãó ¡i«ìè¥ i¦ ®¤¨ ¯¥à¢¨¨© à®§¤i« ¤¨áª.", + "- áâ ®¢«î¢ ç ¯i¤âà¨¬ãó «¨è¥ ä ©«®¢ã á¨áâ¥¬ã FAT.", TEXT_STYLE_NORMAL }, { 8, 14, - "- áâ ®¢«î¢ ç ¥ ¬®¦¥ ¢¨¤ «¨â¨ ¯¥à¢¨¨© à®§¤i« § ¤¨áªã", - TEXT_STYLE_NORMAL - }, - { - 8, - 15, - " ¯®ª¨ ¤¨áªã ï¢¨© à®§è¨à¥¨© à®§¤i«.", - TEXT_STYLE_NORMAL - }, - { - 8, - 16, - "- áâ ®¢«î¢ ç ¥ ¬®¦¥ ¢¨¤ «¨â¨ ¯¥àè¨© à®§è¨à¥¨© à®§¤i« § ¤¨áªã", - TEXT_STYLE_NORMAL - }, - { - 8, - 17, - " ¯®ª¨ ¤¨áªã iáãîâì ièi à®§è¨à¥i à®§¤i«¨.", - TEXT_STYLE_NORMAL - }, - { - 8, - 18, - "- áâ ®¢«î¢ ç ¯i¤âà¨¬ãó «¨è¥ ä ©«®¢ã á¨áâ¥¬ã FAT.", - TEXT_STYLE_NORMAL - }, - { - 8, - 19, "- ¥à¥¢iàª ä ©«®¢®õ á¨áâ¥¬¨ é¥ ¥ ¢¯à®¢ ¤¦¥ .", TEXT_STYLE_NORMAL },

9 years, 6 months

[gedmurphy] 68265: [DEVMGR] - Add basic functionality for enabling and disabling devices. Make it accessible via the toolbar and main menu - Implement checking whether a device has a problem and if...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 25 18:59:23 2015 New Revision: 68265 URL: http://svn.reactos.org/svn/reactos?rev=68265&view=rev Log: [DEVMGR] - Add basic functionality for enabling and disabling devices. Make it accessible via the toolbar and main menu - Implement checking whether a device has a problem and if a device can be uninstalled - Implement getting, setting and removing device flags in the install params - Fix creating and destroying the (currently empty) context menu Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp [iso-8859-1] Thu Jun 25 18:59:23 2015 @@ -22,10 +22,12 @@ m_ProblemNumber(0), m_OverlayImage(0) { + ZeroMemory(&m_DevinfoData, sizeof(SP_DEVINFO_DATA)); } CDeviceNode::~CDeviceNode() { + SetupDiDestroyDeviceInfoList(m_hDevInfo); } bool @@ -36,6 +38,7 @@ CONFIGRET cr; // ATLASSERT(m_DeviceId == NULL); + // Get the length of the device id string cr = CM_Get_Device_ID_Size(&ulLength, m_DevInst, 0); @@ -64,6 +67,23 @@ if (m_DeviceId == NULL) return false; + //SP_DEVINFO_DATA DevinfoData; + m_hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, + NULL, + NULL, + NULL); + if (m_hDevInfo != INVALID_HANDLE_VALUE) + { + m_DevinfoData.cbSize = sizeof(SP_DEVINFO_DATA); + SetupDiOpenDeviceInfoW(m_hDevInfo, + m_DeviceId, + NULL, + 0, + &m_DevinfoData); + } + + + // Get the current status of the device cr = CM_Get_DevNode_Status_Ex(&m_Status, &m_ProblemNumber, @@ -145,6 +165,22 @@ return (cr == CR_SUCCESS ? true : false); } +bool +CDeviceNode::HasProblem() +{ + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_Status & (DN_HAS_PROBLEM | DN_PRIVATE_PROBLEM)) != 0); + } + + return false; +} bool CDeviceNode::IsHidden() @@ -230,4 +266,155 @@ } return false; -} +} + +bool +CDeviceNode::CanUninstall() +{ + CONFIGRET cr; + cr = CM_Get_DevNode_Status_Ex(&m_Status, + &m_ProblemNumber, + m_DevInst, + 0, + NULL); + if (cr == CR_SUCCESS) + { + return ((m_Status & DN_DISABLEABLE) != 0 && + (m_Status & DN_ROOT_ENUMERATED) == 0); + } + + return false; +} + +bool +CDeviceNode::EnableDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ) +{ + bool Ret = false; + bool Canceled = false; + + SetFlags(DI_NODI_DEFAULTACTION, 0); + + SP_PROPCHANGE_PARAMS pcp; + pcp.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + pcp.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE; + pcp.StateChange = (Enable ? DICS_ENABLE : DICS_DISABLE); + pcp.HwProfile = 0; + + + // check both scopes to make sure we can make the change + for (int i = 0; i < 2; i++) + { + // Check globally first, then check config specific + pcp.Scope = (i == 0) ? DICS_FLAG_GLOBAL : DICS_FLAG_CONFIGSPECIFIC; + + if (SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, + m_hDevInfo, + &m_DevinfoData); + } + + if (GetLastError() == ERROR_CANCELLED) + { + Canceled = true; + break; + } + } + + if (Canceled == false) + { + pcp.Scope = DICS_FLAG_CONFIGSPECIFIC; + if (SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiChangeState(m_hDevInfo, &m_DevinfoData); + } + + if (Enable) + { + pcp.Scope = DICS_FLAG_GLOBAL; + if (SetupDiSetClassInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &pcp.ClassInstallHeader, + sizeof(SP_PROPCHANGE_PARAMS))) + { + SetupDiChangeState(m_hDevInfo, &m_DevinfoData); + } + } + + SetFlags(DI_PROPERTIES_CHANGE, 0); + + NeedsReboot = ((GetFlags() & (DI_NEEDRESTART | DI_NEEDREBOOT)) != 0); + } + + RemoveFlags(DI_NODI_DEFAULTACTION, 0); + + return true; +} + +DWORD +CDeviceNode::GetFlags( + ) +{ + SP_DEVINSTALL_PARAMS DevInstallParams; + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams)) + { + return DevInstallParams.Flags; + } + return 0; +} + +bool +CDeviceNode::SetFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ) +{ + SP_DEVINSTALL_PARAMS DevInstallParams; + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams)) + { + DevInstallParams.Flags |= Flags; + DevInstallParams.FlagsEx |= FlagsEx; + return SetupDiSetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams); + } + return false; +} + +bool +CDeviceNode::RemoveFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ) +{ + SP_DEVINSTALL_PARAMS DevInstallParams; + DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS); + if (SetupDiGetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams)) + { + DevInstallParams.Flags &= ~Flags; + DevInstallParams.FlagsEx &= ~FlagsEx; + return SetupDiSetDeviceInstallParamsW(m_hDevInfo, + &m_DevinfoData, + &DevInstallParams); + } + return false; +} + + Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h [iso-8859-1] Thu Jun 25 18:59:23 2015 @@ -4,6 +4,8 @@ class CDeviceNode : public CNode { private: + SP_DEVINFO_DATA m_DevinfoData; + HDEVINFO m_hDevInfo; DEVINST m_DevInst; ULONG m_Status; ULONG m_ProblemNumber; @@ -22,13 +24,31 @@ DEVINST GetDeviceInst() { return m_DevInst; } int GetOverlayImage() { return m_OverlayImage; } - bool HasProblem() { return !!(m_ProblemNumber); } + bool HasProblem(); bool IsHidden(); bool CanDisable(); bool IsDisabled(); bool IsStarted(); bool IsInstalled(); - bool CanInstall() { return TRUE; } // unimplemented - bool CanUninstall() { return TRUE; } // unimplemented + bool CanUninstall(); + + bool EnableDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ); + +private: + bool SetFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ); + + bool RemoveFlags( + _In_ DWORD Flags, + _In_ DWORD FlagsEx + ); + + DWORD GetFlags( + ); }; Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Thu Jun 25 18:59:23 2015 @@ -92,8 +92,7 @@ } // Create the context menu and make properties the default item - m_hMenu = LoadMenuW(g_hInstance, MAKEINTRESOURCEW(IDR_POPUP)); - m_hContextMenu = GetSubMenu(m_hMenu, 0); + m_hContextMenu = CreatePopupMenu(); SetMenuDefaultItem(m_hContextMenu, IDC_PROPERTIES, FALSE); return !!(m_hTreeView); @@ -110,7 +109,7 @@ ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA)); } - DestroyMenu(m_hMenu); + DestroyMenu(m_hContextMenu); return true; } @@ -167,6 +166,18 @@ ScreenToClient(m_hTreeView, &pt) && PtInRect(&rc, pt)) { + + CNode *Node = GetSelectedNode(); + if (Node && Node->HasProperties()) + { + + } + + + + + + INT xPos = GET_X_LPARAM(lParam); INT yPos = GET_Y_LPARAM(lParam); @@ -287,6 +298,24 @@ if (Node) { return Node->CanDisable(); + } + return false; +} + +bool +CDeviceView::EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ) +{ + CDeviceNode *Node = dynamic_cast<CDeviceNode *>(GetSelectedNode()); + if (Node) + { + if (Node->EnableDevice(Enable, NeedsReboot)) + { + Refresh(m_ViewType, true, true); + return true; + } } return false; } @@ -362,10 +391,10 @@ 0); if (cr != CR_SUCCESS) return false; - // Check for devices without a class + // Check if this is the unknown class if (IsEqualGUID(*ClassGuid, GUID_DEVCLASS_UNKNOWN)) { - // Get device info for all devices for all classes + // Get device info for all devices *hDevInfo = SetupDiGetClassDevsW(NULL, NULL, NULL, @@ -378,7 +407,6 @@ NULL, NULL, DIGCF_PRESENT); - } return (hDevInfo != INVALID_HANDLE_VALUE); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Thu Jun 25 18:59:23 2015 @@ -78,6 +78,12 @@ bool IsDisabled( _In_ LPTV_ITEMW TvItem ); + + bool EnableSelectedDevice( + _In_ bool Enable, + _Out_ bool &NeedsReboot + ); + bool SelDeviceIsStarted(); bool SelDeviceIsInstalled(); Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Thu Jun 25 18:59:23 2015 @@ -507,7 +507,7 @@ { LPTOOLTIPTEXT lpttt = (LPTOOLTIPTEXT)lParam; - UINT_PTR idButton = (UINT)lpttt->hdr.idFrom; + UINT_PTR idButton = lpttt->hdr.idFrom; switch (idButton) { case IDC_PROPERTIES: @@ -568,13 +568,19 @@ case IDC_ENABLE_DRV: { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Enable Driver", MB_OK); + bool NeedsReboot; + if (m_DeviceView->EnableSelectedDevice(true, NeedsReboot) && + NeedsReboot) + { + MessageBox(m_hMainWnd, L"Rebooting", L"Enable", MB_OK); + } break; } case IDC_DISABLE_DRV: { - MessageBox(m_hMainWnd, L"Not yet implemented", L"Disable Driver", MB_OK); + bool NeedsReboot; + m_DeviceView->EnableSelectedDevice(false, NeedsReboot); break; }

9 years, 6 months

[cfinck] 68264: [LOCALSPL] Implement LocalEnumJobs the easy way by using the new Skiplist function LookupNodeByIndexSkiplist and calling _LocalGetJobLevelX for each job. This required changes in _L...

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jun 25 15:27:38 2015 New Revision: 68264 URL: http://svn.reactos.org/svn/reactos?rev=68264&view=rev Log: [LOCALSPL] Implement LocalEnumJobs the easy way by using the new Skiplist function LookupNodeByIndexSkiplist and calling _LocalGetJobLevelX for each job. This required changes in _LocalGetJobLevelX, so that the strings are now copied in reverse to the end of the buffer while the structure is copied to the start. By preserving the pointers after each call, the function can be called multiple times. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Thu Jun 25 15:27:38 2015 @@ -359,7 +359,7 @@ static DWORD -_LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) +_LocalGetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE* ppStart, PBYTE* ppEnd, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); @@ -369,58 +369,57 @@ DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); DWORD dwErrorCode; JOB_INFO_1W JobInfo1 = { 0 }; - PBYTE pString; // A Status Message is optional. if (pJob->pwszStatus) cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; + *pcbNeeded += sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; goto Cleanup; } - // Put the strings right after the JOB_INFO_1W structure. - pString = pOutput + sizeof(JOB_INFO_1W); - - JobInfo1.pDatatype = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDatatype, cbDatatype); - pString += cbDatatype; - - JobInfo1.pDocument = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDocumentName, cbDocumentName); - pString += cbDocumentName; - - JobInfo1.pMachineName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszMachineName, cbMachineName); - pString += cbMachineName; - - JobInfo1.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); - pString += cbPrinterName; + // Put the strings at the end of the buffer. + *ppEnd -= cbDatatype; + JobInfo1.pDatatype = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDatatype, cbDatatype); + + *ppEnd -= cbDocumentName; + JobInfo1.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + + *ppEnd -= cbMachineName; + JobInfo1.pMachineName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); + + *ppEnd -= cbPrinterName; + JobInfo1.pPrinterName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); if (cbStatus) { - JobInfo1.pStatus = (PWSTR)pString; - CopyMemory(pString, pJob->pwszStatus, cbStatus); - pString += cbStatus; - } - - JobInfo1.pUserName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszUserName, cbUserName); - pString += cbUserName; - - // Fill the structure and copy it as well. + *ppEnd -= cbStatus; + JobInfo1.pStatus = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); + } + + *ppEnd -= cbUserName; + JobInfo1.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); + + // Fill the rest of the structure. JobInfo1.JobId = pJob->dwJobID; JobInfo1.Priority = pJob->dwPriority; JobInfo1.Status = pJob->dwStatus; JobInfo1.TotalPages = pJob->dwTotalPages; CopyMemory(&JobInfo1.Submitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); - CopyMemory(pOutput, &JobInfo1, sizeof(JOB_INFO_1W)); - + + // Finally copy the structure to the output pointer. + CopyMemory(*ppStart, &JobInfo1, sizeof(JOB_INFO_1W)); + *ppStart += sizeof(JOB_INFO_1W); dwErrorCode = ERROR_SUCCESS; Cleanup: @@ -428,7 +427,7 @@ } static DWORD -_LocalGetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE pOutput, DWORD cbBuf, PDWORD pcbNeeded) +_LocalGetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PBYTE* ppStart, PBYTE* ppEnd, DWORD cbBuf, PDWORD pcbNeeded) { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); @@ -444,7 +443,6 @@ FILETIME ftNow; FILETIME ftSubmitted; JOB_INFO_2W JobInfo2 = { 0 }; - PBYTE pString; ULARGE_INTEGER uliNow; ULARGE_INTEGER uliSubmitted; @@ -456,65 +454,63 @@ cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; + *pcbNeeded += sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; goto Cleanup; } - // Put the strings right after the JOB_INFO_2W structure. - pString = pOutput + sizeof(JOB_INFO_2W); - - JobInfo2.pDatatype = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDatatype, cbDatatype); - pString += cbDatatype; - - JobInfo2.pDevMode = (PDEVMODEW)pString; - CopyMemory(pString, &pJob->DevMode, sizeof(DEVMODEW)); - pString += sizeof(DEVMODEW); - - JobInfo2.pDocument = (PWSTR)pString; - CopyMemory(pString, pJob->pwszDocumentName, cbDocumentName); - pString += cbDocumentName; - - JobInfo2.pDriverName = (PWSTR)pString; - CopyMemory(pString, pJob->pPrinter->pwszPrinterDriver, cbDriverName); - pString += cbDriverName; - - JobInfo2.pMachineName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszMachineName, cbMachineName); - pString += cbMachineName; - - JobInfo2.pNotifyName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszNotifyName, cbNotifyName); - pString += cbNotifyName; - - JobInfo2.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); - pString += cbPrinterName; - - JobInfo2.pPrintProcessor = (PWSTR)pString; - CopyMemory(pString, pJob->pPrintProcessor->pwszName, cbPrintProcessor); - pString += cbPrintProcessor; + // Put the strings at the end of the buffer. + *ppEnd -= cbDatatype; + JobInfo2.pDatatype = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDatatype, cbDatatype); + + *ppEnd -= sizeof(DEVMODEW); + JobInfo2.pDevMode = (PDEVMODEW)*ppEnd; + CopyMemory(*ppEnd, &pJob->DevMode, sizeof(DEVMODEW)); + + *ppEnd -= cbDocumentName; + JobInfo2.pDocument = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszDocumentName, cbDocumentName); + + *ppEnd -= cbDriverName; + JobInfo2.pDriverName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterDriver, cbDriverName); + + *ppEnd -= cbMachineName; + JobInfo2.pMachineName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszMachineName, cbMachineName); + + *ppEnd -= cbNotifyName; + JobInfo2.pNotifyName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszNotifyName, cbNotifyName); + + *ppEnd -= cbPrinterName; + JobInfo2.pPrinterName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrinter->pwszPrinterName, cbPrinterName); + + *ppEnd -= cbPrintProcessor; + JobInfo2.pPrintProcessor = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pPrintProcessor->pwszName, cbPrintProcessor); if (cbPrintProcessorParameters) { - JobInfo2.pParameters = (PWSTR)pString; - CopyMemory(pString, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); - pString += cbPrintProcessorParameters; + *ppEnd -= cbPrintProcessorParameters; + JobInfo2.pParameters = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); } if (cbStatus) { - JobInfo2.pStatus = (PWSTR)pString; - CopyMemory(pString, pJob->pwszStatus, cbStatus); - pString += cbStatus; - } - - JobInfo2.pUserName = (PWSTR)pString; - CopyMemory(pString, pJob->pwszUserName, cbUserName); - pString += cbUserName; + *ppEnd -= cbStatus; + JobInfo2.pStatus = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszStatus, cbStatus); + } + + *ppEnd -= cbUserName; + JobInfo2.pUserName = (PWSTR)*ppEnd; + CopyMemory(*ppEnd, pJob->pwszUserName, cbUserName); // Time in JOB_INFO_2W is the number of milliseconds elapsed since the job was submitted. Calculate this time. if (!SystemTimeToFileTime(&pJob->stSubmitted, &ftSubmitted)) @@ -553,7 +549,8 @@ CopyMemory(&JobInfo2.Submitted, &pJob->stSubmitted, sizeof(SYSTEMTIME)); // Finally copy the structure to the output pointer. - CopyMemory(pOutput, &JobInfo2, sizeof(JOB_INFO_2W)); + CopyMemory(*ppStart, &JobInfo2, sizeof(JOB_INFO_2W)); + *ppStart += sizeof(JOB_INFO_2W); dwErrorCode = ERROR_SUCCESS; Cleanup: @@ -561,9 +558,10 @@ } BOOL WINAPI -LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) +LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded) { DWORD dwErrorCode; + PBYTE pEnd = &pStart[cbBuf]; PLOCAL_HANDLE pHandle; PLOCAL_JOB pJob; PLOCAL_PRINTER_HANDLE pPrinterHandle; @@ -586,11 +584,14 @@ goto Cleanup; } + // Begin counting. + *pcbNeeded = 0; + // The function behaves differently for each level. if (Level == 1) - dwErrorCode = _LocalGetJobLevel1(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + dwErrorCode = _LocalGetJobLevel1(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); else if (Level == 2) - dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); + dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); else dwErrorCode = ERROR_INVALID_LEVEL; @@ -871,6 +872,99 @@ if (Command) { // TODO + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + DWORD dwErrorCode; + PBYTE pEnd = &pStart[cbBuf]; + PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; + PSKIPLIST_NODE pFirstJobNode; + PSKIPLIST_NODE pNode; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != Printer) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; + + // Check the level. + if (Level > 2) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // Lookup the node of the first job requested by the caller in the Printer's Job List. + pFirstJobNode = LookupNodeByIndexSkiplist(&pPrinterHandle->pPrinter->JobList, FirstJob); + + // Count the required buffer size and the number of jobs. + pNode = pFirstJobNode; + + while (*pcReturned < NoJobs && pNode) + { + pJob = (PLOCAL_JOB)pNode->Element; + + // The function behaves differently for each level. + if (Level == 1) + _LocalGetJobLevel1(pPrinterHandle, pJob, NULL, NULL, 0, pcbNeeded); + else if (Level == 2) + _LocalGetJobLevel2(pPrinterHandle, pJob, NULL, NULL, 0, pcbNeeded); + + // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. + *pcReturned++; + pNode = pNode->Next[0]; + } + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + { + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; + } + + // Begin counting again and also empty the given buffer. + *pcbNeeded = 0; + *pcReturned = 0; + ZeroMemory(pStart, cbBuf); + + // Now call the same functions again to copy the actual data for each job into the buffer. + pNode = pFirstJobNode; + + while (*pcReturned < NoJobs && pNode) + { + pJob = (PLOCAL_JOB)pNode->Element; + + // The function behaves differently for each level. + if (Level == 1) + dwErrorCode = _LocalGetJobLevel1(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); + else if (Level == 2) + dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, &pStart, &pEnd, cbBuf, pcbNeeded); + + if (dwErrorCode != ERROR_SUCCESS) + goto Cleanup; + + // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. + *pcReturned++; + pNode = pNode->Next[0]; } dwErrorCode = ERROR_SUCCESS; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Thu Jun 25 15:27:38 2015 @@ -36,7 +36,7 @@ LocalOpenPrinter, // fpOpenPrinter LocalSetJob, // fpSetJob LocalGetJob, // fpGetJob - NULL, // fpEnumJobs + LocalEnumJobs, // fpEnumJobs NULL, // fpAddPrinter NULL, // fpDeletePrinter NULL, // fpSetPrinter Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Thu Jun 25 15:27:38 2015 @@ -187,7 +187,8 @@ void InitializeGlobalJobList(); void InitializePrinterJobList(PLOCAL_PRINTER pPrinter); BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); -BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded); +BOOL WINAPI LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); +BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); BOOL WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob);

9 years, 6 months

[tfaber] 68263: [SHELL32] - Fix shell folder reference leak in _OpenDirectory. CORE-9867

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 25 14:04:02 2015 New Revision: 68263 URL: http://svn.reactos.org/svn/reactos?rev=68263&view=rev Log: [SHELL32] - Fix shell folder reference leak in _OpenDirectory. CORE-9867 Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Thu Jun 25 14:04:02 2015 @@ -634,6 +634,7 @@ return FALSE; hr = IShellFolder_GetDisplayNameOf(psfDesktop, item->pidl, SHGDN_FORPARSING, &strFile); + IShellFolder_Release(psfDesktop); if (!SUCCEEDED(hr)) return FALSE;

9 years, 6 months

[cfinck] 68262: [SKIPLIST] - Add a LookupNodeByIndexSkiplist function and a small test for it in skiplist_test. - Remove a redundant double-set in LookupElementSkiplist. Yes, we now have one lookup...

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jun 25 13:12:01 2015 New Revision: 68262 URL: http://svn.reactos.org/svn/reactos?rev=68262&view=rev Log: [SKIPLIST] - Add a LookupNodeByIndexSkiplist function and a small test for it in skiplist_test. - Remove a redundant double-set in LookupElementSkiplist. Yes, we now have one lookup function that accepts search criteria and returns an element and another one that accepts an index and returns a SKIPLIST_NODE. It's simply because I have exactly these two cases :) You're free to implement the two missing functions or refactor this code another way. Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.c [iso-8859-1] Thu Jun 25 13:12:01 2015 @@ -366,8 +366,6 @@ // * Walk through all nodes on this level that come before the node we're looking for. // * When we have reached such a node, go down a level and continue there. // * Repeat these steps till we're in level 0, right in front of the node we're looking for. - pNode = &Skiplist->Head; - for (i = Skiplist->MaximumLevel + 1; --i >= 0;) { while (pNode->Next[i] && pNode->Next[i] != pLastComparedNode && Skiplist->CompareRoutine(pNode->Next[i]->Element, Element) < 0) @@ -395,3 +393,48 @@ // Return the stored element of the found node. return pNode->Element; } + +/** + * @name LookupNodeByIndexSkiplist + * + * Looks up a node in the Skiplist at the given position. The efficiency of this operation is O(log N) on average. + * + * @param Skiplist + * Pointer to the SKIPLIST structure to operate on. + * + * @param ElementIndex + * Zero-based position of the node in the Skiplist. + * + * @return + * Returns the found node or NULL if the position is invalid. + */ +PSKIPLIST_NODE +LookupNodeByIndexSkiplist(PSKIPLIST Skiplist, DWORD ElementIndex) +{ + CHAR i; + DWORD dwIndex = 0; + PSKIPLIST_NODE pNode = &Skiplist->Head; + + // The only way the node can't be found is when the index is out of range. + if (ElementIndex >= Skiplist->NodeCount) + return NULL; + + // Do the efficient lookup in Skiplists: + // * Start from the maximum level. + // * Walk through all nodes on this level that come before the node we're looking for. + // * When we have reached such a node, go down a level and continue there. + // * Repeat these steps till we're in level 0, right in front of the node we're looking for. + for (i = Skiplist->MaximumLevel + 1; --i >= 0;) + { + // We compare with <= instead of < here, because the added distances make up a 1-based index while ElementIndex is zero-based, + // so we have to jump one node further. + while (pNode->Next[i] && dwIndex + pNode->Distance[i] <= ElementIndex) + { + dwIndex += pNode->Distance[i]; + pNode = pNode->Next[i]; + } + } + + // We are right in front of the node we're looking for now. + return pNode->Next[0]; +} Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist.h [iso-8859-1] Thu Jun 25 13:12:01 2015 @@ -49,5 +49,6 @@ BOOL InsertTailElementSkiplist(PSKIPLIST Skiplist, PVOID Element); PVOID DeleteElementSkiplist(PSKIPLIST Skiplist, PVOID Element); PVOID LookupElementSkiplist(PSKIPLIST Skiplist, PVOID Element, PDWORD ElementIndex); +PSKIPLIST_NODE LookupNodeByIndexSkiplist(PSKIPLIST Skiplist, DWORD ElementIndex); #endif Modified: branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/skiplist/skiplist_test.c [iso-8859-1] Thu Jun 25 13:12:01 2015 @@ -67,6 +67,7 @@ DWORD ElementIndex; DWORD i; SKIPLIST Skiplist; + PSKIPLIST_NODE pNode; system("mode con cols=300"); InitializeSkiplist(&Skiplist, MyAlloc, MyCompare, MyFree); @@ -83,6 +84,10 @@ for (i = 0; i < 40; i++) InsertElementSkiplist(&Skiplist, (PVOID)(rand() % 100)); + // Output the third element (with zero-based index 2). + pNode = LookupNodeByIndexSkiplist(&Skiplist, 2); + printf("Element = %lu for index 2\n", (DWORD)pNode->Element); + // Check if an element with number 44 is in the list and output its index. Element = (DWORD)LookupElementSkiplist(&Skiplist, (PVOID)44, &ElementIndex); printf("Element = %lu, ElementIndex = %lu\n\n", Element, ElementIndex);

9 years, 6 months

[tfaber] 68261: [SHELL32] - Fix reference leak in SHLoadInProc

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 25 12:57:03 2015 New Revision: 68261 URL: http://svn.reactos.org/svn/reactos?rev=68261&view=rev Log: [SHELL32] - Fix reference leak in SHLoadInProc Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] Thu Jun 25 12:57:03 2015 @@ -1033,8 +1033,12 @@ TRACE("%s\n", debugstr_guid(rclsid)); CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,&ptr); - if (ptr) + if(ptr) + { + IUnknown * pUnk = ptr; + IUnknown_Release(pUnk); return S_OK; + } return DISP_E_MEMBERNOTFOUND; }

9 years, 6 months

[tfaber] 68260: [SHELL32] - Fix shell folder reference leak in SHGetFileInfoW CORE-9867

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jun 25 12:51:38 2015 New Revision: 68260 URL: http://svn.reactos.org/svn/reactos?rev=68260&view=rev Log: [SHELL32] - Fix shell folder reference leak in SHGetFileInfoW CORE-9867 Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.c [iso-8859-1] Thu Jun 25 12:51:38 2015 @@ -723,6 +723,9 @@ if (flags & ~SHGFI_KNOWN_FLAGS) FIXME("unknown flags %08x\n", flags & ~SHGFI_KNOWN_FLAGS); + if (psfParent) + IShellFolder_Release(psfParent); + if (hr != S_OK) ret = FALSE;

9 years, 6 months

[cfinck] 68259: [LOCALSPL] - Implement LocalSetJob for Level 1 and 2. - Add pPrintProcessor, pwszPrintProcessorParameters and pwszStatus members to the LOCAL_JOB structure and use them in LocalAddJ...

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jun 25 12:29:18 2015 New Revision: 68259 URL: http://svn.reactos.org/svn/reactos?rev=68259&view=rev Log: [LOCALSPL] - Implement LocalSetJob for Level 1 and 2. - Add pPrintProcessor, pwszPrintProcessorParameters and pwszStatus members to the LOCAL_JOB structure and use them in LocalAddJob, LocalGetJob and LocalSetJob. - Fix naming of some LOCAL_JOB members. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Thu Jun 25 12:29:18 2015 @@ -164,7 +164,7 @@ } // Add it to the Printer's Job List. - if (!InsertElementSkiplist(&pJob->Printer->JobList, pJob)) + if (!InsertElementSkiplist(&pJob->pPrinter->JobList, pJob)) { ERR("InsertElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); goto Cleanup; @@ -215,10 +215,10 @@ goto Cleanup; } - pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; // This handle must not have started a job yet! - if (pPrinterHandle->StartedJob) + if (pPrinterHandle->pStartedJob) { dwErrorCode = ERROR_INVALID_HANDLE; goto Cleanup; @@ -233,7 +233,7 @@ // Check if the printer is set to do direct printing. // The Job List isn't used in this case. - if (pPrinterHandle->Printer->dwAttributes & PRINTER_ATTRIBUTE_DIRECT) + if (pPrinterHandle->pPrinter->dwAttributes & PRINTER_ATTRIBUTE_DIRECT) { dwErrorCode = ERROR_INVALID_ACCESS; goto Cleanup; @@ -264,7 +264,8 @@ } // Copy over defaults to the LOCAL_JOB structure. - pJob->Printer = pPrinterHandle->Printer; + pJob->pPrinter = pPrinterHandle->pPrinter; + pJob->pPrintProcessor = pPrinterHandle->pPrinter->pPrintProcessor; pJob->dwPriority = DEF_PRIORITY; pJob->pwszDatatype = AllocSplStr(pPrinterHandle->pwszDatatype); pJob->pwszDocumentName = AllocSplStr(wszDefaultDocumentName); @@ -321,7 +322,7 @@ // Add the job at the end of the Printer's Job List. // As all new jobs are created with default priority, we can be sure that it would always be inserted at the end. - if (!InsertTailElementSkiplist(&pJob->Printer->JobList, pJob)) + if (!InsertTailElementSkiplist(&pJob->pPrinter->JobList, pJob)) { dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); @@ -363,14 +364,19 @@ DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); - DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbStatus = 0; DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); DWORD dwErrorCode; JOB_INFO_1W JobInfo1 = { 0 }; PBYTE pString; + // A Status Message is optional. + if (pJob->pwszStatus) + cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbUserName; + *pcbNeeded = sizeof(JOB_INFO_1W) + cbDatatype + cbDocumentName + cbMachineName + cbPrinterName + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; @@ -393,8 +399,15 @@ pString += cbMachineName; JobInfo1.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pwszPrinterName, cbPrinterName); + CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); pString += cbPrinterName; + + if (cbStatus) + { + JobInfo1.pStatus = (PWSTR)pString; + CopyMemory(pString, pJob->pwszStatus, cbStatus); + pString += cbStatus; + } JobInfo1.pUserName = (PWSTR)pString; CopyMemory(pString, pJob->pwszUserName, cbUserName); @@ -419,11 +432,13 @@ { DWORD cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); DWORD cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); - DWORD cbDriverName = (wcslen(pJob->Printer->pwszPrinterDriver) + 1) * sizeof(WCHAR); + DWORD cbDriverName = (wcslen(pJob->pPrinter->pwszPrinterDriver) + 1) * sizeof(WCHAR); DWORD cbMachineName = (wcslen(pJob->pwszMachineName) + 1) * sizeof(WCHAR); DWORD cbNotifyName = (wcslen(pJob->pwszNotifyName) + 1) * sizeof(WCHAR); - DWORD cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); - DWORD cbPrintProcessor = (wcslen(pJob->Printer->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); + DWORD cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); + DWORD cbPrintProcessor = (wcslen(pJob->pPrintProcessor->pwszName) + 1) * sizeof(WCHAR); + DWORD cbPrintProcessorParameters = 0; + DWORD cbStatus = 0; DWORD cbUserName = (wcslen(pJob->pwszUserName) + 1) * sizeof(WCHAR); DWORD dwErrorCode; FILETIME ftNow; @@ -433,8 +448,15 @@ ULARGE_INTEGER uliNow; ULARGE_INTEGER uliSubmitted; + // Print Processor Parameters and Status Message are optional. + if (pJob->pwszPrintProcessorParameters) + cbPrintProcessorParameters = (wcslen(pJob->pwszPrintProcessorParameters) + 1) * sizeof(WCHAR); + + if (pJob->pwszStatus) + cbStatus = (wcslen(pJob->pwszStatus) + 1) * sizeof(WCHAR); + // Check if the supplied buffer is large enough. - *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbUserName; + *pcbNeeded = sizeof(JOB_INFO_2W) + cbDatatype + sizeof(DEVMODEW) + cbDocumentName + cbDriverName + cbMachineName + cbNotifyName + cbPrinterName + cbPrintProcessor + cbPrintProcessorParameters + cbStatus + cbUserName; if (cbBuf < *pcbNeeded) { dwErrorCode = ERROR_INSUFFICIENT_BUFFER; @@ -457,7 +479,7 @@ pString += cbDocumentName; JobInfo2.pDriverName = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pwszPrinterDriver, cbDriverName); + CopyMemory(pString, pJob->pPrinter->pwszPrinterDriver, cbDriverName); pString += cbDriverName; JobInfo2.pMachineName = (PWSTR)pString; @@ -469,12 +491,26 @@ pString += cbNotifyName; JobInfo2.pPrinterName = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pwszPrinterName, cbPrinterName); + CopyMemory(pString, pJob->pPrinter->pwszPrinterName, cbPrinterName); pString += cbPrinterName; JobInfo2.pPrintProcessor = (PWSTR)pString; - CopyMemory(pString, pJob->Printer->pPrintProcessor->pwszName, cbPrintProcessor); + CopyMemory(pString, pJob->pPrintProcessor->pwszName, cbPrintProcessor); pString += cbPrintProcessor; + + if (cbPrintProcessorParameters) + { + JobInfo2.pParameters = (PWSTR)pString; + CopyMemory(pString, pJob->pwszPrintProcessorParameters, cbPrintProcessorParameters); + pString += cbPrintProcessorParameters; + } + + if (cbStatus) + { + JobInfo2.pStatus = (PWSTR)pString; + CopyMemory(pString, pJob->pwszStatus, cbStatus); + pString += cbStatus; + } JobInfo2.pUserName = (PWSTR)pString; CopyMemory(pString, pJob->pwszUserName, cbUserName); @@ -496,7 +532,7 @@ // Position in JOB_INFO_2W is the 1-based index of the job in the processing queue. // Retrieve this through the element index of the job in the Printer's Job List. - if (!LookupElementSkiplist(&pJob->Printer->JobList, pJob, &JobInfo2.Position)) + if (!LookupElementSkiplist(&pJob->pPrinter->JobList, pJob, &JobInfo2.Position)) { dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("pJob could not be located in the Printer's Job List!\n"); @@ -525,7 +561,7 @@ } BOOL WINAPI -LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) +LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded) { DWORD dwErrorCode; PLOCAL_HANDLE pHandle; @@ -540,11 +576,11 @@ goto Cleanup; } - pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; // Get the desired job. pJob = LookupElementSkiplist(&GlobalJobList, &JobId, NULL); - if (!pJob || pJob->Printer != pPrinterHandle->Printer) + if (!pJob || pJob->pPrinter != pPrinterHandle->pPrinter) { dwErrorCode = ERROR_INVALID_PARAMETER; goto Cleanup; @@ -557,6 +593,287 @@ dwErrorCode = _LocalGetJobLevel2(pPrinterHandle, pJob, pOutput, cbBuf, pcbNeeded); else dwErrorCode = ERROR_INVALID_LEVEL; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +static DWORD +_LocalSetJobLevel1(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PJOB_INFO_1W pJobInfo) +{ + DWORD dwErrorCode; + + // First check the validity of the input before changing anything. + if (!FindDatatype(pJob->pPrintProcessor, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_INVALID_DATATYPE; + goto Cleanup; + } + + // Check if the datatype has changed. + if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the document name has changed. + if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the status message has changed. + if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the user name has changed. + if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + { + // The new user name doesn't need to exist, so no additional verification is required. + + // Use the new value. + if (!ReallocSplStr(&pJob->pwszUserName, pJobInfo->pUserName)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the priority has changed. + if (pJob->dwPriority != pJobInfo->Priority && IS_VALID_PRIORITY(pJobInfo->Priority)) + { + // Set the new priority. + pJob->dwPriority = pJobInfo->Priority; + + // Remove and reinsert the job in the Printer's Job List. + // The Compare function will be used to find the right position now considering the new priority. + DeleteElementSkiplist(&pJob->pPrinter->JobList, pJob); + InsertElementSkiplist(&pJob->pPrinter->JobList, pJob); + } + + // Check if the status flags have changed. + if (pJob->dwStatus != pJobInfo->Status) + { + // Only add status flags that make sense. + if (pJobInfo->Status & JOB_STATUS_PAUSED) + pJob->dwStatus |= JOB_STATUS_PAUSED; + + if (pJobInfo->Status & JOB_STATUS_ERROR) + pJob->dwStatus |= JOB_STATUS_ERROR; + + if (pJobInfo->Status & JOB_STATUS_OFFLINE) + pJob->dwStatus |= JOB_STATUS_OFFLINE; + + if (pJobInfo->Status & JOB_STATUS_PAPEROUT) + pJob->dwStatus |= JOB_STATUS_PAPEROUT; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +static DWORD +_LocalSetJobLevel2(PLOCAL_PRINTER_HANDLE pPrinterHandle, PLOCAL_JOB pJob, PJOB_INFO_2W pJobInfo) +{ + DWORD dwErrorCode; + PLOCAL_PRINT_PROCESSOR pPrintProcessor; + + // First check the validity of the input before changing anything. + pPrintProcessor = FindPrintProcessor(pJobInfo->pPrintProcessor); + if (!pPrintProcessor) + { + dwErrorCode = ERROR_UNKNOWN_PRINTPROCESSOR; + goto Cleanup; + } + + if (!FindDatatype(pPrintProcessor, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_INVALID_DATATYPE; + goto Cleanup; + } + + // Check if the datatype has changed. + if (wcscmp(pJob->pwszDatatype, pJobInfo->pDatatype) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDatatype, pJobInfo->pDatatype)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the document name has changed. + if (wcscmp(pJob->pwszDocumentName, pJobInfo->pDocument) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszDocumentName, pJobInfo->pDocument)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the notify name has changed. + if (wcscmp(pJob->pwszNotifyName, pJobInfo->pNotifyName) != 0) + { + // The new notify name doesn't need to exist, so no additional verification is required. + + // Use the new value. + if (!ReallocSplStr(&pJob->pwszNotifyName, pJobInfo->pNotifyName)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the (optional) Print Processor Parameters have changed. + if ((!pJob->pwszPrintProcessorParameters && pJobInfo->pParameters) || wcscmp(pJob->pwszPrintProcessorParameters, pJobInfo->pParameters) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszPrintProcessorParameters, pJobInfo->pParameters)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the (optional) Status Message has changed. + if ((!pJob->pwszStatus && pJobInfo->pStatus) || wcscmp(pJob->pwszStatus, pJobInfo->pStatus) != 0) + { + // Use the new value. + if (!ReallocSplStr(&pJob->pwszStatus, pJobInfo->pStatus)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the user name has changed. + if (wcscmp(pJob->pwszUserName, pJobInfo->pUserName) != 0) + { + // The new user name doesn't need to exist, so no additional verification is required. + + // Use the new value. + if (!ReallocSplStr(&pJob->pwszUserName, pJobInfo->pUserName)) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("ReallocSplStr failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + } + + // Check if the priority has changed. + if (pJob->dwPriority != pJobInfo->Priority && IS_VALID_PRIORITY(pJobInfo->Priority)) + { + // Set the new priority. + pJob->dwPriority = pJobInfo->Priority; + + // Remove and reinsert the job in the Printer's Job List. + // The Compare function will be used to find the right position now considering the new priority. + DeleteElementSkiplist(&pJob->pPrinter->JobList, pJob); + InsertElementSkiplist(&pJob->pPrinter->JobList, pJob); + } + + // Check if the status flags have changed. + if (pJob->dwStatus != pJobInfo->Status) + { + // Only add status flags that make sense. + if (pJobInfo->Status & JOB_STATUS_PAUSED) + pJob->dwStatus |= JOB_STATUS_PAUSED; + + if (pJobInfo->Status & JOB_STATUS_ERROR) + pJob->dwStatus |= JOB_STATUS_ERROR; + + if (pJobInfo->Status & JOB_STATUS_OFFLINE) + pJob->dwStatus |= JOB_STATUS_OFFLINE; + + if (pJobInfo->Status & JOB_STATUS_PAPEROUT) + pJob->dwStatus |= JOB_STATUS_PAPEROUT; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +BOOL WINAPI +LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command) +{ + DWORD dwErrorCode; + PLOCAL_HANDLE pHandle; + PLOCAL_JOB pJob; + PLOCAL_PRINTER_HANDLE pPrinterHandle; + + // Check if this is a printer handle. + pHandle = (PLOCAL_HANDLE)hPrinter; + if (pHandle->HandleType != Printer) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; + + // Get the desired job. + pJob = LookupElementSkiplist(&GlobalJobList, &JobId, NULL); + if (!pJob || pJob->pPrinter != pPrinterHandle->pPrinter) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Setting job information is handled differently for each level. + if (Level) + { + if (Level == 1) + dwErrorCode = _LocalSetJobLevel1(pPrinterHandle, pJob, (PJOB_INFO_1W)pJobInfo); + else if (Level == 2) + dwErrorCode = _LocalSetJobLevel2(pPrinterHandle, pJob, (PJOB_INFO_2W)pJobInfo); + else + dwErrorCode = ERROR_INVALID_LEVEL; + } + + if (dwErrorCode != ERROR_SUCCESS) + goto Cleanup; + + // Perform an additional command if desired. + if (Command) + { + // TODO + } + + dwErrorCode = ERROR_SUCCESS; Cleanup: SetLastError(dwErrorCode); @@ -626,7 +943,7 @@ pJob->dwJobID = pShadowFile->dwJobID; pJob->dwTotalPages = pShadowFile->dwTotalPages; pJob->dwPriority = pShadowFile->dwPriority; - pJob->Printer = pPrinter; + pJob->pPrinter = pPrinter; pJob->pwszDatatype = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDatatype)); pJob->pwszDocumentName = AllocSplStr((PCWSTR)((ULONG_PTR)pShadowFile + pShadowFile->offDocumentName)); pJob->pwszOutputFile = NULL; @@ -667,7 +984,7 @@ } // Compute the total size of the shadow file. - cbPrinterName = (wcslen(pJob->Printer->pwszPrinterName) + 1) * sizeof(WCHAR); + cbPrinterName = (wcslen(pJob->pPrinter->pwszPrinterName) + 1) * sizeof(WCHAR); cbDatatype = (wcslen(pJob->pwszDatatype) + 1) * sizeof(WCHAR); cbDocumentName = (wcslen(pJob->pwszDocumentName) + 1) * sizeof(WCHAR); cbFileSize = sizeof(SHD_HEADER) + cbPrinterName + cbDatatype + cbDocumentName + sizeof(DEVMODEW); @@ -694,7 +1011,7 @@ // The first value begins right after the shadow file header. dwCurrentOffset = sizeof(SHD_HEADER); - CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->Printer->pwszPrinterName, cbPrinterName); + CopyMemory((PBYTE)pShadowFile + dwCurrentOffset, pJob->pPrinter->pwszPrinterName, cbPrinterName); pShadowFile->offPrinterName = dwCurrentOffset; dwCurrentOffset += cbPrinterName; Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/main.c [iso-8859-1] Thu Jun 25 12:29:18 2015 @@ -34,7 +34,7 @@ // Local Constants static const PRINTPROVIDOR _PrintProviderFunctions = { LocalOpenPrinter, // fpOpenPrinter - NULL, // fpSetJob + LocalSetJob, // fpSetJob LocalGetJob, // fpGetJob NULL, // fpEnumJobs NULL, // fpAddPrinter Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/precomp.h [iso-8859-1] Thu Jun 25 12:29:18 2015 @@ -32,6 +32,7 @@ // Macros #define IS_VALID_JOB_ID(ID) (ID >= 1 && ID <= 99999) +#define IS_VALID_PRIORITY(P) (P >= MIN_PRIORITY && P <= MAX_PRIORITY) // Constants #define MAX_PRINTER_NAME 220 @@ -91,23 +92,26 @@ typedef struct _LOCAL_JOB { // This sort key must be the first element for LookupElementSkiplist to work! - DWORD dwJobID; // Internal and external ID of this Job - - PLOCAL_PRINTER Printer; // Associated Printer to this Job - DWORD dwPriority; // Priority of this Job from MIN_PRIORITY to MAX_PRIORITY, default being DEF_PRIORITY - SYSTEMTIME stSubmitted; // Time of the submission of this Job - PWSTR pwszUserName; // User that submitted the Job - PWSTR pwszNotifyName; // User that shall be notified about the status of the Job - PWSTR pwszDocumentName; // Name of the Document that is printed - PWSTR pwszDatatype; // Datatype of the Document - PWSTR pwszOutputFile; // Output File to spool the Job to - DWORD dwTotalPages; // Total pages of the Document - DWORD dwPagesPrinted; // Number of pages that have already been printed - DWORD dwStartTime; // Earliest time in minutes since 12:00 AM UTC when this document can be printed - DWORD dwUntilTime; // Latest time in minutes since 12:00 AM UTC when this document can be printed - DWORD dwStatus; // JOB_STATUS_* flags of the Job - PWSTR pwszMachineName; // Name of the machine that submitted the Job (prepended with two backslashes) - DEVMODEW DevMode; // Associated Device Mode to this Job + DWORD dwJobID; // Internal and external ID of this Job + + PLOCAL_PRINTER pPrinter; // Associated Printer to this Job + PLOCAL_PRINT_PROCESSOR pPrintProcessor; // Associated Print Processor to this Job + DWORD dwPriority; // Priority of this Job from MIN_PRIORITY to MAX_PRIORITY, default being DEF_PRIORITY + SYSTEMTIME stSubmitted; // Time of the submission of this Job + PWSTR pwszUserName; // User that submitted the Job + PWSTR pwszNotifyName; // User that shall be notified about the status of the Job + PWSTR pwszDocumentName; // Name of the Document that is printed + PWSTR pwszDatatype; // Datatype of the Document + PWSTR pwszOutputFile; // Output File to spool the Job to + PWSTR pwszPrintProcessorParameters; // Optional; Parameters for the chosen Print Processor + PWSTR pwszStatus; // Optional; a Status Message for the Job + DWORD dwTotalPages; // Total pages of the Document + DWORD dwPagesPrinted; // Number of pages that have already been printed + DWORD dwStartTime; // Earliest time in minutes since 12:00 AM UTC when this document can be printed + DWORD dwUntilTime; // Latest time in minutes since 12:00 AM UTC when this document can be printed + DWORD dwStatus; // JOB_STATUS_* flags of the Job + PWSTR pwszMachineName; // Name of the machine that submitted the Job (prepended with two backslashes) + DEVMODEW DevMode; // Associated Device Mode to this Job } LOCAL_JOB, *PLOCAL_JOB; @@ -120,8 +124,8 @@ */ typedef struct _LOCAL_PRINTER_HANDLE { - PLOCAL_PRINTER Printer; - PLOCAL_JOB StartedJob; + PLOCAL_PRINTER pPrinter; + PLOCAL_JOB pStartedJob; PWSTR pwszDatatype; DEVMODEW DevMode; } @@ -134,7 +138,7 @@ typedef struct _LOCAL_HANDLE { enum { Printer, Monitor, Port } HandleType; - PVOID SpecificHandle; + PVOID pSpecificHandle; } LOCAL_HANDLE, *PLOCAL_HANDLE; @@ -184,6 +188,7 @@ void InitializePrinterJobList(PLOCAL_PRINTER pPrinter); BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalGetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pOutput, DWORD cbBuf, LPDWORD pcbNeeded); +BOOL WINAPI LocalSetJob(HANDLE hPrinter, DWORD JobId, DWORD Level, PBYTE pJobInfo, DWORD Command); PLOCAL_JOB ReadJobShadowFile(PCWSTR pwszFilePath); BOOL WriteJobShadowFile(PCWSTR pwszFilePath, const PLOCAL_JOB pJob); Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Thu Jun 25 12:29:18 2015 @@ -537,7 +537,7 @@ // Create a new printer handle. pPrinterHandle = DllAllocSplMem(sizeof(LOCAL_PRINTER_HANDLE)); - pPrinterHandle->Printer = pPrinter; + pPrinterHandle->pPrinter = pPrinter; // Check if a datatype was given. if (pDefault && pDefault->pDatatype) @@ -600,20 +600,20 @@ // Look for this job in the Global Job List. pJob = LookupElementSkiplist(&GlobalJobList, &dwJobID, NULL); - if (!pJob || pJob->Printer != pPrinter) + if (!pJob || pJob->pPrinter != pPrinter) { // The user supplied a non-existing Job ID or the Job ID does not belong to the supplied printer name. dwErrorCode = ERROR_INVALID_PRINTER_NAME; goto Cleanup; } - pPrinterHandle->StartedJob = pJob; + pPrinterHandle->pStartedJob = pJob; } // Create a new handle that references a printer. pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); pHandle->HandleType = Printer; - pHandle->SpecificHandle = pPrinterHandle; + pHandle->pSpecificHandle = pPrinterHandle; } else { @@ -637,7 +637,7 @@ ///////////// TODO ///////////////////// pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); pHandle->HandleType = Monitor; - //pHandle->SpecificHandle = pMonitorHandle; + //pHandle->pSpecificHandle = pMonitorHandle; } else if (wcscmp(p, L"XcvPort ") == 0) { @@ -647,7 +647,7 @@ //////////// TODO ////////////////////// pHandle = DllAllocSplMem(sizeof(LOCAL_HANDLE)); pHandle->HandleType = Port; - //pHandle->SpecificHandle = pPortHandle; + //pHandle->pSpecificHandle = pPortHandle; } else { @@ -710,7 +710,7 @@ goto Cleanup; } - pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->SpecificHandle; + pPrinterHandle = (PLOCAL_PRINTER_HANDLE)pHandle->pSpecificHandle; // Check if this is the right document information level. if (Level != 1) @@ -723,14 +723,14 @@ // Create a new job. pJob = DllAllocSplMem(sizeof(LOCAL_JOB)); - pJob->Printer = pPrinterHandle->Printer; + pJob->pPrinter = pPrinterHandle->pPrinter; pJob->dwPriority = DEF_PRIORITY; // Check if a datatype was given. if (pDocumentInfo1->pDatatype) { // Use the datatype if it's valid. - if (!FindDatatype(pJob->Printer->pPrintProcessor, pDocumentInfo1->pDatatype)) + if (!FindDatatype(pJob->pPrintProcessor, pDocumentInfo1->pDatatype)) { dwErrorCode = ERROR_INVALID_DATATYPE; goto Cleanup; @@ -771,14 +771,14 @@ // Add the job at the end of the Printer's Job List. // As all new jobs are created with default priority, we can be sure that it would always be inserted at the end. - if (!InsertTailElementSkiplist(&pJob->Printer->JobList, pJob)) + if (!InsertTailElementSkiplist(&pJob->pPrinter->JobList, pJob)) { dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; ERR("InsertTailElementSkiplist failed for job %lu for the Printer's Job List!\n", pJob->dwJobID); goto Cleanup; } - pPrinterHandle->StartedJob = pJob; + pPrinterHandle->pStartedJob = pJob; dwErrorCode = ERROR_SUCCESS; dwReturnValue = pJob->dwJobID;

9 years, 6 months

[ekohl] 68258: [NTOSKRNL] xHalIoReadPartitionTable: Do not return a valid partiton number for container partitions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jun 24 20:22:19 2015 New Revision: 68258 URL: http://svn.reactos.org/svn/reactos?rev=68258&view=rev Log: [NTOSKRNL] xHalIoReadPartitionTable: Do not return a valid partiton number for container partitions. Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Wed Jun 24 20:22:19 2015 @@ -1655,9 +1655,8 @@ UInt32x32To64(GET_PARTITION_LENGTH(PartitionDescriptor), SectorSize); - // BUGBUGBUG: The correct partition numbers seem to cause boot failures!!! -// PartitionInfo->PartitionNumber = (!IsContainerPartition(PartitionType)) ? i : 0; - PartitionInfo->PartitionNumber = i + 1; + /* Get the partition number */ + PartitionInfo->PartitionNumber = (!IsContainerPartition(PartitionType)) ? i + 1 : 0; } else {

9 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
35
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 June 2015