Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 63393: [USETUP]: French translation for extended partitions feature, see r63392.
by hbelusca＠svn.reactos.org 21 May '14

21 May '14

Author: hbelusca Date: Wed May 21 00:18:50 2014 New Revision: 63393 URL: http://svn.reactos.org/svn/reactos?rev=63393&view=rev Log: [USETUP]: French translation for extended partitions feature, see r63392. Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h 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] Wed May 21 00:18:50 2014 @@ -64,7 +64,7 @@ { 6, 8, - "Bienvenue l'installation de ReactOS", + "Bienvenue dans l'installation de ReactOS", TEXT_STYLE_HIGHLIGHT }, { @@ -140,7 +140,7 @@ { 6, 8, - "L'Installation de ReactOS est en phase de dveloppement.", + "L'installation de ReactOS est en phase de dveloppement.", TEXT_STYLE_NORMAL }, { @@ -457,7 +457,7 @@ { 6, 8, - "L'Installation de ReactOS est en phase de dveloppement.", + "L'installation de ReactOS est en phase de dveloppement.", TEXT_STYLE_NORMAL }, { @@ -814,13 +814,13 @@ { 6, 9, - "l'espace disque non utilise pour de nouvelles partitions.", + "l'espace disque non utilis pour de nouvelles partitions.", TEXT_STYLE_NORMAL }, { 8, 11, - "\x07 Appuyer sur HAUT ou BAS pour slectionner une entree de la liste.", + "\x07 Appuyer sur HAUT ou BAS pour slectionner une entre de la liste.", TEXT_STYLE_NORMAL }, { @@ -832,14 +832,13 @@ { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 Appuyer sur C pour creer une nouvelle partition.", + "\x07 Appuyer sur P pour crer une partition primaire.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 Appuyer sur E pour crer une partition tendue.", TEXT_STYLE_NORMAL }, { @@ -1300,7 +1299,7 @@ { { // NOT_AN_ERROR - "Success\n" + "Succs\n" }, { //ERROR_NOT_INSTALLED @@ -1509,34 +1508,34 @@ { //ERROR_INSUFFICIENT_DISKSPACE, "Pas assez d'espace libre dans la partition slectionne.\n" - " * Appuyez sur n'importe quelle touche pour continuer.", + " * Appuyer sur une touche pour continuer.", NULL }, { //ERROR_PARTITION_TABLE_FULL, - "You can not create a new primary or extended partition in the\n" - "partition table of this disk because the partition table is full.\n" + "Impossible de crer une nouvelle partition primaire ou tendue\n" + "sur ce disque parce que sa table de partition est pleine.\n" "\n" - " * Press any key to continue." + " * Appuyer sur une touche pour continuer." }, { //ERROR_ONLY_ONE_EXTENDED, - "You can not create more than one extended partition per disk.\n" + "Impossible de crer plus d'une partition tendue par disque.\n" "\n" - " * Press any key to continue." + " * Appuyer sur une touche pour continuer." }, { //ERROR_NOT_BEHIND_EXTENDED, - "You can not create a partition behind an extended partition.\n" + "Impossible de crer une partition prcdant une partition tendue.\n" "\n" - " * Press any key to continue." + " * Appuyer sur une touche pour continuer." }, { //ERROR_EXTENDED_NOT_LAST, - "An extended partition must always be the last\n" - "partition in a partition table.\n" + "Une partition tendue doit toujours être place en dernier\n" + "dans la table de partition.\n" "\n" - " * Press any key to continue." + " * Appuyer sur une touche pour continuer." }, { NULL, @@ -1650,19 +1649,17 @@ {STRING_PLEASEWAIT, " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " ENTRE = Installer C = Crer Partition F3 = Quitter"}, + " ENTRE = Installer C = Crer Partition Primaire E = Crer Partition tendue F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTRE = Installer D = Supprimer Partition F3 = Quitter"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Supprimer Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Taille de la nouvelle partition :"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a primary partition on"}, -// "Vous avez choisi de crer une nouvelle partition sur"}, + "Vous avez choisi de crer une partition primaire sur"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, - "You have chosen to create an extended partition on"}, + "Vous avez choisi de crer une partition tendue sur"}, {STRING_HDDSIZE, "Veuillez entrer la taille de la nouvelle partition en mgaoctets."}, {STRING_CREATEPARTITION, @@ -1746,7 +1743,7 @@ {STRING_MAXSIZE, "Mo (max. %lu Mo)"}, {STRING_EXTENDED_PARTITION, - "Extended Partition"}, + "Partition tendue"}, {STRING_UNFORMATTED, "Nouveau (non format)"}, {STRING_FORMATUNUSED,

1 0

[ekohl] 63392: [USETUP] - Implement creation of extended partitions. - Add creation checks for primary and extended partitions.
by ekohl＠svn.reactos.org 20 May '14

20 May '14

Author: ekohl Date: Tue May 20 23:48:36 2014 New Revision: 63392 URL: http://svn.reactos.org/svn/reactos?rev=63392&view=rev Log: [USETUP] - Implement creation of extended partitions. - Add creation checks for primary and extended partitions. Modified: trunk/reactos/base/setup/usetup/errorcode.h 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/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Tue May 20 23:48:36 2014 @@ -28,7 +28,8 @@ typedef enum { - ERROR_NOT_INSTALLED = 0, + NOT_AN_ERROR = 0, + ERROR_NOT_INSTALLED, ERROR_NO_HDD, ERROR_NO_SOURCE_DRIVE, ERROR_LOAD_TXTSETUPSIF, @@ -67,6 +68,12 @@ ERROR_UPDATE_GEOID, ERROR_INSUFFICIENT_DISKSPACE, + ERROR_PARTITION_TABLE_FULL, + ERROR_ONLY_ONE_EXTENDED, + ERROR_NOT_BEHIND_EXTENDED, + ERROR_EXTENDED_NOT_LAST, + + ERROR_LAST_ERROR_CODE }ERROR_NUMBER; 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] Tue May 20 23:48:36 2014 @@ -1463,12 +1463,14 @@ static PAGE_NUMBER SelectPartitionPage(PINPUT_RECORD Ir) { + ULONG Error; + MUIDisplayPage(SELECT_PARTITION_PAGE); if (PartitionList == NULL) { PartitionList = CreatePartitionList(2, - 19, + 21, xScreen - 3, yScreen - 3); if (PartitionList == NULL) @@ -1521,9 +1523,9 @@ return SELECT_PARTITION_PAGE; /* let the user select another partition */ } #endif - CreateNewPartition(PartitionList, - PartitionList->CurrentPartition->SectorCount.QuadPart, - TRUE); + CreatePrimaryPartition(PartitionList, + PartitionList->CurrentPartition->SectorCount.QuadPart, + TRUE); DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; @@ -1553,6 +1555,10 @@ { CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLCREATEPARTITION)); } + else if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) + { + CONSOLE_SetStatusText(MUIGetString(STRING_DELETEPARTITION)); + } else { CONSOLE_SetStatusText(MUIGetString(STRING_INSTALLDELETEPARTITION)); @@ -1591,27 +1597,42 @@ return SELECT_PARTITION_PAGE; /* let the user select another partition */ } #endif + if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) + continue; //return SELECT_PARTITION_PAGE; + if (PartitionList->CurrentPartition == NULL || PartitionList->CurrentPartition->IsPartitioned == FALSE) { - CreateNewPartition(PartitionList, - 0ULL, - TRUE); + CreatePrimaryPartition(PartitionList, + 0ULL, + TRUE); } DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'C') /* C */ - { - if (PartitionList->CurrentPartition->IsPartitioned == TRUE) - { - MUIDisplayError(ERROR_NEW_PARTITION, Ir, POPUP_WAIT_ANY_KEY); + 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_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; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { @@ -1773,7 +1794,7 @@ static PAGE_NUMBER -CreatePartitionPage(PINPUT_RECORD Ir) +CreatePrimaryPartitionPage(PINPUT_RECORD Ir) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -1907,15 +1928,161 @@ DPRINT ("Partition size: %I64u bytes\n", PartSize); - CreateNewPartition(PartitionList, - SectorCount, - FALSE); + CreatePrimaryPartition(PartitionList, + SectorCount, + FALSE); return SELECT_PARTITION_PAGE; } } - return CREATE_PARTITION_PAGE; + return CREATE_PRIMARY_PARTITION_PAGE; +} + + +static PAGE_NUMBER +CreateExtendedPartitionPage(PINPUT_RECORD Ir) +{ + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + BOOLEAN Quit; + BOOLEAN Cancel; + CHAR InputBuffer[50]; + ULONG MaxSize; + ULONGLONG PartSize; + ULONGLONG DiskSize; + ULONGLONG SectorCount; + PCHAR Unit; + + if (PartitionList == NULL || + PartitionList->CurrentDisk == NULL || + PartitionList->CurrentPartition == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + DiskEntry = PartitionList->CurrentDisk; + PartEntry = PartitionList->CurrentPartition; + + CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_EXTENDED_PARTITION)); + + DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; +#if 0 + if (DiskSize >= 10737418240) /* 10 GB */ + { + DiskSize = DiskSize / 1073741824; + Unit = MUIGetString(STRING_GB); + } + else +#endif + { + DiskSize = DiskSize / 1048576; + if (DiskSize == 0) + DiskSize = 1; + + Unit = MUIGetString(STRING_MB); + } + + if (DiskEntry->DriverName.Length > 0) + { + CONSOLE_PrintTextXY(6, 10, + MUIGetString(STRING_HDINFOPARTCREATE), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + &DiskEntry->DriverName); + } + else + { + CONSOLE_PrintTextXY(6, 10, + MUIGetString(STRING_HDDINFOUNK1), + DiskSize, + Unit, + DiskEntry->DiskNumber, + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id); + } + + CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); + +#if 0 + CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", + PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / 1048576); +#endif + + CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); + + PartEntry = PartitionList->CurrentPartition; + while (TRUE) + { + MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / 1048576; /* in MBytes (rounded) */ + + if (MaxSize > PARTITION_MAXSIZE) + MaxSize = PARTITION_MAXSIZE; + + ShowPartitionSizeInputBox(12, 14, xScreen - 12, 17, /* left, top, right, bottom */ + MaxSize, InputBuffer, &Quit, &Cancel); + + if (Quit == TRUE) + { + if (ConfirmQuit (Ir) == TRUE) + { + return QUIT_PAGE; + } + } + else if (Cancel == TRUE) + { + return SELECT_PARTITION_PAGE; + } + else + { + PartSize = atoi(InputBuffer); + + if (PartSize < 1) + { + /* Too small */ + continue; + } + + if (PartSize > MaxSize) + { + /* Too large */ + continue; + } + + /* Convert to bytes */ + if (PartSize == MaxSize) + { + /* Use all of the unpartitioned disk space */ + SectorCount = PartEntry->SectorCount.QuadPart; + } + else + { + /* Calculate the sector count from the size in MB */ + SectorCount = PartSize * 1048576 / DiskEntry->BytesPerSector; + + /* But never get larger than the unpartitioned disk space */ + if (SectorCount > PartEntry->SectorCount.QuadPart) + SectorCount = PartEntry->SectorCount.QuadPart; + } + + DPRINT ("Partition size: %I64u bytes\n", PartSize); + + CreateExtendedPartition(PartitionList, + SectorCount); + + return SELECT_PARTITION_PAGE; + } + } + + return CREATE_EXTENDED_PARTITION_PAGE; } @@ -3848,8 +4015,12 @@ Page = SelectPartitionPage(&Ir); break; - case CREATE_PARTITION_PAGE: - Page = CreatePartitionPage(&Ir); + case CREATE_PRIMARY_PARTITION_PAGE: + Page = CreatePrimaryPartitionPage(&Ir); + break; + + case CREATE_EXTENDED_PARTITION_PAGE: + Page = CreateExtendedPartitionPage(&Ir); break; case DELETE_PARTITION_PAGE: 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] Tue May 20 23:48:36 2014 @@ -828,12 +828,19 @@ { 8, 15, - "\x07 â¨á¥â¥ C § áê§¤ ¢ ¥ ®¢ ¤ï«.", + "\x07 Press P to create a primary partition.", +// "\x07 â¨á¥â¥ C § áê§¤ ¢ ¥ ®¢ ¤ï«.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 â¨á¥â¥ D § ¨§âà¨¢ ¥ áêé¥áâ¢ã¢ é ¤ï«.", TEXT_STYLE_NORMAL }, @@ -1288,6 +1295,10 @@ MUI_ERROR bgBGErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "¥ ªâ ¥ ¥ ¯ê«® á«®¦¥ ª®¬¯îâêà \n" @@ -1501,6 +1512,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1612,13 +1649,19 @@ {STRING_PLEASEWAIT, " ®ç ª ©â¥..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = « £ ¥ C = ê§¤ ¢ ¥ ¤ï« F3 = §å®¤"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = « £ ¥ C = ê§¤ ¢ ¥ ¤ï« F3 = §å®¤"}, {STRING_INSTALLDELETEPARTITION, " ENTER = « £ ¥ D = §âà¨¢ ¥ ¤ï« F3 = §å®¤"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, " §¬¥à ®¢¨ï ¤ï«:"}, {STRING_CHOOSENEWPARTITION, - "§¡à «¨ áâ¥ ¤ áê§¤ ¤¥â¥ ®¢ ¤ï« "}, + "You have chosen to create a primary partition on"}, +// "§¡à «¨ áâ¥ ¤ áê§¤ ¤¥â¥ ®¢ ¤ï« "}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "ê¢¥¤¥â¥ à §¬¥à ®¢¨ï ¤ï« (¢ ¬¥£ ¡ ©â¨)."}, {STRING_CREATEPARTITION, @@ -1701,6 +1744,8 @@ " ¥à §¯à¥¤¥«¥® ¬ïáâ® %6lu %s"}, {STRING_MAXSIZE, " (¤® %lu )"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "®¢ (¥ä®à¬ â¨à )"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -827,12 +827,19 @@ { 8, 15, - "\x07 Stisknut¡m C umo§n¡te vytvoýen¡ novho odd¡lu.", + "\x07 Press P to create a primary partition.", +// "\x07 Stisknut¡m C umo§n¡te vytvoýen¡ novho odd¡lu.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Stisknut¡m D umo§n¡te smaz n¡ existuj¡c¡ho odd¡lu.", TEXT_STYLE_NORMAL }, @@ -1286,6 +1293,10 @@ MUI_ERROR csCZErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS nen¡ ve vaçem po¡tai kompletnØ nainstalov n.\n" @@ -1497,6 +1508,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1608,13 +1645,19 @@ {STRING_PLEASEWAIT, " ¬ekejte, pros¡m..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalovat C = Vytvoýit odd¡l F3 = Ukonit"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Instalovat C = Vytvoýit odd¡l F3 = Ukonit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalovat D = Odstranit odd¡l F3 = Ukonit"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Velikost novho odd¡lu:"}, {STRING_CHOOSENEWPARTITION, - "Zvolili jste vytvoýen¡ novho odd¡lu na"}, + "You have chosen to create a primary partition on"}, +// "Zvolili jste vytvoýen¡ novho odd¡lu na"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Zadejte velikost novho odd¡lu v megabajtech."}, {STRING_CREATEPARTITION, @@ -1697,6 +1740,8 @@ " M¡sto bez odd¡l %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Novì (Nenaform tovanì)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -814,12 +814,18 @@ { 8, 15, - "\x07 C erstellt eine neue Partition.", + "\x07 P erstellt eine primre Partition.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 E erstellt eine erweiterte Partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 D lscht eine vorhandene Partition.", TEXT_STYLE_NORMAL }, @@ -1279,6 +1285,10 @@ MUI_ERROR deDEErrorEntries[] = { + { + // NOT_AN_ERROR + "Erfolg\n" + }, { //ERROR_NOT_INSTALLED "ReactOS wurde nicht vollstndig auf Ihrem System installiert.\n" @@ -1494,6 +1504,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "Sie knnen keine weitere primre oder erweiterte Partition in\n" + "der Partitionstabelle erstellen, weil die Tabelle voll ist.\n" + "\n" + " * Eine beliebige Taste zum Fortsetzen drcken." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "Sie knnen nur eine erweiterte Partition auf jeder Festplatte anlegen.\n" + "\n" + " * Eine beliebige Taste zum Fortsetzen drcken." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "Sie knnen hinter einer erweiterten Partition keine weitere Partition anlegen.\n" + "\n" + " * Eine beliebige Taste zum Fortsetzen drcken." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "Eine erweiterte Partition muss immer die letzte Partition in \n" + "einer Partitionstabelle sein.\n" + "\n" + " * Eine beliebige Taste zum Fortsetzen drcken." + }, + { NULL, NULL } @@ -1605,13 +1641,17 @@ {STRING_PLEASEWAIT, " Bitte warten..."}, {STRING_INSTALLCREATEPARTITION, - " EINGABETASTE = Installieren C = Partition erstellen F3 = Installation abbr."}, + " EINGABETASTE = Installieren P = Primre E = Erweiterte F3 = Installation abbr."}, {STRING_INSTALLDELETEPARTITION, " EINGABETASTE = Installieren D = Partition lschen F3 = Installation abbr."}, + {STRING_DELETEPARTITION, + " D = Partition lschen F3 = Installation abbrechen"}, {STRING_PARTITIONSIZE, "Gráe der neuen Partition:"}, {STRING_CHOOSENEWPARTITION, - "Eine neue Partition soll hier erstellt werden:"}, + "Eine primre Partition soll hier erstellt werden:"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "Eine erweiterte Partition soll hier erstellt werden:"}, {STRING_HDDSIZE, "Bitte geben Sie die Gráe der neuen Partition in Megabyte ein."}, {STRING_CREATEPARTITION, @@ -1694,6 +1734,8 @@ " Unpartitionierter Speicher %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Erweiterte Partition"}, {STRING_UNFORMATTED, "Neu (Unformatiert)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -837,12 +837,19 @@ { 8, 15, - "\x07 «ã©« C ¤ £ ¦¬¨ã©« â¤ ¤â¦ £â¨ ©£.", + "\x07 Press P to create a primary partition.", +// "\x07 «ã©« C ¤ £ ¦¬¨ã©« â¤ ¤â¦ £â¨ ©£.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 «ã©« D ¤ ¨á¯« â¤ ¬§á¨®¦¤ £â¨ ©£.", TEXT_STYLE_NORMAL }, @@ -1308,6 +1315,10 @@ MUI_ERROR elGRErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "¦ ReactOS ¤ ¡«©«á¡ §¢ã¨àª ©«¦¤\n" @@ -1513,6 +1524,32 @@ "ENTER = Reboot computer" }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1624,13 +1661,19 @@ {STRING_PLEASEWAIT, " ¨¡¢é §¨ £â¤«..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = ¡«á©«© C = £ ¦¬¨å Partition F3 = §¦®é¨©"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = ¡«á©«© C = £ ¦¬¨å Partition F3 = §¦®é¨©"}, {STRING_INSTALLDELETEPARTITION, " ENTER = ¡«á©«© D = ¨ã Partition F3 = §¦®é¨©"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "â¦ª «¦¬ ¤â¦¬ partition:"}, {STRING_CHOOSENEWPARTITION, - "§ ¢â¥« ¤ £ ¦¬¨ã©« â¤ ¤â¦ partition on"}, + "You have chosen to create a primary partition on"}, +// "§ ¢â¥« ¤ £ ¦¬¨ã©« â¤ ¤â¦ partition on"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "¨¡¢é é©« «¦ £â¦ª «¦¬ partition © megabytes."}, {STRING_CREATEPARTITION, @@ -1713,6 +1756,8 @@ " Unpartitioned space %6lu %s"}, {STRING_MAXSIZE, "MB (£. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "â¦ ( £¦¨à£â¤¦)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -819,12 +819,18 @@ { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 Press P to create a primary partition.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL }, @@ -1278,6 +1284,10 @@ MUI_ERROR enUSErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" @@ -1489,6 +1499,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1599,13 +1635,17 @@ {STRING_PLEASEWAIT, " Please wait..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install C = Create Partition F3 = Quit"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Size of new partition:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a new partition on"}, + "You have chosen to create a primary partition on"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, @@ -1688,6 +1728,8 @@ " Unpartitioned space %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "New (Unformatted)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -826,12 +826,19 @@ { 8, 15, - "\x07 Presione C para crear una nueva partici¢n.", + "\x07 Press P to create a primary partition.", +// "\x07 Presione C para crear una nueva partici¢n.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Presione D para borrar una partici¢n existente.", TEXT_STYLE_NORMAL }, @@ -1285,6 +1292,10 @@ MUI_ERROR esESErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS no est completamente instalado en su\n" @@ -1496,6 +1507,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1606,13 +1643,19 @@ {STRING_PLEASEWAIT, " Por favor, espere..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalar C = Crear Partici¢n F3 = Salir"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Instalar C = Crear Partici¢n F3 = Salir"}, + {STRING_DELETEPARTITION, + " D = Borrar Partici¢n F3 = Salir"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalar D = Borrar Partici¢n F3 = Salir"}, {STRING_PARTITIONSIZE, "Tama¤o de la nueva partici¢n:"}, {STRING_CHOOSENEWPARTITION, - "Ha elegido crear una nueva partici¢n en"}, + "You have chosen to create a primary partition on"}, +// "Ha elegido crear una nueva partici¢n en"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Por favor, introduzca el tama¤o de la nueva partici¢n en megabytes."}, {STRING_CREATEPARTITION, @@ -1695,6 +1738,8 @@ " Espacio sin particionar %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Nuevo (sin formato)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -819,12 +819,19 @@ { 8, 15, - "\x07 Vajuta C, et teha uus partitsioon.", + "\x07 Press P to create a primary partition.", +// "\x07 Vajuta C, et teha uus partitsioon.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Vajuta D, et kustutada olemasolev partitsioon.", TEXT_STYLE_NORMAL }, @@ -1278,6 +1285,10 @@ MUI_ERROR etEEErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS ei ole tielikult paigaldatud.\n" @@ -1486,6 +1497,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1597,13 +1634,19 @@ {STRING_PLEASEWAIT, " Palun oota..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Paigalda C = Loo partitsioon F3 = Vlju"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Paigalda C = Loo partitsioon F3 = Vlju"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Paigalda D = Kustuta partitsioon F3 = Vlju"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Uue partitsiooni suurus:"}, {STRING_CHOOSENEWPARTITION, - "Oled valinud kettale uue partitsiooni loomise"}, + "You have chosen to create a primary partition on"}, +// "Oled valinud kettale uue partitsiooni loomise"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Sisesta uue partitsiooni suurus megabaitides."}, {STRING_CREATEPARTITION, @@ -1686,6 +1729,8 @@ " Kasutamata kettaruum %6lu %s"}, {STRING_MAXSIZE, "MB (maks. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Uus (Vormindamata)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -832,12 +832,19 @@ { 8, 15, - "\x07 Appuyer sur C pour creer une nouvelle partition.", + "\x07 Press P to create a primary partition.", +// "\x07 Appuyer sur C pour creer une nouvelle partition.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Appuyer sur D pour effacer une partition.", TEXT_STYLE_NORMAL }, @@ -1291,6 +1298,10 @@ MUI_ERROR frFRErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS n'est pas compltement install sur votre\n" @@ -1502,6 +1513,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1613,13 +1650,19 @@ {STRING_PLEASEWAIT, " Veuillez patienter..."}, {STRING_INSTALLCREATEPARTITION, - " ENTRE = Installer C = Crer Partition F3 = Quitter"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTRE = Installer C = Crer Partition F3 = Quitter"}, {STRING_INSTALLDELETEPARTITION, " ENTRE = Installer D = Supprimer Partition F3 = Quitter"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Taille de la nouvelle partition :"}, {STRING_CHOOSENEWPARTITION, - "Vous avez choisi de crer une nouvelle partition sur"}, + "You have chosen to create a primary partition on"}, +// "Vous avez choisi de crer une nouvelle partition sur"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Veuillez entrer la taille de la nouvelle partition en mgaoctets."}, {STRING_CREATEPARTITION, @@ -1702,6 +1745,8 @@ " Espace non partitionn %6lu %s"}, {STRING_MAXSIZE, "Mo (max. %lu Mo)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Nouveau (non format)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -820,12 +820,18 @@ { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 Press P to create a primary partition.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL }, @@ -1279,6 +1285,10 @@ MUI_ERROR heILErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" @@ -1490,6 +1500,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1600,13 +1636,18 @@ {STRING_PLEASEWAIT, " ..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = C = F3 = "}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = C = F3 = "}, {STRING_INSTALLDELETEPARTITION, " ENTER = D = F3 = "}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, " :"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a new partition on"}, + "You have chosen to create a primary partition on"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, @@ -1689,6 +1730,8 @@ " Unpartitioned space %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "New (Unformatted)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -820,12 +820,19 @@ { 8, 15, - "\x07 Premere C per creare una nuova partizione.", + "\x07 Press P to create a primary partition.", +// "\x07 Premere C per creare una nuova partizione.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Premere D per cancellare una partizione esistente.", TEXT_STYLE_NORMAL }, @@ -1279,6 +1286,10 @@ MUI_ERROR itITErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS non installato completamente nel vostro\n" @@ -1490,6 +1501,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1601,13 +1638,19 @@ {STRING_PLEASEWAIT, " Attendere..."}, {STRING_INSTALLCREATEPARTITION, - " INVIO = Installa C = Crea Partizione F3 = Esci"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " INVIO = Installa C = Crea Partizione F3 = Esci"}, {STRING_INSTALLDELETEPARTITION, " INVIO = Installa D = Rimuovi Partizione F3 = Esci"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Dimensione della nuova partizione:"}, {STRING_CHOOSENEWPARTITION, - "Avete scelto di creare una nuova partizione su"}, + "You have chosen to create a primary partition on"}, +// "Avete scelto di creare una nuova partizione su"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Indicare la dimensione della nuova partizione in megabyte."}, {STRING_CREATEPARTITION, 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] Tue May 20 23:48:36 2014 @@ -820,12 +820,19 @@ { 8, 15, - "\x07 ±À×¼² Êß°Ã¨¼®Ý ¦ »¸¾² ½ÙÆÊ C ·°¦ µ¼Ã ¸ÀÞ»²¡", + "\x07 Press P to create a primary partition.", +// "\x07 ±À×¼² Êß°Ã¨¼®Ý ¦ »¸¾² ½ÙÆÊ C ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 ·¿ÝÉ Êß°Ã¨¼®Ý¦ »¸¼Þ® ½ÙÆÊ D ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, @@ -1279,6 +1286,10 @@ MUI_ERROR jaJPErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS Ê ºÝËß°ÀÆ ¶Ý¾ÞÝÆ ²Ý½Ä°Ù\n" @@ -1490,6 +1501,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1600,13 +1637,19 @@ {STRING_PLEASEWAIT, " µÏÁ ¸ÀÞ»²..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = ²Ý½Ä°Ù C = Êß°Ã¨¼®Ý »¸¾² F3 = Á³¼"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = ²Ý½Ä°Ù C = Êß°Ã¨¼®Ý »¸¾² F3 = Á³¼"}, {STRING_INSTALLDELETEPARTITION, " ENTER = ²Ý½Ä°Ù D = Êß°Ã¨¼®Ý »¸¼Þ® F3 = Á³¼"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "±À×¼² Êß°Ã¨¼®ÝÉ »²½Þ:"}, {STRING_CHOOSENEWPARTITION, - "±À×¼² Êß°Ã¨¼®Ý¦ Â·ÞÆ »¸¾²½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À:"}, + "You have chosen to create a primary partition on"}, +// "±À×¼² Êß°Ã¨¼®Ý¦ Â·ÞÆ »¸¾²½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À:"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "±À×¼² Êß°Ã¨¼®ÝÉ »²½Þ¦ Ò¶ÞÊÞ²Ä ÀÝ²ÃÞ Æ³Ø®¸ ¼Ã¸ÀÞ»²¡"}, {STRING_CREATEPARTITION, @@ -1689,6 +1732,8 @@ " ÐÌÞÝ¶ÂÉ ½Íß°½ %6lu %s"}, {STRING_MAXSIZE, "MB (»²ÀÞ². %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "¼Ý· (ÐÌ«°Ï¯Ä)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -829,12 +829,18 @@ { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 Press P to create a primary partition.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Press D to delete an existing partition.", TEXT_STYLE_NORMAL }, @@ -1288,6 +1294,10 @@ MUI_ERROR ltLTErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS is not completely installed on your\n" @@ -1499,6 +1509,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1610,13 +1646,17 @@ {STRING_PLEASEWAIT, " Please wait..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install C = Create Partition F3 = Quit"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Install D = Delete Partition F3 = Quit"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Size of new partition:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a new partition on"}, + "You have chosen to create a primary partition on"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Please enter the size of the new partition in megabytes."}, {STRING_CREATEPARTITION, @@ -1699,6 +1739,8 @@ " Unpartitioned space %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "New (Unformatted)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -854,12 +854,19 @@ { 8, 15, - "\x07 Druk op C om een nieuwe partitie aan te maken.", + "\x07 Press P to create a primary partition.", +// "\x07 Druk op C om een nieuwe partitie aan te maken.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Druk op D om een bestaande partitie te verwijderen.", TEXT_STYLE_NORMAL }, @@ -1319,6 +1326,10 @@ MUI_ERROR nlNLErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS is niet geheel ge\x8Bnstalleerd op uw\n" @@ -1534,6 +1545,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1645,13 +1682,19 @@ {STRING_PLEASEWAIT, " Een ogenblik geduld..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Installeren C = Partitie aanmaken F3 = Afsluiten"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Installeren C = Partitie aanmaken F3 = Afsluiten"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installeren D = Partitie verwijderen F3 = Afsluiten"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Grootte nieuwe partitie:"}, {STRING_CHOOSENEWPARTITION, - "U wilt een nieuwe partitie aanmaken op"}, + "You have chosen to create a primary partition on"}, +// "U wilt een nieuwe partitie aanmaken op"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Voert u de grootte van de nieuwe partitie in in megabytes."}, {STRING_CREATEPARTITION, @@ -1734,6 +1777,8 @@ " Niet gepartitioneerde ruimte %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Nieuw (Ongeformatteerd)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -828,12 +828,19 @@ { 8, 15, - "\x07 Nacinij C, by stworzy now¥ partycj©.", + "\x07 Press P to create a primary partition.", +// "\x07 Nacinij C, by stworzy now¥ partycj©.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Nacinij D, by skasowa istniej¥c¥ partycj©.", TEXT_STYLE_NORMAL }, @@ -1287,6 +1294,10 @@ MUI_ERROR plPLErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS nie zosta w peni zainstalowany na twoim\n" @@ -1498,6 +1509,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1609,13 +1646,19 @@ {STRING_PLEASEWAIT, " Prosz© czeka..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalacja C = Utworzenie Partycji F3 = Wyjcie"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Instalacja C = Utworzenie Partycji F3 = Wyjcie"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalacja D = Skasowanie Partycji F3 = Wyjcie"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Rozmiar nowej partycji:"}, {STRING_CHOOSENEWPARTITION, - "Wybrane: utworzenie nowej partycji na"}, + "You have chosen to create a primary partition on"}, +// "Wybrane: utworzenie nowej partycji na"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Prosz© wprowadzi rozmiar nowej partycji w megabajtach."}, {STRING_CREATEPARTITION, 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] Tue May 20 23:48:36 2014 @@ -838,12 +838,19 @@ { 8, 15, - "\x07 Para criar uma partiÆo no espao nÆo particionado, pressione C.", + "\x07 Press P to create a primary partition.", +// "\x07 Para criar uma partiÆo no espao nÆo particionado, pressione C.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Para excluir a partiÆo selecionada, pressione D.", TEXT_STYLE_NORMAL }, @@ -1315,6 +1322,10 @@ MUI_ERROR ptBRErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "O ReactOS nÆo est completamente instalado no computador.\n" @@ -1526,6 +1537,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1636,13 +1673,19 @@ {STRING_PLEASEWAIT, " Por favor, aguarde..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER=Instalar C=Criar partiÆo F3=Sair"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER=Instalar C=Criar partiÆo F3=Sair"}, {STRING_INSTALLDELETEPARTITION, " ENTER=Instalar D=Apagar partiÆo F3=Sair"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Tamanho da nova partiÆo:"}, {STRING_CHOOSENEWPARTITION, - "Voc solicitou a criaÆo de uma nova partiÆo em"}, + "You have chosen to create a primary partition on"}, +// "Voc solicitou a criaÆo de uma nova partiÆo em"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Por favor, insira o tamanho da nova partiÆo em megabytes (MB)."}, {STRING_CREATEPARTITION, @@ -1725,6 +1768,8 @@ " Espao nÆo particionado %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Novo (sem formato)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -881,12 +881,19 @@ { 8, 15, - "\x07 Tastaîi C pentru a crea o nouÇ partiîie.", + "\x07 Press P to create a primary partition.", +// "\x07 Tastaîi C pentru a crea o nouÇ partiîie.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Tastaîi D pentru a terge o partiîie existentÇ.", TEXT_STYLE_NORMAL }, @@ -1340,6 +1347,10 @@ MUI_ERROR roROErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS nu a fost instalat complet n calculatorul\n" @@ -1567,6 +1578,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1677,13 +1714,19 @@ {STRING_PLEASEWAIT, " Ateptaîi..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalare C = Creare partiîie F3 = Ieire"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Instalare C = Creare partiîie F3 = Ieire"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalare D = ¸tergere partiîie F3 = Ieire"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "MÇrimea noii partiîii:"}, {STRING_CHOOSENEWPARTITION, - "Aîi ales crearea unei noi partiîii pe"}, + "You have chosen to create a primary partition on"}, +// "Aîi ales crearea unei noi partiîii pe"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Introduceîi mÇrimea noii partiîii n megaocteîi."}, {STRING_CREATEPARTITION, @@ -1766,6 +1809,8 @@ " Spaîiu nepartiîionat %6lu %s"}, {STRING_MAXSIZE, "Mo (max. %lu Mo)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Part. nouÇ (neformatatÇ)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -820,12 +820,19 @@ { 8, 15, - "\x07 ¦¬¨â¥ C ¤«ï á®§¤ ¨ï ®¢®£® à §¤¥« .", + "\x07 Press P to create a primary partition.", +// "\x07 ¦¬¨â¥ C ¤«ï á®§¤ ¨ï ®¢®£® à §¤¥« .", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 ¦¬¨â¥ D ¤«ï ã¤ «¥¨ï áãé¥áâ¢ãîé¥£® à §¤¥« .", TEXT_STYLE_NORMAL }, @@ -1279,6 +1286,10 @@ MUI_ERROR ruRUErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS ¥ ¡ë« ¯®«®áâìî ãáâ ®¢«¥ ¢ è\n" @@ -1490,6 +1501,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1601,13 +1638,19 @@ {STRING_PLEASEWAIT, " ®¦ «ã©áâ , ¯®¤®¦¤¨â¥..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ëå®¤"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = áâ ®¢¨âì C = ®§¤ âì à §¤¥« F3 = ëå®¤"}, {STRING_INSTALLDELETEPARTITION, " ENTER = áâ ®¢¨âì D = ¤ «¨âì à §¤¥« F3 = ëå®¤"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, " §¬¥à ®¢®£® à §¤¥« :"}, {STRING_CHOOSENEWPARTITION, - "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, + "You have chosen to create a primary partition on"}, +// "ë å®â¨â¥ á®§¤ âì ®¢ë© à §¤¥« "}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "®¦ «ã©áâ , ¢¢¥¤¨â¥ à §¬¥à ®¢®£® à §¤¥« ¢ ¬¥£ ¡ ©â å."}, {STRING_CREATEPARTITION, @@ -1690,6 +1733,8 @@ " ¥à §¬¥ç¥®¥ ¯à®áâà áâ¢® %6lu %s"}, {STRING_MAXSIZE, " (¬ ªá. %lu )"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "®¢ë© (¥®âä®à¬ â¨à®¢ ë©)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -827,12 +827,19 @@ { 8, 15, - "\x07 Stlate C pre vytvorenie novej oblasti.", + "\x07 Press P to create a primary partition.", +// "\x07 Stlate C pre vytvorenie novej oblasti.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Stlate D pre vymazanie existuj£cej oblasti.", TEXT_STYLE_NORMAL }, @@ -1286,6 +1293,10 @@ MUI_ERROR skSKErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "Systm ReactOS nie je kompletne nainçtalovanì na Vaçom\n" @@ -1500,6 +1511,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1611,13 +1648,19 @@ {STRING_PLEASEWAIT, " Pokajte, pros¡m ..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Inçtalova C = Vytvori oblas F3 = Skoni"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Inçtalova C = Vytvori oblas F3 = Skoni"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Inçtalova D = Odstr ni oblas F3 = Skoni"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Vekos novej oblasti:"}, {STRING_CHOOSENEWPARTITION, - "Zvolili ste vytvorenie novej oblasti na"}, + "You have chosen to create a primary partition on"}, +// "Zvolili ste vytvorenie novej oblasti na"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Zadajte, pros¡m, vekos novej oblasti v megabajtoch."}, {STRING_CREATEPARTITION, @@ -1700,6 +1743,8 @@ " Miesto bez oblast¡ %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Nov (Nenaform tovan )"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -823,12 +823,19 @@ { 8, 15, - "\x07 Kiko C pr t krijuar nj particion t ri.", + "\x07 Press P to create a primary partition.", +// "\x07 Kiko C pr t krijuar nj particion t ri.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Kliko D pr t fshir nj particion ekzistues.", TEXT_STYLE_NORMAL }, @@ -1282,6 +1289,10 @@ MUI_ERROR sqALErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS nuk shte instaluar plotesisht ne kompjuterin\n" @@ -1493,6 +1504,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1603,13 +1640,19 @@ {STRING_PLEASEWAIT, " Ju lutem prisni..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Instalo C = Krijo Particion F3 = Dil"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Instalo C = Krijo Particion F3 = Dil"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalo D = Fshi Particion F3 = Dil"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Madhsia e particionit t ri:"}, {STRING_CHOOSENEWPARTITION, +// "You have chosen to create a primary partition on"}, "Ju keni zgjedhur pr t krijuar nj ndarje t re n"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Ju lutem, jepini madhsin e particionit t ri n megabajt."}, {STRING_CREATEPARTITION, @@ -1692,6 +1735,8 @@ " Hapsire e papjesesezuar %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "I ri (papjesesezuar)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -826,12 +826,19 @@ { 8, 15, - "\x07 Tryck C fr att skapa en ny partition.", + "\x07 Press P to create a primary partition.", +// "\x07 Tryck C fr att skapa en ny partition.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Tryck D fr att ta bort en befintlig partititon.", TEXT_STYLE_NORMAL }, @@ -1285,6 +1292,10 @@ MUI_ERROR svSEErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS installerades inte fullstndigt p din\n" @@ -1496,6 +1507,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1606,13 +1643,19 @@ {STRING_PLEASEWAIT, " Var vnlig vnta..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Installera C = Skapa Partition F3 = Avsluta"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = Installera C = Skapa Partition F3 = Avsluta"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Installera D = Ta bort Partition F3 = Avsluta"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Storlek p den nya partitionen:"}, {STRING_CHOOSENEWPARTITION, - "Du har valt att skapa en ny partiton p"}, + "You have chosen to create a primary partition on"}, +// "Du har valt att skapa en ny partiton p"}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Vnligen skriv in storleken av den nya partitionen i megabytes."}, {STRING_CREATEPARTITION, @@ -1695,6 +1738,8 @@ " Opartitionerat utrymme %6lu %s"}, {STRING_MAXSIZE, "MB (max. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Ny (Oformaterad)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -807,12 +807,19 @@ { 8, 15, - "\x07 Seili boluktan yeni bir blm oluturmak iin C d§mesine basnz.", + "\x07 Press P to create a primary partition.", +// "\x07 Seili boluktan yeni bir blm oluturmak iin C d§mesine basnz.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 Seili blm silmek iin D d§mesine basnz.", TEXT_STYLE_NORMAL }, @@ -1254,6 +1261,10 @@ MUI_ERROR trTRErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS, bilgisayara btnyle kurulmad.\n" @@ -1464,6 +1475,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1574,13 +1611,19 @@ {STRING_PLEASEWAIT, " Ltfen bekleyiniz..."}, {STRING_INSTALLCREATEPARTITION, - " Giri = Kur C = Blm Olutur F3 = k"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " Giri = Kur C = Blm Olutur F3 = k"}, {STRING_INSTALLDELETEPARTITION, " Giri = Kur D = Blm Sil F3 = k"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "Bykl§ giriniz:"}, {STRING_CHOOSENEWPARTITION, - "Yeni bir blm oluturmay setiniz."}, + "You have chosen to create a primary partition on"}, +// "Yeni bir blm oluturmay setiniz."}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "Oluturulacak blmn bykl§n megaoklu olarak giriniz."}, {STRING_CREATEPARTITION, @@ -1663,6 +1706,8 @@ " Kullanlmayan Boluk %6lu %s"}, {STRING_MAXSIZE, "MB (En ok %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "Yeni (Biimlendirilmemi)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -825,12 +825,19 @@ { 8, 15, - "\x07 â¨áiâì C é®¡ áâ¢®à¨â¨ ®¢¨© à®§¤i«.", + "\x07 Press P to create a primary partition.", +// "\x07 â¨áiâì C é®¡ áâ¢®à¨â¨ ®¢¨© à®§¤i«.", TEXT_STYLE_NORMAL }, { 8, 17, + "\x07 Press E to create an extended partition.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, "\x07 â¨áiâì D é®¡ ¢¨¤ «¨â¨ iáãîç¨© à®§¤i«.", TEXT_STYLE_NORMAL }, @@ -1284,6 +1291,10 @@ MUI_ERROR ukUAErrorEntries[] = { + { + // NOT_AN_ERROR + "Success\n" + }, { //ERROR_NOT_INSTALLED "ReactOS ¥ ¡ã¢ ¯®¢iáâî ¢áâ ®¢«¥¨© è\n" @@ -1496,6 +1507,32 @@ NULL }, { + //ERROR_PARTITION_TABLE_FULL, + "You can not create a new primary or extended partition in the\n" + "partition table of this disk because the partition table is full.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_ONLY_ONE_EXTENDED, + "You can not create more than one extended partition per disk.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_NOT_BEHIND_EXTENDED, + "You can not create a partition behind an extended partition.\n" + "\n" + " * Press any key to continue." + }, + { + //ERROR_EXTENDED_NOT_LAST, + "An extended partition must always be the last\n" + "partition in a partition table.\n" + "\n" + " * Press any key to continue." + }, + { NULL, NULL } @@ -1606,13 +1643,19 @@ {STRING_PLEASEWAIT, " ã¤ì-« áª , § ç¥ª ©â¥..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = áâ ®¢¨â¨ C = â¢®à¨â¨ ®§¤i« F3 = ¨©â¨"}, + " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, +// " ENTER = áâ ®¢¨â¨ C = â¢®à¨â¨ ®§¤i« F3 = ¨©â¨"}, {STRING_INSTALLDELETEPARTITION, " ENTER = áâ ®¢¨â¨ D = ¨¤ «¨â¨ ®§¤i« F3 = ¨©â¨"}, + {STRING_DELETEPARTITION, + " D = Delete Partition F3 = Quit"}, {STRING_PARTITIONSIZE, "®§¬ià ®¢®£® à®§¤i«ã:"}, {STRING_CHOOSENEWPARTITION, - "¨ å®ç¥â¥ áâ¢®à¨â¨ ®¢¨© à®§¤i« "}, + "You have chosen to create a primary partition on"}, +// "¨ å®ç¥â¥ áâ¢®à¨â¨ ®¢¨© à®§¤i« "}, + {STRING_CHOOSE_NEW_EXTENDED_PARTITION, + "You have chosen to create an extended partition on"}, {STRING_HDDSIZE, "ã¤ì-« áª , ¢¢¥¤iâì à®§¬ià ®¢®£® à®§¤i«ã ¢ ¬¥£ ¡ ©â å."}, {STRING_CREATEPARTITION, @@ -1695,6 +1738,8 @@ " ¥à®§¬iç¥ ®¡« áâì %6lu %s"}, {STRING_MAXSIZE, "MB (¬ ªá. %lu MB)"}, + {STRING_EXTENDED_PARTITION, + "Extended Partition"}, {STRING_UNFORMATTED, "®¢¨© (¥ä®à¬ â®¢ ¨©)"}, {STRING_FORMATUNUSED, 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] Tue May 20 23:48:36 2014 @@ -100,8 +100,10 @@ #define STRING_PLEASEWAIT 1 #define STRING_INSTALLCREATEPARTITION 2 #define STRING_INSTALLDELETEPARTITION 3 +#define STRING_DELETEPARTITION 59 #define STRING_PARTITIONSIZE 4 #define STRING_CHOOSENEWPARTITION 5 +#define STRING_CHOOSE_NEW_EXTENDED_PARTITION 57 #define STRING_HDDSIZE 6 #define STRING_CREATEPARTITION 7 #define STRING_PARTFORMAT 8 @@ -144,6 +146,7 @@ #define STRING_UNPSPACE 48 #define STRING_MAXSIZE 49 #define STRING_UNFORMATTED 50 +#define STRING_EXTENDED_PARTITION 58 #define STRING_FORMATUNUSED 51 #define STRING_FORMATUNKNOWN 52 #define STRING_KB 53 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] Tue May 20 23:48:36 2014 @@ -1373,6 +1373,11 @@ { PartType = "NTFS"; /* FIXME: Not quite correct! */ } + else if ((PartEntry->PartitionType == PARTITION_EXTENDED) || + (PartEntry->PartitionType == PARTITION_XINT13_EXTENDED)) + { + PartType = MUIGetString(STRING_EXTENDED_PARTITION); + } } PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; @@ -2095,7 +2100,7 @@ VOID -CreateNewPartition( +CreatePrimaryPartition( PPARTLIST List, ULONGLONG SectorCount, BOOLEAN AutoCreate) @@ -2104,7 +2109,7 @@ PPARTENTRY PartEntry; PPARTENTRY NewPartEntry; - DPRINT1("CreateNewPartition(%I64u)\n", SectorCount); + DPRINT1("CreatePrimaryPartition(%I64u)\n", SectorCount); if (List == NULL || List->CurrentDisk == NULL || @@ -2168,6 +2173,102 @@ PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); + } + + UpdateDiskLayout(DiskEntry); + + DiskEntry->Dirty = TRUE; + + UpdatePartitionNumbers(DiskEntry); + + AssignDriveLetters(List); +} + + +VOID +CreateExtendedPartition( + PPARTLIST List, + ULONGLONG SectorCount) +{ + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + PPARTENTRY NewPartEntry; + + DPRINT1("CreatePrimaryPartition(%I64u)\n", SectorCount); + + if (List == NULL || + List->CurrentDisk == NULL || + List->CurrentPartition == NULL || + List->CurrentPartition->IsPartitioned == TRUE) + { + return; + } + + DiskEntry = List->CurrentDisk; + PartEntry = List->CurrentPartition; + +DPRINT1("Current partition sector count: %I64u\n", PartEntry->SectorCount.QuadPart); + + if (Align(PartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - PartEntry->StartSector.QuadPart == PartEntry->SectorCount.QuadPart) + { +DPRINT1("Convert existing partition entry\n"); + /* Convert current entry to 'new (unformatted)' */ + PartEntry->IsPartitioned = TRUE; +// PartEntry->PartitionType = PARTITION_ENTRY_UNUSED; + PartEntry->FormatState = Formatted; + PartEntry->AutoCreate = FALSE; + PartEntry->New = FALSE; + PartEntry->BootIndicator = FALSE; /* FIXME */ + +DPRINT1("First Sector: %I64u\n", PartEntry->StartSector.QuadPart); +DPRINT1("Last Sector: %I64u\n", PartEntry->StartSector.QuadPart + PartEntry->SectorCount.QuadPart - 1); +DPRINT1("Total Sectors: %I64u\n", PartEntry->SectorCount.QuadPart); + } + else + { +DPRINT1("Add new partition entry\n"); + + /* Insert and initialize a new partition entry */ + NewPartEntry = RtlAllocateHeap(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(PARTENTRY)); + if (NewPartEntry == NULL) + return; + + /* Insert the new entry into the list */ + InsertTailList(&PartEntry->ListEntry, + &NewPartEntry->ListEntry); + + NewPartEntry->DiskEntry = DiskEntry; + + NewPartEntry->IsPartitioned = TRUE; + NewPartEntry->StartSector.QuadPart = PartEntry->StartSector.QuadPart; + NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + SectorCount, DiskEntry->SectorAlignment) - + NewPartEntry->StartSector.QuadPart; + +// NewPartEntry->PartitionType = PARTITION_ENTRY_UNUSED; + +DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); +DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); +DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + NewPartEntry->New = FALSE; + NewPartEntry->FormatState = Formatted; + NewPartEntry->BootIndicator = FALSE; /* FIXME */ + + PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; + PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); + } + + if (NewPartEntry->StartSector.QuadPart < 1450560) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + NewPartEntry->PartitionType = PARTITION_EXTENDED; + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + NewPartEntry->PartitionType = PARTITION_XINT13_EXTENDED; } UpdateDiskLayout(DiskEntry); @@ -2561,4 +2662,143 @@ return TRUE; } + +static +BOOLEAN +IsLastPrimaryPartiton( + IN PPARTENTRY PartEntry) +{ + return (PartEntry->ListEntry.Flink == &PartEntry->DiskEntry->PrimaryPartListHead); +} + + +static +BOOLEAN +IsPreviousPartitionExtended( + IN PPARTENTRY PartEntry, + IN PDISKENTRY DiskEntry) +{ + PPARTENTRY PrevPartEntry; + PLIST_ENTRY Entry; + + Entry = PartEntry->ListEntry.Blink; + + while (Entry != &DiskEntry->PrimaryPartListHead) + { + PrevPartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + + if (IsContainerPartition(PrevPartEntry->PartitionType)) + return TRUE; + + Entry = Entry->Blink; + } + + return FALSE; + +} + + +static +ULONG +GetPrimaryPartitionCount( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY Entry; + PPARTENTRY PartEntry; + UINT nCount = 0; + + Entry = DiskEntry->PrimaryPartListHead.Flink; + while (Entry != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned == TRUE) + nCount++; + + Entry = Entry->Flink; + } + + return nCount; +} + + +static +ULONG +GetExtendedPartitionCount( + IN PDISKENTRY DiskEntry) +{ + PLIST_ENTRY Entry; + PPARTENTRY PartEntry; + UINT nCount = 0; + + Entry = DiskEntry->PrimaryPartListHead.Flink; + while (Entry != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned == TRUE && + IsContainerPartition(PartEntry->PartitionType)) + nCount++; + + Entry = Entry->Flink; + } + + return nCount; +} + + +ULONG +PrimaryPartitionCreationChecks( + 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; + + /* Fail if there are more than 4 partitions in the list */ + if (GetPrimaryPartitionCount(DiskEntry) > 4) + return ERROR_PARTITION_TABLE_FULL; + + /* FIXME: Fail if this partiton is located behind an extended partition */ + if (IsPreviousPartitionExtended(PartEntry, DiskEntry)) + return ERROR_NOT_BEHIND_EXTENDED; + + return ERROR_SUCCESS; +} + + +ULONG +ExtendedPartitionCreationChecks( + 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; + + /* Fail if there are more than 4 partitions in the list */ + if (GetPrimaryPartitionCount(DiskEntry) > 4) + return ERROR_PARTITION_TABLE_FULL; + + /* Fail if there is another extended partition in the list */ + if (GetExtendedPartitionCount(DiskEntry) != 0) + return ERROR_ONLY_ONE_EXTENDED; + + /* Fail if the partition is not the last list entry */ + if (!IsLastPrimaryPartiton(PartEntry)) + return ERROR_EXTENDED_NOT_LAST; + + 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] Tue May 20 23:48:36 2014 @@ -216,12 +216,17 @@ PPARTLIST List); VOID -CreateNewPartition( +CreatePrimaryPartition( PPARTLIST List, ULONGLONG PartitionSize, BOOLEAN AutoCreate); VOID +CreateExtendedPartition( + PPARTLIST List, + ULONGLONG PartitionSize); + +VOID DeleteCurrentPartition( PPARTLIST List); @@ -237,4 +242,12 @@ WritePartitionsToDisk( PPARTLIST List); +ULONG +PrimaryPartitionCreationChecks( + IN PPARTLIST List); + +ULONG +ExtendedPartitionCreationChecks( + 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] Tue May 20 23:48:36 2014 @@ -128,7 +128,8 @@ LAYOUT_SETTINGS_PAGE, SELECT_PARTITION_PAGE, - CREATE_PARTITION_PAGE, + CREATE_PRIMARY_PARTITION_PAGE, + CREATE_EXTENDED_PARTITION_PAGE, DELETE_PARTITION_PAGE, SELECT_FILE_SYSTEM_PAGE,

1 0

[dquintana] 63391: I was noted that I forgot to also apply the same fix to the KeRestoreFloatingPointState function. Also, for reference: r23894 contained working implemnentations in fpu.c. In r238...
by dquintana＠svn.reactos.org 20 May '14

20 May '14

Author: dquintana Date: Tue May 20 22:51:38 2014 New Revision: 63391 URL: http://svn.reactos.org/svn/reactos?rev=63391&view=rev Log: I was noted that I forgot to also apply the same fix to the KeRestoreFloatingPointState function. Also, for reference: r23894 contained working implemnentations in fpu.c. In r23895 ion "moved" it to cpu.c, killing the MSVC implementation in the process. In 23972, ion added new MSVC code for it, but this new version had the bug. It has remained undiscovered until very recently. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Tue May 20 22:51:38 2014 @@ -1459,7 +1459,8 @@ __asm { fnclex - frstor [FpState] + mov eax, [FpState] + frstor [eax] }; #endif

1 0

[dquintana] 63390: Fix KeSaveFloatingPointState. It was working once upon a time, but the fix was lost on some refactoring. I was told to blame it on Arch.
by dquintana＠svn.reactos.org 20 May '14

20 May '14

Author: dquintana Date: Tue May 20 22:33:26 2014 New Revision: 63390 URL: http://svn.reactos.org/svn/reactos?rev=63390&view=rev Log: Fix KeSaveFloatingPointState. It was working once upon a time, but the fix was lost on some refactoring. I was told to blame it on Arch. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Tue May 20 22:33:26 2014 @@ -1432,7 +1432,8 @@ #else __asm { - fnsave [FpState] + mov eax, [FpState] + fnsave [eax] }; #endif

1 0

[cwittich] 63389: [urlmon_winetest] -Fixed some occasionally failing tests. Patch by Jacek Caban (sync to wine head)
by cwittich＠svn.reactos.org 20 May '14

20 May '14

Author: cwittich Date: Tue May 20 21:29:27 2014 New Revision: 63389 URL: http://svn.reactos.org/svn/reactos?rev=63389&view=rev Log: [urlmon_winetest] -Fixed some occasionally failing tests. Patch by Jacek Caban (sync to wine head) Modified: trunk/rostests/winetests/urlmon/url.c Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re… ============================================================================== --- trunk/rostests/winetests/urlmon/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/url.c [iso-8859-1] Tue May 20 21:29:27 2014 @@ -2818,6 +2818,7 @@ #define BINDTEST_ABORT_START 0x0400 #define BINDTEST_ABORT_PROGRESS 0x0800 #define BINDTEST_ASYNC_SWITCH 0x1000 +#define BINDTEST_ALLOW_FINDINGRESOURCE 0x2000 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2893,9 +2894,11 @@ MSG msg; IBindStatusCallback *previousclb; IUnknown *unk = (IUnknown*)0x00ff00ff; + BOOL allow_finding_resource; IBinding *bind; init_bind_test(protocol, flags, t); + allow_finding_resource = (flags & BINDTEST_ALLOW_FINDINGRESOURCE) != 0; if(no_callback) { hres = CreateBindCtx(0, &bctx); @@ -2975,7 +2978,7 @@ SET_EXPECT(BeginningTransaction); SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); - if(http_is_first) + if(http_is_first || allow_finding_resource) SET_EXPECT(OnProgress_FINDINGRESOURCE); SET_EXPECT(OnProgress_CONNECTING); } @@ -3133,6 +3136,8 @@ CLEAR_CALLED(OnProgress_CONNECTING); } }else if(!abort_start) { + if(allow_finding_resource) + CLEAR_CALLED(OnProgress_FINDINGRESOURCE); /* IE7 does call this */ CLEAR_CALLED(OnProgress_CONNECTING); } @@ -3959,7 +3964,7 @@ test_BindToObject(HTTP_TEST, 0, S_OK); trace("http test (short response)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); + test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_ISTREAM); trace("http test (short response, to object)...\n"); test_BindToObject(HTTP_TEST, 0, S_OK); @@ -3973,7 +3978,7 @@ test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_START, TYMED_FILE); trace("http test (abort progress)...\n"); - test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS, TYMED_FILE); + test_BindToStorage(HTTP_TEST, BINDTEST_ABORT_PROGRESS|BINDTEST_ALLOW_FINDINGRESOURCE, TYMED_FILE); trace("emulated http test...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); @@ -4086,3 +4091,4 @@ CloseHandle(complete_event2); CoUninitialize(); } +

1 0

[tkreuzer] 63388: [NTOSKRNL] Fix ending address calculation for the commit path in NtAllocateVirtualMemory like done for the reserve path in r63356. Add a comment about a Windows kernel bug, which ...
by tkreuzer＠svn.reactos.org 20 May '14

20 May '14

Author: tkreuzer Date: Tue May 20 21:11:43 2014 New Revision: 63388 URL: http://svn.reactos.org/svn/reactos?rev=63388&view=rev Log: [NTOSKRNL] Fix ending address calculation for the commit path in NtAllocateVirtualMemory like done for the reserve path in r63356. Add a comment about a Windows kernel bug, which we will keep for now, until the implications are better determined. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue May 20 21:11:43 2014 @@ -4593,8 +4593,8 @@ // on the user input, and then compute the actual region size once all the // alignments have been done. // + EndingAddress = (((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1)); StartingAddress = (ULONG_PTR)PAGE_ALIGN(PBaseAddress); - EndingAddress = (((ULONG_PTR)PBaseAddress + PRegionSize - 1) | (PAGE_SIZE - 1)); PRegionSize = EndingAddress - StartingAddress + 1; // @@ -4700,6 +4700,12 @@ { // // Make sure it's okay to touch it + // Note: The Windows 2003 kernel has a bug here, passing the + // unaligned base address together with the aligned size, + // potentially covering a region larger than the actual allocation. + // Might be exposed through NtGdiCreateDIBSection w/ section handle + // For now we keep this behavior. + // TODO: analyze possible implications, create test case // Status = MiCheckSecuredVad(FoundVad, PBaseAddress,

1 0

[hbelusca] 63387: [CONSRV]: Remove unused (anymore) ProcessKeyCallback support for terminal frontends.
by hbelusca＠svn.reactos.org 20 May '14

20 May '14

Author: hbelusca Date: Tue May 20 19:56:47 2014 New Revision: 63387 URL: http://svn.reactos.org/svn/reactos?rev=63387&view=rev Log: [CONSRV]: Remove unused (anymore) ProcessKeyCallback support for terminal frontends. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Tue May 20 19:56:47 2014 @@ -1927,7 +1927,7 @@ /* Detect Alt-Esc/Space/Tab presses defer to DefWindowProc */ if ( (HIWORD(lParam) & KF_ALTDOWN) && (wParam == VK_ESCAPE || wParam == VK_SPACE || wParam == VK_TAB)) { - return DefWindowProcW(hWnd, msg, wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); } OnKey(GuiData, msg, wParam, lParam); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Tue May 20 19:56:47 2014 @@ -796,25 +796,6 @@ } static BOOL NTAPI -GuiProcessKeyCallback(IN OUT PFRONTEND This, - MSG* msg, - BYTE KeyStateMenu, - DWORD ShiftState, - UINT VirtualKeyCode, - BOOL Down) -{ - if ((ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED) || KeyStateMenu & 0x80) && - (VirtualKeyCode == VK_ESCAPE || VirtualKeyCode == VK_TAB || VirtualKeyCode == VK_SPACE)) - { - DPRINT1("GuiProcessKeyCallback\n"); - //DefWindowProcW(msg->hwnd, msg->message, msg->wParam, msg->lParam); - //return TRUE; - } - - return FALSE; -} - -static BOOL NTAPI GuiSetMouseCursor(IN OUT PFRONTEND This, HCURSOR CursorHandle); @@ -1098,7 +1079,6 @@ GuiResizeTerminal, GuiSetActiveScreenBuffer, GuiReleaseScreenBuffer, - GuiProcessKeyCallback, GuiRefreshInternalInfo, GuiChangeTitle, GuiChangeIcon, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] Tue May 20 19:56:47 2014 @@ -175,16 +175,6 @@ UnicodeChar = (1 == RetChars ? Chars[0] : 0); } - if (TermProcessKeyCallback(Console, - msg, - KeyState[VK_MENU], - ShiftState, - VirtualKeyCode, - Down)) - { - return; - } - Fake = UnicodeChar && (msg->message != WM_CHAR && msg->message != WM_SYSCHAR && msg->message != WM_KEYUP && msg->message != WM_SYSKEYUP); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Tue May 20 19:56:47 2014 @@ -276,6 +276,21 @@ case WM_KEYUP: case WM_SYSKEYUP: { +#if 0 + if ((HIWORD(lParam) & KF_ALTDOWN) && wParam == VK_TAB) + { + // if ((HIWORD(lParam) & (KF_UP | KF_REPEAT)) != KF_REPEAT) + TuiSwapConsole(ShiftState & SHIFT_PRESSED ? -1 : 1); + + break; + } + else if (wParam == VK_MENU /* && !Down */) + { + TuiSwapConsole(0); + break; + } +#endif + if (ConDrvValidateConsoleUnsafe(ActiveConsole->Console, CONSOLE_RUNNING, TRUE)) { MSG Message; @@ -688,32 +703,6 @@ { } -static BOOL NTAPI -TuiProcessKeyCallback(IN OUT PFRONTEND This, - MSG* msg, - BYTE KeyStateMenu, - DWORD ShiftState, - UINT VirtualKeyCode, - BOOL Down) -{ - if (0 != (ShiftState & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) && - VK_TAB == VirtualKeyCode) - { - if (Down) - { - TuiSwapConsole(ShiftState & SHIFT_PRESSED ? -1 : 1); - } - - return TRUE; - } - else if (VK_MENU == VirtualKeyCode && !Down) - { - return TuiSwapConsole(0); - } - - return FALSE; -} - static VOID NTAPI TuiRefreshInternalInfo(IN OUT PFRONTEND This) { @@ -814,7 +803,6 @@ TuiSetCursorInfo, TuiSetScreenInfo, TuiResizeTerminal, - TuiProcessKeyCallback, TuiRefreshInternalInfo, TuiChangeTitle, TuiChangeIcon, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Tue May 20 19:56:47 2014 @@ -46,12 +46,6 @@ VOID (NTAPI *SetActiveScreenBuffer)(IN OUT PFRONTEND This); VOID (NTAPI *ReleaseScreenBuffer)(IN OUT PFRONTEND This, IN PCONSOLE_SCREEN_BUFFER ScreenBuffer); - BOOL (NTAPI *ProcessKeyCallback)(IN OUT PFRONTEND This, - MSG* msg, - BYTE KeyStateMenu, - DWORD ShiftState, - UINT VirtualKeyCode, - BOOL Down); VOID (NTAPI *RefreshInternalInfo)(IN OUT PFRONTEND This); /* Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Tue May 20 19:56:47 2014 @@ -25,8 +25,6 @@ (Console)->TermIFace.Vtbl->SetActiveScreenBuffer(&(Console)->TermIFace) #define TermReleaseScreenBuffer(Console, ScreenBuffer) \ (Console)->TermIFace.Vtbl->ReleaseScreenBuffer(&(Console)->TermIFace, (ScreenBuffer)) -#define TermProcessKeyCallback(Console, Msg, KeyStateMenu, ShiftState, VirtualKeyCode, Down) \ - (Console)->FrontEndIFace.Vtbl->ProcessKeyCallback(&(Console)->FrontEndIFace, (Msg), (KeyStateMenu), (ShiftState), (VirtualKeyCode), (Down)) #define TermRefreshInternalInfo(Console) \ (Console)->FrontEndIFace.Vtbl->RefreshInternalInfo(&(Console)->FrontEndIFace)

1 0

[jimtabor] 63386: [User32] - Update and sync DDE code with wine. Make name space close to what it should be.
by jimtabor＠svn.reactos.org 20 May '14

20 May '14

Author: jimtabor Date: Tue May 20 19:39:34 2014 New Revision: 63386 URL: http://svn.reactos.org/svn/reactos?rev=63386&view=rev Log: [User32] - Update and sync DDE code with wine. Make name space close to what it should be. Modified: trunk/reactos/win32ss/user/user32/misc/dde.c trunk/reactos/win32ss/user/user32/misc/ddeclient.c trunk/reactos/win32ss/user/user32/misc/ddeserver.c Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Tue May 20 19:39:34 2014 @@ -36,7 +36,7 @@ static WDML_INSTANCE* WDML_InstanceList = NULL; static LONG WDML_MaxInstanceID = 0; /* OK for present, have to worry about wrap-around later */ -const WCHAR WDML_szEventClass[] = {'D','d','e','E','v','e','n','t','C','l','a','s','s',0}; +const WCHAR WDML_szEventClass[] = {'D','D','E','M','L','E','v','e','n','t',0}; /* protection for instance list */ CRITICAL_SECTION WDML_CritSect; @@ -91,7 +91,7 @@ return uiHi; default: - return MAKELPARAM(uiLo, uiHi); + return MAKELONG(uiLo, uiHi); } } @@ -229,11 +229,508 @@ * DdeSetQualityOfService (USER32.@) */ -BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, CONST SECURITY_QUALITY_OF_SERVICE *pqosNew, +BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, const SECURITY_QUALITY_OF_SERVICE *pqosNew, PSECURITY_QUALITY_OF_SERVICE pqosPrev) { FIXME("(%p %p %p): stub\n", hwndClient, pqosNew, pqosPrev); return TRUE; +} + +/* ================================================================ + * + * WDML Error management + * + * ================================================================ */ + +/****************************************************************************** + * DdeGetLastError [USER32.@] Gets most recent error code + * + * PARAMS + * idInst [I] Instance identifier + * + * RETURNS + * Last error code + */ +UINT WINAPI DdeGetLastError(DWORD idInst) +{ + DWORD error_code; + WDML_INSTANCE* pInstance; + + /* First check instance + */ + pInstance = WDML_GetInstance(idInst); + if (pInstance == NULL) + { + error_code = DMLERR_INVALIDPARAMETER; + } + else + { + error_code = pInstance->lastError; + pInstance->lastError = 0; + } + + return error_code; +} + +/****************************************************************** + * WDML_SetAllLastError + * + * + */ +static void WDML_SetAllLastError(DWORD lastError) +{ + DWORD threadID; + WDML_INSTANCE* pInstance; + threadID = GetCurrentThreadId(); + pInstance = WDML_InstanceList; + while (pInstance) + { + if (pInstance->threadID == threadID) + pInstance->lastError = lastError; + pInstance = pInstance->next; + } +} + +/* ================================================================ + * + * String management + * + * ================================================================ */ + + +/****************************************************************** + * WDML_FindNode + * + * + */ +static HSZNode* WDML_FindNode(WDML_INSTANCE* pInstance, HSZ hsz) +{ + HSZNode* pNode; + + if (pInstance == NULL) return NULL; + + for (pNode = pInstance->nodeList; pNode != NULL; pNode = pNode->next) + { + if (pNode->hsz == hsz) break; + } + if (!pNode) WARN("HSZ %p not found\n", hsz); + return pNode; +} + +/****************************************************************** + * WDML_MakeAtomFromHsz + * + * Creates a global atom from an existing HSZ + * Generally used before sending an HSZ as an atom to a remote app + */ +ATOM WDML_MakeAtomFromHsz(HSZ hsz) +{ + WCHAR nameBuffer[MAX_BUFFER_LEN]; + + if (GetAtomNameW(HSZ2ATOM(hsz), nameBuffer, MAX_BUFFER_LEN)) + return GlobalAddAtomW(nameBuffer); + WARN("HSZ %p not found\n", hsz); + return 0; +} + +/****************************************************************** + * WDML_MakeHszFromAtom + * + * Creates a HSZ from an existing global atom + * Generally used while receiving a global atom and transforming it + * into an HSZ + */ +HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) +{ + WCHAR nameBuffer[MAX_BUFFER_LEN]; + + if (!atom) return NULL; + + if (GlobalGetAtomNameW(atom, nameBuffer, MAX_BUFFER_LEN)) + { + TRACE("%x => %s\n", atom, debugstr_w(nameBuffer)); + return DdeCreateStringHandleW(pInstance->instanceID, nameBuffer, CP_WINUNICODE); + } + WARN("ATOM 0x%x not found\n", atom); + return 0; +} + +/****************************************************************** + * WDML_IncHSZ + * + * + */ +BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) +{ + HSZNode* pNode; + + pNode = WDML_FindNode(pInstance, hsz); + if (!pNode) return FALSE; + + pNode->refCount++; + return TRUE; +} + +/****************************************************************************** + * WDML_DecHSZ (INTERNAL) + * + * Decrease the ref count of an HSZ. If it reaches 0, the node is removed from the list + * of HSZ nodes + * Returns -1 is the HSZ isn't found, otherwise it's the current (after --) of the ref count + */ +BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) +{ + HSZNode* pPrev = NULL; + HSZNode* pCurrent; + + for (pCurrent = pInstance->nodeList; pCurrent != NULL; pCurrent = (pPrev = pCurrent)->next) + { + /* If we found the node we were looking for and its ref count is one, + * we can remove it + */ + if (pCurrent->hsz == hsz) + { + if (--pCurrent->refCount == 0) + { + if (pCurrent == pInstance->nodeList) + { + pInstance->nodeList = pCurrent->next; + } + else + { + pPrev->next = pCurrent->next; + } + HeapFree(GetProcessHeap(), 0, pCurrent); + DeleteAtom(HSZ2ATOM(hsz)); + } + return TRUE; + } + } + WARN("HSZ %p not found\n", hsz); + + return FALSE; +} + +/****************************************************************************** + * WDML_FreeAllHSZ (INTERNAL) + * + * Frees up all the strings still allocated in the list and + * remove all the nodes from the list of HSZ nodes. + */ +void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) +{ + /* Free any strings created in this instance. + */ + while (pInstance->nodeList != NULL) + { + DdeFreeStringHandle(pInstance->instanceID, pInstance->nodeList->hsz); + } +} + +/****************************************************************************** + * InsertHSZNode (INTERNAL) + * + * Insert a node to the head of the list. + */ +static void WDML_InsertHSZNode(WDML_INSTANCE* pInstance, HSZ hsz) +{ + if (hsz != 0) + { + HSZNode* pNew = NULL; + /* Create a new node for this HSZ. + */ + pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(HSZNode)); + if (pNew != NULL) + { + pNew->hsz = hsz; + pNew->next = pInstance->nodeList; + pNew->refCount = 1; + pInstance->nodeList = pNew; + } + else + { + ERR("Primary HSZ Node allocation failed - out of memory\n"); + } + } +} + +/****************************************************************** + * WDML_QueryString + * + * + */ +static int WDML_QueryString(WDML_INSTANCE* pInstance, HSZ hsz, LPVOID ptr, DWORD cchMax, + int codepage) +{ + WCHAR pString[MAX_BUFFER_LEN]; + int ret; + /* If psz is null, we have to return only the length + * of the string. + */ + if (ptr == NULL) + { + ptr = pString; + cchMax = MAX_BUFFER_LEN; + } + + /* if there is no input windows returns a NULL string */ + if (hsz == NULL) + { + CHAR *t_ptr = ptr; + *t_ptr = '\0'; + return 1; + } + + switch (codepage) + { + case CP_WINANSI: + ret = GetAtomNameA(HSZ2ATOM(hsz), ptr, cchMax); + break; + case CP_WINUNICODE: + ret = GetAtomNameW(HSZ2ATOM(hsz), ptr, cchMax); + break; + default: + ERR("Unknown code page %d\n", codepage); + ret = 0; + } + return ret; +} + +/***************************************************************** + * DdeQueryStringA [USER32.@] + */ +DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT iCodePage) +{ + DWORD ret = 0; + WDML_INSTANCE* pInstance; + + TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + + /* First check instance + */ + pInstance = WDML_GetInstance(idInst); + if (pInstance != NULL) + { + if (iCodePage == 0) iCodePage = CP_WINANSI; + ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); + } + + TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); + return ret; +} + +/***************************************************************** + * DdeQueryStringW [USER32.@] + */ + +DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, INT iCodePage) +{ + DWORD ret = 0; + WDML_INSTANCE* pInstance; + + TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + + /* First check instance + */ + pInstance = WDML_GetInstance(idInst); + if (pInstance != NULL) + { + if (iCodePage == 0) iCodePage = CP_WINUNICODE; + ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); + } + + TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); + return ret; +} + +/****************************************************************** + * DML_CreateString + * + * + */ +static HSZ WDML_CreateString(WDML_INSTANCE* pInstance, LPCVOID ptr, int codepage) +{ + HSZ hsz; + + switch (codepage) + { + case CP_WINANSI: + hsz = ATOM2HSZ(AddAtomA(ptr)); + TRACE("added atom %s with HSZ %p,\n", debugstr_a(ptr), hsz); + break; + case CP_WINUNICODE: + hsz = ATOM2HSZ(AddAtomW(ptr)); + TRACE("added atom %s with HSZ %p,\n", debugstr_w(ptr), hsz); + break; + default: + ERR("Unknown code page %d\n", codepage); + return 0; + } + WDML_InsertHSZNode(pInstance, hsz); + return hsz; +} + +/***************************************************************** + * DdeCreateStringHandleA [USER32.@] + * + * See DdeCreateStringHandleW. + */ +HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) +{ + HSZ hsz = 0; + WDML_INSTANCE* pInstance; + + TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); + + pInstance = WDML_GetInstance(idInst); + if (pInstance == NULL) + WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); + else + { + if (codepage == 0) codepage = CP_WINANSI; + hsz = WDML_CreateString(pInstance, psz, codepage); + } + + return hsz; +} + + +/****************************************************************************** + * DdeCreateStringHandleW [USER32.@] Creates handle to identify string + * + * PARAMS + * idInst [I] Instance identifier + * psz [I] Pointer to string + * codepage [I] Code page identifier + * RETURNS + * Success: String handle + * Failure: 0 + */ +HSZ WINAPI DdeCreateStringHandleW(DWORD idInst, LPCWSTR psz, INT codepage) +{ + WDML_INSTANCE* pInstance; + HSZ hsz = 0; + + pInstance = WDML_GetInstance(idInst); + if (pInstance == NULL) + WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); + else + { + if (codepage == 0) codepage = CP_WINUNICODE; + hsz = WDML_CreateString(pInstance, psz, codepage); + } + + return hsz; +} + +/***************************************************************** + * DdeFreeStringHandle (USER32.@) + * RETURNS + * success: nonzero + * fail: zero + */ +BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) +{ + WDML_INSTANCE* pInstance; + BOOL ret = FALSE; + + TRACE("(%d,%p):\n", idInst, hsz); + + /* First check instance + */ + pInstance = WDML_GetInstance(idInst); + if (pInstance) + ret = WDML_DecHSZ(pInstance, hsz); + + return ret; +} + +/***************************************************************** + * DdeKeepStringHandle (USER32.@) + * + * RETURNS + * success: nonzero + * fail: zero + */ +BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) +{ + WDML_INSTANCE* pInstance; + BOOL ret = FALSE; + + TRACE("(%d,%p):\n", idInst, hsz); + + /* First check instance + */ + pInstance = WDML_GetInstance(idInst); + if (pInstance) + ret = WDML_IncHSZ(pInstance, hsz); + + return ret; +} + +/***************************************************************** + * DdeCmpStringHandles (USER32.@) + * + * Compares the value of two string handles. This comparison is + * not case sensitive. + * + * PARAMS + * hsz1 [I] Handle to the first string + * hsz2 [I] Handle to the second string + * + * RETURNS + * -1 The value of hsz1 is zero or less than hsz2 + * 0 The values of hsz 1 and 2 are the same or both zero. + * 1 The value of hsz2 is zero of less than hsz1 + */ +INT WINAPI DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) +{ + WCHAR psz1[MAX_BUFFER_LEN]; + WCHAR psz2[MAX_BUFFER_LEN]; + int ret = 0; + int ret1, ret2; + + ret1 = GetAtomNameW(HSZ2ATOM(hsz1), psz1, MAX_BUFFER_LEN); + ret2 = GetAtomNameW(HSZ2ATOM(hsz2), psz2, MAX_BUFFER_LEN); + + TRACE("(%p<%s> %p<%s>);\n", hsz1, debugstr_w(psz1), hsz2, debugstr_w(psz2)); + + /* Make sure we found both strings. */ + if (ret1 == 0 && ret2 == 0) + { + /* If both are not found, return both "zero strings". */ + ret = 0; + } + else if (ret1 == 0) + { + /* If hsz1 is a not found, return hsz1 is "zero string". */ + ret = -1; + } + else if (ret2 == 0) + { + /* If hsz2 is a not found, return hsz2 is "zero string". */ + ret = 1; + } + else + { + /* Compare the two strings we got (case insensitive). */ + ret = lstrcmpiW(psz1, psz2); + /* Since strcmp returns any number smaller than + * 0 when the first string is found to be less than + * the second one we must make sure we are returning + * the proper values. + */ + if (ret < 0) + { + ret = -1; + } + else if (ret > 0) + { + ret = 1; + } + } + + return ret; } /* ================================================================ @@ -329,7 +826,7 @@ * */ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode) + DWORD afCmd, DWORD ulRes, BOOL bUnicode) { WDML_INSTANCE* pInstance; WDML_INSTANCE* reference_inst; @@ -343,7 +840,7 @@ { ERR("Reserved value not zero? What does this mean?\n"); /* trap this and no more until we know more */ - return DMLERR_NO_ERROR; + return DMLERR_INVALIDPARAMETER; } /* grab enough heap for one control struct - not really necessary for re-initialise @@ -386,12 +883,12 @@ (pInstance->CBFflags & CBF_FAIL_ALLSVRXACTIONS) == CBF_FAIL_ALLSVRXACTIONS; } - TRACE("instance created - checking validity\n"); + ERR("instance created - checking validity\n"); if (*pidInst == 0) { /* Initialisation of new Instance Identifier */ - TRACE("new instance, callback %p flags %X\n",pfnCallback,afCmd); + ERR("new instance, callback %p flags %X\n",pfnCallback,afCmd); EnterCriticalSection(&WDML_CritSect); @@ -410,7 +907,7 @@ */ pInstance->CBFflags = pInstance->CBFflags|APPCMD_FILTERINITS; - TRACE("First application instance detected OK\n"); + ERR("First application instance detected OK\n"); /* allocate new instance ID */ WDML_IncrementInstanceId(pInstance); } @@ -419,7 +916,7 @@ /* really need to chain the new one in to the latest here, but after checking conditions * such as trying to start a conversation from an application trying to monitor */ reference_inst = WDML_InstanceList; - TRACE("Subsequent application instance - starting checks\n"); + ERR("Subsequent application instance - starting checks\n"); while (reference_inst->next != NULL) { /* @@ -435,6 +932,7 @@ if (pInstance->clientOnly != reference_inst->clientOnly) { + ERR("WDML_Initialize Mustbe Client-only\n"); ret = DMLERR_DLL_USAGE; goto theError; } @@ -443,6 +941,7 @@ if (pInstance->monitor != reference_inst->monitor) { + ERR("WDML_Initialize cannot use monitor w/any modes\n"); ret = DMLERR_INVALIDPARAMETER; goto theError; } @@ -459,7 +958,7 @@ } /* All cleared, add to chain */ - TRACE("Application Instance checks finished\n"); + ERR("Application Instance checks finished\n"); WDML_IncrementInstanceId(pInstance); reference_inst->next = pInstance; } @@ -489,17 +988,18 @@ SetWindowLongPtrW(pInstance->hwndEvent, GWL_WDML_INSTANCE, (ULONG_PTR)pInstance); - TRACE("New application instance processing finished OK\n"); + ERR("New application instance processing finished OK\n"); } else { /* Reinitialisation situation --- FIX */ - TRACE("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); + ERR("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); EnterCriticalSection(&WDML_CritSect); if (WDML_InstanceList == NULL) { + ERR("WDML_Initialize No instance list\n"); ret = DMLERR_INVALIDPARAMETER; goto theError; } @@ -524,6 +1024,7 @@ if (!(afCmd & APPCMD_CLIENTONLY)) { + ERR("WDML_Initialize AppCmd Client-only 2\n"); ret = DMLERR_INVALIDPARAMETER; goto theError; } @@ -533,6 +1034,7 @@ if (pInstance->monitor != reference_inst->monitor) { + ERR("WDML_Initialize cannot change monitor modes 2\n"); ret = DMLERR_INVALIDPARAMETER; goto theError; } @@ -541,6 +1043,7 @@ if ((afCmd&APPCMD_CLIENTONLY) && !reference_inst->clientOnly) { + ERR("WDML_Initialize trying to set Client-only via APPCMD\n"); ret = DMLERR_INVALIDPARAMETER; goto theError; } @@ -550,6 +1053,7 @@ } if (reference_inst->next == NULL) { + ERR("WDML_Initialize Nothing Next\n"); ret = DMLERR_INVALIDPARAMETER; goto theError; } @@ -566,6 +1070,7 @@ return DMLERR_NO_ERROR; theError: + ERR("WDML_Initialize error %x\n",ret); HeapFree(GetProcessHeap(), 0, pInstance); LeaveCriticalSection(&WDML_CritSect); return ret; @@ -767,497 +1272,6 @@ return (WDML_INSTANCE*)GetWindowLongPtrW(hWnd, GWL_WDML_INSTANCE); } -/****************************************************************************** - * DdeGetLastError [USER32.@] Gets most recent error code - * - * PARAMS - * idInst [I] Instance identifier - * - * RETURNS - * Last error code - */ -UINT WINAPI DdeGetLastError(DWORD idInst) -{ - DWORD error_code; - WDML_INSTANCE* pInstance; - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - { - error_code = DMLERR_INVALIDPARAMETER; - } - else - { - error_code = pInstance->lastError; - pInstance->lastError = 0; - } - - return error_code; -} - -/****************************************************************** - * WDML_SetAllLastError - * - * - */ -static void WDML_SetAllLastError(DWORD lastError) -{ - DWORD threadID; - WDML_INSTANCE* pInstance; - threadID = GetCurrentThreadId(); - pInstance = WDML_InstanceList; - while (pInstance) - { - if (pInstance->threadID == threadID) - pInstance->lastError = lastError; - pInstance = pInstance->next; - } -} - -/* ================================================================ - * - * String management - * - * ================================================================ */ - - -/****************************************************************** - * WDML_FindNode - * - * - */ -static HSZNode* WDML_FindNode(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pNode; - - if (pInstance == NULL) return NULL; - - for (pNode = pInstance->nodeList; pNode != NULL; pNode = pNode->next) - { - if (pNode->hsz == hsz) break; - } - if (!pNode) WARN("HSZ %p not found\n", hsz); - return pNode; -} - -/****************************************************************** - * WDML_MakeAtomFromHsz - * - * Creates a global atom from an existing HSZ - * Generally used before sending an HSZ as an atom to a remote app - */ -ATOM WDML_MakeAtomFromHsz(HSZ hsz) -{ - WCHAR nameBuffer[MAX_BUFFER_LEN]; - - if (GetAtomNameW(HSZ2ATOM(hsz), nameBuffer, MAX_BUFFER_LEN)) - return GlobalAddAtomW(nameBuffer); - WARN("HSZ %p not found\n", hsz); - return 0; -} - -/****************************************************************** - * WDML_MakeHszFromAtom - * - * Creates a HSZ from an existing global atom - * Generally used while receiving a global atom and transforming it - * into an HSZ - */ -HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) -{ - WCHAR nameBuffer[MAX_BUFFER_LEN]; - - if (!atom) return NULL; - - if (GlobalGetAtomNameW(atom, nameBuffer, MAX_BUFFER_LEN)) - { - TRACE("%x => %s\n", atom, debugstr_w(nameBuffer)); - return DdeCreateStringHandleW(pInstance->instanceID, nameBuffer, CP_WINUNICODE); - } - WARN("ATOM 0x%x not found\n", atom); - return 0; -} - -/****************************************************************** - * WDML_IncHSZ - * - * - */ -BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pNode; - - pNode = WDML_FindNode(pInstance, hsz); - if (!pNode) return FALSE; - - pNode->refCount++; - return TRUE; -} - -/****************************************************************************** - * WDML_DecHSZ (INTERNAL) - * - * Decrease the ref count of an HSZ. If it reaches 0, the node is removed from the list - * of HSZ nodes - * Returns -1 is the HSZ isn't found, otherwise it's the current (after --) of the ref count - */ -BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) -{ - HSZNode* pPrev = NULL; - HSZNode* pCurrent; - - for (pCurrent = pInstance->nodeList; pCurrent != NULL; pCurrent = (pPrev = pCurrent)->next) - { - /* If we found the node we were looking for and its ref count is one, - * we can remove it - */ - if (pCurrent->hsz == hsz) - { - if (--pCurrent->refCount == 0) - { - if (pCurrent == pInstance->nodeList) - { - pInstance->nodeList = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - HeapFree(GetProcessHeap(), 0, pCurrent); - DeleteAtom(HSZ2ATOM(hsz)); - } - return TRUE; - } - } - WARN("HSZ %p not found\n", hsz); - - return FALSE; -} - -/****************************************************************************** - * WDML_FreeAllHSZ (INTERNAL) - * - * Frees up all the strings still allocated in the list and - * remove all the nodes from the list of HSZ nodes. - */ -void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) -{ - /* Free any strings created in this instance. - */ - while (pInstance->nodeList != NULL) - { - DdeFreeStringHandle(pInstance->instanceID, pInstance->nodeList->hsz); - } -} - -/****************************************************************************** - * InsertHSZNode (INTERNAL) - * - * Insert a node to the head of the list. - */ -static void WDML_InsertHSZNode(WDML_INSTANCE* pInstance, HSZ hsz) -{ - if (hsz != 0) - { - HSZNode* pNew = NULL; - /* Create a new node for this HSZ. - */ - pNew = HeapAlloc(GetProcessHeap(), 0, sizeof(HSZNode)); - if (pNew != NULL) - { - pNew->hsz = hsz; - pNew->next = pInstance->nodeList; - pNew->refCount = 1; - pInstance->nodeList = pNew; - } - else - { - ERR("Primary HSZ Node allocation failed - out of memory\n"); - } - } -} - -/****************************************************************** - * WDML_QueryString - * - * - */ -static int WDML_QueryString(WDML_INSTANCE* pInstance, HSZ hsz, LPVOID ptr, DWORD cchMax, - int codepage) -{ - WCHAR pString[MAX_BUFFER_LEN]; - int ret; - /* If psz is null, we have to return only the length - * of the string. - */ - if (ptr == NULL) - { - ptr = pString; - cchMax = MAX_BUFFER_LEN; - } - - /* if there is no input windows returns a NULL string */ - if (hsz == NULL) - { - CHAR *t_ptr = ptr; - *t_ptr = '\0'; - return 1; - } - - switch (codepage) - { - case CP_WINANSI: - ret = GetAtomNameA(HSZ2ATOM(hsz), ptr, cchMax); - break; - case CP_WINUNICODE: - ret = GetAtomNameW(HSZ2ATOM(hsz), ptr, cchMax); - break; - default: - ERR("Unknown code page %d\n", codepage); - ret = 0; - } - return ret; -} - -/***************************************************************** - * DdeQueryStringA [USER32.@] - */ -DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT iCodePage) -{ - DWORD ret = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance != NULL) - { - if (iCodePage == 0) iCodePage = CP_WINANSI; - ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); - } - - TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); - return ret; -} - -/***************************************************************** - * DdeQueryStringW [USER32.@] - */ - -DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, INT iCodePage) -{ - DWORD ret = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance != NULL) - { - if (iCodePage == 0) iCodePage = CP_WINUNICODE; - ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); - } - - TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); - return ret; -} - -/****************************************************************** - * DML_CreateString - * - * - */ -static HSZ WDML_CreateString(WDML_INSTANCE* pInstance, LPCVOID ptr, int codepage) -{ - HSZ hsz; - - switch (codepage) - { - case CP_WINANSI: - hsz = ATOM2HSZ(AddAtomA(ptr)); - TRACE("added atom %s with HSZ %p,\n", debugstr_a(ptr), hsz); - break; - case CP_WINUNICODE: - hsz = ATOM2HSZ(AddAtomW(ptr)); - TRACE("added atom %s with HSZ %p,\n", debugstr_w(ptr), hsz); - break; - default: - ERR("Unknown code page %d\n", codepage); - return 0; - } - WDML_InsertHSZNode(pInstance, hsz); - return hsz; -} - -/***************************************************************** - * DdeCreateStringHandleA [USER32.@] - * - * See DdeCreateStringHandleW. - */ -HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) -{ - HSZ hsz = 0; - WDML_INSTANCE* pInstance; - - TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - else - { - if (codepage == 0) codepage = CP_WINANSI; - hsz = WDML_CreateString(pInstance, psz, codepage); - } - - return hsz; -} - - -/****************************************************************************** - * DdeCreateStringHandleW [USER32.@] Creates handle to identify string - * - * PARAMS - * idInst [I] Instance identifier - * psz [I] Pointer to string - * codepage [I] Code page identifier - * RETURNS - * Success: String handle - * Failure: 0 - */ -HSZ WINAPI DdeCreateStringHandleW(DWORD idInst, LPCWSTR psz, INT codepage) -{ - WDML_INSTANCE* pInstance; - HSZ hsz = 0; - - pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL) - WDML_SetAllLastError(DMLERR_INVALIDPARAMETER); - else - { - if (codepage == 0) codepage = CP_WINUNICODE; - hsz = WDML_CreateString(pInstance, psz, codepage); - } - - return hsz; -} - -/***************************************************************** - * DdeFreeStringHandle (USER32.@) - * RETURNS - * success: nonzero - * fail: zero - */ -BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) -{ - WDML_INSTANCE* pInstance; - BOOL ret = FALSE; - - TRACE("(%d,%p):\n", idInst, hsz); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance) - ret = WDML_DecHSZ(pInstance, hsz); - - return ret; -} - -/***************************************************************** - * DdeKeepStringHandle (USER32.@) - * - * RETURNS - * success: nonzero - * fail: zero - */ -BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) -{ - WDML_INSTANCE* pInstance; - BOOL ret = FALSE; - - TRACE("(%d,%p):\n", idInst, hsz); - - /* First check instance - */ - pInstance = WDML_GetInstance(idInst); - if (pInstance) - ret = WDML_IncHSZ(pInstance, hsz); - - return ret; -} - -/***************************************************************** - * DdeCmpStringHandles (USER32.@) - * - * Compares the value of two string handles. This comparison is - * not case sensitive. - * - * PARAMS - * hsz1 [I] Handle to the first string - * hsz2 [I] Handle to the second string - * - * RETURNS - * -1 The value of hsz1 is zero or less than hsz2 - * 0 The values of hsz 1 and 2 are the same or both zero. - * 1 The value of hsz2 is zero of less than hsz1 - */ -INT WINAPI DdeCmpStringHandles(HSZ hsz1, HSZ hsz2) -{ - WCHAR psz1[MAX_BUFFER_LEN]; - WCHAR psz2[MAX_BUFFER_LEN]; - int ret = 0; - int ret1, ret2; - - ret1 = GetAtomNameW(HSZ2ATOM(hsz1), psz1, MAX_BUFFER_LEN); - ret2 = GetAtomNameW(HSZ2ATOM(hsz2), psz2, MAX_BUFFER_LEN); - - TRACE("(%p<%s> %p<%s>);\n", hsz1, debugstr_w(psz1), hsz2, debugstr_w(psz2)); - - /* Make sure we found both strings. */ - if (ret1 == 0 && ret2 == 0) - { - /* If both are not found, return both "zero strings". */ - ret = 0; - } - else if (ret1 == 0) - { - /* If hsz1 is a not found, return hsz1 is "zero string". */ - ret = -1; - } - else if (ret2 == 0) - { - /* If hsz2 is a not found, return hsz2 is "zero string". */ - ret = 1; - } - else - { - /* Compare the two strings we got (case insensitive). */ - ret = lstrcmpiW(psz1, psz2); - /* Since strcmp returns any number smaller than - * 0 when the first string is found to be less than - * the second one we must make sure we are returning - * the proper values. - */ - if (ret < 0) - { - ret = -1; - } - else if (ret > 0) - { - ret = 1; - } - } - - return ret; -} - /* ================================================================ * * Data handle management @@ -1459,7 +1473,7 @@ /* 1 is the handle value returned by an asynchronous operation. */ if (hData == (HDDEDATA)1) - return TRUE; + return TRUE; return GlobalFree(hData) == 0; } @@ -1514,7 +1528,7 @@ default: FIXME("Unsupported format (%04x) for data %p, passing raw information\n", pDd->cfFormat, hMem); - /* fall thru */ + /* fall through */ case 0: case CF_TEXT: ret = DdeCreateDataHandle(pConv->instance->instanceID, pDd->Value, size, 0, 0, pDd->cfFormat, 0); @@ -1573,7 +1587,7 @@ default: FIXME("Unsupported format (%04x) for data %p, passing raw information\n", pDdh->cfFormat, hDdeData); - /* fall thru */ + /* fall through */ case 0: case CF_TEXT: hMem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(WINE_DDEHEAD) + dwSize); @@ -1738,6 +1752,259 @@ /* ================================================================ * + * Link (hot & warm) management + * + * ================================================================ */ + +/****************************************************************** + * WDML_AddLink + * + * + */ +void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, + UINT wType, HSZ hszItem, UINT wFmt) +{ + WDML_LINK* pLink; + + pLink = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_LINK)); + if (pLink == NULL) + { + ERR("OOM\n"); + return; + } + + pLink->hConv = hConv; + pLink->transactionType = wType; + WDML_IncHSZ(pInstance, pLink->hszItem = hszItem); + pLink->uFmt = wFmt; + pLink->next = pInstance->links[side]; + pInstance->links[side] = pLink; +} + +/****************************************************************** + * WDML_RemoveLink + * + * + */ +void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, + HSZ hszItem, UINT uFmt) +{ + WDML_LINK* pPrev = NULL; + WDML_LINK* pCurrent = NULL; + + pCurrent = pInstance->links[side]; + + while (pCurrent != NULL) + { + if (pCurrent->hConv == hConv && + DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && + pCurrent->uFmt == uFmt) + { + if (pCurrent == pInstance->links[side]) + { + pInstance->links[side] = pCurrent->next; + } + else + { + pPrev->next = pCurrent->next; + } + + WDML_DecHSZ(pInstance, pCurrent->hszItem); + HeapFree(GetProcessHeap(), 0, pCurrent); + break; + } + + pPrev = pCurrent; + pCurrent = pCurrent->next; + } +} + +/* this function is called to remove all links related to the conv. + It should be called from both client and server when terminating + the conversation. +*/ +/****************************************************************** + * WDML_RemoveAllLinks + * + * + */ +void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) +{ + WDML_LINK* pPrev = NULL; + WDML_LINK* pCurrent = NULL; + WDML_LINK* pNext = NULL; + + pCurrent = pInstance->links[side]; + + while (pCurrent != NULL) + { + if (pCurrent->hConv == (HCONV)pConv) + { + if (pCurrent == pInstance->links[side]) + { + pInstance->links[side] = pCurrent->next; + pNext = pCurrent->next; + } + else + { + pPrev->next = pCurrent->next; + pNext = pCurrent->next; + } + + WDML_DecHSZ(pInstance, pCurrent->hszItem); + + HeapFree(GetProcessHeap(), 0, pCurrent); + pCurrent = NULL; + } + + if (pCurrent) + { + pPrev = pCurrent; + pCurrent = pCurrent->next; + } + else + { + pCurrent = pNext; + } + } +} + +/****************************************************************** + * WDML_FindLink + * + * + */ +WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, + HSZ hszItem, BOOL use_fmt, UINT uFmt) +{ + WDML_LINK* pCurrent = NULL; + + for (pCurrent = pInstance->links[side]; pCurrent != NULL; pCurrent = pCurrent->next) + { + /* we don't need to check for transaction type as it can be altered */ + + if (pCurrent->hConv == hConv && + DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && + (!use_fmt || pCurrent->uFmt == uFmt)) + { + break; + } + + } + + return pCurrent; +} + +/* ================================================================ + * + * Transaction management + * + * ================================================================ */ + +/****************************************************************** + * WDML_AllocTransaction + * + * Alloc a transaction structure for handling the message ddeMsg + */ +WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, + UINT wFmt, HSZ hszItem) +{ + WDML_XACT* pXAct; + static WORD tid = 1; /* FIXME: wrap around */ + + pXAct = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_XACT)); + if (!pXAct) + { + pInstance->lastError = DMLERR_MEMORY_ERROR; + return NULL; + } + + pXAct->xActID = tid++; + pXAct->ddeMsg = ddeMsg; + pXAct->hDdeData = 0; + pXAct->hUser = 0; + pXAct->next = NULL; + pXAct->wType = 0; + pXAct->wFmt = wFmt; + if ((pXAct->hszItem = hszItem)) WDML_IncHSZ(pInstance, pXAct->hszItem); + pXAct->atom = 0; + pXAct->hMem = 0; + pXAct->lParam = 0; + + return pXAct; +} + +/****************************************************************** + * WDML_QueueTransaction + * + * Adds a transaction to the list of transaction + */ +void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) +{ + WDML_XACT** pt; + + /* advance to last in queue */ + for (pt = &pConv->transactions; *pt != NULL; pt = &(*pt)->next); + *pt = pXAct; +} + +/****************************************************************** + * WDML_UnQueueTransaction + * + * + */ +BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) +{ + WDML_XACT** pt; + + for (pt = &pConv->transactions; *pt; pt = &(*pt)->next) + { + if (*pt == pXAct) + { + *pt = pXAct->next; + return TRUE; + } + } + return FALSE; +} + +/****************************************************************** + * WDML_FreeTransaction + * + * + */ +void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt) +{ + /* free pmt(s) in pXAct too. check against one for not deleting TRUE return values */ + if (doFreePmt && (ULONG_PTR)pXAct->hMem > 1) + { + GlobalFree(pXAct->hMem); + } + if (pXAct->hszItem) WDML_DecHSZ(pInstance, pXAct->hszItem); + + HeapFree(GetProcessHeap(), 0, pXAct); +} + +/****************************************************************** + * WDML_FindTransaction + * + * + */ +WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) +{ + WDML_XACT* pXAct; + + tid = HIWORD(tid); + for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) + { + if (pXAct->xActID == tid) + break; + } + return pXAct; +} + +/* ================================================================ + * * Conversation management * * ================================================================ */ @@ -1876,7 +2143,7 @@ } if (wCmd == EC_QUERYWAITING) - return pConv->transactions ? TRUE : FALSE; + return pConv->transactions != NULL; if (wCmd != EC_ENABLEALL && wCmd != EC_ENABLEONE) { @@ -2203,259 +2470,6 @@ /* ================================================================ * - * Link (hot & warm) management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AddLink - * - * - */ -void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - UINT wType, HSZ hszItem, UINT wFmt) -{ - WDML_LINK* pLink; - - pLink = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_LINK)); - if (pLink == NULL) - { - ERR("OOM\n"); - return; - } - - pLink->hConv = hConv; - pLink->transactionType = wType; - WDML_IncHSZ(pInstance, pLink->hszItem = hszItem); - pLink->uFmt = wFmt; - pLink->next = pInstance->links[side]; - pInstance->links[side] = pLink; -} - -/****************************************************************** - * WDML_RemoveLink - * - * - */ -void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, UINT uFmt) -{ - WDML_LINK* pPrev = NULL; - WDML_LINK* pCurrent = NULL; - - pCurrent = pInstance->links[side]; - - while (pCurrent != NULL) - { - if (pCurrent->hConv == hConv && - DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && - pCurrent->uFmt == uFmt) - { - if (pCurrent == pInstance->links[side]) - { - pInstance->links[side] = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - } - - WDML_DecHSZ(pInstance, pCurrent->hszItem); - HeapFree(GetProcessHeap(), 0, pCurrent); - break; - } - - pPrev = pCurrent; - pCurrent = pCurrent->next; - } -} - -/* this function is called to remove all links related to the conv. - It should be called from both client and server when terminating - the conversation. -*/ -/****************************************************************** - * WDML_RemoveAllLinks - * - * - */ -void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) -{ - WDML_LINK* pPrev = NULL; - WDML_LINK* pCurrent = NULL; - WDML_LINK* pNext = NULL; - - pCurrent = pInstance->links[side]; - - while (pCurrent != NULL) - { - if (pCurrent->hConv == (HCONV)pConv) - { - if (pCurrent == pInstance->links[side]) - { - pInstance->links[side] = pCurrent->next; - pNext = pCurrent->next; - } - else - { - pPrev->next = pCurrent->next; - pNext = pCurrent->next; - } - - WDML_DecHSZ(pInstance, pCurrent->hszItem); - - HeapFree(GetProcessHeap(), 0, pCurrent); - pCurrent = NULL; - } - - if (pCurrent) - { - pPrev = pCurrent; - pCurrent = pCurrent->next; - } - else - { - pCurrent = pNext; - } - } -} - -/****************************************************************** - * WDML_FindLink - * - * - */ -WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, BOOL use_fmt, UINT uFmt) -{ - WDML_LINK* pCurrent = NULL; - - for (pCurrent = pInstance->links[side]; pCurrent != NULL; pCurrent = pCurrent->next) - { - /* we don't need to check for transaction type as it can be altered */ - - if (pCurrent->hConv == hConv && - DdeCmpStringHandles(pCurrent->hszItem, hszItem) == 0 && - (!use_fmt || pCurrent->uFmt == uFmt)) - { - break; - } - - } - - return pCurrent; -} - -/* ================================================================ - * - * Transaction management - * - * ================================================================ */ - -/****************************************************************** - * WDML_AllocTransaction - * - * Alloc a transaction structure for handling the message ddeMsg - */ -WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, - UINT wFmt, HSZ hszItem) -{ - WDML_XACT* pXAct; - static WORD tid = 1; /* FIXME: wrap around */ - - pXAct = HeapAlloc(GetProcessHeap(), 0, sizeof(WDML_XACT)); - if (!pXAct) - { - pInstance->lastError = DMLERR_MEMORY_ERROR; - return NULL; - } - - pXAct->xActID = tid++; - pXAct->ddeMsg = ddeMsg; - pXAct->hDdeData = 0; - pXAct->hUser = 0; - pXAct->next = NULL; - pXAct->wType = 0; - pXAct->wFmt = wFmt; - if ((pXAct->hszItem = hszItem)) WDML_IncHSZ(pInstance, pXAct->hszItem); - pXAct->atom = 0; - pXAct->hMem = 0; - pXAct->lParam = 0; - - return pXAct; -} - -/****************************************************************** - * WDML_QueueTransaction - * - * Adds a transaction to the list of transaction - */ -void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) -{ - WDML_XACT** pt; - - /* advance to last in queue */ - for (pt = &pConv->transactions; *pt != NULL; pt = &(*pt)->next); - *pt = pXAct; -} - -/****************************************************************** - * WDML_UnQueueTransaction - * - * - */ -BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) -{ - WDML_XACT** pt; - - for (pt = &pConv->transactions; *pt; pt = &(*pt)->next) - { - if (*pt == pXAct) - { - *pt = pXAct->next; - return TRUE; - } - } - return FALSE; -} - -/****************************************************************** - * WDML_FreeTransaction - * - * - */ -void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt) -{ - /* free pmt(s) in pXAct too. check against one for not deleting TRUE return values */ - if (doFreePmt && (ULONG_PTR)pXAct->hMem > 1) - { - GlobalFree(pXAct->hMem); - } - if (pXAct->hszItem) WDML_DecHSZ(pInstance, pXAct->hszItem); - - HeapFree(GetProcessHeap(), 0, pXAct); -} - -/****************************************************************** - * WDML_FindTransaction - * - * - */ -WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) -{ - WDML_XACT* pXAct; - - tid = HIWORD(tid); - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { - if (pXAct->xActID == tid) - break; - } - return pXAct; -} - -/* ================================================================ - * * Information broadcast across DDEML implementations * * ================================================================ */ Modified: trunk/reactos/win32ss/user/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] Tue May 20 19:39:34 2014 @@ -30,8 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddeml); static LRESULT CALLBACK WDML_ClientProc(HWND, UINT, WPARAM, LPARAM); /* only for one client, not conv list */ -const char WDML_szClientConvClassA[] = "DdeClientAnsi"; -const WCHAR WDML_szClientConvClassW[] = {'D','d','e','C','l','i','e','n','t','U','n','i','c','o','d','e',0}; +const char WDML_szClientConvClassA[] = "DDEMLAnsiClient"; +const WCHAR WDML_szClientConvClassW[] = {'D','D','E','M','L','U','n','i','c','o','d','e','C','l','i','e','n','t',0}; /****************************************************************************** * DdeConnectList [USER32.@] Establishes conversation with DDE servers @@ -91,7 +91,7 @@ WDML_CONV* pConv = NULL; ATOM aSrv = 0, aTpc = 0; - TRACE("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); + ERR("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); pInstance = WDML_GetInstance(idInst); if (!pInstance) @@ -166,7 +166,7 @@ /* note: sent messages shall not use packing */ SendMessageTimeoutW( HWND_BROADCAST, WM_DDE_INITIATE, (WPARAM)hwndClient, MAKELPARAM(aSrv, aTpc), - SMTO_ABORTIFHUNG, 2000, NULL ); + SMTO_ABORTIFHUNG, 0, NULL ); pInstance = WDML_GetInstance(idInst); if (!pInstance) @@ -180,12 +180,12 @@ pConv = WDML_GetConvFromWnd(hwndClient); if (pConv == NULL || pConv->hwndServer == 0) { - WARN("Done with INITIATE, but no Server window available\n"); + ERR("Done with INITIATE, but no Server window available %p\n", (pConv ? pConv->hwndServer : NULL)); pConv = NULL; pInstance->lastError = DMLERR_NO_CONV_ESTABLISHED; goto theEnd; } - TRACE("Connected to Server window (%p)\n", pConv->hwndServer); + ERR("Connected to Server window (%p)\n", pConv->hwndServer); pConv->wConvst = XST_CONNECTED; /* finish init of pConv */ @@ -312,8 +312,8 @@ /* pack DdeAdvise */ pDdeAdvise = GlobalLock(pXAct->hMem); - pDdeAdvise->fAckReq = (wType & XTYPF_ACKREQ) ? TRUE : FALSE; - pDdeAdvise->fDeferUpd = (wType & XTYPF_NODATA) ? TRUE : FALSE; + pDdeAdvise->fAckReq = (wType & XTYPF_ACKREQ) != 0; + pDdeAdvise->fDeferUpd = (wType & XTYPF_NODATA) != 0; pDdeAdvise->cfFormat = wFmt; GlobalUnlock(pXAct->hMem); @@ -848,7 +848,7 @@ * XTYP_ADVDATA and callback should return the proper status. */ pLink = WDML_FindLink(pConv->instance, (HCONV)pConv, WDML_CLIENT_SIDE, hsz, - uiLo ? TRUE : FALSE, wdh.cfFormat); + uiLo != 0, wdh.cfFormat); if (!pLink) { WDML_DecHSZ(pConv->instance, hsz); @@ -1008,22 +1008,20 @@ */ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, const WDML_XACT* pXAct, DWORD *ack) { - DWORD dwTime; + DWORD start, elapsed; DWORD err; WDML_CONV* pConv; - TRACE("Starting wait for a timeout of %d ms\n", dwTimeout); - - /* FIXME: time 32 bit wrap around */ - dwTimeout += GetCurrentTime(); - - while ((dwTime = GetCurrentTime()) < dwTimeout) + ERR("Starting wait for a timeout of %d ms\n", dwTimeout); + + start = GetTickCount(); + while ((elapsed = GetTickCount() - start) < dwTimeout) { /* we cannot be in the crit sect all the time because when client and server run in a * single process they need to share the access to the internal data */ if (MsgWaitForMultipleObjects(0, NULL, FALSE, - dwTimeout - dwTime, QS_POSTMESSAGE) == WAIT_OBJECT_0) + dwTimeout - elapsed, QS_POSTMESSAGE) == WAIT_OBJECT_0) { MSG msg; @@ -1034,16 +1032,18 @@ pConv = WDML_GetConv(hConv, FALSE); if (pConv == NULL) { + ERR("conversation no longer available\n"); /* conversation no longer available... return failure */ return 0; } + ERR("Msg hWnd %p & Client %p\n",msg.hwnd,pConv->hwndClient); if (msg.hwnd == pConv->hwndClient) { /* check that either pXAct has been processed or no more xActions are pending */ BOOL ret = (pConv->transactions == pXAct); if (WDML_HandleReply(pConv, &msg, &hdd, ack) == WDML_QS_HANDLED) { - TRACE("WDML_HandleReply returned WDML_QS_HANDLED\n"); + ERR("WDML_HandleReply returned WDML_QS_HANDLED\n"); ret = TRUE; } else @@ -1057,13 +1057,14 @@ } else { + ERR("Dispatching message\n"); DispatchMessageW(&msg); } } } } - TRACE("Timeout !!\n"); + ERR("Timeout !!\n"); pConv = WDML_GetConv(hConv, FALSE); if (pConv != NULL) @@ -1143,6 +1144,7 @@ if (pConv == NULL) { /* cannot set error... cannot get back to DDE instance */ + ERR("No Conv!\n"); return 0; } @@ -1237,14 +1239,18 @@ { if ((pConv = WDML_GetConv(hConv, TRUE)) && pConv->instance == pInstance) { - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { + + pXAct = pConv->transactions; + while (pXAct) { + WDML_XACT *nextXAct = pXAct->next; + if (pXAct->dwTimeout == TIMEOUT_ASYNC && (idTransaction == 0 || pXAct->xActID == idTransaction)) { WDML_UnQueueTransaction(pConv, pXAct); WDML_FreeTransaction(pInstance, pXAct, TRUE); } + pXAct = nextXAct; } } } @@ -1253,13 +1259,16 @@ for (pConv = pInstance->convs[WDML_CLIENT_SIDE]; pConv; pConv = pConv->next) { if (!(pConv->wStatus & ST_CONNECTED)) continue; - for (pXAct = pConv->transactions; pXAct; pXAct = pXAct->next) - { + pXAct = pConv->transactions; + while (pXAct) { + WDML_XACT *nextXAct = pXAct->next; + if (pXAct->dwTimeout == TIMEOUT_ASYNC) { WDML_UnQueueTransaction(pConv, pXAct); WDML_FreeTransaction(pInstance, pXAct, TRUE); } + pXAct = nextXAct; } } } @@ -1278,16 +1287,18 @@ UINT uiLo, uiHi; WDML_CONV* pConv = NULL; HSZ hszSrv, hszTpc; - - TRACE("%p %04x %08lx %08lx\n", hwnd, iMsg, wParam , lParam); - + char buf[256]; + WDML_INSTANCE* pInstance; + + ERR("%p %04x %08lx %08lx\n", hwnd, iMsg, wParam , lParam); + + /* in the initial WM_INITIATE sendmessage */ if (iMsg == WM_DDE_ACK && - /* in the initial WM_INITIATE sendmessage */ - ((pConv = WDML_GetConvFromWnd(hwnd)) == NULL || pConv->wStatus == XST_INIT1)) - { + (!(pConv = WDML_GetConvFromWnd(hwnd)) || pConv->wStatus == XST_INIT1)) + { + + ERR("WM_DDE_ACK\n"); /* In response to WM_DDE_INITIATE, save server window */ - char buf[256]; - WDML_INSTANCE* pInstance; /* note: sent messages do not need packing */ uiLo = LOWORD(lParam); Modified: trunk/reactos/win32ss/user/user32/misc/ddeserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeserver.c [iso-8859-1] Tue May 20 19:39:34 2014 @@ -30,8 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddeml); static const WCHAR szServerNameClass[] = {'D','d','e','S','e','r','v','e','r','N','a','m','e',0}; -const char WDML_szServerConvClassA[] = "DdeServerConvAnsi"; -const WCHAR WDML_szServerConvClassW[] = {'D','d','e','S','e','r','v','e','r','C','o','n','v','U','n','i','c','o','d','e',0}; +const char WDML_szServerConvClassA[] = "DdeServerConvA"; +const WCHAR WDML_szServerConvClassW[] = {'D','d','e','S','e','r','v','e','r','C','o','n','v','W',0}; static LRESULT CALLBACK WDML_ServerNameProc(HWND, UINT, WPARAM, LPARAM); static LRESULT CALLBACK WDML_ServerConvProc(HWND, UINT, WPARAM, LPARAM); @@ -62,7 +62,7 @@ pInstance = WDML_GetInstance(idInst); - if (pInstance == NULL || pInstance->links == NULL) + if (pInstance == NULL) return FALSE; atom = WDML_MakeAtomFromHsz(hszItem); @@ -135,7 +135,7 @@ return TRUE; theError: - if (atom) GlobalDeleteAtom(atom); + GlobalDeleteAtom(atom); return FALSE; } @@ -380,12 +380,12 @@ LOWORD(lParam) -- application atom HIWORD(lParam) -- topic atom */ - TRACE("WM_DDE_INITIATE message received!\n"); + ERR("WM_DDE_INITIATE message received!\n"); hwndClient = (HWND)wParam; pInstance = WDML_GetInstanceFromWnd(hwndServer); - TRACE("idInst=%d, threadID=0x%x\n", pInstance->instanceID, GetCurrentThreadId()); if (!pInstance) return 0; + ERR("idInst=%d, threadID=0x%x\n", pInstance->instanceID, GetCurrentThreadId()); /* don't free DDEParams, since this is a broadcast */ UnpackDDElParam(WM_DDE_INITIATE, lParam, &uiLo, &uiHi); @@ -708,7 +708,7 @@ pXAct->hszItem, TRUE, pXAct->wFmt); if (pLink == NULL) { - ERR("Couln'd find link for %p, dropping request\n", pXAct->hszItem); + ERR("Couldn't find link for %p, dropping request\n", pXAct->hszItem); FreeDDElParam(WM_DDE_UNADVISE, pXAct->lParam); return WDML_QS_ERROR; } @@ -748,6 +748,54 @@ return pXAct; } +static BOOL data_looks_unicode( const WCHAR *data, DWORD size ) +{ + DWORD i; + + if (size % sizeof(WCHAR)) return FALSE; + for (i = 0; i < size / sizeof(WCHAR); i++) if (data[i] > 255) return FALSE; + return TRUE; +} + +/* convert data to Unicode, unless it looks like it's already Unicode */ +static HDDEDATA map_A_to_W( DWORD instance, void *ptr, DWORD size ) +{ + HDDEDATA ret; + DWORD len; + const char *end; + + if (!data_looks_unicode( ptr, size )) + { + if ((end = memchr( ptr, 0, size ))) size = end + 1 - (const char *)ptr; + len = MultiByteToWideChar( CP_ACP, 0, ptr, size, NULL, 0 ); + ret = DdeCreateDataHandle( instance, NULL, len * sizeof(WCHAR), 0, 0, CF_TEXT, 0); + MultiByteToWideChar( CP_ACP, 0, ptr, size, (WCHAR *)DdeAccessData(ret, NULL), len ); + } + else ret = DdeCreateDataHandle( instance, ptr, size, 0, 0, CF_TEXT, 0 ); + + return ret; +} + +/* convert data to ASCII, unless it looks like it's not in Unicode format */ +static HDDEDATA map_W_to_A( DWORD instance, void *ptr, DWORD size ) +{ + HDDEDATA ret; + DWORD len; + const WCHAR *end; + + if (data_looks_unicode( ptr, size )) + { + size /= sizeof(WCHAR); + if ((end = memchrW( ptr, 0, size ))) size = end + 1 - (const WCHAR *)ptr; + len = WideCharToMultiByte( CP_ACP, 0, ptr, size, NULL, 0, NULL, NULL ); + ret = DdeCreateDataHandle( instance, NULL, len, 0, 0, CF_TEXT, 0); + WideCharToMultiByte( CP_ACP, 0, ptr, size, (char *)DdeAccessData(ret, NULL), len, NULL, NULL ); + } + else ret = DdeCreateDataHandle( instance, ptr, size, 0, 0, CF_TEXT, 0 ); + + return ret; +} + /****************************************************************** * WDML_ServerHandleExecute * @@ -761,11 +809,16 @@ if (!(pConv->instance->CBFflags & CBF_FAIL_EXECUTES)) { LPVOID ptr = GlobalLock(pXAct->hMem); + DWORD size = GlobalSize(pXAct->hMem); if (ptr) { - hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, GlobalSize(pXAct->hMem), - 0, 0, CF_TEXT, 0); + if (pConv->instance->unicode) /* Unicode server, try to map A->W */ + hDdeData = map_A_to_W( pConv->instance->instanceID, ptr, size ); + else if (!IsWindowUnicode( pConv->hwndClient )) /* ASCII server and client, try to map W->A */ + hDdeData = map_W_to_A( pConv->instance->instanceID, ptr, size ); + else + hDdeData = DdeCreateDataHandle(pConv->instance->instanceID, ptr, size, 0, 0, CF_TEXT, 0); GlobalUnlock(pXAct->hMem); } hDdeData = WDML_InvokeCallback(pConv->instance, XTYP_EXECUTE, 0, (HCONV)pConv,

1 0

[aandrejevic] 63385: [NTVDM] Use a separate palette for text mode. Previously the text mode palette was equal to the first 16 entries of the graphical palette, which is wrong since the AC registers...
by aandrejevic＠svn.reactos.org 20 May '14

20 May '14

Author: aandrejevic Date: Tue May 20 18:46:50 2014 New Revision: 63385 URL: http://svn.reactos.org/svn/reactos?rev=63385&view=rev Log: [NTVDM] Use a separate palette for text mode. Previously the text mode palette was equal to the first 16 entries of the graphical palette, which is wrong since the AC registers can be used to select arbitrary colors from the DAC. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Tue May 20 18:46:50 2014 @@ -172,6 +172,32 @@ #endif /* + * Default 16-color palette for foreground and background + * (corresponding flags in comments). + * Taken from subsystems/win32/winsrv/consrv/frontends/gui/conwnd.c + */ +static const COLORREF ConsoleColors[16] = +{ + RGB(0, 0, 0), // (Black) + RGB(0, 0, 128), // BLUE + RGB(0, 128, 0), // GREEN + RGB(0, 128, 128), // BLUE | GREEN + RGB(128, 0, 0), // RED + RGB(128, 0, 128), // BLUE | RED + RGB(128, 128, 0), // GREEN | RED + RGB(192, 192, 192), // BLUE | GREEN | RED + + RGB(128, 128, 128), // (Grey) INTENSITY + RGB(0, 0, 255), // BLUE | INTENSITY + RGB(0, 255, 0), // GREEN | INTENSITY + RGB(0, 255, 255), // BLUE | GREEN | INTENSITY + RGB(255, 0, 0), // RED | INTENSITY + RGB(255, 0, 255), // BLUE | RED | INTENSITY + RGB(255, 255, 0), // GREEN | RED | INTENSITY + RGB(255, 255, 255) // BLUE | GREEN | RED | INTENSITY +}; + +/* * Console interface -- VGA-mode-agnostic */ typedef struct _CHAR_CELL @@ -184,6 +210,7 @@ static LPVOID ConsoleFramebuffer = NULL; // Active framebuffer, points to // either TextFramebuffer or a valid // graphics framebuffer. +static HPALETTE TextPaletteHandle = NULL; static HPALETTE PaletteHandle = NULL; static HANDLE StartEvent = NULL; @@ -774,7 +801,7 @@ static VOID VgaWriteDac(BYTE Data) { - INT PaletteIndex; + INT i, PaletteIndex; PALETTEENTRY Entry; /* Set the value */ @@ -789,8 +816,20 @@ Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[PaletteIndex * 3 + 2]); Entry.peFlags = 0; - /* Update the palette entry and set the palette change flag */ + /* Update the palette entry */ SetPaletteEntries(PaletteHandle, PaletteIndex, 1, &Entry); + + /* Check which text palette entries are affected */ + for (i = 0; i <= VGA_AC_PAL_F_REG; i++) + { + if (VgaAcRegisters[i] == PaletteIndex) + { + /* Update the text palette entry */ + SetPaletteEntries(TextPaletteHandle, i, 1, &Entry); + } + } + + /* Set the palette changed flag */ PaletteChanged = TRUE; /* Update the index */ @@ -800,6 +839,8 @@ static VOID VgaWriteAc(BYTE Data) { + PALETTEENTRY Entry; + ASSERT(VgaAcIndex < VGA_AC_MAX_REG); /* Save the value */ @@ -810,8 +851,17 @@ // DbgPrint(" AC Palette Writing %d to index %d\n", Data, VgaAcIndex); if (VgaAcRegisters[VgaAcIndex] != Data) { - /* Update the AC register and set the palette change flag */ + /* Update the AC register */ VgaAcRegisters[VgaAcIndex] = Data; + + /* Fill the entry structure */ + Entry.peRed = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3]); + Entry.peGreen = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3 + 1]); + Entry.peBlue = VGA_DAC_TO_COLOR(VgaDacRegisters[Data * 3 + 2]); + Entry.peFlags = 0; + + /* Update the palette entry and set the palette change flag */ + SetPaletteEntries(TextPaletteHandle, VgaAcIndex, 1, &Entry); PaletteChanged = TRUE; } } @@ -843,33 +893,62 @@ static BOOLEAN VgaInitializePalette(VOID) { - LPLOGPALETTE Palette; - - /* Allocate storage space for the palette */ + INT i; + BOOLEAN Result = FALSE; + LPLOGPALETTE Palette, TextPalette; + + /* Allocate storage space for the palettes */ Palette = (LPLOGPALETTE)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGPALETTE) + - VGA_MAX_COLORS * sizeof(PALETTEENTRY)); - if (Palette == NULL) return FALSE; - - /* Initialize the palette */ - Palette->palVersion = 0x0300; + VGA_MAX_COLORS * sizeof(PALETTEENTRY)); + TextPalette = (LPLOGPALETTE)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(LOGPALETTE) + + (VGA_AC_PAL_F_REG + 1) * sizeof(PALETTEENTRY)); + if ((Palette == NULL) || (TextPalette == NULL)) goto Cleanup; + + /* Initialize the palettes */ + Palette->palVersion = TextPalette->palVersion = 0x0300; Palette->palNumEntries = VGA_MAX_COLORS; - - /* Restore the default palette */ + TextPalette->palNumEntries = VGA_AC_PAL_F_REG + 1; + + /* Restore the default graphics palette */ VgaRestoreDefaultPalette(Palette->palPalEntry, Palette->palNumEntries); - /* Create the palette */ + /* Set the default text palette */ + for (i = 0; i < TextPalette->palNumEntries; i++) + { + /* Set the palette entries */ + TextPalette->palPalEntry[i].peRed = GetRValue(ConsoleColors[i]); + TextPalette->palPalEntry[i].peGreen = GetGValue(ConsoleColors[i]); + TextPalette->palPalEntry[i].peBlue = GetBValue(ConsoleColors[i]); + TextPalette->palPalEntry[i].peFlags = 0; + } + + /* Create the palettes */ PaletteHandle = CreatePalette(Palette); - - /* Free the palette */ - HeapFree(GetProcessHeap(), 0, Palette); - - /* Fail if the palette wasn't successfully created... */ - if (PaletteHandle == NULL) return FALSE; - - /* ... otherwise return success */ - return TRUE; + TextPaletteHandle = CreatePalette(TextPalette); + + if (PaletteHandle != NULL && TextPaletteHandle != NULL) + { + /* The palettes have been created successfully */ + Result = TRUE; + } + +Cleanup: + /* Free the palettes */ + if (Palette) HeapFree(GetProcessHeap(), 0, Palette); + if (TextPalette) HeapFree(GetProcessHeap(), 0, TextPalette); + + if (!Result) + { + /* Something failed, delete the palettes */ + if (PaletteHandle) DeleteObject(PaletteHandle); + if (TextPaletteHandle) DeleteObject(TextPaletteHandle); + } + + return Result; } static BOOL VgaEnterGraphicsMode(PCOORD Resolution) @@ -1001,7 +1080,7 @@ * screen-buffers, which is a new feature on ReactOS). */ SetConsolePalette(TextConsoleBuffer, - PaletteHandle, + TextPaletteHandle, SYSPAL_NOSTATIC256); /* Set the screen mode flag */

1 0

[hbelusca] 63384: Sync with trunk r63383 .
by hbelusca＠svn.reactos.org 20 May '14

20 May '14

Author: hbelusca Date: Tue May 20 17:04:19 2014 New Revision: 63384 URL: http://svn.reactos.org/svn/reactos?rev=63384&view=rev Log: Sync with trunk r63383 . Added: branches/condrv_restructure/base/applications/sndrec32/lang/ru-RU.rc - copied unchanged from r63383, trunk/reactos/base/applications/sndrec32/lang/ru-RU.rc branches/condrv_restructure/dll/win32/browseui/lang/ru-RU.rc - copied unchanged from r63383, trunk/reactos/dll/win32/browseui/lang/ru-RU.rc branches/condrv_restructure/dll/win32/winscard/CMakeLists.txt - copied unchanged from r63383, trunk/reactos/dll/win32/winscard/CMakeLists.txt branches/condrv_restructure/dll/win32/winscard/stubs.c - copied unchanged from r63383, trunk/reactos/dll/win32/winscard/stubs.c branches/condrv_restructure/dll/win32/winscard/winscard.spec - copied unchanged from r63383, trunk/reactos/dll/win32/winscard/winscard.spec branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afcover.h - copied unchanged from r63383, trunk/reactos/lib/3rdparty/freetype/src/autofit/afcover.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afranges.c - copied unchanged from r63383, trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afranges.h - copied unchanged from r63383, trunk/reactos/lib/3rdparty/freetype/src/autofit/afranges.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afstyles.h - copied unchanged from r63383, trunk/reactos/lib/3rdparty/freetype/src/autofit/afstyles.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/hbshim.c - copied unchanged from r63383, trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/hbshim.h - copied unchanged from r63383, trunk/reactos/lib/3rdparty/freetype/src/autofit/hbshim.h Removed: branches/condrv_restructure/dll/3rdparty/libjpeg/ansi2knr.c branches/condrv_restructure/dll/win32/winscard/winscard.def branches/condrv_restructure/lib/3rdparty/bzip2/Makefile-libbz2_so branches/condrv_restructure/lib/3rdparty/bzip2/README.COMPILATION.PROBLEMS branches/condrv_restructure/lib/3rdparty/bzip2/bzip2.1 branches/condrv_restructure/lib/3rdparty/bzip2/bzip2.1.preformatted branches/condrv_restructure/lib/3rdparty/bzip2/bzip2.txt branches/condrv_restructure/lib/3rdparty/bzip2/dlltest.dsp branches/condrv_restructure/lib/3rdparty/bzip2/libbz2.dsp branches/condrv_restructure/lib/3rdparty/bzip2/makefile.msc branches/condrv_restructure/lib/3rdparty/bzip2/manual.ps branches/condrv_restructure/lib/3rdparty/bzip2/manual.texi branches/condrv_restructure/lib/3rdparty/bzip2/manual_1.html branches/condrv_restructure/lib/3rdparty/bzip2/manual_2.html branches/condrv_restructure/lib/3rdparty/bzip2/manual_3.html branches/condrv_restructure/lib/3rdparty/bzip2/manual_4.html branches/condrv_restructure/lib/3rdparty/bzip2/manual_toc.html branches/condrv_restructure/lib/3rdparty/bzip2/sample1.ref branches/condrv_restructure/lib/3rdparty/bzip2/sample2.ref branches/condrv_restructure/lib/3rdparty/bzip2/sample3.ref branches/condrv_restructure/lib/3rdparty/bzip2/words0 branches/condrv_restructure/lib/3rdparty/bzip2/words1 branches/condrv_restructure/lib/3rdparty/bzip2/words2 branches/condrv_restructure/lib/3rdparty/bzip2/words3 branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/base/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/bzip2/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/cache/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/cff/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/cff/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/cid/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/cid/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/gxvalid/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/gxvalid/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/gzip/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/lzw/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/otvalid/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/otvalid/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/pcf/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/pcf/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/psaux/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/psaux/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/pshinter/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/pshinter/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/psnames/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/psnames/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/raster/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/raster/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/smooth/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/smooth/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/type1/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/type1/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/type42/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/type42/rules.mk branches/condrv_restructure/lib/3rdparty/freetype/src/winfonts/module.mk branches/condrv_restructure/lib/3rdparty/freetype/src/winfonts/rules.mk Modified: branches/condrv_restructure/ (props changed) branches/condrv_restructure/CMakeLists.txt branches/condrv_restructure/base/applications/cacls/lang/ru-RU.rc branches/condrv_restructure/base/applications/dxdiag/lang/ru-RU.rc branches/condrv_restructure/base/applications/fontview/lang/ru-RU.rc branches/condrv_restructure/base/applications/mplay32/lang/ru-RU.rc branches/condrv_restructure/base/applications/rapps/rapps/7zip.txt branches/condrv_restructure/base/applications/rapps/rapps/abiword.txt branches/condrv_restructure/base/applications/rapps/rapps/abiword26.txt branches/condrv_restructure/base/applications/rapps/rapps/abyss.txt branches/condrv_restructure/base/applications/rapps/rapps/ac97forvirtualbox.txt branches/condrv_restructure/base/applications/rapps/rapps/alreader.txt branches/condrv_restructure/base/applications/rapps/rapps/ants.txt branches/condrv_restructure/base/applications/rapps/rapps/audiograbber.txt branches/condrv_restructure/base/applications/rapps/rapps/bittorrent.txt branches/condrv_restructure/base/applications/rapps/rapps/bochs.txt branches/condrv_restructure/base/applications/rapps/rapps/boswars.txt branches/condrv_restructure/base/applications/rapps/rapps/boundaround.txt branches/condrv_restructure/base/applications/rapps/rapps/christmasbound.txt branches/condrv_restructure/base/applications/rapps/rapps/chromium.txt branches/condrv_restructure/base/applications/rapps/rapps/cnt.txt branches/condrv_restructure/base/applications/rapps/rapps/codeblocks.txt branches/condrv_restructure/base/applications/rapps/rapps/codeblocks_gcc.txt branches/condrv_restructure/base/applications/rapps/rapps/codeblocks_gcc_2.txt branches/condrv_restructure/base/applications/rapps/rapps/comctl32ocx.txt branches/condrv_restructure/base/applications/rapps/rapps/devcpp_mingw32.txt branches/condrv_restructure/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt branches/condrv_restructure/base/applications/rapps/rapps/diablo2.txt branches/condrv_restructure/base/applications/rapps/rapps/dosblaster.txt branches/condrv_restructure/base/applications/rapps/rapps/dosbox.txt branches/condrv_restructure/base/applications/rapps/rapps/doublecommander.txt branches/condrv_restructure/base/applications/rapps/rapps/dplus.txt branches/condrv_restructure/base/applications/rapps/rapps/dvdwritenow.txt branches/condrv_restructure/base/applications/rapps/rapps/excelview.txt branches/condrv_restructure/base/applications/rapps/rapps/fap.txt branches/condrv_restructure/base/applications/rapps/rapps/fira.txt branches/condrv_restructure/base/applications/rapps/rapps/firefox.txt branches/condrv_restructure/base/applications/rapps/rapps/firefox2.txt branches/condrv_restructure/base/applications/rapps/rapps/firefox3.txt branches/condrv_restructure/base/applications/rapps/rapps/firefox36.txt branches/condrv_restructure/base/applications/rapps/rapps/freebasic.txt branches/condrv_restructure/base/applications/rapps/rapps/glidewrapzbag.txt branches/condrv_restructure/base/applications/rapps/rapps/globulation2.txt branches/condrv_restructure/base/applications/rapps/rapps/hover.txt branches/condrv_restructure/base/applications/rapps/rapps/hxd.txt branches/condrv_restructure/base/applications/rapps/rapps/indiftpd.txt branches/condrv_restructure/base/applications/rapps/rapps/irfanview.txt branches/condrv_restructure/base/applications/rapps/rapps/irfanviewplugins.txt branches/condrv_restructure/base/applications/rapps/rapps/kdewin.txt branches/condrv_restructure/base/applications/rapps/rapps/kyodai.txt branches/condrv_restructure/base/applications/rapps/rapps/lazaruside.txt branches/condrv_restructure/base/applications/rapps/rapps/lbreakout2.txt branches/condrv_restructure/base/applications/rapps/rapps/lgeneral.txt branches/condrv_restructure/base/applications/rapps/rapps/libreoffice.txt branches/condrv_restructure/base/applications/rapps/rapps/lmarbles.txt branches/condrv_restructure/base/applications/rapps/rapps/mcwin32.txt branches/condrv_restructure/base/applications/rapps/rapps/mfc40.txt branches/condrv_restructure/base/applications/rapps/rapps/mirandaim.txt branches/condrv_restructure/base/applications/rapps/rapps/mirc.txt branches/condrv_restructure/base/applications/rapps/rapps/mirc6.txt branches/condrv_restructure/base/applications/rapps/rapps/mono2.txt branches/condrv_restructure/base/applications/rapps/rapps/mpc.txt branches/condrv_restructure/base/applications/rapps/rapps/mpxplay.txt branches/condrv_restructure/base/applications/rapps/rapps/msxml3.txt branches/condrv_restructure/base/applications/rapps/rapps/net11.txt branches/condrv_restructure/base/applications/rapps/rapps/net20.txt branches/condrv_restructure/base/applications/rapps/rapps/net20sp2.txt branches/condrv_restructure/base/applications/rapps/rapps/npp.txt branches/condrv_restructure/base/applications/rapps/rapps/offbyone.txt branches/condrv_restructure/base/applications/rapps/rapps/opencodecs.txt branches/condrv_restructure/base/applications/rapps/rapps/openoffice.txt branches/condrv_restructure/base/applications/rapps/rapps/openoffice2.4.txt branches/condrv_restructure/base/applications/rapps/rapps/openttd.txt branches/condrv_restructure/base/applications/rapps/rapps/opera.txt branches/condrv_restructure/base/applications/rapps/rapps/opera9.txt branches/condrv_restructure/base/applications/rapps/rapps/peazip.txt branches/condrv_restructure/base/applications/rapps/rapps/pengupop.txt branches/condrv_restructure/base/applications/rapps/rapps/photofiltre.txt branches/condrv_restructure/base/applications/rapps/rapps/pingus.txt branches/condrv_restructure/base/applications/rapps/rapps/pptview.txt branches/condrv_restructure/base/applications/rapps/rapps/pspad.txt branches/condrv_restructure/base/applications/rapps/rapps/ptanks.txt branches/condrv_restructure/base/applications/rapps/rapps/putty.txt branches/condrv_restructure/base/applications/rapps/rapps/python.txt branches/condrv_restructure/base/applications/rapps/rapps/python2.txt branches/condrv_restructure/base/applications/rapps/rapps/qb64sdl.txt branches/condrv_restructure/base/applications/rapps/rapps/qmmp.txt branches/condrv_restructure/base/applications/rapps/rapps/remood.txt branches/condrv_restructure/base/applications/rapps/rapps/reshack.txt branches/condrv_restructure/base/applications/rapps/rapps/rocks.txt branches/condrv_restructure/base/applications/rapps/rapps/rosbe.txt branches/condrv_restructure/base/applications/rapps/rapps/rosbeamd64.txt branches/condrv_restructure/base/applications/rapps/rapps/rosbearm.txt branches/condrv_restructure/base/applications/rapps/rapps/sambatng.txt branches/condrv_restructure/base/applications/rapps/rapps/sbforvmware.txt branches/condrv_restructure/base/applications/rapps/rapps/scite.txt branches/condrv_restructure/base/applications/rapps/rapps/scummvm.txt branches/condrv_restructure/base/applications/rapps/rapps/sdl_mixer.txt branches/condrv_restructure/base/applications/rapps/rapps/sdl_runtime.txt branches/condrv_restructure/base/applications/rapps/rapps/seamonkey.txt branches/condrv_restructure/base/applications/rapps/rapps/smplayer.txt branches/condrv_restructure/base/applications/rapps/rapps/snoopy.txt branches/condrv_restructure/base/applications/rapps/rapps/stamina.txt branches/condrv_restructure/base/applications/rapps/rapps/steam.txt branches/condrv_restructure/base/applications/rapps/rapps/sumatrapdf.txt branches/condrv_restructure/base/applications/rapps/rapps/summerbound.txt branches/condrv_restructure/base/applications/rapps/rapps/superdxb.txt branches/condrv_restructure/base/applications/rapps/rapps/superfinder.txt branches/condrv_restructure/base/applications/rapps/rapps/supertux.txt branches/condrv_restructure/base/applications/rapps/rapps/tahoma.txt branches/condrv_restructure/base/applications/rapps/rapps/thunderbird.txt branches/condrv_restructure/base/applications/rapps/rapps/thunderbird3.txt branches/condrv_restructure/base/applications/rapps/rapps/tileworld.txt branches/condrv_restructure/base/applications/rapps/rapps/totalcommander.txt branches/condrv_restructure/base/applications/rapps/rapps/tuxpaint.txt branches/condrv_restructure/base/applications/rapps/rapps/ultravnc.txt branches/condrv_restructure/base/applications/rapps/rapps/utorrent.txt branches/condrv_restructure/base/applications/rapps/rapps/vb5run.txt branches/condrv_restructure/base/applications/rapps/rapps/vb6run.txt branches/condrv_restructure/base/applications/rapps/rapps/vc2005sp1run.txt branches/condrv_restructure/base/applications/rapps/rapps/vc2008sp1run.txt branches/condrv_restructure/base/applications/rapps/rapps/vc2010run.txt branches/condrv_restructure/base/applications/rapps/rapps/vc6run.txt branches/condrv_restructure/base/applications/rapps/rapps/vlc.txt branches/condrv_restructure/base/applications/rapps/rapps/winboard.txt branches/condrv_restructure/base/applications/rapps/rapps/wme9.txt branches/condrv_restructure/base/applications/rapps/rapps/wordview.txt branches/condrv_restructure/base/applications/rapps/rapps/zaz.txt branches/condrv_restructure/base/applications/regedit/lang/ru-RU.rc branches/condrv_restructure/base/applications/shutdown/lang/ru-RU.rc branches/condrv_restructure/base/applications/sndrec32/rsrc.rc branches/condrv_restructure/base/applications/sndvol32/lang/ru-RU.rc branches/condrv_restructure/base/setup/reactos/lang/ru-RU.rc branches/condrv_restructure/base/setup/usetup/bootsup.c branches/condrv_restructure/base/setup/usetup/interface/consup.c branches/condrv_restructure/base/setup/usetup/interface/usetup.c branches/condrv_restructure/base/setup/usetup/native/console.c branches/condrv_restructure/base/setup/usetup/native/fslist.c branches/condrv_restructure/base/setup/usetup/native/utils/console.c branches/condrv_restructure/base/setup/usetup/native/utils/console.h branches/condrv_restructure/base/setup/usetup/partlist.c branches/condrv_restructure/base/setup/usetup/partlist.h branches/condrv_restructure/base/shell/explorer-new/lang/ru-RU.rc branches/condrv_restructure/boot/bootdata/hivesys.inf branches/condrv_restructure/boot/bootdata/packages/reactos.dff.in branches/condrv_restructure/dll/3rdparty/libjpeg/README branches/condrv_restructure/dll/3rdparty/libjpeg/change.log branches/condrv_restructure/dll/3rdparty/libjpeg/cjpeg.c branches/condrv_restructure/dll/3rdparty/libjpeg/jcapistd.c branches/condrv_restructure/dll/3rdparty/libjpeg/jcarith.c branches/condrv_restructure/dll/3rdparty/libjpeg/jccolor.c branches/condrv_restructure/dll/3rdparty/libjpeg/jcdctmgr.c branches/condrv_restructure/dll/3rdparty/libjpeg/jchuff.c branches/condrv_restructure/dll/3rdparty/libjpeg/jcinit.c branches/condrv_restructure/dll/3rdparty/libjpeg/jcmarker.c branches/condrv_restructure/dll/3rdparty/libjpeg/jcmaster.c branches/condrv_restructure/dll/3rdparty/libjpeg/jcparam.c branches/condrv_restructure/dll/3rdparty/libjpeg/jctrans.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdapimin.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdapistd.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdarith.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdcolor.c branches/condrv_restructure/dll/3rdparty/libjpeg/jddctmgr.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdhuff.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdinput.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdmarker.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdmaster.c branches/condrv_restructure/dll/3rdparty/libjpeg/jdmerge.c branches/condrv_restructure/dll/3rdparty/libjpeg/jfdctint.c branches/condrv_restructure/dll/3rdparty/libjpeg/jidctint.c branches/condrv_restructure/dll/3rdparty/libjpeg/jpegtran.c branches/condrv_restructure/dll/3rdparty/libjpeg/transupp.c branches/condrv_restructure/dll/cpl/desk/lang/ru-RU.rc branches/condrv_restructure/dll/cpl/mmsys/lang/ru-RU.rc branches/condrv_restructure/dll/cpl/wined3dcfg/general.c branches/condrv_restructure/dll/cpl/wined3dcfg/lang/cs-CZ.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/de-DE.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/en-US.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/he-IL.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/pl-PL.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/ro-RO.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/sq-AL.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/wined3dcfg/resource.h branches/condrv_restructure/dll/cpl/wined3dcfg/wined3dcfg.h branches/condrv_restructure/dll/opengl/opengl32/wgl_font.c branches/condrv_restructure/dll/win32/CMakeLists.txt branches/condrv_restructure/dll/win32/aclui/lang/ru-RU.rc branches/condrv_restructure/dll/win32/browseui/browseui.rc branches/condrv_restructure/dll/win32/kernel32/client/proc.c branches/condrv_restructure/dll/win32/kernel32/client/vdm.c branches/condrv_restructure/dll/win32/winscard/precomp.h branches/condrv_restructure/dll/win32/winscard/winscard.c branches/condrv_restructure/drivers/bus/acpi/busmgr/bus.c branches/condrv_restructure/drivers/bus/acpi/buspdo.c branches/condrv_restructure/drivers/bus/acpi/include/acpi_bus.h branches/condrv_restructure/drivers/bus/acpi/include/acpisys.h branches/condrv_restructure/drivers/input/i8042prt/pnp.c branches/condrv_restructure/drivers/input/kbdclass/kbdclass.c branches/condrv_restructure/drivers/input/mouclass/mouclass.c branches/condrv_restructure/drivers/network/ndis/ndis/miniport.c branches/condrv_restructure/include/psdk/winscard.h branches/condrv_restructure/include/reactos/libs/fast486/fast486.h branches/condrv_restructure/include/reactos/libs/libjpeg/jconfig.h branches/condrv_restructure/include/reactos/libs/libjpeg/jmorecfg.h branches/condrv_restructure/include/reactos/libs/libjpeg/jpegint.h branches/condrv_restructure/include/reactos/libs/libjpeg/jpeglib.h branches/condrv_restructure/include/reactos/libs/libjpeg/jversion.h branches/condrv_restructure/include/reactos/libs/libjpeg/transupp.h branches/condrv_restructure/lib/3rdparty/freetype/ChangeLog branches/condrv_restructure/lib/3rdparty/freetype/README branches/condrv_restructure/lib/3rdparty/freetype/devel/ftoption.h branches/condrv_restructure/lib/3rdparty/freetype/include/config/ftconfig.h branches/condrv_restructure/lib/3rdparty/freetype/include/config/ftoption.h branches/condrv_restructure/lib/3rdparty/freetype/include/freetype.h branches/condrv_restructure/lib/3rdparty/freetype/include/ftautoh.h branches/condrv_restructure/lib/3rdparty/freetype/include/ftbdf.h branches/condrv_restructure/lib/3rdparty/freetype/include/ftchapters.h branches/condrv_restructure/lib/3rdparty/freetype/include/ftoutln.h branches/condrv_restructure/lib/3rdparty/freetype/include/internal/ftrfork.h branches/condrv_restructure/lib/3rdparty/freetype/include/internal/fttrace.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.cin branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.hin branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afcjk.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afcjk.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afdummy.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afdummy.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afglobal.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afglobal.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afhints.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afhints.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afindic.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afindic.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin2.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin2.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afloader.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afloader.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afmodule.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afmodule.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afpic.c branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afpic.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afscript.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aftypes.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afwrtsys.h branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/autofit.c branches/condrv_restructure/lib/3rdparty/freetype/src/base/basepic.c branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftbitmap.c branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftcalc.c branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftobjs.c branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftoutln.c branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftrfork.c branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/bdfdrivr.c branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/bdflib.c branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2blues.c branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2font.c branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2ft.c branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2hints.c branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cffload.c branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cffobjs.c branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cffparse.c branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidload.c branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidobjs.c branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidparse.c branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidparse.h branches/condrv_restructure/lib/3rdparty/freetype/src/pcf/pcfread.c branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/pfrload.c branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/pfrobjs.c branches/condrv_restructure/lib/3rdparty/freetype/src/psaux/psobjs.c branches/condrv_restructure/lib/3rdparty/freetype/src/pshinter/pshalgo.c branches/condrv_restructure/lib/3rdparty/freetype/src/raster/ftraster.c branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/sfdriver.c branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/ttcmap.c branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/ttsbit.c branches/condrv_restructure/lib/3rdparty/freetype/src/smooth/ftgrays.c branches/condrv_restructure/lib/3rdparty/freetype/src/tools/afblue.pl branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/ttgload.c branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/ttinterp.c branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/ttinterp.h branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1gload.c branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1load.c branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1objs.c branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1parse.c branches/condrv_restructure/lib/3rdparty/freetype/src/type42/t42objs.c branches/condrv_restructure/lib/3rdparty/freetype/src/type42/t42parse.c branches/condrv_restructure/lib/3rdparty/freetype/src/winfonts/winfnt.c branches/condrv_restructure/lib/fast486/fast486.c branches/condrv_restructure/lib/fast486/opcodes.c branches/condrv_restructure/lib/sdk/crt/stdio/file.c branches/condrv_restructure/lib/sdk/crt/stdlib/mbtowc.c branches/condrv_restructure/lib/sdk/crt/string/ctype.c branches/condrv_restructure/media/doc/3rd Party Files.txt branches/condrv_restructure/media/doc/README.WINE branches/condrv_restructure/media/fonts/tahoma.ttf branches/condrv_restructure/media/fonts/tahomabd.ttf branches/condrv_restructure/ntoskrnl/ex/mutant.c branches/condrv_restructure/ntoskrnl/fstub/disksup.c branches/condrv_restructure/ntoskrnl/include/internal/amd64/mm.h branches/condrv_restructure/ntoskrnl/io/iomgr/driver.c branches/condrv_restructure/ntoskrnl/io/pnpmgr/pnpinit.c branches/condrv_restructure/ntoskrnl/io/pnpmgr/pnpmgr.c branches/condrv_restructure/ntoskrnl/mm/ARM3/miarm.h branches/condrv_restructure/ntoskrnl/mm/ARM3/pagfault.c branches/condrv_restructure/ntoskrnl/mm/ARM3/procsup.c branches/condrv_restructure/ntoskrnl/mm/ARM3/section.c branches/condrv_restructure/ntoskrnl/mm/ARM3/vadnode.c branches/condrv_restructure/ntoskrnl/mm/ARM3/virtual.c branches/condrv_restructure/subsystems/ntvdm/bios/bios.c branches/condrv_restructure/subsystems/ntvdm/bios/bios.h branches/condrv_restructure/subsystems/ntvdm/bios/bios32/bios32.c branches/condrv_restructure/subsystems/ntvdm/bios/bios32/bios32p.h branches/condrv_restructure/subsystems/ntvdm/bios/bios32/kbdbios32.c branches/condrv_restructure/subsystems/ntvdm/bios/vidbios.c branches/condrv_restructure/subsystems/ntvdm/bop.c branches/condrv_restructure/subsystems/ntvdm/callback.c branches/condrv_restructure/subsystems/ntvdm/callback.h branches/condrv_restructure/subsystems/ntvdm/dos/dem.c branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/bios.c branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/dos.c branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/dos.h branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/dosfiles.c branches/condrv_restructure/subsystems/ntvdm/emulator.c branches/condrv_restructure/subsystems/ntvdm/emulator.h branches/condrv_restructure/subsystems/ntvdm/hardware/cmos.c branches/condrv_restructure/subsystems/ntvdm/lang/cs-CZ.rc branches/condrv_restructure/subsystems/ntvdm/lang/de-DE.rc branches/condrv_restructure/subsystems/ntvdm/lang/en-US.rc branches/condrv_restructure/subsystems/ntvdm/lang/es-ES.rc branches/condrv_restructure/subsystems/ntvdm/lang/fr-FR.rc branches/condrv_restructure/subsystems/ntvdm/lang/it-IT.rc branches/condrv_restructure/subsystems/ntvdm/lang/pl-PL.rc branches/condrv_restructure/subsystems/ntvdm/ntvdm.c branches/condrv_restructure/subsystems/ntvdm/resource.h branches/condrv_restructure/subsystems/win/basesrv/vdm.c branches/condrv_restructure/tools/spec2def/spec2def.c branches/condrv_restructure/win32ss/drivers/miniport/vga_new/vbemodes.c branches/condrv_restructure/win32ss/gdi/ntgdi/bitmaps.c branches/condrv_restructure/win32ss/include/callback.h branches/condrv_restructure/win32ss/user/ntuser/callback.c branches/condrv_restructure/win32ss/user/ntuser/menu.c branches/condrv_restructure/win32ss/user/ntuser/menu.h branches/condrv_restructure/win32ss/user/ntuser/window.c branches/condrv_restructure/win32ss/user/user32/misc/dllmain.c branches/condrv_restructure/win32ss/user/user32/windows/menu.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/condrv_restructure/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/CMakeLists.t… Modified: branches/condrv_restructure/base/applications/cacls/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/mplay32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/abiword26.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/ants.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/boundaround.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/christmasbound.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/devcpp_mingw32.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/hxd.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/opencodecs.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/photofiltre.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/python2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/rocks.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/snoopy.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/thunderbird3.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/vc2010run.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/shutdown/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/r… Modified: branches/condrv_restructure/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/native/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/native/fslist.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/native/utils/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/native/utils/console.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/shell/e… Modified: branches/condrv_restructure/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/boot/bootdat… Modified: branches/condrv_restructure/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/boot/bootdat… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/README URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Removed: branches/condrv_restructure/dll/3rdparty/libjpeg/ansi2knr.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/change.log URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/cjpeg.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jcapistd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jcarith.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jccolor.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jcdctmgr.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jchuff.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jcinit.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jcmarker.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jcmaster.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jcparam.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jctrans.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdapimin.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdapistd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdarith.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdcolor.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jddctmgr.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdhuff.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdinput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdmarker.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdmaster.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jdmerge.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jfdctint.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jidctint.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/jpegtran.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/3rdparty/libjpeg/transupp.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/3rdparty… Modified: branches/condrv_restructure/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/desk… Modified: branches/condrv_restructure/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/mmsy… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/general.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/resource.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/wined3dcfg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/opengl/opengl32/wgl_font.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/opengl/o… Modified: branches/condrv_restructure/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/CM… Modified: branches/condrv_restructure/dll/win32/aclui/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ac… Modified: branches/condrv_restructure/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/br… Modified: branches/condrv_restructure/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/winscard/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/wi… Modified: branches/condrv_restructure/dll/win32/winscard/winscard.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/wi… Removed: branches/condrv_restructure/dll/win32/winscard/winscard.def URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/wi… Modified: branches/condrv_restructure/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/bus/… Modified: branches/condrv_restructure/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/bus/… Modified: branches/condrv_restructure/drivers/bus/acpi/include/acpi_bus.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/bus/… Modified: branches/condrv_restructure/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/bus/… Modified: branches/condrv_restructure/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/inpu… Modified: branches/condrv_restructure/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/inpu… Modified: branches/condrv_restructure/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/inpu… Modified: branches/condrv_restructure/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/netw… Modified: branches/condrv_restructure/include/psdk/winscard.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/psdk… Modified: branches/condrv_restructure/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/libs/libjpeg/jconfig.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/libs/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/libs/libjpeg/jpegint.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/libs/libjpeg/jpeglib.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/libs/libjpeg/jversion.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/libs/libjpeg/transupp.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/Makefile-libbz2_so URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/README.COMPILATION.PROBLEMS URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/bzip2.1 URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/bzip2.1.preformatted URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/bzip2.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/dlltest.dsp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/libbz2.dsp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/makefile.msc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/manual.ps URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/manual.texi URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/manual_1.html URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/manual_2.html URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/manual_3.html URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/manual_4.html URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/manual_toc.html URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/sample1.ref URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/sample2.ref URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/sample3.ref URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/words0 URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/words1 URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/words2 URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/bzip2/words3 URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/config/ftconfig.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/freetype.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/ftautoh.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/ftbdf.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/ftchapters.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/ftoutln.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/internal/ftrfork.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/include/internal/fttrace.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.cin URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afblue.hin URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afcjk.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afdummy.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afdummy.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afglobal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afglobal.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afhints.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afindic.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afindic.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aflatin2.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afloader.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afmodule.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afmodule.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afpic.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afpic.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afscript.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/afwrtsys.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/autofit.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/autofit/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/base/basepic.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftcalc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/base/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/bdf/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/bzip2/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/cache/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2blues.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2font.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2ft.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cf2hints.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/cff/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidload.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidobjs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidparse.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/cid/cidparse.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/cid/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/cid/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/gxvalid/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/gxvalid/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/gzip/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/lzw/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/otvalid/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/otvalid/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/pcf/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/pcf/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/pfr/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/psaux/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/psaux/psobjs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/psaux/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/pshinter/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/pshinter/pshalgo.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/pshinter/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/psnames/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/psnames/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/raster/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/raster/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/sfdriver.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/smooth/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/smooth/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/tools/afblue.pl URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/type1/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/type1/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1gload.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1objs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/type1/t1parse.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/type42/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/type42/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/type42/t42objs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/winfonts/module.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Removed: branches/condrv_restructure/lib/3rdparty/freetype/src/winfonts/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/3rdparty… Modified: branches/condrv_restructure/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/fast486/… Modified: branches/condrv_restructure/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/fast486/… Modified: branches/condrv_restructure/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/sdk/crt/… Modified: branches/condrv_restructure/lib/sdk/crt/stdlib/mbtowc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/sdk/crt/… Modified: branches/condrv_restructure/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/sdk/crt/… Modified: branches/condrv_restructure/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/media/doc/3r… Modified: branches/condrv_restructure/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/media/doc/RE… Modified: branches/condrv_restructure/media/fonts/tahoma.ttf URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/media/fonts/… Modified: branches/condrv_restructure/media/fonts/tahomabd.ttf URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/media/fonts/… Modified: branches/condrv_restructure/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/ex/… Modified: branches/condrv_restructure/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/fst… Modified: branches/condrv_restructure/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/inc… Modified: branches/condrv_restructure/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/io/… Modified: branches/condrv_restructure/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/io/… Modified: branches/condrv_restructure/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/io/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/vadnode.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/bios/bios32/bios32p.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/bop.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/callback.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/w… Modified: branches/condrv_restructure/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/tools/spec2d… Modified: branches/condrv_restructure/win32ss/drivers/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/driv… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/incl… Modified: branches/condrv_restructure/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs