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
56784f60
Commit
56784f60
authored
Jan 14, 2009
by
Jeff Latimer
Committed by
Alexandre Julliard
Jan 14, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Check for NULL pData in DdeClientTransAction expecting to be passed a handle.
parent
950514c8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
dde_client.c
dlls/user32/dde_client.c
+12
-6
dde.c
dlls/user32/tests/dde.c
+1
-4
No files found.
dlls/user32/dde_client.c
View file @
56784f60
...
...
@@ -632,6 +632,15 @@ static WDML_XACT* WDML_ClientQueueExecute(WDML_CONV* pConv, LPVOID pData, DWORD
TRACE
(
"XTYP_EXECUTE transaction
\n
"
);
if
(
pData
==
NULL
)
{
if
(
cbData
==
(
DWORD
)
-
1
)
pConv
->
instance
->
lastError
=
DMLERR_INVALIDPARAMETER
;
else
pConv
->
instance
->
lastError
=
DMLERR_MEMORY_ERROR
;
return
NULL
;
}
pXAct
=
WDML_AllocTransaction
(
pConv
->
instance
,
WM_DDE_EXECUTE
,
0
,
0
);
if
(
!
pXAct
)
return
NULL
;
...
...
@@ -1154,13 +1163,10 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS
switch
(
wType
)
{
case
XTYP_EXECUTE
:
/* Windows simply ignores hszItem and wFmt in this case */
if
(
pData
==
NULL
)
{
pConv
->
instance
->
lastError
=
DMLERR_INVALIDPARAMETER
;
return
0
;
}
/* Windows simply ignores hszItem and wFmt in this case */
pXAct
=
WDML_ClientQueueExecute
(
pConv
,
pData
,
cbData
);
if
(
pXAct
==
NULL
)
return
0
;
break
;
case
XTYP_POKE
:
if
(
!
hszItem
)
...
...
dlls/user32/tests/dde.c
View file @
56784f60
...
...
@@ -427,10 +427,7 @@ todo_wine
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_MEMORY_ERROR
,
"Expected DMLERR_MEMORY_ERROR, got %d
\n
"
,
ret
);
}
ok
(
ret
==
DMLERR_MEMORY_ERROR
,
"Expected DMLERR_MEMORY_ERROR, got %d
\n
"
,
ret
);
/* XTYP_EXECUTE, no data, -1 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