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
Zsolt Vadász
wine
Commits
c96cd6ef
Commit
c96cd6ef
authored
13 years ago
by
Hans Leidekker
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
msi: Avoid casts in IWineMsiRemotePackage methods.
parent
cc517f2b
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/msi/install.c
+4
-8
4 additions, 8 deletions
dlls/msi/install.c
dlls/msi/msiserver.idl
+3
-3
3 additions, 3 deletions
dlls/msi/msiserver.idl
dlls/msi/package.c
+8
-12
8 additions, 12 deletions
dlls/msi/package.c
with
15 additions
and
23 deletions
dlls/msi/install.c
+
4
−
8
View file @
c96cd6ef
...
...
@@ -246,8 +246,7 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder,
}
len
=
0
;
hr
=
IWineMsiRemotePackage_GetTargetPath
(
remote_package
,
folder
,
NULL
,
&
len
);
hr
=
IWineMsiRemotePackage_GetTargetPath
(
remote_package
,
folder
,
NULL
,
&
len
);
if
(
FAILED
(
hr
))
goto
done
;
...
...
@@ -259,8 +258,7 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder,
goto
done
;
}
hr
=
IWineMsiRemotePackage_GetTargetPath
(
remote_package
,
folder
,
(
BSTR
*
)
value
,
&
len
);
hr
=
IWineMsiRemotePackage_GetTargetPath
(
remote_package
,
folder
,
value
,
&
len
);
if
(
FAILED
(
hr
))
goto
done
;
...
...
@@ -371,8 +369,7 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder,
}
len
=
0
;
hr
=
IWineMsiRemotePackage_GetSourcePath
(
remote_package
,
folder
,
NULL
,
&
len
);
hr
=
IWineMsiRemotePackage_GetSourcePath
(
remote_package
,
folder
,
NULL
,
&
len
);
if
(
FAILED
(
hr
))
goto
done
;
...
...
@@ -384,8 +381,7 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder,
goto
done
;
}
hr
=
IWineMsiRemotePackage_GetSourcePath
(
remote_package
,
folder
,
(
BSTR
*
)
value
,
&
len
);
hr
=
IWineMsiRemotePackage_GetSourcePath
(
remote_package
,
folder
,
value
,
&
len
);
if
(
FAILED
(
hr
))
goto
done
;
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/msiserver.idl
+
3
−
3
View file @
c96cd6ef
...
...
@@ -54,14 +54,14 @@ interface IWineMsiRemotePackage : IUnknown
{
HRESULT
SetMsiHandle
(
[
in
]
MSIHANDLE
handle
)
;
HRESULT
GetActiveDatabase
(
[
out
]
MSIHANDLE
*
handle
)
;
HRESULT
GetProperty
(
[
in
]
BSTR
property
,
[
out
]
BSTR
*
value
,
[
out
]
DWORD
*
size
)
;
HRESULT
GetProperty
(
[
in
]
BSTR
property
,
[
out
,
size_is
(
*
size
)
]
BSTR
value
,
[
in
,
out
]
DWORD
*
size
)
;
HRESULT
SetProperty
(
[
in
]
BSTR
property
,
[
in
]
BSTR
value
)
;
HRESULT
ProcessMessage
(
[
in
]
INSTALLMESSAGE
message
,
[
in
]
MSIHANDLE
record
)
;
HRESULT
DoAction
(
[
in
]
BSTR
action
)
;
HRESULT
Sequence
(
[
in
]
BSTR
table
,
[
in
]
int
sequence
)
;
HRESULT
GetTargetPath
(
[
in
]
BSTR
folder
,
[
out
]
BSTR
*
value
,
[
out
]
DWORD
*
size
)
;
HRESULT
GetTargetPath
(
[
in
]
BSTR
folder
,
[
out
,
size_is
(
*
size
)
]
BSTR
value
,
[
in
,
out
]
DWORD
*
size
)
;
HRESULT
SetTargetPath
(
[
in
]
BSTR
folder
,
[
in
]
BSTR
value
)
;
HRESULT
GetSourcePath
(
[
in
]
BSTR
folder
,
[
out
]
BSTR
*
value
,
[
out
]
DWORD
*
size
)
;
HRESULT
GetSourcePath
(
[
in
]
BSTR
folder
,
[
out
,
size_is
(
*
size
)
]
BSTR
value
,
[
in
,
out
]
DWORD
*
size
)
;
HRESULT
GetMode
(
[
in
]
MSIRUNMODE
mode
,
[
out
]
BOOL
*
ret
)
;
HRESULT
SetMode
(
[
in
]
MSIRUNMODE
mode
,
[
in
]
BOOL
state
)
;
HRESULT
GetFeatureState
(
[
in
]
BSTR
feature
,
[
out
]
INSTALLSTATE
*
installed
,
[
out
]
INSTALLSTATE
*
action
)
;
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/package.c
+
8
−
12
View file @
c96cd6ef
...
...
@@ -2231,7 +2231,7 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name,
goto
done
;
}
hr
=
IWineMsiRemotePackage_GetProperty
(
remote_package
,
bname
,
(
BSTR
*
)
value
,
&
len
);
hr
=
IWineMsiRemotePackage_GetProperty
(
remote_package
,
bname
,
value
,
&
len
);
if
(
FAILED
(
hr
))
goto
done
;
...
...
@@ -2383,15 +2383,11 @@ static HRESULT WINAPI mrp_GetActiveDatabase( IWineMsiRemotePackage *iface, MSIHA
return
S_OK
;
}
static
HRESULT
WINAPI
mrp_GetProperty
(
IWineMsiRemotePackage
*
iface
,
BSTR
property
,
BSTR
*
value
,
DWORD
*
size
)
static
HRESULT
WINAPI
mrp_GetProperty
(
IWineMsiRemotePackage
*
iface
,
BSTR
property
,
BSTR
value
,
DWORD
*
size
)
{
msi_remote_package_impl
*
This
=
impl_from_IWineMsiRemotePackage
(
iface
);
UINT
r
;
r
=
MsiGetPropertyW
(
This
->
package
,
(
LPWSTR
)
property
,
(
LPWSTR
)
value
,
size
);
if
(
r
!=
ERROR_SUCCESS
)
return
HRESULT_FROM_WIN32
(
r
);
UINT
r
=
MsiGetPropertyW
(
This
->
package
,
property
,
value
,
size
);
if
(
r
!=
ERROR_SUCCESS
)
return
HRESULT_FROM_WIN32
(
r
);
return
S_OK
;
}
...
...
@@ -2423,10 +2419,10 @@ static HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR table, in
return
HRESULT_FROM_WIN32
(
r
);
}
static
HRESULT
WINAPI
mrp_GetTargetPath
(
IWineMsiRemotePackage
*
iface
,
BSTR
folder
,
BSTR
*
value
,
DWORD
*
size
)
static
HRESULT
WINAPI
mrp_GetTargetPath
(
IWineMsiRemotePackage
*
iface
,
BSTR
folder
,
BSTR
value
,
DWORD
*
size
)
{
msi_remote_package_impl
*
This
=
impl_from_IWineMsiRemotePackage
(
iface
);
UINT
r
=
MsiGetTargetPathW
(
This
->
package
,
(
LPWSTR
)
folder
,
(
LPWSTR
)
value
,
size
);
UINT
r
=
MsiGetTargetPathW
(
This
->
package
,
folder
,
value
,
size
);
return
HRESULT_FROM_WIN32
(
r
);
}
...
...
@@ -2437,10 +2433,10 @@ static HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR fold
return
HRESULT_FROM_WIN32
(
r
);
}
static
HRESULT
WINAPI
mrp_GetSourcePath
(
IWineMsiRemotePackage
*
iface
,
BSTR
folder
,
BSTR
*
value
,
DWORD
*
size
)
static
HRESULT
WINAPI
mrp_GetSourcePath
(
IWineMsiRemotePackage
*
iface
,
BSTR
folder
,
BSTR
value
,
DWORD
*
size
)
{
msi_remote_package_impl
*
This
=
impl_from_IWineMsiRemotePackage
(
iface
);
UINT
r
=
MsiGetSourcePathW
(
This
->
package
,
(
LPWSTR
)
folder
,
(
LPWSTR
)
value
,
size
);
UINT
r
=
MsiGetSourcePathW
(
This
->
package
,
folder
,
value
,
size
);
return
HRESULT_FROM_WIN32
(
r
);
}
...
...
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