Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[gvg] 20176: Make property sheet fit in 640x480. Fixes bug 1099

by gvg＠svn.reactos.com

Make property sheet fit in 640x480. Fixes bug 1099 Modified: trunk/reactos/lib/cpl/intl/Ja.rc Modified: trunk/reactos/lib/cpl/intl/cz.rc Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/es.rc Modified: trunk/reactos/lib/cpl/intl/hu.rc Modified: trunk/reactos/lib/cpl/intl/nl.rc Modified: trunk/reactos/lib/cpl/intl/sv.rc _____ Modified: trunk/reactos/lib/cpl/intl/Ja.rc --- trunk/reactos/lib/cpl/intl/Ja.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/Ja.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -1,6 +1,6 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "æSö?" FONT 9, "MS UI Gothic" @@ -9,7 +9,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ÉöÆl" FONT 9, "MS UI Gothic" @@ -18,7 +18,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Æ?ë¦" FONT 9, "MS UI Gothic" @@ -27,7 +27,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Ä×ìÅ" FONT 9, "MS UI Gothic" @@ -43,15 +43,15 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "î?îÒé?ïLìå(&P):", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Ä×ìÅé?î`Ä«é?ò\\ïLû@\n\n\ h = Ä×èÈ m = ò¬ s = òb t = î?æOé?é¢é?î?îÒ\n\n\ h = 12 Ä×èÈ\nH = 24 Ä×èÈ\n\nhh, mm, ss = Éµô¬é?â[âìéáéÞ\n\ - h, m, s = Éµô¬é?â[âìé?éÁ", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + h, m, s = Éµô¬é?â[âìé?éÁ", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ô·òt" FONT 9, "MS UI Gothic" @@ -60,7 +60,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ô³ù?î¥îÛ" FONT 9, "MS UI Gothic" _____ Modified: trunk/reactos/lib/cpl/intl/cz.rc --- trunk/reactos/lib/cpl/intl/cz.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/cz.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -2,7 +2,7 @@ LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "ObecnÚ nastavenÝ" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "?Ýsla" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Mýna" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "?as" FONT 8, "MS Shell Dlg" @@ -45,16 +45,15 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Zkratka odpoledne:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Zßpis formßtu Þasu\n\n\ - h = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\n\ - h = 12-ti hodinov² cyklus\nH = 24-ti godinov² cyklus\n\n\ - hh, mm, ss = poÞßteÞnÝ nula\n\ - h, m, s = bez poÞßteÞnÝ nuly", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = hodina m = minuta s = vte°ina t = dop. nebo odp.\n\n\ +h = 12-ti hodinov² cyklus H = 24-ti godinov² cyklus\n\ +hh, mm, ss = poÞßteÞnÝ nula h, m, s = bez poÞßteÞnÝ nuly", -1, 13, 133, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -63,7 +62,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Jazyky" FONT 8, "MS Shell Dlg" _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Allgemein" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Zahlen" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Wõhrung" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Uhrzeit" FONT 8, "MS Shell Dlg" @@ -45,16 +45,15 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Zeitformat\n\n\ - h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n\ - h = 12 Stunden\nH = 24 Stunden\n\n\ - hh, mm, ss = f³hrende Null\n\ - h, m, s = keine f³hrende Null", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n\ +h = 12 Stunden H = 24 Stunden\n\ +hh, mm, ss = f³hrende Null h, m, s = keine f³hrende Null", -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -63,7 +62,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Regionale Einstellungen" FONT 8, "MS Shell Dlg" _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -2,7 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Numbers" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Currency" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Time" FONT 8, "MS Shell Dlg" @@ -45,15 +45,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Time format notation\n\n\ - h = hour m = minute s = second t = am or pm\n\nh = 12 hour\n\ - H = 24 hour\n\nhh, mm, ss = leading zero\n\ - h, m, s = no leading zero", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = hour m = minute s = second t = am or pm\n\n\ +h = 12 hour H = 24 hour\n\ +hh, mm, ss = leading zero h, m, s = no leading zero", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Date" FONT 8, "MS Shell Dlg" @@ -62,7 +63,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Input Locale" FONT 8, "MS Shell Dlg" _____ Modified: trunk/reactos/lib/cpl/intl/es.rc --- trunk/reactos/lib/cpl/intl/es.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/es.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -6,7 +6,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_SPANISH -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" FONT 8, "MS Shell Dlg" @@ -15,7 +15,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Numeros" FONT 8, "MS Shell Dlg" @@ -24,7 +24,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Moneda" FONT 8, "MS Shell Dlg" @@ -33,7 +33,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tiempo" FONT 8, "MS Shell Dlg" @@ -49,18 +49,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "SÝmbolo &PM:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Formato de Notaci¾n del Tiempo\n\n" - "h = hora m = minuto s = segundo t = am ¾ pm\n\n" - "h = 12 houras\n" - "H = 24 houras\n\n" - "hh, mm, ss = cero inicial\n" - "h, m, s = sin cero inicial", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + "h = hora m = minuto s = segundo t = am ¾ pm\n\n" + "h = 12 houras H = 24 houras\n" + "hh, mm, ss = cero inicial h, m, s = sin cero inicial", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Dia" FONT 8, "MS Shell Dlg" @@ -69,7 +67,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Localidad" FONT 8, "MS Shell Dlg" _____ Modified: trunk/reactos/lib/cpl/intl/hu.rc --- trunk/reactos/lib/cpl/intl/hu.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/hu.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -1,7 +1,7 @@ // Hungarian resource file by Peter Lukacs LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "?ltalßnos" FONT 8, "MS Shell Dlg" @@ -10,7 +10,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Szßmok" FONT 8, "MS Shell Dlg" @@ -19,7 +19,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "PÚnznem" FONT 8, "MS Shell Dlg" @@ -28,7 +28,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Id§" FONT 8, "MS Shell Dlg" @@ -44,18 +44,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&DÚlutßn jele:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 124, 228, 60, WS_VISIBLE LTEXT "Id§formßtum jel÷lÚse\n\n" "o = ¾ra p = perc m = mßsodperc n = de. vagy du.\n\n" - "o = 12 ¾rßs\n" - "O = 24 ¾rßs\n\n" - "oo, pp, mm = nulla hasznßlata\n" - "o, p, m = nincs nulla", - -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP + "o = 12 ¾rßs O = 24 ¾rßs\n" + "oo, pp, mm = nulla hasznßlata o, p, m = nincs nulla", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Dßtum" FONT 8, "MS Shell Dlg" @@ -64,7 +62,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hely megadßsa" FONT 8, "MS Shell Dlg" _____ Modified: trunk/reactos/lib/cpl/intl/nl.rc --- trunk/reactos/lib/cpl/intl/nl.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/nl.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -2,7 +2,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //Vertaald door Lionel Lowie -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Algemeen" FONT 8, "MS Shell Dlg" @@ -11,7 +11,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Getal" FONT 8, "MS Shell Dlg" @@ -20,7 +20,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Valuta" FONT 8, "MS Shell Dlg" @@ -29,7 +29,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tijd" FONT 8, "MS Shell Dlg" @@ -45,16 +45,16 @@ COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "&PM-symbool:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP - GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + GROUPBOX "", -1, 7, 132, 228, 60, WS_VISIBLE LTEXT "Tijdsnotatie\n\n\ - h = uur m = minuut s = second t = am or pm\n\n\ - h = 12 uur\nH = 24 uur\n\n\ - hh, mm, ss = voorgaande nul\n\ - h, m, s = zonder voorgaande nul", -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP +h = uur m = minuut s = second t = am or pm\n\n\ +h = 12 uur H = 24 uur\n\ +hh, mm, ss = voorgaande nul h, m, s = zonder voorgaande nul", + -1, 13, 133, 214, 47, WS_CHILD |WS_VISIBLE | WS_GROUP END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -63,7 +63,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Invoer" FONT 8, "MS Shell Dlg" _____ Modified: trunk/reactos/lib/cpl/intl/sv.rc --- trunk/reactos/lib/cpl/intl/sv.rc 2005-12-14 20:32:57 UTC (rev 20175) +++ trunk/reactos/lib/cpl/intl/sv.rc 2005-12-14 21:36:15 UTC (rev 20176) @@ -3,7 +3,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -IDD_GENERALPAGE DIALOGEX 0, 0, 246, 228 +IDD_GENERALPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Generellt" FONT 8, "MS Shell Dlg" @@ -12,7 +12,7 @@ END -IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 228 +IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tal" FONT 8, "MS Shell Dlg" @@ -21,7 +21,7 @@ END -IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 228 +IDD_CURRENCYPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Valuta" FONT 8, "MS Shell Dlg" @@ -30,7 +30,7 @@ END -IDD_TIMEPAGE DIALOGEX 0, 0, 246, 228 +IDD_TIMEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Tid" FONT 8, "MS Shell Dlg" @@ -39,7 +39,7 @@ END -IDD_DATEPAGE DIALOGEX 0, 0, 246, 228 +IDD_DATEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Datum" FONT 8, "MS Shell Dlg" @@ -48,7 +48,7 @@ END -IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 228 +IDD_LOCALEPAGE DIALOGEX 0, 0, 246, 188 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "InmatningssprÕk" FONT 8, "MS Shell Dlg"

18 years, 9 months

[gvg] 20175: Don't pop-up device installer screen.

by gvg＠svn.reactos.com

Don't pop-up device installer screen. Fixes bug 1026 Modified: branches/ros-branch-0_2_9/reactos/lib/newdev/newdev.c _____ Modified: branches/ros-branch-0_2_9/reactos/lib/newdev/newdev.c --- branches/ros-branch-0_2_9/reactos/lib/newdev/newdev.c 2005-12-14 19:51:53 UTC (rev 20174) +++ branches/ros-branch-0_2_9/reactos/lib/newdev/newdev.c 2005-12-14 20:32:57 UTC (rev 20175) @@ -1111,6 +1111,10 @@ if ((!FindDriver(&DevInstData)) && (Show != SW_HIDE)) { +#if 1 /* Yes, I know I'm creating dead code here, problem is that you'll get + warnings about unused variables/code if you just #ifdef the code */ + if (0) { +#endif /* Create the Welcome page */ ZeroMemory (&psp, sizeof(PROPSHEETPAGE)); psp.dwSize = sizeof(PROPSHEETPAGE); @@ -1163,6 +1167,14 @@ PropertySheet(&psh); DeleteObject(DevInstData.hTitleFont); +#if 1 + } + else + { + DPRINT1("No driver found for %S (%S), skipping installation screens\n", + DevInstData.buffer, InstanceId); + } +#endif } else

18 years, 9 months

[frik85] 20174: RosCMS update:

by frik85＠svn.reactos.com

RosCMS update: * website status page: add day counter and "date colors" Modified: trunk/web/reactos.org/htdocs/roscms/colors.php Added: trunk/web/reactos.org/htdocs/roscms/inc/tools.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/colors.php --- trunk/web/reactos.org/htdocs/roscms/colors.php 2005-12-14 19:49:09 UTC (rev 20173) +++ trunk/web/reactos.org/htdocs/roscms/colors.php 2005-12-14 19:51:53 UTC (rev 20174) @@ -23,5 +23,7 @@ $roscms_intern_color0="#5984C3"; // table head line $roscms_intern_color1="#E2E2E2"; // table color1 $roscms_intern_color2="#EEEEEE"; // table color2 + $roscms_intern_color_new="#339900"; // new content + $roscms_intern_color_old="#FF3300"; // new content ?> \ No newline at end of file _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/tools.php --- trunk/web/reactos.org/htdocs/roscms/inc/tools.php 2005-12-14 19:49:09 UTC (rev 20173) +++ trunk/web/reactos.org/htdocs/roscms/inc/tools.php 2005-12-14 19:51:53 UTC (rev 20174) @@ -0,0 +1,45 @@ +<?php + /* + RosCMS - ReactOS Content Management System + Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + + + function compareDate ($i_sFirstDate, $i_sSecondDate) + { + // Break the Date strings into seperate components + $arrFirstDate = explode ("-", $i_sFirstDate); + $arrSecondDate = explode ("-", $i_sSecondDate); + + $intFirstYear = $arrFirstDate[0]; + $intFirstMonth = $arrFirstDate[1]; + $intFirstDay = $arrFirstDate[2]; + + $intSecondYear = $arrSecondDate[0]; + $intSecondMonth = $arrSecondDate[1]; + $intSecondDay = $arrSecondDate[2]; + + + // Calculate the diference of the two dates and return the number of days + $intDate1Jul = gregoriantojd($intFirstMonth, $intFirstDay, $intFirstYear); + $intDate2Jul = gregoriantojd($intSecondMonth, $intSecondDay, $intSecondYear); +// echo "|".$intDate1Jul."|".$intDate2Jul."|"; + return $intDate1Jul - $intDate2Jul; + + } // end Compare Date + +?> \ No newline at end of file Property changes on: trunk/web/reactos.org/htdocs/roscms/inc/tools.php ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/website_status.php --- trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-14 19:49:09 UTC (rev 20173) +++ trunk/web/reactos.org/htdocs/roscms/inc/website_status.php 2005-12-14 19:51:53 UTC (rev 20174) @@ -31,15 +31,22 @@ include('securitylog.php'); // open security log die("Hacking attempt"); } + +include("inc/tools.php"); + ?> <h1><a href="http://www.reactos.org/?page=dev">ReactOS Development</a> > Website Status</h1> <h2>Website Status</h2> +<ul> + <li><a href="#sec1">Website Content Updates</a></li> + <li><a href="#sec2">Website Translation Status</a></li> +</ul> +<a name="sec1"></a> <h3>Website Content Updates</h3> <table cellpadding="1" cellspacing="1"> <tr bgcolor="#5984C3"> <td width="200"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Title</strong></font></div></td> - <td width="250"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> <td width="200"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Name</strong></font></div></td> <td width="150"> <div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> @@ -53,7 +60,7 @@ AND `content_visible` = 1 AND `content_type` = 'default' ORDER BY `content_id` DESC - LIMIT 0 , 15 ;") ; + LIMIT 0 , 20 ;") ; $color=""; $color1=$roscms_intern_color1; $color2=$roscms_intern_color2; @@ -107,17 +114,6 @@ } ?> </font></td> - <td valign="middle" bgcolor="<?php echo $color; ?>"><font face="Arial, Helvetica, sans-serif" size="2"> - <?php - - if ($result_count_title[0] == "0" || $result_count_title[0] == "") { - // temp - } - else { - echo substr($result_lang_page_name_update['page_description'], 0, 40); - } - ?> - </font></td> <td valign="middle" bgcolor="<?php echo $color; ?>"><font face="Arial, Helvetica, sans-serif" size="2"><b> <?php @@ -139,8 +135,13 @@ echo $result_lang_name_update['lang_name']; ?> </font></div></td> - <td valign="middle" bgcolor="<?php echo $color; ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"> - <?php + <td valign="middle" bgcolor="<?php echo $color; ?>" title="<?php + + $accountinfo_query = @mysql_query("SELECT user_name, user_id FROM users WHERE user_id = '".$result_updates['content_usrname_id']."'") or die('DB error (website status page)!'); + $accountinfo_result = @mysql_fetch_array($accountinfo_query); + echo $accountinfo_result['user_name']." (".$result_updates['content_usrname_id'].")"; + + ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"><?php echo "<b>".$result_updates['content_date'].' '.$result_updates['content_time']."</b>"; ?> @@ -150,6 +151,7 @@ } // end while ?> </table> +<a name="sec2"></a> <h3>Website Translation Status</h3> <p>This page show the current website translation status.</p> <table cellpadding="1" cellspacing="1"> @@ -236,14 +238,35 @@ $link_current_line = true; } ?></font></td> - <td valign="middle" bgcolor="<?php echo $color; ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"><?php + <td valign="middle" bgcolor="<?php + + echo $color; + + ?>"><div align="center"><font face="Arial, Helvetica, sans-serif" size="2"><?php + if ($link_current_line == "true") { echo '<a href="../?page='.$result_page['content_name'].'&lang=en">'. $result_page['content_date'] .'</a>'; } else { echo $result_page['content_date']; } - ?></font></div></td> + + if (compareDate((date('Y')."-".date('m')."-".date('d')),$result_page['conte nt_date']) == 0) { + echo '<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td bgcolor="'.$roscms_intern_color_new.'"><div align="center"><strong><font color="#FFFFFF" size="2">'; + echo 'today'; + echo '</font></strong></div></td></tr></table>'; + } + elseif (compareDate((date('Y')."-".date('m')."-".date('d')),$result_page['conte nt_date']) <= 7) { + //echo '<br /><font color="'.$roscms_intern_color_new.'"><b>'.compareDate((date('Y')."-".dat e('m')."-".date('d')),$result_page['content_date']).' days</font>'; + echo '<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td bgcolor="'.$roscms_intern_color_new.'"><div align="center"><strong><font color="#FFFFFF" size="2">'; + echo compareDate((date('Y')."-".date('m')."-".date('d')),$result_page['conten t_date']).' days'; + echo '</font></strong></div></td></tr></table>'; + } + else { + echo "<br />".compareDate((date('Y')."-".date('m')."-".date('d')),$result_page['co ntent_date'])." days"; + } + ?> + </font></div></td> <?php $query_lang_name = mysql_query("SELECT * FROM `languages` @@ -277,6 +300,19 @@ else { echo $result_lang_item2['content_date']; } + + if (compareDate($result_page['content_date'],$result_lang_item2['content_da te']) <= 0) { + echo '<br /><font color="'.$roscms_intern_color_new.'">+ '.compareDate($result_lang_item2['content_date'],$result_page['content_d ate']).' days</font>'; + /*echo '<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td bgcolor="'.$roscms_intern_color_new.'"><div align="center"><strong><font color="#FFFFFF" size="2">'; + echo compareDate($result_lang_item2['content_date'],$result_page['content_dat e']).' days'; + echo '</font></strong></div></td></tr></table>';*/ + } + else { + echo '<br /><font color="'.$roscms_intern_color_old.'">- '.compareDate($result_page['content_date'],$result_lang_item2['content_d ate']).' days</font>'; + /*echo '<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td bgcolor="'.$roscms_intern_color_old.'"><div align="center"><strong><font color="#FFFFFF" size="2">'; + echo compareDate($result_page['content_date'],$result_lang_item2['content_dat e']).' days'; + echo '</font></strong></div></td></tr></table>';*/ + } } ?></font></div></td> <?php @@ -288,4 +324,4 @@ } // end while ?> </table> -<p>All entries that are marked with "done" are NOT by all means completely translated!</p> +<p> </p>

18 years, 9 months

[gvg] 20173: Tag Wine-0_9_3, clean up Wine-0_9_2

by gvg＠svn.reactos.com

Tag Wine-0_9_3, clean up Wine-0_9_2 Deleted: vendor/wine/dlls/avifil32/Wine-0_9_2/ Added: vendor/wine/dlls/avifil32/Wine-0_9_3/ Deleted: vendor/wine/dlls/cabinet/Wine-0_9_2/ Added: vendor/wine/dlls/cabinet/Wine-0_9_3/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9_2/ Added: vendor/wine/dlls/comctl32/Wine-0_9_3/ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_2/ Added: vendor/wine/dlls/commdlg/Wine-0_9_3/ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Bg.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Bg.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ca.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ca.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Cn.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Cn.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Cs.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Cs.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Da.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Da.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_De.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_De.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_En.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_En.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Es.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Es.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Fi.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Fi.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Fr.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Fr.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Hu.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Hu.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_It.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_It.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ja.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ja.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Nl.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Nl.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_No.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_No.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Pl.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Pl.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Pt.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Pt.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ru.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ru.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Si.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Si.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Sk.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Sk.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Sv.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Sv.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Uk.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Uk.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Wa.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Wa.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Zh.rc Added: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Zh.rc Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/printdlg.c Added: vendor/wine/dlls/commdlg/Wine-0_9_3/printdlg.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_2/ Added: vendor/wine/dlls/crypt32/Wine-0_9_3/ Deleted: vendor/wine/dlls/crypt32/Wine-0_9_3/Makefile.in Added: vendor/wine/dlls/crypt32/Wine-0_9_3/Makefile.in Deleted: vendor/wine/dlls/crypt32/Wine-0_9_3/cert.c Added: vendor/wine/dlls/crypt32/Wine-0_9_3/cert.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_3/crypt32.spec Added: vendor/wine/dlls/crypt32/Wine-0_9_3/crypt32.spec Deleted: vendor/wine/dlls/crypt32/Wine-0_9_3/crypt32_private.h Added: vendor/wine/dlls/crypt32/Wine-0_9_3/crypt32_private.h Deleted: vendor/wine/dlls/crypt32/Wine-0_9_3/encode.c Added: vendor/wine/dlls/crypt32/Wine-0_9_3/encode.c Deleted: vendor/wine/dlls/crypt32/Wine-0_9_3/main.c Added: vendor/wine/dlls/crypt32/Wine-0_9_3/main.c Added: vendor/wine/dlls/crypt32/Wine-0_9_3/oid.c Deleted: vendor/wine/dlls/dinput/Wine-0_9_2/ Added: vendor/wine/dlls/dinput/Wine-0_9_3/ Deleted: vendor/wine/dlls/dinput/Wine-0_9_3/device.c Added: vendor/wine/dlls/dinput/Wine-0_9_3/device.c Deleted: vendor/wine/dlls/dinput8/Wine-0_9_2/ Added: vendor/wine/dlls/dinput8/Wine-0_9_3/ Deleted: vendor/wine/dlls/dplay/Wine-0_9_2/ Added: vendor/wine/dlls/dplay/Wine-0_9_3/ Deleted: vendor/wine/dlls/dplayx/Wine-0_9_2/ Added: vendor/wine/dlls/dplayx/Wine-0_9_3/ Deleted: vendor/wine/dlls/dplayx/Wine-0_9_3/dplayx_messages.c Added: vendor/wine/dlls/dplayx/Wine-0_9_3/dplayx_messages.c Deleted: vendor/wine/dlls/dsound/Wine-0_9_2/ Added: vendor/wine/dlls/dsound/Wine-0_9_3/ Deleted: vendor/wine/dlls/icmp/Wine-0_9_2/ Added: vendor/wine/dlls/icmp/Wine-0_9_3/ Added: vendor/wine/dlls/imm32/Wine-0_9_3/ Deleted: vendor/wine/dlls/midimap/Wine-0_9_2/ Added: vendor/wine/dlls/midimap/Wine-0_9_3/ Deleted: vendor/wine/dlls/midimap/Wine-0_9_3/midimap.c Added: vendor/wine/dlls/midimap/Wine-0_9_3/midimap.c Deleted: vendor/wine/dlls/mpr/Wine-0_9_2/ Added: vendor/wine/dlls/mpr/Wine-0_9_3/ Deleted: vendor/wine/dlls/msi/Wine-0_9_2/ Added: vendor/wine/dlls/msi/Wine-0_9_3/ Deleted: vendor/wine/dlls/msi/Wine-0_9_3/dialog.c Added: vendor/wine/dlls/msi/Wine-0_9_3/dialog.c [truncated at 100 lines; 143 more skipped] _____ Copied: vendor/wine/dlls/avifil32/Wine-0_9_3 (from rev 20110, vendor/wine/dlls/avifil32/current) _____ Copied: vendor/wine/dlls/cabinet/Wine-0_9_3 (from rev 20110, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9_3 (from rev 20110, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-0_9_3 (from rev 20110, vendor/wine/dlls/commdlg/current) _____ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Bg.rc --- vendor/wine/dlls/commdlg/current/cdlg_Bg.rc 2005-12-12 20:15:23 UTC (rev 20110) +++ vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Bg.rc 2005-12-14 19:49:09 UTC (rev 20173) @@ -1,475 +0,0 @@ -/* - * Copyright 2005 Milko Krachounov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Ê¾Û ÞþÞ¸Ý¯ ´Þ°Õ°Õ õÓ ÝÕ ´Þ´Óý ÝÕ¨¯, ÓýÓ Óþ Ò¯ ´Þ´ÝÓ§. - * ?Û¯ ÞýÓ ´¯ßÙÕýÞ Ý Û¯Ú õÓ ÒÞ ¯´ÓÔÞ. - */ - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "??Ô¯Þ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&?ýÕ ÝÓ ¶ÓÚÙ:", 1090, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&?ÞÕÛ?¯ÞÞ:", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&ÊÞ´ ¶ÓÚÙ¯ÔÕ:", 1089, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ë±?¯Ú±?ÔÓ:", 1091, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "??Ô¯Þ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "??ýÕÝÞ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¤¯ý¯¨", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "ÐÓý¯ þÓ &¸Õ?ÕÝÕ", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ð·§ÓÝÞ ÛÓ?¯ ..." -FONT 8, "MS Shell Dlg" -{ - LTEXT "&?ýÕ ÝÓ ¶ÓÚÙ:", 1090, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&?ÞÕÛ?¯ÞÞ:", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&ÊÞ´ ¶ÓÚÙ¯ÔÕ:", 1089, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ë±?¯Ú±?ÔÓ:", 1091, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Ð·§ÓÝÞ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "??ýÕÝÞ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¤¯ý¯¨", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "ÐÓý¯ þÓ &¸Õ?ÕÝÕ", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "¤Õ¸Ó?" -FONT 8, "MS Shell Dlg" -{ - LTEXT "¤ÞÝ?Õ:", 1088, 6, 6, 40, 9 - LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "ðÓþ´Õ¸Ó?ÓÚ", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&?±Þ¸Û¯", rad1, 16, 45, 60, 12 - RADIOBUTTON "&?þßÓÝ¯?¯", rad2, 16, 60, 60, 12 - RADIOBUTTON "&Ð?ÓÝÞ÷Þ", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "ðÓþ´Õ¸Ó?ÓÚ", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "??ýÕÝÞ", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&?Ó±?¯ÚÛÞ", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "&??:", 1090, 60, 80, 30, 9 - LTEXT "&?¯:", 1091, 120, 80, 30, 9 - LTEXT "&?Ó¸Õ±?Ô¯:", 1092, 6, 100, 76, 9 - COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "¤Õ¸Ó? Ô·Ô &¶ÓÚÙ", chx1, 20, 100, 60, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "ÐÒ·±?ÕÝ¯", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?Ó±?¯ÚÛÞ ÝÓ ´Õ¸Ó?ÓÝÕ?¯" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "¤ÞÝ?Õ", grp1, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "¤ÞÝ?Õ ´¯ ´¯õ&ÓþßÞÓÝÕ", rad1, 16, 20, 80, 12 - LTEXT "[Ý ýÓ]", 1088, 35, 35, 120, 9 - RADIOBUTTON "?¾Ò &´ÞÝ?Õ", rad2, 16, 50, 80, 12 - COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&?Ó±?¯ÚÛÞ", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "?ÞÕÝ?Ó÷Þ ", grp2, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "¤¯&?Õ?", rad3, 50, 100, 40, 12 - RADIOBUTTON "¤ÕÚþÓ&µ", rad4, 50, 115, 40, 12 - ICON "LANDSCAP", stc10, 10, 95, 32, 32 - ICON "PORTRAIT", stc11, 10, 95, 32, 32 - GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "ðÓþ&ýÕ", 1089, 130, 95, 30, 9 - LTEXT "&?þ?¯¸ÝÞÛ", 1090, 130, 110, 30, 9 - COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÏÞ¶?" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&ÏÞ¶?:",stc1 ,6,3,40,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Ð?ÞÙ:",stc2 ,108,3,44,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "ðÓ&þýÕ:",stc3,179,3,30,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "??ýÕÝÞ",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "¤Þ&Ù¯µÞ", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¤¯ý¯¨" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP - GROUPBOX "?¶ÕÛ?Þ",grp1,6,72,84,34,WS_GROUP - CHECKBOX "&ÃÓ¸Õ?ÓÝ", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "¤¯õ&¸Õ?ÓÝ", chx2, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "&ÍÔ ?:", stc4 ,6,110,30,9 - COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "¤ÞýÕ",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "&?þß¾ÛÓ:",stc7 ,98,114,40,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 314, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÍÔ ?" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&?±Ý¯ÔÝÞ ÷ÔÕ?¯ÔÕ:", 1088, 4, 4, 140, 10 - LTEXT "&¤¯?ÕßÞ?ÕÙ±ÛÞ ÷ÔÕ?¯ÔÕ:", 1089, 4, 106, 140, 10 - LTEXT "ÍÔ ?|&¤Ù·?ÕÝ", 1090, 150, 151, 48, 10 - LTEXT "&ÎÕÔÕÝ¯:", 726 /*1094*/,261,126,32,10 - EDITTEXT 706, 295,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&ÃÕÙÕÝ¯:",727/*1095*/,261,140,32,10 - EDITTEXT 707, 295,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&ÐÞÝ³¯:",728 /*1096*/,261,154,32,10 - EDITTEXT 708, 295,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Ê¯Ý:" ,723 /*1091*/,197,126,42,10 - EDITTEXT 703, 241,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&?Ó±Þ?ÕÝ¯±?:" ,724 /*1092*/,197,140,42,10 - EDITTEXT 704, 241,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&?±ÔÕ?ÕÝ¯±?:" ,725 /*1093*/,197,154,42,10 - EDITTEXT 705, 241,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "??ýÕÝÞ", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "¤¯ý¯¨", pshHelp,100,166, 44, 14 - PUSHBUTTON "&?¯ßÓÔÞ ´¯?ÕßÞ?ÕÙ±ÛÞ ÷Ô ?", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&?´ÕõÕÙÞ ÷ÔÕ?¯ÔÕ >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¤",713,300,200,4,14 /* just a dummy: '¤' is like &¤ in "&¤Ù·?ÕÝ" */ -} - - -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 281, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ê·±ÕÝÕ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Ê·±Þ &þÓ:", -1, 4, 8, 42, 8 - EDITTEXT edt1, 47, 7, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&ÐÓý¯ ÷ÕÙÞ õ¾ýÞ", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Î¾Ô±?ÔÞ?ÕÙÕÝ ÕÒÞ±?·", chx2, 4, 42, 96, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "¤¯±¯ÛÓ", grp1, 107, 26, 98, 28 - CONTROL "?Ó&Ò¯Õ", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 - CONTROL "?Ó&õ¯Ù¾", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 158, 38, 40, 12 - - DEFPUSHBUTTON "&?ÓýÕÞ ±ÙÕõÔÓ¨", IDOK, 212, 5, 65, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "??ýÕÝÞ", IDCANCEL , 212, 23, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¤¯ý¯¨", pshHelp , 212, 45, 65, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 281, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÃÓý ÝÓ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Ê·±Þ &þÓ:", -1, 4, 9, 48, 8 - EDITTEXT edt1, 47, 7, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "ÃÓ&ý ÝÓ ±:", -1, 4, 26, 48, 8 - EDITTEXT edt2, 47, 24, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "&ÐÓý¯ ÷ÕÙÞ õ¾ýÞ", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Î¾Ô±?ÔÞ?ÕÙÕÝ ÕÒÞ±?·", chx2, 5, 62, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "&?ÓýÕÞ ±ÙÕõÔÓ¨", IDOK, 212, 4, 65, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "&ÃÓýÕÝÞ", psh1 , 212, 21, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "ÃÓýÕÝÞ &Ô±Þ¸ÛÞ", psh2 , 212, 38, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "??ý ÝÓ", IDCANCEL , 212, 55, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&¤¯ý¯¨", pshHelp , 212, 75, 65, 14, WS_GROUP | WS_TABSTOP -} - - -PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 321, 186 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "¤Õ¸Ó?" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 232,164, 48,14, WS_GROUP - PUSHBUTTON "&¤¯ý¯¨", pshHelp, 50, 161, 48,14, WS_GROUP - - GROUPBOX "¤ÞÝ?Õ", grp4, 8, 4, 305,84, WS_GROUP - CONTROL "¤Õ¸Ó? Ô·Ô &¶ÓÚÙ", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,217,70,74,12 - PUSHBUTTON "ÐÔ¯&Ú±?ÔÓ", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&?ýÕ:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Ð·±?¯ ÝÞÕ:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc12, 57, 36, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ÊÞ´:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc11, 57, 48, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "? ±?¯:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc14, 57, 60, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "?¯ýÕÝ?Ó:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc13, 57, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "?¯´Þ ", grp2, 172, 92, 141,64, WS_GROUP - LTEXT "?¯Ú &Û¯´Þ :",stc5,180,108,68,8 - ICON "", ico3, 174,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "¤¯õ&ÕµõÓÝÕ", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,252,130,57,12 - EDITTEXT edt3, 252,106, 32,12, WS_GROUP | ES_NUMBER - - GROUPBOX "ðÓþ´Õ¸Ó?ÓÚ", grp1, 8,92, 156,64, WS_GROUP - CONTROL "&?±Þ¸Û¯", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&Ð?ÓÝÞ÷Þ", rad3,"Button",BS_AUTORADIOBUTTON,16,122,48,12 - CONTROL "&?þßÓÝ¯?¯", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 86,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 130,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&¯?:", stc2, 64,124, 20,8 - RTEXT "&õ¯:", stc3, 112,124, 16,8 -} - -PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "?Ó±?¯ÚÛÞ ÝÓ ´Õ¸Ó?ÓÝÕ?¯" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "??ýÕÝÞ",IDCANCEL,232,156,48,14 -/* PUSHBUTTON "?ÕµÓ...", psh5, 284,156,48,14 */ - - GROUPBOX "¤ÞÝ?Õ", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "ÐÔ¯&Ú±?ÔÓ", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&?ýÕ:", stc6, 16, 20, 36,8 - COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Ð·±?¯ ÝÞÕ:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc12, 57, 36, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ÊÞ´:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc11, 57, 48, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "? ±?¯:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc14, 57, 60, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "?¯ýÕÝ?Ó:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "ÊÕÛ±?", stc13, 57, 72, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "iÓ?Þ ", grp2, 8, 92, 164,56, WS_GROUP - LTEXT "ðÓþ&ýÕ:", stc2, 16,108, 36, 8 - COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "&?þ?¯¸ÝÞÛ:", stc3, 16,128, 36, 8 - COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - - GROUPBOX "?ÞÕÝ?Ó÷Þ ", grp1, 180, 92, 100,56, WS_GROUP - ICON "", ico1, 195,112, 18,20, WS_GROUP - CONTROL "¤¯&?Õ?", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 - CONTROL "¤ÕÚþÓ&µ", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 -END - -PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "?Ó±?¯ÚÛÞ ÝÓ ±?ÓÝÞ÷Ó?Ó" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "iÓ?Þ ", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "ðÓþ&ýÕ:", stc2, 16, 112, 36, 8 - COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&?¯Ý?ÕÚÝÕ:", stc3, 16, 132, 36, 8 - COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "?ÞÕÝ?Ó÷Þ ", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "¤¯&?Õ?", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "¤ÕÚþÓ&µ", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "ðÓýÛÞ", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "&? ÔÓ:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&? ±ÝÓ:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&?¯ÝÓ:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "?&¯ÙÝÓ:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "&¤ÞÝ?Õ...", psh3, 184, 220, 48, 14 -END - -NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "??Ô¯Þ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?& ±?¯:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY - COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - - LTEXT "&?ýÕ ÝÓ ¶ÓÚÙ:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY - EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - - LTEXT "&ÊÞ´ ¶ÓÚÙ¯ÔÕ:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "ÐÓý¯ þÓ &¸ Õ?ÕÝÕ",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - - DEFPUSHBUTTON "&??Ô¯Þ", IDOK,222,110,50,14 - PUSHBUTTON "??ýÕÝÞ", IDCANCEL,222,128,50,14 - PUSHBUTTON "&¤¯ý¯¨", pshHelp,222,145,50,14 -} - -STRINGTABLE DISCARDABLE -{ - IDS_ABOUTBOX "&??Ý¯±Ý¯ FolderPicker ?Õ±?Ó" - IDS_DOCUMENTFOLDERS "¤Ó´ÛÞ ± õ¯Û¾ýÕÝ?Þ" - IDS_PERSONAL "?¯Þ?Õ õ¯Û¾ýÕÝ?Þ" - IDS_FAVORITES "??ýÕ?ÛÞ" - IDS_PATH "ÐÞ±?ÕýÕÝ ´·?" - IDS_DESKTOP "ðÓß¯?ÕÝ ´Ù¯?" - IDS_FONTS "ÏÞ¶?¯ÔÕ" - IDS_MYCOMPUTER "?¯ Û¯ý´??·" -} - -STRINGTABLE DISCARDABLE -{ - IDS_SYSTEMFOLDERS "ÐÞ±?ÕýÝÞ ´Ó´ÛÞ" - IDS_LOCALHARDRIVES "?¯ÛÓÙÝÞ ¾±?¯Ú±?ÔÓ" - IDS_FILENOTFOUND "ÈÓÚÙ·? ÝÕ Õ ÝÓýÕÕÝ" - IDS_VERIFYFILE "¤¯ÔÕÕ?Õ õÓÙÞ ±?Õ Ô·ÔÕÙÞ ´ÓÔÞÙÝ¯ ÞýÕ?¯ ÝÓ ¶ÓÚÙÓ" - IDS_CREATEFILE "ÈÓÚÙ·? ÝÕ ±·¨Õ±?Ô¾ÔÓ.\n?±ÛÓ?Õ ÙÞ õÓ Ò¯ ±·þõÓõÕ?Õ?" - IDS_OVERWRITEFILE "ÈÓÚÙ·? ÔÕ¸Õ ±·¨Õ±?Ô¾ÔÓ.\n?±ÛÓ?Õ ÙÞ õÓ Ò¯ þÓýÕÝÞ?Õ?" - IDS_INVALID_FILENAME_TITLE "?ÕÔÓÙÞõÝÞ þÝÓ÷Þ Ô ´·? " - IDS_INVALID_FILENAME "?ýÕ?¯ ÝÓ ¶ÓÚÙÓ ÝÕ ý¯µÕ õÓ ±·õ·µÓ ±ÙÕõÝÞ?Õ ±ÞýÔ¯ÙÞ: \n / : < > |" - IDS_PATHNOTEXISTING "¤·? ? ÝÕ ±·¨Õ±?Ô¾ÔÓ" - IDS_FILENOTEXISTING "ÈÓÚÙ·? ÝÕ ±·¨Õ±?Ô¾ÔÓ" -} - -STRINGTABLE DISCARDABLE -{ - IDS_UPFOLDER "?õÝ¯ ÝÞÔ¯ ÝÓÒ¯Õ" - IDS_NEWFOLDER "Ð·þõÓÚ Ý¯ÔÓ ´Ó´ÛÓ" - IDS_LISTVIEW "Ð´Þ±·Û" - IDS_REPORTVIEW "¤¯õ¯ßÝ¯±?Þ" - IDS_TODESKTOP "¤ÕýÞÝÞ Û·ý Óß¯?ÝÞ ´Ù¯?" -} - -STRINGTABLE DISCARDABLE -{ - PD32_PRINT_TITLE "¤Õ¸Ó?" - - PD32_VALUE_UREADABLE "?Õ¸Õ?Þý ÕÙÕýÕÝ?" - PD32_INVALID_PAGE_RANGE "?ÕÔÓÙÞõÕÝ Ý¯ýÕ ÝÓ ±?ÓÝÞ÷Ó.\n\ -?þ´¯ÙþÔÓÚ?Õ ±?¯ÚÝ¯±?Þ ýÕµõ¾ %d Þ %d." - PD32_FROM_NOT_ABOVE_TO "Ð?¯ÚÝ¯±??Ó '¯?' ÝÕ ý¯µÕ õÓ Õ ´¯-Ò¯Ù ýÓ ¯? \ -±?¯ÚÝ¯±??Ó 'õ¯'." - PD32_MARGINS_OVERLAP "?ÓÝÞ÷Þ?Õ ±Õ ´Õ´¯ÛÞÔÓ? ÞÙÞ ÞþÙÞþÓ? ÞþÔ·Ý \ -ÛÓ ÝÓ ±?ÓÝÞ÷Ó?Ó.\n?¯ÞÒÞÓÚ?Õ ÒÞ." - PD32_NR_OF_COPIES_EMPTY "Ê ßÔÓ õÓ Ô·ÔÕõÕ?Õ ß¯Ú Û¯´Þ , Û¯Þ?¯ \ -õÓ ß·õÓ? ¯?´Õ¸Ó?ÓÝÞ." - PD32_TOO_LARGE_COPIES "?·ÔÕÙÞ ±?Õ ´¯-Ò¯Ù ý ß¯Ú Û¯´Þ , ¯?Û¯ÙÛ¯?¯ \ -ÔÓ°Þ ? ´ÞÝ?Õ ´¯õõ·µÓ.\n?·ÔÕõÕ?Õ ¸Þ±Ù¯ ýÕµõ¾ 1 Þ %d." - PD32_PRINT_ERROR "¤¯ ÔÞ ±Õ ÒÕ°ÛÓ ´Þ ´Õ¸ Ó?ÓÝÕ?¯." - PD32_NO_DEFAULT_PRINTER "?Õ Õ þÓõÓõÕÝ ´ÞÝ?Õ ´¯ ´¯õÓþßÞÓÝÕ." - PD32_CANT_FIND_PRINTER "¤ÞÝ?Õ·? ÝÕ ý¯µÕ õÓ ß·õÕ ÝÓýÕÕÝ." - PD32_OUT_OF_MEMORY "?Õõ¯±?ÞÒ ÝÓ ´ÓýÕ?." - PD32_GENERIC_ERROR "¤¯ ÔÞ ±Õ ÒÕ°ÛÓ." - PD32_DRIVER_UNKNOWN "?Õ´¯þÝÓ? õÓÚÔÕ þÓ ´ÞÝ?Õ Ó." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." - - PD32_DEFAULT_PRINTER "¤ÞÝ?Õ ´¯ ´¯õÓþßÞÓÝÕ; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "?ýÓ %d õ¯Û¾ýÕÝ?Ó Ô ¯´Ó°ÛÓ?Ó" - PD32_MARGINS_IN_INCHES "?ÓÝÞ÷Þ [ÞÝ¸¯ÔÕ]" - PD32_MARGINS_IN_MILIMETERS "?ÓÝÞ÷Þ [ýý]" - PD32_MILIMETERS "ýý" - - PD32_PRINTER_STATUS_READY "?¯?¯Ô¯" - PD32_PRINTER_STATUS_PAUSED "¤Õ¾±?ÓÝ¯ÔÕÝ¯; " - PD32_PRINTER_STATUS_ERROR "?Õ°ÛÓ; " - PD32_PRINTER_STATUS_PENDING_DELETION "¤Õõ±?¯ ¨¯ Þþ?ÞÔÓÝÕ; " - PD32_PRINTER_STATUS_PAPER_JAM "ÃÓõ·±?ÔÓÝÕ ÝÓ §Ó?Þ ?Ó; " - PD32_PRINTER_STATUS_PAPER_OUT "? ýÓ §Ó?Þ ; " - PD32_PRINTER_STATUS_MANUAL_FEED "¤¯±?ÓÔÕ?Õ §Ó?Þ ·¸Ý¯; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "¤¯ßÙÕý ± §Ó?Þ ?Ó; " - PD32_PRINTER_STATUS_OFFLINE "¤ÞÝ?ÕÓ ÞþÛÙ?¸ÕÝ; " - PD32_PRINTER_STATUS_IO_ACTIVE "?§¯õ/?þ§¯õ ÓÛ?ÞÔÕÝ; " - PD32_PRINTER_STATUS_BUSY "ÃÓÕ?; " - PD32_PRINTER_STATUS_PRINTING "¤Õ¸Ó?Þ; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "?þ§¯õÝÞ Û¯Ý?ÕÚÝÕ Õ ´·ÙÕÝ; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "?Õ Õ ÝÓÙÞ¸ÕÝ; " - PD32_PRINTER_STATUS_WAITING "?þ¸ÓÛÔÓÝÕ; " - PD32_PRINTER_STATUS_PROCESSING "?ßÓß¯?ÛÓ; " - PD32_PRINTER_STATUS_INITIALIZING "¤¯õÒ¯?¯ÔÛÓ; " - PD32_PRINTER_STATUS_WARMING_UP "ÃÓÒ ÔÓÝÕ; " - PD32_PRINTER_STATUS_TONER_LOW "Ê¯ÝÕÓ ÝÓ ´ÞÔ·°ÔÓÝÕ; " - PD32_PRINTER_STATUS_NO_TONER "? ýÓ ?¯ÝÕ; " - PD32_PRINTER_STATUS_PAGE_PUNT "¤¯õÓÔÓÝÕ ÝÓ §Ó?Þ ?Ó; " - PD32_PRINTER_STATUS_USER_INTERVENTION "¤ÕÛ·±ÝÓ?¯ ¯? ´¯?ÕßÞ?ÕÙ ; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "?Õõ¯±?ÞÒ ÝÓ ´ÓýÕ?; " - PD32_PRINTER_STATUS_DOOR_OPEN "?Ó´ÓÛÓ ÝÓ ´ÞÝ?ÕÓ Õ ¯?Ô¯ ÕÝ; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "?ÕÞþÔÕ±?ÕÝ ´ÞÝ?Õ ±·Ô·; " - PD32_PRINTER_STATUS_POWER_SAVE "ðÕµÞý ÝÓ ´Õ±?ÕÝÕ ÝÓ ÕÝÕÒÞ ; " -} - -STRINGTABLE DISCARDABLE /* Color names */ -{ - IDS_COLOR_BLACK "ÎÕÝ¯" - IDS_COLOR_MAROON "ÏÓ?ÕÝ" /* Maroon? ÎÕÔÕÝÞÛÓÔ¯ ÛÓ¶ Ô? */ - IDS_COLOR_GREEN "ÃÕÙÕÝ" - IDS_COLOR_OLIVE "?Ó±ÙÞÝÕÝ" - IDS_COLOR_NAVY "Ê·ýÝ¯±ÞÝ" - IDS_COLOR_PURPLE "?¯ÓÔ" - IDS_COLOR_TEAL "ÐÞÝ³¯þÕÙÕÝ" - IDS_COLOR_GRAY "ÐÞÔ" - IDS_COLOR_SILVER "ÐÕß·ÕÝ" - IDS_COLOR_RED "ÎÕÔÕÝ" - IDS_COLOR_LIME "ã·Ù?¯þÕÙÕÝ" /* ? § Ò¯ Û·±?ÞÙ ?Þý¯ÝÕÝ, Ý¯ ýÞ ¾ßÞ§Ó õÕ?±ÛÞ?Õ ýÕ¸?Þ, ÙÞý¯ÝÓ ÝÕ ßÞÙ µ·Ù?¯þÕÙÕÝ */ - IDS_COLOR_YELLOW "ã·Ù?" - IDS_COLOR_BLUE "ÐÞÝ" - IDS_COLOR_FUCHSIA "¤¾´¾ÕÝ" /* ?Ó§'ýÓÓý¾ */ - IDS_COLOR_AQUA "?ÛÔÓýÓÞÝ" /* ÃÕÙÕÝ¯±ÞÝ */ - IDS_COLOR_WHITE "? Ù¯" -} - -STRINGTABLE DISCARDABLE -{ - IDS_FONT_SIZE "?þßÕÕ?Õ ÓþýÕ ÝÓ °Þ¶?Ó ýÕµõ¾ %d Þ %d ´¾ÝÛ?Ó." - IDS_SAVE_BUTTON "&Ð·§ÓÝÞ" - IDS_SAVE_IN "Ð·§ÓÝÞ &Ô:" - IDS_SAVE "Ð·§ÓÝÞ" - IDS_SAVE_AS "Ð·§ÓÝÞ ÛÓ?¯" - IDS_OPEN_FILE "??Ô¯Þ ¶ÓÚÙ" -} _____ Copied: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Bg.rc (from rev 20113, vendor/wine/dlls/commdlg/current/cdlg_Bg.rc) _____ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ca.rc --- vendor/wine/dlls/commdlg/current/cdlg_Ca.rc 2005-12-12 20:15:23 UTC (rev 20110) +++ vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ca.rc 2005-12-14 19:49:09 UTC (rev 20173) @@ -1,218 +0,0 @@ -/* - * Copyright 1998 Marc Huguet Puig - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. - */ - -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT - -OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Obrir" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Nom:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Directoris:", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Tipus de fitxers:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Unitats:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "NomÚs &lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Anomenar i desar..." -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Nom:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "&Directoris:", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "Desar fitxer en f&ormat:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "&Unitats:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Fer-ne c?pia", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Impressi¾" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Impressora:", 1088, 6, 6, 40, 9 - LTEXT "Impressi¾ del document", 1089, 60, 6, 150, 9 - GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "&Sencer", 1056, 16, 45, 60, 12 - RADIOBUTTON "&Part seleccionada", 1057, 16, 60, 60, 12 - RADIOBUTTON "PÓ&gines", 1058, 16, 75, 60, 12 - DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Configuraci¾", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "P&rimera:", 1090, 60, 80, 30, 9 - LTEXT "?&ltima:", 1091, 120, 80, 30, 9 - LTEXT "&Qualitat:", 1092, 6, 100, 76, 9 - COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "Imprimir en un &fitxer", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "S&eparar les c?pies", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configuraci¾ de la impressi¾" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "Impressora:", 1072, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "Impressora per &defecte", 1056, 16, 20, 80, 12 - LTEXT "[none]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Impressora &especificada:", 1057, 16, 50, 80, 12 - COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Opcions", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientaci¾", 1073, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12 - RADIOBUTTON "&Horitzontal", 1059, 50, 115, 40, 12 - ICON "LANDSCAP", 1097, 10, 95, 32, 32 - ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "&Mida", 1089, 130, 95, 30, 9 - LTEXT "A&limentaci¾:", 1090, 130, 110, 30, 9 - COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Tipus de lletra" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Tipus de lletra:",1088 ,6,3,40,9 - COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Estil del tipus de lletra:",1089 ,108,3,44,9 - COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&GrandÓria:",1090,179,3,30,9 - COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "D'acord",IDOK,218,6,40,14,WS_GROUP - PUSHBUTTON "AnulÀlaci¾",IDCANCEL,218,23,40,14,WS_GROUP - PUSHBUTTON "A&plicar", 1026,218,40,40,14,WS_GROUP - PUSHBUTTON "A&juda" , 1038,218,57,40,14,WS_GROUP - GROUPBOX "Efectes",1072,6,72,84,34,WS_GROUP - CHECKBOX "&Barrar-lo", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Subratllar-lo", 1041, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "&Color:", 1091 ,6,110,30,9 - COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Exemple",grp2,98,72,120,36,WS_GROUP - CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Color" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Colors &bßsics:", 1088, 4, 4, 140, 10 - LTEXT "Colors person&alitzats:", 1089, 4, 106, 140, 10 - LTEXT "Color S?l&id", 1090, 150, 151, 48, 10 - LTEXT "&Roig:", 726 /*1094*/,249,126,24,10 - EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Verd:",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "Bla&u:",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Tint:" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Sat.:" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Llum.:" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "D'acord", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038,100,166, 44, 14 - PUSHBUTTON "Afegir als &colors personalitzats", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Definir colors personalitzats >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ -} - - -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Cerca" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Cercar:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "C&ercar mots sencers", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Distingir maj·scules de min·scules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Direcci¾", 1072, 107, 26, 68, 28 - CONTROL "&Amunt", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "A&vall", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Continuaci¾", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnulÀlaci¾", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Substituci¾" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Cercar:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&Substituir per:", 1090, -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Cercar &mots sencers", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "&Distingir maj·scules de min·scules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "C&ontinucaci¾", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "S&ubstituci¾", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Substituci¾ &automÓtica", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Tancar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "A&juda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP -} _____ Copied: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Ca.rc (from rev 20113, vendor/wine/dlls/commdlg/current/cdlg_Ca.rc) _____ Deleted: vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Cn.rc --- vendor/wine/dlls/commdlg/current/cdlg_Cn.rc 2005-12-12 20:15:23 UTC (rev 20110) +++ vendor/wine/dlls/commdlg/Wine-0_9_3/cdlg_Cn.rc 2005-12-14 19:49:09 UTC (rev 20173) @@ -1,446 +0,0 @@ -/* - * Copyright 2002 Tisheng Chen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. - */ - -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED - -OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "???¬" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?????¹(&N):", 1090, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "?????ð(&D):", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "?????Óð?(&T):", 1089, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Ã²Â»ã¸(&v):", 1091, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "???¬", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Í?Â?(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?Ý?µ?¬ ..." -FONT 8, "MS Shell Dlg" -{ - LTEXT "?????¹(&N):", 1090, 6, 6, 76, 9 - EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP - LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "????(&D):", -1, 110, 6, 92, 9 - LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP - LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP - LTEXT "?????Óð?(&T):", 1089, 6, 104, 90, 9 - COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - LTEXT "Ã²Â»ã¸(&v):", 1091, 110, 104, 92, 9 - COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "?ú?µ", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Í?Â?(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "??Ëí" -FONT 8, "MS Shell Dlg" -{ - LTEXT "??Ëí?·:", 1088, 6, 6, 40, 9 - LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "??ËíÀÂ?º", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "?½??(&A)", rad1, 16, 45, 60, 12 - RADIOBUTTON "ÐíÈ±Á?ÀÂ?º(&e)", rad2, 16, 60, 60, 12 - RADIOBUTTON "Ê??²(&G)", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "?ÀÂ¿", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?ÞÍ?(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - LTEXT "?Ë(&F):", 1090, 60, 80, 30, 9 - LTEXT "Á¢(&T):", 1091, 120, 80, 30, 9 - LTEXT "??ËíÍ???(&Q):", 1092, 6, 100, 76, 9 - COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "??ËíÁ¢????(&l):", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Condensed", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP -} - - -PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "??Ëí?ÞÍ?" -FONT 8, "MS Shell Dlg" -{ - GROUPBOX "??Ëí?·", grp1, 6, 10, 180, 65, BS_GROUPBOX - RADIOBUTTON "?¼?¤??Ëí?·(&D)", rad1, 16, 20, 80, 12 - LTEXT "[none]", 1088, 35, 35, 120, 9 - RADIOBUTTON "Í©Â¿Á???Ëí?·(&P)", rad2, 16, 50, 80, 12 - COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "?ÀÂ¿", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?ÞÍ?(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "À¢¤?(&O)", grp2, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "Î¦¤?(&P)", rad3, 50, 100, 40, 12 - RADIOBUTTON "?ß¤?(&L)", rad4, 50, 115, 40, 12 - ICON "LANDSCAP", stc10, 10, 95, 32, 32 - ICON "PORTRAIT", stc11, 10, 95, 32, 32 - GROUPBOX "Í¢i?", grp3, 120, 85, 180, 50, BS_GROUPBOX - LTEXT "Í¢i??¾ðí(&Z)", 1089, 130, 95, 30, 9 - LTEXT "Í¢i???È?(&S)", 1090, 130, 110, 30, 9 - COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÎÍ?Õ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "ÎÍ?Õ(&F):",1088 ,6,3,40,9 - COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "ÎÍ?ÕÐ¨?¢(&y):",1089 ,108,3,44,9 - COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "?¾ðí(&S):",1090,179,3,30,9 - COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "?ÀÂ¿",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "?í¤¹",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "ËªË?(&A)", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP - GROUPBOX "ðº?¹",1072,6,72,84,34,WS_GROUP - CHECKBOX "?¥?²¤?(&k)", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "¤??«¤?(&U)", chx2, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "Ði?½(&C):", 1091 ,6,110,30,9 - COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP - GROUPBOX "?¥?²",grp2,98,72,120,36,WS_GROUP - CTEXT "Íð??ÎÍ?ÕAaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7,98,114,80,9 - COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | - CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP -} - - -CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ði?½" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?¨?¥Ði?½(&B):", 1088, 4, 4, 140, 10 - LTEXT "ÎÈÂ¿ÍãÐi?½(&C):", 1089, 4, 106, 140, 10 - LTEXT "Ði?½|???½(&O)", 1090, 150, 151, 48, 10 - LTEXT "?ý(&R):", 726 /*1094*/,249,126,24,10 - EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "??(&G):",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?Â(&B):",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?½Á¸(&E):" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?Ñ??Â?(&S):" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "??Â?(&L)" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 - CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 - CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 - CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 - CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "?ÀÂ¿", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·", pshHelp,100,166, 44, 14 - PUSHBUTTON "?Ý?ËÁ¢ÎÈÂ¿ÍãÐi?½(&A)", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?µÂ¿ÎÈÂ¿ÊÕÐi?½(&D)>>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ -} - - -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?ÚiÊ" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?ÚiÊ(&n):", -1, 4, 8, 42, 8 - EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "?½ÎÍãÑ?õ(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Ã°ÀÍ?¾ðíð?(&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "À¢¤?", grp1, 107, 26, 68, 28 - CONTROL "¤??¤(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "¤?¤?(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - - DEFPUSHBUTTON "?ÚiÊ¤?Ê?©÷(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "?í¤¹", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP -} - - -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "?µ??" -FONT 8, "MS Shell Dlg" -{ - LTEXT "?ÚiÊ???¦(&n):", -1, 4, 9, 48, 8 - EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "?µ???¬(&p):", -1, 4, 26, 48, 8 - EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "?½ÎÍãÑ?õ(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Ã°ÀÍ?¾ðíð?(&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - - DEFPUSHBUTTON "?ÚiÊ¤?Ê?©÷(&F)", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "?µ??(&R)", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?½???µ??(&A)", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?í¤¹", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "?´Í·(&H)", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP -} - - -PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "??Ëí" -FONT 8, "MS Shell Dlg" -{ - DEFPUSHBUTTON "?ÀÂ¿", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON - PUSHBUTTON "?í¤¹", IDCANCEL, 232,164, 48,14, WS_GROUP - PUSHBUTTON "?´Í·(&H)", pshHelp, 50, 161, 48,14, WS_GROUP - - GROUPBOX "??Ëí?·", grp4, 8, 4, 272,84, WS_GROUP - CONTROL "??ËíÁ¢????(&l)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 - PUSHBUTTON "?¶ðÈ(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "?¹?ã(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Î??¼:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ð???:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "??Í?:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "?©Îó:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "À¦?²", grp2, 160, 92, 120,64, WS_GROUP - LTEXT "À¦?²(&C):",stc5,168,108,68,8 - ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 - EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER - - GROUPBOX "??ËíÀÂ?º", grp1, 8,92, 144,64, WS_GROUP - CONTROL "?½??(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "Ê??²(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "ÐíÈ±Á?ÀÂ?º(&S)", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 - EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER - EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "?Ë(&f):", stc2, 52,124, 20,8 - RTEXT "Á¢(&t):", stc3, 100,124, 16,8 -} - -PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | - DS_CONTEXTHELP | DS_3DLOOK -CAPTION "??Ëí?ÞÍ?" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "?ÀÂ¿",IDOK,180,156,48,14,WS_GROUP - PUSHBUTTON "?í¤¹",IDCANCEL,232,156,48,14 -/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - - GROUPBOX "??Ëí?·", grp4, 8, 4, 272,84, WS_GROUP - PUSHBUTTON "?¶ðÈ(&P)", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "?¹?ã(&N):", stc6, 16, 20, 36,8 - COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "Î??¼:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "ð???:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "??Í?:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "?©Îó:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - - GROUPBOX "Í¢i?", grp2, 8, 92, 164,56, WS_GROUP [truncated at 1000 lines; 74538 more skipped]

18 years, 9 months

[gvg] 20172: Update status

by gvg＠svn.reactos.com

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-12-14 19:45:16 UTC (rev 20171) +++ trunk/reactos/media/doc/README.WINE 2005-12-14 19:47:05 UTC (rev 20172) @@ -26,53 +26,55 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9_2 -reactos/tools/wpp # Synced to Wine-0_9_2 +reactos/tools/unicode # Synced to Wine-0_9_3 +reactos/tools/wpp # Synced to Wine-0_9_3 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9_2 -reactos/tools/wmc # Synced to Wine-0_9_2 -reactos/tools/wrc # Synced to Wine-0_9_2 +reactos/tools/winebuild # Synced to Wine-0_9_3 +reactos/tools/wmc # Synced to Wine-0_9_3 +reactos/tools/wrc # Synced to Wine-0_9_3 reactos/tools/widl # Forked at Wine-20050930 The following libraries are shared with Wine. -reactos/lib/avifil32 # Synced to Wine-0_9_2 -reactos/lib/cabinet # Synced to Wine-0_9_2 -reactos/lib/comctl32 # Synced to Wine-0_9_2 -reactos/lib/comdlg32 # Synced to Wine-0_9_2 -reactos/lib/crypt32 # Synced to Wine-0_9_2 +reactos/lib/avifil32 # Synced to Wine-0_9_3 +reactos/lib/cabinet # Synced to Wine-0_9_3 +reactos/lib/comctl32 # Synced to Wine-0_9_3 +reactos/lib/comdlg32 # Synced to Wine-0_9_3 +reactos/lib/crypt32 # Synced to Wine-0_9_3 reactos/lib/dbghelp # -reactos/lib/dinput # Synced to Wine-0_9_2 -reactos/lib/dinput8 # Synced to Wine-0_9_2 -reactos/lib/dplay # Synced to Wine-0_9_2 -reactos/lib/dplayx # Synced to Wine-0_9_2 -reactos/lib/icmp # Synced to Wine-0_9_2 +reactos/lib/dinput # Synced to Wine-0_9_3 +reactos/lib/dinput8 # Synced to Wine-0_9_3 +reactos/lib/dplay # Synced to Wine-0_9_3 +reactos/lib/dplayx # Synced to Wine-0_9_3 +reactos/lib/icmp # Synced to Wine-0_9_3 +reactos/lib/imm32 # Synced to Wine-0_9_3 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-0_9_2 +reactos/lib/mpr # Synced to Wine-0_9_3 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-0_9_2 -reactos/lib/msi # Synced to Wine-0_9_2 +reactos/lib/msimg32 # Synced to Wine-0_9_3 +reactos/lib/msi # Synced to Wine-0_9_3 reactos/lib/msvideo # Out of sync -reactos/lib/netapi32 # Synced to Wine-0_9_2 -reactos/lib/objsel # Synced to Wine-0_9_2 +reactos/lib/netapi32 # Synced to Wine-0_9_3 +reactos/lib/objsel # Synced to Wine-0_9_3 reactos/lib/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-0_9_2 -reactos/lib/oleaut32 # Synced to Wine-0_9_2 -reactos/lib/oledlg # Synced to Wine-0_9_2 -reactos/lib/olepro32 # Synced to Wine-0_9_2 -reactos/lib/riched20 # Synced to Wine-0_9_2 -reactos/lib/richedit # Synced to Wine-0_9_2 -reactos/lib/rpcrt4 # Synced to Wine-0_9_2 +reactos/lib/ole32 # Synced to Wine-0_9_3 +reactos/lib/oleacc # Synced to Wine-0_9_3 +reactos/lib/oleaut32 # Synced to Wine-0_9_3 +reactos/lib/oledlg # Synced to Wine-0_9_3 +reactos/lib/olepro32 # Synced to Wine-0_9_3 +reactos/lib/riched20 # Synced to Wine-0_9_3 +reactos/lib/richedit # Synced to Wine-0_9_3 +reactos/lib/rpcrt4 # Synced to Wine-0_9_3 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-0_9_2 -reactos/lib/shdocvw # Synced to Wine-0_9_2 -reactos/lib/shfolder # Synced to Wine-0_9_2 -reactos/lib/shlwapi # Synced to Wine-0_9_2 +reactos/lib/shell32 # Synced to Wine-0_9_3 +reactos/lib/shdocvw # Synced to Wine-0_9_3 +reactos/lib/shfolder # Synced to Wine-0_9_3 +reactos/lib/shlwapi # Synced to Wine-0_9_3 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-0_9_2 -reactos/lib/uxtheme # Synced to Wine-0_9_2 +reactos/lib/urlmon # Synced to Wine-0_9_3 +reactos/lib/uxtheme # Synced to Wine-0_9_3 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628 @@ -82,13 +84,12 @@ ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-0_9_2 +reactos/subsys/system/msiexec # Synced to Wine-0_9_3 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files check Wine current souces first as it may already be fixed. -reactos/lib/imm32 # reactos/lib/uuid # advapi32 -

18 years, 9 months

[greatlrd] 20171: delete a folder. that does not belong to trunk it was accented commited when I did resive a big patch from hu translations team. thx Brezenbak to notice it. and the translations have been move to right folder.

by greatlrd＠svn.reactos.com

delete a folder. that does not belong to trunk it was accented commited when I did resive a big patch from hu translations team. thx Brezenbak to notice it. and the translations have been move to right folder. Deleted: trunk/reactos/lib/shwlapi/

18 years, 9 months

[gvg] 20170: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Jacek Caban <jacek(a)codeweavers.com> - Return S_OK in [On|Can]InPlaceActivate. Handle IOleDocumentSite in QueryInterface. - Added IOleDocumentSite implementation. - Sync the WebBrowser's window size with document's window. - Sync window sizes. - Use sink in navigate_complete instead of ClientSite's IDispatch. - Added implementation of OLEIVERB_SHOW in DoVerb. - Activate document object. - Added IOleInPlaceActiveObject stub implementation. - Added GetOverrideKeyPath and GetOptionKeyPath implementation. - Added SetObjectRects implementation. - Better windows handling. - shdocvw: Added get_Document implementation. - Added implementation of IConnectionPoint::Advise and Unadvise. - Don't crash when parameters of Navigate2 are NULL. - Added implementation of GetWindowContext. Added stub implementation of IOleInPlaceFrame interface. Modified: trunk/reactos/include/wine/objidl.h Modified: trunk/reactos/lib/shdocvw/client.c Modified: trunk/reactos/lib/shdocvw/dochost.c Modified: trunk/reactos/lib/shdocvw/events.c Added: trunk/reactos/lib/shdocvw/frame.c Modified: trunk/reactos/lib/shdocvw/oleobject.c Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw.xml Modified: trunk/reactos/lib/shdocvw/webbrowser.c Modified: trunk/reactos/lib/uuid/uuid.c Modified: trunk/reactos/w32api/include/exdispid.h Added: trunk/reactos/w32api/include/hlink.h Modified: trunk/reactos/w32api/include/objidl.h Modified: trunk/reactos/w32api/include/oleidl.h _____ Modified: trunk/reactos/include/wine/objidl.h --- trunk/reactos/include/wine/objidl.h 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/include/wine/objidl.h 2005-12-14 19:42:38 UTC (rev 20170) @@ -94,10 +94,6 @@ unsigned long cbData; BYTE data[1]; } RemSTGMEDIUM; -typedef struct tagHLITEM { - ULONG uHLID; - LPWSTR pwzFriendlyName; -} HLITEM; typedef struct tagSTATDATA { FORMATETC formatetc; DWORD grfAdvf; @@ -430,7 +426,6 @@ EXTERN_C const FMTID FMTID_UserDefinedProperties; DECLARE_ENUMERATOR(FORMATETC); -DECLARE_ENUMERATOR(HLITEM); DECLARE_ENUMERATOR(STATDATA); DECLARE_ENUMERATOR(STATPROPSETSTG); DECLARE_ENUMERATOR(STATPROPSTG); _____ Modified: trunk/reactos/lib/shdocvw/client.c --- trunk/reactos/lib/shdocvw/client.c 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/lib/shdocvw/client.c 2005-12-14 19:42:38 UTC (rev 20170) @@ -47,6 +47,9 @@ }else if(IsEqualGUID(&IID_IDocHostUIHandler2, riid)) { TRACE("(%p)->(IID_IDocHostUIHandler2 %p)\n", This, ppv); *ppv = DOCHOSTUI2(This); + }else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) { + TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv); + *ppv = DOCSITE(This); } if(*ppv) { @@ -168,15 +171,21 @@ static HRESULT WINAPI InPlaceSite_CanInPlaceActivate(IOleInPlaceSite *iface) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* Nothing to do here */ + return S_OK; } static HRESULT WINAPI InPlaceSite_OnInPlaceActivate(IOleInPlaceSite *iface) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + /* Nothing to do here */ + return S_OK; } static HRESULT WINAPI InPlaceSite_OnUIActivate(IOleInPlaceSite *iface) @@ -191,9 +200,23 @@ LPRECT lprcClipRect, LPOLEINPLACEFRAMEINFO lpFrameInfo) { WebBrowser *This = INPLACESITE_THIS(iface); - FIXME("(%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, + + TRACE("(%p)->(%p %p %p %p %p)\n", This, ppFrame, ppDoc, lprcPosRect, lprcClipRect, lpFrameInfo); - return E_NOTIMPL; + + *ppFrame = INPLACEFRAME(This); + *ppDoc = NULL; + + GetClientRect(This->doc_view_hwnd, lprcPosRect); + memcpy(lprcClipRect, lprcPosRect, sizeof(RECT)); + + lpFrameInfo->cb = sizeof(*lpFrameInfo); + lpFrameInfo->fMDIApp = FALSE; + lpFrameInfo->hwndFrame = This->shell_embedding_hwnd; + lpFrameInfo->haccel = NULL; + lpFrameInfo->cAccelEntries = 0; /* FIXME: should be 5 */ + + return S_OK; } static HRESULT WINAPI InPlaceSite_Scroll(IOleInPlaceSite *iface, SIZE scrollExtent) @@ -259,8 +282,72 @@ InPlaceSite_OnPosRectChange }; +#define DOCSITE_THIS(iface) DEFINE_THIS(WebBrowser, OleDocumentSite, iface) + +static HRESULT WINAPI OleDocumentSite_QueryInterface(IOleDocumentSite *iface, + REFIID riid, void **ppv) +{ + WebBrowser *This = DOCSITE_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI OleDocumentSite_AddRef(IOleDocumentSite *iface) +{ + WebBrowser *This = DOCSITE_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); +} + +static ULONG WINAPI OleDocumentSite_Release(IOleDocumentSite *iface) +{ + WebBrowser *This = DOCSITE_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); +} + +static HRESULT WINAPI OleDocumentSite_ActivateMe(IOleDocumentSite *iface, + IOleDocumentView *pViewToActivate) +{ + WebBrowser *This = DOCSITE_THIS(iface); + IOleDocument *oledoc; + RECT rect; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, pViewToActivate); + + hres = IUnknown_QueryInterface(This->document, &IID_IOleDocument, (void**)&oledoc); + if(FAILED(hres)) + return hres; + + IOleDocument_CreateView(oledoc, INPLACESITE(This), NULL, 0, &This->view); + IOleDocument_Release(oledoc); + + GetClientRect(This->doc_view_hwnd, &rect); + IOleDocumentView_SetRect(This->view, &rect); + + hres = IOleDocumentView_Show(This->view, TRUE); + + return hres; +} + +#undef DOCSITE_THIS + +static const IOleDocumentSiteVtbl OleDocumentSiteVtbl = { + OleDocumentSite_QueryInterface, + OleDocumentSite_AddRef, + OleDocumentSite_Release, + OleDocumentSite_ActivateMe +}; + void WebBrowser_ClientSite_Init(WebBrowser *This) { This->lpOleClientSiteVtbl = &OleClientSiteVtbl; This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; + This->lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; + + This->view = NULL; } + +void WebBrowser_ClientSite_Destroy(WebBrowser *This) +{ + if(This->view) + IOleDocumentView_Release(This->view); +} _____ Modified: trunk/reactos/lib/shdocvw/dochost.c --- trunk/reactos/lib/shdocvw/dochost.c 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/lib/shdocvw/dochost.c 2005-12-14 19:42:38 UTC (rev 20170) @@ -18,9 +18,142 @@ #include "wine/debug.h" #include "shdocvw.h" +#include "hlink.h" +#include "exdispid.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +static ATOM doc_view_atom = 0; + +static void navigate_complete(WebBrowser *This) +{ + IDispatch *disp = NULL; + DISPPARAMS dispparams; + VARIANTARG params[2]; + VARIANT url; + HRESULT hres; + + hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + FIXME("Could not get IDispatch interface\n"); + + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = (VT_BYREF|VT_VARIANT); + V_BYREF(params) = &url; + + V_VT(params+1) = VT_DISPATCH; + V_DISPATCH(params+1) = disp; + + V_VT(&url) = VT_BSTR; + V_BSTR(&url) = This->url; + + call_sink(This->cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); + call_sink(This->cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + + if(disp) + IDispatch_Release(disp); +} + +static LRESULT navigate2(WebBrowser *This) +{ + IHlinkTarget *hlink; + HRESULT hres; + + TRACE("(%p)\n", This); + + if(!This->document) { + WARN("document == NULL\n"); + return 0; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); + if(FAILED(hres)) { + FIXME("Could not get IHlinkTarget interface\n"); + return 0; + } + + hres = IHlinkTarget_Navigate(hlink, 0, NULL); + IHlinkTarget_Release(hlink); + if(FAILED(hres)) { + FIXME("Navigate failed\n"); + return 0; + } + + navigate_complete(This); + + return 0; +} + +static LRESULT resize_document(WebBrowser *This, LONG width, LONG height) +{ + RECT rect = {0, 0, width, height}; + + TRACE("(%p)->(%ld %ld)\n", This, width, height); + + if(This->view) + IOleDocumentView_SetRect(This->view, &rect); + + return 0; +} + +static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + WebBrowser *This; + + static const WCHAR wszTHIS[] = {'T','H','I','S',0}; + + if(msg == WM_CREATE) { + This = *(WebBrowser**)lParam; + SetPropW(hwnd, wszTHIS, This); + }else { + This = GetPropW(hwnd, wszTHIS); + } + + switch(msg) { + case WM_SIZE: + return resize_document(This, LOWORD(lParam), HIWORD(lParam)); + case WB_WM_NAVIGATE2: + return navigate2(This); + } + + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +void create_doc_view_hwnd(WebBrowser *This) +{ + RECT rect; + + static const WCHAR wszShell_DocObject_View[] = + {'S','h','e','l','l',' ','D','o','c','O','b','j','e','c','t',' ','V','i','e','w',0}; + + if(!doc_view_atom) { + static WNDCLASSEXW wndclass = { + sizeof(wndclass), + CS_PARENTDC, + doc_view_proc, + 0, 0 /* native uses 4*/, NULL, NULL, NULL, + (HBRUSH)COLOR_WINDOWFRAME, NULL, + wszShell_DocObject_View, + NULL + }; + + wndclass.hInstance = shdocvw_hinstance; + + doc_view_atom = RegisterClassExW(&wndclass); + } + + GetWindowRect(This->shell_embedding_hwnd, &rect); + This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, + wszShell_DocObject_View, + WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, + rect.left, rect.top, rect.right, rect.bottom, This->shell_embedding_hwnd, + NULL, shdocvw_hinstance, This); +} + #define DOCHOSTUI_THIS(iface) DEFINE_THIS(WebBrowser, DocHostUIHandler, iface) static HRESULT WINAPI DocHostUIHandler_QueryInterface(IDocHostUIHandler2 *iface, @@ -143,8 +276,23 @@ LPOLESTR *pchKey, DWORD dw) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%p %ld)\n", This, pchKey, dw); - return E_NOTIMPL; + IDocHostUIHandler *handler; + HRESULT hres; + + TRACE("(%p)->(%p %ld)\n", This, pchKey, dw); + + if(!This->client) + return S_OK; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, + (void**)&handler); + if(SUCCEEDED(hres)) { + hres = IDocHostUIHandler_GetOptionKeyPath(handler, pchKey, dw); + IDocHostUIHandler_Release(handler); + return hres; + } + + return S_OK; } static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, @@ -183,8 +331,23 @@ LPOLESTR *pchKey, DWORD dw) { WebBrowser *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%p %ld)\n", This, pchKey, dw); - return E_NOTIMPL; + IDocHostUIHandler2 *handler; + HRESULT hres; + + TRACE("(%p)->(%p %ld)\n", This, pchKey, dw); + + if(!This->client) + return S_OK; + + hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler2, + (void**)&handler); + if(SUCCEEDED(hres)) { + hres = IDocHostUIHandler2_GetOverrideKeyPath(handler, pchKey, dw); + IDocHostUIHandler2_Release(handler); + return hres; + } + + return S_OK; } #undef DOCHOSTUI_THIS @@ -214,4 +377,6 @@ void WebBrowser_DocHost_Init(WebBrowser *This) { This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; + + This->doc_view_hwnd = NULL; } _____ Modified: trunk/reactos/lib/shdocvw/events.c --- trunk/reactos/lib/shdocvw/events.c 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/lib/shdocvw/events.c 2005-12-14 19:42:38 UTC (rev 20170) @@ -27,13 +27,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -typedef struct { +struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; WebBrowser *webbrowser; + IDispatch **sinks; + DWORD sinks_size; + IID iid; -} ConnectionPoint; +}; #define CONPOINT(x) ((IConnectionPoint*) &(x)->lpConnectionPointVtbl) @@ -84,13 +87,13 @@ if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents2 %p)\n", This, ppCP); - *ppCP = This->cp_wbe2; + *ppCP = CONPOINT(This->cp_wbe2); }else if(IsEqualGUID(&DIID_DWebBrowserEvents, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents %p)\n", This, ppCP); - *ppCP = This->cp_wbe; + *ppCP = CONPOINT(This->cp_wbe); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = This->cp_pns; + *ppCP = CONPOINT(This->cp_pns); } if(*ppCP) { @@ -181,15 +184,53 @@ DWORD *pdwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); - return E_NOTIMPL; + IDispatch *disp; + DWORD i; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, pUnkSink, pdwCookie); + + hres = IUnknown_QueryInterface(pUnkSink, &This->iid, (void**)&disp); + if(FAILED(hres)) { + hres = IUnknown_QueryInterface(pUnkSink, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return CONNECT_E_CANNOTCONNECT; + } + + if(This->sinks) { + for(i=0; i<This->sinks_size; i++) { + if(!This->sinks[i]) + break; + } + + if(i == This->sinks_size) + This->sinks = HeapReAlloc(GetProcessHeap(), 0, This->sinks, + (++This->sinks_size)*sizeof(*This->sinks)); + }else { + This->sinks = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->sinks)); + This->sinks_size = 1; + i = 0; + } + + This->sinks[i] = disp; + *pdwCookie = i+1; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) { ConnectionPoint *This = CONPOINT_THIS(iface); - FIXME("(%p)->(%ld)\n", This, dwCookie); - return E_NOTIMPL; + + TRACE("(%p)->(%ld)\n", This, dwCookie); + + if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1]) + return CONNECT_E_NOCONNECTION; + + IDispatch_Release(This->sinks[dwCookie-1]); + This->sinks[dwCookie-1] = NULL; + + return S_OK; } static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, @@ -214,17 +255,45 @@ ConnectionPoint_EnumConnections }; -static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, IConnectionPoint **cp) +void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) { + DWORD i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i]) + IDispatch_Invoke(This->sinks[i], dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, + DISPATCH_METHOD, dispparams, NULL, NULL, NULL); + } +} + +static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, ConnectionPoint **cp) +{ ConnectionPoint *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ConnectionPoint)); ret->lpConnectionPointVtbl = &ConnectionPointVtbl; ret->webbrowser = wb; + + ret->sinks = NULL; + ret->sinks_size = 0; + memcpy(&ret->iid, riid, sizeof(IID)); - *cp = CONPOINT(ret); + *cp = ret; } +static void ConnectionPoint_Destroy(ConnectionPoint *This) +{ + int i; + + for(i=0; i<This->sinks_size; i++) { + if(This->sinks[i]) + IDispatch_Release(This->sinks[i]); + } + + HeapFree(GetProcessHeap(), 0, This->sinks); + HeapFree(GetProcessHeap(), 0, This); +} + void WebBrowser_Events_Init(WebBrowser *This) { This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; @@ -236,7 +305,7 @@ void WebBrowser_Events_Destroy(WebBrowser *This) { - HeapFree(GetProcessHeap(), 0, This->cp_wbe2); - HeapFree(GetProcessHeap(), 0, This->cp_wbe); - HeapFree(GetProcessHeap(), 0, This->cp_pns); + ConnectionPoint_Destroy(This->cp_wbe2); + ConnectionPoint_Destroy(This->cp_wbe); + ConnectionPoint_Destroy(This->cp_pns); } _____ Copied: trunk/reactos/lib/shdocvw/frame.c (from rev 20168, vendor/wine/dlls/shdocvw/current/frame.c) Property changes on: trunk/reactos/lib/shdocvw/frame.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shdocvw/oleobject.c --- trunk/reactos/lib/shdocvw/oleobject.c 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/lib/shdocvw/oleobject.c 2005-12-14 19:42:38 UTC (rev 20170) @@ -29,44 +29,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -static ATOM doc_view_atom = 0; static ATOM shell_embedding_atom = 0; -static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT resize_window(WebBrowser *This, LONG width, LONG height) { - return DefWindowProcA(hwnd, msg, wParam, lParam); + if(This->doc_view_hwnd) + SetWindowPos(This->doc_view_hwnd, NULL, 0, 0, width, height, + SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; } static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - return DefWindowProcA(hwnd, msg, wParam, lParam); -} + WebBrowser *This; -static void create_doc_view_hwnd(WebBrowser *This) -{ - static const WCHAR wszShell_DocObject_View[] = - {'S','h','e','l','l',' ','D','o','c','O','b','j','e','c','t',' ','V','i','e','w',0}; + static const WCHAR wszTHIS[] = {'T','H','I','S',0}; - if(!doc_view_atom) { - static WNDCLASSEXW wndclass = { - sizeof(wndclass), - CS_PARENTDC, - doc_view_proc, - 0, 0 /* native uses 4*/, NULL, NULL, NULL, - (HBRUSH)COLOR_WINDOWFRAME, NULL, - wszShell_DocObject_View, - NULL - }; + if(msg == WM_CREATE) { + This = *(WebBrowser**)lParam; + SetPropW(hwnd, wszTHIS, This); + }else { + This = GetPropW(hwnd, wszTHIS); + } - wndclass.hInstance = shdocvw_hinstance; - - doc_view_atom = RegisterClassExW(&wndclass); + switch(msg) { + case WM_SIZE: + return resize_window(This, LOWORD(lParam), HIWORD(lParam)); } - This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, NULL, - WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, - 0, 0, 0, 0, This->shell_embedding_hwnd, - NULL, shdocvw_hinstance, This); + return DefWindowProcA(hwnd, msg, wParam, lParam); } static void create_shell_embedding_hwnd(WebBrowser *This) @@ -99,12 +91,10 @@ IOleInPlaceSite_Release(inplace); } - This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, NULL, + This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, wszShellEmbedding, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX, 0, 0, 0, 0, parent, NULL, shdocvw_hinstance, This); - - create_doc_view_hwnd(This); } /********************************************************************** @@ -151,7 +141,7 @@ This->client = pClientSite; if(!pClientSite) return S_OK; - + IOleClientSite_AddRef(pClientSite); create_shell_embedding_hwnd(This); @@ -227,11 +217,14 @@ WebBrowser *This = OLEOBJ_THIS(iface); HRESULT hres; + static const WCHAR wszitem[] = {'i','t','e','m',0}; + TRACE("(%p)->(%ld %p %p %ld %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, lprcPosRect); switch (iVerb) { + case OLEIVERB_SHOW: case OLEIVERB_INPLACEACTIVATE: { IOleInPlaceSite *inplace; @@ -264,8 +257,15 @@ &This->frameinfo); - IOleInPlaceSite_Release(inplace); + if(iVerb == OLEIVERB_INPLACEACTIVATE) + IOleInPlaceSite_Release(inplace); + SetWindowPos(This->shell_embedding_hwnd, NULL, + This->pos_rect.left, This->pos_rect.top, + This->pos_rect.right-This->pos_rect.left, + This->pos_rect.bottom-This->pos_rect.top, + SWP_NOZORDER | SWP_SHOWWINDOW); + if(This->client) { IOleClientSite_ShowObject(This->client); IOleClientSite_GetContainer(This->client, &This->container); @@ -274,6 +274,20 @@ if(This->frame) IOleInPlaceFrame_GetWindow(This->frame, &This->frame_hwnd); + if(iVerb == OLEIVERB_INPLACEACTIVATE) + return S_OK; + + TRACE("OLEIVERB_SHOW\n"); + + IOleInPlaceSite_OnUIActivate(inplace); + IOleInPlaceSite_Release(inplace); + + IOleInPlaceFrame_SetActiveObject(This->frame, ACTIVEOBJ(This), wszitem); + + /* TODO: + * IOleInPlaceFrmae_SetMenu + */ + return S_OK; } default: @@ -482,8 +496,18 @@ LPCRECT lprcPosRect, LPCRECT lprcClipRect) { WebBrowser *This = INPLACEOBJ_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); + + if(This->shell_embedding_hwnd) { + SetWindowPos(This->shell_embedding_hwnd, NULL, + lprcPosRect->left, lprcPosRect->top, + lprcPosRect->right-lprcPosRect->left, + lprcPosRect->bottom-lprcPosRect->top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + return S_OK; } static HRESULT WINAPI OleInPlaceObject_ReactivateAndUndo(IOleInPlaceObject *iface) @@ -574,11 +598,102 @@ OleControl_FreezeEvents }; +#define ACTIVEOBJ_THIS(iface) DEFINE_THIS(WebBrowser, OleInPlaceActiveObject, iface) + +static HRESULT WINAPI InPlaceActiveObject_QueryInterface(IOleInPlaceActiveObject *iface, + REFIID riid, void **ppv) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER2(This), riid, ppv); +} + +static ULONG WINAPI InPlaceActiveObject_AddRef(IOleInPlaceActiveObject *iface) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER2(This)); +} + +static ULONG WINAPI InPlaceActiveObject_Release(IOleInPlaceActiveObject *iface) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER2(This)); +} + +static HRESULT WINAPI InPlaceActiveObject_GetWindow(IOleInPlaceActiveObject *iface, + HWND *phwnd) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IOleInPlaceObject_GetWindow(INPLACEOBJ(This), phwnd); +} + +static HRESULT WINAPI InPlaceActiveObject_ContextSensitiveHelp(IOleInPlaceActiveObject *iface, + BOOL fEnterMode) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + return IOleInPlaceObject_ContextSensitiveHelp(INPLACEOBJ(This), fEnterMode); +} + +static HRESULT WINAPI InPlaceActiveObject_TranslateAccelerator(IOleInPlaceActiveObject *iface, + LPMSG lpmsg) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%p)\n", This, lpmsg); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_OnDocWindowActivate(IOleInPlaceActiveObject *iface, + BOOL fActivate) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fActivate); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_ResizeBorder(IOleInPlaceActiveObject *iface, + LPCRECT lprcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fFrameWindow) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%p %p %x)\n", This, lprcBorder, pUIWindow, fFrameWindow); + return E_NOTIMPL; +} + +static HRESULT WINAPI InPlaceActiveObject_EnableModeless(IOleInPlaceActiveObject *iface, + BOOL fEnable) +{ + WebBrowser *This = ACTIVEOBJ_THIS(iface); + FIXME("(%p)->(%x)\n", This, fEnable); + return E_NOTIMPL; +} + +#undef ACTIVEOBJ_THIS + +static const IOleInPlaceActiveObjectVtbl OleInPlaceActiveObjectVtbl = { + InPlaceActiveObject_QueryInterface, + InPlaceActiveObject_AddRef, + InPlaceActiveObject_Release, + InPlaceActiveObject_GetWindow, + InPlaceActiveObject_ContextSensitiveHelp, + InPlaceActiveObject_TranslateAccelerator, + InPlaceActiveObject_OnFrameWindowActivate, + InPlaceActiveObject_OnDocWindowActivate, + InPlaceActiveObject_ResizeBorder, + InPlaceActiveObject_EnableModeless +}; + void WebBrowser_OleObject_Init(WebBrowser *This) { - This->lpOleObjectVtbl = &OleObjectVtbl; - This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; - This->lpOleControlVtbl = &OleControlVtbl; + This->lpOleObjectVtbl = &OleObjectVtbl; + This->lpOleInPlaceObjectVtbl = &OleInPlaceObjectVtbl; + This->lpOleControlVtbl = &OleControlVtbl; + This->lpOleInPlaceActiveObjectVtbl = &OleInPlaceActiveObjectVtbl; This->client = NULL; This->container = NULL; @@ -586,6 +701,7 @@ This->frame_hwnd = NULL; This->frame = NULL; This->uiwindow = NULL; + This->shell_embedding_hwnd = NULL; memset(&This->pos_rect, 0, sizeof(RECT)); memset(&This->clip_rect, 0, sizeof(RECT)); _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.h --- trunk/reactos/lib/shdocvw/shdocvw.h 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/lib/shdocvw/shdocvw.h 2005-12-14 19:42:38 UTC (rev 20170) @@ -58,6 +58,9 @@ /********************************************************************** * WebBrowser declaration for SHDOCVW.DLL */ + +typedef struct ConnectionPoint ConnectionPoint; + typedef struct { /* Interfaces available via WebBrowser object */ @@ -71,20 +74,29 @@ const IQuickActivateVtbl *lpQuickActivateVtbl; const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; + const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; /* Interfaces available for embeded document */ const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; const IDocHostUIHandler2Vtbl *lpDocHostUIHandlerVtbl; + const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; + /* Interfaces of InPlaceFrame object */ + + const IOleInPlaceFrameVtbl *lpOleInPlaceFrameVtbl; + LONG ref; IUnknown *document; IOleClientSite *client; IOleContainer *container; + IOleDocumentView *view; + LPOLESTR url; + /* window context */ HWND iphwnd; @@ -100,9 +112,9 @@ /* Connection points */ - IConnectionPoint *cp_wbe2; - IConnectionPoint *cp_wbe; - IConnectionPoint *cp_pns; + ConnectionPoint *cp_wbe2; + ConnectionPoint *cp_wbe; + ConnectionPoint *cp_pns; } WebBrowser; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) @@ -117,12 +129,16 @@ #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); +#define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) #define DOCHOSTUI(x) ((IDocHostUIHandler*) &(x)->lpDocHostUIHandlerVtbl) #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) +#define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) +#define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl) + void WebBrowser_OleObject_Init(WebBrowser*); void WebBrowser_ViewObject_Init(WebBrowser*); void WebBrowser_Persist_Init(WebBrowser*); @@ -133,11 +149,19 @@ void WebBrowser_ClientSite_Init(WebBrowser*); void WebBrowser_DocHost_Init(WebBrowser*); +void WebBrowser_Frame_Init(WebBrowser*); + void WebBrowser_OleObject_Destroy(WebBrowser*); void WebBrowser_Events_Destroy(WebBrowser*); +void WebBrowser_ClientSite_Destroy(WebBrowser*); HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); +void create_doc_view_hwnd(WebBrowser *This); +void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); + +#define WB_WM_NAVIGATE2 (WM_USER+100) + #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) /********************************************************************** _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.xml --- trunk/reactos/lib/shdocvw/shdocvw.xml 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/lib/shdocvw/shdocvw.xml 2005-12-14 19:42:38 UTC (rev 20170) @@ -23,6 +23,7 @@ <file>dochost.c</file> <file>events.c</file> <file>factory.c</file> + <file>frame.c</file> <file>misc.c</file> <file>oleobject.c</file> <file>persist.c</file> _____ Modified: trunk/reactos/lib/shdocvw/webbrowser.c --- trunk/reactos/lib/shdocvw/webbrowser.c 2005-12-14 19:41:46 UTC (rev 20169) +++ trunk/reactos/lib/shdocvw/webbrowser.c 2005-12-14 19:42:38 UTC (rev 20170) @@ -94,6 +94,9 @@ }else if(IsEqualGUID(&IID_IViewObject2, riid)) { TRACE("(%p)->(IID_IViewObject2 %p)\n", This, ppv); *ppv = VIEWOBJ2(This); + }else if(IsEqualGUID(&IID_IOleInPlaceActiveObject, riid)) { + TRACE("(%p)->(IID_IOleInPlaceActiveObject %p)\n", This, ppv); + *ppv = ACTIVEOBJ(This); } if(*ppv) { @@ -126,7 +129,9 @@ WebBrowser_OleObject_Destroy(This); WebBrowser_Events_Destroy(This); + WebBrowser_ClientSite_Destroy(This); + SysFreeString(This->url); HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); } @@ -255,8 +260,14 @@ static HRESULT WINAPI WebBrowser_get_Document(IWebBrowser2 *iface, IDispatch **ppDisp) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppDisp); + + *ppDisp = NULL; + if(This->document) + IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)ppDisp); + + return S_OK; } static HRESULT WINAPI WebBrowser_get_TopLevelContainer(IWebBrowser2 *iface, VARIANT_BOOL *pBool) @@ -504,13 +515,20 @@ if(!This->client) return E_FAIL; - if(V_VT(Flags) != VT_EMPTY || V_VT(TargetFrameName) != VT_EMPTY - || V_VT(PostData) != VT_EMPTY || V_VT(Headers) != VT_EMPTY) + if((Flags && V_VT(Flags) != VT_EMPTY) + || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY) + || (PostData && V_VT(PostData) != VT_EMPTY) + || (Headers && V_VT(Headers) != VT_EMPTY)) FIXME("Unsupported arguments\n"); + if(!URL) + return S_OK; if(V_VT(URL) != VT_BSTR) - FIXME("V_VT(URL) != VT_BSTR\n"); + return E_INVALIDARG; + if(!This->doc_view_hwnd) + create_doc_view_hwnd(This); + /* * FIXME: * We should use URLMoniker's BindToObject instead creating HTMLDocument here. @@ -543,6 +561,8 @@ return hres; } + This->url = SysAllocString(V_BSTR(URL)); + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); if(FAILED(hres)) return hres; @@ -550,6 +570,8 @@ hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); IOleObject_Release(oleobj); + PostMessageW(This->doc_view_hwnd, WB_WM_NAVIGATE2, 0, 0); + return hres; } @@ -775,6 +797,7 @@ [truncated at 1000 lines; 1429 more skipped]

18 years, 9 months

[greatlrd] 20169: move the shlwapi_Hu.rc from wrong folder that will be delete thx Brezenbak to note it

by greatlrd＠svn.reactos.com

move the shlwapi_Hu.rc from wrong folder that will be delete thx Brezenbak to note it Modified: trunk/reactos/lib/shlwapi/shlwapi.rc Added: trunk/reactos/lib/shlwapi/shlwapi_Hu.rc _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.rc --- trunk/reactos/lib/shlwapi/shlwapi.rc 2005-12-14 19:09:44 UTC (rev 20168) +++ trunk/reactos/lib/shlwapi/shlwapi.rc 2005-12-14 19:41:46 UTC (rev 20169) @@ -28,6 +28,7 @@ #include "shlwapi_De.rc" #include "shlwapi_En.rc" #include "shlwapi_Es.rc" +#include "shlwapi_Hu.rc" #include "shlwapi_Ko.rc" #include "shlwapi_Nl.rc" #include "shlwapi_No.rc" _____ Added: trunk/reactos/lib/shlwapi/shlwapi_Hu.rc --- trunk/reactos/lib/shlwapi/shlwapi_Hu.rc 2005-12-14 19:09:44 UTC (rev 20168) +++ trunk/reactos/lib/shlwapi/shlwapi_Hu.rc 2005-12-14 19:41:46 UTC (rev 20169) @@ -0,0 +1,37 @@ +/* + * Hungarian resources for shlwapi + * + * Copyright 2004 Jon Griffiths + * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hiba!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Ne &jelenÝtse meg t÷bbet ezt a hiba³znetet", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&MÚgse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +}

18 years, 9 months

[gvg] 20168: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Michael Jung <mjung(a)iss.tu-darmstadt.de> - Use the ANSI codepage in IShellFolder::GetDisplayNameOf. - Implemented scrolling during drag&drop for the shellview class. - Use GetUIObjectOf instead of BindToObject to get a IDropTarget object. - Register the shell view itself as the drop target, not it's parent folder. Forward drag&drop method calls to the folder currently under the cursor. - Initialize OLE instead of just COM, in order to enable Drag & Drop. - Modified KeyStateToDropEffect macro to match native shellview's behaviour. - Also scan HKEY_CURRENT_USER for shell namespace extensions in Desktop folder. Fixed a handle leak in case of failing AddToEnumList call. - Also scan HKEY_CURRENT_USER for shell namespace extensions in MyComputer. - Enhanced UnixFolder's IDropTarget implementation. Use STATIC_CAST macro more consistently. - Initial stubbed implementation of UnixFolder's IDropTarget interface. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Ge van Geldorp <gvg(a)reactos.org> - Load shortcut icon by resource id instead of by icon index. - Other code in shlexec.c (e.g. the extension handling code in ShellExecute_GetClassKey) expects sei->lpFile to not be enclosed in quotes. Martin Fuchs <martin-fuchs(a)gmx.net> - Correctly call HCR_GetFolderAttributes() in SHELL32_GetItemAttributes(). Directly return the correct "My Computer" attributes in ISF_Desktop_fnGetAttributesOf(). Remove "todo_wine" from the "My Computer" attributes test case. Add test case for retrieving the file system path from the CSIDL_PROGRAM_FILES PIDL using SHGetPathFromIDListW(). - Fix context menu handling for more than one entry in order to repair .lnk-file execution: Don't break at the first non-matching entry. Markus Gömmel <m.goemmel(a)compulab.de> - Added CSIDL_MYVIDEO|MYPICTURES|MYMUSIC to _SHRegisterUserShellFolders. Modified: trunk/reactos/lib/shell32/iconcache.c Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shlexec.c Modified: trunk/reactos/lib/shell32/shlview.c _____ Modified: trunk/reactos/lib/shell32/iconcache.c --- trunk/reactos/lib/shell32/iconcache.c 2005-12-14 19:02:42 UTC (rev 20167) +++ trunk/reactos/lib/shell32/iconcache.c 2005-12-14 19:09:44 UTC (rev 20168) @@ -129,7 +129,10 @@ /* search for the shortcut icon only once */ if (s_imgListIdx == -1) - s_imgListIdx = SIC_LoadOverlayIcon(-IDI_SHELL_SHORTCUT); + s_imgListIdx = SIC_LoadOverlayIcon(- IDI_SHELL_SHORTCUT); + /* FIXME should use icon index 29 instead of the + resource id, but not all icons are present yet + so we can't use icon indices */ if (s_imgListIdx != -1) { _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-12-14 19:02:42 UTC (rev 20167) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-12-14 19:09:44 UTC (rev 20168) @@ -121,9 +121,9 @@ }; #define KeyStateToDropEffect(kst)\ - (((kst) & MK_CONTROL) ?\ - (((kst) & MK_SHIFT) ? DROPEFFECT_LINK : DROPEFFECT_COPY):\ - DROPEFFECT_MOVE) + ((((kst)&(MK_CONTROL|MK_SHIFT))==(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_LINK :\ + (((kst)&(MK_CONTROL|MK_SHIFT)) ? DROPEFFECT_COPY :\ + DROPEFFECT_MOVE)) HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-12-14 19:02:42 UTC (rev 20167) +++ trunk/reactos/lib/shell32/shellpath.c 2005-12-14 19:09:44 UTC (rev 20168) @@ -1808,12 +1808,15 @@ CSIDL_RECENT, CSIDL_SENDTO, CSIDL_STARTMENU, + CSIDL_MYMUSIC, + CSIDL_MYVIDEO, CSIDL_DESKTOPDIRECTORY, CSIDL_NETHOOD, CSIDL_TEMPLATES, CSIDL_PRINTHOOD, CSIDL_COOKIES, CSIDL_HISTORY, + CSIDL_MYPICTURES }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath; _____ Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-12-14 19:02:42 UTC (rev 20167) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-12-14 19:09:44 UTC (rev 20168) @@ -428,6 +428,9 @@ static const DWORD dwDesktopAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + static const DWORD dwMyComputerAttributes = + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | + SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); @@ -447,6 +450,8 @@ pdump (*apidl); if (_ILIsDesktop(*apidl)) { *rgfInOut &= dwDesktopAttributes; + } else if (_ILIsMyComputer(*apidl)) { + *rgfInOut &= dwMyComputerAttributes; } else { SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); } _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2005-12-14 19:02:42 UTC (rev 20167) +++ trunk/reactos/lib/shell32/shlexec.c 2005-12-14 19:09:44 UTC (rev 20168) @@ -1156,15 +1156,15 @@ r = RegEnumKeyW( hkeycm, i++, szguid, 39 ); if ( r != ERROR_SUCCESS ) break; - r = ERROR_FUNCTION_FAILED; + hr = CLSIDFromString( szguid, &guid ); - if ( FAILED( hr ) ) - break; - r = ERROR_SUCCESS; - /* stop at the first one that succeeds in running */ - hr = shellex_load_object_and_run( hkey, &guid, sei ); - if ( SUCCEEDED( hr ) ) - break; + if (SUCCEEDED(hr)) + { + /* stop at the first one that succeeds in running */ + hr = shellex_load_object_and_run( hkey, &guid, sei ); + if ( SUCCEEDED( hr ) ) + break; + } } RegCloseKey( hkeycm ); } _____ Modified: trunk/reactos/lib/shell32/shlview.c --- trunk/reactos/lib/shell32/shlview.c 2005-12-14 19:02:42 UTC (rev 20167) +++ trunk/reactos/lib/shell32/shlview.c 2005-12-14 19:09:44 UTC (rev 20168) @@ -100,6 +100,10 @@ DWORD dwAspects; DWORD dwAdvf; IAdviseSink *pAdvSink; + IDropTarget* pCurDropTarget; /* The sub-item, which is currently dragged over */ + IDataObject* pCurDataObject; /* The dragged data-object */ + LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ + UINT iActiveTimersMask; /* Bookkeeping of activated timers for drag scrolling */ } IShellViewImpl; static const IShellViewVtbl svvt; @@ -190,6 +194,11 @@ if(pFolder) IShellFolder_AddRef(pFolder); IShellFolder_QueryInterface(sv->pSFParent, &IID_IShellFolder2, (LPVOID*)&sv->pSF2Parent); + sv->pCurDropTarget = NULL; + sv->pCurDataObject = NULL; + sv->iDragOverItem = 0; + sv->iActiveTimersMask = 0; + TRACE("(%p)->(%p)\n",sv, pFolder); return (IShellView *) sv; } @@ -671,7 +680,7 @@ } } - if (SUCCEEDED(IShellFolder_CreateViewObject(This->pSFParent, This->hWnd, &IID_IDropTarget, (LPVOID*)&pdt))) + if (SUCCEEDED(IUnknown_QueryInterface((IUnknown*)&This->lpVtbl, &IID_IDropTarget, (LPVOID*)&pdt))) { RegisterDragDrop(This->hWnd, pdt); IDropTarget_Release(pdt); @@ -2169,56 +2178,176 @@ return IShellFolder_Release((IShellFolder*)This); } -static HRESULT WINAPI ISVDropTarget_DragEnter( - IDropTarget *iface, - IDataObject *pDataObject, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect) +/********************************************************************** ******** + * scroll_timer_proc [Internal] + * + * Timer callback function for drag&drop scrolling + */ + +#define IDT_UP 0x1u +#define IDT_DOWN 0x2u +#define IDT_LEFT 0x4u +#define IDT_RIGHT 0x8u + +VOID CALLBACK scroll_timer_proc(HWND hwnd, UINT uMsg, UINT_PTR idTimer, DWORD dwTimer) { + switch (idTimer) { + case IDT_UP: + SendMessageW(hwnd, WM_VSCROLL, SB_LINEUP, 0); + break; + case IDT_DOWN: + SendMessageW(hwnd, WM_VSCROLL, SB_LINEDOWN, 0); + break; + case IDT_LEFT: + SendMessageW(hwnd, WM_HSCROLL, SB_LINEUP, 0); + break; + case IDT_RIGHT: + SendMessageW(hwnd, WM_HSCROLL, SB_LINEDOWN, 0); + break; + } +} + +/********************************************************************** ******** + * start_stop_timer [Internal] + */ +static inline void start_stop_timer(IShellViewImpl *This, UINT_PTR idTimer, BOOL fStart) { + if (fStart && !(This->iActiveTimersMask & idTimer)) { + SetTimer(This->hWndList, idTimer, 200, scroll_timer_proc); + This->iActiveTimersMask |= idTimer; + } + if (!fStart && This->iActiveTimersMask & idTimer) { + KillTimer(This->hWndList, idTimer); + This->iActiveTimersMask &= ~idTimer; + } +} + +/********************************************************************** ******** + * drag_notify_subitem [Internal] + * + * Figure out the shellfolder object, which is currently under the mouse cursor + * and notify it via the IDropTarget interface. + */ + +#define SCROLLAREAWIDTH 20 + +static HRESULT drag_notify_subitem(IShellViewImpl *This, DWORD grfKeyState, POINTL pt, + DWORD *pdwEffect) { + LVHITTESTINFO htinfo; + LVITEMA lvItem; + LONG lResult; + HRESULT hr; + RECT clientRect; - IShellViewImpl *This = impl_from_IDropTarget(iface); + /* Map from global to client coordinates and query the index of the listview-item, which is + * currently under the mouse cursor. */ + htinfo.pt.x = pt.x; + htinfo.pt.y = pt.y; + htinfo.flags = LVHT_ONITEM; + ScreenToClient(This->hWndList, &htinfo.pt); + lResult = SendMessageW(This->hWndList, LVM_HITTEST, 0, (LPARAM)&htinfo); - FIXME("Stub: This=%p, DataObject=%p\n",This,pDataObject); + /* Start or stop the drag scrolling timers */ + GetClientRect(This->hWndList, &clientRect); + start_stop_timer(This, IDT_LEFT, htinfo.pt.x < SCROLLAREAWIDTH); + start_stop_timer(This, IDT_RIGHT, htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH); + start_stop_timer(This, IDT_UP, htinfo.pt.y < SCROLLAREAWIDTH); + start_stop_timer(This, IDT_DOWN, htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH); - return E_NOTIMPL; + /* If we are still over the previous sub-item, notify it via DragOver and return. */ + if (This->pCurDropTarget && lResult == This->iDragOverItem) + return IDropTarget_DragOver(This->pCurDropTarget, grfKeyState, pt, pdwEffect); + + /* We've left the previous sub-item, notify it via DragLeave and Release it. */ + if (This->pCurDropTarget) { + IDropTarget_DragLeave(This->pCurDropTarget); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } + + This->iDragOverItem = lResult; + if (lResult == -1) { + /* We are not above one of the listview's subitems. Bind to the parent folder's + * DropTarget interface. */ + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IDropTarget, + (LPVOID*)&This->pCurDropTarget); + } else { + /* Query the relative PIDL of the shellfolder object represented by the currently + * dragged over listview-item ... */ + ZeroMemory(&lvItem, sizeof(lvItem)); + lvItem.mask = LVIF_PARAM; + lvItem.iItem = lResult; + ListView_GetItemA(This->hWndList, &lvItem); + + /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ + hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWndList, 1, + (LPCITEMIDLIST*)&lvItem.lParam, &IID_IDropTarget, NULL, (LPVOID*)&This->pCurDropTarget); + } + + /* If anything failed, pCurDropTarget should be NULL now, which ought to be a save state. */ + if (FAILED(hr)) + return hr; + + /* Notify the item just entered via DragEnter. */ + return IDropTarget_DragEnter(This->pCurDropTarget, This->pCurDataObject, grfKeyState, pt, pdwEffect); } -static HRESULT WINAPI ISVDropTarget_DragOver( - IDropTarget *iface, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect) +static HRESULT WINAPI ISVDropTarget_DragEnter(IDropTarget *iface, IDataObject *pDataObject, + DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - IShellViewImpl *This = impl_from_IDropTarget(iface); + IShellViewImpl *This = impl_from_IDropTarget(iface); - FIXME("Stub: This=%p\n",This); + /* Get a hold on the data object for later calls to DragEnter on the sub-folders */ + This->pCurDataObject = pDataObject; + IDataObject_AddRef(pDataObject); - return E_NOTIMPL; + return drag_notify_subitem(This, grfKeyState, pt, pdwEffect); } -static HRESULT WINAPI ISVDropTarget_DragLeave( - IDropTarget *iface) +static HRESULT WINAPI ISVDropTarget_DragOver(IDropTarget *iface, DWORD grfKeyState, POINTL pt, + DWORD *pdwEffect) { - IShellViewImpl *This = impl_from_IDropTarget(iface); + IShellViewImpl *This = impl_from_IDropTarget(iface); + return drag_notify_subitem(This, grfKeyState, pt, pdwEffect); +} - FIXME("Stub: This=%p\n",This); +static HRESULT WINAPI ISVDropTarget_DragLeave(IDropTarget *iface) { + IShellViewImpl *This = impl_from_IDropTarget(iface); - return E_NOTIMPL; + IDropTarget_DragLeave(This->pCurDropTarget); + + IDropTarget_Release(This->pCurDropTarget); + IDataObject_Release(This->pCurDataObject); + This->pCurDataObject = NULL; + This->pCurDropTarget = NULL; + This->iDragOverItem = 0; + + start_stop_timer(This, IDT_LEFT, FALSE); + start_stop_timer(This, IDT_RIGHT, FALSE); + start_stop_timer(This, IDT_UP, FALSE); + start_stop_timer(This, IDT_DOWN, FALSE); + + return S_OK; } -static HRESULT WINAPI ISVDropTarget_Drop( - IDropTarget *iface, - IDataObject* pDataObject, - DWORD grfKeyState, - POINTL pt, - DWORD *pdwEffect) +static HRESULT WINAPI ISVDropTarget_Drop(IDropTarget *iface, IDataObject* pDataObject, + DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - IShellViewImpl *This = impl_from_IDropTarget(iface); + IShellViewImpl *This = impl_from_IDropTarget(iface); - FIXME("Stub: This=%p\n",This); + IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); - return E_NOTIMPL; + IDropTarget_Release(This->pCurDropTarget); + IDataObject_Release(This->pCurDataObject); + This->pCurDataObject = NULL; + This->pCurDropTarget = NULL; + This->iDragOverItem = 0; + + start_stop_timer(This, IDT_LEFT, FALSE); + start_stop_timer(This, IDT_RIGHT, FALSE); + start_stop_timer(This, IDT_UP, FALSE); + start_stop_timer(This, IDT_DOWN, FALSE); + + return S_OK; } static const IDropTargetVtbl dtvt =

18 years, 9 months

[gvg] 20167: Sync to Wine-0_9_3:

by gvg＠svn.reactos.com

Sync to Wine-0_9_3: Robert Shearman <rob(a)codeweavers.com> - Return the correct error code from NdrProxyErrorHandler. - Add a function to retrieve the MIDL_SERVER_INFO struct from an object. - Make sure to fill out the MIDL_STUB_MESSAGE structure in NdrSendReceive like we do in NdrProxySendReceive. - Fix the overflow check to not depend on pStubMsg->BufferStart and pStubMsg->BufferEnd being valid, because they aren't filled in when using MIDL-generated server stubs. - Don't set the pointer to NULL on unmarshaling because we may want to unmarshal the value to an existing pointer instead of allocating a new one. - Raise exceptions on failures. Replace references of pStubMsg->BufferEnd with RpcMsg->Buffer + pStubMsg->BufferLength. - Fix buffer calculation when no interface data is marshaled to the stream. - Implement conformant varying array functions. - Implement conformant struct functions. - Implement FC_STRUCTPAD2 for complex types. - Add functions for marshaling base types (ints, floats, etc.). - Extend conformance computation function to also compute variances. MSDN suggests that conformance and variance are pretty much the same, but there may be some subtleties to it. - Fix NdrConformantArrayBufferSize to include the size of the conformance value. Make NdrConformantArrayMemorySize do something more useful, like actually return the required memory. Conformance offset can be negative and should only be two bytes. - We should always allocate in NdrConformantStringUnmarshal if the memory pointer is NULL. - The CLSID can be substituted by an IID present in one of the proxy file infos in NdrDllGetClassObject. Ge van Geldorp <gvg(a)reactos.org> - Match PSDK STATUS_* definitions. Modified: trunk/reactos/lib/rpcrt4/cpsf.c Modified: trunk/reactos/lib/rpcrt4/cpsf.h Modified: trunk/reactos/lib/rpcrt4/cstub.c Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c Modified: trunk/reactos/lib/rpcrt4/ndr_misc.h Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c _____ Modified: trunk/reactos/lib/rpcrt4/cpsf.c --- trunk/reactos/lib/rpcrt4/cpsf.c 2005-12-14 18:55:57 UTC (rev 20166) +++ trunk/reactos/lib/rpcrt4/cpsf.c 2005-12-14 19:02:42 UTC (rev 20167) @@ -133,6 +133,10 @@ const CLSID *pclsid, CStdPSFactoryBuffer *pPSFactoryBuffer) { + TRACE("(%s, %s, %p, %p, %s, %p)\n", debugstr_guid(rclsid), + debugstr_guid(iid), ppv, pProxyFileList, debugstr_guid(pclsid), + pPSFactoryBuffer); + *ppv = NULL; if (!pPSFactoryBuffer->lpVtbl) { pPSFactoryBuffer->lpVtbl = &CStdPSFactory_Vtbl; @@ -141,7 +145,17 @@ } if (IsEqualGUID(rclsid, pclsid)) return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); - return CLASS_E_CLASSNOTAVAILABLE; + else { + const ProxyFileInfo *info; + int index; + /* otherwise, the dll may be using the iid as the clsid, so + * search for it in the proxy file list */ + if (FindProxyInfo(pProxyFileList, rclsid, &info, &index)) + return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); + + WARN("class %s not available\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } } /*********************************************************************** _____ Modified: trunk/reactos/lib/rpcrt4/cpsf.h --- trunk/reactos/lib/rpcrt4/cpsf.h 2005-12-14 18:55:57 UTC (rev 20166) +++ trunk/reactos/lib/rpcrt4/cpsf.h 2005-12-14 19:02:42 UTC (rev 20167) @@ -41,4 +41,6 @@ LPPSFACTORYBUFFER pPSFactory, LPRPCSTUBBUFFER *ppStub); +const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface); + #endif /* __WINE_CPSF_H */ _____ Modified: trunk/reactos/lib/rpcrt4/cstub.c --- trunk/reactos/lib/rpcrt4/cstub.c 2005-12-14 18:55:57 UTC (rev 20166) +++ trunk/reactos/lib/rpcrt4/cstub.c 2005-12-14 19:02:42 UTC (rev 20167) @@ -177,3 +177,9 @@ CStdStubBuffer *This = (CStdStubBuffer *)iface; TRACE("(%p)->DebugServerRelease(%p)\n",This,pv); } + +const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface) +{ + CStdStubBuffer *This = (CStdStubBuffer *)iface; + return STUB_HEADER(This).pServerInfo; +} _____ Modified: trunk/reactos/lib/rpcrt4/ndr_marshall.c --- trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-12-14 18:55:57 UTC (rev 20166) +++ trunk/reactos/lib/rpcrt4/ndr_marshall.c 2005-12-14 19:02:42 UTC (rev 20167) @@ -97,18 +97,28 @@ #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) #define STD_OVERFLOW_CHECK(_Msg) do { \ - TRACE("buffer=%d/%ld\n", _Msg->Buffer - _Msg->BufferStart, _Msg->BufferLength); \ - if (_Msg->Buffer > _Msg->BufferEnd) ERR("buffer overflow %d bytes\n", _Msg->Buffer - _Msg->BufferEnd); \ + TRACE("buffer=%d/%ld\n", _Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer, _Msg->BufferLength); \ + if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ + ERR("buffer overflow %d bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \ } while (0) #define NDR_TABLE_SIZE 128 #define NDR_TABLE_MASK 127 +static unsigned char *WINAPI NdrBaseTypeMarshall(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static unsigned char *WINAPI NdrBaseTypeUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); +static void WINAPI NdrBaseTypeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static unsigned long WINAPI NdrBaseTypeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); + NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, + NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, + NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, + NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, + NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, /* 0x10 */ - 0, + NdrBaseTypeMarshall, /* 0x11 */ NdrPointerMarshall, NdrPointerMarshall, NdrPointerMarshall, NdrPointerMarshall, @@ -139,10 +149,13 @@ NdrUserMarshalMarshall }; NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, + NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, + NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, + NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, + NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, NdrBaseTypeUnmarshall, /* 0x10 */ - 0, + NdrBaseTypeUnmarshall, /* 0x11 */ NdrPointerUnmarshall, NdrPointerUnmarshall, NdrPointerUnmarshall, NdrPointerUnmarshall, @@ -173,10 +186,13 @@ NdrUserMarshalUnmarshall }; NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, + NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, + NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, + NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, + NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, NdrBaseTypeBufferSize, /* 0x10 */ - 0, + NdrBaseTypeBufferSize, /* 0x11 */ NdrPointerBufferSize, NdrPointerBufferSize, NdrPointerBufferSize, NdrPointerBufferSize, @@ -207,10 +223,13 @@ NdrUserMarshalBufferSize }; NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, + NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, + NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, + NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, + NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, NdrBaseTypeMemorySize, /* 0x10 */ - 0, + NdrBaseTypeMemorySize, /* 0x11 */ NdrPointerMemorySize, NdrPointerMemorySize, NdrPointerMemorySize, NdrPointerMemorySize, @@ -234,10 +253,13 @@ NdrUserMarshalMemorySize }; NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, + 0, + NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, + NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, + NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, + NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, NdrBaseTypeFree, /* 0x10 */ - 0, + NdrBaseTypeFree, /* 0x11 */ NdrPointerFree, NdrPointerFree, NdrPointerFree, NdrPointerFree, @@ -286,46 +308,56 @@ return pFormat+4; } -PFORMAT_STRING ComputeConformance(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, - PFORMAT_STRING pFormat, ULONG_PTR def) +static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { + pStubMsg->ActualCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + TRACE("unmarshalled variance is %ld\n", pStubMsg->ActualCount); + return pFormat+4; +} + +PFORMAT_STRING ComputeConformanceOrVariance( + MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, + PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount) +{ BYTE dtype = pFormat[0] & 0xf; - DWORD ofs = (DWORD)pFormat[2] | ((DWORD)pFormat[3] << 8); + short ofs = *(short *)&pFormat[2]; LPVOID ptr = NULL; DWORD data = 0; + /* FIXME: is this correct? */ if (pFormat[0] == 0xff) { /* null descriptor */ - pStubMsg->MaxCount = def; + *pCount = def; goto finish_conf; } switch (pFormat[0] & 0xf0) { case RPC_FC_NORMAL_CONFORMANCE: - TRACE("normal conformance, ofs=%ld\n", ofs); + TRACE("normal conformance, ofs=%d\n", ofs); ptr = pMemory + ofs; break; case RPC_FC_POINTER_CONFORMANCE: - TRACE("pointer conformance, ofs=%ld\n", ofs); + TRACE("pointer conformance, ofs=%d\n", ofs); ptr = pStubMsg->Memory + ofs; break; case RPC_FC_TOP_LEVEL_CONFORMANCE: - TRACE("toplevel conformance, ofs=%ld\n", ofs); + TRACE("toplevel conformance, ofs=%d\n", ofs); if (pStubMsg->StackTop) { ptr = pStubMsg->StackTop + ofs; } else { - /* -Os mode, MaxCount is already set */ + /* -Os mode, *pCount is already set */ goto finish_conf; } break; case RPC_FC_CONSTANT_CONFORMANCE: data = ofs | ((DWORD)pFormat[1] << 16); TRACE("constant conformance, val=%ld\n", data); - pStubMsg->MaxCount = data; + *pCount = data; goto finish_conf; case RPC_FC_TOP_LEVEL_MULTID_CONFORMANCE: - FIXME("toplevel multidimensional conformance, ofs=%ld\n", ofs); + FIXME("toplevel multidimensional conformance, ofs=%d\n", ofs); if (pStubMsg->StackTop) { ptr = pStubMsg->StackTop + ofs; } @@ -376,7 +408,7 @@ done_conf_grab: switch (pFormat[1]) { case 0: /* no op */ - pStubMsg->MaxCount = data; + *pCount = data; break; case RPC_FC_DEREFERENCE: /* already handled */ @@ -387,7 +419,7 @@ } finish_conf: - TRACE("resulting conformance is %ld\n", pStubMsg->MaxCount); + TRACE("resulting conformance is %ld\n", *pCount); return pFormat+4; } @@ -538,7 +570,6 @@ unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { unsigned long len, esize, ofs; - unsigned char *pMem; TRACE("(pStubMsg == ^%p, *pMemory == ^%p, pFormat == ^%p, fMustAlloc == %u)\n", pStubMsg, *ppMemory, pFormat, fMustAlloc); @@ -563,33 +594,18 @@ FIXME("sized string format=%d\n", pFormat[1]); } - if (fMustAlloc) { + if (fMustAlloc || !*ppMemory) *ppMemory = NdrAllocate(pStubMsg, len*esize + BUFFER_PARANOIA); - } else { - if (pStubMsg->ReuseBuffer && !*ppMemory) - /* for servers, we may just point straight into the RPC buffer, I think - * (I guess that's what MS does since MIDL code doesn't try to free) */ - *ppMemory = pStubMsg->Buffer - ofs*esize; - /* for clients, memory should be provided by caller */ - } - if (len == 0) { - *ppMemory = NULL; - return NULL; - } + memcpy(*ppMemory, pStubMsg->Buffer, len*esize); - pMem = *ppMemory + ofs*esize; - - if (pMem != pStubMsg->Buffer) - memcpy(pMem, pStubMsg->Buffer, len*esize); - pStubMsg->Buffer += len*esize; if (*pFormat == RPC_FC_C_CSTRING) { - TRACE("string=%s\n", debugstr_a((char*)pMem)); + TRACE("string=%s\n", debugstr_a((char*)*ppMemory)); } else if (*pFormat == RPC_FC_C_WSTRING) { - TRACE("string=%s\n", debugstr_w((LPWSTR)pMem)); + TRACE("string=%s\n", debugstr_w((LPWSTR)*ppMemory)); } return NULL; /* FIXME: is this always right? */ @@ -749,8 +765,6 @@ RpcRaiseException(RPC_X_BAD_STUB_DATA); } - *pPointer = NULL; - if (pointer_id) { m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; if (m) m(pStubMsg, pPointer, desc, fMustAlloc); @@ -1449,6 +1463,9 @@ case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1512,6 +1529,9 @@ case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1569,6 +1589,9 @@ case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1622,6 +1645,9 @@ case RPC_FC_ALIGNM8: ALIGN_POINTER(pMemory, 7); break; + case RPC_FC_STRUCTPAD2: + pMemory += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: pMemory += pFormat[1]; pFormat += 2; @@ -1669,6 +1695,9 @@ case RPC_FC_ALIGNM8: ALIGN_LENGTH(size, 7); break; + case RPC_FC_STRUCTPAD2: + size += 2; + break; case RPC_FC_EMBEDDED_COMPLEX: size += pFormat[1]; pFormat += 2; @@ -1901,7 +1930,8 @@ pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); size = pStubMsg->MaxCount; - pStubMsg->BufferLength += size*esize; + /* conformance value plus array */ + pStubMsg->BufferLength += sizeof(DWORD) + size*esize; EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } @@ -1912,16 +1942,18 @@ unsigned long WINAPI NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - DWORD size = 0; - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); + DWORD size = 0, esize = *(const WORD*)(pFormat+2); + unsigned char *buffer; + + TRACE("(%p,%p)\n", pStubMsg, pFormat); if (pFormat[0] != RPC_FC_CARRAY) FIXME("format=%d\n", pFormat[0]); + buffer = pStubMsg->Buffer; pFormat = ReadConformance(pStubMsg, pFormat+4); + pStubMsg->Buffer = buffer; size = pStubMsg->MaxCount; - EmbeddedPointerMemorySize(pStubMsg, pFormat); - - return 0; + return size*esize; } /*********************************************************************** @@ -1945,7 +1977,35 @@ unsigned char* pMemory, PFORMAT_STRING pFormat ) { - FIXME( "stub\n" ); + DWORD esize = *(const WORD*)(pFormat+2); + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if (pFormat[0] != RPC_FC_CVARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->MaxCount); + pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->Offset); + pStubMsg->Buffer += 4; + NDR_LOCAL_UINT32_WRITE(pStubMsg->Buffer, pStubMsg->ActualCount); + pStubMsg->Buffer += 4; + + memcpy(pStubMsg->Buffer, pMemory + pStubMsg->Offset, pStubMsg->ActualCount*esize); + pStubMsg->BufferMark = pStubMsg->Buffer; + pStubMsg->Buffer += pStubMsg->ActualCount*esize; + + EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); + + STD_OVERFLOW_CHECK(pStubMsg); + return NULL; } @@ -1958,7 +2018,29 @@ PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { - FIXME( "stub\n" ); + DWORD offset; + DWORD esize = *(const WORD*)(pFormat+2); + + TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + + if (pFormat[0] != RPC_FC_CVARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + pFormat = ReadConformance(pStubMsg, pFormat); + offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + pFormat = ReadVariance(pStubMsg, pFormat); + + if (!*ppMemory || fMustAlloc) + *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); + memcpy(*ppMemory + offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); + pStubMsg->Buffer += pStubMsg->ActualCount * esize; + + EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + return NULL; } @@ -1980,7 +2062,26 @@ void WINAPI NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { - FIXME( "stub\n" ); + DWORD esize = *(const WORD*)(pFormat+2); + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if (pFormat[0] != RPC_FC_CVARRAY) + { + ERR("invalid format type %x\n", pFormat[0]); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + /* compute size */ + pFormat = ComputeConformance(pStubMsg, pMemory, pFormat+4, 0); + /* compute length */ + pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, 0); + + /* conformance + offset + variance + array */ + pStubMsg->BufferLength += 3*sizeof(DWORD) + pStubMsg->ActualCount*esize; + + EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } @@ -2269,6 +2370,14 @@ is to raise an exception */ } +typedef struct _NDR_CSTRUCT_FORMAT +{ + unsigned char type; + unsigned char alignment; + unsigned short memory_size; + short offset_to_array_description; +} NDR_CSTRUCT_FORMAT; + /*********************************************************************** * NdrConformantStructMarshall [RPCRT4.@] */ @@ -2276,7 +2385,32 @@ unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; + pFormat += sizeof(NDR_CSTRUCT_FORMAT); + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) + { + ERR("invalid format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + TRACE("memory_size = %d\n", pCStructFormat->memory_size); + + /* copy constant sized part of struct */ + memcpy(pStubMsg->Buffer, pMemory, pCStructFormat->memory_size); + pStubMsg->Buffer += pCStructFormat->memory_size; + + if (pCStructFormat->offset_to_array_description) + { + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + NdrConformantArrayMarshall(pStubMsg, pMemory + pCStructFormat->memory_size, pArrayFormat); + } + if (pCStructFormat->type == RPC_FC_CPSTRUCT) + EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat); return NULL; } @@ -2288,7 +2422,52 @@ PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - FIXME("stub\n"); + const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; + pFormat += sizeof(NDR_CSTRUCT_FORMAT); + + TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + + if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) + { + ERR("invalid format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + TRACE("memory_size = %d\n", pCStructFormat->memory_size); + + /* work out how much memory to allocate if we need to do so */ + if (!*ppMemory || fMustAlloc) + { + SIZE_T size = pCStructFormat->memory_size; + + if (pCStructFormat->offset_to_array_description) + { + unsigned char *buffer; + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + buffer = pStubMsg->Buffer; + pStubMsg->Buffer += pCStructFormat->memory_size; + size += NdrConformantArrayMemorySize(pStubMsg, pArrayFormat); + pStubMsg->Buffer = buffer; + } + *ppMemory = NdrAllocate(pStubMsg, size); + } + + /* now copy the data */ + memcpy(*ppMemory, pStubMsg->Buffer, pCStructFormat->memory_size); + pStubMsg->Buffer += pCStructFormat->memory_size; + if (pCStructFormat->offset_to_array_description) + { + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + unsigned char *pMemoryArray = *ppMemory + pCStructFormat->memory_size; + /* note that we pass fMustAlloc as 0 as we have already allocated the + * memory */ + NdrConformantArrayUnmarshall(pStubMsg, &pMemoryArray, pArrayFormat, 0); + } + if (pCStructFormat->type == RPC_FC_CPSTRUCT) + EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); return NULL; } @@ -2299,7 +2478,30 @@ unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_CSTRUCT_FORMAT * pCStructFormat = (NDR_CSTRUCT_FORMAT*)pFormat; + pFormat += sizeof(NDR_CSTRUCT_FORMAT); + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) + { + ERR("invalid format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + TRACE("memory_size = %d\n", pCStructFormat->memory_size); + + /* add constant sized part of struct to buffer size */ + pStubMsg->BufferLength += pCStructFormat->memory_size; + + if (pCStructFormat->offset_to_array_description) + { + PFORMAT_STRING pArrayFormat = (unsigned char*)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + NdrConformantArrayBufferSize(pStubMsg, pMemory + pCStructFormat->memory_size, pArrayFormat); + } + if (pCStructFormat->type == RPC_FC_CPSTRUCT) + EmbeddedPointerBufferSize(pStubMsg, pMemory, pFormat); } /*********************************************************************** @@ -2694,6 +2896,242 @@ } /*********************************************************************** + * NdrBaseTypeMarshall [internal] + */ +static unsigned char *WINAPI NdrBaseTypeMarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + switch(*pFormat) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + *(UCHAR *)pStubMsg->Buffer = *(UCHAR *)pMemory; + pStubMsg->Buffer += sizeof(UCHAR); + TRACE("value: 0x%02x\n", *(UCHAR *)pMemory); + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + *(USHORT *)pStubMsg->Buffer = *(USHORT *)pMemory; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%04x\n", *(USHORT *)pMemory); + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ERROR_STATUS_T: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); + *(ULONG *)pStubMsg->Buffer = *(ULONG *)pMemory; + pStubMsg->Buffer += sizeof(ULONG); + TRACE("value: 0x%08lx\n", *(ULONG *)pMemory); + break; + case RPC_FC_FLOAT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(float) - 1); + *(float *)pStubMsg->Buffer = *(float *)pMemory; + pStubMsg->Buffer += sizeof(float); + break; + case RPC_FC_DOUBLE: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(double) - 1); + *(double *)pStubMsg->Buffer = *(double *)pMemory; + pStubMsg->Buffer += sizeof(double); + break; + case RPC_FC_HYPER: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG) - 1); + *(ULONGLONG *)pStubMsg->Buffer = *(ULONGLONG *)pMemory; + pStubMsg->Buffer += sizeof(ULONGLONG); + TRACE("value: %s\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory)); + break; + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + default: + FIXME("Unhandled base type: 0x%02x\n", *pFormat); + } + + STD_OVERFLOW_CHECK(pStubMsg); + + /* FIXME: what is the correct return value? */ + return NULL; +} + +/********************************************************************** * + * NdrBaseTypeUnmarshall [internal] + */ +static unsigned char *WINAPI NdrBaseTypeUnmarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + TRACE("pStubMsg: %p, ppMemory: %p, type: 0x%02x, fMustAlloc: %s\n", pStubMsg, ppMemory, *pFormat, fMustAlloc ? "true" : "false"); + + if (fMustAlloc || !*ppMemory) + *ppMemory = NdrAllocate(pStubMsg, NdrBaseTypeMemorySize(pStubMsg, pFormat)); + + TRACE("*ppMemory: %p\n", *ppMemory); + + switch(*pFormat) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + **(UCHAR **)ppMemory = *(UCHAR *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(UCHAR); + TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + **(USHORT **)ppMemory = *(USHORT *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ERROR_STATUS_T: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); + **(ULONG **)ppMemory = *(ULONG *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(ULONG); + TRACE("value: 0x%08lx\n", **(ULONG **)ppMemory); + break; + case RPC_FC_FLOAT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(float) - 1); + **(float **)ppMemory = *(float *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(float); + TRACE("value: %f\n", **(float **)ppMemory); + break; + case RPC_FC_DOUBLE: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(double) - 1); + **(double **)ppMemory = *(double*)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(double); + TRACE("value: %f\n", **(double **)ppMemory); + break; + case RPC_FC_HYPER: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG) - 1); + **(ULONGLONG **)ppMemory = *(ULONGLONG *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(ULONGLONG); + TRACE("value: %s\n", wine_dbgstr_longlong(**(ULONGLONG **)ppMemory)); + break; + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + default: + FIXME("Unhandled base type: 0x%02x\n", *pFormat); + } + + /* FIXME: what is the correct return value? */ + + return NULL; +} + +/********************************************************************** * + * NdrBaseTypeBufferSize [internal] + */ +static void WINAPI NdrBaseTypeBufferSize( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + switch(*pFormat) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + pStubMsg->BufferLength += sizeof(UCHAR); + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(USHORT) - 1); + pStubMsg->BufferLength += sizeof(USHORT); + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONG) - 1); + pStubMsg->BufferLength += sizeof(ULONG); + break; + case RPC_FC_FLOAT: + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(float) - 1); + pStubMsg->BufferLength += sizeof(float); + break; + case RPC_FC_DOUBLE: + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(double) - 1); + pStubMsg->BufferLength += sizeof(double); + break; + case RPC_FC_HYPER: + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONGLONG) - 1); + pStubMsg->BufferLength += sizeof(ULONGLONG); + break; + case RPC_FC_ERROR_STATUS_T: + ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(error_status_t) - 1); + pStubMsg->BufferLength += sizeof(error_status_t); + break; + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + default: + FIXME("Unhandled base type: 0x%02x\n", *pFormat); + } +} + +/********************************************************************** * + * NdrBaseTypeMemorySize [internal] + */ +static unsigned long WINAPI NdrBaseTypeMemorySize( + PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + switch(*pFormat) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + return sizeof(UCHAR); + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + return sizeof(USHORT); + case RPC_FC_LONG: + case RPC_FC_ULONG: + return sizeof(ULONG); + case RPC_FC_FLOAT: + return sizeof(float); + case RPC_FC_DOUBLE: + return sizeof(double); + case RPC_FC_HYPER: + return sizeof(ULONGLONG); + case RPC_FC_ERROR_STATUS_T: + return sizeof(error_status_t); + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + default: + FIXME("Unhandled base type: 0x%02x\n", *pFormat); + return 0; + } +} + +/********************************************************************** * + * NdrBaseTypeFree [internal] + */ +static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p pMemory %p type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + /* nothing to do */ +} + +/********************************************************************** * * NdrClientContextMarshall */ void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, _____ Modified: trunk/reactos/lib/rpcrt4/ndr_midl.c --- trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-12-14 18:55:57 UTC (rev 20166) +++ trunk/reactos/lib/rpcrt4/ndr_midl.c 2005-12-14 19:02:42 UTC (rev 20167) @@ -140,8 +140,12 @@ */ HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) { - FIXME("(0x%08lx): semi-stub\n", dwExceptionCode); - return MAKE_HRESULT(SEVERITY_ERROR, FACILITY_RPC, RPC_S_CALL_FAILED); + WARN("(0x%08lx): a proxy call failed\n", dwExceptionCode); + + if (FAILED(dwExceptionCode)) + return dwExceptionCode; + else + return HRESULT_FROM_WIN32(dwExceptionCode); } /*********************************************************************** @@ -234,12 +238,12 @@ unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle) { TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p): wild guess.\n", stubmsg, buflen, handle); - + assert( stubmsg && stubmsg->RpcMsg ); /* I guess this is our chance to put the binding handle into the RPC_MESSAGE */ stubmsg->RpcMsg->Handle = handle; - + stubmsg->RpcMsg->BufferLength = buflen; if (I_RpcGetBuffer(stubmsg->RpcMsg) != S_OK) return NULL; @@ -249,7 +253,6 @@ stubmsg->BufferEnd = stubmsg->Buffer + stubmsg->BufferLength; return (stubmsg->Buffer = (unsigned char *)stubmsg->RpcMsg->Buffer); } - /*********************************************************************** * NdrFreeBuffer [RPCRT4.@] */ @@ -264,30 +267,29 @@ /*********************************************************************** * * NdrSendReceive [RPCRT4.@] */ -unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *pStubMsg, unsigned char *buffer ) +unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) { - TRACE("(pStubMsg == ^%p, buffer == ^%p)\n", pStubMsg, buffer); + TRACE("(stubmsg == ^%p, buffer == ^%p)\n", stubmsg, buffer); /* FIXME: how to handle errors? (raise exception?) */ - if (!pStubMsg) { + if (!stubmsg) { ERR("NULL stub message. No action taken.\n"); return NULL; } - if (!pStubMsg->RpcMsg) { + if (!stubmsg->RpcMsg) { ERR("RPC Message not present in stub message. No action taken.\n"); return NULL; } - if (I_RpcSendReceive(pStubMsg->RpcMsg) != RPC_S_OK) { + if (I_RpcSendReceive(stubmsg->RpcMsg) != RPC_S_OK) { WARN("I_RpcSendReceive did not return success.\n"); /* FIXME: raise exception? */ - return NULL; } - pStubMsg->BufferLength = pStubMsg->RpcMsg->BufferLength; - pStubMsg->BufferStart = pStubMsg->RpcMsg->Buffer; - pStubMsg->BufferEnd = pStubMsg->BufferStart + pStubMsg->BufferLength; - pStubMsg->Buffer = pStubMsg->BufferStart; + stubmsg->BufferLength = stubmsg->RpcMsg->BufferLength; + stubmsg->BufferStart = stubmsg->RpcMsg->Buffer; + stubmsg->BufferEnd = stubmsg->BufferStart + stubmsg->BufferLength; + stubmsg->Buffer = stubmsg->BufferStart; /* FIXME: is this the right return value? */ return NULL; _____ Modified: trunk/reactos/lib/rpcrt4/ndr_misc.h --- trunk/reactos/lib/rpcrt4/ndr_misc.h 2005-12-14 18:55:57 UTC (rev 20166) +++ trunk/reactos/lib/rpcrt4/ndr_misc.h 2005-12-14 19:02:42 UTC (rev 20167) @@ -35,8 +35,11 @@ HRESULT RPCRT4_GetPSFactory(REFIID riid, struct IPSFactoryBuffer **ppPS); -PFORMAT_STRING ComputeConformance(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, - PFORMAT_STRING pFormat, ULONG_PTR def); +#define ComputeConformance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->MaxCount) +#define ComputeVariance(pStubMsg, pMemory, pFormat, def) ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->ActualCount) +PFORMAT_STRING ComputeConformanceOrVariance( + MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pMemory, + PFORMAT_STRING pFormat, ULONG_PTR def, ULONG *pCount); typedef unsigned char* (WINAPI *NDR_MARSHALL) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING); typedef unsigned char* (WINAPI *NDR_UNMARSHALL)(PMIDL_STUB_MESSAGE, unsigned char**,PFORMAT_STRING, unsigned char); _____ Modified: trunk/reactos/lib/rpcrt4/ndr_ole.c --- trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-12-14 18:55:57 UTC (rev 20166) +++ trunk/reactos/lib/rpcrt4/ndr_ole.c 2005-12-14 19:02:42 UTC (rev 20167) @@ -254,13 +254,17 @@ TRACE("(%p,%p,%p)\n", pStubMsg, pMemory, pFormat); pStubMsg->MaxCount = 0; if (!LoadCOM()) return NULL; - if (pStubMsg->Buffer + sizeof(DWORD) < pStubMsg->BufferEnd) { + if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { stream = RpcStream_Create(pStubMsg, TRUE); if (stream) { hr = COM_MarshalInterface(stream, riid, (LPUNKNOWN)pMemory, pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); IStream_Release(stream); + if (FAILED(hr)) { + IUnknown_Release((LPUNKNOWN)pMemory); + RpcRaiseException(hr); + } } } return NULL; @@ -280,11 +284,13 @@ TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (!LoadCOM()) return NULL; *(LPVOID*)ppMemory = NULL; - if (pStubMsg->Buffer + sizeof(DWORD) < pStubMsg->BufferEnd) { + if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { stream = RpcStream_Create(pStubMsg, FALSE); if (stream) { hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); IStream_Release(stream); + if (FAILED(hr)) + RpcRaiseException(hr); } } [truncated at 1000 lines; 10 more skipped]

18 years, 9 months

← Newer
1
...
30
31
32
33
34
35
36
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005