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
dc1dad6a
Commit
dc1dad6a
authored
Aug 02, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
devenum: Don't register quartz from devenum.
parent
c90a79a7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
23 deletions
+1
-23
devenum_main.c
dlls/devenum/devenum_main.c
+0
-22
wine.inf.in
tools/wine.inf.in
+1
-1
No files found.
dlls/devenum/devenum_main.c
View file @
dc1dad6a
...
...
@@ -35,8 +35,6 @@ typedef struct
BOOL
instance
;
}
register_info
;
static
void
DEVENUM_RegisterQuartz
(
void
);
/***********************************************************************
* Global string constant definitions
*/
...
...
@@ -102,9 +100,6 @@ HRESULT WINAPI DllRegisterServer(void)
res
=
__wine_register_resources
(
DEVENUM_hInstance
);
/* Quartz is needed for IFilterMapper2 */
DEVENUM_RegisterQuartz
();
/*** ActiveMovieFilter Categories ***/
CoInitialize
(
NULL
);
...
...
@@ -151,20 +146,3 @@ HRESULT WINAPI DllUnregisterServer(void)
FIXME
(
"stub!
\n
"
);
return
__wine_unregister_resources
(
DEVENUM_hInstance
);
}
typedef
HRESULT
(
WINAPI
*
DllRegisterServer_func
)(
void
);
/* calls DllRegisterServer() for the Quartz DLL */
static
void
DEVENUM_RegisterQuartz
(
void
)
{
HANDLE
hDLL
=
LoadLibraryA
(
"quartz.dll"
);
DllRegisterServer_func
pDllRegisterServer
=
NULL
;
if
(
hDLL
)
pDllRegisterServer
=
(
DllRegisterServer_func
)
GetProcAddress
(
hDLL
,
"DllRegisterServer"
);
if
(
pDllRegisterServer
)
{
HRESULT
hr
=
pDllRegisterServer
();
if
(
FAILED
(
hr
))
ERR
(
"Failed to register Quartz. Error was 0x%x)
\n
"
,
hr
);
}
}
tools/wine.inf.in
View file @
dc1dad6a
...
...
@@ -2493,6 +2493,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
[RegisterDllsSection]
;;some dlls have to be registered first
11,,shell32.dll,1
11,,quartz.dll,1
11,,comctl32.dll,2
11,,cryptdlg.dll,1
...
...
@@ -2502,7 +2503,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,msiexec.exe,1
11,,msisip.dll,1
11,,qcap.dll,1
11,,quartz.dll,1
11,,urlmon.dll,1
11,,windowscodecs.dll,1
11,,winegstreamer.dll,1
...
...
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