user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
This commit is contained in:
parent
dbad0ee626
commit
97dc032161
|
@ -1163,7 +1163,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS
|
||||||
pXAct = WDML_ClientQueueUnadvise(pConv, wFmt, hszItem);
|
pXAct = WDML_ClientQueueUnadvise(pConv, wFmt, hszItem);
|
||||||
break;
|
break;
|
||||||
case XTYP_REQUEST:
|
case XTYP_REQUEST:
|
||||||
if (pData)
|
if (pData || !hszItem)
|
||||||
{
|
{
|
||||||
pConv->instance->lastError = DMLERR_INVALIDPARAMETER;
|
pConv->instance->lastError = DMLERR_INVALIDPARAMETER;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -353,10 +353,7 @@ static void test_ddeml_client(void)
|
||||||
ret = DdeGetLastError(client_pid);
|
ret = DdeGetLastError(client_pid);
|
||||||
ok(hdata == NULL, "Expected NULL hdata, got %p\n", hdata);
|
ok(hdata == NULL, "Expected NULL hdata, got %p\n", hdata);
|
||||||
ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\n", res);
|
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);
|
DdeFreeStringHandle(client_pid, item);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue