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
4fb3518e
Commit
4fb3518e
authored
Oct 12, 2007
by
James Hawkins
Committed by
Alexandre Julliard
Oct 15, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
parent
ccabbeed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
10 deletions
+9
-10
dde_client.c
dlls/user32/dde_client.c
+7
-2
dde.c
dlls/user32/tests/dde.c
+2
-8
No files found.
dlls/user32/dde_client.c
View file @
4fb3518e
...
...
@@ -1141,8 +1141,13 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS
pXAct
=
WDML_ClientQueueExecute
(
pConv
,
pData
,
cbData
);
break
;
case
XTYP_POKE
:
pXAct
=
WDML_ClientQueuePoke
(
pConv
,
pData
,
cbData
,
wFmt
,
hszItem
);
break
;
if
(
!
hszItem
)
{
pConv
->
instance
->
lastError
=
DMLERR_INVALIDPARAMETER
;
return
0
;
}
pXAct
=
WDML_ClientQueuePoke
(
pConv
,
pData
,
cbData
,
wFmt
,
hszItem
);
break
;
case
XTYP_ADVSTART
|
XTYPF_NODATA
:
case
XTYP_ADVSTART
|
XTYPF_NODATA
|
XTYPF_ACKREQ
:
case
XTYP_ADVSTART
:
...
...
dlls/user32/tests/dde.c
View file @
4fb3518e
...
...
@@ -358,10 +358,7 @@ static void test_ddeml_client(void)
ret
=
DdeGetLastError
(
client_pid
);
ok
(
op
==
NULL
,
"Expected NULL, got %p
\n
"
,
op
);
ok
(
res
==
0xdeadbeef
,
"Expected 0xdeadbeef, got %d
\n
"
,
res
);
todo_wine
{
ok
(
ret
==
DMLERR_INVALIDPARAMETER
,
"Expected DMLERR_INVALIDPARAMETER, got %d
\n
"
,
ret
);
}
ok
(
ret
==
DMLERR_INVALIDPARAMETER
,
"Expected DMLERR_INVALIDPARAMETER, got %d
\n
"
,
ret
);
/* XTYP_POKE, no data */
res
=
0xdeadbeef
;
...
...
@@ -370,10 +367,7 @@ static void test_ddeml_client(void)
ret
=
DdeGetLastError
(
client_pid
);
ok
(
op
==
NULL
,
"Expected NULL, got %p
\n
"
,
op
);
ok
(
res
==
0xdeadbeef
,
"Expected 0xdeadbeef, got %d
\n
"
,
res
);
todo_wine
{
ok
(
ret
==
DMLERR_INVALIDPARAMETER
,
"Expected DMLERR_INVALIDPARAMETER, got %d
\n
"
,
ret
);
}
ok
(
ret
==
DMLERR_INVALIDPARAMETER
,
"Expected DMLERR_INVALIDPARAMETER, got %d
\n
"
,
ret
);
/* XTYP_POKE, wrong size */
res
=
0xdeadbeef
;
...
...
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