Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[cwittich] 31089: -UniqueProcessId is ULONG_PTR not ULONG -some formatting fixes

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 21:42:10 2007 New Revision: 31089 URL: http://svn.reactos.org/svn/reactos?rev=31089&view=rev Log: -UniqueProcessId is ULONG_PTR not ULONG -some formatting fixes Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=31… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Dec 8 21:42:10 2007 @@ -120,11 +120,11 @@ /* Set return length */ Length = sizeof(PROCESS_BASIC_INFORMATION); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH_TRY { @@ -132,7 +132,7 @@ ProcessBasicInfo->ExitStatus = Process->ExitStatus; ProcessBasicInfo->PebBaseAddress = Process->Peb; ProcessBasicInfo->AffinityMask = Process->Pcb.Affinity; - ProcessBasicInfo->UniqueProcessId = (ULONG)Process-> + ProcessBasicInfo->UniqueProcessId = (ULONG_PTR)Process-> UniqueProcessId; ProcessBasicInfo->InheritedFromUniqueProcessId = (ULONG)Process->InheritedFromUniqueProcessId; @@ -151,12 +151,12 @@ case ProcessQuotaLimits: case ProcessIoCounters: - Length = sizeof(IO_COUNTERS); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + Length = sizeof(IO_COUNTERS); + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } Status = STATUS_NOT_IMPLEMENTED; break; @@ -167,11 +167,11 @@ /* Set the return length */ Length = sizeof(KERNEL_USER_TIMES); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect writes with SEH */ _SEH_TRY @@ -225,11 +225,11 @@ /* Set the return length*/ Length = sizeof(ULONG); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Count the number of handles this process has */ HandleCount = ObpGetHandleCountByHandleTable(Process->ObjectTable); @@ -279,11 +279,11 @@ /* Set the return length */ Length = sizeof(VM_COUNTERS); - if ( ProcessInformationLength != Length ) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } + if ( ProcessInformationLength != Length ) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Enter SEH for write safety */ _SEH_TRY

16 years, 9 months

[jimtabor] 31088: Louis Lenders : gdi32: Add check for null pointer in SetDIBitsToDevice.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 8 21:32:22 2007 New Revision: 31088 URL: http://svn.reactos.org/svn/reactos?rev=31088&view=rev Log: Louis Lenders : gdi32: Add check for null pointer in SetDIBitsToDevice. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sat Dec 8 21:32:22 2007 @@ -342,6 +342,8 @@ INT DIBWidth; SIZEL SourceSize; XLATEOBJ *XlateObj = NULL; + + if (!Bits) return 0; pDC = DC_LockDc(hDC); if (!pDC)

16 years, 9 months

[cwittich] 31087: Dmitry Timoshkov : Windows doesn' t send the initialization messages to a dialog if a passed in dlgProc is NULL . <dmitry at codeweavers.com>

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 21:11:28 2007 New Revision: 31087 URL: http://svn.reactos.org/svn/reactos?rev=31087&view=rev Log: Dmitry Timoshkov : Windows doesn' t send the initialization messages to a dialog if a passed in dlgProc is NULL . <dmitry at codeweavers.com> Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Sat Dec 8 21:11:28 2007 @@ -798,7 +798,7 @@ if (unicode) SetWindowLongPtrW( hwnd, DWLP_DLGPROC, (ULONG_PTR)dlgProc ); else SetWindowLongPtrA( hwnd, DWLP_DLGPROC, (ULONG_PTR)dlgProc ); - if (dlgInfo->hUserFont) + if (dlgProc && dlgInfo->hUserFont) SendMessageW( hwnd, WM_SETFONT, (WPARAM)dlgInfo->hUserFont, 0 ); /* Create controls */ @@ -806,16 +806,17 @@ if (DIALOG_CreateControls32( hwnd, dlgTemplate, &template, hInst, unicode )) { /* Send initialisation messages and set focus */ - - if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && - ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) - { - /* By returning TRUE, app has requested a default focus assignment */ - dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); - if( dlgInfo->hwndFocus ) - SetFocus( dlgInfo->hwndFocus ); - } - + if (dlgProc) + { + if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && + ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) + { + /* By returning TRUE, app has requested a default focus assignment */ + dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); + if( dlgInfo->hwndFocus ) + SetFocus( dlgInfo->hwndFocus ); + } + } if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) SendMessageW( hwnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, 0), 0);

16 years, 9 months

[cwittich] 31086: use REFGUID instead of UUID* to be compatible with MS PSDK

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 20:37:25 2007 New Revision: 31086 URL: http://svn.reactos.org/svn/reactos?rev=31086&view=rev Log: use REFGUID instead of UUID* to be compatible with MS PSDK Modified: trunk/reactos/base/setup/usetup/interface/devinst.c Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/devinst.c (original) +++ trunk/reactos/base/setup/usetup/interface/devinst.c Sat Dec 8 20:37:25 2007 @@ -365,7 +365,7 @@ /* Process the pnp event */ DPRINT("Received PnP Event\n"); - if (IsEqualIID(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL)) + if (IsEqualIID(&PnpEvent->EventGuid, (REFGUID)&GUID_DEVICE_ARRIVAL)) { DPRINT1("Device arrival event: %S\n", PnpEvent->TargetDevice.DeviceIds); InstallDevice(hInf, hEnum, hServices, PnpEvent->TargetDevice.DeviceIds);

16 years, 9 months

[cwittich] 31085: revert 31080 and apply the patch from Francois Gouget to delete_registry_key (Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes.)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 19:48:36 2007 New Revision: 31085 URL: http://svn.reactos.org/svn/reactos?rev=31085&view=rev Log: revert 31080 and apply the patch from Francois Gouget to delete_registry_key (Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes.) Modified: trunk/reactos/base/applications/regedit/regproc.c Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sat Dec 8 19:48:36 2007 @@ -362,45 +362,6 @@ } } str[val_idx] = '\0'; -} - -/****************************************************************************** - * Parses HKEY_SOME_ROOT\some\key\path to get the root key handle and - * extract the key path (what comes after the first '\'). - */ -static BOOL parseKeyName(LPSTR lpKeyName, HKEY *hKey, LPSTR *lpKeyPath) -{ - LPSTR lpSlash; - unsigned int i, len; - - if (lpKeyName == NULL) - return FALSE; - - lpSlash = strchr(lpKeyName, '\\'); - if (lpSlash) - { - len = lpSlash-lpKeyName; - } - else - { - len = strlen(lpKeyName); - lpSlash = lpKeyName+len; - } - *hKey = NULL; - for (i = 0; i < REG_CLASS_NUMBER; i++) { - if (strncmp(lpKeyName, reg_class_names[i], len) == 0 && - len == strlen(reg_class_names[i])) { - *hKey = reg_class_keys[i]; - break; - } - } - if (*hKey == NULL) - return FALSE; - - if (*lpSlash != '\0') - lpSlash++; - *lpKeyPath = lpSlash; - return TRUE; } /****************************************************************************** @@ -1457,7 +1418,53 @@ } /****************************************************************************** - + * Recursive function which removes the registry key with all subkeys. + */ +static void delete_branch(HKEY key, + CHAR **reg_key_name_buf, DWORD *reg_key_name_len) +{ + HKEY branch_key; + DWORD max_sub_key_len; + DWORD subkeys; + DWORD curr_len; + LONG ret; + long int i; + + if (RegOpenKeyA(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { + REGPROC_print_error(); + } + + /* get size information and resize the buffers if necessary */ + if (RegQueryInfoKey(branch_key, NULL, NULL, NULL, + &subkeys, &max_sub_key_len, + NULL, NULL, NULL, NULL, NULL, NULL + ) != ERROR_SUCCESS) { + REGPROC_print_error(); + } + curr_len = (DWORD) strlen(*reg_key_name_buf); + REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, + max_sub_key_len + curr_len + 1); + + (*reg_key_name_buf)[curr_len] = '\\'; + for (i = subkeys - 1; i >= 0; i--) { + DWORD buf_len = *reg_key_name_len - curr_len; + + ret = RegEnumKeyExA(branch_key, i, *reg_key_name_buf + curr_len + 1, + &buf_len, NULL, NULL, NULL, NULL); + if (ret != ERROR_SUCCESS && + ret != ERROR_MORE_DATA && + ret != ERROR_NO_MORE_ITEMS) { + REGPROC_print_error(); + } else { + delete_branch(key, reg_key_name_buf, reg_key_name_len); + } + } + (*reg_key_name_buf)[curr_len] = '\0'; + RegCloseKey(branch_key); + RegDeleteKeyA(key, *reg_key_name_buf); +} + +/****************************************************************************** * Removes the registry key with all subkeys. Parses full key name. * * Parameters: @@ -1466,24 +1473,33 @@ */ void delete_registry_key(CHAR *reg_key_name) { - CHAR *key_name; - HKEY key_class; + CHAR *branch_name; + DWORD branch_name_len; + HKEY reg_key_class; + HKEY branch_key; if (!reg_key_name || !reg_key_name[0]) return; - - if (!parseKeyName(reg_key_name, &key_class, &key_name)) { + /* open the specified key */ + if (!getRegClass(reg_key_name, &reg_key_class)) { fprintf(stderr,"%s: Incorrect registry class specification in '%s'\n", getAppName(), reg_key_name); exit(1); } - if (!*key_name) { + branch_name = getRegKeyName(reg_key_name); + CHECK_ENOUGH_MEMORY(branch_name); + branch_name_len = (DWORD) strlen(branch_name); + if (!branch_name[0]) { fprintf(stderr,"%s: Can't delete registry class '%s'\n", getAppName(), reg_key_name); exit(1); } - - RegDeleteTreeA(key_class, key_name); + if (RegOpenKeyA(reg_key_class, branch_name, &branch_key) == ERROR_SUCCESS) { + /* check whether the key exists */ + RegCloseKey(branch_key); + delete_branch(reg_key_class, &branch_name, &branch_name_len); + } + HeapFree(GetProcessHeap(), 0, branch_name); } /******************************************************************************

16 years, 9 months

[cwittich] 31084: Michael Stefaniuc : kernel32: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call. <mstefani at redhat.de>

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 19:33:05 2007 New Revision: 31084 URL: http://svn.reactos.org/svn/reactos?rev=31084&view=rev Log: Michael Stefaniuc : kernel32: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call. <mstefani at redhat.de> Modified: trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c Modified: trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lz… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lzexpand_main.c Sat Dec 8 19:33:05 2007 @@ -168,10 +168,9 @@ } for (i = 0; i < MAX_LZSTATES; i++) if (!lzstates[i]) break; if (i == MAX_LZSTATES) return LZERROR_GLOBALLOC; - lzstates[i] = lzs = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(struct lzstate) ); + lzstates[i] = lzs = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct lzstate) ); if(lzs == NULL) return LZERROR_GLOBALLOC; - memset(lzs,'\0',sizeof(*lzs)); lzs->realfd = hfSrc; lzs->lastchar = head.lastchar; lzs->reallength = head.reallength;

16 years, 9 months

[cwittich] 31083: move GetTextExtentExPointI and GetTextExtentPointI from stubs.c to text.c

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 19:26:40 2007 New Revision: 31083 URL: http://svn.reactos.org/svn/reactos?rev=31083&view=rev Log: move GetTextExtentExPointI and GetTextExtentPointI from stubs.c to text.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Dec 8 19:26:40 2007 @@ -1568,39 +1568,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } - -/* - * @implemented - */ -BOOL -STDCALL -GetTextExtentExPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize) -{ - return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); -} - -/* - * @implemented - */ -BOOL -STDCALL -GetTextExtentPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - LPSIZE lpSize) -{ - return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); -} - - - - /* * @unimplemented Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Sat Dec 8 19:26:40 2007 @@ -274,6 +274,34 @@ return NtGdiGetTextExtentPoint32(hdc, lpString, cbString, lpSize); } +/* + * @implemented + */ +BOOL +STDCALL +GetTextExtentExPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + int nMaxExtent, + LPINT lpnFit, + LPINT alpDx, + LPSIZE lpSize) +{ + return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); +} + +/* + * @implemented + */ +BOOL +STDCALL +GetTextExtentPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + LPSIZE lpSize) +{ + return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); +} /* * @implemented

16 years, 9 months

[cwittich] 31082: Francois Gouget : Make the dword and binary data parsing both more flexible and stricter. <fgouget at codeweavers.com> Jason Edmeades : Fix importing of .reg hex. <jason.edmeades at googlemail.com>

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 18:17:39 2007 New Revision: 31082 URL: http://svn.reactos.org/svn/reactos?rev=31082&view=rev Log: Francois Gouget : Make the dword and binary data parsing both more flexible and stricter. <fgouget at codeweavers.com> Jason Edmeades : Fix importing of .reg hex. <jason.edmeades at googlemail.com> Modified: trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/regproc.h Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sat Dec 8 18:17:39 2007 @@ -157,16 +157,14 @@ /****************************************************************************** * Converts a hex representation of a DWORD into a DWORD. */ -DWORD convertHexToDWord(char *str, BYTE *buf) -{ - DWORD dw; - char xbuf[9]; - - memcpy(xbuf,str,8); - xbuf[8]='\0'; - sscanf(xbuf,"%08lx",&dw); - memcpy(buf,&dw,sizeof(DWORD)); - return sizeof(DWORD); +static BOOL convertHexToDWord(char* str, DWORD *dw) +{ + char dummy; + if (strlen(str) > 8 || sscanf(str, "%lx%c", dw, &dummy) != 1) { + fprintf(stderr,"%s: ERROR, invalid hex value\n", getAppName()); + return FALSE; + } + return TRUE; } /****************************************************************************** @@ -219,46 +217,45 @@ } /****************************************************************************** - * Converts a hex comma separated values list into a hex list. - * The Hex input string must be in exactly the correct form. - */ -DWORD convertHexCSVToHex(char *str, BYTE *buf, ULONG bufLen) -{ - char *s = str; /* Pointer to current */ - char *b = (char*) buf; /* Pointer to result */ - - size_t strLen = strlen(str); - size_t strPos = 0; - DWORD byteCount = 0; - - memset(buf, 0, bufLen); - - /* - * warn the user if we are here with a string longer than 2 bytes that does - * not contains ",". It is more likely because the data is invalid. - */ - if ( ( strLen > 2) && ( strchr(str, ',') == NULL) ) - fprintf(stderr,"%s: WARNING converting CSV hex stream with no comma, " - "input data seems invalid.\n", getAppName()); - if (strLen > 3*bufLen) - fprintf(stderr,"%s: ERROR converting CSV hex stream. Too long\n", - getAppName()); - - while (strPos < strLen) { - char xbuf[3]; +* Converts a hex comma separated values list into a binary string. + */ +static BYTE* convertHexCSVToHex(char *str, DWORD *size) +{ + char *s; + BYTE *d, *data; + + /* The worst case is 1 digit + 1 comma per byte */ + *size=(strlen(str)+1)/2; + data=HeapAlloc(GetProcessHeap(), 0, *size); + CHECK_ENOUGH_MEMORY(data); + + s = str; + d = data; + *size=0; + while (*s != '\0') { UINT wc; - - memcpy(xbuf,s,2); xbuf[2]='\0'; - sscanf(xbuf,"%02x",&wc); - if (byteCount < bufLen) - *b++ =(unsigned char)wc; - - s+=3; - strPos+=3; - byteCount++; - } - - return byteCount; + char dummy; + + if (s[1] != ',' && s[1] != '\0' && s[2] != ',' && s[2] != '\0') { + fprintf(stderr,"%s: ERROR converting CSV hex stream. Invalid sequence at '%s'\n", + getAppName(), s); + HeapFree(GetProcessHeap(), 0, data); + return NULL; + } + if (sscanf(s, "%x%c", &wc, &dummy) < 1 || dummy != ',') { + fprintf(stderr,"%s: ERROR converting CSV hex stream. Invalid value at '%s'\n", + getAppName(), s); + HeapFree(GetProcessHeap(), 0, data); + return NULL; + } + *d++ =(BYTE)wc; + (*size)++; + /* Skip one or two digits and any comma */ + while (*s && *s!=',') s++; + if (*s) s++; + } + + return data; } /****************************************************************************** @@ -417,11 +414,9 @@ LONG setValue(LPSTR val_name, LPSTR val_data) { LONG res; - DWORD dwDataType, dwParseType = REG_BINARY; + DWORD dwDataType, dwParseType; LPBYTE lpbData; - BYTE convert[KEY_MAX_LEN]; - BYTE *bBigBuffer = 0; - DWORD dwLen; + DWORD dwData, dwLen; if ( (val_name == NULL) || (val_data == NULL) ) return ERROR_INVALID_PARAMETER; @@ -449,21 +444,16 @@ } else if (dwParseType == REG_DWORD) /* Convert the dword types */ { - dwLen = convertHexToDWord(val_data, convert); - lpbData = convert; + if (!convertHexToDWord(val_data, &dwData)) + return ERROR_INVALID_DATA; + lpbData = (BYTE*)&dwData; + dwLen = sizeof(dwData); } else if (dwParseType == REG_BINARY) /* Convert the binary data */ { - size_t b_len = strlen (val_data)+2/3; - if (b_len > KEY_MAX_LEN) { - bBigBuffer = HeapAlloc (GetProcessHeap(), 0, b_len); - CHECK_ENOUGH_MEMORY(bBigBuffer); - dwLen = convertHexCSVToHex(val_data, bBigBuffer, (ULONG) b_len); - lpbData = bBigBuffer; - } else { - dwLen = convertHexCSVToHex(val_data, convert, KEY_MAX_LEN); - lpbData = convert; - } + lpbData = convertHexCSVToHex(val_data, &dwLen); + if (!lpbData) + return ERROR_INVALID_DATA; } else /* unknown format */ { @@ -479,8 +469,8 @@ lpbData, dwLen); - if (bBigBuffer) - HeapFree (GetProcessHeap(), 0, bBigBuffer); + if (dwParseType == REG_BINARY) + HeapFree(GetProcessHeap(), 0, lpbData); return res; } Modified: trunk/reactos/base/applications/regedit/regproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.h (original) +++ trunk/reactos/base/applications/regedit/regproc.h Sat Dec 8 18:17:39 2007 @@ -52,8 +52,6 @@ */ char* getToken(char** str, const char* delims); void get_file_name(CHAR **command_line, CHAR *filename); -DWORD convertHexToDWord(char *str, BYTE *buf); -DWORD convertHexCSVToHex(char *str, BYTE *buf, ULONG bufLen); LPSTR convertHexToHexCSV( BYTE *buf, ULONG len); LPSTR convertHexToDWORDStr( BYTE *buf, ULONG len); LPSTR getRegKeyName(LPSTR lpLine);

16 years, 9 months

[cwittich] 31081: Francois Gouget : Add missing '\n' to an error message. <fgouget at codeweavers.com> Francois Gouget : Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes. Francois Gouget : Having garbage after the dash in '"foo"=-' is not valid. Francois Gouget : The registry functions return standard error codes, not HRESULTs. Francois Gouget : If the data for a given value is in an unknown format, then print an error and don't modify the value.

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 17:29:51 2007 New Revision: 31081 URL: http://svn.reactos.org/svn/reactos?rev=31081&view=rev Log: Francois Gouget : Add missing '\n' to an error message. <fgouget at codeweavers.com> Francois Gouget : Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes. Francois Gouget : Having garbage after the dash in '"foo"=-' is not valid. Francois Gouget : The registry functions return standard error codes, not HRESULTs. Francois Gouget : If the data for a given value is in an unknown format, then print an error and don't modify the value. Modified: trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/regproc.h Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sat Dec 8 17:29:51 2007 @@ -61,7 +61,7 @@ #define CHECK_ENOUGH_MEMORY(p) \ if (!(p)) \ { \ - fprintf(stderr,"%s: file %s, line %d: Not enough memory", \ + fprintf(stderr,"%s: file %s, line %d: Not enough memory\n", \ getAppName(), __FILE__, __LINE__); \ exit(NOT_ENOUGH_MEMORY); \ } @@ -305,7 +305,8 @@ } return type; } - return (**lpValue=='\0'?REG_SZ:REG_NONE); + *parse_type=REG_NONE; + return REG_NONE; } /****************************************************************************** @@ -413,9 +414,9 @@ * val_name - name of the registry value * val_data - registry value data */ -HRESULT setValue(LPSTR val_name, LPSTR val_data) -{ - HRESULT hRes; +LONG setValue(LPSTR val_name, LPSTR val_data) +{ + LONG res; DWORD dwDataType, dwParseType = REG_BINARY; LPBYTE lpbData; BYTE convert[KEY_MAX_LEN]; @@ -425,10 +426,16 @@ if ( (val_name == NULL) || (val_data == NULL) ) return ERROR_INVALID_PARAMETER; + if (strcmp(val_data, "-") == 0) + { + res=RegDeleteValueA(currentKeyHandle,val_name); + return (res == ERROR_FILE_NOT_FOUND ? ERROR_SUCCESS : res); + } + /* Get the data type stored into the value field */ dwDataType = getDataType(&val_data, &dwParseType); - if ( dwParseType == REG_SZ) /* no conversion for string */ + if (dwParseType == REG_SZ) /* no conversion for string */ { dwLen = (DWORD) strlen(val_data); if (dwLen>0 && val_data[dwLen-1]=='"') @@ -439,11 +446,13 @@ dwLen++; REGPROC_unescape_string(val_data); lpbData = (LPBYTE)val_data; - } else if (dwParseType == REG_DWORD) /* Convert the dword types */ + } + else if (dwParseType == REG_DWORD) /* Convert the dword types */ { dwLen = convertHexToDWord(val_data, convert); lpbData = convert; - } else /* Convert the hexadecimal types */ + } + else if (dwParseType == REG_BINARY) /* Convert the binary data */ { size_t b_len = strlen (val_data)+2/3; if (b_len > KEY_MAX_LEN) { @@ -456,8 +465,13 @@ lpbData = convert; } } - - hRes = RegSetValueExA( + else /* unknown format */ + { + fprintf(stderr,"%s: ERROR, unknown data format\n", getAppName()); + return ERROR_INVALID_DATA; + } + + res = RegSetValueExA( currentKeyHandle, val_name, 0, /* Reserved */ @@ -467,33 +481,32 @@ if (bBigBuffer) HeapFree (GetProcessHeap(), 0, bBigBuffer); - return hRes; + return res; } /****************************************************************************** * Open the key */ -HRESULT openKey( LPSTR stdInput) -{ - DWORD dwDisp; - HRESULT hRes; +LONG openKey( LPSTR stdInput) +{ + DWORD dwDisp; + LONG res; /* Sanity checks */ if (stdInput == NULL) return ERROR_INVALID_PARAMETER; /* Get the registry class */ - currentKeyClass = getRegClass(stdInput); /* Sets global variable */ - if (currentKeyClass == (HKEY)ERROR_INVALID_PARAMETER) - return (HRESULT)ERROR_INVALID_PARAMETER; + if (!getRegClass(stdInput, &currentKeyClass)) /* Sets global variable */ + return ERROR_INVALID_PARAMETER; /* Get the key name */ currentKeyName = getRegKeyName(stdInput); /* Sets global variable */ if (currentKeyName == NULL) return ERROR_INVALID_PARAMETER; - hRes = RegCreateKeyExA( + res = RegCreateKeyExA( currentKeyClass, /* Class */ currentKeyName, /* Sub Key */ 0, /* MUST BE 0 */ @@ -505,10 +518,10 @@ &dwDisp); /* disposition, REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY */ - if (hRes == ERROR_SUCCESS) + if (res == ERROR_SUCCESS) bTheKeyIsOpen = TRUE; - return hRes; + return res; } @@ -548,7 +561,7 @@ * Extracts from [HKEY\some\key\path] or HKEY\some\key\path types of line * the key class (what ends before the first '\') */ -HKEY getRegClass(LPSTR lpClass) +BOOL getRegClass(LPSTR lpClass, HKEY* hkey) { LPSTR classNameEnd; LPSTR classNameBeg; @@ -557,7 +570,7 @@ char lpClassCopy[KEY_MAX_LEN]; if (lpClass == NULL) - return (HKEY)ERROR_INVALID_PARAMETER; + return FALSE; lstrcpynA(lpClassCopy, lpClass, KEY_MAX_LEN); @@ -579,10 +592,11 @@ for (i = 0; i < REG_CLASS_NUMBER; i++) { if (!strcmp(classNameBeg, reg_class_names[i])) { - return reg_class_keys[i]; - } - } - return (HKEY)ERROR_INVALID_PARAMETER; + *hkey = reg_class_keys[i]; + return TRUE; + } + } + return FALSE; } /****************************************************************************** @@ -724,7 +738,7 @@ LPSTR val_data; /* registry value data */ int line_idx = 0; /* current character under analysis */ - HRESULT hRes = 0; + LONG res; /* get value name */ if (line[line_idx] == '@' && line[line_idx + 1] == '=') { @@ -767,8 +781,8 @@ val_data = line + line_idx; REGPROC_unescape_string(val_name); - hRes = setValue(val_name, val_data); - if ( hRes != ERROR_SUCCESS ) + res = setValue(val_name, val_data); + if ( res != ERROR_SUCCESS ) fprintf(stderr,"%s: ERROR Key %s not created. Value: %s, Data: %s\n", getAppName(), currentKeyName, @@ -1372,8 +1386,7 @@ strcpy(reg_key_name_buf, reg_key_name); /* open the specified key */ - reg_key_class = getRegClass(reg_key_name); - if (reg_key_class == (HKEY)ERROR_INVALID_PARAMETER) { + if (!getRegClass(reg_key_name, &reg_key_class)) { fprintf(stderr,"%s: Incorrect registry class specification in '%s'\n", getAppName(), reg_key_name); exit(1); Modified: trunk/reactos/base/applications/regedit/regproc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.h (original) +++ trunk/reactos/base/applications/regedit/regproc.h Sat Dec 8 17:29:51 2007 @@ -57,7 +57,7 @@ LPSTR convertHexToHexCSV( BYTE *buf, ULONG len); LPSTR convertHexToDWORDStr( BYTE *buf, ULONG len); LPSTR getRegKeyName(LPSTR lpLine); -HKEY getRegClass(LPSTR lpLine); +BOOL getRegClass(LPSTR lpLine, HKEY* hkey); DWORD getDataType(LPSTR *lpValue, DWORD* parse_type); LPSTR getArg(LPSTR arg); HRESULT openKey(LPSTR stdInput);

16 years, 9 months

[cwittich] 31080: Stefan Leichter : Replace call to delete_branch with RegDeleteTreeA. <Stefan.Leichter at camline.com>

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Dec 8 17:05:00 2007 New Revision: 31080 URL: http://svn.reactos.org/svn/reactos?rev=31080&view=rev Log: Stefan Leichter : Replace call to delete_branch with RegDeleteTreeA. <Stefan.Leichter at camline.com> Modified: trunk/reactos/base/applications/regedit/regproc.c Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sat Dec 8 17:05:00 2007 @@ -364,6 +364,45 @@ } } str[val_idx] = '\0'; +} + +/****************************************************************************** + * Parses HKEY_SOME_ROOT\some\key\path to get the root key handle and + * extract the key path (what comes after the first '\'). + */ +static BOOL parseKeyName(LPSTR lpKeyName, HKEY *hKey, LPSTR *lpKeyPath) +{ + LPSTR lpSlash; + unsigned int i, len; + + if (lpKeyName == NULL) + return FALSE; + + lpSlash = strchr(lpKeyName, '\\'); + if (lpSlash) + { + len = lpSlash-lpKeyName; + } + else + { + len = strlen(lpKeyName); + lpSlash = lpKeyName+len; + } + *hKey = NULL; + for (i = 0; i < REG_CLASS_NUMBER; i++) { + if (strncmp(lpKeyName, reg_class_names[i], len) == 0 && + len == strlen(reg_class_names[i])) { + *hKey = reg_class_keys[i]; + break; + } + } + if (*hKey == NULL) + return FALSE; + + if (*lpSlash != '\0') + lpSlash++; + *lpKeyPath = lpSlash; + return TRUE; } /****************************************************************************** @@ -1415,53 +1454,7 @@ } /****************************************************************************** - * Recursive function which removes the registry key with all subkeys. - */ -static void delete_branch(HKEY key, - CHAR **reg_key_name_buf, DWORD *reg_key_name_len) -{ - HKEY branch_key; - DWORD max_sub_key_len; - DWORD subkeys; - DWORD curr_len; - LONG ret; - long int i; - - if (RegOpenKeyA(key, *reg_key_name_buf, &branch_key) != ERROR_SUCCESS) { - REGPROC_print_error(); - } - - /* get size information and resize the buffers if necessary */ - if (RegQueryInfoKey(branch_key, NULL, NULL, NULL, - &subkeys, &max_sub_key_len, - NULL, NULL, NULL, NULL, NULL, NULL - ) != ERROR_SUCCESS) { - REGPROC_print_error(); - } - curr_len = (DWORD) strlen(*reg_key_name_buf); - REGPROC_resize_char_buffer(reg_key_name_buf, reg_key_name_len, - max_sub_key_len + curr_len + 1); - - (*reg_key_name_buf)[curr_len] = '\\'; - for (i = subkeys - 1; i >= 0; i--) { - DWORD buf_len = *reg_key_name_len - curr_len; - - ret = RegEnumKeyExA(branch_key, i, *reg_key_name_buf + curr_len + 1, - &buf_len, NULL, NULL, NULL, NULL); - if (ret != ERROR_SUCCESS && - ret != ERROR_MORE_DATA && - ret != ERROR_NO_MORE_ITEMS) { - REGPROC_print_error(); - } else { - delete_branch(key, reg_key_name_buf, reg_key_name_len); - } - } - (*reg_key_name_buf)[curr_len] = '\0'; - RegCloseKey(branch_key); - RegDeleteKeyA(key, *reg_key_name_buf); -} - -/****************************************************************************** + * Removes the registry key with all subkeys. Parses full key name. * * Parameters: @@ -1470,34 +1463,24 @@ */ void delete_registry_key(CHAR *reg_key_name) { - CHAR *branch_name; - DWORD branch_name_len; - HKEY reg_key_class; - HKEY branch_key; + CHAR *key_name; + HKEY key_class; if (!reg_key_name || !reg_key_name[0]) return; - /* open the specified key */ - reg_key_class = getRegClass(reg_key_name); - if (reg_key_class == (HKEY)ERROR_INVALID_PARAMETER) { + + if (!parseKeyName(reg_key_name, &key_class, &key_name)) { fprintf(stderr,"%s: Incorrect registry class specification in '%s'\n", getAppName(), reg_key_name); exit(1); } - branch_name = getRegKeyName(reg_key_name); - CHECK_ENOUGH_MEMORY(branch_name); - branch_name_len = (DWORD) strlen(branch_name); - if (!branch_name[0]) { + if (!*key_name) { fprintf(stderr,"%s: Can't delete registry class '%s'\n", getAppName(), reg_key_name); exit(1); } - if (RegOpenKeyA(reg_key_class, branch_name, &branch_key) == ERROR_SUCCESS) { - /* check whether the key exists */ - RegCloseKey(branch_key); - delete_branch(reg_key_class, &branch_name, &branch_name_len); - } - HeapFree(GetProcessHeap(), 0, branch_name); + + RegDeleteTreeA(key_class, key_name); } /******************************************************************************

16 years, 9 months

← Newer
1
...
42
43
44
45
46
47
48
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007