Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 59548: [CDMAKE] Use calloc instead of malloc + memset
by pschweitzer＠svn.reactos.org 21 Jul '13

21 Jul '13

Author: pschweitzer Date: Sun Jul 21 16:15:16 2013 New Revision: 59548 URL: http://svn.reactos.org/svn/reactos?rev=59548&view=rev Log: [CDMAKE] Use calloc instead of malloc + memset Modified: trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.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 Jul 21 16:15:16 2013 @@ -652,10 +652,9 @@ { PDIR_RECORD d; - d = malloc(sizeof(DIR_RECORD)); + d = calloc(1, sizeof(DIR_RECORD)); if (d == NULL) error_exit("Insufficient memory"); - memset ( d, 0, sizeof(DIR_RECORD) ); d->next_in_memory = root.next_in_memory; root.next_in_memory = d; @@ -687,10 +686,9 @@ char *n; */ - d = malloc(sizeof(DIR_RECORD)); + d = calloc(1, sizeof(DIR_RECORD)); if (d == NULL) error_exit("Insufficient memory"); - memset ( d, 0, sizeof(DIR_RECORD) ); d->next_in_memory = root.next_in_memory; root.next_in_memory = d; @@ -1071,8 +1069,7 @@ new_empty_dirrecord(PDIR_RECORD d, BOOL directory) { PDIR_RECORD new_d; - new_d = malloc(sizeof(*new_d)); - memset(new_d, 0, sizeof(*new_d)); + new_d = calloc(1, sizeof(*new_d)); new_d->parent = d; new_d->level = d->level + 1; new_d->next_in_directory = d->first_record; Modified: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Sun Jul 21 16:15:16 2013 @@ -111,8 +111,7 @@ free(parentname); free(parentcase); hashcode = djb_hash(targetnorm); - de = malloc(sizeof(*de)); - memset(de, 0, sizeof(*de)); + de = calloc(1, sizeof(*de)); de->parent = parent_de; de->normalized_name = strdup(targetnorm); de->case_name = strdup(chop_filename(casename)); @@ -139,8 +138,7 @@ targetnorm = strdup(targetdir); normalize_dirname(targetnorm); de = dir_hash_create_dir(dh, targetdir, targetnorm); - tf = malloc(sizeof(*tf)); - memset(tf, 0, sizeof(*tf)); + tf = calloc(1, sizeof(*tf)); tf->next = de->head; de->head = tf; tf->source_name = strdup(source);

1 0

[akhaldi] 59547: * Improve the way we create bootcd, livecd and bootcdregtest. The effort results in ~28% *smaller* build folder, and *much* faster generation of the ISOs. [CDMAKE] * Introduce a wa...
by akhaldi＠svn.reactos.org 21 Jul '13

21 Jul '13

Author: akhaldi Date: Sun Jul 21 13:33:03 2013 New Revision: 59547 URL: http://svn.reactos.org/svn/reactos?rev=59547&view=rev Log: * Improve the way we create bootcd, livecd and bootcdregtest. The effort results in ~28% *smaller* build folder, and *much* faster generation of the ISOs. [CDMAKE] * Introduce a way to create an iso using a file map instead of the current on-disk layout. This allows us to massively reduce the IO and the disk space needed to perform the creation of the 3 ISOs, and at the same time speed up the process. Brought to you by Art Yerkes (arty) with review/bug fix by Thomas Faber. [CMAKE] * Leverage the newly introduced cdmake feature. * Silence cdmake verbosity. * Write the contents of the file lists at once, instead of appending to it one item by one. [VGAFONTS] * Don't include the cab file twice. Added: trunk/reactos/tools/cdmake/dirhash.c (with props) trunk/reactos/tools/cdmake/dirhash.h (with props) trunk/reactos/tools/cdmake/dirsep.h (with props) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/boot/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/media/vgafonts/CMakeLists.txt trunk/reactos/tools/cdmake/CMakeLists.txt trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=59547&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -235,6 +235,9 @@ add_subdirectory(subsystems) add_subdirectory(win32ss) + # Create {bootcd, livecd, bootcdregtest}.lst + create_iso_lists() + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) add_dependency_footer() Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=59… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -1,50 +1,27 @@ ##bootcd #clear it out -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcd)\n") +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst "") add_custom_target(bootcd - ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcd - -P ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${CMAKE_CURRENT_BINARY_DIR}/bootcd REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso + COMMAND native-cdmake -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin @${CMAKE_CURRENT_BINARY_DIR}/bootcd.lst REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso DEPENDS native-cdmake VERBATIM) - + ##bootcdregtest #clear it out -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest)\n") +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst "") add_custom_target(bootcdregtest - ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest - -P ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest REACTOS ${REACTOS_BINARY_DIR}/bootcdregtest.iso + COMMAND native-cdmake -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin @${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.lst REACTOS ${REACTOS_BINARY_DIR}/bootcdregtest.iso DEPENDS native-cdmake VERBATIM) - ##livecd -#clear it out -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd)\n") -#create profiles directories too -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles)\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users\")\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users/Desktop\")\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User\")\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/Desktop\")\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/My Documents\")\n") +#clear it out and create the empty Desktop folder +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop\n") add_custom_target(livecd - ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/livecd - -P ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${CMAKE_CURRENT_BINARY_DIR}/livecd REACTOS ${REACTOS_BINARY_DIR}/livecd.iso + COMMAND native-cdmake -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin @${CMAKE_CURRENT_BINARY_DIR}/livecd.lst REACTOS ${REACTOS_BINARY_DIR}/livecd.iso DEPENDS native-cdmake VERBATIM) Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -227,13 +227,14 @@ if(_CD_NO_CAB) #directly on cd foreach(item ${_CD_FILE}) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + if(_CD_NAME_ON_CD) + #rename it in the cd tree + set(__file ${_CD_NAME_ON_CD}) + else() + get_filename_component(__file ${item} NAME) + endif() + set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endforeach() - if(_CD_NAME_ON_CD) - get_filename_component(__file ${_CD_FILE} NAME) - #rename it in the cd tree - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n") - endif() if(_CD_TARGET) #manage dependency add_dependencies(bootcd ${_CD_TARGET}) @@ -259,13 +260,14 @@ add_dependencies(livecd ${_CD_TARGET}) endif() foreach(item ${_CD_FILE}) - file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + if(_CD_NAME_ON_CD) + #rename it in the cd tree + set(__file ${_CD_NAME_ON_CD}) + else() + get_filename_component(__file ${item} NAME) + endif() + set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endforeach() - if(_CD_NAME_ON_CD) - get_filename_component(__file ${_CD_FILE} NAME) - #rename it in the cd tree - file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n") - endif() endif() #end livecd #do we add it to regtest? @@ -275,13 +277,14 @@ if(_CD_NO_CAB) #directly on cd foreach(item ${_CD_FILE}) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + if(_CD_NAME_ON_CD) + #rename it in the cd tree + set(__file ${_CD_NAME_ON_CD}) + else() + get_filename_component(__file ${item} NAME) + endif() + set_property(GLOBAL APPEND PROPERTY BOOTCDREGTEST_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endforeach() - if(_CD_NAME_ON_CD) - get_filename_component(__file ${_CD_FILE} NAME) - #rename it in the cd tree - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n") - endif() if(_CD_TARGET) #manage dependency add_dependencies(bootcdregtest ${_CD_TARGET}) @@ -296,6 +299,23 @@ #endif() endif() endif() #end bootcd +endfunction() + +function(create_iso_lists) + get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST) + string(REPLACE ";" "\n" _filelist "${_filelist}") + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.lst "${_filelist}") + unset(_filelist) + + get_property(_filelist GLOBAL PROPERTY LIVECD_FILE_LIST) + string(REPLACE ";" "\n" _filelist "${_filelist}") + file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.lst "${_filelist}") + unset(_filelist) + + get_property(_filelist GLOBAL PROPERTY BOOTCDREGTEST_FILE_LIST) + string(REPLACE ";" "\n" _filelist "${_filelist}") + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.lst "${_filelist}") + unset(_filelist) endfunction() # Create module_clean targets Modified: trunk/reactos/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/CMakeLists.… ============================================================================== --- trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/vgafonts/CMakeLists.txt [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -18,4 +18,3 @@ add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab) add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos NO_CAB FOR all) -add_cd_file(TARGET vgafonts FILE ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab DESTINATION reactos FOR all) Modified: trunk/reactos/tools/cdmake/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/CMakeLists.tx… ============================================================================== --- trunk/reactos/tools/cdmake/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/CMakeLists.txt [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -1,2 +1,2 @@ +add_executable(cdmake cdmake.c dirhash.c llmosrt.c) -add_executable(cdmake cdmake.c llmosrt.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 Jul 21 13:33:03 2013 @@ -33,8 +33,13 @@ #include <stdlib.h> #include <string.h> #ifdef _WIN32 +# define WIN32_LEAN_AND_MEAN +# include <windows.h> # include <io.h> # include <dos.h> +# ifdef _MSC_VER +# define R_OK 4 +# endif #else # if defined(__FreeBSD__) || defined(__APPLE__) # include <sys/uio.h> @@ -45,28 +50,19 @@ # include <sys/types.h> # include <dirent.h> # include <unistd.h> +# define TRUE 1 +# define FALSE 0 #endif // _WIN32 #include <ctype.h> #include <setjmp.h> #include <time.h> -#ifndef _WIN32 -#ifndef MAX_PATH -#define MAX_PATH 260 -#endif -#define DIR_SEPARATOR_CHAR '/' -#define DIR_SEPARATOR_STRING "/" -#else -#define DIR_SEPARATOR_CHAR '\\' -#define DIR_SEPARATOR_STRING "\\" -#endif +#include "dirsep.h" +#include "dirhash.h" typedef unsigned char BYTE; typedef unsigned short WORD; typedef unsigned long DWORD; typedef int BOOL; - -const BOOL TRUE = 1; -const BOOL FALSE = 0; // file system parameters @@ -115,6 +111,7 @@ char extension[MAX_EXTENSION_LENGTH+1]; char extension_on_cd[MAX_CDEXTENSION_LENGTH+1]; char *joliet_name; + const char *orig_name; DATE_AND_TIME date_and_time; DWORD sector; DWORD size; @@ -172,6 +169,8 @@ 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; /*----------------------------------------------------------------------------- This function edits a 32-bit unsigned number into a comma-delimited form, such @@ -1067,6 +1066,159 @@ } #endif + +static PDIR_RECORD +new_empty_dirrecord(PDIR_RECORD d, BOOL directory) +{ + PDIR_RECORD new_d; + new_d = malloc(sizeof(*new_d)); + memset(new_d, 0, sizeof(*new_d)); + new_d->parent = d; + new_d->level = d->level + 1; + new_d->next_in_directory = d->first_record; + d->first_record = new_d; + new_d->next_in_memory = root.next_in_memory; + root.next_in_memory = new_d; + if (directory) + { + new_d->flags |= DIRECTORY_FLAG; + new_d->next_in_path_table = root.next_in_path_table; + root.next_in_path_table = new_d; + } + return new_d; +} + +#if _WIN32 +static int +get_cd_file_time(HANDLE handle, DATE_AND_TIME *cd_time_info) +{ + FILETIME file_time; + SYSTEMTIME sys_time; + if (!GetFileTime(handle, NULL, NULL, &file_time)) + { + return -1; + } + FileTimeToSystemTime(&file_time, &sys_time); + memset(cd_time_info, 0, sizeof(*cd_time_info)); + cd_time_info->year = sys_time.wYear; + cd_time_info->month = sys_time.wMonth - 1; + cd_time_info->day = sys_time.wDay; + cd_time_info->hour = sys_time.wHour; + cd_time_info->minute = sys_time.wMinute; + cd_time_info->second = sys_time.wSecond; + return 0; +} +#endif + +static void +scan_specified_files(PDIR_RECORD d, struct target_dir_entry *dir) +{ + PDIR_RECORD new_d; +#if _WIN32 + HANDLE open_file; + LARGE_INTEGER file_size; +#else + struct stat stbuf; +#endif + struct target_file *file; + struct target_dir_entry *child; + + d->first_record = NULL; + + for (file = dir->head; file; file = file->next) + { + if (strcmp(file->target_name, DIRECTORY_TIMESTAMP) == 0) + { +#if _WIN32 + if ((open_file = CreateFileA(file->source_name, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL)) == INVALID_HANDLE_VALUE) + { + error_exit("Can't open timestamp file %s\n", file->source_name); + } + + if (get_cd_file_time(open_file, &d->date_and_time) == -1) + { + error_exit("Can't stat timestamp file %s\n", file->source_name); + } + CloseHandle(open_file); +#else + if (stat(file->target_name, &stbuf) == -1) + { + error_exit("Can't stat timestamp file %s\n", file->source_name); + } + convert_date_and_time(&d->date_and_time, &stbuf.st_ctime); +#endif + } + else + { + if (verbosity == VERBOSE) + { + printf("%d: file %s (from %s)\n", + d->level, + file->target_name, + file->source_name); + } + new_d = new_empty_dirrecord(d, FALSE); + parse_filename_into_dirrecord(file->target_name, new_d, FALSE); +#if _WIN32 + if ((open_file = CreateFileA(file->source_name, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL)) == INVALID_HANDLE_VALUE) + { + error_exit("Can't open file %s\n", file->source_name); + } + if (get_cd_file_time(open_file, &new_d->date_and_time) == -1) + { + error_exit("Can't stat file %s\n", file->source_name); + } + if (!GetFileSizeEx(open_file, &file_size)) + { + error_exit("Can't 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; + CloseHandle(open_file); +#else + if (stat(file->source_name, &stbuf) == -1) + { + error_exit("Can't find '%s' (target %s)\n", + file->source_name, + file->target_name); + } + convert_date_and_time(&new_d->date_and_time, &stbuf.st_mtime); + new_d->size = new_d->joliet_size = stbuf.st_size; + new_d->orig_name = file->source_name; +#endif + } + } + + for (child = dir->child; child; child = child->next) + { + if (verbosity == VERBOSE) + { + printf("%d: directory %s\n", d->level, child->case_name); + } + new_d = new_empty_dirrecord(d, TRUE); + parse_filename_into_dirrecord(child->case_name, new_d, TRUE); + scan_specified_files(new_d, child); + } + + /* sort directory */ + d->first_record = sort_linked_list(d->first_record, + 0, + compare_directory_order); + source[0] = 0; + end_source = source; +} /*----------------------------------------------------------------------------- This function loads the file specifications for the file or directory @@ -1455,14 +1607,23 @@ } else { + const char *file_source; old_end_source = end_source; - get_file_specifications(q); - *end_source = 0; + if (!q->orig_name) + { + get_file_specifications(q); + *end_source = 0; + file_source = source; + } + else + { + file_source = q->orig_name; + } if (verbosity == VERBOSE) - printf("Writing %s\n", source); - file = fopen(source, "rb"); + printf("Writing contents of %s\n", file_source); + file = fopen(file_source, "rb"); if (file == NULL) - error_exit("Can't open %s\n", source); + error_exit("Can't open %s\n", file_source); fseek(file, 0, SEEK_SET); while (size > 0) { @@ -1472,7 +1633,7 @@ if (fread (cd.buffer + cd.count, n, 1, file) < 1) { fclose(file); - error_exit("Read error in file %s\n", source); + error_exit("Read error in file %s\n", file_source); } cd.count += n; if (cd.count == BUFFER_SIZE) @@ -1626,23 +1787,71 @@ if (cd.filespecs[0] == 0) error_exit("Missing image file specifications"); - - // set source[] and end_source to source directory, with a terminating directory separator - - end_source = source + strlen(source); - if (end_source[-1] == ':') - *end_source++ = '.'; - if (end_source[-1] != DIR_SEPARATOR_CHAR) - *end_source++ = DIR_SEPARATOR_CHAR; - - // scan all files and create directory structure in memory - - make_directory_records(&root); - - // sort path table entries - - root.next_in_path_table = sort_linked_list(root.next_in_path_table, 1, - compare_path_table_order); + if (source[0] != '@') + { + /* set source[] and end_source to source directory, + * with a terminating directory separator */ + end_source = source + strlen(source); + if (end_source[-1] == ':') + *end_source++ = '.'; + if (end_source[-1] != DIR_SEPARATOR_CHAR) + *end_source++ = DIR_SEPARATOR_CHAR; + + /* scan all files and create directory structure in memory */ + make_directory_records(&root); + } + else + { + char *trimmedline, *targetname, *srcname, *eq; + char lineread[1024]; + FILE *f = fopen(source+1, "r"); + if (!f) + { + error_exit("Can't open cd description %s\n", source+1); + } + while (fgets(lineread, sizeof(lineread), f)) + { + /* We treat these characters as line endings */ + trimmedline = strtok(lineread, "\t\r\n;"); + eq = strchr(trimmedline, '='); + if (!eq) + { + char *normdir; + /* Treat this as a directory name */ + targetname = trimmedline; + normdir = strdup(targetname); + normalize_dirname(normdir); + dir_hash_create_dir(&specified_files, targetname, normdir); + free(normdir); + } + else + { + targetname = strtok(lineread, "="); + srcname = strtok(NULL, ""); + +#if _WIN32 + if (_access(srcname, R_OK) == 0) + dir_hash_add_file(&specified_files, srcname, targetname); + else + error_exit("can't access file '%s' (target %s)\n", srcname, targetname); +#else + if (access(srcname, R_OK) == 0) + dir_hash_add_file(&specified_files, srcname, targetname); + else + error_exit("can't access file '%s' (target %s)\n", srcname, targetname); +#endif + } + } + fclose(f); + + /* scan all files and create directory structure in memory */ + scan_specified_files(&root, &specified_files.root); + } + + /* sort path table entries */ + root.next_in_path_table = sort_linked_list(root.next_in_path_table, + 1, + compare_path_table_order); // initialize CD-ROM write buffer @@ -1704,9 +1913,9 @@ if (verbosity >= NORMAL) puts("CD-ROM image made successfully"); + dir_hash_destroy(&specified_files); release_memory(); return 0; } - /* EOF */ Added: trunk/reactos/tools/cdmake/dirhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.c?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.c (added) +++ trunk/reactos/tools/cdmake/dirhash.c [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -0,0 +1,205 @@ +#include <string.h> +#include <malloc.h> +#include "dirsep.h" +#include "dirhash.h" + +/* This is the famous DJB hash */ +static unsigned int +djb_hash(const char *name) +{ + unsigned int val = 5381; + int i = 0; + + for (i = 0; name[i]; i++) + { + val = (33 * val) + name[i]; + } + + return val; +} + +static const char * +chop_filename(const char *target) +{ + char *last_slash = strrchr(target, '/'); + if (!last_slash) + last_slash = strrchr(target, '\\'); + if (last_slash) + return last_slash + 1; + else + return target; +} + +static void +chop_dirname(const char *name, char **dirname) +{ + char *last_slash = strrchr(name, '/'); + if (!last_slash) + last_slash = strrchr(name, '\\'); + if (!last_slash) + { + free(*dirname); + *dirname = malloc(1); + **dirname = 0; + } + else + { + char *newdata = malloc(last_slash - name + 1); + memcpy(newdata, name, last_slash - name); + newdata[last_slash - name] = 0; + free(*dirname); + *dirname = newdata; + } +} + +static struct target_dir_entry * +get_entry_by_normname(struct target_dir_hash *dh, const char *norm) +{ + unsigned int hashcode; + struct target_dir_entry *de; + hashcode = djb_hash(norm); + de = dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; + while (de && strcmp(de->normalized_name, norm)) + de = de->next; + return de; +} + +void normalize_dirname(char *filename) +{ + int i, tgt; + int slash = 1; + + for (i = 0, tgt = 0; filename[i]; i++) { + if (slash) { + if (filename[i] != '/' && filename[i] != '\\') { + filename[tgt++] = toupper(filename[i]); + slash = 0; + } + } else { + if (filename[i] == '/' || filename[i] == '\\') { + slash = 1; + filename[tgt++] = DIR_SEPARATOR_CHAR; + } else { + filename[tgt++] = toupper(filename[i]); + } + } + } + filename[tgt] = 0; +} + +struct target_dir_entry * +dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm) +{ + unsigned int hashcode; + struct target_dir_entry *de, *parent_de; + char *parentname = NULL; + char *parentcase = NULL; + struct target_dir_entry **ent; + if (!dh->root.normalized_name) + { + dh->root.normalized_name = strdup(""); + dh->root.case_name = strdup(""); + hashcode = djb_hash(""); + dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS] = &dh->root; + } + de = get_entry_by_normname(dh, targetnorm); + if (de) + return de; + chop_dirname(targetnorm, &parentname); + chop_dirname(casename, &parentcase); + parent_de = dir_hash_create_dir(dh, parentcase, parentname); + free(parentname); + free(parentcase); + hashcode = djb_hash(targetnorm); + de = malloc(sizeof(*de)); + memset(de, 0, sizeof(*de)); + de->parent = parent_de; + de->normalized_name = strdup(targetnorm); + de->case_name = strdup(chop_filename(casename)); + de->next = parent_de->child; + parent_de->child = de; + ent = &dh->buckets[hashcode % NUM_DIR_HASH_BUCKETS]; + while ((*ent)) + { + ent = &(*ent)->next; + } + *ent = de; + return de; +} + +void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target) +{ + unsigned int hashcode; + struct target_file *tf; + struct target_dir_entry *de; + const char *filename = chop_filename(target); + char *targetdir = NULL; + char *targetnorm; + chop_dirname(target, &targetdir); + targetnorm = strdup(targetdir); + normalize_dirname(targetnorm); + de = dir_hash_create_dir(dh, targetdir, targetnorm); + tf = malloc(sizeof(*tf)); + memset(tf, 0, sizeof(*tf)); + tf->next = de->head; + de->head = tf; + tf->source_name = strdup(source); + tf->target_name = strdup(filename); +} + +struct target_dir_entry * +dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t) +{ + if (t->i == -1) + return NULL; + if (!t->it) + { + while (++t->i != NUM_DIR_HASH_BUCKETS) + { + if (dh->buckets[t->i]) + { + t->it = dh->buckets[t->i]; + return t->it; + } + } + t->i = -1; + return NULL; + } + else + { + t->it = t->it->next; + if (!t->it) + { + t->i = -1; + return NULL; + } + else + return t->it; + } +} + +void dir_hash_destroy_dir(struct target_dir_entry *de) +{ + struct target_file *tf; + struct target_dir_entry *te; + while ((te = de->child)) + { + de->child = te->next; + dir_hash_destroy_dir(te); + free(te); + } + while ((tf = de->head)) + { + de->head = tf->next; + free(tf->source_name); + free(tf->target_name); + free(tf); + } + free(de->normalized_name); + free(de->case_name); +} + +void dir_hash_destroy(struct target_dir_hash *dh) +{ + dir_hash_destroy_dir(&dh->root); +} Propchange: trunk/reactos/tools/cdmake/dirhash.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.h?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.h (added) +++ trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -0,0 +1,38 @@ +#ifndef _REACTOS_TOOLS_CDMAKE_DIRHASH_H_ +#define _REACTOS_TOOLS_CDMAKE_DIRHASH_H_ + +#define NUM_DIR_HASH_BUCKETS 1024 + +struct target_file { + struct target_file *next; + char *source_name; + char *target_name; +}; + +struct target_dir_entry { + struct target_dir_entry *next; + struct target_dir_entry *parent; + struct target_dir_entry *child; + struct target_file *head; + char *normalized_name; + char *case_name; +}; + +struct target_dir_hash { + struct target_dir_entry *buckets[NUM_DIR_HASH_BUCKETS]; + struct target_dir_entry root; +}; + +struct target_dir_traversal { + struct target_dir_entry *it; + int i; +}; + +void normalize_dirname(char *filename); +void dir_hash_add_file(struct target_dir_hash *dh, const char *source, const char *target); +struct target_dir_entry * +dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm); +struct target_dir_entry *dir_hash_next_dir(struct target_dir_hash *dh, struct target_dir_traversal *t); +void dir_hash_destroy(struct target_dir_hash *dh); + +#endif//_REACTOS_TOOLS_CDMAKE_DIRHASH_H_ Propchange: trunk/reactos/tools/cdmake/dirhash.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/tools/cdmake/dirsep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirsep.h?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/dirsep.h (added) +++ trunk/reactos/tools/cdmake/dirsep.h [iso-8859-1] Sun Jul 21 13:33:03 2013 @@ -0,0 +1,10 @@ +#ifndef _WIN32 +#ifndef MAX_PATH +#define MAX_PATH 260 +#endif +#define DIR_SEPARATOR_CHAR '/' +#define DIR_SEPARATOR_STRING "/" +#else +#define DIR_SEPARATOR_CHAR '\\' +#define DIR_SEPARATOR_STRING "\\" +#endif Propchange: trunk/reactos/tools/cdmake/dirsep.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 59546: [KMTESTS:SE] - Remove broken prototypes
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 19:40:32 2013 New Revision: 59546 URL: http://svn.reactos.org/svn/reactos?rev=59546&view=rev Log: [KMTESTS:SE] - Remove broken prototypes Modified: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c Modified: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_se/SeQueryIn… ============================================================================== --- trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c [iso-8859-1] Sat Jul 20 19:40:32 2013 @@ -12,21 +12,6 @@ #define NDEBUG #include <debug.h> - -//------------------------------------------------------------------------------// -// Functions required forWorking with ACCESS_STATE structure // -//------------------------------------------------------------------------------// - -NTKERNELAPI NTSTATUS NTAPI SeCreateAccessState( - PACCESS_STATE AccessState, - PVOID AuxData, - ACCESS_MASK DesiredAccess, - PGENERIC_MAPPING Mapping - ); - -NTKERNELAPI VOID NTAPI SeDeleteAccessState( - PACCESS_STATE AccessState - ); //------------------------------------------------------------------------------// // Testing Functions //

1 0

[tfaber] 59545: [KMTEST] - Fix platform includes
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 19:36:41 2013 New Revision: 59545 URL: http://svn.reactos.org/svn/reactos?rev=59545&view=rev Log: [KMTEST] - Fix platform includes Modified: trunk/rostests/kmtests/include/kmt_platform.h Modified: trunk/rostests/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_platf… ============================================================================== --- trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] Sat Jul 20 19:36:41 2013 @@ -21,8 +21,9 @@ #include <ntifs.h> #include <ndk/exfuncs.h> #include <ndk/kefuncs.h> +#include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> -#include <ndk/mmfuncs.h> +#include <ndk/sefuncs.h> #include <ntstrsafe.h> #elif defined KMT_USER_MODE @@ -30,7 +31,10 @@ #define UNICODE #include <windef.h> #include <winbase.h> +#include <winreg.h> #include <winsvc.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/mmfuncs.h> #include <strsafe.h>

1 0

[tfaber] 59544: [KMTESTS:RTL] - Add test for REG_MULTI_SZ in RtlQueryRegistryValues
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 19:33:13 2013 New Revision: 59544 URL: http://svn.reactos.org/svn/reactos?rev=59544&view=rev Log: [KMTESTS:RTL] - Add test for REG_MULTI_SZ in RtlQueryRegistryValues Added: trunk/rostests/kmtests/rtl/RtlRegistry.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sat Jul 20 19:33:13 2013 @@ -13,6 +13,7 @@ rtl/RtlAvlTree.c rtl/RtlException.c rtl/RtlMemory.c + rtl/RtlRegistry.c rtl/RtlSplayTree.c rtl/RtlUnicodeString.c) Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Sat Jul 20 19:33:13 2013 @@ -13,6 +13,7 @@ KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlMemory; +KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; KMT_TESTFUNC Test_RtlUnicodeString; @@ -25,6 +26,7 @@ { "RtlAvlTree", Test_RtlAvlTree }, { "RtlException", Test_RtlException }, { "RtlMemory", Test_RtlMemory }, + { "RtlRegistry", Test_RtlRegistry }, { "RtlSplayTree", Test_RtlSplayTree }, { "RtlUnicodeString", Test_RtlUnicodeString }, { NULL, NULL }, Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Jul 20 19:33:13 2013 @@ -48,6 +48,7 @@ KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlMemory; +KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; KMT_TESTFUNC Test_ZwAllocateVirtualMemory; KMT_TESTFUNC Test_ZwCreateSection; @@ -97,6 +98,7 @@ { "RtlAvlTreeKM", Test_RtlAvlTree }, { "RtlExceptionKM", Test_RtlException }, { "RtlMemoryKM", Test_RtlMemory }, + { "RtlRegistryKM", Test_RtlRegistry }, { "RtlSplayTreeKM", Test_RtlSplayTree }, { "ZwAllocateVirtualMemory", Test_ZwAllocateVirtualMemory }, { "ZwCreateSection", Test_ZwCreateSection }, Added: trunk/rostests/kmtests/rtl/RtlRegistry.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlRegistry.c… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlRegistry.c (added) +++ trunk/rostests/kmtests/rtl/RtlRegistry.c [iso-8859-1] Sat Jul 20 19:33:13 2013 @@ -0,0 +1,248 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for RtlQueryRegistryValues + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> + +#ifdef KMT_KERNEL_MODE +#define KMT_KERNEL_HANDLE OBJ_KERNEL_HANDLE +#else +#define KMT_KERNEL_HANDLE 0 +#endif + +#ifndef RTL_NUMBER_OF +#define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0])) +#endif + +typedef struct +{ + PCWSTR ValueName; + ULONG ValueType; + PVOID ValueData; + ULONG ValueLength; +} EXPECTED_VALUE, *PEXPECTED_VALUE; + +typedef struct +{ + ULONG Count; + ULONG CurrentIndex; + EXPECTED_VALUE Values[20]; +} EXPECTED_VALUES, *PEXPECTED_VALUES; + +//static RTL_QUERY_REGISTRY_ROUTINE QueryRoutine; +static +NTSTATUS +NTAPI +QueryRoutine( + _In_ PWSTR ValueName, + _In_ ULONG ValueType, + _In_ PVOID ValueData, + _In_ ULONG ValueLength, + _In_ PVOID Context, + _In_ PVOID EntryContext) +{ + PEXPECTED_VALUES ExpectedValues = Context; + PEXPECTED_VALUE Expected; + SIZE_T EqualBytes; + + ok(ExpectedValues->CurrentIndex < ExpectedValues->Count, + "Call number %lu, expected only %lu\n", + ExpectedValues->CurrentIndex, ExpectedValues->Count); + if (!skip(ExpectedValues->CurrentIndex < ExpectedValues->Count, "Out of bounds\n")) + { + Expected = &ExpectedValues->Values[ExpectedValues->CurrentIndex]; + if (EntryContext) + ok_eq_pointer(EntryContext, Expected); + ok_eq_wstr(ValueName, Expected->ValueName); + ok_eq_ulong(ValueType, Expected->ValueType); + ok_eq_ulong(ValueLength, Expected->ValueLength); + EqualBytes = RtlCompareMemory(ValueData, + Expected->ValueData, + min(ValueLength, Expected->ValueLength)); + ok_eq_size(EqualBytes, Expected->ValueLength); + } + + ExpectedValues->CurrentIndex++; + return STATUS_SUCCESS; +} + +static +VOID +TestRtlQueryRegistryValues( + _In_ HANDLE KeyHandle) +{ + NTSTATUS Status; + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"TestValue"); + RTL_QUERY_REGISTRY_TABLE QueryTable[] = + { + { QueryRoutine, 0, L"TestValue", NULL, REG_NONE, NULL, 0 }, + { NULL } + }; + EXPECTED_VALUES Expected; + typedef struct + { + PWSTR Str; + ULONG Len; + } STR_AND_LEN; +#define CONST_STR_AND_LEN(d) { (d), sizeof(d) } +#define CSAL CONST_STR_AND_LEN + +#define NO_AUTO_LEN 1 +#define NO_DEFAULT 2 +#define AUTO_DIFFERS 4 +#define DEFAULT_DIFFERS 8 + struct + { + STR_AND_LEN Value; + ULONG ExpectedCount; + STR_AND_LEN Expected[20]; + ULONG Flags; + ULONG DefaultExpectedCount; + STR_AND_LEN DefaultExpected[20]; + + } Tests[] = + { + { { NULL, 0 }, 0, { { NULL, 0 } }, NO_AUTO_LEN | NO_DEFAULT }, + { CSAL(L""), 0, { { NULL, 0 } }, NO_AUTO_LEN }, + { CSAL(L"\0"), 1, { CSAL(L"") }, + AUTO_DIFFERS | DEFAULT_DIFFERS, 0, { { NULL, 0 } } }, + { CSAL(L"String"), 1, { CSAL(L"String") }, NO_AUTO_LEN }, + { CSAL(L"String\0"), 1, { CSAL(L"String") } }, + { CSAL(L"String1\0String2"), 2, { CSAL(L"String1"), CSAL(L"String2") }, NO_AUTO_LEN }, + { CSAL(L"String1\0String2\0"), 2, { CSAL(L"String1"), CSAL(L"String2") } }, + { CSAL(L"String1\0\0String3"), 3, { CSAL(L"String1"), CSAL(L""), CSAL(L"String3") }, NO_AUTO_LEN }, + { CSAL(L"String1\0\0String3\0"), 3, { CSAL(L"String1"), CSAL(L""), CSAL(L"String3") }, + AUTO_DIFFERS, 1, { CSAL(L"String1") } }, + }; + +#define DO_QUERY(ExpectedArray, ExpectedCount) do \ + { \ + ULONG _i; \ + for (_i = 0; _i < (ExpectedCount); _i++) \ + { \ + Expected.Values[_i].ValueName = ValueName.Buffer; \ + Expected.Values[_i].ValueType = REG_SZ; \ + Expected.Values[_i].ValueData = (ExpectedArray)[_i].Str; \ + Expected.Values[_i].ValueLength = (ExpectedArray)[_i].Len; \ + } \ + Expected.CurrentIndex = 0; \ + Expected.Count = (ExpectedCount); \ + if ((ExpectedCount) == 1) \ + QueryTable[0].EntryContext = &Expected.Values[0]; \ + else \ + QueryTable[0].EntryContext = NULL; \ + Status = RtlQueryRegistryValues(RTL_REGISTRY_HANDLE, \ + (PCWSTR)KeyHandle, \ + QueryTable, \ + &Expected, \ + NULL); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_ulong(Expected.CurrentIndex, Expected.Count); \ + } while(0) + + ULONG TestCount = RTL_NUMBER_OF(Tests); + ULONG i; + + for (i = 0; i < TestCount; i++) + { + trace("Set: %lu\n", i); + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_MULTI_SZ, + Tests[i].Value.Str, + Tests[i].Value.Len); + ok_eq_hex(Status, STATUS_SUCCESS); + + DO_QUERY(Tests[i].Expected, Tests[i].ExpectedCount); + } + + /* Delete value to test default values */ + Status = ZwDeleteValueKey(KeyHandle, &ValueName); + ok(Status == STATUS_SUCCESS || Status == STATUS_OBJECT_NAME_NOT_FOUND, + "ZwDeleteValueKey returned %lx\n", Status); + + /* Default: REG_NONE */ + DO_QUERY((STR_AND_LEN *)NULL, 0); + + for (i = 0; i < TestCount; i++) + { + if (Tests[i].Flags & NO_DEFAULT) + continue; + trace("Default: %lu\n", i); + QueryTable[0].DefaultType = REG_MULTI_SZ; + QueryTable[0].DefaultData = Tests[i].Value.Str; + QueryTable[0].DefaultLength = Tests[i].Value.Len; + + if (Tests[i].Flags & DEFAULT_DIFFERS) + DO_QUERY(Tests[i].DefaultExpected, Tests[i].DefaultExpectedCount); + else + DO_QUERY(Tests[i].Expected, Tests[i].ExpectedCount); + } + + for (i = 0; i < TestCount; i++) + { + if (Tests[i].Flags & NO_AUTO_LEN) + continue; + trace("Auto: %lu\n", i); + QueryTable[0].DefaultType = REG_MULTI_SZ; + QueryTable[0].DefaultData = Tests[i].Value.Str; + QueryTable[0].DefaultLength = 0; + + if (Tests[i].Flags & AUTO_DIFFERS) + DO_QUERY(Tests[i].DefaultExpected, Tests[i].DefaultExpectedCount); + else + DO_QUERY(Tests[i].Expected, Tests[i].ExpectedCount); + } +} + +START_TEST(RtlRegistry) +{ + NTSTATUS Status; + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE SoftwareHandle; + HANDLE KeyHandle; + + RtlInitUnicodeString(&KeyName, L"\\Registry\\MACHINE\\Software"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenKey(&SoftwareHandle, + KEY_CREATE_SUB_KEY, + &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(NT_SUCCESS(Status) && SoftwareHandle != NULL, "No software key\n")) + return; + + RtlInitUnicodeString(&KeyName, L"RtlRegistryKmtestKey"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE, + SoftwareHandle, + NULL); + Status = ZwCreateKey(&KeyHandle, + KEY_QUERY_VALUE | KEY_SET_VALUE | DELETE, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + + if (!skip(NT_SUCCESS(Status) && KeyHandle != NULL, "No test key\n")) + { + TestRtlQueryRegistryValues(KeyHandle); + + Status = ZwDeleteKey(KeyHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = ZwClose(KeyHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + } +} Propchange: trunk/rostests/kmtests/rtl/RtlRegistry.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 59543: [browseui.cpp] - Improve the hack for the global constructors by manually calling them only during DLL_PROCESS_ATTACH
by gadamopoulos＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: gadamopoulos Date: Sat Jul 20 17:50:40 2013 New Revision: 59543 URL: http://svn.reactos.org/svn/reactos?rev=59543&view=rev Log: [browseui.cpp] - Improve the hack for the global constructors by manually calling them only during DLL_PROCESS_ATTACH Modified: trunk/reactos/dll/win32/browseui/browseui.cpp Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Sat Jul 20 17:50:40 2013 @@ -57,14 +57,14 @@ { TRACE("%p 0x%x %p\n", hInstance, dwReason, fImpLoad); - /* HACK - the global constructors don't run, so I placement new them here */ - new (&gModule) CBrowseUIModule; - new (&gWinModule) CAtlWinModule; - new (&_AtlBaseModule) CAtlBaseModule; - new (&_AtlComModule) CAtlComModule; - if (dwReason == DLL_PROCESS_ATTACH) { + /* HACK - the global constructors don't run, so I placement new them here */ + new (&gModule) CBrowseUIModule; + new (&gWinModule) CAtlWinModule; + new (&_AtlBaseModule) CAtlBaseModule; + new (&_AtlComModule) CAtlComModule; + gModule.Init(ObjectMap, hInstance, NULL); DisableThreadLibraryCalls (hInstance); }

1 0

[tfaber] 59542: [NTOS] - Use more pool tagging
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 17:46:38 2013 New Revision: 59542 URL: http://svn.reactos.org/svn/reactos?rev=59542&view=rev Log: [NTOS] - Use more pool tagging Modified: trunk/reactos/ntoskrnl/config/cmhook.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/fsrtl/notify.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/ps/kill.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmhook.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmhook.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -180,7 +180,7 @@ ExReleaseFastMutex(&CmiCallbackLock); /* free the callback */ - ExFreePool(CurrentCallback); + ExFreePoolWithTag(CurrentCallback, 'bcMC'); return STATUS_SUCCESS; } else Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -359,7 +359,7 @@ if (!NT_SUCCESS(Status)) { /* Close handles and free buffers */ - if (NameBuffer) ExFreePool(NameBuffer); + if (NameBuffer) ExFreePoolWithTag(NameBuffer, TAG_CM); ObDereferenceObject(Event); ZwClose(EventHandle); DPRINT1("ZwCreateFile failed : %lx.\n", Status); @@ -397,7 +397,7 @@ if (!NT_SUCCESS(Status)) { /* Close handles and free buffers */ - if (NameBuffer) ExFreePool(NameBuffer); + if (NameBuffer) ExFreePoolWithTag(NameBuffer, TAG_CM); ObDereferenceObject(Event); ZwClose(EventHandle); ZwClose(*Primary); @@ -461,7 +461,7 @@ if (!NT_SUCCESS(Status)) { /* Close handles and free buffers */ - if (NameBuffer) ExFreePool(NameBuffer); + if (NameBuffer) ExFreePoolWithTag(NameBuffer, TAG_CM); ObDereferenceObject(Event); ZwClose(EventHandle); return Status; @@ -471,7 +471,7 @@ if (FsSizeInformation.BytesPerSector > HBLOCK_SIZE) { /* Close handles and free buffers */ - if (NameBuffer) ExFreePool(NameBuffer); + if (NameBuffer) ExFreePoolWithTag(NameBuffer, TAG_CM); ObDereferenceObject(Event); ZwClose(EventHandle); return STATUS_CANNOT_LOAD_REGISTRY_FILE; @@ -596,7 +596,7 @@ } /* We're done, close handles and free buffers */ - if (NameBuffer) ExFreePool(NameBuffer); + if (NameBuffer) ExFreePoolWithTag(NameBuffer, TAG_CM); ObDereferenceObject(Event); ZwClose(EventHandle); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -164,7 +164,7 @@ ((Length < (*ReturnLength)) && (BytesToCopy < sizeof(WCHAR)))) { /* Free the buffer allocated by CmpConstructName */ - ExFreePool(KeyName); + ExFreePoolWithTag(KeyName, TAG_CM); /* Return buffer length failure without writing anything there because nothing fits */ return STATUS_INFO_LENGTH_MISMATCH; @@ -207,7 +207,7 @@ _SEH2_END; /* Free the buffer allocated by CmpConstructName */ - ExFreePool(KeyName); + ExFreePoolWithTag(KeyName, TAG_CM); /* Return status */ return Status; Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… ============================================================================== --- trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -546,7 +546,7 @@ } /* Free the configuration data */ - ExFreePool(CmpConfigurationData); + ExFreePoolWithTag(CmpConfigurationData, TAG_CM); } /* Open physical memory */ @@ -824,7 +824,7 @@ ZwClose(SectionHandle); /* Free the BIOS version string buffer */ - if (BiosVersion) ExFreePool(BiosVersion); + if (BiosVersion) ExFreePoolWithTag(BiosVersion, TAG_CM); Quickie: /* Close the procesor handle */ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -787,7 +787,7 @@ RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); /* Release the memory allocated by SeLocateProcessImageName */ - ExFreePool(ProcessImageName); + ExFreePoolWithTag(ProcessImageName, TAG_SEPA); } else { Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -424,7 +424,7 @@ } /* Finally, free the notification, as it's not needed anymore */ - ExFreePool(NotifyChange); + ExFreePoolWithTag(NotifyChange, 'FSrN'); } } } Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -1581,7 +1581,7 @@ /* Free the session page tables */ #ifndef _M_AMD64 - ExFreePool(SessionGlobal->PageTables); + ExFreePoolWithTag(SessionGlobal->PageTables, 'tHmM'); #endif ASSERT(!MI_IS_PHYSICAL_ADDRESS(SessionGlobal)); Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -332,7 +332,7 @@ PagedPool, HashSize * sizeof(MMVIEW), - ' mM'); + TAG_MM); if (!Session->SystemSpaceViewTable) { /* Failed to allocate a new table, keep the old one for now */ Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -553,7 +553,7 @@ /* It's not a ROS PFN anymore */ Page->u4.AweAllocation = FALSE; - ExFreePool(MI_GET_ROS_DATA(Page)); + ExFreePoolWithTag(MI_GET_ROS_DATA(Page), 'RsPf'); Page->RosMmData = 0; /* Bring it back into the free list */ Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=595… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -276,7 +276,8 @@ if (Process->SeAuditProcessCreationInfo.ImageFileName) { /* Free it */ - ExFreePool(Process->SeAuditProcessCreationInfo.ImageFileName); + ExFreePoolWithTag(Process->SeAuditProcessCreationInfo.ImageFileName, + TAG_SEPA); Process->SeAuditProcessCreationInfo.ImageFileName = NULL; } @@ -679,7 +680,7 @@ NextPort = TerminationPort->Next; /* Free the Termination Port Object */ - ExFreePool(TerminationPort); + ExFreePoolWithTag(TerminationPort, '=TsP'); /* Keep looping as long as there is a port */ TerminationPort = NextPort; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -655,7 +655,7 @@ Process->SeAuditProcessCreationInfo.ImageFileName = ExAllocatePoolWithTag(PagedPool, sizeof(OBJECT_NAME_INFORMATION), - 'aPeS'); + TAG_SEPA); if (!Process->SeAuditProcessCreationInfo.ImageFileName) { /* Fail */ Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Jul 20 17:46:38 2013 @@ -699,7 +699,7 @@ } /* Free the image path */ - ExFreePool(ImageName); + ExFreePoolWithTag(ImageName, TAG_SEPA); } /* Dereference the process */ ObDereferenceObject(Process);

1 0

[gadamopoulos] 59541: [shell32] - Add the accelerators table that will be used for the shell view control - Rewrite CDefView::OpenSelectedItems and CDefView::OnContextMenu. - Rewrite accelerators h...
by gadamopoulos＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: gadamopoulos Date: Sat Jul 20 16:23:54 2013 New Revision: 59541 URL: http://svn.reactos.org/svn/reactos?rev=59541&view=rev Log: [shell32] - Add the accelerators table that will be used for the shell view control - Rewrite CDefView::OpenSelectedItems and CDefView::OnContextMenu. - Rewrite accelerators handling for the shell view. Instead of handling them manually in CDefView::OnNotify, we now translate it properly in CDefView::TranslateAccelerator and forward the result WM_COMMAND message to the IContextMenu2 using a new method called CDefView::OnExplorerCommand. - Now we don't do call ShellExecute or use clipboard function right in CDefView and this also is the first step to properly handle opening or exploring a folder (which is needed for explorer_new) Modified: trunk/reactos/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shell32/shlview.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rc [iso-8859-1] Sat Jul 20 16:23:54 2013 @@ -27,6 +27,23 @@ #include "shell32_version.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDA_SHELLVIEW ACCELERATORS +BEGIN + "d", FCIDM_SHVIEW_DELETE, VIRTKEY, CONTROL + VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY + VK_DELETE, FCIDM_SHVIEW_DELETE, VIRTKEY, SHIFT + VK_F2, FCIDM_SHVIEW_RENAME, VIRTKEY + VK_RETURN, FCIDM_SHVIEW_OPEN, VIRTKEY, ALT + "x", FCIDM_SHVIEW_CUT, VIRTKEY, CONTROL + "c", FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL + VK_INSERT, FCIDM_SHVIEW_COPY, VIRTKEY, CONTROL + "v", FCIDM_SHVIEW_INSERT, VIRTKEY, CONTROL + VK_INSERT, FCIDM_SHVIEW_INSERT, VIRTKEY, SHIFT + "z", FCIDM_SHVIEW_UNDO, VIRTKEY, CONTROL + "a", FCIDM_SHVIEW_SELECTALL, VIRTKEY, CONTROL + VK_F1, FCIDM_SHVIEW_HELP, VIRTKEY +END shv_accel ACCELERATORS BEGIN Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sat Jul 20 16:23:54 2013 @@ -89,7 +89,7 @@ LPITEMIDLIST *apidl; LISTVIEW_SORT_INFO ListViewSortInfo; ULONG hNotify; /* change notification handle */ - HANDLE hAccel; + HACCEL hAccel; DWORD dwAspects; DWORD dwAdvf; CComPtr<IAdviseSink> pAdvSink; @@ -129,6 +129,7 @@ void OnDeactivate(); void DoActivate(UINT uState); HRESULT drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); + LRESULT OnExplorerCommand(UINT uCommand, BOOL bUseSelection); // *** IOleWindow methods *** virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); @@ -948,7 +949,7 @@ SHFree((LPITEMIDLIST)ntreg.pidl); } - hAccel = LoadAcceleratorsA(shell32_hInstance, "shv_accel"); + hAccel = LoadAcceleratorsA(shell32_hInstance, MAKEINTRESOURCEA( IDA_SHELLVIEW)); return S_OK; } @@ -1096,154 +1097,57 @@ */ HRESULT CDefView::OpenSelectedItems() { - static UINT CF_IDLIST = 0; - HRESULT hr; - CComPtr<IDataObject> selection; - CComPtr<IContextMenu> cm; - HMENU hmenu; - FORMATETC fetc; - STGMEDIUM stgm; - LPIDA pIDList; - LPCITEMIDLIST parent_pidl; - WCHAR parent_path[MAX_PATH]; - LPCWSTR parent_dir = NULL; - SFGAOF attribs; - int i; - CMINVOKECOMMANDINFOEX ici; - MENUITEMINFOW info; - - if (0 == GetSelections()) - { - return S_OK; - } - - hr = pSFParent->GetUIObjectOf(m_hWnd, cidl, - (LPCITEMIDLIST*)apidl, IID_IContextMenu, - 0, (LPVOID *)&cm); - - if (SUCCEEDED(hr)) - { - hmenu = CreatePopupMenu(); - if (hmenu) - { - hr = IUnknown_SetSite(cm, (IShellView *)this); - if (SUCCEEDED(cm->QueryContextMenu(hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY))) - { - INT def = -1, n = GetMenuItemCount(hmenu); - - for ( i = 0; i < n; i++ ) - { - memset( &info, 0, sizeof info ); - info.cbSize = sizeof info; - info.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID; - if (GetMenuItemInfoW( hmenu, i, TRUE, &info)) - { - if (info.fState & MFS_DEFAULT) - { - def = info.wID; - break; - } - } - } - if (def != -1) - { - memset( &ici, 0, sizeof ici ); - ici.cbSize = sizeof ici; - ici.lpVerb = MAKEINTRESOURCEA( def ); - ici.hwnd = m_hWnd; - - hr = cm->InvokeCommand((LPCMINVOKECOMMANDINFO)&ici); - if (hr == S_OK) - { - DestroyMenu(hmenu); - hr = IUnknown_SetSite(cm, NULL); - return S_OK; - } - else - ERR("InvokeCommand failed: %x\n", hr); - } - else - ERR("No default context menu item\n"); - - } - DestroyMenu( hmenu ); - hr = IUnknown_SetSite(cm, NULL); - } - } - - - - hr = pSFParent->GetUIObjectOf(m_hWnd, cidl, - (LPCITEMIDLIST*)apidl, IID_IDataObject, - 0, (LPVOID *)&selection); - - - - if (FAILED(hr)) - return hr; - - if (0 == CF_IDLIST) - { - CF_IDLIST = RegisterClipboardFormatW(CFSTR_SHELLIDLIST); - } - - fetc.cfFormat = CF_IDLIST; - fetc.ptd = NULL; - fetc.dwAspect = DVASPECT_CONTENT; - fetc.lindex = -1; - fetc.tymed = TYMED_HGLOBAL; - - hr = selection->QueryGetData(&fetc); - if (FAILED(hr)) - return hr; - - hr = selection->GetData(&fetc, &stgm); - if (FAILED(hr)) - return hr; - - pIDList = (LPIDA)GlobalLock(stgm.hGlobal); - - parent_pidl = (LPCITEMIDLIST) ((LPBYTE)pIDList + pIDList->aoffset[0]); - hr = pSFParent->GetAttributesOf(1, &parent_pidl, &attribs); - if (SUCCEEDED(hr) && (attribs & SFGAO_FILESYSTEM) && - SHGetPathFromIDListW(parent_pidl, parent_path)) - { - parent_dir = parent_path; - } - - for (i = pIDList->cidl; i > 0; --i) - { - LPCITEMIDLIST pidl; - - pidl = (LPCITEMIDLIST)((LPBYTE)pIDList + pIDList->aoffset[i]); - - attribs = SFGAO_FOLDER; - hr = pSFParent->GetAttributesOf(1, &pidl, &attribs); - - if (SUCCEEDED(hr) && ! (attribs & SFGAO_FOLDER)) - { - SHELLEXECUTEINFOW shexinfo; - - shexinfo.cbSize = sizeof(SHELLEXECUTEINFOW); - shexinfo.fMask = SEE_MASK_INVOKEIDLIST; /* SEE_MASK_IDLIST is also possible. */ - shexinfo.hwnd = NULL; - shexinfo.lpVerb = NULL; - shexinfo.lpFile = NULL; - shexinfo.lpParameters = NULL; - shexinfo.lpDirectory = parent_dir; - shexinfo.nShow = SW_NORMAL; - shexinfo.lpIDList = ILCombine(parent_pidl, pidl); - - ShellExecuteExW(&shexinfo); /* Discard error/success info */ - - ILFree((LPITEMIDLIST)shexinfo.lpIDList); - } - } - - GlobalUnlock(stgm.hGlobal); - ReleaseStgMedium(&stgm); - - return S_OK; + HMENU hMenu; + CMINVOKECOMMANDINFO cmi; + UINT uCommand; + HRESULT hResult; + + hResult = OnDefaultCommand(); + if (hResult == S_OK) + return hResult; + + hMenu = CreatePopupMenu(); + if (!hMenu) + return E_FAIL; + + hResult = GetItemObject( SVGIO_SELECTION, IID_IContextMenu, (LPVOID *)&pCM); + if (FAILED(hResult)) + goto cleanup; + + hResult = IUnknown_SetSite(pCM, (IShellView *)this); + //if (FAILED( hResult)) + // goto cleanup; + + hResult = pCM->QueryContextMenu(hMenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY); + if (FAILED(hResult)) + goto cleanup; + + uCommand = GetMenuDefaultItem(hMenu, FALSE, 0); + if (uCommand == (UINT)-1) + { + hResult = E_FAIL; + goto cleanup; + } + + ZeroMemory(&cmi, sizeof(cmi)); + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); + cmi.hwnd = m_hWnd; + + hResult = pCM->InvokeCommand(&cmi); + +cleanup: + + if (hMenu) + DestroyMenu(hMenu); + + if (pCM) + { + IUnknown_SetSite(pCM, NULL); + pCM.Release(); + } + + return hResult; } /********************************************************** @@ -1254,10 +1158,7 @@ WORD x; WORD y; UINT uCommand; - DWORD wFlags; HMENU hMenu; - BOOL fExplore; - HWND hwndTree; CMINVOKECOMMANDINFO cmi; HRESULT hResult; @@ -1270,94 +1171,94 @@ TRACE("(%p)->(0x%08x 0x%08x) stub\n", this, x, y); - fExplore = FALSE; - hwndTree = NULL; - - /* look, what's selected and create a context menu object of it*/ - if (GetSelections()) - { - pSFParent->GetUIObjectOf(hWndParent, cidl, (LPCITEMIDLIST*)apidl, IID_IContextMenu, NULL, (LPVOID *)&pCM); - - if (pCM) - { - TRACE("-- pContextMenu\n"); - hMenu = CreatePopupMenu(); - - if (hMenu) - { - hResult = IUnknown_SetSite(pCM, (IShellView *)this); - - /* See if we are in Explore or Open mode. If the browser's tree is present, we are in Explore mode.*/ - if (SUCCEEDED(pShellBrowser->GetControlWindow(FCW_TREE, &hwndTree)) && hwndTree) - { - TRACE("-- explore mode\n"); - fExplore = TRUE; - } - - /* build the flags depending on what we can do with the selected item */ - wFlags = CMF_NORMAL | (cidl != 1 ? 0 : CMF_CANRENAME) | (fExplore ? CMF_EXPLORE : 0); - - /* let the ContextMenu merge its items in */ - if (SUCCEEDED(pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, wFlags ))) - { - if (FolderSettings.fFlags & FWF_DESKTOP) - SetMenuDefaultItem(hMenu, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); - - TRACE("-- track popup\n"); - uCommand = TrackPopupMenu(hMenu, - TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, - x, y, 0, m_hWnd, NULL); - - if (uCommand > 0) - { - TRACE("-- uCommand=%u\n", uCommand); - - if (uCommand == FCIDM_SHVIEW_OPEN && pCommDlgBrowser.p != NULL) - { - TRACE("-- dlg: OnDefaultCommand\n"); - if (OnDefaultCommand() != S_OK) - OpenSelectedItems(); - } - else - { - TRACE("-- explore -- invoke command\n"); - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.hwnd = hWndParent; /* this window has to answer CWM_GETISHELLBROWSER */ - cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); - pCM->InvokeCommand(&cmi); - } - } - - hResult = IUnknown_SetSite(pCM, NULL); - DestroyMenu(hMenu); - } - } - pCM.Release(); - } - } - else /* background context menu */ - { - hMenu = CreatePopupMenu(); - - CDefFolderMenu_Create2(NULL, NULL, cidl, (LPCITEMIDLIST*)apidl, pSFParent, NULL, 0, NULL, (IContextMenu**)&pCM); - pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, 0); - - uCommand = TrackPopupMenu(hMenu, - TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, - x, y, 0, m_hWnd, NULL); + hMenu = CreatePopupMenu(); + if (!hMenu) + return E_FAIL; + + GetSelections(); + + hResult = GetItemObject( cidl ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_IContextMenu, (LPVOID *)&pCM); + if (FAILED( hResult)) + goto cleanup; + + hResult = IUnknown_SetSite(pCM, (IShellView *)this); + //if (FAILED( hResult)) + // goto cleanup; + + hResult = pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + if (FAILED( hResult)) + goto cleanup; + + if (FolderSettings.fFlags & FWF_DESKTOP) + SetMenuDefaultItem(hMenu, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); + + uCommand = TrackPopupMenu(hMenu, + TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, + x, y, 0, m_hWnd, NULL); + if (uCommand == 0) + goto cleanup; + + if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK) + goto cleanup; + + ZeroMemory(&cmi, sizeof(cmi)); + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); + cmi.hwnd = m_hWnd; + pCM->InvokeCommand(&cmi); + +cleanup: + + if (pCM) + { + IUnknown_SetSite(pCM, NULL); + pCM.Release(); + } + + if (hMenu) DestroyMenu(hMenu); - TRACE("-- (%p)->(uCommand=0x%08x )\n", this, uCommand); - - ZeroMemory(&cmi, sizeof(cmi)); - cmi.cbSize = sizeof(cmi); - cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); - cmi.hwnd = hWndParent; - pCM->InvokeCommand(&cmi); - + return 0; +} + +LRESULT CDefView::OnExplorerCommand(UINT uCommand, BOOL bUseSelection) +{ + HRESULT hResult; + CMINVOKECOMMANDINFO cmi; + HMENU hMenu; + + hMenu = CreatePopupMenu(); + if (!hMenu) + return 0; + + hResult = GetItemObject( bUseSelection ? SVGIO_SELECTION : SVGIO_BACKGROUND, IID_IContextMenu, (LPVOID *)&pCM); + if (FAILED( hResult)) + goto cleanup; + + hResult = IUnknown_SetSite(pCM, (IShellView *)this); + //if (FAILED( hResult)) + // goto cleanup; + + hResult = pCM->QueryContextMenu(hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + if (FAILED( hResult)) + goto cleanup; + + ZeroMemory(&cmi, sizeof(cmi)); + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = (LPCSTR)MAKEINTRESOURCEA(uCommand); + cmi.hwnd = m_hWnd; + pCM->InvokeCommand(&cmi); + +cleanup: + + if (pCM) + { + IUnknown_SetSite(pCM, NULL); pCM.Release(); } + + if (hMenu) + DestroyMenu(hMenu); return 0; } @@ -1590,6 +1491,21 @@ SendMessageA(hWndList, LVM_SORTITEMS, (WPARAM) &ListViewSortInfo, (LPARAM)ListViewCompareItems); break; + case FCIDM_SHVIEW_REFRESH: + Refresh(); + break; + + case FCIDM_SHVIEW_DELETE: + case FCIDM_SHVIEW_CUT: + case FCIDM_SHVIEW_COPY: + case FCIDM_SHVIEW_RENAME: + return OnExplorerCommand(dwCmdID, TRUE); + + case FCIDM_SHVIEW_INSERT: + case FCIDM_SHVIEW_UNDO: + case FCIDM_SHVIEW_INSERTLINK: + case FCIDM_SHVIEW_NEWFOLDER: + return OnExplorerCommand(dwCmdID, FALSE); default: TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID); } @@ -1649,12 +1565,12 @@ case NM_DBLCLK: TRACE("-- NM_DBLCLK %p\n", this); - if (OnDefaultCommand() != S_OK) OpenSelectedItems(); + OpenSelectedItems(); break; case NM_RETURN: TRACE("-- NM_RETURN %p\n", this); - if (OnDefaultCommand() != S_OK) OpenSelectedItems(); + OpenSelectedItems(); break; case HDN_ENDTRACKW: @@ -1822,87 +1738,10 @@ case LVN_KEYDOWN: { - /* MSG msg; - msg.hwnd = m_hWnd; - msg.message = WM_KEYDOWN; - msg.wParam = plvKeyDown->wVKey; - msg.lParam = 0; - msg.time = 0; - msg.pt = 0;*/ - LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; - SHORT ctrl = GetKeyState(VK_CONTROL) & 0x8000; /* initiate a rename of the selected file or directory */ - if (plvKeyDown->wVKey == VK_F2) - { - /* see how many files are selected */ - int i = ListView_GetSelectedCount(hWndList); - - /* get selected item */ - if (i == 1) - { - /* get selected item */ - i = ListView_GetNextItem(hWndList, -1, LVNI_SELECTED); - - SendMessageW(hWndList, LVM_ENSUREVISIBLE, i, 0); - SendMessageW(hWndList, LVM_EDITLABELW, i, 0); - } - } -#if 0 - TranslateAccelerator(m_hWnd, hAccel, &msg) -#endif - else if(plvKeyDown->wVKey == VK_DELETE) - { - UINT i; - int item_index; - LVITEMA item; - LPITEMIDLIST* pItems; - ISFHelper *psfhlp; - - pSFParent->QueryInterface(IID_ISFHelper, - (LPVOID*)&psfhlp); - - if (psfhlp == NULL) - break; - - if (!(i = ListView_GetSelectedCount(hWndList))) - break; - - /* allocate memory for the pidl array */ - pItems = (LPITEMIDLIST *)HeapAlloc(GetProcessHeap(), 0, - sizeof(LPITEMIDLIST) * i); - - /* retrieve all selected items */ - i = 0; - item_index = -1; - while (ListView_GetSelectedCount(hWndList) > i) - { - /* get selected item */ - item_index = ListView_GetNextItem(hWndList, - item_index, LVNI_SELECTED); - item.iItem = item_index; - item.mask = LVIF_PARAM; - SendMessageA(hWndList, LVM_GETITEMA, 0, (LPARAM) &item); - - /* get item pidl */ - pItems[i] = (LPITEMIDLIST)item.lParam; - - i++; - } - - /* perform the item deletion */ - psfhlp->DeleteItems(i, (LPCITEMIDLIST*)pItems); - - /* free pidl array memory */ - HeapFree(GetProcessHeap(), 0, pItems); - } - /* Initiate a refresh */ - else if (plvKeyDown->wVKey == VK_F5) - { - Refresh(); - } - else if (plvKeyDown->wVKey == VK_BACK) + if (plvKeyDown->wVKey == VK_BACK) { LPSHELLBROWSER lpSb; if ((lpSb = (LPSHELLBROWSER)SendMessageW(hWndParent, CWM_GETISHELLBROWSER, 0, 0))) @@ -1910,134 +1749,7 @@ lpSb->BrowseObject(NULL, SBSP_PARENT); } } - else if (plvKeyDown->wVKey == 'C' && ctrl) - { - if (GetSelections()) - { - CComPtr<IDataObject> pda; - - if (SUCCEEDED(pSFParent->GetUIObjectOf(m_hWnd, cidl, (LPCITEMIDLIST*)apidl, IID_IDataObject, 0, (LPVOID *)&pda))) - { - HRESULT hr = OleSetClipboard(pda); - if (FAILED(hr)) - { - WARN("OleSetClipboard failed"); - } - } - } - break; - } - else if(plvKeyDown->wVKey == 'V' && ctrl) - { - CComPtr<IDataObject> pda; - STGMEDIUM medium; - FORMATETC formatetc; - LPITEMIDLIST * apidl; - LPITEMIDLIST pidl; - CComPtr<IShellFolder> psfFrom; - CComPtr<IShellFolder> psfDesktop; - CComPtr<IShellFolder> psfTarget; - LPIDA lpcida; - CComPtr<ISFHelper> psfhlpdst; - CComPtr<ISFHelper> psfhlpsrc; - HRESULT hr; - - hr = OleGetClipboard(&pda); - if (hr != S_OK) - { - ERR("Failed to get clipboard with %lx\n", hr); - return E_FAIL; - } - - InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLIST), TYMED_HGLOBAL); - hr = pda->GetData(&formatetc, &medium); - - if (FAILED(hr)) - { - ERR("Failed to get clipboard data with %lx\n", hr); - return E_FAIL; - } - - /* lock the handle */ - lpcida = (LPIDA)GlobalLock(medium.hGlobal); - if (!lpcida) - { - ERR("failed to lock pidl\n"); - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* convert the data into pidl */ - apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - - if (!apidl) - { - ERR("failed to copy pidl\n"); - return E_FAIL; - } - - if (FAILED(SHGetDesktopFolder(&psfDesktop))) - { - ERR("failed to get desktop folder\n"); - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - - if (_ILIsDesktop(pidl)) - { - /* use desktop shellfolder */ - psfFrom = psfDesktop; - } - else if (FAILED(psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom))) - { - ERR("no IShellFolder\n"); - - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - - return E_FAIL; - } - - psfTarget = pSFParent; - - - /* get source and destination shellfolder */ - if (FAILED(psfTarget->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpdst))) - { - ERR("no IID_ISFHelper for destination\n"); - - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - - return E_FAIL; - } - - if (FAILED(psfFrom->QueryInterface(IID_ISFHelper, (LPVOID*)&psfhlpsrc))) - { - ERR("no IID_ISFHelper for source\n"); - - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - return E_FAIL; - } - - /* FIXXME - * do we want to perform a copy or move ??? - */ - hr = psfhlpdst->CopyItems(psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); - - SHFree(pidl); - _ILFreeaPidl(apidl, lpcida->cidl); - ReleaseStgMedium(&medium); - - TRACE("paste end hr %x\n", hr); - break; - } + else FIXME("LVN_KEYDOWN key=0x%08x\n", plvKeyDown->wVKey); } @@ -2149,12 +1861,13 @@ */ HRESULT WINAPI CDefView::TranslateAccelerator(LPMSG lpmsg) { -#if 0 - FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n", this, lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); -#endif - - if (lpmsg->message >= WM_KEYFIRST && lpmsg->message >= WM_KEYLAST) - { + if (lpmsg->message >= WM_KEYFIRST && lpmsg->message <= WM_KEYLAST) + { + if (::TranslateAcceleratorW(m_hWnd, hAccel, lpmsg) != 0) + return S_OK; + + /* FIXME: should call TranslateAcceleratorSB */ + TRACE("-- key=0x04%lx\n", lpmsg->wParam) ; } Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Jul 20 16:23:54 2013 @@ -20,6 +20,12 @@ #define __WINE_SHELL_RES_H #define IDC_STATIC -1 + +/* + * Accelerators + */ +#define IDA_SHELLVIEW 1 + /* * Bitmaps

1 0

[tfaber] 59540: [EXPLORER] - Don't compile FAT support code (WTF) if it's not used
by tfaber＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tfaber Date: Sat Jul 20 14:38:35 2013 New Revision: 59540 URL: http://svn.reactos.org/svn/reactos?rev=59540&view=rev Log: [EXPLORER] - Don't compile FAT support code (WTF) if it's not used Modified: trunk/reactos/base/shell/explorer/shell/fatfs.cpp trunk/reactos/base/shell/explorer/shell/filechild.cpp Modified: trunk/reactos/base/shell/explorer/shell/fatfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/fatfs.cpp [iso-8859-1] Sat Jul 20 14:38:35 2013 @@ -30,6 +30,7 @@ #include "fatfs.h" +#ifdef _DEBUG static union DEntry* link_dir_entries(struct dirent* dir, struct Kette* K, int cnt) { @@ -634,3 +635,5 @@ return j; } + +#endif // _DEBUG Modified: trunk/reactos/base/shell/explorer/shell/filechild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/filechild.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/filechild.cpp [iso-8859-1] Sat Jul 20 14:38:35 2013 @@ -177,7 +177,7 @@ _root._entry = new RegistryRoot(); entry = _root.read_tree(info._path+_tcslen(_root._path)); break; - +#ifdef _DEBUG case ET_FAT: { _root._drive_type = DRIVE_UNKNOWN; _root._sort_order = SORT_NONE; @@ -194,7 +194,7 @@ entry = _root.read_tree(info._path+_tcslen(_root._path)); } break;} - +#endif #ifndef _NO_WIN_FS default: // ET_WINDOWS _root._drive_type = GetDriveType(info._path);

1 0

[tkreuzer] 59539: [PSDK] Fix broken (DBG_)UNREFERENCED_LOCAL_VARIABLE macros
by tkreuzer＠svn.reactos.org 20 Jul '13

20 Jul '13

Author: tkreuzer Date: Sat Jul 20 12:18:02 2013 New Revision: 59539 URL: http://svn.reactos.org/svn/reactos?rev=59539&view=rev Log: [PSDK] Fix broken (DBG_)UNREFERENCED_LOCAL_VARIABLE macros Modified: trunk/reactos/include/psdk/ntdef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Sat Jul 20 12:18:02 2013 @@ -321,9 +321,9 @@ /* Use to silence unused variable warnings when it is intentional */ #define UNREFERENCED_PARAMETER(P) {(P)=(P);} -#define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} +#define UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) #define DBG_UNREFERENCED_PARAMETER(P) {(P)=(P);} -#define DBG_UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} +#define DBG_UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) /* min/max helper macros */ #ifndef NOMINMAX Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 20 12:18:02 2013 @@ -130,9 +130,9 @@ #endif #define UNREFERENCED_PARAMETER(P) {(P)=(P);} -#define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} -#define DBG_UNREFERENCED_PARAMETER(P) {(L)=(L);} -#define DBG_UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);} +#define UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) +#define DBG_UNREFERENCED_PARAMETER(P) {(P)=(P);} +#define DBG_UNREFERENCED_LOCAL_VARIABLE(L) ((void)(L)) #ifndef DECLSPEC_ALIGN # if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs