Commit 8ee6cca3 authored by Andreas Mohr's avatar Andreas Mohr Committed by Alexandre Julliard

- TRACE opened registry handles

- add proper quotes to wineinstall - spelling
parent 312303ac
...@@ -87,6 +87,7 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT ...@@ -87,6 +87,7 @@ NTSTATUS WINAPI NtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_AT
} }
} }
SERVER_END_REQ; SERVER_END_REQ;
TRACE("<- 0x%04x\n", *retkey);
return ret; return ret;
} }
...@@ -119,6 +120,7 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR ...@@ -119,6 +120,7 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR
*retkey = req->hkey; *retkey = req->hkey;
} }
SERVER_END_REQ; SERVER_END_REQ;
TRACE("<- 0x%04x\n", *retkey);
return ret; return ret;
} }
......
...@@ -369,7 +369,7 @@ BOOL WINAPI CreateDirectoryA( LPCSTR path, ...@@ -369,7 +369,7 @@ BOOL WINAPI CreateDirectoryA( LPCSTR path,
} }
if (!DOSFS_GetFullName( path, FALSE, &full_name )) return 0; if (!DOSFS_GetFullName( path, FALSE, &full_name )) return 0;
if (mkdir( full_name.long_name, 0777 ) == -1) { 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 /* the FILE_SetDosError() generated error codes don't match the
* CreateDirectory ones for some errnos */ * CreateDirectory ones for some errnos */
switch (errno) { switch (errno) {
......
...@@ -26,30 +26,30 @@ Registry Command Line API Tool ...@@ -26,30 +26,30 @@ Registry Command Line API Tool
1 - Parse the before.reg and after.reg file into regFixer.pl, in order to 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" 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:) or dword:)
2 - Generate the diff between the before.reg.fix and after.reg.fix 2 - Generate the diff between the before.reg.fix and after.reg.fix
into app.diff into app.diff
Now we have a app.reg file that contain what has been done by installing the 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 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 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 only remains to take the format we have and reset it into a format similar
to the one we get from regedit. to the one we get from regedit.
I say "similar" because there is a tiny difference between Windows 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 The problem with this (and it is not a big one) is that regedit exports long
data streams onto many lines, and since I dont have tons of time I setup 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 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. process by regapi.
So, this package comes with a few pieces: So, this package comes with a few pieces:
...@@ -70,7 +70,7 @@ FAQ ...@@ -70,7 +70,7 @@ FAQ
Quick Start Guide Quick Start Guide
----------------- -----------------
1 - Get a snapshot of your windows registry in before.reg, (regedit/export) 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. 3 - Get a snapshot of your windows registry in after.reg.
4 - Invoke ./regSet.sh before.reg after.reg 4 - Invoke ./regSet.sh before.reg after.reg
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
# user and print a message if wine cannot be found # user and print a message if wine cannot be found
#--- defaults (change these if you are a packager) #--- 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 prefix=/usr/local # installation prefix
sysconfdir=$prefix/etc # where wine.conf and global registry is supposed to be sysconfdir=$prefix/etc # where wine.conf and global registry is supposed to be
bindir=$prefix/bin # where winelib apps will be (or is) installed bindir=$prefix/bin # where winelib apps will be (or is) installed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment