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
70ebae34
Commit
70ebae34
authored
Aug 05, 2008
by
Jeff Latimer
Committed by
Alexandre Julliard
Aug 18, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: DdeClientTransaction should check that pData is not NULL for XTYP_REQUEST.
parent
04a59014
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
dde_client.c
dlls/user32/dde_client.c
+5
-0
dde.c
dlls/user32/tests/dde.c
+0
-3
No files found.
dlls/user32/dde_client.c
View file @
70ebae34
...
@@ -1154,6 +1154,11 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS
...
@@ -1154,6 +1154,11 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS
{
{
case
XTYP_EXECUTE
:
case
XTYP_EXECUTE
:
/* Windows simply ignores hszItem and wFmt in this case */
/* Windows simply ignores hszItem and wFmt in this case */
if
(
pData
==
NULL
)
{
pConv
->
instance
->
lastError
=
DMLERR_INVALIDPARAMETER
;
return
0
;
}
pXAct
=
WDML_ClientQueueExecute
(
pConv
,
pData
,
cbData
);
pXAct
=
WDML_ClientQueueExecute
(
pConv
,
pData
,
cbData
);
break
;
break
;
case
XTYP_POKE
:
case
XTYP_POKE
:
...
...
dlls/user32/tests/dde.c
View file @
70ebae34
...
@@ -433,10 +433,7 @@ todo_wine
...
@@ -433,10 +433,7 @@ todo_wine
ret
=
DdeGetLastError
(
client_pid
);
ret
=
DdeGetLastError
(
client_pid
);
ok
(
op
==
NULL
,
"Expected NULL, got %p
\n
"
,
op
);
ok
(
op
==
NULL
,
"Expected NULL, got %p
\n
"
,
op
);
ok
(
res
==
0xdeadbeef
,
"Expected 0xdeadbeef, got %d
\n
"
,
res
);
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
);
}
DdeFreeStringHandle
(
client_pid
,
topic
);
DdeFreeStringHandle
(
client_pid
,
topic
);
DdeFreeDataHandle
(
hdata
);
DdeFreeDataHandle
(
hdata
);
...
...
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