Skip to content

W
wine-winehq
Commit ec49e417 authored by Jeff Latimer's avatar Jeff Latimer Committed by Alexandre Julliard
Browse files
Options

user32: DdeClientTransaction should return 0 in the last param for DDE_DATA.

parent fe0d5b55
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 14 deletions
dlls/user32/dde_client.c
View file @ ec49e417
...@@ -921,6 +921,7 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h ...@@ -921,6 +921,7 @@ static WDML_QUEUE_STATE WDML_HandleReply(WDML_CONV* pConv, MSG* msg, HDDEDATA* h
if (pConv->transactions) if (pConv->transactions)
{ {
if (ack) *ack = DDE_FNOTPROCESSED;
/* first check message against a pending transaction, if any */ /* first check message against a pending transaction, if any */
switch (pXAct->ddeMsg) switch (pXAct->ddeMsg)
{ {
......
dlls/user32/tests/dde.c
View file @ ec49e417
...@@ -291,11 +291,8 @@ static void test_ddeml_client(void) ...@@ -291,11 +291,8 @@ static void test_ddeml_client(void)
DdeGetLastError(client_pid); DdeGetLastError(client_pid);
hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
ret = DdeGetLastError(client_pid); ret = DdeGetLastError(client_pid);
ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
todo_wine ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %08x\n", res);
{
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", res);
}
if (hdata == NULL) if (hdata == NULL)
ok(FALSE, "hdata is NULL\n"); ok(FALSE, "hdata is NULL\n");
else else
...@@ -313,11 +310,9 @@ static void test_ddeml_client(void) ...@@ -313,11 +310,9 @@ static void test_ddeml_client(void)
DdeGetLastError(client_pid); DdeGetLastError(client_pid);
hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
ret = DdeGetLastError(client_pid); ret = DdeGetLastError(client_pid);
todo_wine
{
ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, 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);
}
if (hdata == NULL) if (hdata == NULL)
ok(FALSE, "hdata is NULL\n"); ok(FALSE, "hdata is NULL\n");
else else
...@@ -336,10 +331,7 @@ static void test_ddeml_client(void) ...@@ -336,10 +331,7 @@ static void test_ddeml_client(void)
hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
ret = DdeGetLastError(client_pid); ret = DdeGetLastError(client_pid);
ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
todo_wine
{
ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res);
}
if (hdata == NULL) if (hdata == NULL)
ok(FALSE, "hdata is NULL\n"); ok(FALSE, "hdata is NULL\n");
else else
...@@ -457,10 +449,7 @@ static void test_ddeml_client(void) ...@@ -457,10 +449,7 @@ static void test_ddeml_client(void)
hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res);
ret = DdeGetLastError(client_pid); ret = DdeGetLastError(client_pid);
ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret); ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", ret);
todo_wine
{
ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res); ok(res == DDE_FNOTPROCESSED, "Expected DDE_FNOTPROCESSED, got %d\n", res);
}
if (hdata == NULL) if (hdata == NULL)
ok(FALSE, "hdata is NULL\n"); ok(FALSE, "hdata is NULL\n");
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment