wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

appdb/cron cleanup.php
by WineHQ 15 Jun '07

15 Jun '07

ChangeSet ID: 31198 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/14 23:10:00 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Re-enable screenshot purging to see how it works now that we've got the reported list Patch: http://cvs.winehq.org/patch.py?id=31198 Old revision New revision Changes Path 1.38 1.39 +5 -5 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.38 appdb/cron/cleanup.php:1.39 --- appdb/cron/cleanup.php:1.38 15 Jun 2007 4:10: 0 -0000 +++ appdb/cron/cleanup.php 15 Jun 2007 4:10: 0 -0000 @@ -315,10 +315,10 @@ function removeScreenshotsWithMissingFil mail_appdb($sEmail, $sSubject, $sMsg); // remove the screenshots with missing files -// foreach($aMissingScreenshotIds as $iScreenshotId) -// { -// $oScreenshot = new Screenshot($iScreenshotId); -// $oScreenshot->delete(); // delete the screenshot -// } + foreach($aMissingScreenshotIds as $iScreenshotId) + { + $oScreenshot = new Screenshot($iScreenshotId); + $oScreenshot->delete(); // delete the screenshot + } } ?>

1 0

Alexandre Julliard : git-notify: Add support for reading references from stdin to allow running as a post-receive hook .
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: tools Branch: master Commit: 6d9043361e57b699a496a96004cfc6511e7745d5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6d9043361e57b699a496a960… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 14 17:17:35 2007 +0200 git-notify: Add support for reading references from stdin to allow running as a post-receive hook. --- git-notify | 77 +++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 50 insertions(+), 27 deletions(-) diff --git a/git-notify b/git-notify index a2bf65d..df8d49e 100755 --- a/git-notify +++ b/git-notify @@ -28,6 +28,9 @@ use open ':utf8'; use Encode 'encode'; use Cwd 'realpath'; +binmode STDIN, ':utf8'; +binmode STDOUT, ':utf8'; + # some parameters you may want to change # base URL of the gitweb repository browser (can be set with the -u option) @@ -121,7 +124,7 @@ sub parse_options() elsif ($arg eq '-d') { $debug++; } else { usage(); } } - if ($#ARGV != 2) { usage(); } + if (@ARGV && $#ARGV != 2) { usage(); } } # send an email notification @@ -339,40 +342,60 @@ sub send_global_notice($$$) mail_notification($commitlist_address, "New commits on branch $ref", "text/plain; charset=UTF-8", @notice); } -$repos_name = get_repos_name(); -parse_options(); +# send all the notices +sub send_all_notices($$$) +{ + my ($ref, $old_sha1, $new_sha1) = @_; -# append repository path to URL -$gitweb_url .= "/$repos_name.git"; + $ref =~ s/^refs\/heads\///; -my $ref = $ARGV[0]; -$ref =~ s/^refs\/heads\///; + if ($old_sha1 eq '0' x 40) # new ref + { + send_commit_notice( $ref, $new_sha1 ) if $commitlist_address; + return; + } -if ($ARGV[1] eq '0' x 40) # new ref -{ - send_commit_notice( $ref, $ARGV[2] ); - exit 0; -} + my @commits = (); -my @commits = (); + open LIST, "-|" or exec "git", "rev-list", "^$old_sha1", "$new_sha1", @exclude_list or die "cannot exec git-rev-list"; + while (<LIST>) + { + chomp; + die "invalid commit $_" unless /^[0-9a-f]{40}$/; + unshift @commits, $_; + } + close LIST; -open LIST, "-|" or exec "git", "rev-list", "^$ARGV[1]", "$ARGV[2]", @exclude_list or die "cannot exec git-rev-list"; -while (<LIST>) -{ - chomp; - die "invalid commit $_" unless /^[0-9a-f]{40}$/; - unshift @commits, $_; + if (@commits > $max_individual_notices) + { + send_global_notice( $ref, $old_sha1, $new_sha1 ) if $commitlist_address; + return; + } + + foreach my $commit (@commits) + { + send_commit_notice( $ref, $commit ) if $commitlist_address; + send_cia_notice( $ref, $commit ) if $cia_project_name; + } } -close LIST; -if (@commits > $max_individual_notices) +$repos_name = get_repos_name(); +parse_options(); + +# append repository path to URL +$gitweb_url .= "/$repos_name.git"; + +if (@ARGV) { - send_global_notice( $ref, $ARGV[1], $ARGV[2] ); - exit 0; + send_all_notices( $ARGV[0], $ARGV[1], $ARGV[2] ); } - -foreach my $commit (@commits) +else # read them from stdin { - send_commit_notice( $ref, $commit ) if $commitlist_address; - send_cia_notice( $ref, $commit ) if $cia_project_name; + while (<>) + { + chomp; + if (/^([0-9a-f]{40}) ([0-9a-f]{40}) (.*)$/) { send_all_notices( $3, $1, $2 ); } + } } + +exit 0;

1 0

Alexandre Julliard : git-to-cvs: Allow pointing to the git directory with a .git symlink inside the CVS dir .
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: tools Branch: master Commit: 8955bb1c995565c2123f67f78205563591cc6648 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8955bb1c995565c2123f67f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 14 16:52:14 2007 +0200 git-to-cvs: Allow pointing to the git directory with a .git symlink inside the CVS dir. --- git-to-cvs | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/git-to-cvs b/git-to-cvs index 8d8ab43..246fee3 100755 --- a/git-to-cvs +++ b/git-to-cvs @@ -18,7 +18,7 @@ # branch: where to get the git commits from, default is 'master' # # This script needs to be run from the root of the checked-out CVS tree, -# with .git (or GIT_DIR) pointing to the git repository. +# with CVS/.git (or GIT_DIR) pointing to the git repository. # use Unicode::String qw(latin1 utf8); @@ -42,10 +42,6 @@ my %ignore_patterns = my $last_commit = $ARGV[0] || "LAST_CVS_COMMIT"; my $branch = $ARGV[1] || "master"; -my $git_dir = `git-rev-parse --git-dir`; -die "Cannot find git repository" if $?; -chomp $git_dir; --d "CVS" or die "Not in a CVS repository"; # run a shell command and die on error sub shell(@) @@ -385,9 +381,17 @@ sub read_tags() close LIST; } +# if we have a .git symlink in CVS/ use that as GIT_DIR +$ENV{"GIT_DIR"} = "CVS/.git" if -d "CVS/.git"; + # use a tmp index file to avoid touching the main one $ENV{"GIT_INDEX_FILE"} = "CVS/.git-index"; +# sanity checks +-d "CVS" or die "Not in a CVS repository"; +-d $ENV{"GIT_DIR"} or die "Invalid git dir $ENV{GIT_DIR}"; +-w "." or die "No write access to current directory"; + read_tags(); apply_commits();

1 0

Alexandre Julliard : git-to-cvs: Use git-for-each-ref to list tags in order to support packed refs.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: tools Branch: master Commit: e045280709c2c8f4ff5cd501721d4d59a4a5cb94 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e045280709c2c8f4ff5cd501… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 14 16:20:42 2007 +0200 git-to-cvs: Use git-for-each-ref to list tags in order to support packed refs. --- git-to-cvs | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/git-to-cvs b/git-to-cvs index bf587fc..8d8ab43 100755 --- a/git-to-cvs +++ b/git-to-cvs @@ -373,14 +373,16 @@ sub apply_commits() # build a list of all commits that are pointed to by a tag sub read_tags() { - opendir DIR, "$git_dir/refs/tags"; - foreach my $tag (grep /^wine/, readdir DIR ) + open LIST, "-|" or exec "git-for-each-ref", "refs/tags/wine*" or die "cannot run git-for-each-ref"; + while (<LIST>) { + next unless /^[0-9a-f]{40} tag\trefs\/tags\/(.*)$/; + my $tag = $1; my $commit = `git-rev-parse $tag^{commit}`; chomp $commit; $tags{$commit} = $tag; } - close DIR; + close LIST; } # use a tmp index file to avoid touching the main one

1 0

Alexander Nicolaysen Sørnes : wordpad: Use Unicode functions in more places.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: e41adf76be0f121428727374423cc46c3b16c656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41adf76be0f1214287273744… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 13 22:24:16 2007 +0200 wordpad: Use Unicode functions in more places. --- programs/wordpad/wordpad.c | 107 +++++++++++++++++++++++-------------------- 1 files changed, 57 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e41adf76be0f121428727…

1 0

Francois Gouget : regedit: Having garbage after the dash in '"foo"=-' is not valid.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 0dac54b3a7896cbc40095eff6bc074f6dc05eda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dac54b3a7896cbc40095eff6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 11:47:50 2007 +0200 regedit: Having garbage after the dash in '"foo"=-' is not valid. Don't complain if the value already does not exist. --- programs/regedit/regproc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0399efc..a973ad0 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -219,8 +219,11 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) if ( (val_name == NULL) || (val_data == NULL) ) return ERROR_INVALID_PARAMETER; - if (val_data[0] == '-') - return RegDeleteValue(currentKeyHandle,val_name); + if (strcmp(val_data, "-") == 0) + { + res=RegDeleteValue(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);

1 0

Francois Gouget : regedit: Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 8e362cb65ac1aea1c0733cbb3202ed2ba327940b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e362cb65ac1aea1c0733cbb3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 11:53:41 2007 +0200 regedit: Modify getRegClass() to avoid dubious comparisons and casts between HKEYs and error codes. --- programs/regedit/regproc.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a973ad0..d1d757d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -279,7 +279,7 @@ static LONG setValue(LPSTR val_name, LPSTR val_data) * Extracts from [HKEY\some\key\path] or HKEY\some\key\path types of line * the key class (what ends before the first '\') */ -static HKEY getRegClass(LPSTR lpClass) +static BOOL getRegClass(LPSTR lpClass, HKEY* hkey) { LPSTR classNameEnd; LPSTR classNameBeg; @@ -288,7 +288,7 @@ static HKEY getRegClass(LPSTR lpClass) char lpClassCopy[KEY_MAX_LEN]; if (lpClass == NULL) - return (HKEY)ERROR_INVALID_PARAMETER; + return FALSE; lstrcpynA(lpClassCopy, lpClass, KEY_MAX_LEN); @@ -310,10 +310,11 @@ static HKEY getRegClass(LPSTR lpClass) for (i = 0; i < REG_CLASS_NUMBER; i++) { if (!strcmp(classNameBeg, reg_class_names[i])) { - return reg_class_keys[i]; + *hkey = reg_class_keys[i]; + return TRUE; } } - return (HKEY)ERROR_INVALID_PARAMETER; + return FALSE; } /****************************************************************************** @@ -365,8 +366,7 @@ static LONG openKey( LPSTR stdInput) return ERROR_INVALID_PARAMETER; /* Get the registry class */ - currentKeyClass = getRegClass(stdInput); /* Sets global variable */ - if (currentKeyClass == (HKEY)ERROR_INVALID_PARAMETER) + if (!getRegClass(stdInput, &currentKeyClass)) /* Sets global variable */ return ERROR_INVALID_PARAMETER; /* Get the key name */ @@ -918,8 +918,7 @@ BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name) 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); @@ -1052,8 +1051,7 @@ void delete_registry_key(CHAR *reg_key_name) 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 (!getRegClass(reg_key_name, &reg_key_class)) { fprintf(stderr,"%s: Incorrect registry class specification in '%s'\n", getAppName(), reg_key_name); exit(1);

1 0

Francois Gouget : regedit: The registry functions return standard error codes, not HRESULTs.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: bde3cf9b5fe2bdffba8a0b6c7db3c30d543fc817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde3cf9b5fe2bdffba8a0b6c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 11:46:46 2007 +0200 regedit: The registry functions return standard error codes, not HRESULTs. --- programs/regedit/regproc.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 368f5c5..0399efc 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -209,9 +209,9 @@ static void REGPROC_unescape_string(LPSTR str) * val_name - name of the registry value * val_data - registry value data */ -static HRESULT setValue(LPSTR val_name, LPSTR val_data) +static LONG setValue(LPSTR val_name, LPSTR val_data) { - HRESULT hRes; + LONG res; DWORD dwDataType, dwParseType; LPBYTE lpbData; DWORD dwData, dwLen; @@ -259,7 +259,7 @@ static HRESULT setValue(LPSTR val_name, LPSTR val_data) return ERROR_INVALID_DATA; } - hRes = RegSetValueEx( + res = RegSetValueEx( currentKeyHandle, val_name, 0, /* Reserved */ @@ -268,7 +268,7 @@ static HRESULT setValue(LPSTR val_name, LPSTR val_data) dwLen); if (dwParseType == REG_BINARY) HeapFree(GetProcessHeap(), 0, lpbData); - return hRes; + return res; } @@ -352,10 +352,10 @@ static LPSTR getRegKeyName(LPSTR lpLine) /****************************************************************************** * Open the key */ -static HRESULT openKey( LPSTR stdInput) +static LONG openKey( LPSTR stdInput) { - DWORD dwDisp; - HRESULT hRes; + DWORD dwDisp; + LONG res; /* Sanity checks */ if (stdInput == NULL) @@ -364,14 +364,14 @@ static HRESULT openKey( LPSTR stdInput) /* Get the registry class */ currentKeyClass = getRegClass(stdInput); /* Sets global variable */ if (currentKeyClass == (HKEY)ERROR_INVALID_PARAMETER) - return (HRESULT)ERROR_INVALID_PARAMETER; + return ERROR_INVALID_PARAMETER; /* Get the key name */ currentKeyName = getRegKeyName(stdInput); /* Sets global variable */ if (currentKeyName == NULL) return ERROR_INVALID_PARAMETER; - hRes = RegCreateKeyEx( + res = RegCreateKeyEx( currentKeyClass, /* Class */ currentKeyName, /* Sub Key */ 0, /* MUST BE 0 */ @@ -383,10 +383,10 @@ static HRESULT openKey( LPSTR stdInput) &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; } @@ -420,7 +420,7 @@ static void processSetValue(LPSTR line) 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] == '=') { @@ -458,8 +458,8 @@ static void processSetValue(LPSTR line) 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,

1 0

Francois Gouget : regedit: Make the dword and binary data parsing both more flexible and stricter.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 804ec044727028892e76b74aeeda2c056482181c URL: http://source.winehq.org/git/wine.git/?a=commit;h=804ec044727028892e76b74ae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 11:46:29 2007 +0200 regedit: Make the dword and binary data parsing both more flexible and stricter. Make sure it does not modify the value if the data is invalid. --- programs/regedit/regproc.c | 109 ++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 60 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index befa971..368f5c5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -70,59 +70,55 @@ if (!(p)) \ /****************************************************************************** * Converts a hex representation of a DWORD into a DWORD. */ -static DWORD convertHexToDWord(char *str, BYTE *buf) +static BOOL convertHexToDWord(char* str, DWORD *dw) { - DWORD dw; - char xbuf[9]; - - memcpy(xbuf,str,8); - xbuf[8]='\0'; - sscanf(xbuf,"%08x",&dw); - memcpy(buf,&dw,sizeof(DWORD)); - return sizeof(DWORD); + char dummy; + if (strlen(str) > 8 || sscanf(str, "%x%c", dw, &dummy) != 1) { + fprintf(stderr,"%s: ERROR, invalid hex value\n", getAppName()); + return FALSE; + } + return TRUE; } /****************************************************************************** - * Converts a hex comma separated values list into a hex list. - * The Hex input string must be in exactly the correct form. + * Converts a hex comma separated values list into a binary string. */ -static DWORD convertHexCSVToHex(char *str, BYTE *buf, ULONG bufLen) +static BYTE* convertHexCSVToHex(char *str, DWORD *size) { - char *s = str; /* Pointer to current */ - char *b = (char*) buf; /* Pointer to result */ - - ULONG strLen = strlen(str); - ULONG 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]; + 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; + char dummy; - memcpy(xbuf,s,2); xbuf[2]='\0'; - sscanf(xbuf,"%02x",&wc); - if (byteCount < bufLen) - *b++ =(unsigned char)wc; + 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)++; - s+=3; - strPos+=3; - byteCount++; + s+=(wc < 0x10 ? 2 : 3); } - return byteCount; + return data; } /****************************************************************************** @@ -216,11 +212,9 @@ static void REGPROC_unescape_string(LPSTR str) static HRESULT setValue(LPSTR val_name, LPSTR val_data) { HRESULT hRes; - DWORD dwDataType, dwParseType = 0; + 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; @@ -248,21 +242,16 @@ static HRESULT setValue(LPSTR val_name, LPSTR val_data) } 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 */ { - int 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, 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 */ { @@ -277,8 +266,8 @@ static HRESULT setValue(LPSTR val_name, LPSTR val_data) dwDataType, lpbData, dwLen); - - HeapFree (GetProcessHeap(), 0, bBigBuffer); + if (dwParseType == REG_BINARY) + HeapFree(GetProcessHeap(), 0, lpbData); return hRes; }

1 0

Francois Gouget : regedit: If the data for a given value is in an unknown format, then print an error and don't modify the value.
by Alexandre Julliard 14 Jun '07

14 Jun '07

Module: wine Branch: master Commit: 90d77072357780e0bb3be9457a4c1d2c2649e09a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d77072357780e0bb3be9457… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 11:43:58 2007 +0200 regedit: If the data for a given value is in an unknown format, then print an error and don't modify the value. Note that '"foo"=' is not valid. --- programs/regedit/regproc.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 7f73674..befa971 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -169,7 +169,8 @@ static DWORD getDataType(LPSTR *lpValue, DWORD* parse_type) } return type; } - return (**lpValue=='\0'?REG_SZ:REG_NONE); + *parse_type=REG_NONE; + return REG_NONE; } /****************************************************************************** @@ -230,7 +231,7 @@ static HRESULT setValue(LPSTR val_name, LPSTR val_data) /* 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 */ { REGPROC_unescape_string(val_data); /* Compute dwLen after REGPROC_unescape_string because it may @@ -244,11 +245,13 @@ static HRESULT setValue(LPSTR val_name, LPSTR val_data) val_data[dwLen]='\0'; } lpbData = (BYTE*) 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 */ { int b_len = strlen (val_data)+2/3; if (b_len > KEY_MAX_LEN) { @@ -261,6 +264,11 @@ static HRESULT setValue(LPSTR val_name, LPSTR val_data) lpbData = convert; } } + else /* unknown format */ + { + fprintf(stderr,"%s: ERROR, unknown data format\n", getAppName()); + return ERROR_INVALID_DATA; + } hRes = RegSetValueEx( currentKeyHandle,

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007