James Hawkins : user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
Alexandre Julliard
julliard at winehq.org
Tue Oct 16 07:59:33 CDT 2007
Module: wine
Branch: master
Commit: 97dc03216183d803e73d30a8ad9d679c28f10c07
URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dc03216183d803e73d30a8ad9d679c28f10c07
Author: James Hawkins <truiken at gmail.com>
Date: Fri Oct 12 00:14:34 2007 -0500
user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
---
dlls/user32/dde_client.c | 2 +-
dlls/user32/tests/dde.c | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c
index cb9fbc8..78987c5 100644
--- a/dlls/user32/dde_client.c
+++ b/dlls/user32/dde_client.c
@@ -1163,7 +1163,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS
pXAct = WDML_ClientQueueUnadvise(pConv, wFmt, hszItem);
break;
case XTYP_REQUEST:
- if (pData)
+ if (pData || !hszItem)
{
pConv->instance->lastError = DMLERR_INVALIDPARAMETER;
return 0;
diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c
index cea7846..9755cf4 100644
--- a/dlls/user32/tests/dde.c
+++ b/dlls/user32/tests/dde.c
@@ -353,10 +353,7 @@ static void test_ddeml_client(void)
ret = DdeGetLastError(client_pid);
ok(hdata == NULL, "Expected NULL hdata, got %p\n", hdata);
ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\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, item);
More information about the wine-cvs
mailing list