Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[greatlrd] 21836: [AUDIT] after looking through code no signs of reverse engineering were found.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 7 22:39:18 2006 New Revision: 21836 URL: http://svn.reactos.ru/svn/reactos?rev=21836&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Modified: trunk/reactos/drivers/filesystems/vfat/direntry.c (props changed) Propchange: trunk/reactos/drivers/filesystems/vfat/direntry.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 7 months

[greatlrd] 21835: Bug 1456 : patch from w3seek : Fix a bug in CreateDirectoryEx that makes the function attempt to create the template directory again

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 7 22:17:50 2006 New Revision: 21835 URL: http://svn.reactos.ru/svn/reactos?rev=21835&view=rev Log: Bug 1456 : patch from w3seek : Fix a bug in CreateDirectoryEx that makes the function attempt to create the template directory again Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/file/dir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c Sun May 7 22:17:50 2006 @@ -192,12 +192,6 @@ } InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); - - InitializeObjectAttributes(&ObjectAttributes, &NtTemplatePathU, OBJ_CASE_INSENSITIVE, NULL, @@ -256,7 +250,13 @@ Status = STATUS_OBJECT_NAME_INVALID; goto Cleanup; } - + + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); + /* * Query the basic file attributes from the template directory */ @@ -358,6 +358,7 @@ /* * Create the new directory */ + Status = NtCreateFile (&DirectoryHandle, DesiredAccess, &ObjectAttributes, @@ -443,7 +444,7 @@ /* FIXME - enumerate and copy the file streams */ } - + /* * We successfully created the directory and copied all information * from the template directory @@ -460,7 +461,7 @@ { NtClose(TemplateHandle); } - + RtlFreeHeap (RtlGetProcessHeap (), 0, NtTemplatePathU.Buffer);

18 years, 7 months

[greatlrd] 21834: [AUDIT] after looking through code no signs of reverse engineering were found.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 7 22:16:31 2006 New Revision: 21834 URL: http://svn.reactos.ru/svn/reactos?rev=21834&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Modified: trunk/reactos/dll/win32/kernel32/file/dir.c (props changed) Propchange: trunk/reactos/dll/win32/kernel32/file/dir.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 7 months

[greatlrd] 21833: [AUDIT] after looking through code no signs of reverse engineering were found.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun May 7 22:14:03 2006 New Revision: 21833 URL: http://svn.reactos.ru/svn/reactos?rev=21833&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Modified: trunk/reactos/dll/win32/kernel32/file/file.c (props changed) Propchange: trunk/reactos/dll/win32/kernel32/file/file.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 7 months

[cwittich] 21832: -don't show SystemComponents -added a "Show updates" checkbox

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun May 7 22:05:51 2006 New Revision: 21832 URL: http://svn.reactos.ru/svn/reactos?rev=21832&view=rev Log: -don't show SystemComponents -added a "Show updates" checkbox Modified: trunk/reactos/dll/cpl/appwiz/Cz.rc trunk/reactos/dll/cpl/appwiz/De.rc trunk/reactos/dll/cpl/appwiz/Dk.rc trunk/reactos/dll/cpl/appwiz/En.rc trunk/reactos/dll/cpl/appwiz/Es.rc trunk/reactos/dll/cpl/appwiz/Fr.rc trunk/reactos/dll/cpl/appwiz/Gr.rc trunk/reactos/dll/cpl/appwiz/Hu.rc trunk/reactos/dll/cpl/appwiz/Ja.rc trunk/reactos/dll/cpl/appwiz/Nl.rc trunk/reactos/dll/cpl/appwiz/Pl.rc trunk/reactos/dll/cpl/appwiz/Ru.rc trunk/reactos/dll/cpl/appwiz/appwiz.c trunk/reactos/dll/cpl/appwiz/resource.h Modified: trunk/reactos/dll/cpl/appwiz/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Cz.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Cz.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Cz.rc Sun May 7 22:05:51 2006 @@ -11,8 +11,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Následující aplikace mohou být automaticky odstranìny. K odstranìní aplikace nebo k nastavení jejích komponent, ji vyberte ze seznamu a klepnìte na tlaèítko Pøidat/Odebrat.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "Pøidat/&Odebrat", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/De.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/De.rc (original) +++ trunk/reactos/dll/cpl/appwiz/De.rc Sun May 7 22:05:51 2006 @@ -11,9 +11,10 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Updates anzeigen",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Die folgende Software kann automatisch entfernt werden. Um ein Programm zu entfernen oder die installierten Programmpakete zu ändern, wählen Sie das Programm in der Liste und klicken auf Ändern/Entfernen.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Ändern/Entfe&rnen", IDC_ADDREMOVE, PROPSHEETWIDTH-(82), 198, 70, 14 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "Ändern/Entfe&rnen", IDC_ADDREMOVE, PROPSHEETWIDTH-(82), 205, 70, 14 END IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT Modified: trunk/reactos/dll/cpl/appwiz/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Dk.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Dk.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Dk.rc Sun May 7 22:05:51 2006 @@ -11,8 +11,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Følgende Software kan automatisk blive Fjernet. For at fjerne programmer eller ændre hvilken typer komponeter der skal være installeret, vælg fra listen og klik på Tilføj/Fjern.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "Tilføj/&Fjern", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/En.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/En.rc (original) +++ trunk/reactos/dll/cpl/appwiz/En.rc Sun May 7 22:05:51 2006 @@ -11,8 +11,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "The following Software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "Modify/&Remove", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Es.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Es.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Es.rc Sun May 7 22:05:51 2006 @@ -17,8 +17,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "El siguiente software puede ser removido automaticamente. Para remover un programa o modificar sus componentes instalados, seleccionalo en la lista y pulsa Añadir/Remover.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "Añadir/&Remover", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Fr.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Fr.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Fr.rc Sun May 7 22:05:51 2006 @@ -1,52 +1,53 @@ /* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Ajout/Supression de programmes" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 - LTEXT "Pour installer un nouveau programme, cliquez sur Installer",-1,36,18,PROPSHEETWIDTH-48,8 - PUSHBUTTON "&Installer...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 - LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN - - ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 - LTEXT "Les logiciels suivant peuvent être supprimés automatiquement. Pour supprimer un programme ou modifier ses composantes installées, sélectionnez-le dans la liste et cliquez sur Ajouter/Supprimer.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP - PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 -END - -IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Configuration de ReactOS" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - -END - -IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Créer un raccourci" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Texte 1", -1, 115, 15, 160, 24 - LTEXT "Texte 2", -1, 115, 35, 160, 17 -END - -IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Créer un raccourci" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Texte 1",-1,10,0,225,40 - LTEXT "Texte 2",-1,10,40,120,20 - LTEXT "Texte 3",-1,10,55,120,20 -END - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Ajout/Supression de programmes" - IDS_CPLSYSTEMDESCRIPTION "Installe et supprime les programmes et les composantes de ReactOS, ainsi que les raccourcis." -END +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ajout/Supression de programmes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16 + LTEXT "Pour installer un nouveau programme, cliquez sur Installer",-1,36,18,PROPSHEETWIDTH-48,8 + PUSHBUTTON "&Installer...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14 + LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN + + ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 + LTEXT "Les logiciels suivant peuvent être supprimés automatiquement. Pour supprimer un programme ou modifier ses composantes installées, sélectionnez-le dans la liste et cliquez sur Ajouter/Supprimer.",-1,36,72,PROPSHEETWIDTH-48,32 + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 +END + +IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Configuration de ReactOS" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + +END + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Créer un raccourci" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Texte 1", -1, 115, 15, 160, 24 + LTEXT "Texte 2", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Créer un raccourci" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Texte 1",-1,10,0,225,40 + LTEXT "Texte 2",-1,10,40,120,20 + LTEXT "Texte 3",-1,10,55,120,20 +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ajout/Supression de programmes" + IDS_CPLSYSTEMDESCRIPTION "Installe et supprime les programmes et les composantes de ReactOS, ainsi que les raccourcis." +END Modified: trunk/reactos/dll/cpl/appwiz/Gr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Gr.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Gr.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Gr.rc Sun May 7 22:05:51 2006 @@ -11,8 +11,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Ôï áêüëïõèï ëïãéóìéêü ìðïñåß íá áðåãêáôáóôáèåß áõôïìÜôùò. Ãéá íá áðåãêáôáóôÞóåôå Ýíá ðñüãñáììá Þ íá áëëÜîåôå ôá åãêáôåóôçìÝíá ôïõ áñ÷åßá, åðéëÝîôå ôï áðü ôç ëßóôá êáé êÜíôå êëéê óôï ÐñïóèÞêç/Áöáßñåóç.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "ÐñïóèÞêç/&Áöáßñåóç", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Hu.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Hu.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Hu.rc Sun May 7 22:05:51 2006 @@ -12,8 +12,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "A következõ szoftvereket lehet eltávolítani. A szoftver törléséhez vagy összetevõinek modosításához kattints a szoftverre a listában, majd kattints a Hozzáadás/eltávolítás gombra.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "Hozzáadás/eltávolítás", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Ja.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Ja.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Ja.rc Sun May 7 22:05:51 2006 @@ -11,8 +11,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "±êçÌvOÍ©®Åí·é±ÆªÅ«Ü·BvOðÏXµ½èARs[^©çíµ½è·éÉÍAê©çÚIÌvOðIðµA[ÏXÆí] ðNbNµÄ¾³¢B",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "ÏXÆí(&R)", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Nl.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Nl.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Nl.rc Sun May 7 22:05:51 2006 @@ -11,8 +11,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "&De volgende software kan automatisch worden verwijderd. U verwijdert een programma of wijzigt de geïnstalleerde onderdelen door het programma te selecteren en op Toevoegen/verwijderen te klikken.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "Toe&voegen/verwijderen", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Pl.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Pl.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Pl.rc Sun May 7 22:05:51 2006 @@ -13,8 +13,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "Nastêpuj¹ce oprogramowanie mo¿e byæ automatycznie usuniête. ¯eby usun¹c program, albo zmodyfikowaæ zainstalowane komponenty, wybierz program z listy i kliknij Dodaj/Usuñ.",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "Dodaj/&Usuñ", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 198, 60, 14 END Modified: trunk/reactos/dll/cpl/appwiz/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/Ru.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Ru.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Ru.rc Sun May 7 22:05:51 2006 @@ -11,8 +11,9 @@ LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN ICON IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16 + CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18 LTEXT "×òîáû óñòàíîâèòü ïðîãðàììó èëè èçìåíèòü å¸ óñòàíîâëåííûå êîìïîíåíòû, âûäåëèòå å¸ â ñïèñêå è íàæìèòå ""Çàìåíèòü/Óäàëèòü"".",-1,36,72,PROPSHEETWIDTH-48,32 - LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 105, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP + LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 88, LBS_STANDARD | WS_TABSTOP PUSHBUTTON "&Çàìåíèòü/Óäàëèòü", IDC_ADDREMOVE, PROPSHEETWIDTH-98, 198, 85, 14 END Modified: trunk/reactos/dll/cpl/appwiz/appwiz.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/appwiz.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/appwiz.c (original) +++ trunk/reactos/dll/cpl/appwiz/appwiz.c Sun May 7 22:05:51 2006 @@ -105,65 +105,113 @@ } -/* Property page dialog callback */ -static INT_PTR CALLBACK -InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) +static void FillSoftwareList(HWND hwndDlg) { TCHAR pszName[MAX_PATH]; TCHAR pszDisplayName[MAX_PATH]; + TCHAR pszParentKeyName[MAX_PATH]; FILETIME FileTime; HKEY hKey; HKEY hSubKey; DWORD dwType; DWORD dwSize; + DWORD dwValue = 0; + BOOL bIsUpdate = FALSE; + BOOL bIsSystemComponent = FALSE; + BOOL bShowUpdates = FALSE; int i; ULONG index; + bShowUpdates = (SendMessage(GetDlgItem(hwndDlg, IDC_SHOWUPDATES), BM_GETCHECK, 0, 0) == BST_CHECKED); + + if (RegOpenKey(HKEY_LOCAL_MACHINE, + _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), + &hKey) != ERROR_SUCCESS) + { + MessageBox(hwndDlg, + _TEXT("Unable to open Uninstall Key"), + _TEXT("Error"), + MB_ICONSTOP); + return; + } + + i = 0; + dwSize = MAX_PATH; + while (RegEnumKeyEx (hKey, i, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) + { + if (RegOpenKey(hKey,pszName,&hSubKey)==ERROR_SUCCESS) + { + dwType = REG_DWORD; + dwSize = sizeof(DWORD); + if (RegQueryValueEx(hSubKey, + _TEXT("SystemComponent"), + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize) == ERROR_SUCCESS) + { + bIsSystemComponent = (dwValue == 0x1); + } + else { + bIsSystemComponent = FALSE; + } + dwType = REG_SZ; + dwSize = MAX_PATH; + bIsUpdate = (RegQueryValueEx(hSubKey, + _TEXT("ParentKeyName"), + NULL, + &dwType, + (LPBYTE)pszParentKeyName, + &dwSize) == ERROR_SUCCESS); + dwSize = MAX_PATH; + if (RegQueryValueEx(hSubKey, + _TEXT("DisplayName"), + NULL, + &dwType, + (LPBYTE)pszDisplayName, + &dwSize) == ERROR_SUCCESS) + { + if ((!bIsUpdate) && (!bIsSystemComponent)) + { + index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); + } + else if (bIsUpdate && bShowUpdates) + { + index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); + } + } + } + + dwSize = MAX_PATH; + i++; + } + + RegCloseKey(hKey); +} + +/* Property page dialog callback */ +static INT_PTR CALLBACK +InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) +{ switch (uMsg) { case WM_INITDIALOG: EnableWindow(GetDlgItem(hwndDlg,IDC_INSTALL), FALSE); - if (RegOpenKey(HKEY_LOCAL_MACHINE, - _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), - &hKey) != ERROR_SUCCESS) - { - MessageBox(hwndDlg, - _TEXT("Unable to open Uninstall Key"), - _TEXT("Error"), - MB_ICONSTOP); - return FALSE; - } - - i = 0; - dwSize = MAX_PATH; - while (RegEnumKeyEx (hKey, i, pszName, &dwSize, NULL, NULL, NULL, &FileTime) == ERROR_SUCCESS) - { - if (RegOpenKey(hKey,pszName,&hSubKey)==ERROR_SUCCESS) - { - dwType = REG_SZ; - dwSize = MAX_PATH; - if (RegQueryValueEx(hSubKey, - _TEXT("DisplayName"), - NULL, - &dwType, - (LPBYTE)pszDisplayName, - &dwSize) == ERROR_SUCCESS) - { - index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); - SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); - } - } - - dwSize = MAX_PATH; - i++; - } - - RegCloseKey(hKey); + FillSoftwareList(hwndDlg); break; case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_SHOWUPDATES: + if (HIWORD(wParam) == BN_CLICKED) + { + SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_RESETCONTENT, 0, 0); + FillSoftwareList(hwndDlg); + } + break; case IDC_SOFTWARELIST: if (HIWORD(wParam) == LBN_DBLCLK) { Modified: trunk/reactos/dll/cpl/appwiz/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/appwiz/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/resource.h (original) +++ trunk/reactos/dll/cpl/appwiz/resource.h Sun May 7 22:05:51 2006 @@ -23,8 +23,9 @@ /* controls */ #define IDC_INSTALL 101 -#define IDC_SOFTWARELIST 102 -#define IDC_ADDREMOVE 103 +#define IDC_SOFTWARELIST 102 +#define IDC_ADDREMOVE 103 +#define IDC_SHOWUPDATES 104 #endif /* __CPL_RESOURCE_H */

18 years, 7 months

[hpoussin] 21831: Add common cleanup block in SetupDiBuildClassInfoListExW, SetupDiClassGuidsFromNameExW, SetupDiClassNameFromGuidExW, SetupDiGetClassDescriptionExW, SETUP_CreateDevListFromEnumerator, SETUP_CreateDevList, SetupDiGetClassDevsExW, CreateClassKey, SetupDiOpenDeviceInfoW

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 7 18:52:32 2006 New Revision: 21831 URL: http://svn.reactos.ru/svn/reactos?rev=21831&view=rev Log: Add common cleanup block in SetupDiBuildClassInfoListExW, SetupDiClassGuidsFromNameExW, SetupDiClassNameFromGuidExW, SetupDiGetClassDescriptionExW, SETUP_CreateDevListFromEnumerator, SETUP_CreateDevList, SetupDiGetClassDevsExW, CreateClassKey, SetupDiOpenDeviceInfoW Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sun May 7 18:52:32 2006 @@ -197,18 +197,19 @@ PVOID Reserved) { WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; - HKEY hClassesKey; - HKEY hClassKey; + HKEY hClassesKey = INVALID_HANDLE_VALUE; + HKEY hClassKey = NULL; DWORD dwLength; DWORD dwIndex; LONG lError; DWORD dwGuidListIndex = 0; + BOOL ret = FALSE; TRACE("0x%lx %p %lu %p %s %p\n", Flags, ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); if (RequiredSize != NULL) - *RequiredSize = 0; + *RequiredSize = 0; hClassesKey = SetupDiOpenClassRegKeyExW(NULL, KEY_ENUMERATE_SUB_KEYS, @@ -216,108 +217,102 @@ MachineName, Reserved); if (hClassesKey == INVALID_HANDLE_VALUE) - { - return FALSE; - } + goto cleanup; for (dwIndex = 0; ; dwIndex++) { - dwLength = MAX_GUID_STRING_LEN + 1; - lError = RegEnumKeyExW(hClassesKey, - dwIndex, - szKeyName, - &dwLength, - NULL, - NULL, - NULL, - NULL); - TRACE("RegEnumKeyExW() returns %ld\n", lError); - if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) - { - TRACE("Key name: %s\n", debugstr_w(szKeyName)); - - if (RegOpenKeyExW(hClassesKey, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hClassKey)) - { - RegCloseKey(hClassesKey); - return FALSE; - } - - if (!RegQueryValueExW(hClassKey, - REGSTR_VAL_NOUSECLASS, - NULL, - NULL, - NULL, - NULL)) - { - TRACE("'NoUseClass' value found!\n"); - RegCloseKey(hClassKey); - continue; - } - - if ((Flags & DIBCI_NOINSTALLCLASS) && - (!RegQueryValueExW(hClassKey, - REGSTR_VAL_NOINSTALLCLASS, - NULL, - NULL, - NULL, - NULL))) - { - TRACE("'NoInstallClass' value found!\n"); - RegCloseKey(hClassKey); - continue; - } - - if ((Flags & DIBCI_NODISPLAYCLASS) && - (!RegQueryValueExW(hClassKey, - REGSTR_VAL_NODISPLAYCLASS, - NULL, - NULL, - NULL, - NULL))) - { - TRACE("'NoDisplayClass' value found!\n"); - RegCloseKey(hClassKey); - continue; - } - - RegCloseKey(hClassKey); - - TRACE("Guid: %s\n", debugstr_w(szKeyName)); - if (dwGuidListIndex < ClassGuidListSize) - { - if (szKeyName[0] == L'{' && szKeyName[37] == L'}') - { - szKeyName[37] = 0; - } - TRACE("Guid: %s\n", debugstr_w(&szKeyName[1])); - - UuidFromStringW(&szKeyName[1], - &ClassGuidList[dwGuidListIndex]); - } - - dwGuidListIndex++; - } - - if (lError != ERROR_SUCCESS) - break; - } - - RegCloseKey(hClassesKey); + dwLength = MAX_GUID_STRING_LEN + 1; + lError = RegEnumKeyExW(hClassesKey, + dwIndex, + szKeyName, + &dwLength, + NULL, + NULL, + NULL, + NULL); + TRACE("RegEnumKeyExW() returns %ld\n", lError); + if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) + { + TRACE("Key name: %s\n", debugstr_w(szKeyName)); + + if (hClassKey != NULL) + RegCloseKey(hClassKey); + if (RegOpenKeyExW(hClassesKey, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hClassKey) != ERROR_SUCCESS) + { + goto cleanup; + } + + if (RegQueryValueExW(hClassKey, + REGSTR_VAL_NOUSECLASS, + NULL, + NULL, + NULL, + NULL) == ERROR_SUCCESS) + { + TRACE("'NoUseClass' value found!\n"); + continue; + } + + if ((Flags & DIBCI_NOINSTALLCLASS) && + (!RegQueryValueExW(hClassKey, + REGSTR_VAL_NOINSTALLCLASS, + NULL, + NULL, + NULL, + NULL))) + { + TRACE("'NoInstallClass' value found!\n"); + continue; + } + + if ((Flags & DIBCI_NODISPLAYCLASS) && + (!RegQueryValueExW(hClassKey, + REGSTR_VAL_NODISPLAYCLASS, + NULL, + NULL, + NULL, + NULL))) + { + TRACE("'NoDisplayClass' value found!\n"); + continue; + } + + TRACE("Guid: %s\n", debugstr_w(szKeyName)); + if (dwGuidListIndex < ClassGuidListSize) + { + if (szKeyName[0] == L'{' && szKeyName[37] == L'}') + szKeyName[37] = 0; + TRACE("Guid: %s\n", debugstr_w(&szKeyName[1])); + + UuidFromStringW(&szKeyName[1], + &ClassGuidList[dwGuidListIndex]); + } + + dwGuidListIndex++; + } + + if (lError != ERROR_SUCCESS) + break; + } if (RequiredSize != NULL) - *RequiredSize = dwGuidListIndex; + *RequiredSize = dwGuidListIndex; if (ClassGuidListSize < dwGuidListIndex) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - return TRUE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + ret = TRUE; + +cleanup: + if (hClassesKey != INVALID_HANDLE_VALUE) + RegCloseKey(hClassesKey); + if (hClassKey != NULL) + RegCloseKey(hClassKey); + return ret; } /*********************************************************************** @@ -404,18 +399,19 @@ { WCHAR szKeyName[MAX_GUID_STRING_LEN + 1]; WCHAR szClassName[256]; - HKEY hClassesKey; - HKEY hClassKey; + HKEY hClassesKey = INVALID_HANDLE_VALUE; + HKEY hClassKey = NULL; DWORD dwLength; DWORD dwIndex; LONG lError; DWORD dwGuidListIndex = 0; + BOOL ret = FALSE; TRACE("%s %p %lu %p %s %p\n", debugstr_w(ClassName), ClassGuidList, ClassGuidListSize, RequiredSize, debugstr_w(MachineName), Reserved); if (RequiredSize != NULL) - *RequiredSize = 0; + *RequiredSize = 0; hClassesKey = SetupDiOpenClassRegKeyExW(NULL, KEY_ENUMERATE_SUB_KEYS, @@ -423,86 +419,83 @@ MachineName, Reserved); if (hClassesKey == INVALID_HANDLE_VALUE) - { - return FALSE; - } + goto cleanup; for (dwIndex = 0; ; dwIndex++) { - dwLength = MAX_GUID_STRING_LEN + 1; - lError = RegEnumKeyExW(hClassesKey, - dwIndex, - szKeyName, - &dwLength, - NULL, - NULL, - NULL, - NULL); - TRACE("RegEnumKeyExW() returns %ld\n", lError); - if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) - { - TRACE("Key name: %s\n", debugstr_w(szKeyName)); - - if (RegOpenKeyExW(hClassesKey, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hClassKey)) - { - RegCloseKey(hClassesKey); - return FALSE; - } - - dwLength = 256 * sizeof(WCHAR); - if (!RegQueryValueExW(hClassKey, - Class, - NULL, - NULL, - (LPBYTE)szClassName, - &dwLength)) - { - TRACE("Class name: %s\n", debugstr_w(szClassName)); - - if (strcmpiW(szClassName, ClassName) == 0) - { - TRACE("Found matching class name\n"); - - TRACE("Guid: %s\n", debugstr_w(szKeyName)); - if (dwGuidListIndex < ClassGuidListSize) - { - if (szKeyName[0] == L'{' && szKeyName[37] == L'}') - { - szKeyName[37] = 0; - } - TRACE("Guid: %s\n", debugstr_w(&szKeyName[1])); - - UuidFromStringW(&szKeyName[1], - &ClassGuidList[dwGuidListIndex]); - } - - dwGuidListIndex++; - } - } - - RegCloseKey(hClassKey); - } - - if (lError != ERROR_SUCCESS) - break; - } - - RegCloseKey(hClassesKey); + dwLength = MAX_GUID_STRING_LEN + 1; + lError = RegEnumKeyExW(hClassesKey, + dwIndex, + szKeyName, + &dwLength, + NULL, + NULL, + NULL, + NULL); + TRACE("RegEnumKeyExW() returns %ld\n", lError); + if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) + { + TRACE("Key name: %s\n", debugstr_w(szKeyName)); + + if (hClassKey != NULL) + RegCloseKey(hClassKey); + if (RegOpenKeyExW(hClassesKey, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hClassKey) != ERROR_SUCCESS) + { + goto cleanup; + } + + dwLength = 256 * sizeof(WCHAR); + if (RegQueryValueExW(hClassKey, + Class, + NULL, + NULL, + (LPBYTE)szClassName, + &dwLength) == ERROR_SUCCESS) + { + TRACE("Class name: %s\n", debugstr_w(szClassName)); + + if (strcmpiW(szClassName, ClassName) == 0) + { + TRACE("Found matching class name\n"); + + TRACE("Guid: %s\n", debugstr_w(szKeyName)); + if (dwGuidListIndex < ClassGuidListSize) + { + if (szKeyName[0] == L'{' && szKeyName[37] == L'}') + szKeyName[37] = 0; + TRACE("Guid: %s\n", debugstr_w(&szKeyName[1])); + + UuidFromStringW(&szKeyName[1], + &ClassGuidList[dwGuidListIndex]); + } + + dwGuidListIndex++; + } + } + } + + if (lError != ERROR_SUCCESS) + break; + } if (RequiredSize != NULL) - *RequiredSize = dwGuidListIndex; + *RequiredSize = dwGuidListIndex; if (ClassGuidListSize < dwGuidListIndex) - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - - return TRUE; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + ret = TRUE; + +cleanup: + if (hClassesKey != INVALID_HANDLE_VALUE) + RegCloseKey(hClassesKey); + if (hClassKey != NULL) + RegCloseKey(hClassKey); + return ret; } /*********************************************************************** @@ -551,7 +544,7 @@ if (MachineName) MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); ret = SetupDiClassNameFromGuidExW(ClassGuid, ClassNameW, MAX_CLASS_NAME_LEN, - NULL, MachineNameW, Reserved); + NULL, MachineNameW, Reserved); if (ret) { int len = WideCharToMultiByte(CP_ACP, 0, ClassNameW, -1, ClassName, @@ -578,6 +571,7 @@ HKEY hKey; DWORD dwLength; LONG rc; + BOOL ret = FALSE; TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassName, ClassNameSize, RequiredSize, debugstr_w(MachineName), Reserved); @@ -588,46 +582,45 @@ MachineName, Reserved); if (hKey == INVALID_HANDLE_VALUE) - { - return FALSE; - } + goto cleanup; if (RequiredSize != NULL) { - dwLength = 0; - rc = RegQueryValueExW(hKey, - Class, - NULL, - NULL, - NULL, - &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - RegCloseKey(hKey); - return FALSE; - } - - *RequiredSize = dwLength / sizeof(WCHAR); + dwLength = 0; + rc = RegQueryValueExW(hKey, + Class, + NULL, + NULL, + NULL, + &dwLength); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + + *RequiredSize = dwLength / sizeof(WCHAR); } dwLength = ClassNameSize * sizeof(WCHAR); rc = RegQueryValueExW(hKey, - Class, - NULL, - NULL, - (LPBYTE)ClassName, - &dwLength); + Class, + NULL, + NULL, + (LPBYTE)ClassName, + &dwLength); if (rc != ERROR_SUCCESS) { - SetLastError(rc); - RegCloseKey(hKey); - return FALSE; - } - - RegCloseKey(hKey); - - return TRUE; + SetLastError(rc); + goto cleanup; + } + + ret = TRUE; + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + return ret; } /*********************************************************************** @@ -1233,8 +1226,9 @@ PCWSTR MachineName, PVOID Reserved) { - HKEY hKey; + HKEY hKey = INVALID_HANDLE_VALUE; DWORD dwLength; + BOOL ret = FALSE; TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassDescription, ClassDescriptionSize, RequiredSize, debugstr_w(MachineName), Reserved); @@ -1246,42 +1240,44 @@ Reserved); if (hKey == INVALID_HANDLE_VALUE) { - WARN("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError()); - return FALSE; + WARN("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError()); + goto cleanup; } if (RequiredSize != NULL) { - dwLength = 0; - if (RegQueryValueExW(hKey, - NULL, - NULL, - NULL, - NULL, - &dwLength)) - { - RegCloseKey(hKey); - return FALSE; - } - - *RequiredSize = dwLength / sizeof(WCHAR); + dwLength = 0; + if (RegQueryValueExW(hKey, + NULL, + NULL, + NULL, + NULL, + &dwLength) != ERROR_SUCCESS) + { + goto cleanup; + } + + *RequiredSize = dwLength / sizeof(WCHAR); } dwLength = ClassDescriptionSize * sizeof(WCHAR); if (RegQueryValueExW(hKey, - NULL, - NULL, - NULL, - (LPBYTE)ClassDescription, - &dwLength)) - { - RegCloseKey(hKey); - return FALSE; - } - - RegCloseKey(hKey); - - return TRUE; + NULL, + NULL, + NULL, + (LPBYTE)ClassDescription, + &dwLength) != ERROR_SUCCESS) + { + goto cleanup; + } + + ret = TRUE; + +cleanup: + if (hKey != INVALID_HANDLE_VALUE) + RegCloseKey(hKey); + + return ret; } /*********************************************************************** @@ -1432,7 +1428,7 @@ LPCWSTR Enumerator, HKEY hEnumeratorKey) /* handle to Enumerator registry key */ { - HKEY hDeviceIdKey, hInstanceIdKey; + HKEY hDeviceIdKey = NULL, hInstanceIdKey; WCHAR KeyBuffer[MAX_PATH]; WCHAR InstancePath[MAX_PATH]; LPWSTR pEndOfInstancePath; /* Pointer into InstancePath buffer */ @@ -1449,13 +1445,15 @@ if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) - return rc; + goto cleanup; i++; /* Open device id sub key */ + if (hDeviceIdKey != NULL) + RegCloseKey(hDeviceIdKey); rc = RegOpenKeyExW(hEnumeratorKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hDeviceIdKey); if (rc != ERROR_SUCCESS) - return rc; + goto cleanup; strcpyW(InstancePath, Enumerator); strcatW(InstancePath, L"\\"); strcatW(InstancePath, KeyBuffer); @@ -1473,19 +1471,13 @@ if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) - { - RegCloseKey(hDeviceIdKey); - return rc; - } + goto cleanup; j++; /* Open instance id sub key */ rc = RegOpenKeyExW(hDeviceIdKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hInstanceIdKey); if (rc != ERROR_SUCCESS) - { - RegCloseKey(hDeviceIdKey); - return rc; - } + goto cleanup; *pEndOfInstancePath = '\0'; strcatW(InstancePath, KeyBuffer); @@ -1503,13 +1495,12 @@ } else if (rc != ERROR_SUCCESS) { - RegCloseKey(hDeviceIdKey); - return rc; + goto cleanup; } else if (dwRegType != REG_SZ) { - RegCloseKey(hDeviceIdKey); - return ERROR_GEN_FAILURE; + rc = ERROR_GEN_FAILURE; + goto cleanup; } else { @@ -1528,16 +1519,20 @@ /* Add the entry to the list */ if (!CreateDeviceInfoElement(list, InstancePath, &KeyGuid, &deviceInfo)) { - RegCloseKey(hDeviceIdKey); - return GetLastError(); + rc = GetLastError(); + goto cleanup; } TRACE("Adding '%s' to device info set %p\n", debugstr_w(InstancePath), list); InsertTailList(&list->ListHead, &deviceInfo->ListEntry); } + } + + rc = ERROR_SUCCESS; + +cleanup: + if (hDeviceIdKey != NULL) RegCloseKey(hDeviceIdKey); - } - - return ERROR_SUCCESS; + return rc; } static LONG SETUP_CreateDevList( @@ -1546,7 +1541,9 @@ LPGUID class OPTIONAL, PCWSTR Enumerator OPTIONAL) { - HKEY HKLM, hEnumKey, hEnumeratorKey; + HKEY HKLM = HKEY_LOCAL_MACHINE; + HKEY hEnumKey = NULL; + HKEY hEnumeratorKey = NULL; WCHAR KeyBuffer[MAX_PATH]; DWORD i; DWORD dwLength; @@ -1555,24 +1552,22 @@ if (class && IsEqualIID(class, &GUID_NULL)) class = NULL; - /* Open Enum key */ + /* Open Enum key (if applicable) */ if (MachineName != NULL) { rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &HKLM); if (rc != ERROR_SUCCESS) - return rc; - } - else - HKLM = HKEY_LOCAL_MACHINE; - - rc = RegOpenKeyExW(HKLM, + goto cleanup; + } + + rc = RegOpenKeyExW( + HKLM, REGSTR_PATH_SYSTEMENUM, 0, KEY_ENUMERATE_SUB_KEYS, &hEnumKey); - if (MachineName != NULL) RegCloseKey(HKLM); if (rc != ERROR_SUCCESS) - return rc; + goto cleanup; /* If enumerator is provided, call directly SETUP_CreateDevListFromEnumerator. * Else, enumerate all enumerators and call SETUP_CreateDevListFromEnumerator @@ -1586,12 +1581,9 @@ 0, KEY_ENUMERATE_SUB_KEYS, &hEnumeratorKey); - RegCloseKey(hEnumKey); if (rc != ERROR_SUCCESS) - return rc; + goto cleanup; rc = SETUP_CreateDevListFromEnumerator(list, class, Enumerator, hEnumeratorKey); - RegCloseKey(hEnumeratorKey); - return rc; } else { @@ -1603,33 +1595,33 @@ rc = RegEnumKeyExW(hEnumKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); if (rc == ERROR_NO_MORE_ITEMS) break; - if (rc != ERROR_SUCCESS) - { - RegCloseKey(hEnumKey); - return rc; - } + else if (rc != ERROR_SUCCESS) + goto cleanup; i++; /* Open sub key */ + if (hEnumeratorKey != NULL) + RegCloseKey(hEnumeratorKey); rc = RegOpenKeyExW(hEnumKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hEnumeratorKey); if (rc != ERROR_SUCCESS) - { - RegCloseKey(hEnumKey); - return rc; - } + goto cleanup; /* Call SETUP_CreateDevListFromEnumerator */ rc = SETUP_CreateDevListFromEnumerator(list, class, KeyBuffer, hEnumeratorKey); - RegCloseKey(hEnumeratorKey); if (rc != ERROR_SUCCESS) - { - RegCloseKey(hEnumKey); - return rc; - } - } + goto cleanup; + } + rc = ERROR_SUCCESS; + } + +cleanup: + if (HKLM != HKEY_LOCAL_MACHINE) + RegCloseKey(HKLM); + if (hEnumKey != NULL) RegCloseKey(hEnumKey); - return ERROR_SUCCESS; - } + if (hEnumeratorKey != NULL) + RegCloseKey(hEnumeratorKey); + return rc; } static BOOL DestroyDeviceInterface(struct DeviceInterface* deviceInterface) @@ -1870,21 +1862,22 @@ * SetupDiGetClassDevsExW (SETUPAPI.@) */ HDEVINFO WINAPI SetupDiGetClassDevsExW( - CONST GUID *class, - LPCWSTR enumstr, - HWND parent, + CONST GUID *class OPTIONAL, + LPCWSTR enumstr OPTIONAL, + HWND parent OPTIONAL, DWORD flags, - HDEVINFO deviceset, - LPCWSTR machine, + HDEVINFO deviceset OPTIONAL, + LPCWSTR machine OPTIONAL, PVOID reserved) { HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE; struct DeviceInfoSet *list; LPGUID pClassGuid; LONG rc; + HDEVINFO ret = INVALID_HANDLE_VALUE; TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr), - parent, flags, deviceset, debugstr_w(machine), reserved); + parent, flags, deviceset, debugstr_w(machine), reserved); /* Create the deviceset if not set */ if (deviceset) @@ -1893,7 +1886,7 @@ if (list->magic != SETUP_DEV_INFO_SET_MAGIC) { SetLastError(ERROR_INVALID_HANDLE); - return INVALID_HANDLE_VALUE; + goto cleanup; } hDeviceInfo = deviceset; } @@ -1903,7 +1896,7 @@ flags & DIGCF_DEVICEINTERFACE ? NULL : class, NULL, machine, NULL); if (hDeviceInfo == INVALID_HANDLE_VALUE) - return INVALID_HANDLE_VALUE; + goto cleanup; list = (struct DeviceInfoSet *)hDeviceInfo; } @@ -1921,31 +1914,25 @@ if (rc != ERROR_SUCCESS) { SetLastError(rc); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - return hDeviceInfo; + goto cleanup; + } + ret = hDeviceInfo; } else if (flags & DIGCF_DEVICEINTERFACE) { if (class == NULL) { SetLastError(ERROR_INVALID_PARAMETER); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; + goto cleanup; } rc = SETUP_CreateInterfaceList(list, machine, (LPGUID)class, enumstr, flags & DIGCF_PRESENT); if (rc != ERROR_SUCCESS) { SetLastError(rc); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - return hDeviceInfo; + goto cleanup; + } + ret = hDeviceInfo; } else { @@ -1953,12 +1940,15 @@ if (rc != ERROR_SUCCESS) { SetLastError(rc); - if (!deviceset) - SetupDiDestroyDeviceInfoList(hDeviceInfo); - return INVALID_HANDLE_VALUE; - } - return hDeviceInfo; - } + goto cleanup; + } + ret = hDeviceInfo; + } + +cleanup: + if (!deviceset && hDeviceInfo != INVALID_HANDLE_VALUE && hDeviceInfo != ret) + SetupDiDestroyDeviceInfoList(hDeviceInfo); + return ret; } /*********************************************************************** @@ -3061,63 +3051,68 @@ WCHAR FullBuffer[MAX_PATH]; WCHAR Buffer[MAX_PATH]; DWORD RequiredSize; - HKEY hClassKey; - + HKEY hClassKey = NULL; + HKEY ret = INVALID_HANDLE_VALUE; + + FullBuffer[0] = '\0'; Buffer[0] = '\\'; if (!SetupGetLineTextW(NULL, - hInf, - Version, - ClassGUID, - &Buffer[1], - MAX_PATH - 1, - &RequiredSize)) - { - return INVALID_HANDLE_VALUE; + hInf, + Version, + ClassGUID, + &Buffer[1], + MAX_PATH - 1, + &RequiredSize)) + { + goto cleanup; } lstrcpyW(FullBuffer, REGSTR_PATH_CLASS_NT); lstrcatW(FullBuffer, Buffer); - if (!SetupGetLineTextW(NULL, - hInf, - Version, - Class, - Buffer, - MAX_PATH, - &RequiredSize)) + hInf, + Version, + Class, + Buffer, + MAX_PATH, + &RequiredSize)) { RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer); - return INVALID_HANDLE_VALUE; + goto cleanup; } if (ERROR_SUCCESS != RegCreateKeyExW(HKEY_LOCAL_MACHINE, - FullBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_SET_VALUE, - NULL, - &hClassKey, - NULL)) - { + FullBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, + NULL, + &hClassKey, + NULL)) + { + goto cleanup; + } + + if (ERROR_SUCCESS != RegSetValueExW(hClassKey, + Class, + 0, + REG_SZ, + (LPBYTE)Buffer, + RequiredSize * sizeof(WCHAR))) + { + goto cleanup; + } + + ret = hClassKey; + +cleanup: + if (hClassKey != NULL && hClassKey != ret) + RegCloseKey(hClassKey); + if (ret == INVALID_HANDLE_VALUE && FullBuffer[0] != '\0') RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer); - return INVALID_HANDLE_VALUE; - } - - if (ERROR_SUCCESS != RegSetValueExW(hClassKey, - Class, - 0, - REG_SZ, - (LPBYTE)Buffer, - RequiredSize * sizeof(WCHAR))) - { - RegCloseKey(hClassKey); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, FullBuffer); - return INVALID_HANDLE_VALUE; - } - - return hClassKey; + return ret; } @@ -3421,7 +3416,7 @@ cleanup: if (hClassKey != NULL && hClassKey != ret) - RegCloseKey(hClassesKey); + RegCloseKey(hClassKey); if (hClassesKey != NULL && hClassesKey != ret) RegCloseKey(hClassesKey); if (lpGuidString) @@ -4823,7 +4818,7 @@ if (Disposition == REG_CREATED_NEW_KEY) break; RegCloseKey(hKey); - hKey = INVALID_HANDLE_VALUE; + hKey = NULL; Index++; } if (Index > 9999) @@ -6117,7 +6112,7 @@ OUT PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { struct DeviceInfoSet *list; - HKEY hEnumKey, hKey; + HKEY hEnumKey, hKey = NULL; DWORD rc; BOOL ret = FALSE; @@ -6175,7 +6170,7 @@ if (rc != ERROR_SUCCESS) { SetLastError(rc); - return FALSE; + goto cleanup; } rc = RegOpenKeyExW( hEnumKey, @@ -6189,20 +6184,16 @@ if (rc == ERROR_FILE_NOT_FOUND) rc = ERROR_NO_SUCH_DEVINST; SetLastError(rc); - return FALSE; + goto cleanup; } /* FIXME: try to get ClassGUID from registry, instead of * sending GUID_NULL to CreateDeviceInfoElement */ if (!CreateDeviceInfoElement(list, DeviceInstanceId, &GUID_NULL, &deviceInfo)) - { - RegCloseKey(hKey); - return FALSE; - } + goto cleanup; InsertTailList(&list->ListHead, &deviceInfo->ListEntry); - RegCloseKey(hKey); ret = TRUE; } @@ -6214,6 +6205,9 @@ } } +cleanup: + if (hKey != NULL) + RegCloseKey(hKey); return ret; }

18 years, 7 months

[hpoussin] 21830: In case of error, Reg* functions set the output handle to NULL. Don't rely on it to be INVALID_HANDLE_VALUE This commit is related to bug 1455

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 7 18:02:00 2006 New Revision: 21830 URL: http://svn.reactos.ru/svn/reactos?rev=21830&view=rev Log: In case of error, Reg* functions set the output handle to NULL. Don't rely on it to be INVALID_HANDLE_VALUE This commit is related to bug 1455 Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sun May 7 18:02:00 2006 @@ -788,11 +788,15 @@ cleanup: if (ret == INVALID_HANDLE_VALUE) { - if (list && list->HKLM != 0 && list->HKLM != HKEY_LOCAL_MACHINE) - RegCloseKey(list->HKLM); + if (list) + { + if (list->HKLM != NULL && list->HKLM != HKEY_LOCAL_MACHINE) + RegCloseKey(list->HKLM); + } HeapFree(GetProcessHeap(), 0, list); } - HeapFree(GetProcessHeap(), 0, UNCServerName); + if (UNCServerName) + HeapFree(GetProcessHeap(), 0, UNCServerName); return ret; } @@ -1660,8 +1664,8 @@ struct DeviceInfoElement *deviceInfo; hInterfaceKey = INVALID_HANDLE_VALUE; - hDeviceInstanceKey = INVALID_HANDLE_VALUE; - hReferenceKey = INVALID_HANDLE_VALUE; + hDeviceInstanceKey = NULL; + hReferenceKey = NULL; /* Open registry key related to this interface */ hInterfaceKey = SetupDiOpenClassRegKeyExW(InterfaceGuid, KEY_ENUMERATE_SUB_KEYS, DIOCR_INTERFACE, MachineName, NULL); @@ -1684,7 +1688,7 @@ i++; /* Open sub key */ - if (hDeviceInstanceKey != INVALID_HANDLE_VALUE) + if (hDeviceInstanceKey != NULL) RegCloseKey(hDeviceInstanceKey); rc = RegOpenKeyExW(hInterfaceKey, KeyBuffer, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hDeviceInstanceKey); if (rc != ERROR_SUCCESS) @@ -1774,7 +1778,7 @@ continue; /* Open sub key */ - if (hReferenceKey != INVALID_HANDLE_VALUE) + if (hReferenceKey != NULL) RegCloseKey(hReferenceKey); rc = RegOpenKeyExW(hDeviceInstanceKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hReferenceKey); if (rc != ERROR_SUCCESS) @@ -1811,7 +1815,6 @@ } rc = RegQueryValueExW(hReferenceKey, SymbolicLink, NULL, NULL, (LPBYTE)pSymbolicLink, &dwLength); pSymbolicLink[dwLength / sizeof(WCHAR)] = '\0'; - RegCloseKey(hReferenceKey); if (rc != ERROR_SUCCESS) goto cleanup; if (!CreateDeviceInterface(deviceInfo, pSymbolicLink, InterfaceGuid, &interfaceInfo)) @@ -1850,9 +1853,9 @@ rc = ERROR_SUCCESS; cleanup: - if (hReferenceKey != INVALID_HANDLE_VALUE) + if (hReferenceKey != NULL) RegCloseKey(hReferenceKey); - if (hDeviceInstanceKey != INVALID_HANDLE_VALUE) + if (hDeviceInstanceKey != NULL) RegCloseKey(hDeviceInstanceKey); if (hInterfaceKey != INVALID_HANDLE_VALUE) RegCloseKey(hInterfaceKey); @@ -4619,8 +4622,8 @@ IN DWORD HwProfile, IN DWORD samDesired) { - HKEY hHWProfilesKey = INVALID_HANDLE_VALUE; - HKEY hHWProfileKey = INVALID_HANDLE_VALUE; + HKEY hHWProfilesKey = NULL; + HKEY hHWProfileKey = NULL; HKEY ret = INVALID_HANDLE_VALUE; LONG rc; @@ -4663,9 +4666,9 @@ ret = hHWProfileKey; cleanup: - if (hHWProfilesKey != INVALID_HANDLE_VALUE) + if (hHWProfilesKey != NULL) RegCloseKey(hHWProfilesKey); - if (hHWProfileKey != INVALID_HANDLE_VALUE && hHWProfileKey != ret) + if (hHWProfileKey != NULL && hHWProfileKey != ret) RegCloseKey(hHWProfileKey); return ret; } @@ -4712,10 +4715,10 @@ DWORD Index; /* Index used in the DriverKey name */ DWORD rc; HKEY hHWProfileKey = INVALID_HANDLE_VALUE; - HKEY hEnumKey = INVALID_HANDLE_VALUE; - HKEY hClassKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = NULL; + HKEY hClassKey = NULL; HKEY hDeviceKey = INVALID_HANDLE_VALUE; - HKEY hKey = INVALID_HANDLE_VALUE; + HKEY hKey = NULL; HKEY RootKey; if (Scope == DICS_FLAG_GLOBAL) @@ -4856,13 +4859,13 @@ HeapFree(GetProcessHeap(), 0, DriverKey); if (hHWProfileKey != INVALID_HANDLE_VALUE) RegCloseKey(hHWProfileKey); - if (hEnumKey != INVALID_HANDLE_VALUE) + if (hEnumKey != NULL) RegCloseKey(hEnumKey); - if (hClassKey != INVALID_HANDLE_VALUE) + if (hClassKey != NULL) RegCloseKey(hClassKey); if (hDeviceKey != INVALID_HANDLE_VALUE) RegCloseKey(hDeviceKey); - if (hKey != INVALID_HANDLE_VALUE && hKey != ret) + if (hKey != NULL && hKey != ret) RegCloseKey(hKey); } @@ -4907,8 +4910,8 @@ DWORD dwRegType; DWORD rc; HKEY hHWProfileKey = INVALID_HANDLE_VALUE; - HKEY hEnumKey = INVALID_HANDLE_VALUE; - HKEY hKey = INVALID_HANDLE_VALUE; + HKEY hEnumKey = NULL; + HKEY hKey = NULL; HKEY RootKey; if (Scope == DICS_FLAG_GLOBAL) @@ -4939,7 +4942,7 @@ KeyType == DIREG_DEV ? samDesired : KEY_QUERY_VALUE, &hKey); RegCloseKey(hEnumKey); - hEnumKey = INVALID_HANDLE_VALUE; + hEnumKey = NULL; if (rc != ERROR_SUCCESS) { SetLastError(rc); @@ -4976,7 +4979,7 @@ goto cleanup; } RegCloseKey(hKey); - hKey = INVALID_HANDLE_VALUE; + hKey = NULL; /* Need to open the driver key */ rc = RegOpenKeyExW( RootKey, @@ -5005,9 +5008,9 @@ cleanup: if (hHWProfileKey != INVALID_HANDLE_VALUE) RegCloseKey(hHWProfileKey); - if (hEnumKey != INVALID_HANDLE_VALUE) + if (hEnumKey != NULL) RegCloseKey(hEnumKey); - if (hKey != INVALID_HANDLE_VALUE && hKey != ret) + if (hKey != NULL && hKey != ret) RegCloseKey(hKey); } @@ -7010,7 +7013,7 @@ GetCurrentHwProfile( IN HDEVINFO DeviceInfoSet) { - HKEY hKey = INVALID_HANDLE_VALUE; + HKEY hKey = NULL; DWORD dwRegType, dwLength; DWORD hwProfile; LONG rc; @@ -7049,7 +7052,7 @@ ret = hwProfile; cleanup: - if (hKey != INVALID_HANDLE_VALUE) + if (hKey != NULL) RegCloseKey(hKey); return hwProfile; @@ -7638,7 +7641,6 @@ LPWSTR lpGuidString = NULL, lpFullGuidString = NULL; BOOL RebootRequired = FALSE; HKEY hKey = INVALID_HANDLE_VALUE; - HKEY hClassKey = INVALID_HANDLE_VALUE; BOOL NeedtoCopyFile; LARGE_INTEGER fullVersion; LONG rc; @@ -7894,8 +7896,6 @@ cleanup: /* End of installation */ - if (hClassKey != INVALID_HANDLE_VALUE) - RegCloseKey(hClassKey); if (hKey != INVALID_HANDLE_VALUE) RegCloseKey(hKey); if (lpGuidString) Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/install.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Sun May 7 18:02:00 2006 @@ -1167,7 +1167,7 @@ LPQUERY_SERVICE_CONFIG ServiceConfig = NULL; BOOL ret = FALSE; - HKEY hGroupOrderListKey = INVALID_HANDLE_VALUE; + HKEY hGroupOrderListKey = NULL; LPWSTR ServiceBinary = NULL; LPWSTR LoadOrderGroup = NULL; LPWSTR DisplayName = NULL; @@ -1359,7 +1359,7 @@ CloseServiceHandle(hSCManager); if (hService != NULL) CloseServiceHandle(hService); - if (hGroupOrderListKey != INVALID_HANDLE_VALUE) + if (hGroupOrderListKey != NULL) RegCloseKey(hGroupOrderListKey); MyFree(ServiceConfig); MyFree(ServiceBinary);

18 years, 7 months

[hpoussin] 21829: Replace some casts by CONTAINING_RECORD macro Fix handle leak in SetupDiOpenClassRegKeyExW

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 7 17:35:44 2006 New Revision: 21829 URL: http://svn.reactos.ru/svn/reactos?rev=21829&view=rev Log: Replace some casts by CONTAINING_RECORD macro Fix handle leak in SetupDiOpenClassRegKeyExW Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sun May 7 17:35:44 2006 @@ -826,7 +826,7 @@ SetLastError(ERROR_NO_MORE_ITEMS); else { - struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)ItemList; + struct DeviceInfoElement *DevInfo = CONTAINING_RECORD(ItemList, struct DeviceInfoElement, ListEntry); memcpy(&DeviceInfoData->ClassGuid, &DevInfo->ClassGuid, sizeof(GUID)); @@ -1661,6 +1661,7 @@ hInterfaceKey = INVALID_HANDLE_VALUE; hDeviceInstanceKey = INVALID_HANDLE_VALUE; + hReferenceKey = INVALID_HANDLE_VALUE; /* Open registry key related to this interface */ hInterfaceKey = SetupDiOpenClassRegKeyExW(InterfaceGuid, KEY_ENUMERATE_SUB_KEYS, DIOCR_INTERFACE, MachineName, NULL); @@ -2290,7 +2291,7 @@ while (ItemList != &list->ListHead && !Found) { PLIST_ENTRY InterfaceListEntry; - struct DeviceInfoElement *DevInfo = (struct DeviceInfoElement *)ItemList; + struct DeviceInfoElement *DevInfo = CONTAINING_RECORD(ItemList, struct DeviceInfoElement, ListEntry); if (DeviceInfoData && (struct DeviceInfoElement *)DeviceInfoData->Reserved != DevInfo) { /* We are not searching for this element */ @@ -2300,7 +2301,7 @@ InterfaceListEntry = DevInfo->InterfaceListHead.Flink; while (InterfaceListEntry != &DevInfo->InterfaceListHead && !Found) { - struct DeviceInterface *DevItf = (struct DeviceInterface *)InterfaceListEntry; + struct DeviceInterface *DevItf = CONTAINING_RECORD(InterfaceListEntry, struct DeviceInterface, ListEntry); if (!IsEqualIID(&DevItf->InterfaceClassGuid, InterfaceClassGuid)) { InterfaceListEntry = InterfaceListEntry->Flink; @@ -2394,7 +2395,7 @@ while (!IsListEmpty(&list->ListHead)) { ListEntry = RemoveHeadList(&list->ListHead); - deviceInfo = (struct DeviceInfoElement *)ListEntry; + deviceInfo = CONTAINING_RECORD(ListEntry, struct DeviceInfoElement, ListEntry); if (!DestroyDeviceInfoElement(deviceInfo)) return FALSE; } @@ -3330,12 +3331,13 @@ PCWSTR MachineName OPTIONAL, PVOID Reserved) { - LPWSTR lpGuidString; - LPWSTR lpFullGuidString; + LPWSTR lpGuidString = NULL; + LPWSTR lpFullGuidString = NULL; DWORD dwLength; HKEY HKLM; - HKEY hClassesKey; - HKEY hClassKey; + HKEY hClassesKey = NULL; + HKEY hClassKey = NULL; + HKEY ret = INVALID_HANDLE_VALUE; DWORD rc; LPCWSTR lpKeyName; @@ -3343,18 +3345,14 @@ Flags, debugstr_w(MachineName), Reserved); if (Flags == DIOCR_INSTALLER) - { lpKeyName = REGSTR_PATH_CLASS_NT; - } else if (Flags == DIOCR_INTERFACE) - { lpKeyName = REGSTR_PATH_DEVICE_CLASSES; - } else { ERR("Invalid Flags parameter!\n"); SetLastError(ERROR_INVALID_FLAGS); - return INVALID_HANDLE_VALUE; + goto cleanup; } if (MachineName != NULL) @@ -3363,32 +3361,35 @@ if (rc != ERROR_SUCCESS) { SetLastError(rc); - return INVALID_HANDLE_VALUE; + goto cleanup; } } else HKLM = HKEY_LOCAL_MACHINE; rc = RegOpenKeyExW(HKLM, - lpKeyName, - 0, - ClassGuid ? 0 : samDesired, - &hClassesKey); + lpKeyName, + 0, + ClassGuid ? 0 : samDesired, + &hClassesKey); if (MachineName != NULL) RegCloseKey(HKLM); if (rc != ERROR_SUCCESS) { - SetLastError(rc); - return INVALID_HANDLE_VALUE; + SetLastError(rc); + goto cleanup; } if (ClassGuid == NULL) - return hClassesKey; + { + /* Stop here. We don't need to open a subkey */ + ret = hClassesKey; + goto cleanup; + } if (UuidToStringW((UUID*)ClassGuid, &lpGuidString) != RPC_S_OK) { - SetLastError(ERROR_GEN_FAILURE); - RegCloseKey(hClassesKey); - return INVALID_HANDLE_VALUE; + SetLastError(ERROR_GEN_FAILURE); + goto cleanup; } dwLength = lstrlenW(lpGuidString); @@ -3396,32 +3397,36 @@ if (!lpFullGuidString) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - RpcStringFreeW(&lpGuidString); - return INVALID_HANDLE_VALUE; + goto cleanup; } lpFullGuidString[0] = '{'; memcpy(&lpFullGuidString[1], lpGuidString, dwLength * sizeof(WCHAR)); lpFullGuidString[dwLength + 1] = '}'; lpFullGuidString[dwLength + 2] = '\0'; - RpcStringFreeW(&lpGuidString); rc = RegOpenKeyExW(hClassesKey, - lpFullGuidString, - 0, - samDesired, - &hClassKey); + lpFullGuidString, + 0, + samDesired, + &hClassKey); if (rc != ERROR_SUCCESS) { - SetLastError(rc); - HeapFree(GetProcessHeap(), 0, lpFullGuidString); - RegCloseKey(hClassesKey); - return INVALID_HANDLE_VALUE; - } - - HeapFree(GetProcessHeap(), 0, lpFullGuidString); - RegCloseKey(hClassesKey); - - return hClassKey; + SetLastError(rc); + goto cleanup; + } + ret = hClassKey; + +cleanup: + if (hClassKey != NULL && hClassKey != ret) + RegCloseKey(hClassesKey); + if (hClassesKey != NULL && hClassesKey != ret) + RegCloseKey(hClassesKey); + if (lpGuidString) + RpcStringFreeW(&lpGuidString); + if (lpFullGuidString) + HeapFree(GetProcessHeap(), 0, lpFullGuidString); + + return ret; } /*********************************************************************** @@ -3942,7 +3947,8 @@ ListEntry = ClassCoInstallersListHead.Flink; while (rc == NO_ERROR && ListEntry != &ClassCoInstallersListHead) { - struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + struct CoInstallerElement *coinstaller; + coinstaller = CONTAINING_RECORD(ListEntry, struct CoInstallerElement, ListEntry); rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); coinstaller->PrivateData = Context.PrivateData; if (rc == ERROR_DI_POSTPROCESSING_REQUIRED) @@ -3957,7 +3963,8 @@ ListEntry = DeviceCoInstallersListHead.Flink; while (rc == NO_ERROR && ListEntry != &DeviceCoInstallersListHead) { - struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + struct CoInstallerElement *coinstaller; + coinstaller = CONTAINING_RECORD(ListEntry, struct CoInstallerElement, ListEntry); rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); coinstaller->PrivateData = Context.PrivateData; if (rc == ERROR_DI_POSTPROCESSING_REQUIRED) @@ -3996,7 +4003,8 @@ ListEntry = ClassCoInstallersListHead.Flink; while (ListEntry != &ClassCoInstallersListHead) { - struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + struct CoInstallerElement *coinstaller; + coinstaller = CONTAINING_RECORD(ListEntry, struct CoInstallerElement, ListEntry); if (coinstaller->DoPostProcessing) { Context.InstallResult = rc; @@ -4011,7 +4019,8 @@ ListEntry = DeviceCoInstallersListHead.Flink; while (ListEntry != &DeviceCoInstallersListHead) { - struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + struct CoInstallerElement *coinstaller; + coinstaller = CONTAINING_RECORD(ListEntry, struct CoInstallerElement, ListEntry); if (coinstaller->DoPostProcessing) { Context.InstallResult = rc; @@ -6023,7 +6032,7 @@ while (!IsListEmpty(&list->DriverListHead)) { ListEntry = RemoveHeadList(&list->DriverListHead); - driverInfo = (struct DriverInfoElement *)ListEntry; + driverInfo = CONTAINING_RECORD(ListEntry, struct DriverInfoElement, ListEntry); DestroyDriverInfoElement(driverInfo); } InstallParams.Reserved = 0; @@ -6043,7 +6052,7 @@ while (!IsListEmpty(&deviceInfo->DriverListHead)) { ListEntry = RemoveHeadList(&deviceInfo->DriverListHead); - driverInfo = (struct DriverInfoElement *)ListEntry; + driverInfo = CONTAINING_RECORD(ListEntry, struct DriverInfoElement, ListEntry); if ((PVOID)InstallParamsSet.Reserved == driverInfo) { InstallParamsSet.Reserved = 0; @@ -6321,7 +6330,7 @@ SetLastError(ERROR_NO_MORE_ITEMS); else { - struct DriverInfoElement *DrvInfo = (struct DriverInfoElement *)ItemList; + struct DriverInfoElement *DrvInfo = CONTAINING_RECORD(ItemList, struct DriverInfoElement, ListEntry); memcpy( &DriverInfoData->DriverType, @@ -6653,11 +6662,11 @@ SetLastError(ERROR_INVALID_PARAMETER); else { - *pDriverInfo = (struct DriverInfoElement *)ItemList; + *pDriverInfo = CONTAINING_RECORD(ItemList, struct DriverInfoElement, ListEntry); DriverInfoData->Reserved = (ULONG_PTR)ItemList; ret = TRUE; TRACE("Choosing driver whose rank is 0x%lx\n", - ((struct DriverInfoElement *)ItemList)->DriverRank); + (*pDriverInfo)->DriverRank); if (DeviceInfoData) memcpy(&DeviceInfoData->ClassGuid, &(*pDriverInfo)->ClassGuid, sizeof(GUID)); }

18 years, 7 months

[ekohl] 21828: Fix timeout handling.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 7 16:48:45 2006 New Revision: 21828 URL: http://svn.reactos.ru/svn/reactos?rev=21828&view=rev Log: Fix timeout handling. Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mai… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/mailslot.c (original) +++ trunk/reactos/dll/win32/kernel32/file/mailslot.c Sun May 7 16:48:45 2006 @@ -88,7 +88,17 @@ NULL, SecurityDescriptor); - DefaultTimeOut.QuadPart = lReadTimeout * 10000; + if (lReadTimeout == MAILSLOT_WAIT_FOREVER) + { + /* Set the max */ + DefaultTimeOut.LowPart = 0; + DefaultTimeOut.HighPart = 0x80000000; + } + else + { + /* Convert to NT format */ + DefaultTimeOut.QuadPart = UInt32x32To64(-10000, lReadTimeout); + } Status = NtCreateMailslotFile(&MailslotHandle, GENERIC_READ | SYNCHRONIZE | WRITE_DAC, @@ -154,7 +164,11 @@ } if (lpReadTimeout != NULL) { - *lpReadTimeout = (DWORD)(Buffer.ReadTimeout.QuadPart / -10000); + if (Buffer.ReadTimeout.LowPart == 0 && + Buffer.ReadTimeout.HighPart == 0x80000000) + *lpReadTimeout = MAILSLOT_WAIT_FOREVER; + else + *lpReadTimeout = (DWORD)(Buffer.ReadTimeout.QuadPart / -10000); } return(TRUE); @@ -173,7 +187,17 @@ IO_STATUS_BLOCK Iosb; NTSTATUS Status; - Timeout.QuadPart = lReadTimeout * -10000; + if (lReadTimeout == MAILSLOT_WAIT_FOREVER) + { + /* Set the max */ + Timeout.LowPart = 0; + Timeout.HighPart = 0x80000000; + } + else + { + /* Convert to NT format */ + Timeout.QuadPart = UInt32x32To64(-10000, lReadTimeout); + } Buffer.ReadTimeout = &Timeout; Status = NtSetInformationFile(hMailslot,

18 years, 7 months

[hpoussin] 21827: Fix a broken cast (thanks w3seek)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 7 16:09:01 2006 New Revision: 21827 URL: http://svn.reactos.ru/svn/reactos?rev=21827&view=rev Log: Fix a broken cast (thanks w3seek) Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Sun May 7 16:09:01 2006 @@ -2134,7 +2134,7 @@ list->MachineName = NULL; } - ClassImageListData->Reserved = (DWORD)list; /* FIXME: 64 bit portability issue */ + ClassImageListData->Reserved = (ULONG_PTR)list; ret = TRUE; cleanup:

18 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
38
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 May 2006