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
f6d63654
Commit
f6d63654
authored
Apr 02, 2018
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Apr 02, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
taskschd: IRegistrationInfo::put_Source() should accept NULL input.
Signed-off-by:
Dmitry Timoshkov
<
dmitry@baikal.ru
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
eb39956b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
6 deletions
+20
-6
task.c
dlls/taskschd/task.c
+10
-5
scheduler.c
dlls/taskschd/tests/scheduler.c
+10
-1
No files found.
dlls/taskschd/task.c
View file @
f6d63654
...
...
@@ -767,15 +767,14 @@ static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR
static
HRESULT
WINAPI
RegistrationInfo_put_Source
(
IRegistrationInfo
*
iface
,
BSTR
source
)
{
registration_info
*
reginfo
=
impl_from_IRegistrationInfo
(
iface
);
WCHAR
*
str
=
NULL
;
TRACE
(
"%p,%s
\n
"
,
iface
,
debugstr_w
(
source
));
if
(
!
source
)
return
E_INVALIDARG
;
if
(
source
&&
!
(
str
=
heap_strdupW
(
source
)))
return
E_OUTOFMEMORY
;
heap_free
(
reginfo
->
source
);
reginfo
->
source
=
heap_strdupW
(
source
);
/* FIXME: update XML on the server side */
return
reginfo
->
source
?
S_OK
:
E_OUTOFMEMORY
;
reginfo
->
source
=
str
;
return
S_OK
;
}
static
const
IRegistrationInfoVtbl
RegistrationInfo_vtbl
=
...
...
@@ -3341,6 +3340,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf
if
(
hr
==
S_OK
)
IRegistrationInfo_put_URI
(
info
,
value
);
}
else
if
(
!
lstrcmpW
(
name
,
Source
))
{
hr
=
read_text_value
(
reader
,
&
value
);
if
(
hr
==
S_OK
)
IRegistrationInfo_put_Source
(
info
,
value
);
}
else
FIXME
(
"unhandled RegistrationInfo element %s
\n
"
,
debugstr_w
(
name
));
...
...
dlls/taskschd/tests/scheduler.c
View file @
f6d63654
...
...
@@ -1429,6 +1429,7 @@ static void test_TaskDefinition(void)
" <Date>2018-04-02T11:22:33</Date>
\n
"
" <Documentation>doc</Documentation>
\n
"
" <URI>uri</URI>
\n
"
" <Source>source</Source>
\n
"
" </RegistrationInfo>
\n
"
" <Settings>
\n
"
" <Enabled>false</Enabled>
\n
"
...
...
@@ -1513,6 +1514,7 @@ static void test_TaskDefinition(void)
static
const
WCHAR
dateW
[]
=
{
'2'
,
'0'
,
'1'
,
'8'
,
'-'
,
'0'
,
'4'
,
'-'
,
'0'
,
'2'
,
'T'
,
'1'
,
'1'
,
':'
,
'2'
,
'2'
,
':'
,
'3'
,
'3'
,
0
};
static
const
WCHAR
docW
[]
=
{
'd'
,
'o'
,
'c'
,
0
};
static
const
WCHAR
uriW
[]
=
{
'u'
,
'r'
,
'i'
,
0
};
static
const
WCHAR
sourceW
[]
=
{
's'
,
'o'
,
'u'
,
'r'
,
'c'
,
'e'
,
0
};
static
WCHAR
Task1
[]
=
{
'"'
,
'T'
,
'a'
,
's'
,
'k'
,
'1'
,
'"'
,
0
};
static
struct
settings
def_settings
=
{
{
0
},
{
'P'
,
'T'
,
'7'
,
'2'
,
'H'
,
0
},
{
0
},
0
,
7
,
TASK_INSTANCES_IGNORE_NEW
,
TASK_COMPATIBILITY_V2
,
VARIANT_TRUE
,
VARIANT_TRUE
,
...
...
@@ -1676,7 +1678,15 @@ todo_wine
hr
=
IRegistrationInfo_get_Source
(
reginfo
,
&
bstr
);
ok
(
hr
==
S_OK
,
"get_Source error %#x
\n
"
,
hr
);
ok
(
!
lstrcmpW
(
bstr
,
sourceW
),
"expected %s, got %s
\n
"
,
wine_dbgstr_w
(
sourceW
),
wine_dbgstr_w
(
bstr
));
SysFreeString
(
bstr
);
hr
=
IRegistrationInfo_put_Source
(
reginfo
,
NULL
);
ok
(
hr
==
S_OK
,
"put_Source error %#x
\n
"
,
hr
);
bstr
=
(
BSTR
)
0xdeadbeef
;
hr
=
IRegistrationInfo_get_Source
(
reginfo
,
&
bstr
);
ok
(
hr
==
S_OK
,
"get_Source error %#x
\n
"
,
hr
);
ok
(
!
bstr
,
"expected NULL, got %s
\n
"
,
wine_dbgstr_w
(
bstr
));
V_VT
(
&
var
)
=
VT_BSTR
;
V_BSTR
(
&
var
)
=
NULL
;
hr
=
IRegistrationInfo_get_SecurityDescriptor
(
reginfo
,
&
var
);
...
...
@@ -1695,7 +1705,6 @@ if (hr == S_OK)
hr
=
IRegistrationInfo_get_Description
(
reginfo
,
&
bstr
);
ok
(
hr
==
S_OK
,
"get_Description error %#x
\n
"
,
hr
);
if
(
hr
==
S_OK
)
ok
(
!
bstr
,
"expected NULL, got %s
\n
"
,
wine_dbgstr_w
(
bstr
));
hr
=
ITaskDefinition_get_Triggers
(
taskdef
,
&
trigger_col
);
...
...
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