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
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
Lorenzo Ferrillo
wine
Commits
2d60d914
Commit
2d60d914
authored
13 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
advpack: Pass all the specified parameters to do_ocx_reg.
parent
30a7d0a5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/advpack/advpack.c
+2
-2
2 additions, 2 deletions
dlls/advpack/advpack.c
dlls/advpack/advpack_private.h
+1
-1
1 addition, 1 deletion
dlls/advpack/advpack_private.h
dlls/advpack/install.c
+1
-1
1 addition, 1 deletion
dlls/advpack/install.c
with
4 additions
and
4 deletions
dlls/advpack/advpack.c
+
2
−
2
View file @
2d60d914
...
...
@@ -452,7 +452,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF,
}
/* registers the OCX if do_reg is TRUE, unregisters it otherwise */
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
)
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
,
const
WCHAR
*
flags
,
const
WCHAR
*
param
)
{
DLLREGISTER
reg_func
;
...
...
@@ -519,7 +519,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show)
if
(
!
hm
)
goto
done
;
hr
=
do_ocx_reg
(
hm
,
TRUE
);
hr
=
do_ocx_reg
(
hm
,
TRUE
,
str_flags
,
param
);
done:
FreeLibrary
(
hm
);
...
...
This diff is collapsed.
Click to expand it.
dlls/advpack/advpack_private.h
+
1
−
1
View file @
2d60d914
...
...
@@ -21,7 +21,7 @@
#ifndef __ADVPACK_PRIVATE_H
#define __ADVPACK_PRIVATE_H
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
)
DECLSPEC_HIDDEN
;
HRESULT
do_ocx_reg
(
HMODULE
hocx
,
BOOL
do_reg
,
const
WCHAR
*
flags
,
const
WCHAR
*
param
)
DECLSPEC_HIDDEN
;
LPWSTR
get_parameter
(
LPWSTR
*
params
,
WCHAR
separator
)
DECLSPEC_HIDDEN
;
void
set_ldids
(
HINF
hInf
,
LPCWSTR
pszInstallSection
,
LPCWSTR
pszWorkingDir
)
DECLSPEC_HIDDEN
;
...
...
This diff is collapsed.
Click to expand it.
dlls/advpack/install.c
+
1
−
1
View file @
2d60d914
...
...
@@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg)
hm
=
LoadLibraryExW
(
buffer
,
NULL
,
LOAD_WITH_ALTERED_SEARCH_PATH
);
if
(
hm
)
{
if
(
do_ocx_reg
(
hm
,
TRUE
)
!=
S_OK
)
if
(
do_ocx_reg
(
hm
,
TRUE
,
NULL
,
NULL
)
!=
S_OK
)
hr
=
E_FAIL
;
FreeLibrary
(
hm
);
...
...
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