Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[mkupfer] 34579: Mario Kacmar <kario AT szm DOT sk> - Enhancement for Slovak keyboard layout (QWERTY) added. - See #3528 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Jul 18 16:05:40 2008 New Revision: 34579 URL: http://svn.reactos.org/svn/reactos?rev=34579&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Enhancement for Slovak keyboard layout (QWERTY) added. - See #3528 for more details. Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c [iso-8859-1] Fri Jul 18 16:05:40 2008 @@ -401,6 +401,8 @@ { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u with acute { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y with acute { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute + { DEADTRANS(0x005a, 0x00b4, 0x0179, 0x0000) }, // Z with acute + { DEADTRANS(0x007a, 0x00b4, 0x017a, 0x0000) }, // z with acute { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, // O with circumflex

16 years, 2 months

[mkupfer] 34578: Mario Kacmar <kario AT szm DOT sk> - Slovak and Czech translation of several rc-files - See #3519 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Jul 18 15:58:09 2008 New Revision: 34578 URL: http://svn.reactos.org/svn/reactos?rev=34578&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Slovak and Czech translation of several rc-files - See #3519 for more details. Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -1,5 +1,10 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 30-01-2008 +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 30-01-2008 + * LAST CHANGE: 10-07-2008 + * --------------------------------------- + * TODO: + * 1. treba usporiada jednotky pod¾a abecedy + * 2. pridanie navigaèných znaèiek "&" */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -235,25 +240,25 @@ IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Kalkulaèka systému ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + PUSHBUTTON "Previes",IDC_BUTTON_CONVERT,35,105,76,17 COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Category:",IDC_STATIC,4,20,56,8 + LTEXT "Kategória:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + LTEXT "Previes z:",IDC_STATIC,4,49,56,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + LTEXT "Previes na:",IDC_STATIC,4,76,56,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 - CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + CONTROL "Spä",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, 40,17 RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, @@ -448,54 +453,54 @@ // types of conversion STRINGTABLE DISCARDABLE BEGIN - IDS_CONV_AREA "Area" - IDS_CONV_CONSUMPTION "Consumption (engines)" - IDS_CONV_CURRENCY "Currencies" - IDS_CONV_ENERGY "Energy" - IDS_CONV_LENGTH "Lenghts" - IDS_CONV_POWER "Power" - IDS_CONV_PRESSURE "Pressure" - IDS_CONV_TEMPERATURE "Temperature" - IDS_CONV_VELOCITY "Velocity" - IDS_CONV_VOLUME "Volume" - IDS_CONV_WEIGHT "Weights" + IDS_CONV_LENGTH "Dåka" + IDS_CONV_ENERGY "Energia" + IDS_CONV_WEIGHT "Hmotnos" + IDS_CONV_CURRENCY "Mena" + IDS_CONV_VOLUME "Objem" + IDS_CONV_AREA "Plocha" + IDS_CONV_VELOCITY "Rýchlos" + IDS_CONV_CONSUMPTION "Spotreba motorov" //Spotreba (motory) + IDS_CONV_TEMPERATURE "Teplota" + IDS_CONV_PRESSURE "Tlak" + IDS_CONV_POWER "Výkon" END // TYPES OF AREAS STRINGTABLE DISCARDABLE BEGIN - IDS_AREA_ACRES "Acres" - IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" - IDS_AREA_ACRES_FRANCE "Acres (France)" - IDS_AREA_ACRES_SCOTS "Acres (Scots)" - IDS_AREA_ACRES_US "Acres (US)" - IDS_AREA_ARES "Ares" + IDS_AREA_ACRES "Akre" + IDS_AREA_ACRES_BRAZIL "Akre (Brazília)" + IDS_AREA_ACRES_FRANCE "Akre (Francúzsko)" + IDS_AREA_ACRES_SCOTS "Akre (kótsko)" + IDS_AREA_ACRES_US "Akre (USA)" + IDS_AREA_ARES "Áre" IDS_AREA_CHOU "Chou" IDS_AREA_DANBO "Danbo" - IDS_AREA_HECTARES "Hectares" + IDS_AREA_HECTARES "Hektáre" IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MORGEN_HUNGARY "Morgen (Maïarsko)" IDS_AREA_MU "Mu" IDS_AREA_PING "Ping" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" - IDS_AREA_SQUARE_CHR "Square chr" - IDS_AREA_SQUARE_FATHOMS "Square fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Square feet" - IDS_AREA_SQUARE_INCHES "Square inches" - IDS_AREA_SQUARE_KILOMETERS "Square kilometers" - IDS_AREA_SQUARE_LAR "Square lar" - IDS_AREA_SQUARE_METER "Square meter" - IDS_AREA_SQUARE_MILES "Square miles" - IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" - IDS_AREA_SQUARE_SHAKU "Square shaku" - IDS_AREA_SQUARE_TSUEN "Square tsuen" - IDS_AREA_SQUARE_VA "Square va" - IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_SQUARE_CENTIMETERS "tvorcové centimetre" + IDS_AREA_SQUARE_CHR "tvorcový chr" + IDS_AREA_SQUARE_FATHOMS "tvorcové siahy" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "tvorcové siahy (Maïarsko)" + IDS_AREA_SQUARE_FEET "tvorcové stopy" + IDS_AREA_SQUARE_INCHES "tvorcové palce" + IDS_AREA_SQUARE_KILOMETERS "tvorcové kilometre" + IDS_AREA_SQUARE_LAR "tvorcový lar" + IDS_AREA_SQUARE_METER "tvorcové meter" + IDS_AREA_SQUARE_MILES "tvorcové míle" + IDS_AREA_SQUARE_MILLIMETERS "tvorcové milimetre" + IDS_AREA_SQUARE_SHAKU "tvorcový shaku" + IDS_AREA_SQUARE_TSUEN "tvorcový tsuen" + IDS_AREA_SQUARE_VA "tvorcový va" + IDS_AREA_SQUARE_YARD "tvorcový yard" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -504,30 +509,30 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" - IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" - IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" + IDS_CONSUMPTION_L_PER_100_KM "Litre/100 kilometerov" + IDS_CONSUMPTION_MILES_GALLON_UK "Míle/galón (UK)" + IDS_CONSUMPTION_MILES_GALLON_US "Míle/galón (USA)" END // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" - IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakúzsky iling" + IDS_CURRENCY_BELGIAN_FRANC "Belgický frank" IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" - IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" - IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_DEUTSCHE_MARK "Nemecká marka" + IDS_CURRENCY_DUTCH_GUILDER "Holandský gulden" IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" - IDS_CURRENCY_FRENCH_FRANC "French franc" - IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" + IDS_CURRENCY_FINNISH_MARKKA "Finská marka" + IDS_CURRENCY_FRENCH_FRANC "Francúzsky frank" + IDS_CURRENCY_GREEK_DRACHMA "Grécka drachma" IDS_CURRENCY_IRISH_POUND "Irish pound" IDS_CURRENCY_ITALIAN_LIRA "Italian lira" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" - IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" + IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský toliar" + IDS_CURRENCY_SPANISH_PESETA "panielska peseta" END // TYPES OF ENERGIES @@ -538,7 +543,7 @@ IDS_ENERGY_IT_CALORIES "International Table calories" IDS_ENERGY_JOULES "Joules" IDS_ENERGY_KILOJOULES "Kilojoules" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" + IDS_ENERGY_KILOWATT_HOURS "Kilowatthodiny" IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" IDS_ENERGY_TH_CALORIES "Thermochemical calorie" END @@ -549,38 +554,38 @@ IDS_LENGTH_ANGSTROMS "Angstroms" IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" IDS_LENGTH_BARLEYCORNS "Barleycorns" - IDS_LENGTH_CENTIMETERS "Centimeters" + IDS_LENGTH_CENTIMETERS "Centimetre" IDS_LENGTH_CHAINS_UK "Chains (UK)" IDS_LENGTH_CHI "Chi" IDS_LENGTH_CHOU "Chou" IDS_LENGTH_CHR "Chr" IDS_LENGTH_CUN "Cun" - IDS_LENGTH_FATHOMS "Fathoms" - IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" - IDS_LENGTH_FEET "Feet" + IDS_LENGTH_FATHOMS "Siahy" + IDS_LENGTH_FATHOMS_HUNGARY "Siahy (Maïarsko)" + IDS_LENGTH_FEET "Stopy" IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_GAN "Gan" IDS_LENGTH_HANDS "Hands" IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_INCHES "Inches" + IDS_LENGTH_INCHES "Palce" IDS_LENGTH_JA "Ja" IDS_LENGTH_JEONG "Jeong" IDS_LENGTH_KABIET "Kabiet" IDS_LENGTH_KEN "Ken" IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometers" + IDS_LENGTH_KILOMETERS "Kilometre" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LIGHT_YEARS "Svetelné roky" IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Meters" - IDS_LENGTH_MILES "Miles" - IDS_LENGTH_MILLIMETERS "Millimeters" - IDS_LENGTH_NAUTICAL_MILES "Nautical miles" + IDS_LENGTH_METERS "Metre" + IDS_LENGTH_MILES "Míle" + IDS_LENGTH_MILLIMETERS "Milimetre" + IDS_LENGTH_NAUTICAL_MILES "Námorné míle" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PARSECS "Parsecy" IDS_LENGTH_PICAS "Picas" - IDS_LENGTH_RI_JAPAN "Ri (Japan)" - IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_RI_JAPAN "Ri (Japonsko)" + IDS_LENGTH_RI_KOREA "Ri (Kórea)" IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" @@ -588,7 +593,7 @@ IDS_LENGTH_SUN "Sun" IDS_LENGTH_TSUEN "Tsuen" IDS_LENGTH_VA "Va" - IDS_LENGTH_YARDS "Yards" + IDS_LENGTH_YARDS "Yardy" IDS_LENGTH_YOTE "Yote" IDS_LENGTH_ZHANG "Zhang" END @@ -596,17 +601,17 @@ // TYPES OF POWERS STRINGTABLE DISCARDABLE BEGIN - IDS_POWER_HORSEPOWER "Horsepower" - IDS_POWER_KILOWATTS "Kilowatts" - IDS_POWER_MEGAWATTS "Megawatts" - IDS_POWER_WATTS "Watts" + IDS_POWER_HORSEPOWER "Koòské sily" + IDS_POWER_KILOWATTS "Kilowatty" + IDS_POWER_MEGAWATTS "Megawatty" + IDS_POWER_WATTS "Watty" END // TYPE OF PRESSURES STRINGTABLE DISCARDABLE BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmospheres" - IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_ATMOSPHERES "Atmosféry" + IDS_PRESSURE_BARS "Bary" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" IDS_PRESSURE_PASCALS "Pascals" IDS_PRESSURE_PSI "Pounds-force per square inch" @@ -624,46 +629,46 @@ // TYPES OF VELOCITIES STRINGTABLE DISCARDABLE BEGIN - IDS_VELOCITY_FEET_HOUR "Feet/hour" - IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" + IDS_VELOCITY_FEET_HOUR "Stopy/hodinu" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometre/hodinu" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach" - IDS_VELOCITY_METERS_SECOND "Meters/second" - IDS_VELOCITY_MILES_HOUR "Miles/hour" + IDS_VELOCITY_METERS_SECOND "Metre/sekundu" + IDS_VELOCITY_MILES_HOUR "Míle/hodinu" END // TYPES OF VOLUMES STRINGTABLE DISCARDABLE BEGIN - IDS_VOLUME_BARRELS_UK "Barrels (UK)" - IDS_VOLUME_BARRELS_OIL "Barrels oil" + IDS_VOLUME_BARRELS_UK "Barely (UK)" + IDS_VOLUME_BARRELS_OIL "Barely ropy" //oleja? IDS_VOLUME_BUN "Bun" - IDS_VOLUME_BUSHELS_UK "Bushels (UK)" - IDS_VOLUME_BUSHELS_US "Bushels (US)" - IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" - IDS_VOLUME_CUBIC_FEET "Cubic feet" - IDS_VOLUME_CUBIC_INCHES "Cubic inches" - IDS_VOLUME_CUBIC_METERS "Cubic meters" - IDS_VOLUME_CUBIC_YARDS "Cubic yards" + IDS_VOLUME_BUSHELS_UK "Buely (UK)" //Buel, Bule? Buly? + IDS_VOLUME_BUSHELS_US "Buely (USA)" + IDS_VOLUME_CUBIC_CENTIMETERS "Kubické centimetre" + IDS_VOLUME_CUBIC_FEET "Kubické stopy" + IDS_VOLUME_CUBIC_INCHES "Kubické palce" + IDS_VOLUME_CUBIC_METERS "Kubické metre" + IDS_VOLUME_CUBIC_YARDS "Kubické yardy" IDS_VOLUME_DOE "Doe" IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" - IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" - IDS_VOLUME_GALLONS_UK "Gallons (UK)" - IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" - IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" + IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (USA)" + IDS_VOLUME_GALLONS_UK "Galóny (UK)" + IDS_VOLUME_GALLONS_DRY_US "Galóny, suché (USA)" + IDS_VOLUME_GALLONS_LIQUID_US "Galóny, tekuté (USA)" IDS_VOLUME_GOU "Gou" IDS_VOLUME_HOP "Hop" IDS_VOLUME_ICCE "Icce" IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Liters" + IDS_VOLUME_LITERS "Litre" IDS_VOLUME_MAL "Mal" - IDS_VOLUME_MILLILITERS "Milliliters" - IDS_VOLUME_PINTS_UK "Pints (UK)" - IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" - IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" - IDS_VOLUME_QUARTS_UK "Quarts (UK)" - IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" - IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" + IDS_VOLUME_MILLILITERS "Mililitre" + IDS_VOLUME_PINTS_UK "Pinty (UK)" //pinta alebo polliter + IDS_VOLUME_PINTS_DRY_US "Pinty, suché (USA)" + IDS_VOLUME_PINTS_LIQUID_US "Pinty, tekuté (USA)" + IDS_VOLUME_QUARTS_UK "Quarts (UK)" //tvrgalóny, tvrtiny, tvrky + IDS_VOLUME_QUARTS_DRY_US "Quarts, suché (USA)" + IDS_VOLUME_QUARTS_LIQUID_US "Quarts, tekuté (USA)" IDS_VOLUME_SEKI "Seki" IDS_VOLUME_SYOU "Syou" IDS_VOLUME_TANANLOUNG "Tananloung" @@ -675,29 +680,29 @@ STRINGTABLE DISCARDABLE BEGIN IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CARATS "Karáty" IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GRAMS "Gramy" IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" - IDS_WEIGHT_JIN_CHINA "Jin (China)" - IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" + IDS_WEIGHT_JIN_CHINA "Jin (Èína)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Tchajvan)" IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_KILOGRAMS "Kilograms" + IDS_WEIGHT_KILOGRAMS "Kilogramy" IDS_WEIGHT_KIN "Kin" - IDS_WEIGHT_LIANG_CHINA "Liang (China)" - IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_LIANG_CHINA "Liang (Èína)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Tchajvan)" IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" - IDS_WEIGHT_OUNCES_TROY "Ounces, troy" - IDS_WEIGHT_POUNDS "Pounds" - IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Unce, anglosaská" + IDS_WEIGHT_OUNCES_TROY "Unce, trójska" + IDS_WEIGHT_POUNDS "Libry" + IDS_WEIGHT_QUINTAL_METRIC "Cent (metrický)" IDS_WEIGHT_SALOUNG "Saloung" IDS_WEIGHT_STONES "Stones" IDS_WEIGHT_TAMLUNG "Tamlung" - IDS_WEIGHT_TONNES "Tonnes" - IDS_WEIGHT_TONS_UK "Tons (UK)" - IDS_WEIGHT_TONS_US "Tons (US)" -END + IDS_WEIGHT_TONNES "Tony" + IDS_WEIGHT_TONS_UK "Tony (UK)" + IDS_WEIGHT_TONS_US "Tony (USA)" +END Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -66,7 +66,7 @@ MENUITEM "&Balíèek...", IDM_GAME_DECK MENUITEM "&Monosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR - MENUITEM "Sk&onèi", IDM_GAME_EXIT + MENUITEM "S&konèi", IDM_GAME_EXIT END POPUP "&Pomocník" BEGIN Modified: trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/lang/cs-CZ.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -2,7 +2,7 @@ * PURPOSE: Czech Language File * TRANSLATOR: Stepan Gabriel - SGABA (sgaba(a)centrum.cz) * TRANSLATED FROM: Slovak translation by Kario (kario(a)szm.sk) - * UPDATED: 2008-04-07 + * UPDATED: 2008-07-06 * * Czech translation * Copyleft 2007 Kario (kario(a)szm.sk),2008 SGABA (sgaba(a)centrum.cz) @@ -34,7 +34,7 @@ MENUITEM SEPARATOR MENUITEM "&Nejlepí èasy...", IDM_TIMES MENUITEM SEPARATOR - MENUITEM "Sk&onèit", IDM_EXIT + MENUITEM "&Konec", IDM_EXIT END POPUP "&Info" //windows = &Pomocník BEGIN Modified: trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -28,7 +28,7 @@ MENUITEM SEPARATOR MENUITEM "&Najlepie èasy...", IDM_TIMES MENUITEM SEPARATOR - MENUITEM "Sk&onèi", IDM_EXIT + MENUITEM "S&konèi", IDM_EXIT END POPUP "&Info" //windows = &Pomocník BEGIN Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -1,12 +1,19 @@ -// Slovak translation by Kario 2007 <kario(a)szm.sk> +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: xx-xx-2007 + * LAST UPDATE: 06-07-2008 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -/* String Tables */ -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "Intalácia systému ReactOS" - IDS_TEXT "Systém ReactOS sa z tohto CD nedá naintalova ihneï!\n\n\Retartujte, prosím, poèítaè a intalaèné CD nechajte\nvloené, aby sa mohol systém ReactOS naintalova." + LTEXT "Víta Vás sprievodca intaláciou systému ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "Systém ReactOS sa z tohto CD nedá naintalova ihneï! "\ + "Retartujte, prosím, poèítaè a intalaèné CD nechajte "\ + "vloené, aby sa mohol systém ReactOS naintalova.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Intaláciu ukonèíte kliknutím na tlaèidlo Dokonèi.", IDC_STATIC, 115, 169, 195, 17 END /* EOF */ Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -19,9 +19,9 @@ #include "lang/nl-NL.rc"*/ #include "lang/pl-PL.rc" /*#include "lang/pt-BR.rc" -#include "lang/ru-RU.rc" +#include "lang/ru-RU.rc"*/ #include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" +/*#include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc"*/ Modified: trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/sk… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -36,7 +36,7 @@ CAPTION "Intalácia ovladaèa obrazovky" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ovládaè obrazovky VMware(r) SVGA bol úspene naintalovaný. Nyní, prosím, vyberte preferované rozliení obrazovky:",-1,25,5,225,20 + LTEXT "Ovládaè obrazovky VMware(r) SVGA bol úspene naintalovaný. Teraz, prosím, vyberte preferované rozlíenie obrazovky:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -3,7 +3,7 @@ * PURPOSE: Slovak Language File for desk * TRANSLATOR: Kario <kario(a)szm.sk> * DATE OF TR.: 15-09-2007 - * LAST CHANGE: 29-02-2008 + * LAST CHANGE: 11-07-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -49,7 +49,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "Napájani&e monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Ak chcete upravi nastavenie napájania monitora a uetri energiu, kliknite na tlaèidlo Napájanie.", - IDC_STATIC, 14, 166, 146 ,20 + IDC_STATIC, 14, 166, 146 ,27 PUSHBUTTON "N&apájanie...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END @@ -109,14 +109,14 @@ CAPTION "Nastavenie" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ahaním zoraïte ikony monitorov pod¾a fyzického rozmiestnenia monitorov.",-1,3,3,240,10 + LTEXT "ahaním zoraïte ikony pod¾a fyzického rozmiestnenia monitorov.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Monitor:",1820,3,100,30,8 LTEXT "<Nie je>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Rozlíenie obrazovky",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 - LTEXT "niie",1815,9,130,15,8,NOT WS_GROUP + LTEXT "niie",1815,9,130,20,8,NOT WS_GROUP LTEXT "vyie",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Farby",1817,125,120,115,43 Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Fri Jul 18 15:58:09 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * NOTE : partially translated * TRANSLATED : 26-12-2007 - * LAST CHANGE: 28-06-2008 + * LAST CHANGE: 07-07-2008 */ /* @@ -551,13 +551,13 @@ IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "Zmena ikony" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...",IDC_BUTTON_PATH, 148, 24,67,14 + LTEXT "Názov súboru:", -1, 7, 14, 208, 10 + PUSHBUTTON "&Preh¾adáva...",IDC_BUTTON_PATH, 148, 24,67,14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "Ikony:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST,7,57,208,119,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK, 107, 181,50, 14 PUSHBUTTON "Zrui",IDCANCEL, 167, 181, 50, 14 @@ -659,9 +659,9 @@ IDS_SHELL_ABOUT_AUTHORS "&Autori" IDS_SHELL_ABOUT_BACK "< &Spä" - FCIDM_SHVIEW_NEW "&Nový" + FCIDM_SHVIEW_NEW "&Nový" FCIDM_SHVIEW_NEWFOLDER "&Prieèinok" - FCIDM_SHVIEW_NEWLINK "&Odkaz" + FCIDM_SHVIEW_NEWLINK "&Odkaz" IDS_FOLDER_OPTIONS "Monosti prieèinka" IDS_RECYCLEBIN_LOCATION "Umiestnenia Koa" //Recycle Bin Location IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto" @@ -686,11 +686,11 @@ IDS_LNK_FILE "Odkaz" IDS_SYS_FILE "Systémový súbor" - IDS_OPEN_VERB "Open" - IDS_RUNAS_VERB "Run as " - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" -END + IDS_OPEN_VERB "Otvori" + IDS_RUNAS_VERB "Spusti ako " + IDS_EDIT_VERB "Upravi" + IDS_FIND_VERB "Find" //Nájs, H¾ada, Vyh¾ada ??? + IDS_PRINT_VERB "Tlaèi" + IDS_PLAY_VERB "Prehra" + IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukáka, Prezrie ??? +END

16 years, 2 months

[pschweitzer] 34577: Bugfixes: - FsRtlDissectDbcs, FsRtlDissectName: zero output memory before use - FsRtlDissectName: fixed output string length calculation - FsRtlIsFatDbcsLegal: removed useless code thanks to fixes in FsRtlDissectDbcs

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Jul 18 14:35:57 2008 New Revision: 34577 URL: http://svn.reactos.org/svn/reactos?rev=34577&view=rev Log: Bugfixes: - FsRtlDissectDbcs, FsRtlDissectName: zero output memory before use - FsRtlDissectName: fixed output string length calculation - FsRtlIsFatDbcsLegal: removed useless code thanks to fixes in FsRtlDissectDbcs Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c branches/pierre-fsd/ntoskrnl/fsrtl/name.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Fri Jul 18 14:35:57 2008 @@ -49,6 +49,10 @@ ULONG FirstPosition, i; ULONG SkipFirstSlash = 0; + /* Zero the strings before continuing */ + RtlZeroMemory(FirstPart, sizeof(*FirstPart)); + RtlZeroMemory(RemainingPart, sizeof(*RemainingPart)); + /* Just quit if the string is empty */ if (!Name.Length) return; @@ -209,10 +213,6 @@ DbcsName.MaximumLength = DbcsName.MaximumLength - 1; } - /* Zero strings for further use */ - RtlZeroMemory(&FirstPart, sizeof(FirstPart)); - RtlZeroMemory(&RemainingPart, sizeof(RemainingPart)); - /* Extract first part of the DbcsName to work on */ FsRtlDissectDbcs(DbcsName, &FirstPart, &RemainingPart); while (FirstPart.Length > 0) @@ -283,8 +283,6 @@ Name.Buffer = RemainingPart.Buffer; Name.Length = RemainingPart.Length; Name.MaximumLength = RemainingPart.MaximumLength; - RtlZeroMemory(&FirstPart, sizeof(FirstPart)); - RtlZeroMemory(&RemainingPart, sizeof(RemainingPart)); /* Call once again our dissect function */ FsRtlDissectDbcs(Name, &FirstPart, &RemainingPart); Modified: branches/pierre-fsd/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/name.… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/name.c [iso-8859-1] Fri Jul 18 14:35:57 2008 @@ -142,6 +142,10 @@ ULONG FirstPosition, i; ULONG SkipFirstSlash = 0; + /* Zero the strings before continuing */ + RtlZeroMemory(FirstPart, sizeof(*FirstPart)); + RtlZeroMemory(RemainingPart, sizeof(*RemainingPart)); + /* Just quit if the string is empty */ if (!Name.Length) return; @@ -175,7 +179,7 @@ if (FirstPosition < (Name.Length / sizeof(WCHAR))) { RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; - RemainingPart->Length = (Name.Length - FirstPosition) * sizeof(WCHAR); + RemainingPart->Length = Name.Length - (FirstPosition + 1) * sizeof(WCHAR); RemainingPart->MaximumLength = Name.MaximumLength - RemainingPart->Length; } }

16 years, 2 months

[frik85] 34576: * update GUI interface, according to http://www.reactos.org/wiki/index.php/First_Stage_GUI_Setup

by frik85＠svn.reactos.org

Author: frik85 Date: Fri Jul 18 14:35:03 2008 New Revision: 34576 URL: http://svn.reactos.org/svn/reactos?rev=34576&view=rev Log: * update GUI interface, according to http://www.reactos.org/wiki/index.php/First_Stage_GUI_Setup Added: trunk/reactos/base/setup/reactos/res/rosbitmap.bmp (with props) Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Fri Jul 18 14:35:03 2008 @@ -19,10 +19,11 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Please choose the language used for the installation process." - , IDC_STATIC, 10, 0, 297, 10 - LTEXT "The selected language will be the default language for the final system.", IDC_STATIC, 10, 13, 297, 10 - LISTBOX IDC_LANGUAGES, 10,28,297,142,LBS_HASSTRINGS | WS_VSCROLL + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, 18, 7, 290, 74 + CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 99, 106, 11 + CONTROL "", IDC_LANGUAGES,"ComboBox",WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 97, 176, 142 + CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 132, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 131, 176, 81 LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 END @@ -49,8 +50,6 @@ CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Keyboard layout:", IDC_STATIC, 20,75, 80, 10 - CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 75, 150, 80 LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 END @@ -59,19 +58,26 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,102 - LISTBOX IDC_PARTITION, 20,13,277,70,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create" ,IDC_PARTCREATE, 20,83,50,15 - PUSHBUTTON "&Delete" ,IDC_PARTDELETE, 75,83,50,15 + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 10,103,297,30 - EDITTEXT IDC_PATH, 20,113,277,12, WS_VISIBLE +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Advanced Partition Settings" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,136,297,40 + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 147, 277, 10 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP /* | WS_DISABLED*/ , 20, 159, 277, 10 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rc [iso-8859-1] Fri Jul 18 14:35:03 2008 @@ -17,6 +17,7 @@ /* Bitmaps */ IDB_WATERMARK BITMAP "res/watermark.bmp" IDB_HEADER BITMAP "res/header.bmp" +IDB_ROSLOGO BITMAP "res/rosbitmap.bmp" /* Language-specific resources */ #include "rsrc.rc" Added: trunk/reactos/base/setup/reactos/res/rosbitmap.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/ros… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/setup/reactos/res/rosbitmap.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Fri Jul 18 14:35:03 2008 @@ -3,7 +3,8 @@ #define RESOURCE_H #define IDB_WATERMARK 100 -#define IDB_HEADER 101 +#define IDB_HEADER 101 +#define IDB_ROSLOGO 102 #define IDC_STATIC -1 @@ -48,6 +49,8 @@ #define IDS_ABORTSETUP 2038 #define IDS_ABORTSETUP2 2039 #define IDC_ACTION 2040 +#define IDC_PARTMOREOPTS 2041 + #define IDI_MAIN 3000

16 years, 2 months

[jimtabor] 34575: Update WinUser, CWPRETSTRUCT and MOUSEHOOKSTRUCTEX.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jul 18 13:09:12 2008 New Revision: 34575 URL: http://svn.reactos.org/svn/reactos?rev=34575&view=rev Log: Update WinUser, CWPRETSTRUCT and MOUSEHOOKSTRUCTEX. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 18 13:09:12 2008 @@ -2797,7 +2797,7 @@ WPARAM wParam; DWORD message; HWND hwnd; -} CWPRETSTRUCT; +} CWPRETSTRUCT,*PCWPRETSTRUCT, *LPCWPRETSTRUCT; typedef struct tagCWPSTRUCT { LPARAM lParam; WPARAM wParam; @@ -3190,6 +3190,20 @@ UINT wHitTestCode; DWORD dwExtraInfo; } MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT; +#if ( _WIN32_WINNT >= 0x0500 ) +#ifdef __cplusplus +typedef struct tagMOUSEHOOKSTRUCTEX : public tagMOUSEHOOKSTRUCT +{ + DWORD mouseData; +} MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX; +#else +typedef struct tagMOUSEHOOKSTRUCTEX +{ + MOUSEHOOKSTRUCT MOUSEHOOKSTRUCT; + DWORD mouseData; +} MOUSEHOOKSTRUCTEX, *LPMOUSEHOOKSTRUCTEX, *PMOUSEHOOKSTRUCTEX; +#endif +#endif typedef struct tagTRACKMOUSEEVENT { DWORD cbSize; DWORD dwFlags;

16 years, 2 months

[arty] 34574: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Reenable spinlocks in MiniIndicateData - Don't raise IRQL when calling MiniDoRequest

by arty＠svn.reactos.org

Author: arty Date: Fri Jul 18 06:19:29 2008 New Revision: 34574 URL: http://svn.reactos.org/svn/reactos?rev=34574&view=rev Log: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Reenable spinlocks in MiniIndicateData - Don't raise IRQL when calling MiniDoRequest Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Jul 18 06:19:29 2008 @@ -156,7 +156,7 @@ * PacketSize = Total size of received packet */ { - /* KIRQL OldIrql; */ + KIRQL OldIrql; PLIST_ENTRY CurrentEntry; PADAPTER_BINDING AdapterBinding; @@ -166,27 +166,8 @@ MiniDisplayPacket2(HeaderBuffer, HeaderBufferSize, LookaheadBuffer, LookaheadBufferSize); - /* - * XXX Think about this. This is probably broken. Spinlocks are - * taken out for now until i comprehend the Right Way to do this. - * - * This used to acquire the MiniportBlock spinlock and hold it until - * just before the call to ReceiveHandler. It would then release and - * subsequently re-acquire the lock. - * - * I don't see how this does any good, as it would seem he's just - * trying to protect the packet list. If somebody else dequeues - * a packet, we are in fact in bad shape, but we don't want to - * necessarily call the receive handler at elevated irql either. - * - * therefore: We *are* going to call the receive handler at high irql - * (due to holding the lock) for now, and eventually we have to - * figure out another way to protect this packet list. - * - * UPDATE: this is busted; this results in a recursive lock acquisition. - */ - //NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - //KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { CurrentEntry = Adapter->ProtocolListHead.Flink; NDIS_DbgPrint(DEBUG_MINIPORT, ("CurrentEntry = %x\n", CurrentEntry)); @@ -201,8 +182,7 @@ AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry); NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding)); - /* see above */ - /* KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); */ + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); #ifdef DBG if(!AdapterBinding) @@ -246,13 +226,12 @@ LookaheadBufferSize, PacketSize); - /* see above */ - /* KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); */ + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); CurrentEntry = CurrentEntry->Flink; } } - //KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Jul 18 06:19:29 2008 @@ -161,14 +161,10 @@ KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - /* MiniportQueryInformation (called by MiniDoRequest) runs at DISPATCH_LEVEL */ - /* TODO (?): move the irql raise into MiniDoRequest */ - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - { NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, NdisRequest); NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); { NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to free\n")); Adapter->MiniportBusy = FALSE; @@ -176,9 +172,7 @@ if (Adapter->WorkQueueHead) KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL); } - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - } - KeLowerIrql(OldIrql); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return NdisStatus; }

16 years, 2 months

[pschweitzer] 34573: - Reimplemented FsRtlIsFatDbcsLegal to match with Windows one (XP SP3 was the test platform) - Fixed bugs in FsRtlDissectDbcs - Fixed the kernl exports for FsRtlIsFatDbcsLegal - Fixed build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Jul 18 04:15:53 2008 New Revision: 34573 URL: http://svn.reactos.org/svn/reactos?rev=34573&view=rev Log: - Reimplemented FsRtlIsFatDbcsLegal to match with Windows one (XP SP3 was the test platform) - Fixed bugs in FsRtlDissectDbcs - Fixed the kernl exports for FsRtlIsFatDbcsLegal - Fixed build Modified: branches/pierre-fsd/include/ddk/ntifs.h branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Fri Jul 18 04:15:53 2008 @@ -3287,6 +3287,12 @@ IN POPLOCK Oplock ); +typedef VOID +(NTAPI *PFSRTL_STACK_OVERFLOW_ROUTINE) ( + IN PVOID Context, + IN PKEVENT Event +); + NTKERNELAPI VOID NTAPI @@ -3294,12 +3300,6 @@ IN PVOID Context, IN PKEVENT Event, IN PFSRTL_STACK_OVERFLOW_ROUTINE StackOverflowRoutine -); - -typedef VOID -(NTAPI *PFSRTL_STACK_OVERFLOW_ROUTINE) ( - IN PVOID Context, - IN PKEVENT Event ); NTKERNELAPI Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Fri Jul 18 04:15:53 2008 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/fsrtl/name.c * PURPOSE: Provides DBCS parsing and other support routines for FSDs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Pierre Schweitzer (heis_spiter(a)hotmail.com) */ /* INCLUDES ******************************************************************/ @@ -52,11 +53,16 @@ if (!Name.Length) return; /* Find first backslash */ - FirstPosition = Name.Length / sizeof(CHAR) ; + FirstPosition = Name.Length / sizeof(CHAR); for (i = 0; i < Name.Length / sizeof(CHAR); i++) { + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(Name->Buffer[i])) + { + i++; + } /* If we found one... */ - if (Name.Buffer[i] == '\\') + else if (Name.Buffer[i] == '\\') { /* If it begins string, just notice it and continue */ if (i == 0) @@ -81,7 +87,7 @@ if (FirstPosition < (Name.Length / sizeof(CHAR))) { RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; - RemainingPart->Length = (Name.Length - FirstPosition) * sizeof(CHAR); + RemainingPart->Length = Name.Length - (FirstPosition + 1) * sizeof(CHAR); RemainingPart->MaximumLength = Name.MaximumLength - RemainingPart->Length; } } @@ -185,97 +191,108 @@ IN BOOLEAN PathNamePermissible, IN BOOLEAN LeadingBackslashPermissible) { - BOOLEAN FirstSlash = FALSE, IsIllegal = FALSE; - ULONG i, LastSlash = 0, LastDot = 0; - ANSI_STRING FileName; - + ANSI_STRING FirstPart, RemainingPart, Name; + ULONG i, LastDot = 0; + /* Just quit if the string is empty */ if (!DbcsName.Length) return FALSE; - /* Check if we have a filename and a pathname - * Continue until we get the last one to extract the filename - */ - for (i = 0; i < DbcsName.Length / sizeof(CHAR); i++) - { - if (DbcsName.Buffer[i] == '\\') - { - LastSlash = i; - if (!i) - { - FirstSlash = TRUE; - } - } - } - - /* DbcsName was to be a filename */ - if (!PathNamePermissible && LastSlash) + /* DbcsName wasn't supposed to be started with \ */ + if (!LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') return FALSE; - - /* DbcsName wasn't supposed to be started with \ if it's a filename */ - if (!LeadingBackslashPermissible && !LastSlash && FirstSlash) - return FALSE; - - /* Now, only work on filename */ - if (LastSlash || FirstSlash) - { - FileName.Buffer = DbcsName.Buffer + LastSlash + 1; - FileName.Length = (DbcsName.Length - LastSlash - 1) * sizeof(CHAR); - FileName.MaximumLength = DbcsName.MaximumLength - FileName.Length; - - } - else - { - FileName.Buffer = DbcsName.Buffer; - FileName.Length = DbcsName.Length; - FileName.MaximumLength = DbcsName.MaximumLength; - } - - /* Filename must be 8.3 filename */ - if (FileName.Length < 3 || FileName.Length > 12) - return FALSE; - - if (!WildCardsPermissible && FsRtlDoesDbcsContainWildCards(&FileName)) - return FALSE; - - /* Now, we will parse the filename to find everything bad in - * It mustn't contain: - * 0x00-0x1F, 0x22, 0x2B, 0x2C, 0x2F, 0x3A, 0x3B, 0x3D, 0x5B, 0x5D, 0x7C */ - for (i = 0; i < FileName.Length / sizeof(CHAR); i++) - { - if ((FileName.Buffer[i] < 0x1F) || (FileName.Buffer[i] == 0x22) || - (FileName.Buffer[i] == 0x2B) || (FileName.Buffer[i] == 0x2C) || - (FileName.Buffer[i] == 0x2F) || (FileName.Buffer[i] == 0x3A) || - (FileName.Buffer[i] == 0x3B) || (FileName.Buffer[i] == 0x3D) || - (FileName.Buffer[i] == 0x5B) || (FileName.Buffer[i] == 0x5D) || - (FileName.Buffer[i] == 0x7C)) - { - IsIllegal = TRUE; - break; - } - if (FileName.Buffer[i] == '.') - { - LastDot = i; - if (!i) - { - IsIllegal = TRUE; - break; - } - } - } - if (IsIllegal || LastDot == (FileName.Length / sizeof(CHAR)) - 1) - return FALSE; - - /* We mustn't have spaces before dot or at the end of the filename */ - if ((LastDot && FileName.Buffer[LastDot - 1] == ' ') || - (FileName.Buffer[FileName.Length / sizeof(CHAR) - 1] == ' ')) - return FALSE; - - /* Filename must be 8.3 filename and not 3.8 filename */ - if (LastDot && ((FileName.Length / sizeof(CHAR) - 1) - LastDot > 3)) - return FALSE; - - /* We have a valid filename */ + /* DbcsName was allowed to be started with \, but now, remove it */ + else if (LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') + { + DbcsName.Buffer = DbcsName.Buffer + 1; + DbcsName.Length = DbcsName.Length - 1; + DbcsName.MaximumLength = DbcsName.MaximumLength - 1; + } + + /* Zero strings for further use */ + RtlZeroMemory(&FirstPart, sizeof(FirstPart)); + RtlZeroMemory(&RemainingPart, sizeof(RemainingPart)); + + /* Extract first part of the DbcsName to work on */ + FsRtlDissectDbcs(DbcsName, &FirstPart, &RemainingPart); + while (FirstPart.Length > 0) + { + /* Accept special filename if wildcards are allowed */ + if (WildCardsPermissible && (FirstPart.Length == 1 || FirstPart.Length == 2) && FirstPart.Buffer[0] == '.') + { + if (FirstPart.Length == 2) + { + if (FirstPart.Buffer[1] == '.') + { + goto EndLoop; + } + } + else + { + goto EndLoop; + } + } + + /* Filename must be 8.3 filename */ + if (FirstPart.Length < 3 || FirstPart.Length > 12) + return FALSE; + + if (!WildCardsPermissible && FsRtlDoesDbcsContainWildCards(&FirstPart)) + return FALSE; + + /* Now, we will parse the filename to find everything bad in + * It mustn't contain: + * 0x00-0x1F, 0x22, 0x2B, 0x2C, 0x2F, 0x3A, 0x3B, 0x3D, 0x5B, 0x5D, 0x7C */ + for (i = 0; i < FirstPart.Length / sizeof(CHAR); i++) + { + if ((FirstPart.Buffer[i] < 0x1F) || (FirstPart.Buffer[i] == 0x22) || + (FirstPart.Buffer[i] == 0x2B) || (FirstPart.Buffer[i] == 0x2C) || + (FirstPart.Buffer[i] == 0x2F) || (FirstPart.Buffer[i] == 0x3A) || + (FirstPart.Buffer[i] == 0x3B) || (FirstPart.Buffer[i] == 0x3D) || + (FirstPart.Buffer[i] == 0x5B) || (FirstPart.Buffer[i] == 0x5D) || + (FirstPart.Buffer[i] == 0x7C)) + { + return FALSE; + } + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(Name->Buffer[i])) + { + i++; + } + else if (FirstPart.Buffer[i] == '.') + { + LastDot = i; + + /* We mustn't have spaces before dot or at the end of the filename + * and no dot at the beginning of the filename */ + if ((i == (FirstPart.Length / sizeof(CHAR)) - 1) || i == 0) + return FALSE; + + if (i > 0) + if (FirstPart.Buffer[i - 1] == ' ') + return FALSE; + } + } + + /* Filename must be 8.3 filename and not 3.8 filename */ + if (LastDot && ((FirstPart.Length / sizeof(CHAR) - 1) - LastDot > 3)) + return FALSE; + + EndLoop: + /* Preparing next loop */ + Name.Buffer = RemainingPart.Buffer; + Name.Length = RemainingPart.Length; + Name.MaximumLength = RemainingPart.MaximumLength; + RtlZeroMemory(&FirstPart, sizeof(FirstPart)); + RtlZeroMemory(&RemainingPart, sizeof(RemainingPart)); + + /* Call once again our dissect function */ + FsRtlDissectDbcs(Name, &FirstPart, &RemainingPart); + + /* We found a pathname, it wasn't allowed */ + if (FirstPart.Length > 0 && !PathNamePermissible) + return FALSE; + } return TRUE; } Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_ar… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Fri Jul 18 04:15:53 2008 @@ -216,7 +216,7 @@ FsRtlInsertPerFileObjectContext FsRtlInsertPerStreamContext FsRtlIsDbcsInExpression -FsRtlIsFatDbcsLegal +FsRtlIsFatDbcsLegal@20 FsRtlIsHpfsDbcsLegal FsRtlIsNameInExpression FsRtlIsNtstatusExpected Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_i3… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Fri Jul 18 04:15:53 2008 @@ -233,7 +233,7 @@ FsRtlInsertPerFileObjectContext FsRtlInsertPerStreamContext FsRtlIsDbcsInExpression -FsRtlIsFatDbcsLegal +FsRtlIsFatDbcsLegal@20 FsRtlIsHpfsDbcsLegal FsRtlIsNameInExpression@16 FsRtlIsNtstatusExpected@4

16 years, 2 months

[mkupfer] 34572: - gui template for 1st stage setup, english only - implemented, but still disabled - it's work in progress

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Fri Jul 18 04:07:54 2008 New Revision: 34572 URL: http://svn.reactos.org/svn/reactos?rev=34572&view=rev Log: - gui template for 1st stage setup, english only - implemented, but still disabled - it's work in progress Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/reactos/res/header.bmp trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Fri Jul 18 04:07:54 2008 @@ -14,4 +14,109 @@ LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Please choose the language used for the installation process." + , IDC_STATIC, 10, 0, 297, 10 + LTEXT "The selected language will be the default language for the final system.", IDC_STATIC, 10, 13, 297, 10 + LISTBOX IDC_LANGUAGES, 10,28,297,142,LBS_HASSTRINGS | WS_VSCROLL + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Keyboard layout:", IDC_STATIC, 20,75, 80, 10 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 75, 150, 80 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,102 + LISTBOX IDC_PARTITION, 20,13,277,70,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create" ,IDC_PARTCREATE, 20,83,50,15 + PUSHBUTTON "&Delete" ,IDC_PARTDELETE, 75,83,50,15 + + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 10,103,297,30 + EDITTEXT IDC_PATH, 20,113,277,12, WS_VISIBLE + + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,136,297,40 + + CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 147, 277, 10 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP /* | WS_DISABLED*/ , 20, 159, 277, 10 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ + "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Language Selection" + IDS_LANGSUBTITLE "Choose language for setup and final system." + IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_TYPESUBTITLE "Choose setup type." + IDS_DEVICETITLE "Setup the basic devices" + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_DRIVETITLE "Setup the installation partition and system folder" + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." + IDS_PROCESSTITLE "Prepare partition, copy files and setup system" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_RESTARTTITLE "First stage of setup finished" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP2 "Abort installation?" +END /* EOF */ Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Fri Jul 18 04:07:54 2008 @@ -21,18 +21,38 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS GUI first stage setup application * FILE: subsys/system/reactos/reactos.c - * PROGRAMMERS: Eric Kohl, Matthias Kupfer + * PROGRAMMERS: Eric Kohl + * Matthias Kupfer */ #include <windows.h> #include <commctrl.h> #include <tchar.h> +#include <setupapi.h> #include "resource.h" /* GLOBALS ******************************************************************/ HFONT hTitleFont; + +struct +{ + LONG DestDiskNumber; // physical disk + LONG DestPartNumber; // partition on disk + LONG DestPartSize; // if partition doesn't exist, size of partition + LONG FSType; // file system type on partition + LONG MBRInstallType; // install bootloader + LONG FormatPart; // type of format the partition + WCHAR SelectedLangId[4]; // selected language + WCHAR InstallationDirectory[MAX_PATH]; // installation directory on hdd + WCHAR DefaultLang[20]; // default language + WCHAR DefaultKBLayout[20]; // default keyboard layout + BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos +} SetupData; + +TCHAR abort_msg[512],abort_title[64]; +BOOL isUnattend; /* FUNCTIONS ****************************************************************/ @@ -106,7 +126,7 @@ SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); /* Hide and disable the 'Cancel' button at the moment, - * later we use this button to cancel the setup process + * we use this button to cancel the setup process * like F3 in usetup */ hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); @@ -129,6 +149,7 @@ { case PSN_SETACTIVE: // Only "Finish" for closing the App PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + //PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); break; default: break; @@ -140,6 +161,384 @@ } return FALSE; +} + +static INT_PTR CALLBACK +LangSelDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_SHOW); + EnableWindow (hwndControl, TRUE); + + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ +} + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; + case PSN_QUERYCANCEL: + SetWindowLong(hwndDlg, DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); + return TRUE; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +static INT_PTR CALLBACK +TypeDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + CheckDlgButton(hwndDlg, IDC_INSTALL, BST_CHECKED); + + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ +} + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; + case PSN_QUERYCANCEL: + SetWindowLong(hwndDlg, DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); + return TRUE; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +static INT_PTR CALLBACK +DeviceDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ +} + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; + case PSN_QUERYCANCEL: + SetWindowLong(hwndDlg, DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); + return TRUE; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +static INT_PTR CALLBACK +DriveDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ +} + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); + break; + case PSN_QUERYCANCEL: + SetWindowLong(hwndDlg, DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); + return TRUE; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +static INT_PTR CALLBACK +ProcessDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow (hwndControl, SW_HIDE); + EnableWindow (hwndControl, FALSE); + + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ +} + break; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT ); + break; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +static INT_PTR CALLBACK +RestartDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + { + HWND hwndControl; + DWORD dwStyle; + + hwndControl = GetParent(hwndDlg); + + /* Center the wizard window */ + CenterWindow (hwndControl); + + dwStyle = GetWindowLong(hwndControl, GWL_STYLE); + SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + + /* Set title font */ + /*SendDlgItemMessage(hwndDlg, + IDC_STARTTITLE, + WM_SETFONT, + (WPARAM)hTitleFont, + (LPARAM)TRUE);*/ + } + break; + case WM_TIMER: + { + INT Position; + HWND hWndProgress; + + hWndProgress = GetDlgItem(hwndDlg, IDC_RESTART_PROGRESS); + Position = SendMessage(hWndProgress, PBM_GETPOS, 0, 0); + if (Position == 300) + { + KillTimer(hwndDlg, 1); + PropSheet_PressButton(GetParent(hwndDlg), PSBTN_FINISH); + } + else + { + SendMessage(hWndProgress, PBM_SETPOS, Position + 1, 0); + } + return TRUE; + } + case WM_DESTROY: + return TRUE; + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + { + case PSN_SETACTIVE: // Only "Finish" for closing the App + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 300)); + SendDlgItemMessage(hwndDlg, IDC_RESTART_PROGRESS, PBM_SETPOS, 0, 0); + SetTimer(hwndDlg, 1, 50, NULL); + break; + default: + break; + } + break; + default: + break; + } + + } + return FALSE; +} + +BOOL isUnattendSetup() +{ + WCHAR szPath[MAX_PATH]; + HINF hUnattendedInf; + INFCONTEXT InfContext; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + //HKEY hKey; + BOOL result = 0; + + GetCurrentDirectoryW(MAX_PATH, szPath); // FIXME + + wcscat(szPath, L"\\unattend.inf"); + hUnattendedInf = SetupOpenInfFileW(szPath, NULL, INF_STYLE_OLDNT, NULL); + if (hUnattendedInf != INVALID_HANDLE_VALUE) + { + if (SetupFindFirstLine(hUnattendedInf, _T("Unattend"), + _T("UnattendSetupEnabled"),&InfContext)) + { + if (SetupGetStringField(&InfContext, 1, szValue, + sizeof(szValue) / sizeof(TCHAR), &LineLength) && + (_tcsicmp(szValue, _T("yes"))==0)) + { + result = 1; // unattendSetup enabled + // read values and store in SetupData + } + } + SetupCloseInfFile(hUnattendedInf); + } + return result; } int WINAPI @@ -149,11 +548,18 @@ int nCmdShow) { PROPSHEETHEADER psh; - HPROPSHEETPAGE ahpsp[1]; + HPROPSHEETPAGE ahpsp[7]; PROPSHEETPAGE psp = {0}; UINT nPages = 0; - - /* Create the Start page */ + isUnattend = isUnattendSetup(); + + if (!isUnattend) + { + + LoadString(hInst,IDS_ABORTSETUP, abort_msg, sizeof(abort_msg)/sizeof(TCHAR)); + LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR)); + + /* Create the Start page, until setup is working */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER; psp.hInstance = hInst; @@ -162,7 +568,77 @@ psp.pszTemplate = MAKEINTRESOURCE(IDD_STARTPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); - // Here we can add the next pages and switch on later + /* Create language selection page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_LANGTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_LANGSUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = LangSelDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_LANGSELPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + // Change language with "SetThreadLocale(langid)" + + /* Create install type selection page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_TYPETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_TYPESUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = TypeDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_TYPEPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create device settings page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DEVICETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DEVICESUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = DeviceDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_DEVICEPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + /* Create install device settings page / boot method / install directory*/ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_DRIVETITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_DRIVESUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = DriveDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_DRIVEPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + } + + /* Create installation progress page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_PROCESSTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_PROCESSSUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = ProcessDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_PROCESSPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + + if (!isUnattend) + { + /* Create finish to reboot page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_RESTARTTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_RESTARTSUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = RestartDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_RESTARTPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); + } /* Create the property sheet */ psh.dwSize = sizeof(PROPSHEETHEADER); Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] Fri Jul 18 04:07:54 2008 @@ -9,6 +9,7 @@ <library>gdi32</library> <library>user32</library> <library>comctl32</library> + <library>setupapi</library> <file>reactos.c</file> <file>reactos.rc</file> </module> Modified: trunk/reactos/base/setup/reactos/res/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/res/hea… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Fri Jul 18 04:07:54 2008 @@ -7,8 +7,47 @@ #define IDC_STATIC -1 -#define IDD_STARTPAGE 2000 -#define IDC_STARTTITLE 2001 +#define IDD_STARTPAGE 2000 +#define IDC_STARTTITLE 2001 +#define IDD_LANGSELPAGE 2002 +#define IDS_LANGTITLE 2003 +#define IDS_LANGSUBTITLE 2004 +#define IDC_LANGUAGES 2005 +#define IDD_TYPEPAGE 2006 +#define IDS_TYPETITLE 2007 +#define IDS_TYPESUBTITLE 2008 +#define IDC_INSTALL 2009 +#define IDC_SETUP 2010 +#define IDD_DEVICEPAGE 2011 +#define IDS_DEVICETITLE 2012 +#define IDS_DEVICESUBTITLE 2013 +#define IDC_COMPUTER 2014 +#define IDC_DISPLAY 2015 +#define IDC_KEYBOARD 2016 +#define IDC_KEYLAYOUT 2017 +#define IDD_DRIVEPAGE 2018 +#define IDS_DRIVETITLE 2019 +#define IDS_DRIVESUBTITLE 2020 +#define IDC_PARTITION 2021 +#define IDC_PARTCREATE 2022 +#define IDC_PARTDELETE 2023 +#define IDC_INSTFREELDR 2024 +#define IDC_NOINSTFREELDR 2025 +#define IDC_PATH 2026 +#define IDD_PROCESSPAGE 2027 +#define IDS_PROCESSTITLE 2028 +#define IDS_PROCESSSUBTITLE 2029 +#define IDC_ACTIVITY 2030 +#define IDC_ITEM 2031 +#define IDC_PROCESSPROGRESS 2032 +#define IDD_RESTARTPAGE 2033 +#define IDS_RESTARTTITLE 2034 +#define IDS_RESTARTSUBTITLE 2035 +#define IDC_FINISHTITLE 2036 +#define IDC_RESTART_PROGRESS 2037 +#define IDS_ABORTSETUP 2038 +#define IDS_ABORTSETUP2 2039 +#define IDC_ACTION 2040 #define IDI_MAIN 3000

16 years, 2 months

[silverblade] 34571: Various changes/tweaks. There are a few nasty issues due to the way the library is presently implemented (deadlocking, unexpected I/O completions, hacky debug code...) so after this commit I intend on rewriting a majority of the code to make it cleaner and less hacky over the next few days. (hax equals code calories, which in turn equals fat and unstable)

by silverblade＠svn.reactos.org

Author: silverblade Date: Thu Jul 17 17:44:47 2008 New Revision: 34571 URL: http://svn.reactos.org/svn/reactos?rev=34571&view=rev Log: Various changes/tweaks. There are a few nasty issues due to the way the library is presently implemented (deadlocking, unexpected I/O completions, hacky debug code...) so after this commit I intend on rewriting a majority of the code to make it cleaner and less hacky over the next few days. (hax equals code calories, which in turn equals fat and unstable) Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild branches/silverblade-audio/include/psdk/digitalv.h branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/DriverProc.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -18,8 +18,8 @@ #include <mmebuddy.h> //#include <debug.h> -PWSTR SBWaveOutDeviceName = L"Sound Blaster Playback"; -PWSTR SBWaveInDeviceName = L"Sound Blaster Recording"; +PWSTR SBWaveOutDeviceName = L"Sound Blaster Playback (silverblade)"; +PWSTR SBWaveInDeviceName = L"Sound Blaster Recording (silverblade)"; /* TODO: Mixer etc */ @@ -86,29 +86,41 @@ LONG parameter1, LONG parameter2) { + MMRESULT Result; +/* + WCHAR msg[1024]; + wsprintf(msg, L"DriverProc msg %d", message); + MessageBox(0, msg, L"DriverProc", MB_OK | MB_TASKMODAL); +*/ + switch ( message ) { case DRV_LOAD : TRACE_("DRV_LOAD"); - EnumerateNt4ServiceSoundDevices(L"sndblst", - 0, - FoundDevice); + InitMmeBuddyLib(); + + Result = EnumerateNt4ServiceSoundDevices(L"sndblst", + 0, + FoundDevice); /* TODO: Check return value */ - StartSoundThread(); + //Result = StartSoundThread(); + //ASSERT(Result == MMSYSERR_NOERROR); return 1L; case DRV_FREE : TRACE_("DRV_FREE"); - StopSoundThread(); + //StopSoundThread(); RemoveAllSoundDevices(); // SOUND_DEBUG_HEX(GetMemoryAllocations()); TRACE_("Leaving driver with %d memory allocations present\n", (int) GetMemoryAllocations()); + + CleanupMmeBuddyLib(); return 1L; @@ -121,7 +133,7 @@ } } - +#if 0 #include <stdio.h> WORD Buffer[5347700 / 2]; @@ -253,3 +265,28 @@ return 0; } +#endif + +BOOL WINAPI DllMain( + HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch ( fdwReason ) + { + case DLL_PROCESS_ATTACH : + MessageBox(0, L"DLL_PROCESS_ATTACH", L"DllMain", MB_OK | MB_TASKMODAL); + break; + case DLL_PROCESS_DETACH : + MessageBox(0, L"DLL_PROCESS_DETACH", L"DllMain", MB_OK | MB_TASKMODAL); + break; + case DLL_THREAD_ATTACH : + MessageBox(0, L"DLL_THREAD_ATTACH", L"DllMain", MB_OK | MB_TASKMODAL); + break; + case DLL_THREAD_DETACH : + MessageBox(0, L"DLL_THREAD_DETACH", L"DllMain", MB_OK | MB_TASKMODAL); + break; + } + + return TRUE; +} Modified: branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/dll/win32/snd… ============================================================================== --- branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] (original) +++ branches/silverblade-audio/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -1,7 +1,7 @@  -<module name="sndblst" type="win32cui" installbase="system32" installname="sndblst.exe" unicode="yes"> -  +<module name="sndblst" type="win32dll" installbase="system32" installname="sndblst2.dll" unicode="yes"> + <importlibrary definition="sndblst.def" /> <include base="ReactOS">include/reactos/libs/sound</include> <include base="sndblst">.</include>  Modified: branches/silverblade-audio/include/psdk/digitalv.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/psdk/… ============================================================================== --- branches/silverblade-audio/include/psdk/digitalv.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/psdk/digitalv.h [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -857,20 +857,6 @@ LPWSTR lpstrText; } MCI_DGV_WINDOW_PARMSW, *LPMCI_DGV_WINDOW_PARMSW; -/* Driver callback for multimedia components (implemented in winmm) */ - -WINAPI BOOL -DriverCallback( - DWORD dwCallBack, - DWORD dwFlags, - HDRVR hdrvr, - DWORD msg, - DWORD dwUser, - DWORD dwParam1, - DWORD dwParam2 -); - - #ifdef __cplusplus } #endif Modified: branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/include/react… ============================================================================== --- branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/silverblade-audio/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -26,11 +26,14 @@ MessageBoxA(0, msg, __FUNCTION__, MB_OK | MB_TASKMODAL) -#ifndef NDEBUG +//#define NDEBUG +#define NTRACE #ifdef ASSERT #undef ASSERT #endif + +#ifndef NDEBUG /* HACK for testing */ #include <stdio.h> @@ -62,12 +65,30 @@ } \ } +#ifndef NTRACE + #define TRACE_ENTRY() \ TRACE_("entered function\n") #define TRACE_EXIT(retval) \ TRACE_("returning %d (0x%x)\n", (int)retval, (int)retval) +#endif + +#else + +#define TRACE_(...) do { } while ( 0 ) +#define WARN_(...) do { } while ( 0 ) +#define ERR_(...) do { } while ( 0 ) +#define ASSERT(x) do { } while ( 0 ) + +#define NTRACE + +#endif + +#ifdef NTRACE + #define TRACE_ENTRY() do { } while ( 0 ) + #define TRACE_EXIT(retval) do { } while ( 0 ) #endif @@ -531,6 +552,24 @@ MMRESULT TranslateInternalMmResult(MMRESULT Result); +MMRESULT +InitEntrypointMutex(); + +VOID +CleanupEntrypointMutex(); + +VOID +AcquireEntrypointMutex(); + +VOID +ReleaseEntrypointMutex(); + +BOOLEAN +InitMmeBuddyLib(); + +VOID +CleanupMmeBuddyLib(); + /* instances.c Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/DriverProc.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/DriverProc.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/DriverProc.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -14,7 +14,8 @@ #include <windows.h> #include <mmddk.h> #include <ntddsnd.h> -#include <debug.h> + +#include <mmebuddy.h> LONG DefaultDriverProc( @@ -27,27 +28,27 @@ switch ( message ) { case DRV_LOAD : - DPRINT("DRV_LOAD\n"); + TRACE_("DRV_LOAD\n"); return 1L; case DRV_FREE : - DPRINT("DRV_FREE\n"); + TRACE_("DRV_FREE\n"); return 1L; case DRV_OPEN : - DPRINT("DRV_OPEN\n"); + TRACE_("DRV_OPEN\n"); return 1L; case DRV_CLOSE : - DPRINT("DRV_CLOSE\n"); + TRACE_("DRV_CLOSE\n"); return 1L; case DRV_ENABLE : - DPRINT("DRV_ENABLE\n"); + TRACE_("DRV_ENABLE\n"); return 1L; case DRV_DISABLE : - DPRINT("DRV_DISABLE\n"); + TRACE_("DRV_DISABLE\n"); return 1L; /* @@ -56,15 +57,15 @@ */ case DRV_QUERYCONFIGURE : - DPRINT("DRV_QUERYCONFIGURE\n"); + TRACE_("DRV_QUERYCONFIGURE\n"); return 0L; case DRV_CONFIGURE : - DPRINT("DRV_CONFIGURE\n"); + TRACE_("DRV_CONFIGURE\n"); return 0L; case DRV_INSTALL : - DPRINT("DRV_INSTALL\n"); + TRACE_("DRV_INSTALL\n"); return DRVCNF_RESTART; }; Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/mme/callback.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -11,7 +11,7 @@ #include <windows.h> #include <mmsystem.h> -#include <digitalv.h> +#include <mmddk.h> #include <mmebuddy.h> Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/nt4.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -155,6 +155,8 @@ /* Device type zero means "all" */ VALIDATE_MMSYS_PARAMETER( VALID_SOUND_DEVICE_TYPE(DeviceType) || DeviceType == 0 ); + + MessageBox(0, ServiceName, L"Looking for devices", MB_OK | MB_TASKMODAL); while ( OpenSoundDeviceRegKey(ServiceName, KeyIndex, &Key) == MMSYSERR_NOERROR ) { Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/thread.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -149,6 +149,8 @@ /* We're ready to do work */ SetEvent(ReadyEvent); + + TRACE_("SoundThreadProc entered\n"); while ( ThreadRunning ) { @@ -313,7 +315,14 @@ TRACE_("Starting sound thread\n"); /* We're all set to go, so let's start the thread up */ - ResumeThread(SoundThread); + if ( ResumeThread(SoundThread) == -1 ) + { + CloseHandle(SoundThread); + SoundThread = INVALID_HANDLE_VALUE; + CleanupThreadEvents(); + ERR_("Error %d\n", (int) GetLastError()); + return Win32ErrorToMmResult(GetLastError()); + } return MMSYSERR_NOERROR; } @@ -332,6 +341,7 @@ return MMSYSERR_ERROR; } + TRACE_("Waiting for ready event\n"); /* Wait for the sound thread to be ready for a request */ WaitForSingleObject(ReadyEvent, INFINITE); @@ -344,6 +354,7 @@ /* Tell the sound thread there is a request waiting */ SetEvent(RequestEvent); + TRACE_("Waiting for done event\n"); /* Wait for our request to be dealt with */ WaitForSingleObject(DoneEvent, INFINITE); Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/utility.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -20,6 +20,9 @@ static HANDLE ProcessHeapHandle = INVALID_HANDLE_VALUE; static DWORD CurrentAllocations = 0; +/* Makes the entry-points safe */ +static HANDLE BigMmLock = NULL; + #if 0 typedef struct _ALLOCATION { @@ -198,3 +201,66 @@ return Result; } + + + +/* + Entrypoint mutex management +*/ + +MMRESULT +InitEntrypointMutex() +{ + BigMmLock = CreateMutex(NULL, FALSE, NULL); + + if ( BigMmLock == NULL ) + { + return Win32ErrorToMmResult(GetLastError()); + } + + return MMSYSERR_NOERROR; +} + +VOID +CleanupEntrypointMutex() +{ + if ( BigMmLock ) + { + CloseHandle(BigMmLock); + } +} + +VOID +AcquireEntrypointMutex() +{ + ASSERT(BigMmLock); + WaitForSingleObject(BigMmLock, INFINITE); +} + +VOID +ReleaseEntrypointMutex() +{ + ASSERT(BigMmLock); + ReleaseMutex(BigMmLock); +} + + +/* + MME Buddy init/cleanup + NOTE: We don't do thread start/stop here... +*/ + +BOOLEAN +InitMmeBuddyLib() +{ + if ( InitEntrypointMutex() != MMSYSERR_NOERROR ) + return FALSE; + + return TRUE; +} + +VOID +CleanupMmeBuddyLib() +{ + ReleaseEntrypointMutex(); +} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streamcontrol.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -74,12 +74,26 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, OUT PULONG State) { + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); VALIDATE_MMSYS_PARAMETER( State ); - return CallUsingSoundThread(SoundDeviceInstance, - GetWaveDeviceState_Request, - State); + // *State = SoundDeviceInstance->Streaming.Wave.State; + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->GetWaveDeviceState(SoundDeviceInstance, + State); + } MMRESULT @@ -113,16 +127,20 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { MMRESULT Result; - TRACE_ENTRY(); - - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - Result = CallUsingSoundThread(SoundDeviceInstance, - PauseWaveDevice_Request, - NULL); - - TRACE_EXIT(Result); - return Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->PauseWaveDevice(SoundDeviceInstance); } MMRESULT @@ -143,6 +161,7 @@ ASSERT( Result == MMSYSERR_NOERROR ); Result = TranslateInternalMmResult(Result); + TRACE_EXIT(Result); return Result; } @@ -151,11 +170,21 @@ RestartWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - return CallUsingSoundThread(SoundDeviceInstance, - RestartWaveDevice_Request, - NULL); + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->RestartWaveDevice(SoundDeviceInstance); } MMRESULT @@ -180,15 +209,31 @@ return Result; } +/* FIXME - This needs to be done a better way */ MMRESULT ResetWaveDevice( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - return CallUsingSoundThread(SoundDeviceInstance, - ResetWaveDevice_Request, - NULL); + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + /* ugly HACK to stop sound playback... FIXME */ + SoundDeviceInstance->Streaming.Wave.CurrentBuffer = NULL; + + /* TODO: Return all audio buffers to the client, marking as DONE */ + + return Functions->ResetWaveDevice(SoundDeviceInstance); } MMRESULT @@ -217,11 +262,21 @@ BreakWaveDeviceLoop( IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance) { - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - return CallUsingSoundThread(SoundDeviceInstance, - BreakWaveDeviceLoop_Request, - NULL); + MMRESULT Result; + PSOUND_DEVICE SoundDevice; + PMMFUNCTION_TABLE Functions; + + VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); + + Result = GetSoundDeviceFromInstance(SoundDeviceInstance, + &SoundDevice); + ASSERT(Result == MMSYSERR_NOERROR); + + Result = GetSoundDeviceFunctionTable(SoundDevice, + &Functions); + ASSERT(Result == MMSYSERR_NOERROR); + + return Functions->BreakWaveDeviceLoop(SoundDeviceInstance); } MMRESULT Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -67,7 +67,7 @@ DWORD BytesToStream, BytesStreamed = 0; UCHAR DeviceType; - TRACE_("PerformWaveIo\n"); + TRACE_ENTRY(); ASSERT( IsValidSoundDeviceInstance(SoundDeviceInstance) ); @@ -83,15 +83,13 @@ StreamInfo = &SoundDeviceInstance->Streaming.Wave; - /* If we're out of buffers, mark stream as stopped and do nothing */ + /* If we're out of buffers, do nothing */ if ( ! StreamInfo->CurrentBuffer ) { TRACE_("*** NOTHING TO DO ***\n"); - /* The stream is idle */ - /*StreamInfo->State = WAVE_DD_IDLE;*/ - - return 0; + TRACE_EXIT(MMSYSERR_NOERROR); + return MMSYSERR_NOERROR; } /* Is this the beginning of a loop? */ @@ -111,7 +109,8 @@ StreamInfo->BufferOffset, MAX_SOUND_BUFFER_SIZE); - TRACE_("Writing %p + %d (%d bytes) - buffer length is %d bytes\n", + TRACE_("Writing hdr %p - %p + %d (%d bytes) - buffer length is %d bytes\n", + StreamInfo->CurrentBuffer, StreamInfo->CurrentBuffer->lpData, (int) StreamInfo->BufferOffset, (int) BytesToStream, @@ -130,24 +129,8 @@ { ERR_("Failed to perform wave device I/O! MMSYS Error %d\n", (int) Result); + TRACE_EXIT(Result); return Result; - } - - /* TODO: Deal with INPUT as well */ - if ( DeviceType == WAVE_OUT_DEVICE_TYPE ) - { - /* - TRACE_("Streamed data - state is now WAVE_DD_PLAYING\n"); - StreamInfo->State = WAVE_DD_PLAYING; - */ - } - else - { - /* NOTE - MME wavein recording does not begin immediately!! */ - /* - TRACE_("Streamed data - state is now WAVE_DD_RECORDING\n"); - StreamInfo->State = WAVE_DD_RECORDING; - */ } BytesStreamed = BytesToStream; @@ -159,12 +142,12 @@ if ( StreamInfo->BufferOffset == StreamInfo->CurrentBuffer->dwBufferLength ) { - TRACE_("Advancing to next buffer\n"); if ( ( StreamInfo->CurrentBuffer->dwFlags & WHDR_ENDLOOP ) && ( StreamInfo->LoopHead ) && ( StreamInfo->LoopsRemaining > 0 ) ) { + TRACE_("Returning to loop head at %p\n", StreamInfo->LoopHead); /* Loop back to the head */ StreamInfo->CurrentBuffer = StreamInfo->LoopHead; -- StreamInfo->LoopsRemaining; @@ -172,6 +155,10 @@ } else { + TRACE_("Advancing from wavehdr %p to %p\n", + StreamInfo->CurrentBuffer, + StreamInfo->CurrentBuffer->lpNext); + /* Either not looping, or looping expired */ StreamInfo->CurrentBuffer = StreamInfo->CurrentBuffer->lpNext; } @@ -181,6 +168,7 @@ if ( StreamInfo->CurrentBuffer ) { + TRACE_("Resetting offset of %p to zero\n", StreamInfo->CurrentBuffer); /* Reset the completion offset */ StreamInfo->CurrentBuffer->reserved = 0; } @@ -189,6 +177,7 @@ /* Increase the number of outstanding buffers */ ++ StreamInfo->BuffersOutstanding; + TRACE_EXIT(MMSYSERR_NOERROR); return MMSYSERR_NOERROR; } @@ -206,7 +195,6 @@ while ( StreamReadyForData(StreamInfo) && StreamHasBuffersQueued(StreamInfo) ) { - TRACE_("Performing wave I/O ...\n"); Result = PerformWaveIo(SoundDeviceInstance); if ( Result != MMSYSERR_NOERROR ) @@ -235,6 +223,10 @@ ASSERT(WaveHeader); WaveHeader->reserved += BytesWritten; + + TRACE_("Transferred %d bytes - offset is now %d of length %d\n", + (int) BytesWritten, (int) WaveHeader->reserved, (int) WaveHeader->dwBufferLength); + ASSERT(WaveHeader->reserved <= WaveHeader->dwBufferLength); StreamInfo = &SoundDeviceInstance->Streaming.Wave; @@ -282,7 +274,7 @@ PerformWaveIo(SoundDeviceInstance); - TRACE_("Wave completion routine done\n"); + TRACE_EXIT(0); } MMRESULT @@ -299,7 +291,7 @@ /* To avoid stupidly long variable names we alias this */ StreamInfo = &SoundDeviceInstance->Streaming.Wave; - TRACE_("QueueBuffer_Request\n"); + TRACE_("QueueBuffer_Request - wavehdr %p\n", WaveHeader); /* Initialise fields of interest to us */ WaveHeader->lpNext = NULL; @@ -313,10 +305,10 @@ { TRACE_("This is the first buffer being queued\n"); - /* Set head, tail and current to this buffer */ + /* Set head and tail to this buffer (current gets set later) */ StreamInfo->BufferQueueHead = WaveHeader; StreamInfo->BufferQueueTail = WaveHeader; - StreamInfo->CurrentBuffer = WaveHeader; + StreamInfo->CurrentBuffer = NULL; /* Initialise the stream state */ StreamInfo->BufferOffset = 0; @@ -327,7 +319,7 @@ StreamInfo->LoopsRemaining = 0; /* Get the streaming started */ - StreamWaveBuffers(SoundDeviceInstance); +// StreamWaveBuffers(SoundDeviceInstance); } else { @@ -337,136 +329,16 @@ StreamInfo->BufferQueueTail->lpNext = WaveHeader; /* ...and set the buffer as the new tail */ StreamInfo->BufferQueueTail = WaveHeader; - - if ( ! StreamInfo->CurrentBuffer ) - { - /* All buffers so far have been committed to the sound driver */ - StreamInfo->CurrentBuffer = WaveHeader; - } + } + + /* Do we need to push the play button? */ + if ( ! StreamInfo->CurrentBuffer ) + { + /* All buffers so far have been committed to the sound driver */ + StreamInfo->CurrentBuffer = WaveHeader; + + StreamWaveBuffers(SoundDeviceInstance); } return MMSYSERR_NOERROR; } - -MMRESULT -GetWaveDeviceState_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - OUT PVOID Parameter) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - PMMFUNCTION_TABLE Functions; - PULONG State = (PULONG) Parameter; - - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - VALIDATE_MMSYS_PARAMETER( State ); - - // *State = SoundDeviceInstance->Streaming.Wave.State; - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, - &SoundDevice); - ASSERT(Result == MMSYSERR_NOERROR); - - Result = GetSoundDeviceFunctionTable(SoundDevice, - &Functions); - ASSERT(Result == MMSYSERR_NOERROR); - - return Functions->GetWaveDeviceState(SoundDeviceInstance, - State); -} - -/* These are a bit repetitive... */ - -MMRESULT -PauseWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - PMMFUNCTION_TABLE Functions; - - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, - &SoundDevice); - ASSERT(Result == MMSYSERR_NOERROR); - - Result = GetSoundDeviceFunctionTable(SoundDevice, - &Functions); - ASSERT(Result == MMSYSERR_NOERROR); - - return Functions->PauseWaveDevice(SoundDeviceInstance); -} - -MMRESULT -RestartWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - PMMFUNCTION_TABLE Functions; - - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, - &SoundDevice); - ASSERT(Result == MMSYSERR_NOERROR); - - Result = GetSoundDeviceFunctionTable(SoundDevice, - &Functions); - ASSERT(Result == MMSYSERR_NOERROR); - - return Functions->RestartWaveDevice(SoundDeviceInstance); -} - -/* This is quite horribly broken */ -MMRESULT -ResetWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - PMMFUNCTION_TABLE Functions; - - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, - &SoundDevice); - ASSERT(Result == MMSYSERR_NOERROR); - - Result = GetSoundDeviceFunctionTable(SoundDevice, - &Functions); - ASSERT(Result == MMSYSERR_NOERROR); - - /* ugly HACK to stop sound playback... FIXME */ - SoundDeviceInstance->Streaming.Wave.CurrentBuffer = NULL; - - /* TODO: Return all audio buffers to the client, marking as DONE */ - - return Functions->ResetWaveDevice(SoundDeviceInstance); -} - -MMRESULT -BreakWaveDeviceLoop_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter) -{ - MMRESULT Result; - PSOUND_DEVICE SoundDevice; - PMMFUNCTION_TABLE Functions; - - VALIDATE_MMSYS_PARAMETER( IsValidSoundDeviceInstance(SoundDeviceInstance) ); - - Result = GetSoundDeviceFromInstance(SoundDeviceInstance, - &SoundDevice); - ASSERT(Result == MMSYSERR_NOERROR); - - Result = GetSoundDeviceFunctionTable(SoundDevice, - &Functions); - ASSERT(Result == MMSYSERR_NOERROR); - - return Functions->BreakWaveDeviceLoop(SoundDeviceInstance); -} Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wave.h [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -22,24 +22,4 @@ IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, OUT PVOID Parameter); -MMRESULT -PauseWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter); - -MMRESULT -RestartWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter); - -MMRESULT -ResetWaveDevice_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter); - -MMRESULT -BreakWaveDeviceLoop_Request( - IN PSOUND_DEVICE_INSTANCE SoundDeviceInstance, - IN PVOID Parameter); - #endif Modified: branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/silverblade-audio/lib/drivers/s… ============================================================================== --- branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/silverblade-audio/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Thu Jul 17 17:44:47 2008 @@ -29,31 +29,40 @@ PSOUND_DEVICE_INSTANCE Instance = (PSOUND_DEVICE_INSTANCE)private_handle; + AcquireEntrypointMutex(); + TRACE_("wodMessageStub called\n"); +// MessageBox(0, L"wodMessage", L"wodMessage", MB_OK | MB_TASKMODAL); switch ( message ) { case WODM_GETNUMDEVS : - return GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); + { + Result = GetSoundDeviceCount(WAVE_OUT_DEVICE_TYPE); + break; + } case WODM_GETDEVCAPS : { UNIVERSAL_CAPS Capabilities; if ( parameter2 < sizeof(WAVEOUTCAPS) ) - return MMSYSERR_INVALPARAM; + { + Result = MMSYSERR_INVALPARAM; + break; + } Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); if ( Result != MMSYSERR_NOERROR ) - return Result; + break; Result = GetSoundDeviceCapabilities(Device, &Capabilities); if ( Result != MMSYSERR_NOERROR ) - return Result; + break; CopyMemory((LPWAVEOUTCAPS)parameter1, &Capabilities.WaveOut, parameter2); - return Result; + break; } case WODM_OPEN : @@ -64,9 +73,8 @@ Result = GetSoundDevice(WAVE_OUT_DEVICE_TYPE, device_id, &Device); TRACE_("GetSoundDevice == %d\n", (int) Result); - - if ( Result != MMSYSERR_NOERROR ) - return Result; + if ( Result != MMSYSERR_NOERROR ) + break; if ( parameter2 & WAVE_FORMAT_QUERY ) { @@ -74,16 +82,19 @@ OpenParameters->lpFormat, sizeof(WAVEFORMATEX)); - return Result; + break; } ASSERT(private_handle != 0); + + // HACK + StartSoundThread(); Result = CreateSoundDeviceInstance(Device, &Instance); TRACE_("CreateSoundDeviceInstance == %d\n", (int) Result); if ( Result != MMSYSERR_NOERROR ) - return Result; + break; Result = SetWaveDeviceFormat(Instance, OpenParameters->lpFormat, @@ -92,7 +103,7 @@ if ( Result != MMSYSERR_NOERROR ) { DestroySoundDeviceInstance(Instance); - return Result; + break; } /* Set up the callback - TODO: Put this somewhere else? */ @@ -108,7 +119,8 @@ /* Notify the client */ NotifySoundClient(Instance, WOM_OPEN, 0); - return MMSYSERR_NOERROR; + Result = MMSYSERR_NOERROR; + break; } case WODM_CLOSE : @@ -124,7 +136,10 @@ /* Must not be playing or paused */ if ( State != WAVE_DD_IDLE ) - return WAVERR_STILLPLAYING; + { + Result = WAVERR_STILLPLAYING; + break; + } /* Notify the client */ NotifySoundClient(Instance, WOM_CLOSE, 0); @@ -132,6 +147,9 @@ Result = DestroySoundDeviceInstance(Instance); ASSERT(Result == MMSYSERR_NOERROR); + // HACK + StopSoundThread(); + return Result; } @@ -140,52 +158,65 @@ ASSERT(Instance != NULL); if ( ! parameter1 ) - return MMSYSERR_INVALPARAM; - - return QueueWaveDeviceBuffer(Instance, (PWAVEHDR) parameter1); + Result = MMSYSERR_INVALPARAM; + else + Result = QueueWaveDeviceBuffer(Instance, (PWAVEHDR) parameter1); + + break; } case WODM_PAUSE : { ASSERT(Instance != NULL); - return PauseWaveDevice(Instance); + Result = PauseWaveDevice(Instance); + break; } case WODM_RESTART : { ASSERT(Instance != NULL); - return RestartWaveDevice(Instance); + Result = RestartWaveDevice(Instance); + break; } case WODM_RESET : { ASSERT(Instance != NULL); - return ResetWaveDevice(Instance); + Result = ResetWaveDevice(Instance); + break; } case WODM_BREAKLOOP : { ASSERT(Instance != NULL); - return BreakWaveDeviceLoop(Instance); + Result = BreakWaveDeviceLoop(Instance); + break; } /* Let WINMM take care of these */ case WODM_PREPARE : case WODM_UNPREPARE : - return MMSYSERR_NOTSUPPORTED; + Result = MMSYSERR_NOTSUPPORTED; + break; /* TODO */ case WODM_SETVOLUME : case WODM_GETVOLUME : case WODM_SETPITCH : case WODM_GETPITCH : - return MMSYSERR_NOTSUPPORTED; + Result = MMSYSERR_NOTSUPPORTED; + break; default : - return MMSYSERR_NOTSUPPORTED; + Result = MMSYSERR_NOTSUPPORTED; + break; } + + ReleaseEntrypointMutex(); + + return Result; }

16 years, 2 months

[sginsberg] 34570: - Patch from Samuel "encoded" Serapion (samdwise51 at gmail dot com) - Use "size_t" instead of "unsigned int" where appropriate

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Jul 17 17:25:03 2008 New Revision: 34570 URL: http://svn.reactos.org/svn/reactos?rev=34570&view=rev Log: - Patch from Samuel "encoded" Serapion (samdwise51 at gmail dot com) - Use "size_t" instead of "unsigned int" where appropriate Modified: trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Thu Jul 17 17:25:03 2008 @@ -737,7 +737,7 @@ /********************************************************************* * _vsnprintf (MSVCRT.@) */ -int CDECL _vsnprintf( char *str, unsigned int len, +int CDECL _vsnprintf( char *str, size_t len, const char *format, va_list valist ) { DWORD sz; @@ -775,7 +775,7 @@ /********************************************************************* * _snprintf (MSVCRT.@) */ -int CDECL _snprintf(char *str, unsigned int len, const char *format, ...) +int CDECL _snprintf(char *str, size_t len, const char *format, ...) { int retval; va_list valist; @@ -788,7 +788,7 @@ /********************************************************************* * _vsnwsprintf (MSVCRT.@) */ -int CDECL _vsnwprintf( wchar_t *str, unsigned int len, +int CDECL _vsnwprintf( wchar_t *str, size_t len, const wchar_t *format, va_list valist ) { pf_output out; @@ -804,7 +804,7 @@ /********************************************************************* * _snwprintf (MSVCRT.@) */ -int CDECL _snwprintf( wchar_t *str, unsigned int len, const wchar_t *format, ...) +int CDECL _snwprintf( wchar_t *str, size_t len, const wchar_t *format, ...) { int retval; va_list valist;

16 years, 2 months

← Newer
1
...
39
40
41
42
43
44
45
...
77
Older →

Jump to page: