Ros-diffs February 2016

ros-diffs@reactos.org

10 participants
155 discussions

[ekohl] 70764: [BATT] Shrink the icon size. Patch by Jared Smudde. CORE-10750 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 21 09:18:35 2016 New Revision: 70764 URL: http://svn.reactos.org/svn/reactos?rev=70764&view=rev Log: [BATT] Shrink the icon size. Patch by Jared Smudde. CORE-10750 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/win32/batt/resources/battery.ico Modified: trunk/reactos/dll/win32/batt/resources/battery.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/resources/b… ============================================================================== Binary files - no diff available.

8 years, 10 months

[ekohl] 70763: [VARIOUS] Updating Turkish Translation. Patch by Erdem Ersoy. #CORE-10879 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 21 09:07:41 2016 New Revision: 70763 URL: http://svn.reactos.org/svn/reactos?rev=70763&view=rev Log: [VARIOUS] Updating Turkish Translation. Patch by Erdem Ersoy. #CORE-10879 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc [iso-8859-1] Sun Feb 21 09:07:41 2016 @@ -1,4 +1,4 @@ -/* TRANSLATOR: 2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATOR: 2015, 2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -34,8 +34,8 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "Clipboard Viewer" - STRING_CLIPFILE "Clipboard Element" + STRING_CLIPBOARD "Pano GÃ¶rÃ¼ntÃ¼leyicisi" + STRING_CLIPFILE "Pano ÃÄesi" STRING_DELETE_MSG "Pano iÃ§eriÄini sil?" STRING_DELETE_TITLE "Pano Sil" STRING_FORMAT_NT "ReactOS Ä°Ã§in Pano KÃ¼tÃ¼kleri (*.clp)" Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/lang/Tr.rc [iso-8859-1] Sun Feb 21 09:07:41 2016 @@ -1,7 +1,7 @@ /* * Turkish Resources for ReactOS Winhlp32 * - * Copyrights: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org), 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * Copyrights: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org), 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -72,7 +72,7 @@ STRINGTABLE { -STID_WINE_HELP, "YardÄ±m ReactOS" +STID_WINE_HELP, "ReactOS YardÄ±m" STID_WHERROR, "YANLIÅLIK" STID_WARNING, "UYARI" STID_INFO, "Bilgi" Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/tr-TR.rc [iso-8859-1] Sun Feb 21 09:07:41 2016 @@ -1,4 +1,4 @@ -/* TRANSLATORS: 2012 Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com), 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ +/* TRANSLATORS: 2012 Arda TanrÄ±kulu (ardatan) (ardatanrikulu(a)gmail.com), 2013-2016 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -18,9 +18,9 @@ FONT 8, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "ReactOS'u YÃ¼kleme", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + LTEXT "ReactOS'un yeni bir kopyasÄ±nÄ± yÃ¼kle. Bu seÃ§enek, kÃ¼tÃ¼klerinizi, ayarlarÄ±nÄ±zÄ± ve izlencelerinizi korumaz. Disklere ve bÃ¶lÃ¼mlere deÄiÅiklikler yapabilirsiniz.", IDC_INSTALLTEXT, 18, 18, 269, 25 AUTORADIOBUTTON "Kurulu ReactOS'u Onarma ya da YÃ¼kseltme", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "ReactOS'un kurulu bir kopyasÄ±nÄ± ÅimdikileÅtir ya da onar. Bu seÃ§enek, kÃ¼tÃ¼klerinizi, ayarlarÄ±nÄ±zÄ± ve izlencelerinizi korur. Bu seÃ§enek yalnÄ±zca ReactOS bu bilgisayarda Ã¶nceden kuruluysa kullanÄ±labilir.", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "AygÄ±tlarÄ± kurmak iÃ§in Ä°leri'ye tÄ±klayÄ±nÄ±z.", IDC_STATIC, 7, 128, 297, 8 END @@ -133,7 +133,7 @@ STRINGTABLE BEGIN - IDS_PARTITION_NAME "Name" - IDS_PARTITION_SIZE "Size" - IDS_PARTITION_TYPE "Type" + IDS_PARTITION_NAME "Ad" + IDS_PARTITION_SIZE "Boyut" + IDS_PARTITION_TYPE "TÃ¼r" END Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Sun Feb 21 09:07:41 2016 @@ -1359,8 +1359,8 @@ MSPAINT_DESC=Paint'i baÅlat CHARMAP_TITLE=Damga EÅlem CHARMAP_DESC=Damga EÅlem'i baÅlat -CLIPBRD_TITLE=Clipboard Viewer -CLIPBRD_DESC=Clipboard Viewer +CLIPBRD_TITLE=Pano GÃ¶rÃ¼ntÃ¼leyicisi +CLIPBRD_DESC=Pano GÃ¶rÃ¼ntÃ¼leyicisi KBSWITCH_TITLE=DÃ¼Äme TakÄ±mÄ± DÃ¼zeni DeÄiÅtiricisi KBSWITCH_DESC=DÃ¼Äme TakÄ±mÄ± DÃ¼zeni DeÄiÅtiricisi REGEDIT_TITLE=DeÄer Defteri DÃ¼zenleyicisi

8 years, 10 months

[hbelusca] 70762: [CDMAKE] - Update source file headers. - Improve some error output. - Factorize code that creates El-Torito boot entries. - Start thinking how to add UDF and AutoCRC support.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 21 03:00:16 2016 New Revision: 70762 URL: http://svn.reactos.org/svn/reactos?rev=70762&view=rev Log: [CDMAKE] - Update source file headers. - Improve some error output. - Factorize code that creates El-Torito boot entries. - Start thinking how to add UDF and AutoCRC support. Modified: trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/llmsort.c Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sun Feb 21 03:00:16 2016 @@ -3,6 +3,11 @@ * by Philip J. Erdelsky * pje(a)acm.org * http://alumnus.caltech.edu/~pje/ + * + * http://alumnus.caltech.edu/~pje/cdmake.txt + * + * According to his website, this file was released into the public domain + * by Philip J. Erdelsky. */ /* * COPYRIGHT: See COPYING in the top level directory @@ -13,6 +18,7 @@ * Casper S. Hornstrup * Filip Navara * Magnus Olsen + * Hermes Belusca-Maito * * HISTORY: * @@ -33,8 +39,6 @@ * Convert long filename to ISO9660 file name by Magnus Olsen * magnus(a)greatlord.com */ - -/* According to his website, this file was released into the public domain by Philip J. Erdelsky */ #include <stdio.h> #include <fcntl.h> @@ -176,13 +180,21 @@ static char DIRECTORY_TIMESTAMP[] = "~Y$'KOR$.3K&"; static struct cd_image cd; +DIR_RECORD root; char volume_label[32]; -DIR_RECORD root; char source[512]; char *end_source; + enum {QUIET, NORMAL, VERBOSE} verbosity; BOOL show_progress; + +BOOL scan_files_only = FALSE; +// BOOL compute_crc = FALSE; + +/* + * ISO 9660 information + */ DWORD size_limit; BOOL accept_punctuation_marks; @@ -190,12 +202,23 @@ DWORD path_table_size; DWORD little_endian_path_table_sector; DWORD big_endian_path_table_sector; + + +/* + * Stats + */ DWORD number_of_files; DWORD bytes_in_files; DWORD unused_bytes_at_ends_of_files; DWORD number_of_directories; DWORD bytes_in_directories; +struct target_dir_hash specified_files; + + +/* + * El-Torito boot information + */ BOOL eltorito; // TRUE/FALSE: bootable/non-bootable CD-ROM BOOL multi_boot; // TRUE/FALSE: multi/single-boot CD-ROM DWORD boot_catalog_sector; @@ -203,12 +226,19 @@ BOOT_ENTRY default_boot_entry; PBOOT_HEADER boot_header_list; +/* + * Joliet information + */ BOOL joliet; DWORD joliet_path_table_size; DWORD joliet_little_endian_path_table_sector; DWORD joliet_big_endian_path_table_sector; -struct target_dir_hash specified_files; +/* + * UDF information + */ +BOOL make_bridged_udf = TRUE; // TRUE for "UDF-Bridge" (aka. UDF/ISO); FALSE for pure UDF. + /*----------------------------------------------------------------------------- This function edits a 32-bit unsigned number into a comma-delimited form, such @@ -685,7 +715,7 @@ if (d->extension[0] != 0) { if (!joliet) - error_exit("Directory with extension %s", filename); + error_exit("Directory with extension '%s'", filename); } d->flags = DIRECTORY_FLAG; } else @@ -993,7 +1023,7 @@ } else { - error_exit("Cannot open %s\n", source); + error_exit("Cannot open '%s'\n", source); return; } @@ -1053,7 +1083,7 @@ } else { - error_exit("Cannot open %s\n", source); + error_exit("Cannot open '%s'\n", source); return; } @@ -1136,7 +1166,7 @@ } else { - error_exit("Cannot open %s\n", source); + error_exit("Cannot open '%s'\n", source); return; } @@ -1221,18 +1251,18 @@ FILE_ATTRIBUTE_NORMAL, NULL)) == INVALID_HANDLE_VALUE) { - error_exit("Cannot open timestamp file %s\n", file->source_name); + error_exit("Cannot open timestamp file '%s'\n", file->source_name); } if (!get_cd_file_time(open_file, &d->date_and_time)) { - error_exit("Cannot stat timestamp file %s\n", file->source_name); + error_exit("Cannot stat timestamp file '%s'\n", file->source_name); } CloseHandle(open_file); #else if (stat(file->target_name, &stbuf) == -1) { - error_exit("Cannot stat timestamp file %s\n", file->source_name); + error_exit("Cannot stat timestamp file '%s'\n", file->source_name); } convert_date_and_time(&d->date_and_time, &stbuf.st_ctime); #endif @@ -1257,15 +1287,15 @@ FILE_ATTRIBUTE_NORMAL, NULL)) == INVALID_HANDLE_VALUE) { - error_exit("Cannot open file %s\n", file->source_name); + error_exit("Cannot open file '%s'\n", file->source_name); } if (!get_cd_file_time(open_file, &new_d->date_and_time)) { - error_exit("Cannot stat file %s\n", file->source_name); + error_exit("Cannot stat file '%s'\n", file->source_name); } if (!GetFileSizeEx(open_file, &file_size)) { - error_exit("Cannot get file size of %s\n", file->source_name); + error_exit("Cannot get file size of '%s'\n", file->source_name); } new_d->size = new_d->joliet_size = file_size.QuadPart; new_d->orig_name = file->source_name; @@ -1378,14 +1408,17 @@ static void pass(void) { - PDIR_RECORD d; - PDIR_RECORD q; + PDIR_RECORD d, q; unsigned int index; unsigned int name_length; DWORD size; DWORD number_of_sectors; char *old_end_source; FILE *file; + + PBOOT_HEADER header; + PBOOT_ENTRY entry; + char timestring[17]; get_time_string(timestring); @@ -1395,46 +1428,47 @@ // Primary Volume Descriptor - - write_string("\1CD001\1"); - write_byte(0); - write_bytecounted_string(32, "", ' '); // system identifier - write_bytecounted_string(32, volume_label, ' '); // volume label - - write_block(8, 0); - write_both_endian_dword(total_sectors); - write_block(32, 0); - write_both_endian_word(1); // volume set size - write_both_endian_word(1); // volume sequence number - write_both_endian_word(2048); // sector size - write_both_endian_dword(path_table_size); - write_little_endian_dword(little_endian_path_table_sector); - write_little_endian_dword(0); // second little endian path table - write_big_endian_dword(big_endian_path_table_sector); - write_big_endian_dword(0); // second big endian path table - write_directory_record(&root, DOT_RECORD, FALSE); - - write_bytecounted_string(128, volume_label, ' '); // volume set identifier - write_bytecounted_string(128, PUBLISHER_ID, ' '); // publisher identifier - write_bytecounted_string(128, DATA_PREP_ID, ' '); // data preparer identifier - write_bytecounted_string(128, APP_ID, ' '); // application identifier - - write_bytecounted_string(37, "", ' '); // copyright file identifier - write_bytecounted_string(37, "", ' '); // abstract file identifier - write_bytecounted_string(37, "", ' '); // bibliographic file identifier - - write_string(timestring); // volume creation - write_byte(0); - write_string(timestring); // most recent modification - write_byte(0); - write_string("0000000000000000"); // volume expires - write_byte(0); - write_string("0000000000000000"); // volume is effective - write_byte(0); - write_byte(1); - write_byte(0); - fill_sector(); - + if (make_bridged_udf) + { + write_string("\1CD001\1"); + write_byte(0); + write_bytecounted_string(32, "", ' '); // system identifier + write_bytecounted_string(32, volume_label, ' '); // volume label + + write_block(8, 0); + write_both_endian_dword(total_sectors); + write_block(32, 0); + write_both_endian_word(1); // volume set size + write_both_endian_word(1); // volume sequence number + write_both_endian_word(2048); // sector size + write_both_endian_dword(path_table_size); + write_little_endian_dword(little_endian_path_table_sector); + write_little_endian_dword(0); // second little endian path table + write_big_endian_dword(big_endian_path_table_sector); + write_big_endian_dword(0); // second big endian path table + write_directory_record(&root, DOT_RECORD, FALSE); + + write_bytecounted_string(128, volume_label, ' '); // volume set identifier + write_bytecounted_string(128, PUBLISHER_ID, ' '); // publisher identifier + write_bytecounted_string(128, DATA_PREP_ID, ' '); // data preparer identifier + write_bytecounted_string(128, APP_ID, ' '); // application identifier + + write_bytecounted_string(37, "", ' '); // copyright file identifier + write_bytecounted_string(37, "", ' '); // abstract file identifier + write_bytecounted_string(37, "", ' '); // bibliographic file identifier + + write_string(timestring); // volume creation + write_byte(0); + write_string(timestring); // most recent modification + write_byte(0); + write_string("0000000000000000"); // volume expires + write_byte(0); + write_string("0000000000000000"); // volume is effective + write_byte(0); + write_byte(1); + write_byte(0); + fill_sector(); + } // Boot Volume Descriptor if (eltorito) @@ -1492,17 +1526,17 @@ } // Volume Descriptor Set Terminator - write_string("\377CD001\1"); - fill_sector(); - - // Boot Catalog and Images + if (make_bridged_udf) + { + write_string("\377CD001\1"); + fill_sector(); + } + + // TODO: Add UDF support! + + // Boot Catalog if (eltorito) { - PBOOT_HEADER header; - PBOOT_ENTRY entry; - - // Boot Catalog - boot_catalog_sector = cd.sector; // Validation entry header @@ -1552,15 +1586,17 @@ } fill_sector(); - - - // Boot Images - + } + + + // Boot Images + if (eltorito) + { default_boot_entry.load_rba = cd.sector; file = fopen(default_boot_entry.bootimage, "rb"); if (file == NULL) - error_exit("Cannot open %s\n", default_boot_entry.bootimage); + error_exit("Cannot open '%s'\n", default_boot_entry.bootimage); fseek(file, 0, SEEK_END); size = ftell(file); if (size == 0 || (size % 2048)) @@ -1573,7 +1609,7 @@ if (!write_from_file(file, size)) { fclose(file); - error_exit("Read error in file %s\n", default_boot_entry.bootimage); + error_exit("Read error in file '%s'\n", default_boot_entry.bootimage); } fclose(file); @@ -1589,7 +1625,7 @@ file = fopen(entry->bootimage, "rb"); if (file == NULL) - error_exit("Cannot open %s\n", entry->bootimage); + error_exit("Cannot open '%s'\n", entry->bootimage); fseek(file, 0, SEEK_END); size = ftell(file); if (size == 0 || (size % 2048)) @@ -1602,7 +1638,7 @@ if (!write_from_file(file, size)) { fclose(file); - error_exit("Read error in file %s\n", entry->bootimage); + error_exit("Read error in file '%s'\n", entry->bootimage); } fclose(file); @@ -1615,7 +1651,9 @@ // fill_sector(); } + // Little Endian Path Table + little_endian_path_table_sector = cd.sector; write_byte(1); write_byte(0); // number of sectors in extended attribute record @@ -1643,6 +1681,7 @@ SECTOR_SIZE + cd.offset; fill_sector(); + // Big Endian Path Table big_endian_path_table_sector = cd.sector; @@ -1713,6 +1752,14 @@ } fill_sector(); } + + // TODO: Add UDF support! + +#if 0 + // Boot Images ?? +#endif + + // TODO: Add CRC block for header! // Directories and files for (d = &root; d != NULL; d = d->next_in_path_table) @@ -1784,11 +1831,11 @@ printf("Writing contents of %s\n", file_source); file = fopen(file_source, "rb"); if (file == NULL) - error_exit("Cannot open %s\n", file_source); + error_exit("Cannot open '%s'\n", file_source); if (!write_from_file(file, size)) { fclose(file); - error_exit("Read error in file %s\n", file_source); + error_exit("Read error in file '%s'\n", file_source); } fclose(file); end_source = old_end_source; @@ -1798,19 +1845,31 @@ } } + // TODO: Add final CRC block! + total_sectors = (DWORD)cd.sector; } static char HELP[] = "\n" "CDMAKE CD-ROM Premastering Utility\n" - "Copyright (C) Philip J. Erdelsky\n" - "Copyright (C) 2003-2015 ReactOS Team\n" + "Copyright (C) 1997 Philip J. Erdelsky\n" + "Copyright (C) 2003-2016 ReactOS Team\n" "\n\n" - "CDMAKE [-vN] [-p] [-s N] [-m] [-j] [-pN] [-eN] [-b bootimage]\n" + "CDMAKE [-vN] [-p] [-s N] [-m] [-j] [-q] " + // "[-x] " + "[-pN] [-eN] [-b bootimage]\n" " [-bootdata:N#<defaultBootEntry>#<bootEntry1>#...#<bootEntryN>]\n" " source volume image\n" "\n" + "Mandatory options:\n" + " source Specifications of base directory containing all files to be\n" + " written to CD-ROM image. Can be a directory, or a path to a\n" + " file list (in which case the path must start with a '@').\n" + " volume Volume label.\n" + " image Image file or device.\n" + "\n" + "General options:\n" " -vN Verbosity level. Valid values for 'N' are:\n" " 0: Quiet mode - display nothing but error messages.\n" " 1: Normal mode (default).\n" @@ -1819,16 +1878,24 @@ " -p Show progress while writing.\n" " -s N Abort operation before beginning write if image will be larger\n" " than N megabytes (i.e. 1024*1024*N bytes).\n" + " -q Only scan the source files; do not create an image.\n" + // " -x Compute and encode the AutoCRC value in the image.\n" + "\n" + "ISO 9660 and Joliet options:\n" " -m Accept punctuation marks other than underscores in names and\n" " extensions.\n" " -j Generate Joliet filename records.\n" "\n" + // "UDF options:\n" + // " Not implemented yet!\n" + // "\n" + "El-Torito boot options:\n" " -pN Boot platform ID in hex format (default: 00 for a BIOS system).\n" " -eN Boot media emulation. Valid values for 'N' are:\n" " 0 (or nothing): No emulation.\n" - " 1: 1.2Mb diskette.\n" - " 2: 1.44Mb diskette.\n" - " 3: 2.88Mb diskette.\n" + " 1: 1.2 MB diskette.\n" + " 2: 1.44MB diskette.\n" + " 3: 2.88MB diskette.\n" " 4: Hard disk.\n" " -b bootimage Create a single-boot El-Torito image.\n" " -bootdata: Create a multi-boot El-Torito image. This option cannot be\n" @@ -1842,12 +1909,7 @@ " - Do not use spaces.\n" " - Each multi-boot entry must be delimited with a hash symbol (#).\n" " - Each option for a boot entry must be delimited with a comma (,).\n" - " - Each boot entry must specify the platform ID.\n" - "\n" - " source Specifications of base directory containing all files to be\n" - " written to CD-ROM image.\n" - " volume Volume label.\n" - " image Image file or device.\n"; + " - Each boot entry must specify the platform ID.\n"; /*----------------------------------------------------------------------------- Program execution starts here. @@ -1879,6 +1941,20 @@ } #endif +static void +init_boot_entry(PBOOT_ENTRY boot_entry, + BYTE boot_emu_type, WORD load_segment, + char* bootimage) +{ + boot_entry->boot_id = 0x88; // Bootable entry + boot_entry->boot_emu_type = boot_emu_type; // 0: No emulation, etc... + boot_entry->load_segment = load_segment; // If 0 then use default 0x07C0 + + boot_entry->bootimage[0] = '\0'; + strncpy(boot_entry->bootimage, bootimage, sizeof(boot_entry->bootimage)); + boot_entry->bootimage[sizeof(boot_entry->bootimage)-1] = '\0'; +} + int main(int argc, char **argv) { time_t timestamp = time(NULL); @@ -1891,23 +1967,27 @@ return 1; } - // Initialize root directory + // Initialize CD-ROM write buffer + + cd.file = NULL; + cd.filespecs[0] = 0; cd.buffer = malloc(BUFFER_SIZE); if (cd.buffer == NULL) error_exit("Insufficient memory"); + + // Initialize root directory memset(&root, 0, sizeof(root)); root.level = 1; root.flags = DIRECTORY_FLAG; convert_date_and_time(&root.date_and_time, &timestamp); - // Initialize CD-ROM write buffer - - cd.file = NULL; - cd.filespecs[0] = 0; - // Initialize parameters + + scan_files_only = FALSE; + make_bridged_udf = TRUE; + // compute_crc = FALSE; verbosity = NORMAL; show_progress = FALSE; @@ -1921,12 +2001,12 @@ multi_boot = FALSE; boot_validation_header.header_id = 1; // Validation header ID boot_validation_header.platform_id = 0; // x86/64 BIOS system - default_boot_entry.boot_id = 0x88; // Bootable entry - default_boot_entry.boot_emu_type = 0; // No emulation - default_boot_entry.load_segment = 0; // 0 --> use default 0x07C0 + init_boot_entry(&default_boot_entry, + 0, // No emulation + 0, // Use default 0x07C0 + ""); default_boot_entry.sector_count = 0; default_boot_entry.load_rba = 0; - default_boot_entry.bootimage[0] = '\0'; boot_header_list = NULL; // Scan command line arguments @@ -2041,7 +2121,7 @@ eltorito = TRUE; multi_boot = TRUE; - // FIXME: Paths with '#' or ',' or ' ' inside are not yet supported!! + // FIXME: Paths containing '#' or ',' or ' ' are not yet supported!! // Start parsing... t = strtok_s(bootdata, "#", &entry_ctx); @@ -2058,7 +2138,7 @@ // Reset to default values platform_id = 0; // x86/64 BIOS system boot_emu_type = 0; // No emulation - load_segment = 0; // 0 --> use default 0x07C0 + load_segment = 0; // Use default 0x07C0 bootimage[0] = '\0'; t = strtok_s(NULL, "#", &entry_ctx); @@ -2106,7 +2186,7 @@ case 't': // Loading segment { - if (*t == 0) // Not specified --> use default 0x07C0 + if (*t == 0) // Not specified: use default 0x07C0 load_segment = 0; else // Segment in hexadecimal load_segment = (BYTE)strtoul(t, NULL, 16); @@ -2129,12 +2209,8 @@ boot_validation_header.header_id = 1; // Validation header ID boot_validation_header.platform_id = platform_id; - default_boot_entry.boot_id = 0x88; // Bootable entry - default_boot_entry.boot_emu_type = boot_emu_type; - default_boot_entry.load_segment = load_segment; - - strncpy(default_boot_entry.bootimage, bootimage, sizeof(default_boot_entry.bootimage)); - default_boot_entry.bootimage[sizeof(default_boot_entry.bootimage)-1] = '\0'; + + init_boot_entry(&default_boot_entry, boot_emu_type, load_segment, bootimage); // Default entry is now initialized. default_entry = FALSE; @@ -2149,12 +2225,7 @@ error_exit("Insufficient memory"); // boot_entry->next_entry = NULL; - boot_entry->boot_id = 0x88; // Bootable entry - boot_entry->boot_emu_type = boot_emu_type; - boot_entry->load_segment = load_segment; - - strncpy(boot_entry->bootimage, bootimage, sizeof(boot_entry->bootimage)); - boot_entry->bootimage[sizeof(boot_entry->bootimage)-1] = '\0'; + init_boot_entry(boot_entry, boot_emu_type, load_segment, bootimage); // Create a new boot header if we don't have one yet if (boot_header == NULL) @@ -2211,6 +2282,10 @@ free(bootdata); } + else if (strcmp(argv[i], "-q") == 0) + scan_files_only = TRUE; + // else if (strcmp(argv[i], "-x") == 0) + // compute_crc = TRUE; else if (i + 2 < argc) { strcpy(source, argv[i++]); @@ -2249,7 +2324,7 @@ FILE *f = fopen(source+1, "r"); if (!f) { - error_exit("Cannot open CD-ROM file description %s\n", source+1); + error_exit("Cannot open CD-ROM file description '%s'\n", source+1); } while (fgets(lineread, sizeof(lineread), f)) { @@ -2327,32 +2402,35 @@ if (size_limit != 0 && total_sectors > size_limit) error_exit("Size limit exceeded"); - // re-initialize CD-ROM write buffer - - cd.file = fopen(cd.filespecs, "w+b"); - if (cd.file == NULL) - error_exit("Cannot open image file %s", cd.filespecs); - cd.sector = 0; - cd.offset = 0; - cd.count = 0; - - - // make writing pass over directory structure - - pass(); - - if (cd.count > 0) - flush_buffer(); - if (show_progress) - printf("\r \n"); - if (fclose(cd.file) != 0) - { - cd.file = NULL; - error_exit("File write error in image file %s", cd.filespecs); - } - - if (verbosity >= NORMAL) - puts("CD-ROM image made successfully"); + if (!scan_files_only) + { + // re-initialize CD-ROM write buffer + + cd.file = fopen(cd.filespecs, "w+b"); + if (cd.file == NULL) + error_exit("Cannot open image file '%s'", cd.filespecs); + cd.sector = 0; + cd.offset = 0; + cd.count = 0; + + + // make writing pass over directory structure + + pass(); + + if (cd.count > 0) + flush_buffer(); + if (show_progress) + printf("\r \n"); + if (fclose(cd.file) != 0) + { + cd.file = NULL; + error_exit("File write error in image file '%s'", cd.filespecs); + } + + if (verbosity >= NORMAL) + puts("CD-ROM image made successfully"); + } dir_hash_destroy(&specified_files); release_memory(); Modified: trunk/reactos/tools/cdmake/llmsort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/llmsort.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/llmsort.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/llmsort.c [iso-8859-1] Sun Feb 21 03:00:16 2016 @@ -2,10 +2,18 @@ * A Linked-List Memory Sort * by Philip J. Erdelsky * pje(a)acm.org + * pje(a)efgh.com * http://alumnus.caltech.edu/~pje/ + * + * Version taken from: + * http://alumnus.caltech.edu/~pje/cdmake.txt + * + * An extended version can be found at: + * http://alumnus.caltech.edu/~pje/llmsort.html + * http://www.efgh.com/software/llmsort.htm + * + * Public domain; no restrictions on use. */ - -/* According to his website, this file was released into the public domain by Philip J. Erdelsky */ #include <stdio.h>

8 years, 10 months

[ekohl] 70761: [VARIOUS] Romanian resources maintenance Patch by Ștefan Fulea. CORE-10811 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 20 21:14:13 2016 New Revision: 70761 URL: http://svn.reactos.org/svn/reactos?rev=70761&view=rev Log: [VARIOUS] Romanian resources maintenance Patch by Ștefan Fulea. CORE-10811 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/system/userinit/lang/ro-RO.rc trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -11,7 +11,7 @@ POPUP "&FiÈier" BEGIN MENUITEM "&Nou\tCtrl+N", IDM_FILE_NEW - MENUITEM "Open\tStrg+O", IDM_FILE_OPEN + MENUITEM "&Deschide\tCtrl+O", IDM_FILE_OPEN MENUITEM SEPARATOR MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT END @@ -26,9 +26,9 @@ POPUP "&FiÈier" BEGIN MENUITEM "&Nou\tCtrl+N", IDM_FILE_NEW - MENUITEM "Open\tStrg+O", IDM_FILE_OPEN - MENUITEM "Save", IDM_FILE_SAVE - MENUITEM "Save as...", IDM_FILE_SAVEAS + MENUITEM "&Deschide\tCtrl+O", IDM_FILE_OPEN + MENUITEM "&PÄstreazÄ", IDM_FILE_SAVE + MENUITEM "PÄst&rare Ã®nâ¦", IDM_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT END Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -25,9 +25,9 @@ FONT 8, "MS Shell Dlg" BEGIN AUTORADIOBUTTON "InstaleazÄ ReactOS", IDC_INSTALL, 7, 7, 277, 10 - LTEXT "Install a new copy of ReactOS. This option does not keep your files, settings and programs. You can make changes to disks and partitions.", IDC_INSTALLTEXT, 18, 18, 269, 25 + LTEXT "Instalarea unei noi copii a ReactOS. FiÃâ¢ierele, configuraÃâºiile Ãâ¢i programele existente nu vor fi pÃÆstrate. Se pot face ajustÃÆri asupra discurilor Ãâ¢i partiÃâºiilor.", IDC_INSTALLTEXT, 18, 18, 269, 25 AUTORADIOBUTTON "ReparÄ sau actualizeazÄ ReactOS", IDC_UPDATE, 7, 50, 277, 10 - LTEXT "Update or repair an installed copy of ReactOS. This option keeps your files, settings and programs. This option is only available if ReactOS is already installed on this computer.", IDC_UPDATETEXT, 18, 61, 269, 30 + LTEXT "Repararea sau actualizarea ReactOS. AceastÃÆ opÃâºiune menÃâºine fiÃâ¢ierele, configuraÃâºiile Ãâ¢i programele existente. OpÃâºiune validÃÆ doar dacÃÆ ReactOS e deja instalat ÃÂ®n calculator.", IDC_UPDATETEXT, 18, 61, 269, 30 LTEXT "ApÄsaÈi pe âÃnainteâ pentru configurarea de dispozitive.", IDC_STATIC, 7, 128, 297, 8 END Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -241,19 +241,19 @@ { 8, 8, - "Sistemul de operare ReactOS este oferit în termenii GNU GPL,", + "Sistemul de operare ReactOS este oferit în termenii Licenþei", TEXT_STYLE_NORMAL }, { 8, 9, - "cu pãrþi de cod din alte licenþe compatibile, cum ar fi", + "Publice Generale GNU, denumit în continuare GPL, cu pãrþi de", TEXT_STYLE_NORMAL }, { 8, 10, - "licenþele X11, BSD ºi GNU LGPL.", + "cod din alte licenþe compatibile (ca X11, BSD ºi LGPL).", TEXT_STYLE_NORMAL }, { @@ -265,13 +265,13 @@ { 8, 13, - "prin urmare oferite sub licenþã GNU GPL, menþinându-ºi în", + "prin urmare oferite sub licenþa GPL, menþinându-ºi astfel ºi", TEXT_STYLE_NORMAL }, { 8, 14, - "acelaºi timp ºi licenþierea originalã.", + "licenþierea originalã în acelaºi timp.", TEXT_STYLE_NORMAL }, { @@ -300,55 +300,55 @@ }, { 8, - 20, - "Dacã din vreun motiv careva nu aþi primit o copie a Licenþei", - TEXT_STYLE_NORMAL - }, - { - 8, 21, - "Publice Generale GNU împreunã cu ReactOS, o puteþi consulta", + "Dacã din vreun careva motiv nu deþineþi o copie a licenþei", TEXT_STYLE_NORMAL }, { 8, 22, + "GPL împreunã cu ReactOS, o puteþi consulta (în englezã)", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, "accesând pagina:", TEXT_STYLE_NORMAL }, { 8, - 23, + 24, "http://www.gnu.org/licenses/licenses.html", TEXT_STYLE_HIGHLIGHT }, { 6, - 26, + 27, "Garanþie:", TEXT_STYLE_HIGHLIGHT }, { 8, - 28, + 29, "Acest sistem de operare este distribuit doar în speranþa cã", TEXT_STYLE_NORMAL }, { 8, - 29, + 30, "va fi util, neavând însã ataºatã NICI O GARANÞIE; nici mãcar", TEXT_STYLE_NORMAL }, { 8, - 30, + 31, "garanþia implicitã a VANDABILITÃÞII sau a UTILITÃÞII ÎNTR-UN", TEXT_STYLE_NORMAL }, { 8, - 31, + 32, "SCOP ANUME.", TEXT_STYLE_NORMAL }, Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -424,8 +424,8 @@ TastaÈi TIME fÄrÄ perametri pentru a afiÈa ora curentÄ urmatÄ de posibilitatea\n\ de a introduce o nouÄ orÄ. TastaÈi ENTER pentru a pÄstra aceiaÈi orÄ.\n" STRING_TIME_HELP2 "IntroduceÈi noua orÄ: " - STRING_TIMER_HELP1 "S-au scurs %d msec\n" - STRING_TIMER_HELP2 "S-au scurs %02d%c%02d%c%02d%c%02d\n" + STRING_TIMER_HELP1 "Timp cronometrat: %d msec\n" + STRING_TIMER_HELP2 "Timp cronometrat: %02d%c%02d%c%02d%c%02d\n" STRING_TIMER_HELP3 "Permite utilizarea a zece cronometre.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON ActiveazÄ cronometru\n\ Modified: trunk/reactos/base/system/userinit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/ro-RO.rc [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -8,15 +8,15 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "LimbÄ:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "Aranjament tastaturÄ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "SelectaÈi limba Èi aranjamentul de tastaturÄ apoi apÄsaÈi âÃnainteâ pentru a continua.", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + DEFPUSHBUTTON "Ãn&ainte", IDOK, 205, 172, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 @@ -25,23 +25,23 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + DEFPUSHBUTTON "LanseazÄ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "&InstaleazÄ ReactOS", IDC_INSTALL, 71, 130, 175, 21 LTEXT "", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "Ãn&apoi", IDOK, 205, 172, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN IDS_SHELL_FAIL "Userinit a eÈuat Ã®n lansarea interfeÈei!\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_INSTALLER_FAIL "Userinit a eÈuat Ã®n lansarea instalÄrii!\n" END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "SpaniolÄ (Spania)" END Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -673,6 +673,18 @@ [Strings.0018] CPLFILE_OPENWITH="Deschide Ã®n Panoul de control" +CHMFILE="Manual compilat din HTML" +HTMLFILE="FiÈier HTML" +XMLFILE="Document XML" +XSLFILE="FiÈier de stil XSL" +MSIPACK="Pachet de instalare ReactOS" +MSSTYLESFILE="FiÈier de stil vizual" +THEMEFILE="TemÄ de interfaÈÄ graficÄ" +WAVFILE="FiÈier audio Wave" +MIDFILE="SecvenÈÄ audio MIDI" +CDAFILE="PistÄ de CD audio" +AVIFILE="FiÈier video" + ; LANG_RUSSIAN SUBLANG_NEUTRAL [Strings.0019] CPLFILE_OPENWITH="ÐÑÐºÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐÐ°Ð½ÐµÐ»Ð¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -101,7 +101,7 @@ IDS_WHATS_THIS "Aceasta ce este?" IDS_LANGUAGE "LimbÄ" IDS_LAYOUT "Aranjament de tastaturÄ" - IDS_REM_QUESTION "DoriÈi eliminarea aranjamentului de tastaturÄ slectat?" + IDS_REM_QUESTION "DoriÈi eliminarea aranjamentului de tastaturÄ selectat?" IDS_CONFIRMATION "Confirmare" IDS_LAYOUT_EXISTS "Aranjamentul de tastaturÄ existÄ deja." IDS_LAYOUT_EXISTS2 "Un asemenea aranjament de tastaturÄ deja existÄ Èi nu poate fi readÄugat." Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sat Feb 20 21:14:13 2016 @@ -164,7 +164,7 @@ * Also check the IDD_COMPUTERPAGE dialog. */ IDS_ADMINISTRATOR_NAME "Administrator" - IDS_MACHINE_OWNER_NAME "Owner" + IDS_MACHINE_OWNER_NAME "Proprietar" END STRINGTABLE

8 years, 10 months

[ekohl] 70760: [MAIN] Improve the icons! (in MAIN.CPL) Patch by Jared Smudde. CORE-10813 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Feb 20 18:50:52 2016 New Revision: 70760 URL: http://svn.reactos.org/svn/reactos?rev=70760&view=rev Log: [MAIN] Improve the icons! (in MAIN.CPL) Patch by Jared Smudde. CORE-10813 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/cpl/main/resources/admintools_folder.ico trunk/reactos/dll/cpl/main/resources/folder_closed.ico trunk/reactos/dll/cpl/main/resources/folder_open.ico trunk/reactos/dll/cpl/main/resources/mouse_button.ico trunk/reactos/dll/cpl/main/resources/mouse_left.ico trunk/reactos/dll/cpl/main/resources/mouse_pointer.ico trunk/reactos/dll/cpl/main/resources/mouse_right.ico trunk/reactos/dll/cpl/main/resources/mouse_speed.ico trunk/reactos/dll/cpl/main/resources/mouse_trails.ico trunk/reactos/dll/cpl/main/resources/mouse_wheel.ico trunk/reactos/dll/cpl/main/resources/repeat_delay.ico trunk/reactos/dll/cpl/main/resources/repeat_rate.ico Modified: trunk/reactos/dll/cpl/main/resources/admintools_folder.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/adm… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/folder_closed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/folder_open.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_button.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_left.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_pointer.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_right.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_speed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_trails.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/mouse_wheel.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/mou… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/repeat_delay.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/rep… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/repeat_rate.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/rep… ============================================================================== Binary files - no diff available.

8 years, 10 months

[pschweitzer] 70759: [NP_ENUM] Add a test application that allows checking that currently network places enumeration is broken in ReactOS

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 20 15:56:49 2016 New Revision: 70759 URL: http://svn.reactos.org/svn/reactos?rev=70759&view=rev Log: [NP_ENUM] Add a test application that allows checking that currently network places enumeration is broken in ReactOS Added: trunk/rostests/tests/np_enum/ trunk/rostests/tests/np_enum/CMakeLists.txt (with props) trunk/rostests/tests/np_enum/np_enum.c (with props) Added: trunk/rostests/tests/np_enum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/np_enum/CMakeLists.… ============================================================================== --- trunk/rostests/tests/np_enum/CMakeLists.txt (added) +++ trunk/rostests/tests/np_enum/CMakeLists.txt [iso-8859-1] Sat Feb 20 15:56:49 2016 @@ -0,0 +1,4 @@ +add_executable(np_enum np_enum.c) +set_module_type(np_enum win32cui UNICODE) +add_importlibs(np_enum msvcrt kernel32 mpr) +add_cd_file(TARGET np_enum DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/tests/np_enum/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/np_enum/np_enum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/np_enum/np_enum.c?r… ============================================================================== --- trunk/rostests/tests/np_enum/np_enum.c (added) +++ trunk/rostests/tests/np_enum/np_enum.c [iso-8859-1] Sat Feb 20 15:56:49 2016 @@ -0,0 +1,76 @@ +#include <windows.h> +#include <stdio.h> + +DWORD debug_shift = 0; + +#define INC_SHIFT ++debug_shift; +#define DEC_SHIFT --debug_shift; +#define PRT_SHIFT do { DWORD cur = 0; for (; cur < debug_shift; ++cur) printf("\t"); } while (0); + +void np_enum(NETRESOURCEW * resource) +{ + DWORD ret; + HANDLE handle; + DWORD size = 0x1000; + NETRESOURCEW * out; + BOOL check = FALSE; + + if (resource && resource->lpRemoteName) + check = TRUE; + + ret = WNetOpenEnum(RESOURCE_GLOBALNET, RESOURCETYPE_DISK, 0, resource, &handle); + if (ret != WN_SUCCESS) + return; + + out = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!out) + { + WNetCloseEnum(handle); + return; + } + + INC_SHIFT + + if (check) + { + printf("Called with lpRemoteName not null, current value: %S\n", resource->lpRemoteName); + } + + do + { + DWORD count = -1; + + ret = WNetEnumResource(handle, &count, out, &size); + if (ret == WN_SUCCESS || ret == WN_MORE_DATA) + { + NETRESOURCEW * current; + + current = out; + for (; count; count--) + { + PRT_SHIFT; + printf("lpRemoteName: %S\n", current->lpRemoteName); + + if ((current->dwUsage & RESOURCEUSAGE_CONTAINER) == RESOURCEUSAGE_CONTAINER) + { + PRT_SHIFT; + printf("Found provider: %S\n", current->lpProvider); + np_enum(current); + } + + current++; + } + } + } while (ret != WN_NO_MORE_ENTRIES); + DEC_SHIFT; + + HeapFree(GetProcessHeap(), 0, out); + WNetCloseEnum(handle); +} + +int wmain(int argc, const WCHAR *argv[]) +{ + np_enum(NULL); + + return 0; +} Propchange: trunk/rostests/tests/np_enum/np_enum.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 10 months

[pschweitzer] 70758: [SHELL32] Don't leak memory when enumerating network places...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 20 09:52:35 2016 New Revision: 70758 URL: http://svn.reactos.org/svn/reactos?rev=70758&view=rev Log: [SHELL32] Don't leak memory when enumerating network places... Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Sat Feb 20 09:52:35 2016 @@ -167,6 +167,7 @@ } } while (dRet != WN_NO_MORE_ENTRIES); + CoTaskMemFree(lpRes); WNetCloseEnum(hEnum); TRACE("Done: %u\n", bRet);

8 years, 10 months

[hbelusca] 70757: ReactOS 0.4.0 is now released! Tag the branch.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Feb 16 21:29:10 2016 New Revision: 70757 URL: http://svn.reactos.org/svn/reactos?rev=70757&view=rev Log: ReactOS 0.4.0 is now released! Tag the branch. Added: tags/ReactOS-0.4.0/ (props changed) - copied from r70756, branches/ros-branch-0_4_0/ Removed: branches/ros-branch-0_4_0/ Propchange: tags/ReactOS-0.4.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Feb 16 21:29:10 2016 @@ -0,0 +1 @@ +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651,70655

8 years, 10 months

[pschweitzer] 70756: [NTOSKRNL] If the cache wasn't initialized by the FSD serving the image, don't allow section creation to avoid later (dramatic) failure in CC. Based on a patch by Sylvain Dever...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 15 21:22:05 2016 New Revision: 70756 URL: http://svn.reactos.org/svn/reactos?rev=70756&view=rev Log: [NTOSKRNL] If the cache wasn't initialized by the FSD serving the image, don't allow section creation to avoid later (dramatic) failure in CC. Based on a patch by Sylvain Deverre. CORE-10038 #comment Modified patch committed in r70756 Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Feb 15 21:22:05 2016 @@ -3776,6 +3776,14 @@ if (FileObject == NULL) return STATUS_INVALID_FILE_FOR_SECTION; + +#ifndef NEWCC + if (FileObject->SectionObjectPointer->SharedCacheMap == NULL) + { + DPRINT1("Denying section creation due to missing cache initialization\n"); + return STATUS_INVALID_FILE_FOR_SECTION; + } +#endif /* * Create the section

8 years, 10 months

[pschweitzer] 70755: [MPR] Import Wine commit: - d070c263adf840cc14dde84eb8e73b04490d1900, Partially implement WNetUseConnectionW(). This reduces diff to Wine, by providing a cleaner implementation...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Feb 15 20:32:25 2016 New Revision: 70755 URL: http://svn.reactos.org/svn/reactos?rev=70755&view=rev Log: [MPR] Import Wine commit: - d070c263adf840cc14dde84eb8e73b04490d1900, Partially implement WNetUseConnectionW(). This reduces diff to Wine, by providing a cleaner implementation of WNetUseConnectionW(). CORE-10032 Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Mon Feb 15 20:32:25 2016 @@ -156,84 +156,3 @@ } /***************************************************************** -@@ -1577,12 +1659,75 @@ - LPWSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) - { -- FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", -- hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, -- debugstr_w(lpAccessName), lpBufferSize, lpResult ); -+ DWORD provider; -+ DWORD cap; -+ char id; -+ DWORD drives; -+ DWORD ret; -+ PF_NPAddConnection3 addConn3; -+ PF_NPAddConnection addConn; - -- SetLastError(WN_NO_NETWORK); -- return WN_NO_NETWORK; -+ if (!providerTable || providerTable->numProviders == 0) { -+ SetLastError(WN_NO_NETWORK); -+ return WN_NO_NETWORK; -+ } -+ -+ if (!lpNetResource) { -+ SetLastError(ERROR_INVALID_PARAMETER); -+ return ERROR_INVALID_PARAMETER; -+ } -+ -+ if (!lpNetResource->lpProvider || !*lpNetResource->lpProvider) { -+ SetLastError(ERROR_BAD_PROVIDER); -+ return ERROR_BAD_PROVIDER; -+ } -+ -+ if (!lpNetResource->lpLocalName || !*lpNetResource->lpLocalName) { -+ SetLastError(ERROR_BAD_DEVICE); -+ return ERROR_BAD_DEVICE; -+ } -+ -+ if ((!(lpNetResource->lpLocalName[0] >= 'a' && lpNetResource->lpLocalName[0] <= 'z') && -+ !(lpNetResource->lpLocalName[0] >= 'A' && lpNetResource->lpLocalName[0] <= 'Z')) || -+ lpNetResource->lpLocalName[1] != ':' || lpNetResource->lpLocalName[2]) { -+ SetLastError(ERROR_BAD_DEVICE); -+ return ERROR_BAD_DEVICE; -+ } -+ -+ id = (lpNetResource->lpLocalName[0] >= 'a') ? lpNetResource->lpLocalName[0] - 'a' : lpNetResource->lpLocalName[0] - 'A'; -+ drives = GetLogicalDrives(); -+ if (drives & (1 << id)) { -+ SetLastError(ERROR_ALREADY_ASSIGNED); -+ return ERROR_ALREADY_ASSIGNED; -+ } -+ -+ provider = _findProviderIndexW(lpNetResource->lpProvider); -+ if (provider == BAD_PROVIDER_INDEX) { -+ SetLastError(ERROR_BAD_PROVIDER); -+ return ERROR_BAD_PROVIDER; -+ } -+ -+ cap = providerTable->table[provider].getCaps(WNNC_CONNECTION); -+ if (!(cap & WNNC_CON_ADDCONNECTION) && !(cap & WNNC_CON_ADDCONNECTION3)) { -+ SetLastError(ERROR_BAD_PROVIDER); -+ return ERROR_BAD_PROVIDER; -+ } -+ -+ ret = WN_ACCESS_DENIED; -+ if (cap & WNNC_CON_ADDCONNECTION3) { -+ addConn3 = (PF_NPAddConnection3)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection3"); -+ if (addConn3) { -+ ret = addConn3(hwndOwner, lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID, dwFlags); -+ } -+ } -+ else if (cap & WNNC_CON_ADDCONNECTION) { -+ addConn = (PF_NPAddConnection)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection"); -+ if (addConn) { -+ ret = addConn(lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID); -+ } -+ } -+ -+ return ret; - } - - /********************************************************************* Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Feb 15 20:32:25 2016 @@ -1654,77 +1654,76 @@ /***************************************************************** * WNetUseConnectionW [MPR.@] */ -DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, LPNETRESOURCEW lpNetResource, - LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags, - LPWSTR lpAccessName, LPDWORD lpBufferSize, - LPDWORD lpResult ) -{ - DWORD provider; - DWORD cap; - char id; - DWORD drives; - DWORD ret; - PF_NPAddConnection3 addConn3; - PF_NPAddConnection addConn; - - if (!providerTable || providerTable->numProviders == 0) { - SetLastError(WN_NO_NETWORK); +DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR password, + LPCWSTR userid, DWORD flags, LPWSTR accessname, DWORD *buffer_size, DWORD *result ) +{ + WNetProvider *provider; + DWORD index, ret, caps; + + TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", + hwndOwner, resource, password, debugstr_w(userid), flags, + accessname, buffer_size, result ); + + if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; - } - - if (!lpNetResource) { - SetLastError(ERROR_INVALID_PARAMETER); + + if (!resource) return ERROR_INVALID_PARAMETER; - } - - if (!lpNetResource->lpProvider || !*lpNetResource->lpProvider) { - SetLastError(ERROR_BAD_PROVIDER); + + if (!resource->lpProvider) + { + FIXME("Networking provider selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (!resource->lpLocalName && (flags & CONNECT_REDIRECT)) + { + FIXME("Locale device selection is not implemented.\n"); + return WN_NO_NETWORK; + } + + if (flags & CONNECT_INTERACTIVE) + return ERROR_BAD_NET_NAME; + + index = _findProviderIndexW(resource->lpProvider); + if (index == BAD_PROVIDER_INDEX) return ERROR_BAD_PROVIDER; - } - - if (!lpNetResource->lpLocalName || !*lpNetResource->lpLocalName) { - SetLastError(ERROR_BAD_DEVICE); - return ERROR_BAD_DEVICE; - } - - if ((!(lpNetResource->lpLocalName[0] >= 'a' && lpNetResource->lpLocalName[0] <= 'z') && - !(lpNetResource->lpLocalName[0] >= 'A' && lpNetResource->lpLocalName[0] <= 'Z')) || - lpNetResource->lpLocalName[1] != ':' || lpNetResource->lpLocalName[2]) { - SetLastError(ERROR_BAD_DEVICE); - return ERROR_BAD_DEVICE; - } - - id = (lpNetResource->lpLocalName[0] >= 'a') ? lpNetResource->lpLocalName[0] - 'a' : lpNetResource->lpLocalName[0] - 'A'; - drives = GetLogicalDrives(); - if (drives & (1 << id)) { - SetLastError(ERROR_ALREADY_ASSIGNED); - return ERROR_ALREADY_ASSIGNED; - } - - provider = _findProviderIndexW(lpNetResource->lpProvider); - if (provider == BAD_PROVIDER_INDEX) { - SetLastError(ERROR_BAD_PROVIDER); + + provider = &providerTable->table[index]; + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) return ERROR_BAD_PROVIDER; - } - - cap = providerTable->table[provider].getCaps(WNNC_CONNECTION); - if (!(cap & WNNC_CON_ADDCONNECTION) && !(cap & WNNC_CON_ADDCONNECTION3)) { - SetLastError(ERROR_BAD_PROVIDER); - return ERROR_BAD_PROVIDER; - } + + if (accessname && buffer_size && *buffer_size) + { + DWORD len; + + if (resource->lpLocalName) + len = strlenW(resource->lpLocalName); + else + len = strlenW(resource->lpRemoteName); + + if (++len > *buffer_size) + { + *buffer_size = len; + return ERROR_MORE_DATA; + } + } + else + accessname = NULL; ret = WN_ACCESS_DENIED; - if (cap & WNNC_CON_ADDCONNECTION3) { - addConn3 = (PF_NPAddConnection3)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection3"); - if (addConn3) { - ret = addConn3(hwndOwner, lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID, dwFlags); - } - } - else if (cap & WNNC_CON_ADDCONNECTION) { - addConn = (PF_NPAddConnection)GetProcAddress(providerTable->table[provider].hLib, "NPAddConnection"); - if (addConn) { - ret = addConn(lpNetResource, (LPWSTR)lpPassword, (LPWSTR)lpUserID); - } + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(hwndOwner, resource, (LPWSTR)password, (LPWSTR)userid, flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(resource, (LPWSTR)password, (LPWSTR)userid); + + if (ret == WN_SUCCESS && accessname) + { + if (resource->lpLocalName) + strcpyW(accessname, resource->lpLocalName); + else + strcpyW(accessname, resource->lpRemoteName); } return ret;

8 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2016