From 8ee6cca35401f3b9271977aadefb98cbd719e8e3 Mon Sep 17 00:00:00 2001 From: Andreas Mohr Date: Mon, 12 Feb 2001 18:10:43 +0000 Subject: [PATCH] - TRACE opened registry handles - add proper quotes to wineinstall - spelling --- dlls/ntdll/reg.c | 2 ++ files/directory.c | 2 +- programs/regapi/README | 18 +++++++++--------- tools/wineinstall | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 351250df72b..2d874d29c73 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -87,6 +87,7 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT } } SERVER_END_REQ; + TRACE("<- 0x%04x\n", *retkey); return ret; } @@ -119,6 +120,7 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR *retkey = req->hkey; } SERVER_END_REQ; + TRACE("<- 0x%04x\n", *retkey); return ret; } diff --git a/files/directory.c b/files/directory.c index 3e42254c7fe..10cc888eada 100644 --- a/files/directory.c +++ b/files/directory.c @@ -369,7 +369,7 @@ BOOL WINAPI CreateDirectoryA( LPCSTR path, } 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) { diff --git a/programs/regapi/README b/programs/regapi/README index b1d3dceb624..3500fd140e8 100644 --- a/programs/regapi/README +++ b/programs/regapi/README @@ -26,30 +26,30 @@ Registry Command Line API Tool 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 @@ FAQ 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 diff --git a/tools/wineinstall b/tools/wineinstall index 1dfe3b01b34..9f50a310705 100755 --- a/tools/wineinstall +++ b/tools/wineinstall @@ -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