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
c2a4f381
Commit
c2a4f381
authored
Feb 27, 2024
by
Vijay Kiran Kamuju
Committed by
Alexandre Julliard
Feb 27, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
taskschd: Implement TaskService_get_ConnectedDomain.
Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=48110
parent
e1e0db6e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
2 deletions
+45
-2
task.c
dlls/taskschd/task.c
+24
-2
scheduler.c
dlls/taskschd/tests/scheduler.c
+21
-0
No files found.
dlls/taskschd/task.c
View file @
c2a4f381
...
@@ -3936,6 +3936,7 @@ typedef struct
...
@@ -3936,6 +3936,7 @@ typedef struct
DWORD
version
;
DWORD
version
;
WCHAR
comp_name
[
MAX_COMPUTERNAME_LENGTH
+
1
];
WCHAR
comp_name
[
MAX_COMPUTERNAME_LENGTH
+
1
];
WCHAR
user_name
[
256
];
WCHAR
user_name
[
256
];
WCHAR
domain_name
[
256
];
}
TaskService
;
}
TaskService
;
static
inline
TaskService
*
impl_from_ITaskService
(
ITaskService
*
iface
)
static
inline
TaskService
*
impl_from_ITaskService
(
ITaskService
*
iface
)
...
@@ -4108,6 +4109,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
...
@@ -4108,6 +4109,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
TaskService
*
task_svc
=
impl_from_ITaskService
(
iface
);
TaskService
*
task_svc
=
impl_from_ITaskService
(
iface
);
WCHAR
comp_name
[
MAX_COMPUTERNAME_LENGTH
+
1
];
WCHAR
comp_name
[
MAX_COMPUTERNAME_LENGTH
+
1
];
WCHAR
user_name
[
256
];
WCHAR
user_name
[
256
];
WCHAR
domain_name
[
256
];
DWORD
len
;
DWORD
len
;
HRESULT
hr
;
HRESULT
hr
;
RPC_WSTR
binding_str
;
RPC_WSTR
binding_str
;
...
@@ -4127,6 +4129,14 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
...
@@ -4127,6 +4129,14 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
if
(
!
GetUserNameW
(
user_name
,
&
len
))
if
(
!
GetUserNameW
(
user_name
,
&
len
))
return
HRESULT_FROM_WIN32
(
GetLastError
());
return
HRESULT_FROM_WIN32
(
GetLastError
());
len
=
ARRAY_SIZE
(
domain_name
);
if
(
!
GetEnvironmentVariableW
(
L"USERDOMAIN"
,
domain_name
,
len
))
{
if
(
!
GetComputerNameExW
(
ComputerNameDnsHostname
,
domain_name
,
&
len
))
return
HRESULT_FROM_WIN32
(
GetLastError
());
wcsupr
(
domain_name
);
}
if
(
!
is_variant_null
(
&
server
))
if
(
!
is_variant_null
(
&
server
))
{
{
const
WCHAR
*
server_name
;
const
WCHAR
*
server_name
;
...
@@ -4166,6 +4176,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
...
@@ -4166,6 +4176,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V
lstrcpyW
(
task_svc
->
comp_name
,
comp_name
);
lstrcpyW
(
task_svc
->
comp_name
,
comp_name
);
lstrcpyW
(
task_svc
->
user_name
,
user_name
);
lstrcpyW
(
task_svc
->
user_name
,
user_name
);
lstrcpyW
(
task_svc
->
domain_name
,
domain_name
);
task_svc
->
connected
=
TRUE
;
task_svc
->
connected
=
TRUE
;
return
S_OK
;
return
S_OK
;
...
@@ -4220,8 +4231,19 @@ static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *u
...
@@ -4220,8 +4231,19 @@ static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *u
static
HRESULT
WINAPI
TaskService_get_ConnectedDomain
(
ITaskService
*
iface
,
BSTR
*
domain
)
static
HRESULT
WINAPI
TaskService_get_ConnectedDomain
(
ITaskService
*
iface
,
BSTR
*
domain
)
{
{
FIXME
(
"%p,%p: stub
\n
"
,
iface
,
domain
);
TaskService
*
task_svc
=
impl_from_ITaskService
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p,%p
\n
"
,
iface
,
domain
);
if
(
!
domain
)
return
E_POINTER
;
if
(
!
task_svc
->
connected
)
return
HRESULT_FROM_WIN32
(
ERROR_ONLY_IF_CONNECTED
);
*
domain
=
SysAllocString
(
task_svc
->
domain_name
);
if
(
!*
domain
)
return
E_OUTOFMEMORY
;
return
S_OK
;
}
}
static
HRESULT
WINAPI
TaskService_get_HighestVersion
(
ITaskService
*
iface
,
DWORD
*
version
)
static
HRESULT
WINAPI
TaskService_get_HighestVersion
(
ITaskService
*
iface
,
DWORD
*
version
)
...
...
dlls/taskschd/tests/scheduler.c
View file @
c2a4f381
...
@@ -60,11 +60,13 @@ static BOOL check_win_version(int min_major, int min_minor)
...
@@ -60,11 +60,13 @@ static BOOL check_win_version(int min_major, int min_minor)
rtlver
.
dwMinorVersion
>=
min_minor
);
rtlver
.
dwMinorVersion
>=
min_minor
);
}
}
#define is_win8_plus() check_win_version(6, 2)
#define is_win8_plus() check_win_version(6, 2)
#define is_win10_plus() check_win_version(10, 0)
static
void
test_Connect
(
void
)
static
void
test_Connect
(
void
)
{
{
WCHAR
comp_name
[
MAX_COMPUTERNAME_LENGTH
+
1
];
WCHAR
comp_name
[
MAX_COMPUTERNAME_LENGTH
+
1
];
WCHAR
user_name
[
256
];
WCHAR
user_name
[
256
];
WCHAR
domain_name
[
256
];
DWORD
len
;
DWORD
len
;
HRESULT
hr
;
HRESULT
hr
;
BSTR
bstr
;
BSTR
bstr
;
...
@@ -100,6 +102,12 @@ static void test_Connect(void)
...
@@ -100,6 +102,12 @@ static void test_Connect(void)
hr
=
ITaskService_get_ConnectedUser
(
service
,
&
bstr
);
hr
=
ITaskService_get_ConnectedUser
(
service
,
&
bstr
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_ONLY_IF_CONNECTED
),
"expected ERROR_ONLY_IF_CONNECTED, got %#lx
\n
"
,
hr
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_ONLY_IF_CONNECTED
),
"expected ERROR_ONLY_IF_CONNECTED, got %#lx
\n
"
,
hr
);
hr
=
ITaskService_get_ConnectedDomain
(
service
,
NULL
);
ok
(
hr
==
E_POINTER
,
"expected E_POINTER, got %#lx
\n
"
,
hr
);
hr
=
ITaskService_get_ConnectedDomain
(
service
,
&
bstr
);
ok
(
hr
==
HRESULT_FROM_WIN32
(
ERROR_ONLY_IF_CONNECTED
),
"expected ERROR_ONLY_IF_CONNECTED, got %#lx
\n
"
,
hr
);
/* Win7 doesn't support UNC \\ prefix, but according to a user
/* Win7 doesn't support UNC \\ prefix, but according to a user
* comment on MSDN Win8 supports both ways.
* comment on MSDN Win8 supports both ways.
*/
*/
...
@@ -159,6 +167,19 @@ static void test_Connect(void)
...
@@ -159,6 +167,19 @@ static void test_Connect(void)
ok
(
!
lstrcmpW
(
user_name
,
bstr
),
"username %s != user name %s
\n
"
,
wine_dbgstr_w
(
user_name
),
wine_dbgstr_w
(
bstr
));
ok
(
!
lstrcmpW
(
user_name
,
bstr
),
"username %s != user name %s
\n
"
,
wine_dbgstr_w
(
user_name
),
wine_dbgstr_w
(
bstr
));
SysFreeString
(
bstr
);
SysFreeString
(
bstr
);
len
=
ARRAY_SIZE
(
domain_name
);
if
(
!
GetEnvironmentVariableW
(
L"USERDOMAIN"
,
domain_name
,
len
))
{
GetComputerNameExW
(
ComputerNameDnsHostname
,
domain_name
,
&
len
);
if
(
is_win10_plus
())
wcsupr
(
domain_name
);
}
hr
=
ITaskService_get_ConnectedDomain
(
service
,
&
bstr
);
ok
(
hr
==
S_OK
,
"get_ConnectedDomain error %#lx
\n
"
,
hr
);
ok
(
!
lstrcmpW
(
domain_name
,
bstr
),
"domainname %s != domain name %s
\n
"
,
wine_dbgstr_w
(
domain_name
),
wine_dbgstr_w
(
bstr
));
SysFreeString
(
bstr
);
ITaskService_Release
(
service
);
ITaskService_Release
(
service
);
}
}
...
...
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