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
ede4a3b5
Commit
ede4a3b5
authored
Jul 22, 2008
by
James Hawkins
Committed by
Alexandre Julliard
Jul 22, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Set all folders' source paths to the root directory if the source type is compressed.
parent
7538f9ac
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
7 deletions
+3
-7
helpers.c
dlls/msi/helpers.c
+3
-1
package.c
dlls/msi/tests/package.c
+0
-6
No files found.
dlls/msi/helpers.c
View file @
ede4a3b5
...
@@ -325,7 +325,9 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source,
...
@@ -325,7 +325,9 @@ LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source,
{
{
path
=
NULL
;
path
=
NULL
;
if
(
f
->
SourceLongPath
)
if
(
package
->
WordCount
&
msidbSumInfoSourceTypeCompressed
)
path
=
get_source_root
(
package
);
else
path
=
build_directory_name
(
3
,
p
,
f
->
SourceLongPath
,
NULL
);
path
=
build_directory_name
(
3
,
p
,
f
->
SourceLongPath
,
NULL
);
TRACE
(
"source -> %s
\n
"
,
debugstr_w
(
path
));
TRACE
(
"source -> %s
\n
"
,
debugstr_w
(
path
));
...
...
dlls/msi/tests/package.c
View file @
ede4a3b5
...
@@ -5676,22 +5676,16 @@ static void test_MsiGetSourcePath(void)
...
@@ -5676,22 +5676,16 @@ static void test_MsiGetSourcePath(void)
lstrcpyA
(
path
,
"kiwi"
);
lstrcpyA
(
path
,
"kiwi"
);
r
=
MsiGetSourcePath
(
hpkg
,
"SubDir"
,
path
,
&
size
);
r
=
MsiGetSourcePath
(
hpkg
,
"SubDir"
,
path
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
todo_wine
{
ok
(
!
lstrcmpA
(
path
,
cwd
),
"Expected
\"
%s
\"
, got
\"
%s
\"\n
"
,
cwd
,
path
);
ok
(
!
lstrcmpA
(
path
,
cwd
),
"Expected
\"
%s
\"
, got
\"
%s
\"\n
"
,
cwd
,
path
);
ok
(
size
==
lstrlenA
(
cwd
),
"Expected %d, got %d
\n
"
,
lstrlenA
(
cwd
),
size
);
ok
(
size
==
lstrlenA
(
cwd
),
"Expected %d, got %d
\n
"
,
lstrlenA
(
cwd
),
size
);
}
/* try SubDir2 after CostFinalize */
/* try SubDir2 after CostFinalize */
size
=
MAX_PATH
;
size
=
MAX_PATH
;
lstrcpyA
(
path
,
"kiwi"
);
lstrcpyA
(
path
,
"kiwi"
);
r
=
MsiGetSourcePath
(
hpkg
,
"SubDir2"
,
path
,
&
size
);
r
=
MsiGetSourcePath
(
hpkg
,
"SubDir2"
,
path
,
&
size
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
r
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
todo_wine
{
ok
(
!
lstrcmpA
(
path
,
cwd
),
"Expected
\"
%s
\"
, got
\"
%s
\"\n
"
,
cwd
,
path
);
ok
(
!
lstrcmpA
(
path
,
cwd
),
"Expected
\"
%s
\"
, got
\"
%s
\"\n
"
,
cwd
,
path
);
ok
(
size
==
lstrlenA
(
cwd
),
"Expected %d, got %d
\n
"
,
lstrlenA
(
cwd
),
size
);
ok
(
size
==
lstrlenA
(
cwd
),
"Expected %d, got %d
\n
"
,
lstrlenA
(
cwd
),
size
);
}
MsiCloseHandle
(
hpkg
);
MsiCloseHandle
(
hpkg
);
DeleteFile
(
msifile
);
DeleteFile
(
msifile
);
...
...
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