Module: wine Branch: master Commit: 1a54a89b8bc4ce4d3cb09bae846f8ac5903f552d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a54a89b8bc4ce4d3cb09bae84...
Author: Lei Zhang thestig@google.com Date: Thu Mar 1 15:47:14 2007 -0800
regedit: Removed dead code from regproc.c.
---
programs/regedit/regproc.c | 221 +------------------------------------------- programs/regedit/regproc.h | 8 -- 2 files changed, 1 insertions(+), 228 deletions(-)
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2cd187b..fe6fa8a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -30,14 +30,11 @@
#define REG_VAL_BUF_SIZE 4096
-/* Delimiters used to parse the "value" to query queryValue*/ -#define QUERY_VALUE_MAX_ARGS 1 - /* maximal number of characters in hexadecimal data line, not including '' character */ #define REG_FILE_HEX_LINE_LEN 76
-/* Globals used by the api setValue, queryValue */ +/* Globals used by the api setValue */ static LPSTR currentKeyName = NULL; static HKEY currentKeyClass = 0; static HKEY currentKeyHandle = 0; @@ -176,55 +173,6 @@ DWORD convertHexToDWord(char *str, BYTE *buf) }
/****************************************************************************** - * Converts a hex buffer into a hex comma separated values - */ -char* convertHexToHexCSV(BYTE *buf, ULONG bufLen) -{ - char* str; - char* ptrStr; - BYTE* ptrBuf; - - ULONG current = 0; - - str = HeapAlloc(GetProcessHeap(), 0, (bufLen+1)*2); - memset(str, 0, (bufLen+1)*2); - ptrStr = str; /* Pointer to result */ - ptrBuf = buf; /* Pointer to current */ - - while (current < bufLen) { - BYTE bCur = ptrBuf[current++]; - char res[3]; - - sprintf(res, "%02x", (unsigned int)*&bCur); - strcat(str, res); - strcat(str, ","); - } - - /* Get rid of the last comma */ - str[strlen(str)-1] = '\0'; - return str; -} - -/****************************************************************************** - * Converts a hex buffer into a DWORD string - */ -char* convertHexToDWORDStr(BYTE *buf, ULONG bufLen) -{ - char* str; - DWORD dw; - - if ( bufLen != sizeof(DWORD) ) return NULL; - - str = HeapAlloc(GetProcessHeap(), 0, (bufLen*2)+1); - - memcpy(&dw,buf,sizeof(DWORD)); - sprintf(str, "%08x", dw); - - /* Get rid of the last comma */ - return str; -} - -/****************************************************************************** * Converts a hex comma separated values list into a hex list. * The Hex input string must be in exactly the correct form. */ @@ -612,44 +560,6 @@ void doSetValue(LPSTR stdInput) }
/****************************************************************************** - * This function is the main entry point to the queryValue type of action. It - * receives the currently read line and dispatch the work depending on the - * context. - */ -void doQueryValue(LPSTR stdInput) -{ - /* - * We encountered the end of the file, make sure we - * close the opened key and exit - */ - if (stdInput == NULL) { - if (bTheKeyIsOpen != FALSE) - closeKey(); - - return; - } - - if ( stdInput[0] == '[') /* We are reading a new key */ - { - if ( bTheKeyIsOpen != FALSE ) - closeKey(); /* Close the previous key before */ - - if ( openKey(stdInput) != ERROR_SUCCESS ) - fprintf(stderr,"%s: queryValue failed to open key %s\n", - getAppName(), stdInput); - } else if( ( bTheKeyIsOpen ) && - (( stdInput[0] == '@') || /* reading a default @=data pair */ - ( stdInput[0] == '"'))) /* reading a new value=data pair */ - { - processQueryValue(stdInput); - } else /* since we are assuming that the */ - { /* file format is valid we must */ - if ( bTheKeyIsOpen ) /* be reading a blank line which */ - closeKey(); /* indicate end of this key processing */ - } -} - -/****************************************************************************** * This function is the main entry point to the deleteValue type of action. It * receives the currently read line and dispatch the work depending on the * context. @@ -741,135 +651,6 @@ void processSetValue(LPSTR line) }
/****************************************************************************** - * This function is a wrapper for the queryValue function. It prepares the - * land and clean the area once completed. - */ -void processQueryValue(LPSTR cmdline) -{ - fprintf(stderr,"ERROR!!! - temporary disabled"); - exit(1); -#if 0 - LPSTR argv[QUERY_VALUE_MAX_ARGS];/* args storage */ - LPSTR token = NULL; /* current token analyzed */ - ULONG argCounter = 0; /* counter of args */ - INT counter; - HRESULT hRes = 0; - LPSTR keyValue = NULL; - LPSTR lpsRes = NULL; - - /* - * Init storage and parse the line - */ - for (counter=0; counter<QUERY_VALUE_MAX_ARGS; counter++) - argv[counter]=NULL; - - while( (token = getToken(&cmdline, queryValueDelim[argCounter])) != NULL ) { - argv[argCounter++] = getArg(token); - - if (argCounter == QUERY_VALUE_MAX_ARGS) - break; /* Stop processing args no matter what */ - } - - /* The value we look for is the first token on the line */ - if ( argv[0] == NULL ) - return; /* SHOULD NOT HAPPEN */ - else - keyValue = argv[0]; - - if( (keyValue[0] == '@') && (strlen(keyValue) == 1) ) { - LONG lLen = KEY_MAX_LEN; - CHAR* lpsData=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,KEY_MAX_LEN); - /* - * We need to query the key default value - */ - hRes = RegQueryValue( - currentKeyHandle, - currentKeyName, - (LPBYTE)lpsData, - &lLen); - - if (hRes==ERROR_MORE_DATA) { - lpsData=HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,lpsData,lLen); - hRes = RegQueryValue(currentKeyHandle,currentKeyName,(LPBYTE)lpsData,&lLen); - } - - if (hRes == ERROR_SUCCESS) { - lpsRes = HeapAlloc( GetProcessHeap(), 0, lLen); - lstrcpynA(lpsRes, lpsData, lLen); - } - } else { - DWORD dwLen = KEY_MAX_LEN; - BYTE* lpbData=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,KEY_MAX_LEN); - DWORD dwType; - /* - * We need to query a specific value for the key - */ - hRes = RegQueryValueEx( - currentKeyHandle, - keyValue, - 0, - &dwType, - (LPBYTE)lpbData, - &dwLen); - - if (hRes==ERROR_MORE_DATA) { - lpbData=HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,lpbData,dwLen); - hRes = RegQueryValueEx(currentKeyHandle,keyValue,NULL,&dwType,(LPBYTE)lpbData,&dwLen); - } - - if (hRes == ERROR_SUCCESS) { - /* - * Convert the returned data to a displayable format - */ - switch ( dwType ) { - case REG_SZ: - case REG_EXPAND_SZ: { - lpsRes = HeapAlloc( GetProcessHeap(), 0, dwLen); - lstrcpynA(lpsRes, lpbData, dwLen); - break; - } - case REG_DWORD: { - lpsRes = convertHexToDWORDStr(lpbData, dwLen); - break; - } - default: { - lpsRes = convertHexToHexCSV(lpbData, dwLen); - break; - } - } - } - - HeapFree(GetProcessHeap(), 0, lpbData); - } - - - if ( hRes == ERROR_SUCCESS ) - fprintf(stderr, - "%s: Value "%s" = "%s" in key [%s]\n", - getAppName(), - keyValue, - lpsRes, - currentKeyName); - - else - fprintf(stderr,"%s: ERROR Value "%s" not found for key "%s".\n", - getAppName(), - keyValue, - currentKeyName); - - /* - * Do some cleanup - */ - for (counter=0; counter<argCounter; counter++) - if (argv[counter] != NULL) - HeapFree(GetProcessHeap(), 0, argv[counter]); - - if (lpsRes != NULL) - HeapFree(GetProcessHeap(), 0, lpsRes); -#endif -} - -/****************************************************************************** * Calls command for each line of a registry file. * Correctly processes comments (in # form), line continuation. * diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index f9ed71f..9a39951 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -32,7 +32,6 @@ void doSetValue(LPSTR lpsLine); void doDeleteValue(LPSTR lpsLine); void doCreateKey(LPSTR lpsLine); void doDeleteKey(LPSTR lpsLine); -void doQueryValue(LPSTR lpsLine); void doRegisterDLL(LPSTR lpsLine); void doUnregisterDLL(LPSTR lpsLine);
@@ -66,10 +65,3 @@ void closeKey(void); */ void processSetValue(LPSTR cmdline); HRESULT setValue(LPSTR val_name, LPSTR val_data); - -/* - * api queryValue prototypes - */ -void processQueryValue(LPSTR cmdline); - -extern BOOL ProcessCmdLine(LPSTR lpCmdLine);
-
Alexandre Julliard