some more cleanups
Andreas Mohr
amohr at codeweavers.com
Thu Feb 1 09:06:35 CST 2001
Hi all,
- TRACE opened registry handles
- add proper quotes to wineinstall
- spelling
Andreas Mohr
-------------- next part --------------
Determining best CVS host...
Using CVSROOT :pserver:cvs at wine.codeweavers.com:/home/cvs/wine
Index: dlls/ntdll/reg.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ntdll/reg.c,v
retrieving revision 1.22
diff -u -r1.22 reg.c
--- dlls/ntdll/reg.c 2001/01/26 20:43:43 1.22
+++ dlls/ntdll/reg.c 2001/02/02 00:54:18
@@ -87,6 +87,7 @@
}
}
SERVER_END_REQ;
+ TRACE("<- 0x%04x\n", *retkey);
return ret;
}
@@ -119,6 +120,7 @@
*retkey = req->hkey;
}
SERVER_END_REQ;
+ TRACE("<- 0x%04x\n", *retkey);
return ret;
}
Index: files/directory.c
===================================================================
RCS file: /home/cvs/wine/wine/files/directory.c,v
retrieving revision 1.34
diff -u -r1.34 directory.c
--- files/directory.c 2001/01/12 19:55:19 1.34
+++ files/directory.c 2001/02/02 00:54:18
@@ -369,7 +369,7 @@
}
if (!DOSFS_GetFullName( path, FALSE, &full_name )) return 0;
if (mkdir( full_name.long_name, 0777 ) == -1) {
- WARN_(file)("Errno %i trying to create directory %s.\n", errno, full_name.long_name);
+ WARN_(file)("Errno %i trying to create directory '%s'\n", errno, full_name.long_name);
/* the FILE_SetDosError() generated error codes don't match the
* CreateDirectory ones for some errnos */
switch (errno) {
Index: programs/regapi/README
===================================================================
RCS file: /home/cvs/wine/wine/programs/regapi/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- programs/regapi/README 2000/05/18 00:52:22 1.2
+++ programs/regapi/README 2001/02/02 00:54:18
@@ -26,30 +26,30 @@
1 - Parse the before.reg and after.reg file into regFixer.pl, in order to
obtain lines in the form [HKEY\Sub1\Sub2\...\Subn]"Value"="Data"
- (where "Data" can be prefixed by the type identifyer : hex:, hex(0000000?)
+ (where "Data" can be prefixed by the type identifier : hex:, hex(0000000?)
or dword:)
2 - Generate the diff between the before.reg.fix and after.reg.fix
into app.diff
Now we have a app.reg file that contain what has been done by installing the
- application. To this we extract the part's that we are interested in using
+ application. To this we extract the parts that we are interested in using
grep (and fix it with sed) and put that into app.added by example
- ( let say we keep the added values only ).
+ ( let's say we keep the added values only ).
At this point we know which registry entry to add to the wine registry. It
only remains to take the format we have and reset it into a format similar
to the one we get from regedit.
I say "similar" because there is a tiny difference between Windows regedit
- export format and the format actualy required by the tool.
+ export format and the format actually required by the tool.
- The problem with this (and it is not a big one) is that regedit export long
- data streams onto many lines, and since I dont have tons of time I setup
+ The problem with this (and it is not a big one) is that regedit exports long
+ data streams onto many lines, and since I don't have tons of time I setup
another Perl script (regRestorer.pl) that fixes this (this could easily
- be done in C obviously) (left as excercise ;-) ).
+ be done in C obviously) (left as exercise ;-) ).
- So, once you parsed app.added into regRestorer.pl you get a app.reg ready to
+ So, once you parsed app.added into regRestorer.pl you get an app.reg ready to
process by regapi.
So, this package comes with a few pieces:
@@ -70,7 +70,7 @@
Quick Start Guide
-----------------
1 - Get a snapshot of your windows registry in before.reg, (regedit/export)
- 2 - Install you're application,
+ 2 - Install your application,
3 - Get a snapshot of your windows registry in after.reg.
4 - Invoke ./regSet.sh before.reg after.reg
Index: tools/wineinstall
===================================================================
RCS file: /home/cvs/wine/wine/tools/wineinstall,v
retrieving revision 1.18
diff -u -r1.18 wineinstall
--- tools/wineinstall 2001/01/18 20:29:21 1.18
+++ tools/wineinstall 2001/02/02 00:54:18
@@ -47,7 +47,7 @@
# user and print a message if wine cannot be found
#--- defaults (change these if you are a packager)
-CONFARGS=--enable-opengl # configure args, e.g. --prefix=/usr --sysconfdir=/etc
+CONFARGS="--enable-opengl" # configure args, e.g. --prefix=/usr --sysconfdir=/etc
prefix=/usr/local # installation prefix
sysconfdir=$prefix/etc # where wine.conf and global registry is supposed to be
bindir=$prefix/bin # where winelib apps will be (or is) installed
More information about the wine-patches
mailing list