Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sebastian Mayr
wine
Commits
f20432bb
Commit
f20432bb
authored
17 years ago
by
Stefan Leichter
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
inseng: Remove 'recursive registry key delete' function.
parent
e8ce143f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/inseng/regsvr.c
+8
-71
8 additions, 71 deletions
dlls/inseng/regsvr.c
with
8 additions
and
71 deletions
dlls/inseng/regsvr.c
+
8
−
71
View file @
f20432bb
...
...
@@ -120,9 +120,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
static
LONG
register_progid
(
WCHAR
const
*
clsid
,
char
const
*
progid
,
char
const
*
curver_progid
,
char
const
*
name
,
char
const
*
extra
);
static
LONG
recursive_delete_key
(
HKEY
key
);
static
LONG
recursive_delete_keyA
(
HKEY
base
,
char
const
*
name
);
static
LONG
recursive_delete_keyW
(
HKEY
base
,
WCHAR
const
*
name
);
/***********************************************************************
* register_interfaces
...
...
@@ -211,7 +208,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list)
WCHAR
buf
[
39
];
StringFromGUID2
(
list
->
iid
,
buf
,
39
);
res
=
recursive_delete_keyW
(
interface_key
,
buf
);
res
=
RegDeleteTreeW
(
interface_key
,
buf
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
res
=
ERROR_SUCCESS
;
}
RegCloseKey
(
interface_key
);
...
...
@@ -318,16 +316,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
WCHAR
buf
[
39
];
StringFromGUID2
(
list
->
clsid
,
buf
,
39
);
res
=
recursive_delete_keyW
(
coclass_key
,
buf
);
res
=
RegDeleteTreeW
(
coclass_key
,
buf
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
res
=
ERROR_SUCCESS
;
if
(
res
!=
ERROR_SUCCESS
)
goto
error_close_coclass_key
;
if
(
list
->
progid
)
{
res
=
recursive_delete_keyA
(
HKEY_CLASSES_ROOT
,
list
->
progid
);
res
=
RegDeleteTreeA
(
HKEY_CLASSES_ROOT
,
list
->
progid
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
res
=
ERROR_SUCCESS
;
if
(
res
!=
ERROR_SUCCESS
)
goto
error_close_coclass_key
;
}
if
(
list
->
viprogid
)
{
res
=
recursive_delete_keyA
(
HKEY_CLASSES_ROOT
,
list
->
viprogid
);
res
=
RegDeleteTreeA
(
HKEY_CLASSES_ROOT
,
list
->
viprogid
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
res
=
ERROR_SUCCESS
;
if
(
res
!=
ERROR_SUCCESS
)
goto
error_close_coclass_key
;
}
}
...
...
@@ -439,70 +440,6 @@ error_close_progid_key:
return
res
;
}
/***********************************************************************
* recursive_delete_key
*/
static
LONG
recursive_delete_key
(
HKEY
key
)
{
LONG
res
;
WCHAR
subkey_name
[
MAX_PATH
];
DWORD
cName
;
HKEY
subkey
;
for
(;;)
{
cName
=
sizeof
(
subkey_name
)
/
sizeof
(
WCHAR
);
res
=
RegEnumKeyExW
(
key
,
0
,
subkey_name
,
&
cName
,
NULL
,
NULL
,
NULL
,
NULL
);
if
(
res
!=
ERROR_SUCCESS
&&
res
!=
ERROR_MORE_DATA
)
{
res
=
ERROR_SUCCESS
;
/* presumably we're done enumerating */
break
;
}
res
=
RegOpenKeyExW
(
key
,
subkey_name
,
0
,
KEY_READ
|
KEY_WRITE
,
&
subkey
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
continue
;
if
(
res
!=
ERROR_SUCCESS
)
break
;
res
=
recursive_delete_key
(
subkey
);
RegCloseKey
(
subkey
);
if
(
res
!=
ERROR_SUCCESS
)
break
;
}
if
(
res
==
ERROR_SUCCESS
)
res
=
RegDeleteKeyW
(
key
,
0
);
return
res
;
}
/***********************************************************************
* recursive_delete_keyA
*/
static
LONG
recursive_delete_keyA
(
HKEY
base
,
char
const
*
name
)
{
LONG
res
;
HKEY
key
;
res
=
RegOpenKeyExA
(
base
,
name
,
0
,
KEY_READ
|
KEY_WRITE
,
&
key
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
return
ERROR_SUCCESS
;
if
(
res
!=
ERROR_SUCCESS
)
return
res
;
res
=
recursive_delete_key
(
key
);
RegCloseKey
(
key
);
return
res
;
}
/***********************************************************************
* recursive_delete_keyW
*/
static
LONG
recursive_delete_keyW
(
HKEY
base
,
WCHAR
const
*
name
)
{
LONG
res
;
HKEY
key
;
res
=
RegOpenKeyExW
(
base
,
name
,
0
,
KEY_READ
|
KEY_WRITE
,
&
key
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
return
ERROR_SUCCESS
;
if
(
res
!=
ERROR_SUCCESS
)
return
res
;
res
=
recursive_delete_key
(
key
);
RegCloseKey
(
key
);
return
res
;
}
/***********************************************************************
* coclass list
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment