Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
03fa9f87
Commit
03fa9f87
authored
Sep 29, 2007
by
Roderick Colenbrander
Committed by
Alexandre Julliard
Oct 01, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Fix RegDeleteTreeA/W compile issues when building ddraw for Windows.
parent
b9bdb2a6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
regsvr.c
dlls/ddraw/regsvr.c
+12
-3
No files found.
dlls/ddraw/regsvr.c
View file @
03fa9f87
...
...
@@ -34,6 +34,9 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
ddraw
);
static
typeof
(
RegDeleteTreeW
)
*
pRegDeleteTreeW
;
static
typeof
(
RegDeleteTreeA
)
*
pRegDeleteTreeA
;
/*
* Near the bottom of this file are the exported DllRegisterServer and
* DllUnregisterServer, which make all this worthwhile.
...
...
@@ -193,7 +196,7 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list)
WCHAR
buf
[
39
];
StringFromGUID2
(
list
->
iid
,
buf
,
39
);
res
=
RegDeleteTreeW
(
interface_key
,
buf
);
res
=
p
RegDeleteTreeW
(
interface_key
,
buf
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
res
=
ERROR_SUCCESS
;
}
...
...
@@ -304,12 +307,12 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
WCHAR
buf
[
39
];
StringFromGUID2
(
list
->
clsid
,
buf
,
39
);
res
=
RegDeleteTreeW
(
coclass_key
,
buf
);
res
=
p
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
=
RegDeleteTreeA
(
HKEY_CLASSES_ROOT
,
list
->
progid
);
res
=
p
RegDeleteTreeA
(
HKEY_CLASSES_ROOT
,
list
->
progid
);
if
(
res
==
ERROR_FILE_NOT_FOUND
)
res
=
ERROR_SUCCESS
;
if
(
res
!=
ERROR_SUCCESS
)
goto
error_close_coclass_key
;
}
...
...
@@ -422,6 +425,12 @@ HRESULT WINAPI DllUnregisterServer(void)
{
HRESULT
hr
;
HMODULE
advapi32
=
GetModuleHandleA
(
"advapi32"
);
if
(
!
advapi32
)
return
E_FAIL
;
pRegDeleteTreeA
=
(
typeof
(
RegDeleteTreeA
)
*
)
GetProcAddress
(
advapi32
,
"RegDeleteTreeA"
);
pRegDeleteTreeW
=
(
typeof
(
RegDeleteTreeW
)
*
)
GetProcAddress
(
advapi32
,
"RegDeleteTreeW"
);
if
(
!
pRegDeleteTreeA
||
!
pRegDeleteTreeW
)
return
E_FAIL
;
TRACE
(
"
\n
"
);
hr
=
unregister_coclasses
(
coclass_list
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment