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
0a284208
Commit
0a284208
authored
Feb 25, 2011
by
Austin English
Committed by
Alexandre Julliard
Feb 28, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi/tests: Remove win9x hacks.
parent
5ed5f21d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
38 deletions
+1
-38
action.c
dlls/msi/tests/action.c
+1
-38
No files found.
dlls/msi/tests/action.c
View file @
0a284208
...
@@ -50,7 +50,6 @@ static HMODULE hsrclient;
...
@@ -50,7 +50,6 @@ static HMODULE hsrclient;
static
BOOL
(
WINAPI
*
pSRRemoveRestorePoint
)(
DWORD
);
static
BOOL
(
WINAPI
*
pSRRemoveRestorePoint
)(
DWORD
);
static
BOOL
(
WINAPI
*
pSRSetRestorePointA
)(
RESTOREPOINTINFOA
*
,
STATEMGRSTATUS
*
);
static
BOOL
(
WINAPI
*
pSRSetRestorePointA
)(
RESTOREPOINTINFOA
*
,
STATEMGRSTATUS
*
);
static
BOOL
on_win9x
;
static
BOOL
is_wow64
;
static
BOOL
is_wow64
;
static
const
BOOL
is_64bit
=
sizeof
(
void
*
)
>
sizeof
(
int
);
static
const
BOOL
is_64bit
=
sizeof
(
void
*
)
>
sizeof
(
int
);
...
@@ -1850,8 +1849,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi
...
@@ -1850,8 +1849,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi
DWORD
dwCreateDisposition
=
OPEN_EXISTING
;
DWORD
dwCreateDisposition
=
OPEN_EXISTING
;
dwAccess
=
GENERIC_READ
|
GENERIC_WRITE
;
dwAccess
=
GENERIC_READ
|
GENERIC_WRITE
;
/* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */
dwShareMode
=
FILE_SHARE_READ
|
FILE_SHARE_WRITE
|
FILE_SHARE_DELETE
;
dwShareMode
=
FILE_SHARE_READ
|
FILE_SHARE_WRITE
;
if
(
GetFileAttributesA
(
pszFile
)
!=
INVALID_FILE_ATTRIBUTES
)
if
(
GetFileAttributesA
(
pszFile
)
!=
INVALID_FILE_ATTRIBUTES
)
dwCreateDisposition
=
OPEN_EXISTING
;
dwCreateDisposition
=
OPEN_EXISTING
;
...
@@ -1965,19 +1963,6 @@ static BOOL is_process_limited(void)
...
@@ -1965,19 +1963,6 @@ static BOOL is_process_limited(void)
return
FALSE
;
return
FALSE
;
}
}
static
BOOL
check_win9x
(
void
)
{
SC_HANDLE
scm
;
scm
=
OpenSCManager
(
NULL
,
NULL
,
GENERIC_ALL
);
if
(
!
scm
&&
(
GetLastError
()
==
ERROR_CALL_NOT_IMPLEMENTED
))
return
TRUE
;
CloseServiceHandle
(
scm
);
return
FALSE
;
}
static
LPSTR
get_user_sid
(
LPSTR
*
usersid
)
static
LPSTR
get_user_sid
(
LPSTR
*
usersid
)
{
{
HANDLE
token
;
HANDLE
token
;
...
@@ -4613,11 +4598,6 @@ static void test_envvar(void)
...
@@ -4613,11 +4598,6 @@ static void test_envvar(void)
char
buffer
[
16
];
char
buffer
[
16
];
UINT
i
;
UINT
i
;
if
(
on_win9x
)
{
win_skip
(
"Environment variables are handled differently on Win9x and WinMe
\n
"
);
return
;
}
if
(
is_process_limited
())
if
(
is_process_limited
())
{
{
skip
(
"process is limited
\n
"
);
skip
(
"process is limited
\n
"
);
...
@@ -4787,11 +4767,6 @@ static void test_start_services(void)
...
@@ -4787,11 +4767,6 @@ static void test_start_services(void)
BOOL
ret
;
BOOL
ret
;
DWORD
error
=
ERROR_SUCCESS
;
DWORD
error
=
ERROR_SUCCESS
;
if
(
on_win9x
)
{
win_skip
(
"Services are not implemented on Win9x and WinMe
\n
"
);
return
;
}
scm
=
OpenSCManager
(
NULL
,
NULL
,
SC_MANAGER_ALL_ACCESS
);
scm
=
OpenSCManager
(
NULL
,
NULL
,
SC_MANAGER_ALL_ACCESS
);
if
(
!
scm
&&
GetLastError
()
==
ERROR_ACCESS_DENIED
)
if
(
!
scm
&&
GetLastError
()
==
ERROR_ACCESS_DENIED
)
{
{
...
@@ -4869,11 +4844,6 @@ static void test_delete_services(void)
...
@@ -4869,11 +4844,6 @@ static void test_delete_services(void)
{
{
UINT
r
;
UINT
r
;
if
(
on_win9x
)
{
win_skip
(
"Services are not implemented on Win9x and WinMe
\n
"
);
return
;
}
if
(
is_process_limited
())
if
(
is_process_limited
())
{
{
skip
(
"process is limited
\n
"
);
skip
(
"process is limited
\n
"
);
...
@@ -5528,11 +5498,6 @@ static void test_remove_env_strings(void)
...
@@ -5528,11 +5498,6 @@ static void test_remove_env_strings(void)
DWORD
type
,
size
;
DWORD
type
,
size
;
char
buffer
[
0x10
];
char
buffer
[
0x10
];
if
(
on_win9x
)
{
win_skip
(
"Environment variables are handled differently on win9x and winme
\n
"
);
return
;
}
if
(
is_process_limited
())
if
(
is_process_limited
())
{
{
skip
(
"process is limited
\n
"
);
skip
(
"process is limited
\n
"
);
...
@@ -6038,8 +6003,6 @@ START_TEST(action)
...
@@ -6038,8 +6003,6 @@ START_TEST(action)
init_functionpointers
();
init_functionpointers
();
on_win9x
=
check_win9x
();
if
(
pIsWow64Process
)
if
(
pIsWow64Process
)
pIsWow64Process
(
GetCurrentProcess
(),
&
is_wow64
);
pIsWow64Process
(
GetCurrentProcess
(),
&
is_wow64
);
...
...
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