Ros-diffs June 2014

ros-diffs@reactos.org

15 participants
157 discussions

[ekohl] 63570: [USETUP] - Add status text for logical partition entries in the partition list. - Add logical partition creation page dummy.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 8 19:05:03 2014 New Revision: 63570 URL: http://svn.reactos.org/svn/reactos?rev=63570&view=rev Log: [USETUP] - Add status text for logical partition entries in the partition list. - Add logical partition creation page dummy. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.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 trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sun Jun 8 19:05:03 2014 @@ -1550,18 +1550,38 @@ while (TRUE) { /* Update status text */ - if (PartitionList->CurrentPartition == NULL || - PartitionList->CurrentPartition->IsPartitioned == FALSE) + if (PartitionList->CurrentPartition == NULL) { CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); } - else if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) - { - CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); + else if (PartitionList->CurrentPartition->LogicalPartition) + { + if (PartitionList->CurrentPartition->IsPartitioned) + { + CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); + } + else + { + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATELOGICAL)); + } } else { - CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); + if (PartitionList->CurrentPartition->IsPartitioned) + { + if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) + { + CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); + } + else + { + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); + } + } + else + { + CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); + } } CONSOLE_ConInKey(Ir); @@ -1616,25 +1636,45 @@ } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ { - Error = PrimaryPartitionCreationChecks(PartitionList); - if (Error != NOT_AN_ERROR) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; - } - - return CREATE_PRIMARY_PARTITION_PAGE; + if (PartitionList->CurrentPartition->LogicalPartition == FALSE) + { + Error = PrimaryPartitionCreationChecks(PartitionList); + if (Error != NOT_AN_ERROR) + { + MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; + } + + return CREATE_PRIMARY_PARTITION_PAGE; + } } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'E') /* E */ { - Error = ExtendedPartitionCreationChecks(PartitionList); - if (Error != NOT_AN_ERROR) - { - MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; - } - - return CREATE_EXTENDED_PARTITION_PAGE; + if (PartitionList->CurrentPartition->LogicalPartition == FALSE) + { + Error = ExtendedPartitionCreationChecks(PartitionList); + if (Error != NOT_AN_ERROR) + { + MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; + } + + return CREATE_EXTENDED_PARTITION_PAGE; + } + } + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L') /* L */ + { + if (PartitionList->CurrentPartition->LogicalPartition == TRUE) + { + Error = LogicalPartitionCreationChecks(PartitionList); + if (Error != NOT_AN_ERROR) + { + MUIDisplayError(Error, Ir, POPUP_WAIT_ANY_KEY); + return SELECT_PARTITION_PAGE; + } + + return CREATE_LOGICAL_PARTITION_PAGE; + } } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { @@ -2085,6 +2125,14 @@ } return CREATE_EXTENDED_PARTITION_PAGE; +} + + +static PAGE_NUMBER +CreateLogicalPartitionPage(PINPUT_RECORD Ir) +{ + + return SELECT_PARTITION_PAGE; } @@ -4029,6 +4077,10 @@ Page = CreateExtendedPartitionPage(&Ir); break; + case CREATE_LOGICAL_PARTITION_PAGE: + Page = CreateLogicalPartitionPage(&Ir); + break; + case DELETE_PARTITION_PAGE: Page = DeletePartitionPage(&Ir); break; 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] Sun Jun 8 19:05:03 2014 @@ -1651,6 +1651,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = « £ ¥ C = ê§¤ ¢ ¥ ¤ï« F3 = §å®¤"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = « £ ¥ D = §âà¨¢ ¥ ¤ï« F3 = §å®¤"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1647,6 +1647,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Instalovat C = Vytvoýit odd¡l F3 = Ukonit"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalovat D = Odstranit odd¡l F3 = Ukonit"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1642,6 +1642,8 @@ " Bitte warten..."}, {STRING_INSTALLCREATEPARTITION, " EINGABETASTE = Installieren P = Primre E = Erweiterte F3 = Installation abbr."}, + {STRING_INSTALLCREATELOGICAL, + " EINGABETASTE = Installieren L = Logisches Laufwerk F3 = Installation abbr."}, {STRING_INSTALLDELETEPARTITION, " EINGABETASTE = Installieren D = Partition lschen F3 = Installation abbr."}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1663,6 +1663,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = ¡«á©«© C = £ ¦¬¨å Partition F3 = §¦®é¨©"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = ¡«á©«© D = ¨ã Partition F3 = §¦®é¨©"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1636,6 +1636,8 @@ " Please wait..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1645,6 +1645,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Instalar C = Crear Partici¢n F3 = Salir"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_DELETEPARTITION, " D = Borrar Partici¢n F3 = Salir"}, {STRING_INSTALLDELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1636,6 +1636,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Paigalda C = Loo partitsioon F3 = Vlju"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Paigalda D = Kustuta partitsioon F3 = Vlju"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1650,6 +1650,8 @@ " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, " ENTRE = Installer P/E = Crer Partition Primaire/tendue F3 = Quitter"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTRE = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1638,6 +1638,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = C = F3 = "}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = D = F3 = "}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1640,6 +1640,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " INVIO = Installa C = Crea Partizione F3 = Esci"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " INVIO = Installa D = Rimuovi Partizione F3 = Esci"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1639,6 +1639,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = ²Ý½Ä°Ù C = Êß°Ã¨¼®Ý »¸¾² F3 = Á³¼"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = ²Ý½Ä°Ù D = Êß°Ã¨¼®Ý »¸¼Þ® F3 = Á³¼"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1647,6 +1647,8 @@ " Please wait..."}, {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1684,6 +1684,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Installeren C = Partitie aanmaken F3 = Afsluiten"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installeren D = Partitie verwijderen F3 = Afsluiten"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1648,6 +1648,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Instalacja C = Utworzenie Partycji F3 = Wyjcie"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalacja D = Skasowanie Partycji F3 = Wyjcie"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1675,6 +1675,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER=Instalar C=Criar partiÆo F3=Sair"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER=Instalar D=Apagar partiÆo F3=Sair"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1716,6 +1716,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Instalare C = Creare partiîie F3 = Ieire"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalare D = ¸tergere partiîie F3 = Ieire"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1640,6 +1640,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ëå®¤"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = áâ ®¢¨âì D = ¤ «¨âì à §¤¥« F3 = ëå®¤"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1650,6 +1650,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Inçtalova C = Vytvori oblas F3 = Skoni"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Inçtalova D = Odstr ni oblas F3 = Skoni"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1642,6 +1642,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Instalo C = Krijo Particion F3 = Dil"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalo D = Fshi Particion F3 = Dil"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1645,6 +1645,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = Installera C = Skapa Partition F3 = Avsluta"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installera D = Ta bort Partition F3 = Avsluta"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1613,6 +1613,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " Giri = Kur C = Blm Olutur F3 = k"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " Giri = Kur D = Blm Sil F3 = k"}, {STRING_DELETEPARTITION, 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] Sun Jun 8 19:05:03 2014 @@ -1645,6 +1645,8 @@ {STRING_INSTALLCREATEPARTITION, " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, // " ENTER = áâ ®¢¨â¨ C = â¢®à¨â¨ ®§¤i« F3 = ¨©â¨"}, + {STRING_INSTALLCREATELOGICAL, + " ENTER = Install L = Create Logical Partition F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = áâ ®¢¨â¨ D = ¨¤ «¨â¨ ®§¤i« F3 = ¨©â¨"}, {STRING_DELETEPARTITION, Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sun Jun 8 19:05:03 2014 @@ -99,6 +99,7 @@ #define STRING_PLEASEWAIT 1 #define STRING_INSTALLCREATEPARTITION 2 +#define STRING_INSTALLCREATELOGICAL 60 #define STRING_INSTALLDELETEPARTITION 3 #define STRING_DELETEPARTITION 59 #define STRING_PARTITIONSIZE 4 Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jun 8 19:05:03 2014 @@ -3088,4 +3088,22 @@ return ERROR_SUCCESS; } + +ULONG +LogicalPartitionCreationChecks( + IN PPARTLIST List) +{ +// PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + +// DiskEntry = List->CurrentDisk; + PartEntry = List->CurrentPartition; + + /* Fail if partition is already in use */ + if (PartEntry->IsPartitioned == TRUE) + return ERROR_NEW_PARTITION; + + return ERROR_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sun Jun 8 19:05:03 2014 @@ -254,4 +254,8 @@ ExtendedPartitionCreationChecks( IN PPARTLIST List); +ULONG +LogicalPartitionCreationChecks( + IN PPARTLIST List); + /* EOF */ Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Sun Jun 8 19:05:03 2014 @@ -130,6 +130,7 @@ SELECT_PARTITION_PAGE, CREATE_PRIMARY_PARTITION_PAGE, CREATE_EXTENDED_PARTITION_PAGE, + CREATE_LOGICAL_PARTITION_PAGE, DELETE_PARTITION_PAGE, SELECT_FILE_SYSTEM_PAGE,

10 years, 6 months

[akhaldi] 63569: [RPCRT4] * Reorder some exports, remove some commented out ones, add some missing ones and remove the ones that do not exist in native. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 18:46:01 2014 New Revision: 63569 URL: http://svn.reactos.org/svn/reactos?rev=63569&view=rev Log: [RPCRT4] * Reorder some exports, remove some commented out ones, add some missing ones and remove the ones that do not exist in native. CORE-8174 Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Sun Jun 8 18:46:01 2014 @@ -1,5 +1,6 @@ @ stdcall CreateProxyFromTypeInfo(ptr ptr ptr ptr ptr) @ stdcall CreateStubFromTypeInfo(ptr ptr ptr ptr) +# I_RpcServerTurnOnOffKeepalives @ stdcall CStdStubBuffer_AddRef(ptr) @ stdcall CStdStubBuffer_Connect(ptr ptr) @ stdcall CStdStubBuffer_CountRefs(ptr) @@ -9,9 +10,10 @@ @ stdcall CStdStubBuffer_Invoke(ptr ptr ptr) @ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr) @ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr) -@ stub CreateServerInterfaceFromStub # wxp @ stdcall DceErrorInqTextA (long ptr) @ stdcall DceErrorInqTextW (long ptr) +# DllGetClassObject +# DllInstall @ stdcall -private DllRegisterServer() @ stub GlobalMutexClearExternal @ stub GlobalMutexRequestExternal @@ -25,17 +27,17 @@ @ stub I_RpcBCacheAllocate @ stub I_RpcBCacheFree @ stub I_RpcBindingCopy +# I_RpcBindingHandleToAsyncHandle @ stub I_RpcBindingInqConnId @ stub I_RpcBindingInqDynamicEndPoint @ stub I_RpcBindingInqDynamicEndPointA @ stub I_RpcBindingInqDynamicEndPointW @ stub I_RpcBindingInqLocalClientPID # wxp +# I_RpcBindingInqMarshalledTargetInfo @ stub I_RpcBindingInqSecurityContext @ stdcall I_RpcBindingInqTransportType(ptr ptr) @ stub I_RpcBindingInqWireIdForSnego @ stub I_RpcBindingIsClientLocal -# 9x version of I_RpcBindingSetAsync has 3 arguments, not 2 -@ stdcall I_RpcBindingSetAsync(ptr ptr) @ stub I_RpcBindingToStaticStringBindingW @ stub I_RpcClearMutex @ stub I_RpcConnectionInqSockBuffSize @@ -53,6 +55,8 @@ @ stub I_RpcIfInqTransferSyntaxes @ stub I_RpcLogEvent @ stdcall I_RpcMapWin32Status(long) +# I_RpcNDRCGetWireRepresentation +# I_RpcNDRSContextEmergencyCleanup @ stdcall I_RpcNegotiateTransferSyntax(ptr) @ stub I_RpcNsBindingSetEntryName @ stub I_RpcNsBindingSetEntryNameA @@ -64,21 +68,25 @@ @ stub I_RpcProxyNewConnection # wxp @ stub I_RpcReallocPipeBuffer @ stdcall I_RpcReceive(ptr) +# I_RpcRecordCalloutFailure +# I_RpcReplyToClientWithStatus @ stub I_RpcRequestMutex +# I_RpcSNCHOption @ stdcall I_RpcSend(ptr) @ stdcall I_RpcSendReceive(ptr) @ stub I_RpcServerAllocateIpPort +# I_RpcServerCheckClientRestriction @ stub I_RpcServerInqAddressChangeFn @ stub I_RpcServerInqLocalConnAddress # wxp @ stub I_RpcServerInqTransportType +# I_RpcServerIsClientDisconnected @ stub I_RpcServerRegisterForwardFunction @ stub I_RpcServerSetAddressChangeFn -@ stdcall I_RpcServerStartListening(ptr) # win9x -@ stdcall I_RpcServerStopListening() # win9x @ stub I_RpcServerUseProtseq2A @ stub I_RpcServerUseProtseq2W @ stub I_RpcServerUseProtseqEp2A @ stub I_RpcServerUseProtseqEp2W +# I_RpcSessionStrictContextHandle @ stub I_RpcSetAsyncHandle @ stub I_RpcSsDontSerializeContext @ stub I_RpcSystemFunction001 # wxp (oh, brother!) @@ -92,7 +100,6 @@ @ stub I_RpcTransIoCancelled @ stub I_RpcTransServerNewConnection @ stub I_RpcTurnOnEEInfoPropagation # wxp -@ stdcall I_RpcWindowProc(ptr long long long) # win9x @ stub I_UuidCreate @ stub MIDL_wchar_strcpy @ stub MIDL_wchar_strlen @@ -118,7 +125,6 @@ @ stdcall NdrAllocate(ptr long) @ varargs NdrAsyncClientCall(ptr ptr) @ stub NdrAsyncServerCall -@ stdcall NdrAsyncStubCall(ptr ptr ptr ptr) @ stdcall NdrByteCountPointerBufferSize(ptr ptr ptr) @ stdcall NdrByteCountPointerFree(ptr ptr ptr) @ stdcall NdrByteCountPointerMarshall(ptr ptr ptr) @@ -126,8 +132,8 @@ @ stdcall NdrCStdStubBuffer2_Release(ptr ptr) @ stdcall NdrCStdStubBuffer_Release(ptr ptr) @ stdcall NdrClearOutParameters(ptr ptr ptr) +@ varargs -arch=i386 NdrClientCall(ptr ptr) NdrClientCall2 @ varargs NdrClientCall2(ptr ptr) -@ varargs -arch=i386 NdrClientCall(ptr ptr) NdrClientCall2 @ stdcall NdrClientContextMarshall(ptr ptr long) @ stdcall NdrClientContextUnmarshall(ptr ptr ptr) @ stub NdrClientInitialize @@ -173,6 +179,7 @@ @ stdcall NdrCorrelationFree(ptr) @ stdcall NdrCorrelationInitialize(ptr ptr long long) @ stdcall NdrCorrelationPass(ptr) +# NdrCreateServerInterfaceFromStub @ stub NdrDcomAsyncClientCall @ stub NdrDcomAsyncStubCall @ stdcall NdrDllCanUnloadNow(ptr) @@ -198,28 +205,19 @@ @ stdcall NdrFullPointerXlatInit(long long) @ stdcall NdrGetBuffer(ptr long ptr) @ stub NdrGetDcomProtocolVersion -@ stub NdrGetPartialBuffer -@ stub NdrGetPipeBuffer @ stub NdrGetSimpleTypeBufferAlignment # wxp @ stub NdrGetSimpleTypeBufferSize # wxp @ stub NdrGetSimpleTypeMemorySize # wxp @ stub NdrGetTypeFlags # wxp @ stdcall NdrGetUserMarshalInfo(ptr long ptr) -@ stub NdrHardStructBufferSize #(ptr ptr ptr) -@ stub NdrHardStructFree #(ptr ptr ptr) -@ stub NdrHardStructMarshall #(ptr ptr ptr) -@ stub NdrHardStructMemorySize #(ptr ptr) -@ stub NdrHardStructUnmarshall #(ptr ptr ptr long) @ stdcall NdrInterfacePointerBufferSize(ptr ptr ptr) @ stdcall NdrInterfacePointerFree(ptr ptr ptr) @ stdcall NdrInterfacePointerMarshall(ptr ptr ptr) @ stdcall NdrInterfacePointerMemorySize(ptr ptr) @ stdcall NdrInterfacePointerUnmarshall(ptr ptr ptr long) -@ stub NdrIsAppDoneWithPipes @ stdcall NdrMapCommAndFaultStatus(ptr ptr ptr long) -@ stub NdrMarkNextActivePipe +@ varargs NdrMesProcEncodeDecode(ptr ptr ptr) @ stub NdrMesProcEncodeDecode2 -@ varargs NdrMesProcEncodeDecode(ptr ptr ptr) @ stub NdrMesSimpleTypeAlignSize @ stub NdrMesSimpleTypeDecode @ stub NdrMesSimpleTypeEncode @@ -248,11 +246,6 @@ @ stub NdrPartialIgnoreClientMarshall # wxp @ stub NdrPartialIgnoreServerInitialize # wxp @ stub NdrPartialIgnoreServerUnmarshall # wxp -@ stub NdrPipePull -@ stub NdrPipePush -@ stub NdrPipeSendReceive -@ stub NdrPipesDone -@ stub NdrPipesInitialize @ stdcall NdrPointerBufferSize(ptr ptr ptr) @ stdcall NdrPointerFree(ptr ptr ptr) @ stdcall NdrPointerMarshall(ptr ptr ptr) @@ -378,13 +371,14 @@ @ stub RpcErrorClearInformation # wxp @ stdcall RpcErrorEndEnumeration(ptr) @ stdcall RpcErrorGetNextRecord(ptr long ptr) +# RpcErrorGetNumberOfRecords @ stdcall RpcErrorLoadErrorInfo(ptr long ptr) -@ stub RpcErrorNumberOfRecords # wxp @ stub RpcErrorResetEnumeration # wxp @ stdcall RpcErrorSaveErrorInfo(ptr ptr ptr) @ stdcall RpcErrorStartEnumeration(ptr) @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus +# RpcGetAuthorizationContextForClient @ stub RpcIfIdVectorFree @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr)

10 years, 6 months

[akhaldi] 63568: [ATL][ATL80][ATL100] * Do not rely on RegDeleteTreeW which is no longer exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 18:27:21 2014 New Revision: 63568 URL: http://svn.reactos.org/svn/reactos?rev=63568&view=rev Log: [ATL][ATL80][ATL100] * Do not rely on RegDeleteTreeW which is no longer exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/atl/registrar.c trunk/reactos/dll/win32/atl100/CMakeLists.txt trunk/reactos/dll/win32/atl80/CMakeLists.txt Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/CMakeLists.txt [iso-8859-1] Sun Jun 8 18:27:21 2014 @@ -2,9 +2,6 @@ add_definitions( -D__WINESRC__ -D_ATL_VER=_ATL_VER_30) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -22,6 +19,6 @@ add_library(atl SHARED ${SOURCE} rsrc.rc) set_module_type(atl win32dll) target_link_libraries(atl uuid wine) -add_importlibs(atl oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(atl oleaut32 ole32 user32 gdi32 advapi32 shlwapi msvcrt kernel32 ntdll) add_pch(atl precomp.h SOURCE) add_cd_file(TARGET atl DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Sun Jun 8 18:27:21 2014 @@ -17,6 +17,12 @@ */ #include <precomp.h> + +#define NO_SHLWAPI_PATH +#define NO_SHLWAPI_STRFCNS +#define NO_SHLWAPI_GDI +#define NO_SHLWAPI_STREAM +#include <shlwapi.h> /************************************************************** * ATLRegistrar implementation @@ -226,10 +232,10 @@ strbuf_write(buf->str, &name, -1); }else if(key_type == DO_DELETE) { TRACE("Deleting %s\n", debugstr_w(buf->str)); - RegDeleteTreeW(parent_key, buf->str); + SHDeleteKeyW(parent_key, buf->str); }else { if(key_type == FORCE_REMOVE) - RegDeleteTreeW(parent_key, buf->str); + SHDeleteKeyW(parent_key, buf->str); lres = RegCreateKeyW(parent_key, buf->str, &hkey); if(lres != ERROR_SUCCESS) { WARN("Could not create(open) key: %08x\n", lres); Modified: trunk/reactos/dll/win32/atl100/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/atl100/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl100/CMakeLists.txt [iso-8859-1] Sun Jun 8 18:27:21 2014 @@ -2,9 +2,6 @@ add_definitions( -D__WINESRC__ -D_ATL_VER=_ATL_VER_100) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -23,6 +20,6 @@ set_module_type(atl100 win32dll) target_link_libraries(atl100 uuid wine) -add_importlibs(atl100 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(atl100 ole32 oleaut32 user32 gdi32 advapi32 shlwapi msvcrt kernel32 ntdll) add_pch(atl100 precomp.h SOURCE) add_cd_file(TARGET atl100 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/atl80/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/atl80/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl80/CMakeLists.txt [iso-8859-1] Sun Jun 8 18:27:21 2014 @@ -2,9 +2,6 @@ add_definitions( -D__WINESRC__ -D_ATL_VER=_ATL_VER_80) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) spec2def(atl80.dll atl80.spec ADD_IMPORTLIB) @@ -20,6 +17,6 @@ add_library(atl80 SHARED ${SOURCE}) set_module_type(atl80 win32dll) target_link_libraries(atl80 uuid wine) -add_importlibs(atl80 oleaut32 user32 ole32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(atl80 oleaut32 user32 ole32 gdi32 advapi32 shlwapi msvcrt kernel32 ntdll) add_pch(atl80 precomp.h SOURCE) add_cd_file(TARGET atl80 DESTINATION reactos/system32 FOR all)

10 years, 6 months

[akhaldi] 63567: [ADVAPI32] * Reorder some exports, remove some commented out ones, add some missing ones and remove the ones that do not exist in native. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 18:13:10 2014 New Revision: 63567 URL: http://svn.reactos.org/svn/reactos?rev=63567&view=rev Log: [ADVAPI32] * Reorder some exports, remove some commented out ones, add some missing ones and remove the ones that do not exist in native. CORE-8174 Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Jun 8 18:13:10 2014 @@ -1,3 +1,4 @@ +@ stub I_ScGetCurrentGroupStateW @ stdcall A_SHAFinal(ptr ptr) @ stdcall A_SHAInit(ptr) @ stdcall A_SHAUpdate(ptr ptr long) @@ -24,7 +25,6 @@ @ stdcall AddAuditAccessAce(ptr long long ptr long long) @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) @ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) -;@ stdcall AddMandatoryAce(ptr long long long ptr) @ stdcall AddUsersToEncryptedFile(wstr ptr) @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) @@ -66,7 +66,6 @@ @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) -@ stdcall ControlServiceEx(ptr long long ptr) @ stdcall ControlTraceA(double str ptr long) @ stdcall ControlTraceW(double wstr ptr long) @ stub ConvertAccessToSecurityDescriptorA @@ -96,7 +95,6 @@ @ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long ptr ptr) @ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long ptr ptr) @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) -# @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) @ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) @ stdcall CreateProcessWithTokenW(ptr long wstr wstr long ptr wstr ptr ptr) @@ -189,7 +187,6 @@ @ stub ElfClearEventLogFileW @ stub ElfCloseEventLog @ stub ElfDeregisterEventSource -@ stub ElfDeregisterEventSourceW @ stub ElfFlushEventLog @ stub ElfNumberOfRecords @ stub ElfOldestRecord @@ -202,6 +199,7 @@ @ stub ElfRegisterEventSourceA @ stub ElfRegisterEventSourceW @ stub ElfReportEventA +# ElfReportEventAndSourceW @ stub ElfReportEventW @ stdcall EnableTrace(long long long ptr double) @ stdcall EncryptFileA(str) @@ -210,7 +208,6 @@ @ stdcall EncryptionDisable(wstr long) @ stdcall EnumDependentServicesA(long long ptr long ptr ptr) @ stdcall EnumDependentServicesW(long long ptr long ptr ptr) -@ stub EnumServiceGroupA @ stdcall EnumServiceGroupW(ptr long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusA(long long long ptr long ptr ptr ptr) @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @@ -254,7 +251,6 @@ @ stub GetLocalManagedApplications @ stub GetManagedApplicationCategories @ stub GetManagedApplications -@ stub GetMangledSiteSid @ stdcall GetMultipleTrusteeA(ptr) @ stdcall GetMultipleTrusteeOperationA(ptr) @ stdcall GetMultipleTrusteeOperationW(ptr) @@ -285,7 +281,6 @@ @ stdcall GetSidLengthRequired(long) @ stdcall GetSidSubAuthority(ptr long) @ stdcall GetSidSubAuthorityCount(ptr) -@ stdcall GetSiteSidFromToken(ptr) @ stdcall GetTokenInformation(long long ptr long ptr) @ stdcall GetTraceEnableFlags(double) @ stdcall GetTraceEnableLevel(double) @@ -299,11 +294,10 @@ @ stdcall GetUserNameA(ptr ptr) @ stdcall GetUserNameW(ptr ptr) @ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) -@ stub I_ScGetCurrentGroupStateW +# I_QueryTagInformation @ stub I_ScIsSecurityProcess @ stub I_ScPnPGetServiceName @ stub I_ScSendTSMessage -@ stub I_ScSetServiceBit @ stdcall I_ScSetServiceBitsA(ptr long long long str) @ stdcall I_ScSetServiceBitsW(ptr long long long wstr) @ stub IdentifyCodeAuthzLevelW @@ -319,7 +313,6 @@ @ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) @ stdcall InitiateSystemShutdownW(str str long long long) @ stub InstallApplication -@ stub IsProcessRestricted @ stdcall IsTextUnicode(ptr long ptr) ntdll.RtlIsTextUnicode @ stdcall IsTokenRestricted(long) @ stub IsTokenUntrusted @@ -370,8 +363,8 @@ @ stub LsaICLookupNamesWithCreds @ stub LsaICLookupSids @ stub LsaICLookupSidsWithCreds +@ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) @ stdcall LsaLookupNames(ptr long ptr ptr ptr) -@ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) @ stdcall LsaLookupPrivilegeDisplayName(ptr ptr ptr ptr) @ stdcall LsaLookupPrivilegeName(ptr ptr ptr) @ stdcall LsaLookupPrivilegeValue(ptr ptr ptr) @@ -411,10 +404,10 @@ @ stdcall MD5Final(ptr) @ stdcall MD5Init(ptr) @ stdcall MD5Update(ptr ptr long) +@ stub MSChapSrvChangePassword2 @ stub MSChapSrvChangePassword -@ stub MSChapSrvChangePassword2 +@ stdcall MakeAbsoluteSD2(ptr ptr) @ stdcall MakeAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall MakeAbsoluteSD2(ptr ptr) @ stdcall MakeSelfRelativeSD(ptr ptr ptr) @ stdcall MapGenericMask(ptr ptr) ntdll.RtlMapGenericMask @ stdcall NotifyBootConfigStatus(long) @@ -446,11 +439,9 @@ @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) @ stub ProcessIdleTasks @ stub ProcessTrace -@ stub ProvAccessRightsToNTAccessMask # ? @ stdcall QueryAllTracesA(ptr long ptr) @ stdcall QueryAllTracesW(ptr long ptr) @ stdcall QueryRecoveryAgentsOnEncryptedFile(wstr ptr) -@ stdcall QuerySecurityAccessMask(long ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @ stdcall QueryServiceConfigA(long ptr long ptr) @@ -463,15 +454,14 @@ @ stub QueryTraceA @ stub QueryTraceW @ stdcall QueryUsersOnEncryptedFile(wstr ptr) -@ stdcall QueryWindows31FilesMigration(long) @ stub ReadEncryptedFileRaw @ stdcall ReadEventLogA(long long long ptr long ptr ptr) @ stdcall ReadEventLogW(long long long ptr long ptr ptr) @ stdcall RegCloseKey(long) @ stdcall RegConnectRegistryA(str long ptr) +# RegConnectRegistryExA +# RegConnectRegistryExW @ stdcall RegConnectRegistryW(wstr long ptr) -@ stdcall RegCopyTreeA(ptr str ptr) -@ stdcall RegCopyTreeW(ptr wstr ptr) @ stdcall RegCreateKeyA(long str ptr) @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @@ -480,14 +470,9 @@ @ stdcall RegDeleteKeyExA(long str long long) @ stdcall RegDeleteKeyExW(long wstr long long) @ stdcall RegDeleteKeyW(long wstr) -@ stdcall RegDeleteKeyValueA(ptr str str) -@ stdcall RegDeleteKeyValueW(ptr wstr wstr) -@ stdcall RegDeleteTreeA(long str) -@ stdcall RegDeleteTreeW(long wstr) @ stdcall RegDeleteValueA(long str) @ stdcall RegDeleteValueW(long wstr) @ stdcall RegDisablePredefinedCache() -@ stdcall RegDisablePredefinedCacheEx() @ stdcall RegDisableReflectionKey(ptr) @ stdcall RegEnableReflectionKey(ptr) @ stdcall RegEnumKeyA(long long ptr long) @@ -502,8 +487,6 @@ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) @ stdcall RegLoadKeyA(long str str) @ stdcall RegLoadKeyW(long wstr wstr) -@ stdcall RegLoadMUIStringA(long str str long ptr long str) -@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) @ stdcall RegNotifyChangeKeyValue(long long long long long) @ stdcall RegOpenCurrentUser(long ptr) @ stdcall RegOpenKeyA(long str ptr) @@ -521,7 +504,6 @@ @ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) @ stdcall RegQueryValueW(long wstr ptr ptr) -@ stub RegRemapPreDefKey @ stdcall RegReplaceKeyA(long str str str) @ stdcall RegReplaceKeyW(long wstr wstr wstr) @ stdcall RegRestoreKeyA(long str long) @@ -531,8 +513,6 @@ @ stdcall RegSaveKeyExW(long str ptr long) @ stdcall RegSaveKeyW(long ptr ptr) @ stdcall RegSetKeySecurity(long long ptr) -@ stdcall RegSetKeyValueA(long str str long ptr long) -@ stdcall RegSetKeyValueW(long wstr wstr long ptr long) @ stdcall RegSetValueA(long str long ptr long) @ stdcall RegSetValueExA(long str long long ptr long) @ stdcall RegSetValueExW(long wstr long long ptr long) @@ -587,7 +567,6 @@ @ stdcall SetNamedSecurityInfoW(wstr long ptr ptr ptr ptr ptr) @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) @ stub SetPrivateObjectSecurityEx -@ stdcall SetSecurityAccessMask(long ptr) @ stdcall SetSecurityDescriptorControl(ptr long long) @ stdcall SetSecurityDescriptorDacl(ptr long ptr long) @ stdcall SetSecurityDescriptorGroup(ptr ptr long) @@ -612,7 +591,6 @@ @ stdcall StartTraceW(ptr wstr ptr) @ stub StopTraceA @ stub StopTraceW -@ stdcall SynchronizeWindows31FilesAndWindowsNTRegistry(long long long long) @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr)

10 years, 6 months

[akhaldi] 63566: [UMPNPMGR] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 18:10:04 2014 New Revision: 63566 URL: http://svn.reactos.org/svn/reactos?rev=63566&view=rev Log: [UMPNPMGR] * Do not rely on RegDeleteTreeW which shouldn't be exported. * We no longer need to define _WIN32_WINNT as 0x600. CORE-8174 Modified: trunk/reactos/base/services/umpnpmgr/CMakeLists.txt trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/CMa… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/CMakeLists.txt [iso-8859-1] Sun Jun 8 18:10:04 2014 @@ -1,8 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl) @@ -17,5 +14,5 @@ ${PSEH_LIB}) set_module_type(umpnpmgr win32cui UNICODE) -add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll) +add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Jun 8 18:10:04 2014 @@ -44,6 +44,7 @@ #include <cfgmgr32.h> #include <regstr.h> #include <userenv.h> +#include <shlwapi.h> #include <pnp_s.h> #define NDEBUG @@ -1142,7 +1143,7 @@ if (ulFlags & CM_DELETE_CLASS_SUBKEYS) { - if (RegDeleteTreeW(hClassKey, pszClassGuid) != ERROR_SUCCESS) + if (SHDeleteKeyW(hClassKey, pszClassGuid) != ERROR_SUCCESS) ret = CR_REGISTRY_ERROR; } else

10 years, 6 months

[akhaldi] 63565: [REACTOS/IDL] * Unfortunately widl seems to generate declarations for functions even when they're wrapped with version related cpp quotes, so hand this block to SVN for now. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 18:08:50 2014 New Revision: 63565 URL: http://svn.reactos.org/svn/reactos?rev=63565&view=rev Log: [REACTOS/IDL] * Unfortunately widl seems to generate declarations for functions even when they're wrapped with version related cpp quotes, so hand this block to SVN for now. CORE-8174 Modified: trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sun Jun 8 18:08:50 2014 @@ -792,73 +792,6 @@ [out] DWORD *pulSSDIFlags, [in] DWORD ulFlags); -cpp_quote("#if _WIN32_WINNT >= 0x0600") - - /* Function 65 */ - DWORD PNP_GetObjectPropKeys( - [in] handle_t hBinding, - [in, string, ref] LPWSTR ObjectName, - [in] DWORD ObjectType, - [in, string, unique] LPWSTR PropertyCultureName, - [in, out] PNP_PROP_COUNT *PropertyCount, - [out] PNP_PROP_COUNT *TransferLen, - [out, size_is(*PropertyCount), length_is(*TransferLen)] DEVPROPKEY *PropertyKeys, - [in] DWORD Flags); - - /* Function 66 */ - DWORD PNP_GetObjectProp( - [in] handle_t hBinding, - [in, string, ref] LPWSTR ObjectName, - [in] DWORD ObjectType, - [in, string, unique] LPWSTR PropertyCultureName, - [in] const DEVPROPKEY *PropertyKey, - [out] DEVPROPTYPE *PropertyType, - [in, out] PNP_PROP_SIZE *PropertySize, - [out] PNP_PROP_SIZE *TransferLen, - [out, size_is(*PropertySize), length_is(*TransferLen)] BYTE *PropertyBuffer, - [in] DWORD Flags); - - /* Function 67 */ - DWORD PNP_SetObjectProp( - [in] handle_t hBinding, - [in, string, ref] LPWSTR ObjectName, - [in] DWORD ObjectType, - [in, string, unique] LPWSTR PropertyCultureName, - [in] const DEVPROPKEY *PropertyKey, - [in] DEVPROPTYPE PropertyType, - [in] PNP_PROP_SIZE PropertySize, - [in, unique, size_is(PropertySize)] BYTE *PropertyBuffer, - [in] DWORD Flags); - - /* Function 68 */ - DWORD PNP_InstallDevInst( - [in] handle_t hBinding); /* FIXME */ - - /* Function 69 */ - DWORD PNP_ApplyPowerSettings( - [in] handle_t hBinding); /* FIXME */ - - /* Function 70 */ - DWORD PNP_DriverStoreAddDriverPackage( - [in] handle_t hBinding); /* FIXME */ - - /* Function 71 */ - DWORD PNP_DriverStoreDeleteDriverPackage( - [in] handle_t hBinding); /* FIXME */ - - /* Function 72 */ - DWORD PNP_RegisterServiceNotification( - [in] handle_t hBinding); /* FIXME */ - - /* Function 73 */ - DWORD PNP_SetActiveService( - [in] handle_t hBinding); /* FIXME */ - - /* Function 74 */ - DWORD PNP_DeleteServiceDevices( - [in] handle_t hBinding); /* FIXME */ - -cpp_quote("#endif /* WIN32_WINNT >= 0x0600 */") cpp_quote("#endif /* WIN32_WINNT >= 0x0501 */") }

10 years, 6 months

[hbelusca] 63564: [CONSRV] - Silence a DPRINT. - Properly initialize the selection.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 8 18:06:14 2014 New Revision: 63564 URL: http://svn.reactos.org/svn/reactos?rev=63564&view=rev Log: [CONSRV] - Silence a DPRINT. - Properly initialize the selection. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c [iso-8859-1] Sun Jun 8 18:06:14 2014 @@ -34,7 +34,7 @@ selWidth = GuiData->Selection.srSelection.Right - GuiData->Selection.srSelection.Left + 1; selHeight = GuiData->Selection.srSelection.Bottom - GuiData->Selection.srSelection.Top + 1; - DPRINT1("Selection is (%d|%d) to (%d|%d)\n", + DPRINT("Selection is (%d|%d) to (%d|%d)\n", GuiData->Selection.srSelection.Left, GuiData->Selection.srSelection.Top, GuiData->Selection.srSelection.Right, Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Jun 8 18:06:14 2014 @@ -533,8 +533,11 @@ GuiData->CmdIdLow = GuiData->CmdIdHigh = 0; /* Initialize the selection */ - RtlZeroMemory(&GuiData->Selection, sizeof(CONSOLE_SELECTION_INFO)); + RtlZeroMemory(&GuiData->Selection, sizeof(GuiData->Selection)); GuiData->Selection.dwFlags = CONSOLE_NO_SELECTION; + RtlZeroMemory(&GuiData->dwSelectionCursor, sizeof(GuiData->dwSelectionCursor)); + GuiData->LineSelection = FALSE; // Default to block selection + // TODO: Retrieve the selection mode via the registry. /* * We need to wait until the GUI has been fully initialized

10 years, 6 months

[jimtabor] 63563: [Win32k] - Fix functions. Old patch from 2009.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 8 17:56:28 2014 New Revision: 63563 URL: http://svn.reactos.org/svn/reactos?rev=63563&view=rev Log: [Win32k] - Fix functions. Old patch from 2009. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sun Jun 8 17:56:28 2014 @@ -2141,7 +2141,13 @@ CONST RECT *lpUnsafeRect, BOOL bErase) { - return NtUserRedrawWindow(hWnd, lpUnsafeRect, NULL, RDW_INVALIDATE | (bErase? RDW_ERASE : 0)); + UINT flags = RDW_INVALIDATE | (bErase ? RDW_ERASE : 0); + if (!hWnd) + { + flags = RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW; + lpUnsafeRect = NULL; + } + return NtUserRedrawWindow(hWnd, lpUnsafeRect, NULL, flags); } BOOL @@ -2151,6 +2157,11 @@ HRGN hRgn, BOOL bErase) { + if (!hWnd) + { + EngSetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } return NtUserRedrawWindow(hWnd, NULL, hRgn, RDW_INVALIDATE | (bErase? RDW_ERASE : 0)); } @@ -2197,11 +2208,13 @@ HWND hWnd, const RECT *lpRect) { - if (hWnd) + UINT flags = RDW_VALIDATE; + if (!hWnd) { - return NtUserRedrawWindow(hWnd, lpRect, NULL, RDW_VALIDATE ); + flags = RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW; + lpRect = NULL; } - return NtUserRedrawWindow(hWnd, lpRect, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ERASENOW|RDW_ALLCHILDREN); + return NtUserRedrawWindow(hWnd, lpRect, NULL, flags); } /* EOF */

10 years, 6 months

[akhaldi] 63562: [WINDOWSCODECS] * Do not rely on RegDeleteTreeW which shouldn't be exported. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 17:56:18 2014 New Revision: 63562 URL: http://svn.reactos.org/svn/reactos?rev=63562&view=rev Log: [WINDOWSCODECS] * Do not rely on RegDeleteTreeW which shouldn't be exported. CORE-8174 Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Sun Jun 8 17:56:18 2014 @@ -17,6 +17,8 @@ */ #include "wincodecs_private.h" + +#include <shlwapi.h> /*********************************************************************** * interface for self-registering @@ -374,11 +376,11 @@ for (; res == ERROR_SUCCESS && list->clsid; ++list) { StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = SHDeleteKeyW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = RegDeleteTreeW(instance_key, buf); + res = SHDeleteKeyW(instance_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -552,11 +554,11 @@ for (; res == ERROR_SUCCESS && list->clsid; ++list) { StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = SHDeleteKeyW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = RegDeleteTreeW(instance_key, buf); + res = SHDeleteKeyW(instance_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -709,11 +711,11 @@ for (; res == ERROR_SUCCESS && list->clsid; ++list) { StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = SHDeleteKeyW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = RegDeleteTreeW(instance_key, buf); + res = SHDeleteKeyW(instance_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -919,11 +921,11 @@ for (; res == ERROR_SUCCESS && list->clsid; ++list) { StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = SHDeleteKeyW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = RegDeleteTreeW(instance_key, buf); + res = SHDeleteKeyW(instance_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -1094,11 +1096,11 @@ for (; res == ERROR_SUCCESS && list->clsid; ++list) { StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = SHDeleteKeyW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; - res = RegDeleteTreeW(instance_key, buf); + res = SHDeleteKeyW(instance_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -2009,14 +2011,14 @@ for (; res == ERROR_SUCCESS && list->clsid; list++) { StringFromGUID2(list->clsid, buf, 39); - res = RegDeleteTreeW(instance_key, buf); + res = SHDeleteKeyW(instance_key, buf); } RegCloseKey(instance_key); RegCloseKey(categories_key); StringFromGUID2(&CLSID_WICImagingCategories, buf, 39); - res = RegDeleteTreeW(coclass_key, buf); + res = SHDeleteKeyW(coclass_key, buf); RegCloseKey(coclass_key);

10 years, 6 months

[akhaldi] 63561: [SHELL32] * Introduce vista.c to copy RegLoadMUIString related functions. If you think you're having a deja-vu, you are (r58809). * Use SHCopyKeyW instead of RegCopyTreeW and mark ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 8 17:51:38 2014 New Revision: 63561 URL: http://svn.reactos.org/svn/reactos?rev=63561&view=rev Log: [SHELL32] * Introduce vista.c to copy RegLoadMUIString related functions. If you think you're having a deja-vu, you are (r58809). * Use SHCopyKeyW instead of RegCopyTreeW and mark that it doesn't copy the security attributes of the keys. CORE-8174 Added: trunk/reactos/dll/win32/shell32/vista.c (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/openwithmenu.cpp Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Jun 8 17:51:38 2014 @@ -77,6 +77,7 @@ add_library(shell32 SHARED ${SOURCE} + vista.c shell32.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) Modified: trunk/reactos/dll/win32/shell32/openwithmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/openwith… ============================================================================== --- trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/openwithmenu.cpp [iso-8859-1] Sun Jun 8 17:51:38 2014 @@ -754,14 +754,15 @@ } /* Copy static verbs from Classes\Applications key */ - LONG Result = RegCopyTreeW(hSrcKey, NULL, hDestKey); + /* FIXME: SHCopyKey does not copy the security attributes of the keys */ + LSTATUS Result = SHCopyKeyW(hSrcKey, NULL, hDestKey, 0); RegCloseKey(hDestKey); RegCloseKey(hSrcKey); RegCloseKey(hKey); if (Result != ERROR_SUCCESS) { - ERR("RegCopyTreeW failed\n"); + ERR("SHCopyKeyW failed\n"); return FALSE; } Added: trunk/reactos/dll/win32/shell32/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/vista.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/vista.c (added) +++ trunk/reactos/dll/win32/shell32/vista.c [iso-8859-1] Sun Jun 8 17:51:38 2014 @@ -0,0 +1,220 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: Copied from advapi32/reg/reg.c + * PURPOSE: Registry functions + * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * Thomas Weidenmueller <w3seek(a)reactos.com> + * UPDATE HISTORY: + * Created 01/11/98 + * 19990309 EA Stubs + * 20050502 Fireball imported some stuff from WINE + */ + +/* FIXME: This file should go away once we properly handle Vista+ APIs */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +/****************************************************************************** + * load_string [Internal] + * + * This is basically a copy of user32/resource.c's LoadStringW. Necessary to + * avoid importing user32, which is higher level than advapi32. Helper for + * RegLoadMUIString. + */ +static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) +{ + HGLOBAL hMemory; + HRSRC hResource; + WCHAR *pString; + int idxString; + + /* Negative values have to be inverted. */ + if (HIWORD(resId) == 0xffff) + resId = (UINT)(-((INT)resId)); + + /* Load the resource into memory and get a pointer to it. */ + hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); + if (!hResource) return 0; + hMemory = LoadResource(hModule, hResource); + if (!hMemory) return 0; + pString = LockResource(hMemory); + + /* Strings are length-prefixed. Lowest nibble of resId is an index. */ + idxString = resId & 0xf; + while (idxString--) pString += *pString + 1; + + /* If no buffer is given, return length of the string. */ + if (!pwszBuffer) return *pString; + + /* Else copy over the string, respecting the buffer size. */ + cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); + if (cMaxChars >= 0) + { + memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); + pwszBuffer[cMaxChars] = L'\0'; + } + + return cMaxChars; +} + +/************************************************************************ + * RegLoadMUIStringW + * + * @implemented + */ +LONG WINAPI +RegLoadMUIStringW(IN HKEY hKey, + IN LPCWSTR pszValue OPTIONAL, + OUT LPWSTR pszOutBuf, + IN DWORD cbOutBuf, + OUT LPDWORD pcbData OPTIONAL, + IN DWORD Flags, + IN LPCWSTR pszDirectory OPTIONAL) +{ + DWORD dwValueType, cbData; + LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; + LONG result; + + /* Parameter sanity checks. */ + if (!hKey || !pszOutBuf) + return ERROR_INVALID_PARAMETER; + + if (pszDirectory && *pszDirectory) + { + FIXME("BaseDir parameter not yet supported!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check for value existence and correctness of it's type, allocate a buffer and load it. */ + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) + { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszTempBuffer) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + + /* Expand environment variables, if appropriate, or copy the original string over. */ + if (dwValueType == REG_EXPAND_SZ) + { + cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); + if (!cbData) goto cleanup; + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszExpandedBuffer) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); + } + else + { + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); + } + + /* If the value references a resource based string, parse the value and load the string. + * Else just copy over the original value. */ + result = ERROR_SUCCESS; + if (*pwszExpandedBuffer != L'@') /* '@' is the prefix for resource based string entries. */ + { + lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR)); + } + else + { + WCHAR *pComma = wcsrchr(pwszExpandedBuffer, L','); + UINT uiStringId; + HMODULE hModule; + + /* Format of the expanded value is 'path_to_dll,-resId' */ + if (!pComma || pComma[1] != L'-') + { + result = ERROR_BADKEY; + goto cleanup; + } + + uiStringId = _wtoi(pComma+2); + *pComma = L'\0'; + + hModule = LoadLibraryExW(pwszExpandedBuffer + 1, NULL, LOAD_LIBRARY_AS_DATAFILE); + if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) + result = ERROR_BADKEY; + FreeLibrary(hModule); + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszTempBuffer); + HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer); + return result; +} + +/************************************************************************ + * RegLoadMUIStringA + * + * @implemented + */ +LONG WINAPI +RegLoadMUIStringA(IN HKEY hKey, + IN LPCSTR pszValue OPTIONAL, + OUT LPSTR pszOutBuf, + IN DWORD cbOutBuf, + OUT LPDWORD pcbData OPTIONAL, + IN DWORD Flags, + IN LPCSTR pszDirectory OPTIONAL) +{ + UNICODE_STRING valueW, baseDirW; + WCHAR *pwszBuffer; + DWORD cbData = cbOutBuf * sizeof(WCHAR); + LONG result; + + valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL; + if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) || + !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszDirectory) || + !(pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbData))) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, Flags, + baseDirW.Buffer); + + if (result == ERROR_SUCCESS) + { + cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszOutBuf, cbOutBuf, NULL, NULL); + if (pcbData) + *pcbData = cbData; + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszBuffer); + RtlFreeUnicodeString(&baseDirW); + RtlFreeUnicodeString(&valueW); + + return result; +} Propchange: trunk/reactos/dll/win32/shell32/vista.c ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
16
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 2014