Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[dreimer] 32427: Okokok, I dont know why someone should feel the urge to translate MB, KB, and GB (Except specific languages...), but here they are.
by dreimer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dreimer Date: Wed Feb 20 00:31:09 2008 New Revision: 32427 URL: http://svn.reactos.org/svn/reactos?rev=32427&view=rev Log: Okokok, I dont know why someone should feel the urge to translate MB, KB, and GB (Except specific languages...), but here they are. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.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/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.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/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c 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 (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Wed Feb 20 00:31:09 2008 @@ -1612,7 +1612,7 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1622,7 +1622,7 @@ if (DiskSize == 0) DiskSize = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0) @@ -1780,19 +1780,19 @@ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } if (PartType == NULL) @@ -1820,7 +1820,7 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1830,7 +1830,7 @@ if (DiskSize == 0) DiskSize = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0) @@ -1913,24 +1913,24 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize = (DiskEntry->DiskSize + (1 << 29)) >> 30; - DiskUnit = "GB"; + DiskUnit = MUIGetString(STRING_GB); } else { DiskSize = (DiskEntry->DiskSize + (1 << 19)) >> 20; - DiskUnit = "MB"; + DiskUnit = MUIGetString(STRING_MB); } /* adjust partition size */ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - PartUnit = "GB"; + PartUnit = MUIGetString(STRING_GB); } else { PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - PartUnit = "MB"; + PartUnit = MUIGetString(STRING_MB); } /* adjust partition type */ 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 (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Wed Feb 20 00:31:09 2008 @@ -1683,6 +1683,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Wed Feb 20 00:31:09 2008 @@ -1680,6 +1680,12 @@ "Ungenutzt"}, {STRING_FORMATUNKNOWN, "Unbekannt"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Wed Feb 20 00:31:09 2008 @@ -1673,6 +1673,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Wed Feb 20 00:31:09 2008 @@ -1686,6 +1686,12 @@ "Non utilis"}, {STRING_FORMATUNKNOWN, "Inconnu"}, + {STRING_KB, + "Ko"}, + {STRING_MB, + "Mo"}, + {STRING_GB, + "Go"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Wed Feb 20 00:31:09 2008 @@ -1683,6 +1683,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Feb 20 00:31:09 2008 @@ -1682,6 +1682,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "¥ ¨á¯®«ì§®¢ ®"}, {STRING_FORMATUNKNOWN, "¥¨§¢¥áâë©"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Wed Feb 20 00:31:09 2008 @@ -1679,6 +1679,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Wed Feb 20 00:31:09 2008 @@ -1673,6 +1673,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Wed Feb 20 00:31:09 2008 @@ -1674,6 +1674,12 @@ "Unused"}, {STRING_FORMATUNKNOWN, "Unknown"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/mui.h Wed Feb 20 00:31:09 2008 @@ -121,4 +121,7 @@ #define STRING_UNFORMATTED 50 #define STRING_FORMATUNUSED 51 #define STRING_FORMATUNKNOWN 52 +#define STRING_KB 53 +#define STRING_MB 54 +#define STRING_GB 55 #endif 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 (original) +++ trunk/reactos/base/setup/usetup/partlist.c Wed Feb 20 00:31:09 2008 @@ -1120,19 +1120,19 @@ if (PartEntry->UnpartitionledLength >= 0x280000000ULL) /* 10 GB */ { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->UnpartitionedLength >= 0xA00000ULL) /* 10 MB */ { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize.QuadPart = (PartEntry->UnpartitionedLength + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } sprintf (LineBuffer, @@ -1176,19 +1176,19 @@ if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB */ { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */ { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19)) >> 20; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } else { PartSize.QuadPart = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9)) >> 10; - Unit = "KB"; + Unit = MUIGetString(STRING_KB); } if (PartType == NULL) @@ -1274,7 +1274,7 @@ if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */ { DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 29)) >> 30; - Unit = "GB"; + Unit = MUIGetString(STRING_GB); } else #endif @@ -1282,7 +1282,7 @@ DiskSize.QuadPart = (DiskEntry->DiskSize + (1 << 19)) >> 20; if (DiskSize.QuadPart == 0) DiskSize.QuadPart = 1; - Unit = "MB"; + Unit = MUIGetString(STRING_MB); } if (DiskEntry->DriverName.Length > 0)

1 0

[cfinck] 32426: Change the "removefrommap" string a bit, maybe this prevents confusions ; -) The Remove links in the user bubbles just remove the user from the current map view, they do NOT remove their location entries from the DB.
by cfinck＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: cfinck Date: Wed Feb 20 00:20:02 2008 New Revision: 32426 URL: http://svn.reactos.org/svn/reactos?rev=32426&view=rev Log: Change the "removefrommap" string a bit, maybe this prevents confusions ;-) The Remove links in the user bubbles just remove the user from the current map view, they do NOT remove their location entries from the DB. Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php Wed Feb 20 00:20:02 2008 @@ -39,7 +39,7 @@ $peoplemap_langres["latitude"] = "Breite"; $peoplemap_langres["longitude"] = "LÃ¤nge"; - $peoplemap_langres["removefrommap"] = "Diese Person aus der Karte entfernen"; + $peoplemap_langres["removefrommap"] = "Person aus dieser Karte entfernen"; $peoplemap_langres["minquerylength"] = "Bitte geben Sie mindestens 3 Zeichen ein."; $peoplemap_langres["nousers"] = "Keinen Benutzer mit Ortsdaten gefunden."; $peoplemap_langres["activatejs"] = "Sie mÃ¼ssen JavaScript aktivieren, um die Personen-Karte zu benutzen!"; Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php Wed Feb 20 00:20:02 2008 @@ -39,7 +39,7 @@ $peoplemap_langres["latitude"] = "Latitude"; $peoplemap_langres["longitude"] = "Longitude"; - $peoplemap_langres["removefrommap"] = "Remove this User from the Map"; + $peoplemap_langres["removefrommap"] = "Remove the User from this Map"; $peoplemap_langres["minquerylength"] = "Please enter at least 3 characters."; $peoplemap_langres["nousers"] = "No user with location data found!"; $peoplemap_langres["activatejs"] = "You have to activate JavaScript to use the People Map!";

1 0

[spetreolle] 32425: - Update French translation
by spetreolle＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: spetreolle Date: Tue Feb 19 22:56:35 2008 New Revision: 32425 URL: http://svn.reactos.org/svn/reactos?rev=32425&view=rev Log: - Update French translation 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 (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Tue Feb 19 22:56:35 2008 @@ -1611,7 +1611,7 @@ {STRING_TXTSETUPFAILED, "Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copie du fichier: %S"}, + " \xB3 Copie du fichier: %S"}, {STRING_SETUPCOPYINGFILES, "Setup copie les fichiers..."}, {STRING_PAGEDMEM, @@ -1679,13 +1679,13 @@ {STRING_UNPSPACE, " Espace non partitionn %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + "Mo (max. %lu Mo)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "Nouveau (non format)"}, {STRING_FORMATUNUSED, - "Unused"}, + "Non utilis"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "Inconnu"}, {0, 0} };

1 0

[dchapyshev] 32424: - Update Russian translation
by dchapyshev＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dchapyshev Date: Tue Feb 19 22:45:09 2008 New Revision: 32424 URL: http://svn.reactos.org/svn/reactos?rev=32424&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h 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 (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Tue Feb 19 22:45:09 2008 @@ -1667,13 +1667,13 @@ {STRING_UNPSPACE, " ¥à §¬¥ç¥®¥ ¯à®áâà áâ¢® %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + " (¬ ªá. %lu )"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "®¢ë© (¥®âä®à¬ â¨à®¢ ë©)"}, {STRING_FORMATUNUSED, - "Unused"}, + "¥ ¨á¯®«ì§®¢ ®"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "¥¨§¢¥áâë©"}, {0, 0} };

1 0

[dreimer] 32423: Once more, some more Strings open for translation. Have fun with 'em.
by dreimer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dreimer Date: Tue Feb 19 22:37:49 2008 New Revision: 32423 URL: http://svn.reactos.org/svn/reactos?rev=32423&view=rev Log: Once more, some more Strings open for translation. Have fun with 'em. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.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/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/pl-PL.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/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c 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 (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Feb 19 22:37:49 2008 @@ -1505,7 +1505,7 @@ coPos, &Written); - sprintf (Buffer, "MB (max. %lu MB)", MaxSize); + sprintf (Buffer, MUIGetString(STRING_MAXSIZE), MaxSize); coPos.X = iLeft + PARTITION_SIZE_INPUT_FIELD_LENGTH + 1; coPos.Y = iTop; WriteConsoleOutputCharacterA(StdOutput, @@ -1750,7 +1750,7 @@ PartType = NULL; if (PartEntry->New == TRUE) { - PartType = "New (Unformatted)"; + PartType = MUIGetString(STRING_UNFORMATTED); } else if (PartEntry->Unpartitioned == FALSE) { @@ -1956,11 +1956,11 @@ } else if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED) { - PartType = "Unused"; + PartType = MUIGetString(STRING_FORMATUNUSED); } else { - PartType = "Unknown"; + PartType = MUIGetString(STRING_FORMATUNKNOWN); } if (PartEntry->AutoCreate == TRUE) 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 (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h Tue Feb 19 22:37:49 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1675,6 +1675,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Tue Feb 19 22:37:49 2008 @@ -1605,7 +1605,7 @@ {STRING_TXTSETUPFAILED, "Setup konnte die '%S' Sektion\nin TXTSETUP.SIF nicht finden.\n"}, {STRING_COPYING, - " \xB3 Kopiere Datei: %S"}, + " \xB3 Kopiere Datei: %S"}, {STRING_SETUPCOPYINGFILES, "Setup kopiert Dateien..."}, {STRING_PAGEDMEM, @@ -1672,6 +1672,14 @@ "Setup erstellte eine neue Partition auf"}, {STRING_UNPSPACE, " Unpartitionierter Speicher %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "Neu (Unformatiert)"}, + {STRING_FORMATUNUSED, + "Ungenutzt"}, + {STRING_FORMATUNKNOWN, + "Unbekannt"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Tue Feb 19 22:37:49 2008 @@ -1666,6 +1666,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Tue Feb 19 22:37:49 2008 @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1665,6 +1665,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Tue Feb 19 22:37:49 2008 @@ -1678,6 +1678,14 @@ "Setup a cr une nouvelle partition sur"}, {STRING_UNPSPACE, " Espace non partitionn %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copia di: %S"}, + " \xB3 Copia di: %S"}, {STRING_SETUPCOPYINGFILES, "Copia dei file in corso..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "Setup ha creato una nuova partizione su"}, {STRING_UNPSPACE, " Spazio non partizionato %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Tue Feb 19 22:37:49 2008 @@ -1608,7 +1608,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1675,6 +1675,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Tue Feb 19 22:37:49 2008 @@ -1674,6 +1674,14 @@ "Instalator utworzy now¥ partycj©"}, {STRING_UNPSPACE, " Miejsce poza partycjami %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "à®£à ¬¬ ãáâ ®¢ª¨ ¥ á¬®£« ©â¨ á¥ªæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 ®¯¨à®¢ ¨¥: %S"}, + " \xB3 ®¯¨à®¢ ¨¥: %S"}, {STRING_SETUPCOPYINGFILES, "à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "à®£à ¬¬ ãáâ ®¢ª¨ á®§¤ « ®¢ë© à §¤¥« :"}, {STRING_UNPSPACE, " ¥à §¬¥ç¥®¥ ¯à®áâà áâ¢® %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h Tue Feb 19 22:37:49 2008 @@ -1604,7 +1604,7 @@ {STRING_TXTSETUPFAILED, "Inçtal tor zlyhal pri hadan¡ sekcie '%S'\nv s£bore TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kop¡ruje sa s£bor: %S"}, + " \xB3 Kop¡ruje sa s£bor: %S"}, {STRING_SETUPCOPYINGFILES, "Inçtal tor kop¡ruje s£bory..."}, {STRING_PAGEDMEM, @@ -1671,6 +1671,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Tue Feb 19 22:37:49 2008 @@ -1598,7 +1598,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1665,6 +1665,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Tue Feb 19 22:37:49 2008 @@ -1599,7 +1599,7 @@ {STRING_TXTSETUPFAILED, "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Copying file: %S"}, + " \xB3 Copying file: %S"}, {STRING_SETUPCOPYINGFILES, "Setup is copying files..."}, {STRING_PAGEDMEM, @@ -1666,6 +1666,14 @@ "Setup created a new partition on"}, {STRING_UNPSPACE, " Unpartitioned space %6lu %s"}, + {STRING_MAXSIZE, + "MB (max. %lu MB)"}, + {STRING_UNFORMATTED, + "New (Unformatted)"}, + {STRING_FORMATUNUSED, + "Unused"}, + {STRING_FORMATUNKNOWN, + "Unknown"}, {0, 0} }; 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 (original) +++ trunk/reactos/base/setup/usetup/mui.h Tue Feb 19 22:37:49 2008 @@ -117,4 +117,8 @@ #define STRING_HDDINFOUNK6 46 #define STRING_NEWPARTITION 47 #define STRING_UNPSPACE 48 +#define STRING_MAXSIZE 49 +#define STRING_UNFORMATTED 50 +#define STRING_FORMATUNUSED 51 +#define STRING_FORMATUNKNOWN 52 #endif 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 (original) +++ trunk/reactos/base/setup/usetup/partlist.c Tue Feb 19 22:37:49 2008 @@ -1146,7 +1146,7 @@ PartType = NULL; if (PartEntry->New == TRUE) { - PartType = "New (Unformatted)"; + PartType = MUIGetString(STRING_UNFORMATTED); } else if (PartEntry->Unpartitioned == FALSE) {

1 0

[fireball] 32422: - Fix a typo.
by fireball＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: fireball Date: Tue Feb 19 20:52:37 2008 New Revision: 32422 URL: http://svn.reactos.org/svn/reactos?rev=32422&view=rev Log: - Fix a typo. Modified: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc Modified: trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ru-R… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc (original) +++ trunk/reactos/subsystems/ntvdm/lang/ru-RU.rc Tue Feb 19 20:52:37 2008 @@ -8,6 +8,6 @@ STRINGTABLE DISCARDABLE BEGIN -STRING_WelcomeMsg, "Âèðòóàëüíàÿ ìàøèíà ïîääåæêè DOS äëÿ ReactOS.\n" +STRING_WelcomeMsg, "Âèðòóàëüíàÿ ìàøèíà ïîääåðæêè DOS äëÿ ReactOS.\n" STRING_PromptMsg, "Ââåäèòå r<cr> äëÿ çàïóñêà, s<cr> äëÿ âûêëþ÷åíèÿ èëè q<cr> âûõîäà." END

1 0

[fireball] 32421: - Fix dxg's includes.
by fireball＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: fireball Date: Tue Feb 19 20:18:18 2008 New Revision: 32421 URL: http://svn.reactos.org/svn/reactos?rev=32421&view=rev Log: - Fix dxg's includes. Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild trunk/reactos/drivers/directx/dxg/dxg_int.h Modified: trunk/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg.rb… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg.rbuild (original) +++ trunk/reactos/drivers/directx/dxg/dxg.rbuild Tue Feb 19 20:18:18 2008 @@ -1,10 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="dxg" type="kernelmodedriver" -installbase="system32/drivers" installname="dxg.sys"> +<module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys"> <importlibrary definition="dxg.def" /> <include base="dxg">.</include> - <define name="__USE_W32API" /> + <include base="dxg">include</include> + <include base="ReactOS">subsystems/win32/win32k/include</include> + <define name="_WIN32_WINNT">0x0501</define> + <define name="WINVER">0x600</define> <library>dxgthk</library> <library>ntoskrnl</library> <file>main.c</file> Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h Tue Feb 19 20:18:18 2008 @@ -6,6 +6,7 @@ #include <ddk/tvout.h> #include <ndk/ntndk.h> +/* Win32 Headers */ #define WINBASEAPI #define STARTF_USESIZE 2 #define STARTF_USEPOSITION 4 @@ -21,13 +22,19 @@ #include <dde.h> #include <wincon.h> -#include <reactos/drivers/directx/directxint.h> +/* Public Win32K Headers */ +#include <win32k/ntusrtyp.h> +#include <win32k/ntuser.h> +#include <win32k/ntgdityp.h> +#include <win32k/ntgdihdl.h> +#include <win32.h> +#include <gdiobj.h> +#include <dc.h> -#include <reactos/win32k/ntgdityp.h> -#include <reactos/win32k/ntgdihdl.h> +#include <drivers/directx/directxint.h> -#include <reactos/drivers/directx/dxg.h> -#include <reactos/drivers/directx/dxeng.h> +#include <drivers/directx/dxg.h> +#include <drivers/directx/dxeng.h> #include "tags.h"

1 0

[dreimer] 32420: Bug 3089: Ukrainian translation update by Artem Reznikov - temarez@yandex.ru
by dreimer＠svn.reactos.org 19 Feb '08

19 Feb '08

Author: dreimer Date: Tue Feb 19 18:43:41 2008 New Revision: 32420 URL: http://svn.reactos.org/svn/reactos?rev=32420&view=rev Log: Bug 3089: Ukrainian translation update by Artem Reznikov - temarez(a)yandex.ru Added: trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc (with props) Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Added: trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/uk… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc Tue Feb 19 18:43:41 2008 @@ -1,0 +1,207 @@ +/* + * PROJECT: ReactOS Software Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/appwiz-new/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for appwiz + * PROGRAMMERS: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Âèäàëèòè", ID_APP_REMOVE + MENUITEM "&Çì³íèòè", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ìåðåæíà óñòàíîâêà" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Óñ&òàíîâèòè...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "Íèæ÷åíàâåäåí³ &ïðîãðàìè ìîæóòü áóòè óñòàíîâëåí³ àâòîìàòè÷íî. Ùîá óñòàíîâèòè ïðîãðàìó, âèáåð³òü ¿¿ ç³ ñïèñêó é íàòèñí³òü êíîïêó ""Óñòàíîâèòè"".", IDC_NETTEXT, 40, 6, 195, 32 + LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP + ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 +END + +IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ñòâîðåííÿ ÿðëèêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Öåé ìàéñòåð äîïîìàãàº ñòâîðèòè ÿðëèê, ÿêèé óêàçóº íà ëîêàëüí³ àáî ìåðåæí³ ïðîãðàìè, ôàéëè, ïàïêè, êîìï'þòåðè àáî àäðåñè â ²íòåðíåò³.", -1, 97, 7, 195, 28 + LTEXT "&Óêàæ³òü ðîçòàøóâàííÿ îá'ºêòà:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "Î&ãëÿä...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Ùîá ïðîäîâæèòè óñòàíîâêó, íàòèñí³òü êíîïêó ""Äàë³"".", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âèá³ð ïàïêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Âèáåð³òü ïàïêó, äå áóäå çíàõîäèòèñÿ ÿðëèê:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "&Ñòâîðèòè ïàïêó...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âèá³ð íàçâè ïðîãðàìè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ââåä³òü ³ì'ÿ ÿðëèêà:", -1, 100, 10, 194, 10 + EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ùîá ñòâîðèòè ÿðëèê, íàòèñí³òü êíîïêó ""Ãîòîâî"".", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âèá³ð çíà÷êà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Âèáåð³òü çíà÷îê äëÿ ïðîãðàìè:", -1, 100, 8, 195, 10 + LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Óñòàíîâêà ïðîãðàìè ç äèñêåò àáî êîìïàêò-äèñêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 + ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 + LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 +END + +IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàïóñê ïðîãðàìè óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 + LTEXT "&Â³äêðèòè:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "Î&ãëÿä...", IDC_LOCBROWSE, 234, 64, 60, 14 +END + +IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Êîðèñòóâàöüêà íàñòðîéêà" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Öþ íîâó ïðîãðàìó ìîæíà çðîáèòè çàãàëüíîäîñòóïíîþ.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Install", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Execute", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàâåðøåííÿ àäì³í³ñòðàòèâíî¿ óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ïðè íàòèñíåíí³ êíîïêè ""Ãîòîâî"" â³äíîâëþºòüñÿ â³äîáðàæåííÿ INI-ôàéëó.", IDC_HEADTEXT, 98, 7, 196, 40 +END + +IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ï³ñëÿ óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Íàòèñí³òü êíîïêó ""Äàë³"".", IDC_HEADTEXT, 98, 7, 197, 40 +END + +IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çàïóñê ïðîãðàìè óñòàíîâêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Óêàæ³òü ðîçòàøóâàííÿ ïðîãðàìè ñêàñóâàííÿ óñòàíîâêè.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Êîìàíäíèé ðÿäîê ïðîãðàìè ñêàñóâàííÿ óñòàíîâêè:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "Î&ãëÿä...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 184, 100, 60, 14 +END + +IDD_WARNING DIALOG 20, 20, 255, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïîïåðåäæåííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "Äî öüîãî êîìï'þòåðà ââ³éøëè ³íø³ êîðèñòóâà÷³.", -1, 37, 8, 214, 10 + LTEXT "ßêùî âè âèäàëÿºòå ïðîãðàìó â òîé ÷àñ, êîëè ç íåþ ïðàöþº ³íøèé êîðèñòóâà÷, öÿ ïðîãðàìà ìîæå áóòè âèäàëåíà íå ïîâí³ñòþ.", -1, 37, 23, 212, 22 + LTEXT "Ùîá íàëåæíèì ÷èíîì çì³íèòè àáî âèäàëèòè òàêó ïðîãðàìó, ñë³ä ïåðåêëþ÷èòèñÿ é çàê³í÷èòè ðîáîòó âñ³õ ³íøèõ êîðèñòóâà÷³â.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Çì³íèòè êîðèñòóâà÷à", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Ïðîäîâæèòè", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âèäàëåííÿ ÿðëèê³â ³ ïàïîê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ùî&á âèäàëèòè åëåìåíò ³ç ìåíþ ""Ïóñê"", âèáåð³òü éîãî é íàòèñí³òü êíîïêó ""Âèäàëèòè"".", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "Â&èäàëèòè", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Çàêðèòè", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Â³äêëàäåíå äîäàâàííÿ ïðîãðàìè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìîæíà âèáðàòè äàòó é ÷àñ äîäàâàííÿ ö³º¿ ïðîãðàìè äî êîìï'þòåðà. Íàïðèêëàä, ìîæíà çàïëàíóâàòè, ùîá öå â³äáóëîñÿ â òîé ÷àñ, êîëè âè íå áóäåòå ïðàöþâàòè ç êîìï'þòåðîì.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "Äîäàòè &ïðîãðàìó ï³çí³øå", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Íå äîäàâàòè ïðîãðàìó", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Óñòàíîâêà é âèäàëåííÿ ïðîãðàì" + IDS_CPLSYSTEMDESCRIPTION "Óñòàíîâêà é âèäàëåííÿ ïðîãðàì ³ êîìïîíåíò³â ReactOS." + IDS_UNABLEOPEN_UNINSTKEY "Íå âäàëîñÿ â³äêðèòè êëþ÷ Uninstall" + IDS_LIST_TITLE "Ñïèñîê" + IDS_SIZE_TITLE "Ðîçì³ð (ÌÁ)" + IDS_LAST_USED "Îñòàííº âèêîðèñòàííÿ" + IDS_PROGANDUPDATES "Ïðîãðàìè ³ îíîâëåííÿ" + IDS_PROGRAMS_ONLY "Ò³ëüêè ïðîãðàìè" + IDS_UPDATES_ONLY "Ò³ëüêè îíîâëåííÿ" + IDS_WELCOME_TITLE "Ëàñêàâî ïðîñèìî äî Àñèñòåíòà óñòàíîâêè ³ âèäàëåííÿ ïðîãðàì" + IDS_WELCOME_MSG "Áóäü ëàñêà âèáåð³òü êàòåãîð³þ çë³âà àáî âèáèðàþòü äîäàòîê â ñïèñêó äëÿ âèäàëåííÿ àáî ïðîãëÿäàííÿ ³íôîðìàö³¿." + IDS_SEARCH_TEXT "Ïîøóê â ñïèñêó..." + IDS_REMOVE_BTN "&Âèäàëèòè" + IDS_MODIFY_BTN "&Çì³íèòè" + IDS_UNABLEREAD_UNINSTSTR "Íå âäàëîñÿ ïðî÷èòàòè UninstallString. Öå çíà÷åííÿ íåâ³ðíå àáî ñòâîðåíî MSI-³íñòàëÿòîðîì." + IDS_INF_REG_OWNER "Çàðåºñòðîâàíî íà: " + IDS_INF_PRODUCT_ID "Êîä ïðîäóêòó: " + IDS_INF_PUBLISHER "Âèäàâåöü: " + IDS_INF_VERSION "Âåðñ³ÿ: " + IDS_INF_CONTACT "Êîíòàêò: " + IDS_INF_SUP_INFO "Â³äîìîñò³ ïðî ï³äòðèìêó: " + IDS_INF_SUP_PHONE "Òåëåôîí ï³äòðèìêè: " + IDS_INF_PRODUCT_UPD "Îíîâëåííÿ ïðîäóêòó: " + IDS_INF_README "Ôàéë ""Readme"": " + IDS_INF_COMMENTS "Ïðèì³òêè: " + IDS_NO_INFORMATION "Íåìàº ³íôîðìàö³¿ ïðî öþ ïðîãðàìó." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/rsrc.rc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Tue Feb 19 18:43:41 2008 @@ -6,3 +6,4 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc"

1 0

[tkreuzer] 32419: some cleanup - move NtGdiFlushUserBatch prototype to ntgdi.h - move pool tags from ntgdihdl.h to win32k/tags.h - move DC struct from ntgdihdl.h to win32k/dc.h - replace GDIEMPTYHDR with BASEOBJECT - use BASEOBJECT in DC and GDIDEVICE structures - rename some NtGdiXxx functions that don't deserve that name and remove some that were defined by a macro, but don't exist on windows (#if 0'ed atm) - remove RetrieveDisplayHDC() prototype (doesn't exist)
by tkreuzer＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: tkreuzer Date: Tue Feb 19 02:05:41 2008 New Revision: 32419 URL: http://svn.reactos.org/svn/reactos?rev=32419&view=rev Log: some cleanup - move NtGdiFlushUserBatch prototype to ntgdi.h - move pool tags from ntgdihdl.h to win32k/tags.h - move DC struct from ntgdihdl.h to win32k/dc.h - replace GDIEMPTYHDR with BASEOBJECT - use BASEOBJECT in DC and GDIDEVICE structures - rename some NtGdiXxx functions that don't deserve that name and remove some that were defined by a macro, but don't exist on windows (#if 0'ed atm) - remove RetrieveDisplayHDC() prototype (doesn't exist) Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Tue Feb 19 02:05:41 2008 @@ -1696,6 +1696,11 @@ ); W32KAPI +NTSTATUS +APIENTRY +NtGdiFlushUserBatch(VOID); + +W32KAPI HRGN APIENTRY NtGdiPathToRegion( Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Feb 19 02:05:41 2008 @@ -40,21 +40,6 @@ #define GDI_ENTRY_FLAGS_MASK 0xff000000 #define GDI_ENTRY_REUSECNT_SHIFT 8 #define GDI_ENTRY_UPPER_SHIFT 16 - -#define GDI_OBJECT_TAG_DC TAG('G', 'l', 'a', '1') -#define GDI_OBJECT_TAG_REGION TAG('G', 'l', 'a', '4') -#define GDI_OBJECT_TAG_BITMAP TAG('G', 'l', 'a', '5') -#define GDI_OBJECT_TAG_CLIOBJ TAG('G', 'h', '0', '6') -#define GDI_OBJECT_TAG_PATH TAG('G', 'h', '0', '7') -#define GDI_OBJECT_TAG_PALETTE TAG('G', 'l', 'a', '8') -#define GDI_OBJECT_TAG_COLSPC TAG('G', 'h', '0', '9') -#define GDI_OBJECT_TAG_FONT TAG('G', 'l', 'a', ':') -#define GDI_OBJECT_TAG_PFE TAG('G', 'h', '0', '<') -#define GDI_OBJECT_TAG_BRUSH TAG('G', 'l', 'a', '@') -#define GDI_OBJECT_TAG_ENUMFONT TAG('G', 'h', '0', 'F') - -#define GDI_OBJECT_TAG_DDRAW TAG('D', 'h', ' ', '1') -#define GDI_OBJECT_TAG_DDSURF TAG('D', 'h', ' ', '2') /*! \defgroup GDI object types * @@ -369,41 +354,4 @@ BOOL vport2WorldValid; /* Is xformVport2World valid? */ } WIN_DC_INFO; -typedef struct _DC -{ - HGDIOBJ hHmgr; // Handle for this DC object. - ULONG Count; - ULONG lucExcLock; - PVOID Tid; - - DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. - INT DC_Type; - INT DC_Flags; - PVOID pPDev; // PGDIDEVICE - PVOID hSem; // PERESOURCE - FLONG flGraphics; - FLONG flGraphics2; - PDC_ATTR pDc_Attr; - WIN_DC_INFO w; - DC_ATTR Dc_Attr; - HDC hNext; - HDC hPrev; - RECTL erclClip; - RECTL erclWindow; - RECTL erclBounds; - HRGN hprgnAPI; - HRGN hprgnVis; - - CLIPOBJ *CombinedClip; - XLATEOBJ *XlateBrush; - XLATEOBJ *XlatePen; - - INT saveLevel; // DCLEVEL lSaveDepth - HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. - - HPALETTE PalIndexed; - - UNICODE_STRING DriverName; -} DC, *PDC; - #endif Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Feb 19 02:05:41 2008 @@ -1,8 +1,9 @@ - #ifndef __WIN32K_DC_H #define __WIN32K_DC_H #include "driver.h" + +/* Constants ******************************************************************/ // Get/SetBounds/Rect support. #define DCB_WINDOWMGR 0x8000 // Queries the Windows bounding rectangle instead of the application's @@ -29,7 +30,43 @@ #define PDEV_DRIVER_PUNTED_CALL 0x00040000 // Driver calls back to GDI engine #define PDEV_CLONE_DEVICE 0x00080000 -// Graphics Device structure. +/* Type definitions ***********************************************************/ + +/* The DC object structure */ +typedef struct _DC +{ + BASEOBJECT BaseObject; + + DHPDEV PDev; // <- GDIDEVICE.hPDev DHPDEV for device. + INT DC_Type; + INT DC_Flags; + PVOID pPDev; // PGDIDEVICE + PVOID hSem; // PERESOURCE + FLONG flGraphics; + FLONG flGraphics2; + PDC_ATTR pDc_Attr; + WIN_DC_INFO w; + DC_ATTR Dc_Attr; + HDC hNext; + HDC hPrev; + RECTL erclClip; + RECTL erclWindow; + RECTL erclBounds; + HRGN hprgnAPI; + HRGN hprgnVis; + + CLIPOBJ *CombinedClip; + XLATEOBJ *XlateBrush; + XLATEOBJ *XlatePen; + + INT saveLevel; // DCLEVEL lSaveDepth + HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC. + + HPALETTE PalIndexed; + + UNICODE_STRING DriverName; +} DC, *PDC; + typedef struct _GRAPHICS_DEVICE { CHAR szNtDeviceName[CCHDEVICENAME]; // Yes char AscII @@ -59,10 +96,7 @@ typedef struct _GDIDEVICE { - HANDLE hHmgr; - ULONG csCount; - ULONG lucExcLock; - PVOID Tid; + BASEOBJECT BaseObject; struct _GDIDEVICE *ppdevNext; INT cPdevRefs; @@ -103,7 +137,15 @@ struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; } GDIDEVICE, *PGDIDEVICE; -/* Internal functions */ +/* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ +typedef struct +{ + LPENHMETAHEADER emh; + BOOL on_disk; /* true if metafile is on disk */ +} DD_ENHMETAFILEOBJ, *PDD_ENHMETAFILEOBJ; + + +/* Internal functions *********************************************************/ #define DC_LockDc(hDC) \ ((PDC) GDIOBJ_LockObj (GdiHandleTable, (HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) @@ -111,7 +153,6 @@ GDIOBJ_UnlockObjByPtr (GdiHandleTable, pDC) NTSTATUS FASTCALL InitDcImpl(VOID); -HDC FASTCALL RetrieveDisplayHDC(VOID); PGDIDEVICE FASTCALL IntEnumHDev(VOID); HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); VOID FASTCALL DC_InitDC(HDC DCToInit); @@ -141,23 +182,14 @@ VOID FASTCALL IntGetWindowExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetWindowOrgEx(PDC dc, LPPOINT pt); -NTSTATUS STDCALL NtGdiFlushUserBatch(VOID); +COLORREF FASTCALL IntGdiSetBkColor (HDC hDC, COLORREF Color); +INT FASTCALL IntGdiSetBkMode(HDC hDC, INT backgroundMode); +COLORREF STDCALL IntGdiGetBkColor(HDC hDC); +INT STDCALL IntGdiGetBkMode(HDC hDC); +COLORREF FASTCALL IntGdiSetTextColor(HDC hDC, COLORREF color); +UINT FASTCALL IntGdiSetTextAlign(HDC hDC, UINT Mode); +UINT STDCALL IntGdiGetTextAlign(HDC hDC); +COLORREF STDCALL IntGdiGetTextColor(HDC hDC); +INT STDCALL IntGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); -COLORREF FASTCALL NtGdiSetBkColor (HDC hDC, COLORREF Color); -INT FASTCALL NtGdiSetBkMode(HDC hDC, INT backgroundMode); -COLORREF STDCALL NtGdiGetBkColor(HDC hDC); -INT STDCALL NtGdiGetBkMode(HDC hDC); -COLORREF FASTCALL NtGdiSetTextColor(HDC hDC, COLORREF color); -UINT FASTCALL NtGdiSetTextAlign(HDC hDC, UINT Mode); -UINT STDCALL NtGdiGetTextAlign(HDC hDC); -COLORREF STDCALL NtGdiGetTextColor(HDC hDC); -INT STDCALL NtGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); - -/* For Metafile and MetaEnhFile not in windows this struct taken from wine cvs 15/9-2006*/ -typedef struct -{ - LPENHMETAHEADER emh; - BOOL on_disk; /* true if metafile is on disk */ -} DD_ENHMETAFILEOBJ, *PDD_ENHMETAFILEOBJ; - -#endif /* __WIN32K_DC_H */ +#endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Tue Feb 19 02:05:41 2008 @@ -36,7 +36,7 @@ typedef BOOL (INTERNAL_CALL *GDICLEANUPPROC)(PVOID ObjectBody); /*! - * GDI object header. This is a part of any GDI object + * GDI object header. This is a part of any GDI object. ROS specific header! */ typedef struct _GDIOBJHDR { @@ -55,13 +55,14 @@ // It's for thread locking. // This header is standalone, used only in gdiobj.c. // -typedef struct _GDIOBJEMPTYHDR +typedef struct _BASEOBJECT { HGDIOBJ hHmgr; - ULONG Count; - ULONG lucExcLock; + ULONG ulShareCount; + USHORT cExclusiveLock; + USHORT BaseFlags; PW32THREAD Tid; -} GDIOBJEMPTYHDR, *PGDIOBJEMPTYHDR; +} BASEOBJECT, *POBJ; BOOL INTERNAL_CALL GDIOBJ_OwnedByCurrentProcess(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle); void INTERNAL_CALL GDIOBJ_SetOwnership(PGDI_HANDLE_TABLE HandleTable, HGDIOBJ ObjectHandle, PEPROCESS Owner); Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h Tue Feb 19 02:05:41 2008 @@ -1,72 +1,97 @@ #ifndef _WIN32K_TAGS_H #define _WIN32K_TAGS_H -#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ +#define TAG_STRING TAG('S', 'T', 'R', ' ') /* string */ /* ntuser */ -#define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ -#define TAG_KEYBOARD TAG('K', 'B', 'D', ' ') /* keyboard */ -#define TAG_ACCEL TAG('A', 'C', 'C', 'L') /* accelerator */ -#define TAG_HOOK TAG('W', 'N', 'H', 'K') /* hook */ -#define TAG_HOTKEY TAG('H', 'O', 'T', 'K') /* hotkey */ -#define TAG_MENUITEM TAG('M', 'E', 'N', 'I') /* menu item */ -#define TAG_MSG TAG('M', 'E', 'S', 'G') /* message */ -#define TAG_MSGQ TAG('M', 'S', 'G', 'Q') /* message queue */ -#define TAG_USRMSG TAG('U', 'M', 'S', 'G') /* user message */ -#define TAG_WNDPROP TAG('W', 'P', 'R', 'P') /* window property */ -#define TAG_WNAM TAG('W', 'N', 'A', 'M') /* window name */ -#define TAG_WINLIST TAG('W', 'N', 'L', 'S') /* window handle list */ -#define TAG_WININTLIST TAG('W', 'N', 'I', 'P') /* window internal pos */ -#define TAG_WINPROCLST TAG('W', 'N', 'P', 'L') /* window proc list */ -#define TAG_SBARINFO TAG('S', 'B', 'I', 'N') /* scrollbar info */ -#define TAG_TIMER TAG('T', 'I', 'M', 'R') /* timer entry */ -#define TAG_TIMERTD TAG('T', 'I', 'M', 'T') /* timer thread dereference list */ -#define TAG_TIMERBMP TAG('T', 'I', 'M', 'B') /* timers bitmap */ -#define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ -#define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ -#define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ +#define TAG_MOUSE TAG('M', 'O', 'U', 'S') /* mouse */ +#define TAG_KEYBOARD TAG('K', 'B', 'D', ' ') /* keyboard */ +#define TAG_ACCEL TAG('A', 'C', 'C', 'L') /* accelerator */ +#define TAG_HOOK TAG('W', 'N', 'H', 'K') /* hook */ +#define TAG_HOTKEY TAG('H', 'O', 'T', 'K') /* hotkey */ +#define TAG_MENUITEM TAG('M', 'E', 'N', 'I') /* menu item */ +#define TAG_MSG TAG('M', 'E', 'S', 'G') /* message */ +#define TAG_MSGQ TAG('M', 'S', 'G', 'Q') /* message queue */ +#define TAG_USRMSG TAG('U', 'M', 'S', 'G') /* user message */ +#define TAG_WNDPROP TAG('W', 'P', 'R', 'P') /* window property */ +#define TAG_WNAM TAG('W', 'N', 'A', 'M') /* window name */ +#define TAG_WINLIST TAG('W', 'N', 'L', 'S') /* window handle list */ +#define TAG_WININTLIST TAG('W', 'N', 'I', 'P') /* window internal pos */ +#define TAG_WINPROCLST TAG('W', 'N', 'P', 'L') /* window proc list */ +#define TAG_SBARINFO TAG('S', 'B', 'I', 'N') /* scrollbar info */ +#define TAG_TIMER TAG('T', 'I', 'M', 'R') /* timer entry */ +#define TAG_TIMERTD TAG('T', 'I', 'M', 'T') /* timer thread dereference list */ +#define TAG_TIMERBMP TAG('T', 'I', 'M', 'B') /* timers bitmap */ +#define TAG_CALLBACK TAG('C', 'B', 'C', 'K') /* callback memory */ +#define TAG_WINSTA TAG('W', 'S', 'T', 'A') /* window station */ +#define TAG_PDCE TAG('U', 's', 'd', 'c') /* dce */ -/* objects */ -#define TAG_BEZIER TAG('B', 'E', 'Z', 'R') /* bezier */ -#define TAG_BITMAP TAG('B', 'T', 'M', 'P') /* bitmap */ -#define TAG_PATBLT TAG('P', 'B', 'L', 'T') /* patblt */ -#define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ -#define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ -#define TAG_DC TAG('D', 'C', 'D', 'C') /* dc */ -#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ -#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ -#define TAG_GDIOBJ TAG('G', 'D', 'I', 'O') /* gdi obj */ -#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ -#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ -#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ -#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ -#define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ -#define TAG_PALETTE TAG('P', 'A', 'L', 'E') /* palette */ -#define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ -#define TAG_PATH TAG('P', 'A', 'T', 'H') /* path */ -#define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ -#define TAG_REGION TAG('R', 'G', 'N', 'O') /* region */ -#define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ -#define TAG_EXTPEN TAG('X', 'P', 'E', 'N') /* extpen */ +/* gdi objects from the handle table */ +#define TAG_DC TAG('G', 'l', 'a', '1') /* dc */ +#define TAG_REGION TAG('G', 'l', 'a', '4') /* region */ +#define TAG_SURFACE TAG('G', 'l', 'a', '5') /* bitmap */ +#define TAG_CLIENTOBJ TAG('G', 'h', '0', '6') +#define TAG_PATH TAG('G', 'h', '0', '7') +#define TAG_PALETTE TAG('G', 'l', 'a', '8') +#define TAG_ICMLCS TAG('G', 'h', '0', '9') +#define TAG_LFONT TAG('G', 'l', 'a', ':') +#define TAG_RFONT TAG('G', 'h', '0', ';') /* correct? */ +#define TAG_PFE TAG('G', 'h', '0', '<') +#define TAG_PFT TAG('G', 'h', '0', '=') /* correct? */ +#define TAG_ICMCXF TAG('G', 'h', '0', '>') /* correct? */ +#define TAG_SPRITE TAG('G', 'h', '0', '?') /* correct? */ +#define TAG_BRUSH TAG('G', 'l', 'a', '@') +#define TAG_UMPD TAG('G', 'h', '0', 'A') /* correct? */ +#define TAG_SPACE TAG('G', 'h', '0', 'C') /* correct? */ +#define TAG_META TAG('G', 'h', '0', 'E') /* correct? */ +#define TAG_EFSTATE TAG('G', 'h', '0', 'F') /* correct? */ +#define TAG_BMFD TAG('G', 'h', '0', 'G') /* correct? */ +#define TAG_VTFD TAG('G', 'h', '0', 'H') /* correct? */ +#define TAG_TTFD TAG('G', 'h', '0', 'I') /* correct? */ +#define TAG_RC TAG('G', 'h', '0', 'J') /* correct? */ +#define TAG_TEMP TAG('G', 'h', '0', 'K') /* correct? */ +#define TAG_DRVOBJ TAG('G', 'h', '0', 'L') /* correct? */ +#define TAG_DCIOBJ TAG('G', 'h', '0', 'M') /* correct? */ +#define TAG_SPOOL TAG('G', 'h', '0', 'N') /* correct? */ + +/* other gdi objects */ +#define TAG_BEZIER TAG('B', 'E', 'Z', 'R') /* bezier */ +#define TAG_BITMAP TAG('B', 'T', 'M', 'P') /* bitmap */ +#define TAG_PATBLT TAG('P', 'B', 'L', 'T') /* patblt */ +#define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ +#define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ +#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ +#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ +#define TAG_GDIOBJ TAG('G', 'D', 'I', 'O') /* gdi obj */ +#define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ +#define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ +#define TAG_DIB TAG('D', 'I', 'B', ' ') /* dib */ +#define TAG_COLORMAP TAG('C', 'O', 'L', 'M') /* color map */ +#define TAG_SHAPE TAG('S', 'H', 'A', 'P') /* shape */ +#define TAG_PALETTEMAP TAG('P', 'A', 'L', 'M') /* palette mapping */ +#define TAG_PRINT TAG('P', 'R', 'N', 'T') /* print */ +#define TAG_GDITEXT TAG('T', 'X', 'T', 'O') /* text */ +#define TAG_EXTPEN TAG('X', 'P', 'E', 'N') /* extpen */ /* Eng objects */ -#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ -#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ -#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ -#define TAG_FONTOBJ TAG('F', 'N', 'T', 'O') /* font object */ -#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ -#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ -#define TAG_BITMAPOBJ TAG('B', 'M', 'P', 'O') /* bitmap object */ +#define TAG_CLIPOBJ TAG('C', 'L', 'P', 'O') /* clip object */ +#define TAG_DRIVEROBJ TAG('D', 'R', 'V', 'O') /* driver object */ +#define TAG_FONT TAG('F', 'N', 'T', 'E') /* font entry */ +#define TAG_FONTOBJ TAG('F', 'N', 'T', 'O') /* font object */ +#define TAG_WNDOBJ TAG('W', 'N', 'D', 'O') /* window object */ +#define TAG_XLATEOBJ TAG('X', 'L', 'A', 'O') /* xlate object */ +#define TAG_BITMAPOBJ TAG('B', 'M', 'P', 'O') /* bitmap object */ /* misc */ -#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ -#define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ +#define TAG_DRIVER TAG('G', 'D', 'R', 'V') /* video drivers */ +#define TAG_FNTFILE TAG('F', 'N', 'T', 'F') /* font file */ #define TAG_SSECTPOOL TAG('S', 'S', 'C', 'P') /* shared section pool */ - /* Dx internal tags rember I do not known if it right namees */ -#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ -#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ +#define TAG_DXPVMLIST TAG('D', 'X', 'P', 'L') /* pmvlist for the driver */ +#define TAG_DXFOURCC TAG('D', 'X', 'F', 'O') /* pdwFourCC for the driver */ +#define TAG_DDRAW TAG('D', 'h', ' ', '1') +#define TAG_DDSURF TAG('D', 'h', ' ', '2') #endif /* _WIN32K_TAGS_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Feb 19 02:05:41 2008 @@ -1622,10 +1622,10 @@ goto cleanup; } - nStretchMode = NtGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); - - oldFg = NtGdiSetTextColor(hdcOff, RGB(0, 0, 0)); - oldBg = NtGdiSetBkColor(hdcOff, RGB(255, 255, 255)); + nStretchMode = IntGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); + + oldFg = IntGdiSetTextColor(hdcOff, RGB(0, 0, 0)); + oldBg = IntGdiSetBkColor(hdcOff, RGB(255, 255, 255)); if (diFlags & DI_MASK) { @@ -1737,9 +1737,9 @@ cyHeight, hdcOff, 0, 0, SRCCOPY, 0, 0); } - NtGdiSetTextColor(hdcOff, oldFg); - NtGdiSetBkColor(hdcOff, oldBg); - NtGdiSetStretchBltMode(hdcOff, nStretchMode); + IntGdiSetTextColor(hdcOff, oldFg); + IntGdiSetBkColor(hdcOff, oldBg); + IntGdiSetStretchBltMode(hdcOff, nStretchMode); Ret = TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Tue Feb 19 02:05:41 2008 @@ -1505,15 +1505,15 @@ rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); } - color_old = NtGdiSetTextColor(hDC, RGB(255,255,255)); - align_old = NtGdiSetTextAlign(hDC, TA_RIGHT); - mode_old = NtGdiSetBkMode(hDC, TRANSPARENT); + color_old = IntGdiSetTextColor(hDC, RGB(255,255,255)); + align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); + mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); NtGdiExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0); - NtGdiSetBkMode(hDC, mode_old); - NtGdiSetTextAlign(hDC, align_old); - NtGdiSetTextColor(hDC, color_old); + IntGdiSetBkMode(hDC, mode_old); + IntGdiSetTextAlign(hDC, align_old); + IntGdiSetTextColor(hDC, color_old); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Tue Feb 19 02:05:41 2008 @@ -1581,7 +1581,7 @@ return FALSE; } - NtGdiSetBkMode(hDc, TRANSPARENT); + IntGdiSetBkMode(hDc, TRANSPARENT); if(uFlags & DC_SMALLCAP) Status = TextIntCreateFontIndirect(&nclm.lfSmCaptionFont, &hFont); @@ -1603,8 +1603,8 @@ } if(uFlags & DC_INBUTTON) - OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); - else OldTextColor = NtGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE + OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); + else OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. @@ -1613,7 +1613,7 @@ lpRc->top, 0, NULL, Text->Buffer, Text->Length/sizeof(WCHAR), NULL, 0); - NtGdiSetTextColor(hDc, OldTextColor); + IntGdiSetTextColor(hDc, OldTextColor); NtGdiSelectFont(hDc, hOldFont); NtGdiDeleteObject(hFont); Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c Tue Feb 19 02:05:41 2008 @@ -43,7 +43,7 @@ HWND hWnd; PWINDOW_OBJECT Window; - hWnd = IntWindowFromDC((HDC) dc->hHmgr); + hWnd = IntWindowFromDC((HDC) dc->BaseObject.hHmgr); Window = UserGetWindowObject(hWnd); if(!Window) return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Feb 19 02:05:41 2008 @@ -838,10 +838,10 @@ /* Initialize the DC state */ DC_InitDC(hNewDC); - NtGdiSetTextColor(hNewDC, RGB(0, 0, 0)); - NtGdiSetTextAlign(hNewDC, TA_TOP); - NtGdiSetBkColor(hNewDC, RGB(255, 255, 255)); - NtGdiSetBkMode(hNewDC, OPAQUE); + IntGdiSetTextColor(hNewDC, RGB(0, 0, 0)); + IntGdiSetTextAlign(hNewDC, TA_TOP); + IntGdiSetBkColor(hNewDC, RGB(255, 255, 255)); + IntGdiSetBkMode(hNewDC, OPAQUE); } else { @@ -1356,8 +1356,8 @@ NtGdiSelectFont( hDC, sDc_Attr->hlfntNew ); NtGdiSelectPen( hDC, sDc_Attr->hpen ); - NtGdiSetBkColor( hDC, sDc_Attr->crBackgroundClr); - NtGdiSetTextColor( hDC, sDc_Attr->crForegroundClr); + IntGdiSetBkColor( hDC, sDc_Attr->crBackgroundClr); + IntGdiSetTextColor( hDC, sDc_Attr->crForegroundClr); NtUserSelectPalette( hDC, dcs->w.hPalette, FALSE ); @@ -2385,7 +2385,7 @@ Dc_Attr = NewDC->pDc_Attr; if(!Dc_Attr) Dc_Attr = &NewDC->Dc_Attr; - NewDC->hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. + NewDC->BaseObject.hHmgr = (HGDIOBJ) hDC; // Save the handle for this DC object. NewDC->w.xformWorld2Wnd.eM11 = 1.0f; NewDC->w.xformWorld2Wnd.eM12 = 0.0f; NewDC->w.xformWorld2Wnd.eM21 = 0.0f; Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Tue Feb 19 02:05:41 2008 @@ -41,7 +41,9 @@ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; \ pt->ax = Dc_Attr->ret_x; \ pt->ay = Dc_Attr->ret_y; \ -} \ +} + +#if 0 BOOL STDCALL NtGdi##FuncName ( HDC hdc, LP##type pt ) \ { \ NTSTATUS Status = STATUS_SUCCESS; \ @@ -78,6 +80,7 @@ } \ return TRUE; \ } +#endif #define DC_SET_MODE( func_name, dc_field, min_val, max_val ) \ INT STDCALL func_name( HDC hdc, INT mode ) \ @@ -123,7 +126,7 @@ PDC_ATTR Dc_Attr = dc->pDc_Attr; if (Dc_Attr == ((PDC_ATTR)&dc->Dc_Attr)) return TRUE; // No need to copy self. - + if (!Dc_Attr) return FALSE; else CopytoUserDcAttr( dc, Dc_Attr); @@ -143,28 +146,28 @@ } -DC_GET_VAL( INT, NtGdiGetMapMode, iMapMode ) -DC_GET_VAL( INT, NtGdiGetPolyFillMode, jFillMode ) -DC_GET_VAL( COLORREF, NtGdiGetBkColor, crBackgroundClr ) -DC_GET_VAL( INT, NtGdiGetBkMode, jBkMode ) -DC_GET_VAL( INT, NtGdiGetROP2, jROP2 ) -DC_GET_VAL( INT, NtGdiGetStretchBltMode, jStretchBltMode ) -DC_GET_VAL( UINT, NtGdiGetTextAlign, lTextAlign ) -DC_GET_VAL( COLORREF, NtGdiGetTextColor, crForegroundClr ) +DC_GET_VAL( INT, IntGdiGetMapMode, iMapMode ) +DC_GET_VAL( INT, IntGdiGetPolyFillMode, jFillMode ) +DC_GET_VAL( COLORREF, IntGdiGetBkColor, crBackgroundClr ) +DC_GET_VAL( INT, IntGdiGetBkMode, jBkMode ) +DC_GET_VAL( INT, IntGdiGetROP2, jROP2 ) +DC_GET_VAL( INT, IntGdiGetStretchBltMode, jStretchBltMode ) +DC_GET_VAL( UINT, IntGdiGetTextAlign, lTextAlign ) +DC_GET_VAL( COLORREF, IntGdiGetTextColor, crForegroundClr ) DC_GET_VAL_EX( GetViewportExtEx, szlViewportExt.cx, szlViewportExt.cy, SIZE, cx, cy ) DC_GET_VAL_EX( GetViewportOrgEx, ptlViewportOrg.x, ptlViewportOrg.y, POINT, x, y ) DC_GET_VAL_EX( GetWindowExtEx, szlWindowExt.cx, szlWindowExt.cy, SIZE, cx, cy ) DC_GET_VAL_EX( GetWindowOrgEx, ptlWindowOrg.x, ptlWindowOrg.y, POINT, x, y ) -DC_SET_MODE( NtGdiSetPolyFillMode, jFillMode, ALTERNATE, WINDING ) -DC_SET_MODE( NtGdiSetROP2, jROP2, R2_BLACK, R2_WHITE ) -DC_SET_MODE( NtGdiSetStretchBltMode, jStretchBltMode, BLACKONWHITE, HALFTONE ) +DC_SET_MODE( IntGdiSetPolyFillMode, jFillMode, ALTERNATE, WINDING ) +DC_SET_MODE( IntGdiSetROP2, jROP2, R2_BLACK, R2_WHITE ) +DC_SET_MODE( IntGdiSetStretchBltMode, jStretchBltMode, BLACKONWHITE, HALFTONE ) COLORREF FASTCALL -NtGdiSetBkColor(HDC hDC, COLORREF color) +IntGdiSetBkColor(HDC hDC, COLORREF color) { COLORREF oldColor; PDC dc; @@ -189,7 +192,7 @@ } INT FASTCALL -NtGdiSetBkMode(HDC hDC, INT Mode) +IntGdiSetBkMode(HDC hDC, INT Mode) { COLORREF oldMode; PDC dc; @@ -211,7 +214,7 @@ UINT FASTCALL -NtGdiSetTextAlign(HDC hDC, +IntGdiSetTextAlign(HDC hDC, UINT Mode) { UINT prevAlign; @@ -234,7 +237,7 @@ COLORREF FASTCALL -NtGdiSetTextColor(HDC hDC, +IntGdiSetTextColor(HDC hDC, COLORREF color) { COLORREF oldColor; Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Feb 19 02:05:41 2008 @@ -68,37 +68,37 @@ static const OBJ_TYPE_INFO ObjTypeInfo[] = { - {0, 0, 0, NULL}, /* 00 reserved entry */ - {1, sizeof(DC), GDI_OBJECT_TAG_DC, DC_Cleanup}, /* 01 DC */ - {1, 0, 0, 0}, /* 02 DD_DDRAW, should be moved away from gdi objects */ - {1, 0, 0, 0}, /* 03 DD_SURFACE, should be moved away from gdi objects */ - {1, sizeof(ROSRGNDATA), GDI_OBJECT_TAG_REGION, RGNDATA_Cleanup}, /* 04 REGION */ - {1, sizeof(BITMAPOBJ), GDI_OBJECT_TAG_BITMAP, BITMAP_Cleanup}, /* 05 BITMAP */ - {0, sizeof(DC), GDI_OBJECT_TAG_CLIOBJ, GDI_CleanupDummy}, /* 06 CLIOBJ: METADC,... FIXME: don't use DC struct */ - {0, 0, GDI_OBJECT_TAG_PATH, NULL}, /* 07 PATH, unused */ - {1, sizeof(PALGDI), GDI_OBJECT_TAG_PALETTE, PALETTE_Cleanup}, /* 08 PALETTE */ - {0, 0, GDI_OBJECT_TAG_COLSPC, NULL}, /* 09 COLORSPACE, unused */ - {1, sizeof(TEXTOBJ), GDI_OBJECT_TAG_FONT, GDI_CleanupDummy}, /* 0a FONT */ - {0, 0, 0, NULL}, /* 0b RFONT, unused */ - {0, 0, 0, NULL}, /* 0c PFE, unused */ - {0, 0, 0, NULL}, /* 0d PFT, unused */ - {0, 0, 0, NULL}, /* 0e ICMCXF, unused */ - {0, 0, 0, NULL}, /* 0f ICMDLL, unused */ - {1, sizeof(GDIBRUSHOBJ), GDI_OBJECT_TAG_BRUSH, BRUSH_Cleanup}, /* 10 BRUSH, PEN, EXTPEN */ - {0, 0, 0, NULL}, /* 11 D3D_HANDLE, unused */ - {0, 0, 0, NULL}, /* 12 DD_VPORT, unused */ - {0, 0, 0, NULL}, /* 13 SPACE, unused */ - {0, 0, 0, NULL}, /* 14 DD_MOTION, unused */ - {0, 0, 0, NULL}, /* 15 META, unused */ - {0, 0, 0, NULL}, /* 16 ENUMFONT, unused */ - {0, 0, 0, NULL}, /* 17 BMFD, unused */ - {0, 0, 0, NULL}, /* 18 VTFD, unused */ - {0, 0, 0, NULL}, /* 19 TTFD, unused */ - {0, 0, 0, NULL}, /* 1a RC, unused */ - {0, 0, 0, NULL}, /* 1b TEMP, unused */ - {0, 0, 0, NULL}, /* 1c DRVOBJ, unused */ - {0, 0, 0, NULL}, /* 1d DCIOBJ, unused */ - {0, 0, 0, NULL}, /* 1e SPOOL, unused */ + {0, 0, 0, NULL}, /* 00 reserved entry */ + {1, sizeof(DC), TAG_DC, DC_Cleanup}, /* 01 DC */ + {1, 0, 0, NULL}, /* 02 UNUSED1 */ + {1, 0, 0, NULL}, /* 03 UNUSED2 */ + {1, sizeof(ROSRGNDATA), TAG_REGION, RGNDATA_Cleanup}, /* 04 RGN */ + {1, sizeof(BITMAPOBJ), TAG_SURFACE, BITMAP_Cleanup}, /* 05 SURFACE */ + {0, sizeof(DC), TAG_CLIENTOBJ, GDI_CleanupDummy}, /* 06 CLIENTOBJ: METADC,... FIXME: don't use DC struct */ + {0, 0, TAG_PATH, NULL}, /* 07 PATH, unused */ + {1, sizeof(PALGDI), TAG_PALETTE, PALETTE_Cleanup}, /* 08 PAL */ + {0, 0, TAG_ICMLCS, NULL}, /* 09 ICMLCS, unused */ + {1, sizeof(TEXTOBJ), TAG_LFONT, GDI_CleanupDummy}, /* 0a LFONT */ + {0, 0, TAG_RFONT, NULL}, /* 0b RFONT, unused */ + {0, 0, TAG_PFE, NULL}, /* 0c PFE, unused */ + {0, 0, TAG_PFT, NULL}, /* 0d PFT, unused */ + {0, 0, TAG_ICMCXF, NULL}, /* 0e ICMCXF, unused */ + {0, 0, TAG_SPRITE, NULL}, /* 0f SPRITE, unused */ + {1, sizeof(GDIBRUSHOBJ), TAG_BRUSH, BRUSH_Cleanup}, /* 10 BRUSH, PEN, EXTPEN */ + {0, 0, TAG_UMPD, NULL}, /* 11 UMPD, unused */ + {0, 0, 0, NULL}, /* 12 UNUSED4 */ + {0, 0, TAG_SPACE, NULL}, /* 13 SPACE, unused */ + {0, 0, 0, NULL}, /* 14 UNUSED5 */ + {0, 0, TAG_META, NULL}, /* 15 META, unused */ + {0, 0, TAG_EFSTATE, NULL}, /* 16 EFSTATE, unused */ + {0, 0, TAG_BMFD, NULL}, /* 17 BMFD, unused */ + {0, 0, TAG_TTFD, NULL}, /* 18 VTFD, unused */ + {0, 0, TAG_TTFD, NULL}, /* 19 TTFD, unused */ + {0, 0, TAG_RC, NULL}, /* 1a RC, unused */ + {0, 0, TAG_TEMP, NULL}, /* 1b TEMP, unused */ + {0, 0, TAG_DRVOBJ, NULL}, /* 1c DRVOBJ, unused */ + {0, 0, TAG_DCIOBJ, NULL}, /* 1d DCIOBJ, unused */ + {0, 0, TAG_SPOOL, NULL}, /* 1e SPOOL, unused */ }; #define BASE_OBJTYPE_COUNT (sizeof(ObjTypeInfo) / sizeof(ObjTypeInfo[0]))

1 0

[dreimer] 32418: Bug 3088: Polish locale update: usetup + appwiz-new by Olaf Siejka - olaf_siejka@o2.pl
by dreimer＠svn.reactos.org 18 Feb '08

18 Feb '08

Author: dreimer Date: Tue Feb 19 01:19:07 2008 New Revision: 32418 URL: http://svn.reactos.org/svn/reactos?rev=32418&view=rev Log: Bug 3088: Polish locale update: usetup + appwiz-new by Olaf Siejka - olaf_siejka(a)o2.pl Added: trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc (with props) Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc trunk/reactos/dll/cpl/appwiz-new/rsrc.rc 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 (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Tue Feb 19 01:19:07 2008 @@ -1607,7 +1607,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by w stanie odnale« sekji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik¢w: %S"}, + " \xB3 Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM, @@ -1649,31 +1649,31 @@ {STRING_KEEPFORMAT, " Zachowaj obecny system plik¢w (bez zmian) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s Dysk 02 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, - " %c%c Type %lu %I64u %s"}, + " %c%c 03Typ %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "na %I64u %s Dysku Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "na %I64u %s Dysku 05 Twardym %lu (Port=%hu, Szyna=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "Dysk Twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, - "%c%c Type %lu %I64u %s"}, + "%c%c 07Typ %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "na Dysku Twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, - "%c%c Type %-3u %6lu %s"}, + "%c%c 09Typ %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s Dysk Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s Dysk11 Twardy %lu (Port=%hu, Szyna=%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "Instalator utworzy now¥ partycj©"}, {STRING_UNPSPACE, - " Unpartitioned space %6lu %s"}, + " Miejsce poza partycjami %6lu %s"}, {0, 0} }; Modified: trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/de… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/de-DE.rc Tue Feb 19 01:19:07 2008 @@ -1,3 +1,8 @@ +/* + * translated by EmuandCo - Daniel Reimer (Feb, 2008) + * reimer.daniel(a)freenet.de + */ + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_POPUP_APP MENU Added: trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/pl… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc (added) +++ trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc Tue Feb 19 01:19:07 2008 @@ -1,0 +1,207 @@ +/* + * translated by Caemyr - Olaf Siejka (Feb, 2008) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl; + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + + +IDR_POPUP_APP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Usuñ", ID_APP_REMOVE + MENUITEM "&Zmieñ", ID_APP_MODIFY, GRAYED + END +END + +IDD_NETINSTALL DIALOGEX 0, 0, 242, 221 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Instalacja sieciowa" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "&Instaluj...", IDC_INSTALL, 150, 171, 85, 14 + LTEXT "&ReactOS mo¿e zainstalowaæ nastêpuj¹ce oprogramowanie automagicznie. Aby zainstalowaæ dany program, wybierz go na licie i nacinij Instaluj.", IDC_NETTEXT, 40, 6, 195, 32 + LISTBOX IDC_NETPROGLIST, 7, 42, 228, 125, LBS_STANDARD | WS_TABSTOP + ICON IDI_APPICO, IDC_NETICON, 9, 10, 20, 20 +END + +IDD_CREATESHORTCUT DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Utwórz skrót" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Ta aplikacja pomo¿e ci utworzyæ skrót do programów, plików, katalogów - zarówno lokalnych jak i sieciowych, a tak¿e komputerów czy adresów internetowych.", -1, 97, 7, 195, 28 + LTEXT "&Podaj lokalizacjê:", IDC_LOCATIONITEM, 98, 46, 196, 8 + EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&rzegl¹daj...", IDC_LOCBROWSE, 233, 58, 60, 14 + LTEXT "Nacinij Dalej aby kontynuowaæ.", -1, 97, 95, 198, 8 +END + +IDD_SELPROGFOLDER DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Wybierz katalog" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wybierz katalog, w którym ma byæ umieszczony skrót:", -1, 100, 7, 193, 10 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000028, 100, 19, 193, 90 + PUSHBUTTON "Nowy &Katalog...", IDC_NEWFOLDERBTN, 218, 116, 75, 14 + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Wybierz nazwê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wpisz nazwê dla skrótu:", -1, 100, 10, 194, 10 + EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Nacinij Zakoñcz by utworzyæ skrót.", -1, 100, 61, 194, 8 +END + +IDD_SELPROGICON DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Wybierz ikonê" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Wybierz ikonê dla skrótu:", -1, 100, 8, 195, 10 + LISTBOX IDC_SELICONLIST, 100, 20, 192, 130, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT +END + +IDD_INSTFROMCD DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Instaluj Program Z Dyskietki lub CD-ROMu" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 7, 193, 28 + ICON 0, IDC_INSTFROMCDICON, 100, 60, 18, 20 + LTEXT "", IDC_INSTFROMCDTEXT, 123, 66, 146, 8 +END + +IDD_RUNINSTPROG DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Uruchom Program Instalacyjny" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "", IDC_HEADTEXT, 101, 6, 195, 28 + LTEXT "&Otwórz:", IDC_LOCATIONITEM, 100, 53, 195, 8 + EDITTEXT IDC_LOCITEMEDIT, 98, 64, 133, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&rzegl¹daj...", IDC_LOCBROWSE, 234, 64, 60, 14 +END + +IDD_CHANGEUSEROPT DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Zmieñ opcje u¿ytkownika" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Mo¿esz udostêpniæ ten nowy program dla wszystkich u¿ytkowników.", 1012, 101, 5, 194, 40 + AUTORADIOBUTTON "Instaluj", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Wykonaj", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP +END + +IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Zakoñczenie Instalacji W Trybie Administratora" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Zmieñ mapowani ini klikaj¹c w Zakoñcz.", IDC_HEADTEXT, 98, 7, 196, 40 +END + +IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Po Instalacji" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT + LTEXT "Proszê nacisn¹æ Dalej.", IDC_HEADTEXT, 98, 7, 197, 40 +END + +IDD_RUNINSTPROG2 DIALOG 0, 0, 250, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Uruchom Program Instalacyjny" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Proszê wskazaæ lokalizacjê programu dezinstalacyjnego.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Linia polecenia dla programu dezinstalacyjnego:", IDC_LOCATIONITEM, 9, 57, 237, 8 + EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL + PUSHBUTTON "P&rzegl¹daj...", IDC_LOCBROWSE, 178, 69, 66, 14 + DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 184, 100, 60, 14 +END + +IDD_WARNING DIALOG 20, 20, 255, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ostrze¿enie" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WARNINGICON, 8, 10, 20, 20 + LTEXT "W tej chwili s¹ zalogowani inni u¿ytkownicy na tym komputerze.", -1, 37, 8, 214, 10 + LTEXT "Jeli odinstalujesz ten program, podczas gdy inni u¿ytkownicy bêd¹ z niego korzystaæ, dezinstalacja mo¿e nie byæ kompletna.", -1, 37, 23, 212, 22 + LTEXT "Aby poprawnie zmieniæ b¹d usun¹æ program, upewnij siê, ¿e wszyscy u¿ytkownicy s¹ wylogowani.", IDC_WARNINGTEXT, 37, 46, 212, 26 + PUSHBUTTON "&Zmieñ u¿ytkownika", IDC_SWITCHUSER, 61, 81, 60, 14 + PUSHBUTTON "&Kontynuuj", IDOK, 125, 81, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 189, 81, 60, 14 +END + +IDD_REMSHORTCUTS DIALOGEX 20, 20, 220, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Usuñ Skróty/Katalogi" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Aby usun¹æ element z menu Start, wybierz go na licie i nacinij usuñ.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 + PUSHBUTTON "&Usuñ", IDC_REMOVEBTN, 84, 182, 60, 14 + DEFPUSHBUTTON "Zamknij", IDOK, 151, 182, 60, 14 +END + +IDD_ADDLATER DIALOGEX 0, 0, 220, 160 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTERMOUSE | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Dodaj póniej" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Mo¿esz wybraæ datê i czas, kiedy dok³adnie chcesz zainstalowaæ dany program. Mo¿esz, na przyk³ad ustawiæ by sta³o siê to gdy nie bêdziesz na nim pracowaæ.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Dodaj program póniej ", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 + AUTORADIOBUTTON "&Nie dodawaj pogramu", IDC_NOTADDPROG, 7, 87, 208, 10 + DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP + PUSHBUTTON "Anuluj", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Dodaj lub Usuñ Programy" + IDS_CPLSYSTEMDESCRIPTION "Zainstaluj lub Usuñ programy i komponenty ReactOSa." + IDS_UNABLEOPEN_UNINSTKEY "Otwarcie klucza dezinstalacji nieudane" + IDS_LIST_TITLE "Lista" + IDS_SIZE_TITLE "Rozmiar (MB)" + IDS_LAST_USED "Ostatnio u¿yty" + IDS_PROGANDUPDATES "Programy i uaktualnienia" + IDS_PROGRAMS_ONLY "Tylko programy" + IDS_UPDATES_ONLY "Tylko uaktualnienia" + IDS_WELCOME_TITLE "Witamy w Dodaj lub Usuñ Programy" + IDS_WELCOME_MSG "Proszê wybraæ kategoriê po lewej albo program z listy by go usun¹æ lub obejrzeæ informacje o nim." + IDS_SEARCH_TEXT "Wyszukaj na licie..." + IDS_REMOVE_BTN "&Usuñ" + IDS_MODIFY_BTN "&Zmieñ" + IDS_UNABLEREAD_UNINSTSTR "Nie mo¿na odczytaæ UninstallString. Ta pozycja jest nieprawid³owa albo zosta³a utworzona za pomoc¹ instalatora MSI." + IDS_INF_REG_OWNER "Zarejestrowany W³aciciel: " + IDS_INF_PRODUCT_ID "ID Produktu: " + IDS_INF_PUBLISHER "Wydawca: " + IDS_INF_VERSION "Wersja: " + IDS_INF_CONTACT "Kontakt: " + IDS_INF_SUP_INFO "Informacje o wsparciu: " + IDS_INF_SUP_PHONE "Telefon do wsparcia: " + IDS_INF_PRODUCT_UPD "Uaktualnienia: " + IDS_INF_README "CzytajTo: " + IDS_INF_COMMENTS "Komentarze: " + IDS_NO_INFORMATION "Brak informacji o programie." +END Propchange: trunk/reactos/dll/cpl/appwiz-new/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/appwiz-new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/rsrc.rc… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/rsrc.rc (original) +++ trunk/reactos/dll/cpl/appwiz-new/rsrc.rc Tue Feb 19 01:19:07 2008 @@ -4,4 +4,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
46
Older →

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 February 2008