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
8a6a9a66
Commit
8a6a9a66
authored
May 18, 2005
by
Aric Stewart
Committed by
Alexandre Julliard
May 18, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some error messages and strcmp changes suggested by Dmitry.
parent
49b1d335
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
4 deletions
+13
-4
action.c
dlls/msi/action.c
+13
-4
No files found.
dlls/msi/action.c
View file @
8a6a9a66
...
...
@@ -2744,6 +2744,7 @@ static UINT writeout_cabinet_stream(MSIPACKAGE *package, WCHAR* stream_name,
if
(
the_file
==
INVALID_HANDLE_VALUE
)
{
ERR
(
"Unable to create file %s
\n
"
,
debugstr_w
(
source
));
rc
=
ERROR_FUNCTION_FAILED
;
goto
end
;
}
...
...
@@ -2846,7 +2847,7 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
LPWSTR
tracknametmp
;
static
const
WCHAR
tmpprefix
[]
=
{
'C'
,
'A'
,
'B'
,
'T'
,
'M'
,
'P'
,
'_'
,
0
};
if
(
data
->
file_name
&&
strcmp
(
data
->
file_name
,
pfdin
->
psz1
))
if
(
data
->
file_name
&&
lstrcmpiA
(
data
->
file_name
,
pfdin
->
psz1
))
return
0
;
file
=
cabinet_alloc
((
len
+
1
)
*
sizeof
(
char
));
...
...
@@ -3189,7 +3190,10 @@ static UINT ACTION_InstallFiles(MSIPACKAGE *package)
rc
);
if
(
rc
==
ERROR_ALREADY_EXISTS
&&
file
->
State
==
2
)
{
CopyFileW
(
file
->
SourcePath
,
file
->
TargetPath
,
FALSE
);
if
(
!
CopyFileW
(
file
->
SourcePath
,
file
->
TargetPath
,
FALSE
))
ERR
(
"Unable to copy file (%s -> %s) (error %ld)
\n
"
,
debugstr_w
(
file
->
SourcePath
),
debugstr_w
(
file
->
TargetPath
),
GetLastError
());
if
(
!
(
file
->
Attributes
&
msidbFileAttributesNoncompressed
))
DeleteFileW
(
file
->
SourcePath
);
rc
=
0
;
...
...
@@ -5767,7 +5771,10 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package)
snprintfW
(
path
,
sizeof
(
path
)
/
sizeof
(
path
[
0
]),
installerPathFmt
,
windir
);
create_full_pathW
(
path
);
TRACE
(
"Copying to local package %s
\n
"
,
debugstr_w
(
packagefile
));
CopyFileW
(
package
->
PackagePath
,
packagefile
,
FALSE
);
if
(
!
CopyFileW
(
package
->
PackagePath
,
packagefile
,
FALSE
))
ERR
(
"Unable to copy package (%s -> %s) (error %ld)
\n
"
,
debugstr_w
(
package
->
PackagePath
),
debugstr_w
(
packagefile
),
GetLastError
());
size
=
strlenW
(
packagefile
)
*
sizeof
(
WCHAR
);
RegSetValueExW
(
hkey
,
szLocalPackage
,
0
,
REG_SZ
,(
LPSTR
)
packagefile
,
size
);
...
...
@@ -6329,6 +6336,8 @@ static LPWSTR load_ttfname_from(LPCWSTR filename)
}
CloseHandle
(
handle
);
}
else
ERR
(
"Unable to open font file %s
\n
"
,
debugstr_w
(
filename
));
TRACE
(
"Returning fontname %s
\n
"
,
debugstr_w
(
ret
));
return
ret
;
...
...
@@ -6798,7 +6807,7 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *package, LPCWSTR szFolder,
HeapFree
(
GetProcessHeap
(),
0
,
folder
->
Property
);
folder
->
Property
=
build_directory_name
(
2
,
szFolderPath
,
NULL
);
if
(
strcmpiW
(
path
,
folder
->
Property
)
==
0
)
if
(
l
strcmpiW
(
path
,
folder
->
Property
)
==
0
)
{
/*
* Resolved Target has not really changed, so just
...
...
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