ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advpack: Call OleInitialize before registering OCXs, like native does.

This commit is contained in:
Rob Shearman 2007-04-01 13:44:18 +01:00 committed by Alexandre Julliard
parent fd8868bac4
commit 5275b1b85f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/advpack/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = advpack.dll MODULE = advpack.dll
IMPORTLIB = libadvpack.$(IMPLIBEXT) IMPORTLIB = libadvpack.$(IMPLIBEXT)
IMPORTS = setupapi version user32 advapi32 kernel32 ntdll IMPORTS = ole32 setupapi version user32 advapi32 kernel32 ntdll
C_SRCS = \ C_SRCS = \
advpack.c \ advpack.c \

3
dlls/advpack/install.c
View File

@ -30,6 +30,7 @@
#include "winnls.h" #include "winnls.h"
#include "setupapi.h" #include "setupapi.h"
#include "advpub.h" #include "advpub.h"
#include "ole2.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "advpack_private.h" #include "advpack_private.h"
@ -350,8 +351,10 @@ static HRESULT adv_install(ADVInfo *info)
if (hr != S_OK) if (hr != S_OK)
return hr; return hr;
OleInitialize(NULL);
hr = iterate_section_fields(info->hinf, info->install_sec, hr = iterate_section_fields(info->hinf, info->install_sec,
RegisterOCXs, register_ocxs_callback, NULL); RegisterOCXs, register_ocxs_callback, NULL);
OleUninitialize();
if (hr != S_OK) if (hr != S_OK)
return hr; return hr;