Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
4fb3518e
Commit
4fb3518e
authored
17 years ago
by
James Hawkins
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
parent
ccabbeed
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/user32/dde_client.c
+7
-2
7 additions, 2 deletions
dlls/user32/dde_client.c
dlls/user32/tests/dde.c
+2
-8
2 additions, 8 deletions
dlls/user32/tests/dde.c
with
9 additions
and
10 deletions
dlls/user32/dde_client.c
+
7
−
2
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
:
...
...
This diff is collapsed.
Click to expand it.
dlls/user32/tests/dde.c
+
2
−
8
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment