Le mer 13/08/2003 à 21:07, Vincent Béron a écrit :
> Le mer 06/08/2003 à 23:10, Alexandre Julliard a écrit :
> > ChangeSet ID: 8934
> > CVSROOT: /home/winehq/opt/cvs-commit
> > Module name: wine
> > Changes by: julliard@wine.codeweavers.com 2003/08/06 22:10:13
> >
> > Modified files:
> > programs/regedit: regproc.h regproc.c regedit.c Makefile.in
> > .cvsignore
> > Added files:
> > programs/regedit: treeview.c rsrc.rc resource.rc resource.h
> > main.h main.c listview.c framewnd.c childwnd.c
> > about.c En.rc
> >
> > Log message:
> > Robert Dickenson <robd@reactos.org>
> > Steven Edwards <Steven_Ed4153@yahoo.com>
> > Mike McCormack <mike@codeweavers.com>
> > Implemented GUI for regedit.
> >
> > Patch: http://cvs.winehq.com/patch.py?root=/home/winehq/opt/cvs-commit&id=8934
>
> regedit.c:
> @@ -153,10 +154,13 @@
> }
>
> if (action == ACTION_UNDEF)
> - {
> - action = ACTION_ADD;
> + return FALSE;
> +
> + return PerformRegAction(action, s);
> }
>
>
> This seems to have broken commandline only regedit, for the ACTION_ADD
> case (used in wineinstall et al.).
>
> The included patch should fix it (building in progress).
Argh, it was incomplete. This one works (has been tested).
Vincent
Index: wine/programs/regedit/regedit.c
===================================================================
RCS file: /home/wine/wine/programs/regedit/regedit.c,v
retrieving revision 1.6
diff -u -r1.6 regedit.c
--- wine/programs/regedit/regedit.c 7 Aug 2003 03:10:13 -0000 1.6
+++ wine/programs/regedit/regedit.c 14 Aug 2003 01:40:09 -0000
@@ -153,6 +153,9 @@
}
}
+ if (*s && action == ACTION_UNDEF)
+ action = ACTION_ADD;
+
if (action == ACTION_UNDEF)
return FALSE;
@@ -235,5 +238,5 @@
exit(1);
break;
}
- return 0;
+ return TRUE;
}
