Ros-diffs April 2021

ros-diffs@reactos.org

21 participants
173 discussions

[reactos] 01/01: [CMAKE] Properly generate all Bison and Flex files at build time

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28dadda8be69da7d8e2aa… commit 28dadda8be69da7d8e2aa64ba0daf09e88fb4330 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed May 1 17:14:49 2019 +0200 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sat Apr 3 21:50:08 2021 +0300 [CMAKE] Properly generate all Bison and Flex files at build time This fully reverts 09c4d0a. Addendum to 5375e33. CORE-15991 --- base/applications/winhlp32/CMakeLists.txt | 7 +- base/applications/winhlp32/macro.lex.yy.c | 2106 ----------------------------- base/applications/winhlp32/macro.lex.yy.h | 320 ----- dll/win32/msi/CMakeLists.txt | 3 - dll/win32/vbscript/CMakeLists.txt | 5 +- sdk/tools/widl/readme.txt | 5 - 6 files changed, 7 insertions(+), 2439 deletions(-) diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt index 2e0b06bbd13..bc6958d6981 100644 --- a/base/applications/winhlp32/CMakeLists.txt +++ b/base/applications/winhlp32/CMakeLists.txt @@ -13,13 +13,12 @@ list(APPEND SOURCE macro.c winhelp.c) +FLEX_TARGET(macro_scanner macro.lex.l ${CMAKE_CURRENT_BINARY_DIR}/macro.lex.yy.c) + list(APPEND PCH_SKIP_SOURCE - macro.lex.yy.c + ${FLEX_macro_scanner_OUTPUTS} string.c) -# macro.lex.yy.c has been generated with relative file paths... -set_source_files_properties(macro.lex.yy.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/winhelp.ico) add_executable(winhlp32 diff --git a/base/applications/winhlp32/macro.lex.yy.c b/base/applications/winhlp32/macro.lex.yy.c deleted file mode 100644 index ff4d78cfe6d..00000000000 --- a/base/applications/winhlp32/macro.lex.yy.c +++ /dev/null @@ -1,2106 +0,0 @@ -#line 2 "macro.lex.yy.c" - -#line 4 "macro.lex.yy.c" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include <inttypes.h> -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN (yy_start) = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START (((yy_start) - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#define YY_BUF_SIZE 16384 -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -extern yy_size_t yyleng; - -extern FILE *yyin, *yyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - #define YY_LESS_LINENO(n) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = (yy_hold_char); \ - YY_RESTORE_YY_MORE_OFFSET \ - (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, (yytext_ptr) ) - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - yy_size_t yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* Stack of input buffers. */ -static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ -static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ - ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] - -/* yy_hold_char holds the character lost when yytext is formed. */ -static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; - -/* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 0; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ - -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... - */ -static int yy_did_buffer_switch_on_eof; - -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -/* Begin user sect3 */ - -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; - -typedef int yy_state_type; - -extern int yylineno; - -int yylineno = 1; - -extern char *yytext; -#define yytext_ptr yytext - -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - (yytext_ptr) = yy_bp; \ - yyleng = (size_t) (yy_cp - yy_bp); \ - (yy_hold_char) = *yy_cp; \ - *yy_cp = '\0'; \ - (yy_c_buf_p) = yy_cp; - -#define YY_NUM_RULES 14 -#define YY_END_OF_BUFFER 15 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[28] = - { 0, - 0, 0, 0, 0, 15, 13, 14, 12, 5, 6, - 13, 1, 1, 3, 4, 10, 8, 9, 10, 7, - 1, 1, 0, 3, 11, 2, 0 - } ; - -static yyconst flex_int32_t yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 3, 1, 4, 1, 1, 1, 1, 5, 1, - 1, 1, 6, 1, 6, 1, 1, 7, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 1, 1, 1, - 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 10, 9, 9, - 1, 11, 1, 1, 12, 13, 14, 14, 14, 14, - - 14, 14, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 10, - 9, 9, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst flex_int32_t yy_meta[15] = - { 0, - 1, 2, 1, 1, 1, 1, 3, 3, 4, 5, - 1, 4, 1, 6 - } ; - -static yyconst flex_int16_t yy_base[33] = - { 0, - 0, 0, 13, 25, 25, 62, 62, 62, 62, 62, - 12, 13, 14, 0, 62, 62, 62, 62, 0, 62, - 6, 24, 0, 0, 62, 0, 62, 38, 42, 45, - 51, 55 - } ; - -static yyconst flex_int16_t yy_def[33] = - { 0, - 27, 1, 28, 28, 27, 27, 27, 27, 27, 27, - 27, 29, 27, 30, 27, 27, 27, 27, 31, 27, - 29, 27, 32, 30, 27, 32, 0, 27, 27, 27, - 27, 27 - } ; - -static yyconst flex_int16_t yy_nxt[77] = - { 0, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, - 6, 6, 15, 14, 7, 23, 17, 18, 21, 22, - 22, 22, 23, 19, 27, 20, 7, 27, 17, 18, - 22, 22, 27, 27, 27, 19, 27, 20, 16, 16, - 16, 16, 16, 16, 22, 27, 22, 24, 24, 24, - 24, 25, 27, 25, 25, 25, 25, 26, 27, 27, - 26, 5, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27 - } ; - -static yyconst flex_int16_t yy_chk[77] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 21, 3, 3, 11, 11, - 13, 13, 12, 3, 5, 3, 4, 0, 4, 4, - 22, 22, 0, 0, 0, 4, 0, 4, 28, 28, - 28, 28, 28, 28, 29, 0, 29, 30, 30, 30, - 30, 31, 0, 31, 31, 31, 31, 32, 0, 0, - 32, 27, 27, 27, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27 - } ; - -static yy_state_type yy_last_accepting_state; -static char *yy_last_accepting_cpos; - -extern int yy_flex_debug; -int yy_flex_debug = 0; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#line 1 "macro.lex.l" -#line 2 "macro.lex.l" -/* - * Help Viewer - * - * Copyright 1996 Ulrich Schmid - * Copyright 2002,2008 Eric Pouech - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#define YY_NO_INPUT 1 - -#line 26 "macro.lex.l" -#include "config.h" -#include <assert.h> -#include <stdarg.h> - -#define YY_NO_UNISTD_H -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winhelp.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winhelp); - -struct lex_data { - LPCSTR macroptr; - LPSTR strptr; - int quote_stack[32]; - unsigned quote_stk_idx; - LPSTR cache_string[32]; - int cache_used; - WINHELP_WINDOW* window; -}; -static struct lex_data* lex_data = NULL; - -struct lexret yylval; - -#define YY_INPUT(buf,result,max_size)\ - if ((result = *lex_data->macroptr ? 1 : 0)) buf[0] = *lex_data->macroptr++; - -#line 529 "macro.lex.yy.c" - -#define INITIAL 0 -#define quote 1 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include <unistd.h> -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -static int yy_init_globals (void ); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy (void ); - -int yyget_debug (void ); - -void yyset_debug (int debug_flag ); - -YY_EXTRA_TYPE yyget_extra (void ); - -void yyset_extra (YY_EXTRA_TYPE user_defined ); - -FILE *yyget_in (void ); - -void yyset_in (FILE * in_str ); - -FILE *yyget_out (void ); - -void yyset_out (FILE * out_str ); - -yy_size_t yyget_leng (void ); - -char *yyget_text (void ); - -int yyget_lineno (void ); - -void yyset_lineno (int line_number ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (void ); -#else -extern int yywrap (void ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); -#endif - -#ifndef YY_NO_INPUT - -#ifdef __cplusplus -static int yyinput (void ); -#else -static int input (void ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - size_t n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (void); - -#define YY_DECL int yylex (void) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - -#line 58 "macro.lex.l" - - -#line 713 "macro.lex.yy.c" - - if ( !(yy_init) ) - { - (yy_init) = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! (yy_start) ) - (yy_start) = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_load_buffer_state( ); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = (yy_c_buf_p); - - /* Support of yytext. */ - *yy_cp = (yy_hold_char); - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = (yy_start); -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 28 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_current_state != 27 ); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - - YY_DO_BEFORE_ACTION; - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = (yy_hold_char); - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - -case 1: -YY_RULE_SETUP -#line 60 "macro.lex.l" -yylval.integer = strtol(yytext, NULL, 10); return INTEGER; - YY_BREAK -case 2: -YY_RULE_SETUP -#line 61 "macro.lex.l" -yylval.integer = strtol(yytext, NULL, 16); return INTEGER; - YY_BREAK -case 3: -YY_RULE_SETUP -#line 63 "macro.lex.l" -return MACRO_Lookup(yytext, &yylval); - YY_BREAK -case 4: -#line 66 "macro.lex.l" -case 5: -#line 67 "macro.lex.l" -case 6: -#line 68 "macro.lex.l" -case 7: -#line 69 "macro.lex.l" -case 8: -#line 70 "macro.lex.l" -case 9: -YY_RULE_SETUP -#line 70 "macro.lex.l" -{ - if (lex_data->quote_stk_idx == 0 || - (yytext[0] == '\"' && lex_data->quote_stack[lex_data->quote_stk_idx - 1] != '\"') || - (yytext[0] == '`')) - { - /* opening a new one */ - if (lex_data->quote_stk_idx == 0) - { - assert(lex_data->cache_used < ARRAY_SIZE(lex_data->cache_string)); - lex_data->strptr = lex_data->cache_string[lex_data->cache_used] = HeapAlloc(GetProcessHeap(), 0, strlen(lex_data->macroptr) + 1); - yylval.string = lex_data->strptr; - lex_data->cache_used++; - BEGIN(quote); - } - else *lex_data->strptr++ = yytext[0]; - lex_data->quote_stack[lex_data->quote_stk_idx++] = yytext[0]; - assert(lex_data->quote_stk_idx < ARRAY_SIZE(lex_data->quote_stack)); - } - else - { - if (yytext[0] == '`') assert(0); - /* close the current quote */ - if (--lex_data->quote_stk_idx == 0) - { - BEGIN INITIAL; - *lex_data->strptr++ = '\0'; - return STRING; - } - else *lex_data->strptr++ = yytext[0]; - } -} - YY_BREAK -case 10: -YY_RULE_SETUP -#line 102 "macro.lex.l" -*lex_data->strptr++ = yytext[0]; - YY_BREAK -case 11: -YY_RULE_SETUP -#line 103 "macro.lex.l" -*lex_data->strptr++ = yytext[1]; - YY_BREAK -case YY_STATE_EOF(quote): -#line 104 "macro.lex.l" -return 0; - YY_BREAK -case 12: -YY_RULE_SETUP -#line 106 "macro.lex.l" - - YY_BREAK -case 13: -YY_RULE_SETUP -#line 107 "macro.lex.l" -return yytext[0]; - YY_BREAK -case 14: -YY_RULE_SETUP -#line 108 "macro.lex.l" -ECHO; - YY_BREAK -#line 881 "macro.lex.yy.c" -case YY_STATE_EOF(INITIAL): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = (yy_hold_char); - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++(yy_c_buf_p); - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = (yy_last_accepting_cpos); - yy_current_state = (yy_last_accepting_state); - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_END_OF_FILE: - { - (yy_did_buffer_switch_on_eof) = 0; - - if ( yywrap( ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = - (yytext_ptr) + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - (yy_c_buf_p) = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - - yy_current_state = yy_get_previous_state( ); - - yy_cp = (yy_c_buf_p); - yy_bp = (yytext_ptr) + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (void) -{ - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; - int ret_val; - - if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; - - else - { - yy_size_t num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; - - int yy_c_buf_p_offset = - (int) ((yy_c_buf_p) - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - yy_size_t new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - if ( (yy_n_chars) == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - - (yy_n_chars) += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - - (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (void) -{ - register yy_state_type yy_current_state; - register char *yy_cp; - - yy_current_state = (yy_start); - - for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) - { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 28 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) -{ - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); - - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - (yy_last_accepting_state) = yy_current_state; - (yy_last_accepting_cpos) = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 28 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 27); - - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (void) -#else - static int input (void) -#endif - -{ - int c; - - *(yy_c_buf_p) = (yy_hold_char); - - if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) - /* This was really a NUL. */ - *(yy_c_buf_p) = '\0'; - - else - { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); - ++(yy_c_buf_p); - - switch ( yy_get_next_buffer( ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart(yyin ); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap( ) ) - return EOF; - - if ( ! (yy_did_buffer_switch_on_eof) ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(); -#else - return input(); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - (yy_c_buf_p) = (yytext_ptr) + offset; - break; - } - } - } - - c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ - *(yy_c_buf_p) = '\0'; /* preserve yytext */ - (yy_hold_char) = *++(yy_c_buf_p); - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file ) -{ - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); - } - - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) -{ - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - (yy_did_buffer_switch_on_eof) = 1; -} - -static void yy_load_buffer_state (void) -{ - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - (yy_hold_char) = *(yy_c_buf_p); -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer(b,file ); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * - */ - void yy_delete_buffer (YY_BUFFER_STATE b ) -{ - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); - - yyfree((void *) b ); -} - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - -{ - int oerrno = errno; - - yy_flush_buffer(b ); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * - */ - void yy_flush_buffer (YY_BUFFER_STATE b ) -{ - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) -{ - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *(yy_c_buf_p) = (yy_hold_char); - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - (yy_buffer_stack_top)++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * - */ -void yypop_buffer_state (void) -{ - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - if ((yy_buffer_stack_top) > 0) - --(yy_buffer_stack_top); - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); - (yy_did_buffer_switch_on_eof) = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (void) -{ - yy_size_t num_to_alloc; - - if (!(yy_buffer_stack)) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - (yy_buffer_stack_max) = num_to_alloc; - (yy_buffer_stack_top) = 0; - return; - } - - if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = (yy_buffer_stack_max) + grow_size; - (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc - ((yy_buffer_stack), - num_to_alloc * sizeof(struct yy_buffer_state*) - ); - if ( ! (yy_buffer_stack) ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); - (yy_buffer_stack_max) = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer(b ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) -{ - - return yy_scan_bytes(yystr,strlen(yystr) ); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - yy_size_t i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer(buf,n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yy_fatal_error (yyconst char* msg ) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = (yy_hold_char); \ - (yy_c_buf_p) = yytext + yyless_macro_arg; \ - (yy_hold_char) = *(yy_c_buf_p); \ - *(yy_c_buf_p) = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the current line number. - * - */ -int yyget_lineno (void) -{ - - return yylineno; -} - -/** Get the input stream. - * - */ -FILE *yyget_in (void) -{ - return yyin; -} - -/** Get the output stream. - * - */ -FILE *yyget_out (void) -{ - return yyout; -} - -/** Get the length of the current token. - * - */ -yy_size_t yyget_leng (void) -{ - return yyleng; -} - -/** Get the current token. - * - */ - -char *yyget_text (void) -{ - return yytext; -} - -/** Set the current line number. - * @param line_number - * - */ -void yyset_lineno (int line_number ) -{ - - yylineno = line_number; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str ) -{ - yyin = in_str ; -} - -void yyset_out (FILE * out_str ) -{ - yyout = out_str ; -} - -int yyget_debug (void) -{ - return yy_flex_debug; -} - -void yyset_debug (int bdebug ) -{ - yy_flex_debug = bdebug ; -} - -static int yy_init_globals (void) -{ - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - (yy_buffer_stack) = 0; - (yy_buffer_stack_top) = 0; - (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; - (yy_init) = 0; - (yy_start) = 0; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = (FILE *) 0; - yyout = (FILE *) 0; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (void) -{ - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(); - } - - /* Destroy the stack itself. */ - yyfree((yy_buffer_stack) ); - (yy_buffer_stack) = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( ); - - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) -{ - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) -{ - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size ) -{ - return (void *) malloc( size ); -} - -void *yyrealloc (void * ptr, yy_size_t size ) -{ - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); -} - -void yyfree (void * ptr ) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 107 "macro.lex.l" - - - -#if 0 -/* all code for testing macros */ -#include "winhelp.h" -static CHAR szTestMacro[256]; - -static LRESULT CALLBACK MACRO_TestDialogProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - if (msg == WM_COMMAND && wParam == IDOK) - { - GetDlgItemText(hDlg, 99, szTestMacro, sizeof(szTestMacro)); - EndDialog(hDlg, IDOK); - return TRUE; - } - return FALSE; -} - -void macro_test(void) -{ - WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance); - DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, (DLGPROC)lpfnDlg); - FreeProcInstance(lpfnDlg); - macro = szTestMacro; -} -#endif - -/* small helper function for debug messages */ -static const char* ts(int t) -{ - static char c[2] = {0,0}; - - switch (t) - { - case EMPTY: return "EMPTY"; - case VOID_FUNCTION: return "VOID_FUNCTION"; - case BOOL_FUNCTION: return "BOOL_FUNCTION"; - case INTEGER: return "INTEGER"; - case STRING: return "STRING"; - case IDENTIFIER: return "IDENTIFIER"; - default: c[0] = (char)t; return c; - } -} - -static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret); - -/****************************************************************** - * MACRO_CheckArgs - * - * checks number of arguments against prototype, and stores arguments on - * stack pa for later call - * returns -1 on error, otherwise the number of pushed parameters - */ -static int MACRO_CheckArgs(void* pa[], unsigned max, const char* args) -{ - int t; - unsigned int len = 0, idx = 0; - - WINE_TRACE("Checking %s\n", debugstr_a(args)); - - if (yylex() != '(') {WINE_WARN("missing (\n");return -1;} - - if (*args) - { - len = strlen(args); - for (;;) - { - t = yylex(); - WINE_TRACE("Got %s <=> %c\n", debugstr_a(ts(t)), *args); - - switch (*args) - { - case 'S': - if (t != STRING) - {WINE_WARN("missing S\n");return -1;} - pa[idx] = (void*)yylval.string; - break; - case 'U': - case 'I': - if (t != INTEGER) - {WINE_WARN("missing U\n");return -1;} - pa[idx] = LongToPtr(yylval.integer); - break; - case 'B': - if (t != BOOL_FUNCTION) - {WINE_WARN("missing B\n");return -1;} - if (MACRO_CallBoolFunc(yylval.function, yylval.proto, &pa[idx]) == 0) - return -1; - break; - default: - WINE_WARN("unexpected %s while args is %c\n", debugstr_a(ts(t)), *args); - return -1; - } - idx++; - if (*++args == '\0') break; - t = yylex(); - if (t == ')') goto CheckArgs_end; - if (t != ',') {WINE_WARN("missing ,\n");return -1;} - if (idx >= max) {WINE_FIXME("stack overflow (%d)\n", max);return -1;} - } - } - if (yylex() != ')') {WINE_WARN("missing )\n");return -1;} - -CheckArgs_end: - while (len > idx) pa[--len] = NULL; - return idx; -} - -/****************************************************************** - * MACRO_CallBoolFunc - * - * Invokes boolean function fn, which arguments are defined by args - * stores bool result into ret - */ -static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) -{ - void* pa[2]; - int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); - - if (idx < 0) return 0; - if (!fn) return 1; - - WINE_TRACE("calling with %u pmts\n", idx); - - switch (strlen(args)) - { - case 0: - { - BOOL (WINAPI *func)(void) = fn; - *ret = (void *)(ULONG_PTR)func(); - break; - } - case 1: - { - BOOL (WINAPI *func)(void *) = fn; - *ret = (void *)(ULONG_PTR)func( pa[0]); - break; - } - default: WINE_FIXME("NIY\n"); - } - - return 1; -} - -/****************************************************************** - * MACRO_CallVoidFunc - * - * - */ -static int MACRO_CallVoidFunc(void *fn, const char* args) -{ - void* pa[6]; - int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); - - if (idx < 0) return 0; - if (!fn) return 1; - - WINE_TRACE("calling %p with %u pmts\n", fn, idx); - - switch (strlen(args)) - { - case 0: - { - void (WINAPI *func)(void) = fn; - func(); - break; - } - case 1: - { - void (WINAPI *func)(void*) = fn; - func( pa[0] ); - break; - } - case 2: - { - void (WINAPI *func)(void*,void*) = fn; - func( pa[0], pa[1] ); - break; - } - case 3: - { - void (WINAPI *func)(void*,void*,void*) = fn; - func( pa[0], pa[1], pa[2] ); - break; - } - case 4: - { - void (WINAPI *func)(void*,void*,void*,void*) = fn; - func( pa[0], pa[1], pa[2], pa[3] ); - break; - } - case 5: - { - void (WINAPI *func)(void*,void*,void*,void*,void*) = fn; - func( pa[0], pa[1], pa[2], pa[3], pa[4] ); - break; - } - case 6: - { - void (WINAPI *func)(void*,void*,void*,void*,void*,void*) = fn; - func( pa[0], pa[1], pa[2], pa[3], pa[4], pa[5] ); - break; - } - default: WINE_FIXME("NIY\n"); - } - - return 1; -} - -BOOL MACRO_ExecuteMacro(WINHELP_WINDOW* window, LPCSTR macro) -{ - struct lex_data curr_lex_data, *prev_lex_data; - BOOL ret = TRUE; - int t; - - WINE_TRACE("%s\n", debugstr_a(macro)); - - prev_lex_data = lex_data; - lex_data = &curr_lex_data; - - memset(lex_data, 0, sizeof(*lex_data)); - lex_data->macroptr = macro; - lex_data->window = WINHELP_GrabWindow(window); - - while ((t = yylex()) != EMPTY) - { - switch (t) - { - case VOID_FUNCTION: - WINE_TRACE("got type void func(%s)\n", debugstr_a(yylval.proto)); - MACRO_CallVoidFunc(yylval.function, yylval.proto); - break; - case BOOL_FUNCTION: - WINE_WARN("got type bool func(%s)\n", debugstr_a(yylval.proto)); - break; - default: - WINE_WARN("got unexpected type %s\n", debugstr_a(ts(t))); - YY_FLUSH_BUFFER; - ret = FALSE; - goto done; - } - switch (t = yylex()) - { - case EMPTY: goto done; - case ';': break; - default: ret = FALSE; YY_FLUSH_BUFFER; goto done; - } - } - -done: - for (t = 0; t < lex_data->cache_used; t++) - HeapFree(GetProcessHeap(), 0, lex_data->cache_string[t]); - lex_data = prev_lex_data; - WINHELP_ReleaseWindow(window); - - return ret; -} - -WINHELP_WINDOW* MACRO_CurrentWindow(void) -{ - return lex_data ? lex_data->window : Globals.active_win; -} - -#ifndef yywrap -int yywrap(void) { return 1; } -#endif - diff --git a/base/applications/winhlp32/macro.lex.yy.h b/base/applications/winhlp32/macro.lex.yy.h deleted file mode 100644 index 7b39b6c1465..00000000000 --- a/base/applications/winhlp32/macro.lex.yy.h +++ /dev/null @@ -1,320 +0,0 @@ -#ifndef yyHEADER_H -#define yyHEADER_H 1 -#define yyIN_HEADER 1 - -#line 6 "macro.lex.yy.h" - -#line 8 "macro.lex.yy.h" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <stdlib.h> - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include <inttypes.h> -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#define YY_BUF_SIZE 16384 -#endif - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -extern yy_size_t yyleng; - -extern FILE *yyin, *yyout; - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - yy_size_t yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); - -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); - -/* Begin user sect3 */ - -extern int yylineno; - -extern char *yytext; -#define yytext_ptr yytext - -#ifdef YY_HEADER_EXPORT_START_CONDITIONS -#define INITIAL 0 -#define quote 1 - -#endif - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include <unistd.h> -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy (void ); - -int yyget_debug (void ); - -void yyset_debug (int debug_flag ); - -YY_EXTRA_TYPE yyget_extra (void ); - -void yyset_extra (YY_EXTRA_TYPE user_defined ); - -FILE *yyget_in (void ); - -void yyset_in (FILE * in_str ); - -FILE *yyget_out (void ); - -void yyset_out (FILE * out_str ); - -yy_size_t yyget_leng (void ); - -char *yyget_text (void ); - -int yyget_lineno (void ); - -void yyset_lineno (int line_number ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (void ); -#else -extern int yywrap (void ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); -#endif - -#ifndef YY_NO_INPUT - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex (void); - -#define YY_DECL int yylex (void) -#endif /* !YY_DECL */ - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif - -#line 107 "macro.lex.l" - - -#line 319 "macro.lex.yy.h" -#undef yyIN_HEADER -#endif /* yyHEADER_H */ diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index 87d2110eabb..983913b6097 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -57,9 +57,6 @@ list(APPEND PCH_SKIP_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c ${CMAKE_CURRENT_BINARY_DIR}/msi_stubs.c) -# cond.tab.c/sql.tab.c have been generated with relative file paths... -set_source_files_properties(cond.tab.c sql.tab.c PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"") - add_library(msi MODULE ${SOURCE} ${PCH_SKIP_SOURCE} diff --git a/dll/win32/vbscript/CMakeLists.txt b/dll/win32/vbscript/CMakeLists.txt index 0f6819625ae..145e7364bfa 100644 --- a/dll/win32/vbscript/CMakeLists.txt +++ b/dll/win32/vbscript/CMakeLists.txt @@ -17,6 +17,9 @@ list(APPEND SOURCE BISON_TARGET(parser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.tab.c COMPILE_FLAGS "-p parser_") +list(APPEND PCH_SKIP_SOURCE + ${BISON_parser_OUTPUTS}) + list(APPEND vbscript_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/vbscript_classes.rgs ${CMAKE_CURRENT_SOURCE_DIR}/vbsglobal.rgs @@ -32,7 +35,7 @@ add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl) add_library(vbscript MODULE ${SOURCE} - ${BISON_parser_OUTPUTS} + ${PCH_SKIP_SOURCE} vbscript.rc ${CMAKE_CURRENT_BINARY_DIR}/vbscript.def) diff --git a/sdk/tools/widl/readme.txt b/sdk/tools/widl/readme.txt deleted file mode 100644 index 4b7a6216dcf..00000000000 --- a/sdk/tools/widl/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -To generate a new scanner and parser run: - -flex --header-file=parser.yy.h --outfile=parser.yy.c parser.l - -bison --defines=parser.tab.h --name-prefix=parser_ parser.y

3 years, 8 months

[reactos] 01/01: [NTOS:MM] Stubplement cookie generation for drivers

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e928e5c929f3a8fa69bf… commit 5e928e5c929f3a8fa69bf869430e145279969bae Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 4 22:08:48 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 3 18:08:53 2021 +0200 [NTOS:MM] Stubplement cookie generation for drivers --- ntoskrnl/mm/ARM3/sysldr.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 745543403f4..c1c7ad0cea9 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -50,6 +50,12 @@ PMMPTE MiKernelResourceStartPte, MiKernelResourceEndPte; ULONG_PTR ExPoolCodeStart, ExPoolCodeEnd, MmPoolCodeStart, MmPoolCodeEnd; ULONG_PTR MmPteCodeStart, MmPteCodeEnd; +#ifdef _WIN64 +#define DEFAULT_SECURITY_COOKIE 0x00002B992DDFA232ll +#else +#define DEFAULT_SECURITY_COOKIE 0xBB40E64E +#endif + /* FUNCTIONS ******************************************************************/ PVOID @@ -2807,6 +2813,84 @@ Fail: return Status; } + +PVOID +NTAPI +LdrpFetchAddressOfSecurityCookie(PVOID BaseAddress, ULONG SizeOfImage) +{ + PIMAGE_LOAD_CONFIG_DIRECTORY ConfigDir; + ULONG DirSize; + PVOID Cookie = NULL; + + /* Check NT header first */ + if (!RtlImageNtHeader(BaseAddress)) return NULL; + + /* Get the pointer to the config directory */ + ConfigDir = RtlImageDirectoryEntryToData(BaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &DirSize); + + /* Check for sanity */ + if (!ConfigDir || + DirSize < FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerTable) || /* SEHandlerTable is after SecurityCookie */ + (ConfigDir->Size != DirSize)) + { + /* Invalid directory*/ + return NULL; + } + + /* Now get the cookie */ + Cookie = (PVOID)ConfigDir->SecurityCookie; + + /* Check this cookie */ + if ((PCHAR)Cookie <= (PCHAR)BaseAddress || + (PCHAR)Cookie >= (PCHAR)BaseAddress + SizeOfImage) + { + Cookie = NULL; + } + + /* Return validated security cookie */ + return Cookie; +} + +PVOID +NTAPI +LdrpInitSecurityCookie(PLDR_DATA_TABLE_ENTRY LdrEntry) +{ + PULONG_PTR Cookie; + ULONG_PTR NewCookie; + + /* Fetch address of the cookie */ + Cookie = LdrpFetchAddressOfSecurityCookie(LdrEntry->DllBase, LdrEntry->SizeOfImage); + + if (Cookie) + { + /* Check if it's a default one */ + if ((*Cookie == DEFAULT_SECURITY_COOKIE) || + (*Cookie == 0)) + { + LARGE_INTEGER Counter = KeQueryPerformanceCounter(NULL); + /* The address should be unique */ + NewCookie = (ULONG_PTR)Cookie; + + /* We just need a simple tick, don't care about precision and whatnot */ + NewCookie ^= (ULONG_PTR)Counter.LowPart; + + /* If the result is 0 or the same as we got, just add one to the default value */ + if ((NewCookie == 0) || (NewCookie == *Cookie)) + { + NewCookie = DEFAULT_SECURITY_COOKIE + 1; + } + + /* Set the new cookie value */ + *Cookie = NewCookie; + } + } + + return Cookie; +} + NTSTATUS NTAPI MmLoadSystemImage(IN PUNICODE_STRING FileName, @@ -3252,6 +3336,9 @@ LoaderScan: /* Write-protect the system image */ MiWriteProtectSystemImage(LdrEntry->DllBase); + /* Initialize the security cookie (Win7 is not doing this yet!) */ + LdrpInitSecurityCookie(LdrEntry); + /* Check if notifications are enabled */ if (PsImageNotifyEnabled) {

3 years, 8 months

[reactos] 01/01: [BROWSEUI] Fix auto-completion on relative paths (#3578)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=206156fad57dc951cde3e… commit 206156fad57dc951cde3e100e584add0d1e8e4ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 3 20:38:25 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 3 20:38:25 2021 +0900 [BROWSEUI] Fix auto-completion on relative paths (#3578) Fix the CLSID_ACListISF object about relative paths. If the given path is relative at CACListISF::Expand, then convert it to a full path. CORE-9281 --- dll/win32/browseui/aclistisf.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dll/win32/browseui/aclistisf.cpp b/dll/win32/browseui/aclistisf.cpp index 15de181714a..4e62b8a5e97 100644 --- a/dll/win32/browseui/aclistisf.cpp +++ b/dll/win32/browseui/aclistisf.cpp @@ -2,7 +2,7 @@ * Shell AutoComplete list * * Copyright 2015 Thomas Faber - * Copyright 2020 Katayama Hirofumi MZ + * Copyright 2020-2021 Katayama Hirofumi MZ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -329,10 +329,20 @@ STDMETHODIMP CACListISF::Expand(LPCOLESTR pszExpand) TRACE("(%p, %ls)\n", this, pszExpand); m_szExpand = pszExpand; - m_iNextLocation = LT_DIRECTORY; + + // get full path + WCHAR szPath1[MAX_PATH], szPath2[MAX_PATH]; + if (PathIsRelativeW(pszExpand) && + SHGetPathFromIDListW(m_pidlCurDir, szPath1) && + PathCombineW(szPath2, szPath1, pszExpand)) + { + pszExpand = szPath2; + } + GetFullPathNameW(pszExpand, _countof(szPath1), szPath1, NULL); + CComHeapPtr<ITEMIDLIST> pidl; - HRESULT hr = SHParseDisplayName(m_szExpand, NULL, &pidl, NULL, NULL); + HRESULT hr = SHParseDisplayName(szPath1, NULL, &pidl, NULL, NULL); if (SUCCEEDED(hr)) { hr = SetLocation(pidl.Detach());

3 years, 8 months

[reactos] 01/01: [BROWSEUI_APITEST] Strengthen ACListISF testcase (#3577)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e771589ae1df303b76ab9… commit e771589ae1df303b76ab93b88ada0dd9e7fb27ae Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 3 16:56:49 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 3 16:56:49 2021 +0900 [BROWSEUI_APITEST] Strengthen ACListISF testcase (#3577) Analyze CLSID_ACListISF's behavior about relative paths. CORE-9281 --- modules/rostests/apitests/browseui/ACListISF.cpp | 197 ++++++++++++++++++++--- 1 file changed, 179 insertions(+), 18 deletions(-) diff --git a/modules/rostests/apitests/browseui/ACListISF.cpp b/modules/rostests/apitests/browseui/ACListISF.cpp index 7cb1bc6d93a..ab87cb492ef 100644 --- a/modules/rostests/apitests/browseui/ACListISF.cpp +++ b/modules/rostests/apitests/browseui/ACListISF.cpp @@ -41,9 +41,6 @@ static DWORD g_WinVersion; #expression, (int)(expected), _value); \ } while (0) - - - static void test_at_end_imp(CComPtr<IEnumString>& EnumStr) { CComHeapPtr<OLECHAR> Result; @@ -128,11 +125,9 @@ test_ExpectFolders_imp(CComPtr<IEnumString>& EnumStr, LPITEMIDLIST pidlTarget, c hr = EnumStr->Next(1, &Result, &Fetched); winetest_ok_hr(hr, S_OK); - if (hr != S_OK) break; - StringCchPrintfW(Buffer, _ARRAYSIZE(Buffer), L"%s%s", (options & IgnoreRoot) ? L"" : Root, (WCHAR*)DisplayName); winetest_ok(!wcscmp(Buffer, Result), "Expected %s, got %s\n", wine_dbgstr_w(Buffer), wine_dbgstr_w(Result)); @@ -159,12 +154,18 @@ test_ACListISF_NONE() HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); ok_hr(hr, S_OK); if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); return; + } CComPtr<IACList2> ACList; ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } ok_hr(hr = ACList->SetOptions(ACLO_NONE), S_OK); test_at_end(EnumStr); @@ -177,7 +178,10 @@ test_ACListISF_NONE() CComHeapPtr<ITEMIDLIST> pidlDiskRoot; ok_hr(hr = SHParseDisplayName(Buffer, NULL, &pidlDiskRoot, NULL, NULL), S_OK); if (!SUCCEEDED(hr)) + { + skip("SHParseDisplayName failed\n"); return; + } ok_hr(hr = ACList->Expand(Buffer), S_OK); test_ExpectFolders(EnumStr, pidlDiskRoot, Buffer, CheckLast | IgnoreHidden); @@ -195,17 +199,26 @@ test_ACListISF_CURRENTDIR() HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); ok_hr(hr, S_OK); if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); return; + } CComPtr<IACList2> ACList; ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } CComPtr<ICurrentWorkingDirectory> CurrentWorkingDir; ok_hr(hr = EnumStr->QueryInterface(IID_ICurrentWorkingDirectory, (void**)&CurrentWorkingDir), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } ok_hr(hr = ACList->SetOptions(ACLO_CURRENTDIR), S_OK); test_at_end(EnumStr); @@ -325,18 +338,10 @@ test_ACListISF_CURRENTDIR() ok_wstr(psz, L"tes2"); CoTaskMemFree(psz); - hr = EnumStr->Next(1, &psz, &cGot); - ok_hr(hr, S_FALSE); - CoTaskMemFree(psz); - StringCbCopyW(szPath, sizeof(szPath), szDir); StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-2"); ok_hr(hr = CurrentWorkingDir->SetDirectory(szPath), S_OK); - hr = EnumStr->Next(1, &psz, &cGot); - ok_hr(hr, S_FALSE); - CoTaskMemFree(psz); - EnumStr->Reset(); hr = EnumStr->Next(1, &psz, &cGot); @@ -349,10 +354,6 @@ test_ACListISF_CURRENTDIR() ok_wstr(psz, L"tes2"); CoTaskMemFree(psz); - hr = EnumStr->Next(1, &psz, &cGot); - ok_hr(hr, S_FALSE); - CoTaskMemFree(psz); - StringCbCopyW(szPath, sizeof(szPath), szDir); StringCbCatW(szPath, sizeof(szPath), L"\\BROWSEUI-1\\TEST1"); RemoveDirectoryW(szPath); @@ -378,6 +379,121 @@ test_ACListISF_CURRENTDIR() RemoveDirectoryW(szPath); } +static void +test_ACListISF_CURRENTDIR2() +{ + CComPtr<IEnumString> EnumStr; + HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); + ok_hr(hr, S_OK); + if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); + return; + } + + CComPtr<IACList2> ACList; + ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); + if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); + return; + } + + CComPtr<ICurrentWorkingDirectory> CurrentWorkingDir; + ok_hr(hr = EnumStr->QueryInterface(IID_ICurrentWorkingDirectory, (void**)&CurrentWorkingDir), S_OK); + if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); + return; + } + + ok_hr(hr = ACList->SetOptions(ACLO_CURRENTDIR), S_OK); + test_at_end(EnumStr); + + CreateDirectoryW(L"C:\\BROWSEUI-1", NULL); + CreateDirectoryW(L"C:\\BROWSEUI-1\\TEST1", NULL); + CreateDirectoryW(L"C:\\BROWSEUI-1\\TEST2", NULL); + CreateDirectoryW(L"C:\\BROWSEUI-1\\TEST1\\TEST3", NULL); + CreateDirectoryW(L"C:\\BROWSEUI-2", NULL); + CreateDirectoryW(L"C:\\BROWSEUI-2\\TEST1", NULL); + CreateDirectoryW(L"C:\\BROWSEUI-2\\TEST2", NULL); + CreateDirectoryW(L"C:\\BROWSEUI-2\\TEST1\\TEST4", NULL); + + ok_hr(hr = CurrentWorkingDir->SetDirectory(L"C:\\BROWSEUI-1\\TEST1"), S_OK); + test_at_end(EnumStr); + + ok_hr(hr = ACList->Expand(L"C:\\BROWSEUI-2\\TEST1\\"), S_OK); + + LPWSTR psz; + ULONG cGot; + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"C:\\BROWSEUI-2\\TEST1\\TEST4"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"TEST3"); + CoTaskMemFree(psz); + + test_at_end(EnumStr); + + ok_hr(hr = ACList->Expand(L"C:\\BROWSEUI-1\\TEST1\\"), S_OK); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"C:\\BROWSEUI-1\\TEST1\\TEST3"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"TEST3"); + CoTaskMemFree(psz); + + test_at_end(EnumStr); + + ok_hr(hr = CurrentWorkingDir->SetDirectory(L"C:\\BROWSEUI-2\\TEST1"), S_OK); + test_at_end(EnumStr); + + ok_hr(hr = ACList->Expand(L"..\\TEST1\\"), S_OK); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"..\\TEST1\\TEST4"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"TEST4"); + CoTaskMemFree(psz); + + test_at_end(EnumStr); + + ok_hr(hr = ACList->Expand(L"\\BROWSEUI-2\\TEST1\\"), S_OK); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"\\BROWSEUI-2\\TEST1\\TEST4"); + CoTaskMemFree(psz); + + hr = EnumStr->Next(1, &psz, &cGot); + ok_hr(hr, S_OK); + ok_wstr(psz, L"TEST4"); + CoTaskMemFree(psz); + + test_at_end(EnumStr); + + RemoveDirectoryW(L"C:\\BROWSEUI-1\\TEST1\\TEST3"); + RemoveDirectoryW(L"C:\\BROWSEUI-1\\TEST1"); + RemoveDirectoryW(L"C:\\BROWSEUI-1\\TEST2"); + RemoveDirectoryW(L"C:\\BROWSEUI-1"); + RemoveDirectoryW(L"C:\\BROWSEUI-2\\TEST1\\TEST4"); + RemoveDirectoryW(L"C:\\BROWSEUI-2\\TEST1"); + RemoveDirectoryW(L"C:\\BROWSEUI-2\\TEST2"); + RemoveDirectoryW(L"C:\\BROWSEUI-2"); +} + static void test_ACListISF_MYCOMPUTER() { @@ -385,7 +501,10 @@ test_ACListISF_MYCOMPUTER() HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IACList2, &ACList)); ok_hr(hr, S_OK); if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); return; + } // Check the default DWORD CurrentOption = 0xdeadbeef; @@ -397,18 +516,26 @@ test_ACListISF_MYCOMPUTER() CComPtr<IEnumString> EnumStr; ok_hr(hr = ACList->QueryInterface(IID_IEnumString, (void**)&EnumStr), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } CComPtr<IPersistFolder> PersistFolder; ok_hr(hr = EnumStr->QueryInterface(IID_IPersistFolder, (void**)&PersistFolder), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } CComHeapPtr<ITEMIDLIST> pidlMyComputer; ok_hr(hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlMyComputer), S_OK); if (!SUCCEEDED(hr)) + { + skip("SHGetSpecialFolderLocation failed\n"); return; - + } hr = EnumStr->Reset(); if (g_WinVersion < WINVER_VISTA) @@ -455,12 +582,18 @@ test_ACListISF_DESKTOP() HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); ok_hr(hr, S_OK); if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); return; + } CComPtr<IACList2> ACList; ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } ok_hr(hr = ACList->SetOptions(ACLO_DESKTOP), S_OK); test_ExpectFolders(EnumStr, NULL, NULL, IgnoreRoot | CheckLast | IgnoreHidden); @@ -473,17 +606,26 @@ test_ACListISF_FAVORITES() HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); ok_hr(hr, S_OK); if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); return; + } CComPtr<IACList2> ACList; ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } CComHeapPtr<ITEMIDLIST> pidlFavorites; ok_hr(hr = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &pidlFavorites), S_OK); if (!SUCCEEDED(hr)) + { + skip("SHGetSpecialFolderLocation failed\n"); return; + } ok_hr(hr = ACList->SetOptions(ACLO_FAVORITES), S_OK); test_ExpectFolders(EnumStr, pidlFavorites, NULL, IgnoreRoot | CheckLast | IgnoreHidden); @@ -496,12 +638,18 @@ test_ACListISF_FILESYSONLY() HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); ok_hr(hr, S_OK); if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); return; + } CComPtr<IACList2> ACList; ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } WCHAR Buffer[MAX_PATH]; GetSystemWindowsDirectoryW(Buffer, _ARRAYSIZE(Buffer)); @@ -510,7 +658,10 @@ test_ACListISF_FILESYSONLY() CComHeapPtr<ITEMIDLIST> pidlDiskRoot; ok_hr(hr = SHParseDisplayName(Buffer, NULL, &pidlDiskRoot, NULL, NULL), S_OK); if (!SUCCEEDED(hr)) + { + skip("SHParseDisplayName failed\n"); return; + } ok_hr(hr = ACList->SetOptions(ACLO_FILESYSONLY), S_OK); test_at_end(EnumStr); @@ -526,12 +677,18 @@ test_ACListISF_FILESYSDIRS() HRESULT hr = CoCreateInstance(CLSID_ACListISF, NULL, CLSCTX_ALL, IID_PPV_ARG(IEnumString, &EnumStr)); ok_hr(hr, S_OK); if (!SUCCEEDED(hr)) + { + skip("CoCreateInstance failed\n"); return; + } CComPtr<IACList2> ACList; ok_hr(hr = EnumStr->QueryInterface(IID_IACList2, (void**)&ACList), S_OK); if (!SUCCEEDED(hr)) + { + skip("QueryInterface failed\n"); return; + } WCHAR Buffer[MAX_PATH]; GetSystemWindowsDirectoryW(Buffer, _ARRAYSIZE(Buffer)); @@ -578,10 +735,14 @@ START_TEST(ACListISF) CCoInit init; ok_hr(init.hres, S_OK); if (!SUCCEEDED(init.hres)) + { + skip("CoInitialize failed\n"); return; + } test_ACListISF_NONE(); test_ACListISF_CURRENTDIR(); + test_ACListISF_CURRENTDIR2(); test_ACListISF_MYCOMPUTER(); test_ACListISF_DESKTOP(); test_ACListISF_FAVORITES();

3 years, 8 months

[reactos] 01/01: [NTOS:EX] Use RtlCutoverTimeToSystemTime to determine the current time zone id

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c449929fefde11e5ff8ff… commit c449929fefde11e5ff8ff5308f0db29b8132dee4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 3 09:38:07 2021 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 3 09:38:07 2021 +0200 [NTOS:EX] Use RtlCutoverTimeToSystemTime to determine the current time zone id CORE-14658 --- ntoskrnl/ex/time.c | 77 +++++++++++++++++++++++++++++++++++++++------- sdk/include/ndk/rtlfuncs.h | 9 ++++++ 2 files changed, 75 insertions(+), 11 deletions(-) diff --git a/ntoskrnl/ex/time.c b/ntoskrnl/ex/time.c index 44ce39d9ad9..ad971773a8d 100644 --- a/ntoskrnl/ex/time.c +++ b/ntoskrnl/ex/time.c @@ -225,6 +225,8 @@ BOOLEAN NTAPI ExRefreshTimeZoneInformation(IN PLARGE_INTEGER CurrentBootTime) { + LARGE_INTEGER StandardTime; + LARGE_INTEGER DaylightTime; LARGE_INTEGER CurrentTime; NTSTATUS Status; @@ -232,20 +234,73 @@ ExRefreshTimeZoneInformation(IN PLARGE_INTEGER CurrentBootTime) Status = RtlQueryTimeZoneInformation(&ExpTimeZoneInfo); if (!NT_SUCCESS(Status)) { - /* Failed, clear all data */ - RtlZeroMemory(&ExpTimeZoneInfo, sizeof(RTL_TIME_ZONE_INFORMATION)); - ExpTimeZoneBias.QuadPart = (LONGLONG)0; - ExpTimeZoneId = TIME_ZONE_ID_UNKNOWN; + DPRINT1("RtlQueryTimeZoneInformation() failed (Status 0x%08lx)\n", Status); + return FALSE; } - else + + /* Get the default bias */ + ExpTimeZoneBias.QuadPart = (LONGLONG)ExpTimeZoneInfo.Bias * TICKSPERMINUTE; + + if (ExpTimeZoneInfo.StandardDate.Month != 0 && + ExpTimeZoneInfo.DaylightDate.Month != 0) { - /* FIXME: Calculate transition dates */ + /* Get this years standard start time */ + if (!RtlCutoverTimeToSystemTime(&ExpTimeZoneInfo.StandardDate, + &StandardTime, + CurrentBootTime, + TRUE)) + { + DPRINT1("RtlCutoverTimeToSystemTime() for StandardDate failed!\n"); + return FALSE; + } - /* Set bias and ID */ - ExpTimeZoneBias.QuadPart = ((LONGLONG)(ExpTimeZoneInfo.Bias + - ExpTimeZoneInfo.StandardBias)) * - TICKSPERMINUTE; - ExpTimeZoneId = TIME_ZONE_ID_STANDARD; + /* Get this years daylight start time */ + if (!RtlCutoverTimeToSystemTime(&ExpTimeZoneInfo.DaylightDate, + &DaylightTime, + CurrentBootTime, + TRUE)) + { + DPRINT1("RtlCutoverTimeToSystemTime() for DaylightDate failed!\n"); + return FALSE; + } + + /* Determine the time zone id and update the time zone bias */ + if (DaylightTime.QuadPart < StandardTime.QuadPart) + { + if ((CurrentBootTime->QuadPart >= DaylightTime.QuadPart) && + (CurrentBootTime->QuadPart < StandardTime.QuadPart)) + { + DPRINT("Daylight time!\n"); + ExpTimeZoneId = TIME_ZONE_ID_DAYLIGHT; + ExpTimeZoneBias.QuadPart += (LONGLONG)ExpTimeZoneInfo.DaylightBias * TICKSPERMINUTE; + } + else + { + DPRINT("Standard time!\n"); + ExpTimeZoneId = TIME_ZONE_ID_STANDARD; + ExpTimeZoneBias.QuadPart += (LONGLONG)ExpTimeZoneInfo.StandardBias * TICKSPERMINUTE; + } + } + else + { + if ((CurrentBootTime->QuadPart >= StandardTime.QuadPart) && + (CurrentBootTime->QuadPart < DaylightTime.QuadPart)) + { + DPRINT("Standard time!\n"); + ExpTimeZoneId = TIME_ZONE_ID_STANDARD; + ExpTimeZoneBias.QuadPart += (LONGLONG)ExpTimeZoneInfo.StandardBias * TICKSPERMINUTE; + } + else + { + DPRINT("Daylight time!\n"); + ExpTimeZoneId = TIME_ZONE_ID_DAYLIGHT; + ExpTimeZoneBias.QuadPart += (LONGLONG)ExpTimeZoneInfo.DaylightBias * TICKSPERMINUTE; + } + } + } + else + { + ExpTimeZoneId = TIME_ZONE_ID_UNKNOWN; } /* Change it for user-mode applications */ diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 7817278a17f..513fc195b5f 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -4533,6 +4533,15 @@ RtlIpv6StringToAddressExW( // // Time Functions // +NTSYSAPI +BOOLEAN +NTAPI +RtlCutoverTimeToSystemTime( + _In_ PTIME_FIELDS CutoverTimeFields, + _Out_ PLARGE_INTEGER SystemTime, + _In_ PLARGE_INTEGER CurrentTime, + _In_ BOOLEAN ThisYearsCutoverOnly); + NTSYSAPI NTSTATUS NTAPI

3 years, 8 months

[reactos] 01/01: [SERVICES] Fix booting with DPH enabled

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97a23a5f3d6994730c312… commit 97a23a5f3d6994730c3121ff57d76f158e4e10c5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 3 01:54:57 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 3 01:54:57 2021 +0200 [SERVICES] Fix booting with DPH enabled RegSetValueExW tries to read one extra character after the buffer, to see if a REG_SZ is null terminated --- base/system/services/controlset.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index e9ac8ddc7e2..1eb0facd545 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -174,9 +174,10 @@ ScmCopyTree( return ERROR_NOT_ENOUGH_MEMORY; } + /* RegSetValueExW tries to read behind the maximum length, so give it space for that */ lpDataBuffer = HeapAlloc(GetProcessHeap(), - 0, - dwMaxValueLength); + HEAP_ZERO_MEMORY, + dwMaxValueLength + sizeof(WCHAR)); if (lpDataBuffer == NULL) { DPRINT1("Buffer allocation failed\n");

3 years, 8 months

[reactos] 01/01: [UMPNPMGR] Fix remaining length calculation

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5028c3adec7aa44eeed7f… commit 5028c3adec7aa44eeed7f811a41f3a9b7085e8b0 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 3 01:43:48 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 3 01:43:48 2021 +0200 [UMPNPMGR] Fix remaining length calculation --- base/services/umpnpmgr/rpcserver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index cf49713061a..cba896860d5 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -1153,7 +1153,7 @@ GetEnumeratorInstanceList( break; dwUsedLength += dwPathLength - 1; - dwRemainingLength += dwPathLength - 1; + dwRemainingLength -= dwPathLength - 1; pPtr += dwPathLength - 1; } @@ -1203,7 +1203,7 @@ GetAllInstanceList( break; dwUsedLength += dwPathLength - 1; - dwRemainingLength += dwPathLength - 1; + dwRemainingLength -= dwPathLength - 1; pPtr += dwPathLength - 1; }

3 years, 8 months

[reactos] 01/01: [SETUPAPI] Fix wrong buffer size given to CM_Get_Device_ID_List_ExW

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4712deb8a87394e502cc1… commit 4712deb8a87394e502cc1bdbed6bf9eaa7ef74ae Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 3 00:51:23 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Apr 3 00:52:01 2021 +0200 [SETUPAPI] Fix wrong buffer size given to CM_Get_Device_ID_List_ExW This buffer overflow was introduced in previous commit. --- dll/win32/setupapi/devclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index b8531b0093d..56398262437 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -142,7 +142,7 @@ SETUP_CreateDevicesList( { cr = CM_Get_Device_ID_List_ExW(Enumerator, Buffer, - BufferLength, + BufferLength / sizeof(WCHAR), Enumerator ? CM_GETIDLIST_FILTER_ENUMERATOR : CM_GETIDLIST_FILTER_NONE, list->hMachine); if (cr == CR_BUFFER_SMALL)

3 years, 8 months

[reactos] 01/01: [SETUPAPI] Use CM_* functions to get list of devices

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f3133c308093d78975d9… commit 0f3133c308093d78975d9f34f38d0a4ed2cd97b3 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Apr 2 20:00:31 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Apr 2 21:41:09 2021 +0200 [SETUPAPI] Use CM_* functions to get list of devices - this prevents duplicating the code with umpnpmgr::PNP_GetDeviceList - we can enumerate devices on other computers This is part of the bugfix for CORE-17529 --- dll/win32/setupapi/devclass.c | 280 ++++++++++------------------------ dll/win32/setupapi/devinst.c | 2 +- dll/win32/setupapi/setupapi_private.h | 3 + 3 files changed, 86 insertions(+), 199 deletions(-) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 86fc33d281b..b8531b0093d 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -117,231 +117,115 @@ SetupDiDestroyClassImageList( return ret; } -/*********************************************************************** - * SETUP_CreateDevicesListFromEnumerator - * - * PARAMS - * list [IO] Device info set to fill with discovered devices. - * pClassGuid [I] If specified, only devices which belong to this class will be added. - * Enumerator [I] Location to search devices to add. - * hEnumeratorKey [I] Registry key corresponding to Enumerator key. Must have KEY_ENUMERATE_SUB_KEYS right. - * - * RETURNS - * Success: ERROR_SUCCESS. - * Failure: an error code. - */ -static LONG -SETUP_CreateDevicesListFromEnumerator( +LONG +SETUP_CreateDevicesList( IN OUT struct DeviceInfoSet *list, - IN CONST GUID *pClassGuid OPTIONAL, - IN LPCWSTR Enumerator, - IN HKEY hEnumeratorKey) /* handle to Enumerator registry key */ + IN PCWSTR MachineName OPTIONAL, + IN CONST GUID *Class OPTIONAL, + IN PCWSTR Enumerator OPTIONAL) { - HKEY hDeviceIdKey = NULL, hInstanceIdKey; - WCHAR KeyBuffer[MAX_PATH]; - WCHAR InstancePath[MAX_PATH]; - LPWSTR pEndOfInstancePath; /* Pointer into InstancePath buffer */ + PWCHAR Buffer = NULL; + DWORD BufferLength = 4096; + PCWSTR InstancePath; struct DeviceInfo *deviceInfo; - DWORD i = 0, j; - DWORD dwLength, dwRegType; - DWORD rc; + WCHAR ClassGuidBuffer[MAX_GUID_STRING_LEN]; + DWORD ClassGuidBufferSize; + GUID ClassGuid; + DEVINST dnDevInst; + CONFIGRET cr; - /* Enumerate device IDs (subkeys of hEnumeratorKey) */ - while (TRUE) - { - dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); - rc = RegEnumKeyExW(hEnumeratorKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - goto cleanup; - i++; - - /* Open device id sub key */ - if (hDeviceIdKey != NULL) - RegCloseKey(hDeviceIdKey); - rc = RegOpenKeyExW(hEnumeratorKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hDeviceIdKey); - if (rc != ERROR_SUCCESS) - goto cleanup; + Buffer = HeapAlloc(GetProcessHeap(), 0, BufferLength); + if (!Buffer) + return ERROR_NOT_ENOUGH_MEMORY; - if (FAILED(StringCchCopyW(InstancePath, _countof(InstancePath), Enumerator)) || - FAILED(StringCchCatW(InstancePath, _countof(InstancePath), BackSlash)) || - FAILED(StringCchCatW(InstancePath, _countof(InstancePath), KeyBuffer)) || - FAILED(StringCchCatW(InstancePath, _countof(InstancePath), BackSlash))) + do + { + cr = CM_Get_Device_ID_List_ExW(Enumerator, + Buffer, + BufferLength, + Enumerator ? CM_GETIDLIST_FILTER_ENUMERATOR : CM_GETIDLIST_FILTER_NONE, + list->hMachine); + if (cr == CR_BUFFER_SMALL) { - rc = ERROR_GEN_FAILURE; - goto cleanup; + if (Buffer) + HeapFree(GetProcessHeap(), 0, Buffer); + BufferLength *= 2; + Buffer = HeapAlloc(GetProcessHeap(), 0, BufferLength); + if (!Buffer) + return ERROR_NOT_ENOUGH_MEMORY; } - - pEndOfInstancePath = &InstancePath[strlenW(InstancePath)]; - - /* Enumerate instance IDs (subkeys of hDeviceIdKey) */ - j = 0; - while (TRUE) + else if (cr != CR_SUCCESS) { - GUID KeyGuid; + TRACE("CM_Get_Device_ID_List_ExW() failed with status 0x%x\n", cr); + if (Buffer) + HeapFree(GetProcessHeap(), 0, Buffer); + return GetErrorCodeFromCrCode(cr); + } + } + while (cr != CR_SUCCESS); - dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); - rc = RegEnumKeyExW(hDeviceIdKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); - if (rc == ERROR_NO_MORE_ITEMS) - break; - if (rc != ERROR_SUCCESS) - goto cleanup; - j++; + for (InstancePath = Buffer; *InstancePath != UNICODE_NULL; InstancePath += wcslen(InstancePath) + 1) + { + /* Check that device really exists */ + TRACE("Checking %S\n", InstancePath); + cr = CM_Locate_DevNode_Ex(&dnDevInst, + (DEVINSTID_W)InstancePath, + CM_LOCATE_DEVNODE_NORMAL, + list->hMachine); + if (cr != CR_SUCCESS) + { + ERR("CM_Locate_DevNode_ExW('%S') failed with status 0x%x\n", InstancePath, cr); + continue; + } - /* Open instance id sub key */ - rc = RegOpenKeyExW(hDeviceIdKey, KeyBuffer, 0, KEY_QUERY_VALUE, &hInstanceIdKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - *pEndOfInstancePath = '\0'; - strcatW(InstancePath, KeyBuffer); - - /* Read ClassGUID value */ - dwLength = sizeof(KeyBuffer) - sizeof(WCHAR); - rc = RegQueryValueExW(hInstanceIdKey, ClassGUID, NULL, &dwRegType, (LPBYTE)KeyBuffer, &dwLength); - RegCloseKey(hInstanceIdKey); - if (rc == ERROR_FILE_NOT_FOUND) + /* Retrieve GUID of this device */ + if (Class) + { + ClassGuidBufferSize = sizeof(ClassGuidBuffer); + cr = CM_Get_DevNode_Registry_Property_ExW(dnDevInst, + CM_DRP_CLASSGUID, + NULL, + ClassGuidBuffer, + &ClassGuidBufferSize, + 0, + list->hMachine); + if (cr == CR_SUCCESS) { - if (pClassGuid) - /* Skip this bad entry as we can't verify it */ + ClassGuidBuffer[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&ClassGuidBuffer[1], &ClassGuid) != RPC_S_OK) + { + /* Bad GUID, skip the entry */ + ERR("Invalid ClassGUID '%S' for device %S\n", ClassGuidBuffer, InstancePath); continue; - /* Set a default GUID for this device */ - memcpy(&KeyGuid, &GUID_NULL, sizeof(GUID)); - } - else if (rc != ERROR_SUCCESS) - { - goto cleanup; - } - else if (dwRegType != REG_SZ || dwLength < MAX_GUID_STRING_LEN * sizeof(WCHAR)) - { - rc = ERROR_GEN_FAILURE; - goto cleanup; + } } else { - KeyBuffer[MAX_GUID_STRING_LEN - 2] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) - /* Bad GUID, skip the entry */ - continue; + TRACE("Using default class GUID_NULL for device %S\n", InstancePath); + memcpy(&ClassGuid, &GUID_NULL, sizeof(GUID)); } - if (pClassGuid && !IsEqualIID(&KeyGuid, pClassGuid)) + if (!IsEqualIID(&ClassGuid, Class)) { - /* Skip this entry as it is not the right device class */ + TRACE("Skipping %S due to wrong class GUID\n", InstancePath); continue; } - - /* Add the entry to the list */ - if (!CreateDeviceInfo(list, InstancePath, &KeyGuid, &deviceInfo)) - { - rc = GetLastError(); - goto cleanup; - } - TRACE("Adding '%s' to device info set %p\n", debugstr_w(InstancePath), list); - InsertTailList(&list->ListHead, &deviceInfo->ListEntry); } - } - - rc = ERROR_SUCCESS; - -cleanup: - if (hDeviceIdKey != NULL) - RegCloseKey(hDeviceIdKey); - return rc; -} - -LONG -SETUP_CreateDevicesList( - IN OUT struct DeviceInfoSet *list, - IN PCWSTR MachineName OPTIONAL, - IN CONST GUID *Class OPTIONAL, - IN PCWSTR Enumerator OPTIONAL) -{ - HKEY HKLM = HKEY_LOCAL_MACHINE; - HKEY hEnumKey = NULL; - HKEY hEnumeratorKey = NULL; - WCHAR KeyBuffer[MAX_PATH]; - DWORD i; - DWORD dwLength; - DWORD rc; - - if (Class && IsEqualIID(Class, &GUID_NULL)) - Class = NULL; - - /* Open Enum key (if applicable) */ - if (MachineName != NULL) - { - rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &HKLM); - if (rc != ERROR_SUCCESS) - goto cleanup; - } - - rc = RegOpenKeyExW( - HKLM, - REGSTR_PATH_SYSTEMENUM, - 0, - KEY_ENUMERATE_SUB_KEYS, - &hEnumKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - /* If enumerator is provided, call directly SETUP_CreateDevicesListFromEnumerator. - * Else, enumerate all enumerators and call SETUP_CreateDevicesListFromEnumerator - * for each one. - */ - if (Enumerator) - { - rc = RegOpenKeyExW( - hEnumKey, - Enumerator, - 0, - KEY_ENUMERATE_SUB_KEYS, - &hEnumeratorKey); - if (rc != ERROR_SUCCESS) + /* Good! Create a device info element */ + if (!CreateDeviceInfo(list, InstancePath, &ClassGuid, &deviceInfo)) { - if (rc == ERROR_FILE_NOT_FOUND) - rc = ERROR_INVALID_DATA; - goto cleanup; + ERR("Failed to create info for %S\n", InstancePath); + HeapFree(GetProcessHeap(), 0, Buffer); + return GetLastError(); } - rc = SETUP_CreateDevicesListFromEnumerator(list, Class, Enumerator, hEnumeratorKey); - } - else - { - /* Enumerate enumerators */ - i = 0; - while (TRUE) - { - dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); - rc = RegEnumKeyExW(hEnumKey, i, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); - if (rc == ERROR_NO_MORE_ITEMS) - break; - else if (rc != ERROR_SUCCESS) - goto cleanup; - i++; - - /* Open sub key */ - if (hEnumeratorKey != NULL) - RegCloseKey(hEnumeratorKey); - rc = RegOpenKeyExW(hEnumKey, KeyBuffer, 0, KEY_ENUMERATE_SUB_KEYS, &hEnumeratorKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - /* Call SETUP_CreateDevicesListFromEnumerator */ - rc = SETUP_CreateDevicesListFromEnumerator(list, Class, KeyBuffer, hEnumeratorKey); - if (rc != ERROR_SUCCESS) - goto cleanup; - } - rc = ERROR_SUCCESS; + TRACE("Adding device %s to list\n", debugstr_w(InstancePath)); + InsertTailList(&list->ListHead, &deviceInfo->ListEntry); } -cleanup: - if (HKLM != HKEY_LOCAL_MACHINE) - RegCloseKey(HKLM); - if (hEnumKey != NULL) - RegCloseKey(hEnumKey); - if (hEnumeratorKey != NULL) - RegCloseKey(hEnumeratorKey); - return rc; + HeapFree(GetProcessHeap(), 0, Buffer); + return ERROR_SUCCESS; } static BOOL diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 167d8062c98..d629e138f1d 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -88,7 +88,7 @@ static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } -static DWORD +DWORD GetErrorCodeFromCrCode(const IN CONFIGRET cr) { switch (cr) diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index 63c391867bb..fb758142645 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -298,6 +298,9 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, U /* devinst.c */ +DWORD +GetErrorCodeFromCrCode(const IN CONFIGRET cr); + BOOL CreateDeviceInfo( IN struct DeviceInfoSet *list,

3 years, 8 months

[reactos] 01/01: [SHELL32] Auto-completion on Properties for Shortcut (#3574)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ade54133625e0a002cd34… commit ade54133625e0a002cd34d4bc2df4eb5bec29b40 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 2 17:04:43 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 2 17:04:43 2021 +0900 [SHELL32] Auto-completion on Properties for Shortcut (#3574) Enable auto-completion on "Properties for Shortcut files". CORE-9281 --- dll/win32/shell32/CShellLink.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 2800510990a..7da9b8cf916 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -6,7 +6,7 @@ * Copyright 2009 Andrew Hill * Copyright 2013 Dominik Hornung * Copyright 2017 Hermes Belusca-Maito - * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2018-2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2887,6 +2887,10 @@ BOOL CShellLink::OnInitDialog(HWND hwndDlg, HWND hwndFocus, LPARAM lParam) if (m_sDescription) SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_COMMENT_EDIT, m_sDescription); + /* auto-completion */ + SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_TARGET_TEXT), SHACF_DEFAULT); + SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_START_IN_EDIT), SHACF_DEFAULT); + m_bInInit = FALSE; return TRUE;

3 years, 8 months

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 April 2021