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
b7193384
Commit
b7193384
authored
Oct 11, 2010
by
Hans Leidekker
Committed by
Alexandre Julliard
Oct 11, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi/tests: Use a different product code in the automation tests.
parent
3d33fb93
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
automation.c
dlls/msi/tests/automation.c
+8
-8
No files found.
dlls/msi/tests/automation.c
View file @
b7193384
...
@@ -42,7 +42,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
...
@@ -42,7 +42,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
static
const
char
*
msifile
=
"winetest-automation.msi"
;
static
const
char
*
msifile
=
"winetest-automation.msi"
;
static
const
WCHAR
szMsifile
[]
=
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'-'
,
'a'
,
'u'
,
't'
,
'o'
,
'm'
,
'a'
,
't'
,
'i'
,
'o'
,
'n'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
static
const
WCHAR
szMsifile
[]
=
{
'w'
,
'i'
,
'n'
,
'e'
,
't'
,
'e'
,
's'
,
't'
,
'-'
,
'a'
,
'u'
,
't'
,
'o'
,
'm'
,
'a'
,
't'
,
'i'
,
'o'
,
'n'
,
'.'
,
'm'
,
's'
,
'i'
,
0
};
static
const
WCHAR
szMSITEST
[]
=
{
'M'
,
'S'
,
'I'
,
'T'
,
'E'
,
'S'
,
'T'
,
0
};
static
const
WCHAR
szMSITEST
[]
=
{
'M'
,
'S'
,
'I'
,
'T'
,
'E'
,
'S'
,
'T'
,
0
};
static
const
WCHAR
szProductCode
[]
=
{
'{'
,
'
F'
,
'1'
,
'C'
,
'3'
,
'A'
,
'F'
,
'5'
,
'0'
,
'-'
,
'8'
,
'B'
,
'5'
,
'6'
,
'-'
,
'4'
,
'A'
,
'6'
,
'9'
,
'-'
,
'A'
,
'0'
,
'0'
,
'C'
,
'-'
,
'0'
,
'0'
,
'7'
,
'7'
,
'3'
,
'F'
,
'E'
,
'4'
,
'2'
,
'F'
,
'3'
,
'0
'
,
'}'
,
0
};
static
const
WCHAR
szProductCode
[]
=
{
'{'
,
'
8'
,
'3'
,
'7'
,
'4'
,
'5'
,
'0'
,
'f'
,
'a'
,
'-'
,
'a'
,
'3'
,
'9'
,
'b'
,
'-'
,
'4'
,
'b'
,
'c'
,
'8'
,
'-'
,
'b'
,
'3'
,
'2'
,
'1'
,
'-'
,
'0'
,
'8'
,
'b'
,
'3'
,
'9'
,
'3'
,
'f'
,
'7'
,
'8'
,
'4'
,
'b'
,
'3
'
,
'}'
,
0
};
static
const
WCHAR
szUpgradeCode
[]
=
{
'{'
,
'C'
,
'E'
,
'0'
,
'6'
,
'7'
,
'E'
,
'8'
,
'D'
,
'-'
,
'2'
,
'E'
,
'1'
,
'A'
,
'-'
,
'4'
,
'3'
,
'6'
,
'7'
,
'-'
,
'B'
,
'7'
,
'3'
,
'4'
,
'-'
,
'4'
,
'E'
,
'B'
,
'2'
,
'B'
,
'D'
,
'A'
,
'D'
,
'6'
,
'5'
,
'6'
,
'5'
,
'}'
,
0
};
static
const
WCHAR
szUpgradeCode
[]
=
{
'{'
,
'C'
,
'E'
,
'0'
,
'6'
,
'7'
,
'E'
,
'8'
,
'D'
,
'-'
,
'2'
,
'E'
,
'1'
,
'A'
,
'-'
,
'4'
,
'3'
,
'6'
,
'7'
,
'-'
,
'B'
,
'7'
,
'3'
,
'4'
,
'-'
,
'4'
,
'E'
,
'B'
,
'2'
,
'B'
,
'D'
,
'A'
,
'D'
,
'6'
,
'5'
,
'6'
,
'5'
,
'}'
,
0
};
static
const
WCHAR
szProductInfoException
[]
=
{
'P'
,
'r'
,
'o'
,
'd'
,
'u'
,
'c'
,
't'
,
'I'
,
'n'
,
'f'
,
'o'
,
','
,
'P'
,
'r'
,
'o'
,
'd'
,
'u'
,
'c'
,
't'
,
','
,
'A'
,
't'
,
't'
,
'r'
,
'i'
,
'b'
,
'u'
,
't'
,
'e'
,
0
};
static
const
WCHAR
szProductInfoException
[]
=
{
'P'
,
'r'
,
'o'
,
'd'
,
'u'
,
'c'
,
't'
,
'I'
,
'n'
,
'f'
,
'o'
,
','
,
'P'
,
'r'
,
'o'
,
'd'
,
'u'
,
'c'
,
't'
,
','
,
'A'
,
't'
,
't'
,
'r'
,
'i'
,
'b'
,
'u'
,
't'
,
'e'
,
0
};
static
const
WCHAR
WINE_INSTALLPROPERTY_PACKAGENAMEW
[]
=
{
'P'
,
'a'
,
'c'
,
'k'
,
'a'
,
'g'
,
'e'
,
'N'
,
'a'
,
'm'
,
'e'
,
0
};
static
const
WCHAR
WINE_INSTALLPROPERTY_PACKAGENAMEW
[]
=
{
'P'
,
'a'
,
'c'
,
'k'
,
'a'
,
'g'
,
'e'
,
'N'
,
'a'
,
'm'
,
'e'
,
0
};
...
@@ -141,7 +141,7 @@ static const CHAR property_dat[] = "Property\tValue\n"
...
@@ -141,7 +141,7 @@ static const CHAR property_dat[] = "Property\tValue\n"
"InstallMode
\t
Typical
\n
"
"InstallMode
\t
Typical
\n
"
"Manufacturer
\t
Wine
\n
"
"Manufacturer
\t
Wine
\n
"
"PIDTemplate
\t
12345<###-%%%%%%%>@@@@@
\n
"
"PIDTemplate
\t
12345<###-%%%%%%%>@@@@@
\n
"
"ProductCode
\t
{
F1C3AF50-8B56-4A69-A00C-00773FE42F30
}
\n
"
"ProductCode
\t
{
837450fa-a39b-4bc8-b321-08b393f784b3
}
\n
"
"ProductID
\t
none
\n
"
"ProductID
\t
none
\n
"
"ProductLanguage
\t
1033
\n
"
"ProductLanguage
\t
1033
\n
"
"ProductName
\t
MSITEST
\n
"
"ProductName
\t
MSITEST
\n
"
...
@@ -2548,7 +2548,7 @@ static void test_Installer_InstallProduct(void)
...
@@ -2548,7 +2548,7 @@ static void test_Installer_InstallProduct(void)
/* Remove registry keys written by RegisterProduct standard action */
/* Remove registry keys written by RegisterProduct standard action */
res
=
delete_key_portable
(
HKEY_LOCAL_MACHINE
,
res
=
delete_key_portable
(
HKEY_LOCAL_MACHINE
,
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Uninstall
\\
{
F1C3AF50-8B56-4A69-A00C-00773FE42F30
}"
,
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Uninstall
\\
{
837450fa-a39b-4bc8-b321-08b393f784b3
}"
,
KEY_WOW64_32KEY
);
KEY_WOW64_32KEY
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
...
@@ -2557,32 +2557,32 @@ static void test_Installer_InstallProduct(void)
...
@@ -2557,32 +2557,32 @@ static void test_Installer_InstallProduct(void)
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
res
=
find_registry_key
(
HKEY_LOCAL_MACHINE
,
res
=
find_registry_key
(
HKEY_LOCAL_MACHINE
,
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Installer
\\
UserData"
,
"
05FA3C1F65B896A40AC00077F34EF203
"
,
access
,
&
hkey
);
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Installer
\\
UserData"
,
"
af054738b93a8cb43b12803b397f483b
"
,
access
,
&
hkey
);
ok
(
res
==
ERROR_SUCCESS
||
ok
(
res
==
ERROR_SUCCESS
||
broken
(
res
==
ERROR_FILE_NOT_FOUND
),
/* win9x */
broken
(
res
==
ERROR_FILE_NOT_FOUND
),
/* win9x */
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
if
(
res
==
ERROR_SUCCESS
)
if
(
res
==
ERROR_SUCCESS
)
{
{
res
=
delete_registry_key
(
hkey
,
"
05FA3C1F65B896A40AC00077F34EF203
"
,
access
);
res
=
delete_registry_key
(
hkey
,
"
af054738b93a8cb43b12803b397f483b
"
,
access
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
RegCloseKey
(
hkey
);
RegCloseKey
(
hkey
);
res
=
delete_key_portable
(
HKEY_LOCAL_MACHINE
,
res
=
delete_key_portable
(
HKEY_LOCAL_MACHINE
,
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Installer
\\
Products
\\
05FA3C1F65B896A40AC00077F34EF203
"
,
access
);
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Installer
\\
Products
\\
af054738b93a8cb43b12803b397f483b
"
,
access
);
ok
(
res
==
ERROR_FILE_NOT_FOUND
,
"Expected ERROR_FILE_NOT_FOUND, got %d
\n
"
,
res
);
ok
(
res
==
ERROR_FILE_NOT_FOUND
,
"Expected ERROR_FILE_NOT_FOUND, got %d
\n
"
,
res
);
}
}
else
else
{
{
/* win9x defaults to a per-machine install. */
/* win9x defaults to a per-machine install. */
delete_key_portable
(
HKEY_LOCAL_MACHINE
,
delete_key_portable
(
HKEY_LOCAL_MACHINE
,
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Installer
\\
Products
\\
05FA3C1F65B896A40AC00077F34EF203
"
,
access
);
"SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Installer
\\
Products
\\
af054738b93a8cb43b12803b397f483b
"
,
access
);
}
}
/* Remove registry keys written by PublishProduct standard action */
/* Remove registry keys written by PublishProduct standard action */
res
=
RegOpenKey
(
HKEY_CURRENT_USER
,
"SOFTWARE
\\
Microsoft
\\
Installer"
,
&
hkey
);
res
=
RegOpenKey
(
HKEY_CURRENT_USER
,
"SOFTWARE
\\
Microsoft
\\
Installer"
,
&
hkey
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
res
=
delete_registry_key
(
hkey
,
"Products
\\
05FA3C1F65B896A40AC00077F34EF203
"
,
KEY_ALL_ACCESS
);
res
=
delete_registry_key
(
hkey
,
"Products
\\
af054738b93a8cb43b12803b397f483b
"
,
KEY_ALL_ACCESS
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
ok
(
res
==
ERROR_SUCCESS
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
res
);
res
=
RegDeleteKeyA
(
hkey
,
"UpgradeCodes
\\
D8E760ECA1E276347B43E42BDBDA5656"
);
res
=
RegDeleteKeyA
(
hkey
,
"UpgradeCodes
\\
D8E760ECA1E276347B43E42BDBDA5656"
);
...
...
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