Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
fb7646be
Commit
fb7646be
authored
Aug 24, 2006
by
James Hawkins
Committed by
Alexandre Julliard
Aug 25, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Inform the user with an error message when the MSI file path is invalid.
parent
bf71a2f6
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
37 additions
and
0 deletions
+37
-0
helpers.c
dlls/msi/helpers.c
+15
-0
msi_Bg.rc
dlls/msi/msi_Bg.rc
+1
-0
msi_De.rc
dlls/msi/msi_De.rc
+1
-0
msi_En.rc
dlls/msi/msi_En.rc
+1
-0
msi_Eo.rc
dlls/msi/msi_Eo.rc
+1
-0
msi_Es.rc
dlls/msi/msi_Es.rc
+1
-0
msi_Fi.rc
dlls/msi/msi_Fi.rc
+1
-0
msi_Fr.rc
dlls/msi/msi_Fr.rc
+1
-0
msi_Hu.rc
dlls/msi/msi_Hu.rc
+1
-0
msi_It.rc
dlls/msi/msi_It.rc
+1
-0
msi_Ko.rc
dlls/msi/msi_Ko.rc
+1
-0
msi_Nl.rc
dlls/msi/msi_Nl.rc
+1
-0
msi_No.rc
dlls/msi/msi_No.rc
+1
-0
msi_Pt.rc
dlls/msi/msi_Pt.rc
+1
-0
msi_Ru.rc
dlls/msi/msi_Ru.rc
+1
-0
msi_Tr.rc
dlls/msi/msi_Tr.rc
+1
-0
package.c
dlls/msi/package.c
+7
-0
No files found.
dlls/msi/helpers.c
View file @
fb7646be
...
@@ -1008,3 +1008,18 @@ WCHAR* generate_error_string(MSIPACKAGE *package, UINT error, DWORD count, ... )
...
@@ -1008,3 +1008,18 @@ WCHAR* generate_error_string(MSIPACKAGE *package, UINT error, DWORD count, ... )
data
=
NULL
;
data
=
NULL
;
return
data
;
return
data
;
}
}
void
msi_ui_error
(
DWORD
msg_id
,
DWORD
type
)
{
WCHAR
text
[
2048
];
static
const
WCHAR
title
[]
=
{
'W'
,
'i'
,
'n'
,
'd'
,
'o'
,
'w'
,
's'
,
' '
,
'I'
,
'n'
,
's'
,
't'
,
'a'
,
'l'
,
'l'
,
'e'
,
'r'
,
0
};
if
(
!
MsiLoadStringW
(
-
1
,
msg_id
,
text
,
sizeof
(
text
)
/
sizeof
(
text
[
0
]),
MAKELANGID
(
LANG_NEUTRAL
,
SUBLANG_NEUTRAL
)
))
return
;
MessageBoxW
(
NULL
,
text
,
title
,
type
);
}
dlls/msi/msi_Bg.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 " %s "
5 " %s "
9 " %s"
9 " %s"
10 " "
10 " "
...
...
dlls/msi/msi_De.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "Der Pfad %s wurde nicht gefunden."
5 "Der Pfad %s wurde nicht gefunden."
9 "Bitte Disk %s einlegen."
9 "Bitte Disk %s einlegen."
10 "schlechte Parameter"
10 "schlechte Parameter"
...
...
dlls/msi/msi_En.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "path %s not found"
5 "path %s not found"
9 "insert disk %s"
9 "insert disk %s"
10 "bad parameters"
10 "bad parameters"
...
...
dlls/msi/msi_Eo.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "Mi ne trovis la vojon %s"
5 "Mi ne trovis la vojon %s"
9 "enþovu la diskon %s"
9 "enþovu la diskon %s"
10 "nekorektaj parametroj"
10 "nekorektaj parametroj"
...
...
dlls/msi/msi_Es.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "ruta %s no encontrada"
5 "ruta %s no encontrada"
9 "inserte el disco %s"
9 "inserte el disco %s"
10 "parmetros incorrectos"
10 "parmetros incorrectos"
...
...
dlls/msi/msi_Fi.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "Polkua %s ei lydy."
5 "Polkua %s ei lydy."
9 "Anna levy %s"
9 "Anna levy %s"
10 "Virheelliset parametrit."
10 "Virheelliset parametrit."
...
...
dlls/msi/msi_Fr.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "Le chemin %s est introuvable"
5 "Le chemin %s est introuvable"
9 "insérez le disque %s"
9 "insérez le disque %s"
10 "mauvais paramètres"
10 "mauvais paramètres"
...
...
dlls/msi/msi_Hu.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "%s tvonal nem tallhat"
5 "%s tvonal nem tallhat"
9 "helyezze be a lemezt: %s"
9 "helyezze be a lemezt: %s"
10 "rossz paramterek"
10 "rossz paramterek"
...
...
dlls/msi/msi_It.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "percorso %s non trovato"
5 "percorso %s non trovato"
9 "inserire disco %s"
9 "inserire disco %s"
10 "parametri incorretti"
10 "parametri incorretti"
...
...
dlls/msi/msi_Ko.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "%s 경로를 찾을수 없습니다"
5 "%s 경로를 찾을수 없습니다"
9 "디스크 %s 삽입"
9 "디스크 %s 삽입"
10 "절못된 매개변수"
10 "절못된 매개변수"
...
...
dlls/msi/msi_Nl.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "Pad %s niet gevonden"
5 "Pad %s niet gevonden"
9 "Plaats disk %s"
9 "Plaats disk %s"
10 "Ongeldige parameters"
10 "Ongeldige parameters"
...
...
dlls/msi/msi_No.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "Fant ikke stien '%s'."
5 "Fant ikke stien '%s'."
9 "Sett i disk '%s'"
9 "Sett i disk '%s'"
10 "Gale parametere."
10 "Gale parametere."
...
...
dlls/msi/msi_Pt.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "caminho %s não encontrado"
5 "caminho %s não encontrado"
9 "insira disco %s"
9 "insira disco %s"
10 "parâmetros inválidos"
10 "parâmetros inválidos"
...
...
dlls/msi/msi_Ru.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 " %s "
5 " %s "
9 " %s"
9 " %s"
10 " "
10 " "
...
...
dlls/msi/msi_Tr.rc
View file @
fb7646be
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
...
@@ -22,6 +22,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE DISCARDABLE
STRINGTABLE DISCARDABLE
{
{
4 "The specified installation package could not be opened. Please check the file path and try again."
5 "%s yolu bulunamad"
5 "%s yolu bulunamad"
9 "%s nolu diski yerletirin"
9 "%s nolu diski yerletirin"
10 "bozuk parametreler"
10 "bozuk parametreler"
...
...
dlls/msi/package.c
View file @
fb7646be
...
@@ -47,6 +47,8 @@
...
@@ -47,6 +47,8 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
msi
);
WINE_DEFAULT_DEBUG_CHANNEL
(
msi
);
extern
void
msi_ui_error
(
DWORD
msg_id
,
DWORD
type
);
static
void
MSI_FreePackage
(
MSIOBJECTHDR
*
arg
)
static
void
MSI_FreePackage
(
MSIOBJECTHDR
*
arg
)
{
{
MSIPACKAGE
*
package
=
(
MSIPACKAGE
*
)
arg
;
MSIPACKAGE
*
package
=
(
MSIPACKAGE
*
)
arg
;
...
@@ -549,7 +551,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage)
...
@@ -549,7 +551,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage)
DeleteFileW
(
file
);
DeleteFileW
(
file
);
if
(
r
!=
ERROR_SUCCESS
)
if
(
r
!=
ERROR_SUCCESS
)
{
if
(
GetLastError
()
==
ERROR_FILE_NOT_FOUND
)
msi_ui_error
(
4
,
MB_OK
|
MB_ICONWARNING
);
return
r
;
return
r
;
}
}
}
package
=
MSI_CreatePackage
(
db
);
package
=
MSI_CreatePackage
(
db
);
...
...
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