James Hawkins : user32: Fix a test that now passes in Windows.
Module: wine Branch: master Commit: 0c22e540592816037df44449324e8ebee43265e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c22e540592816037df4444932... Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 25 15:25:27 2007 -0500 user32: Fix a test that now passes in Windows. --- dlls/user32/tests/dde.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 4f4e09c..e78c8c9 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -285,13 +285,20 @@ static void test_ddeml_client(void) DdeGetLastError(client_pid); hdata = DdeClientTransaction(NULL, 0, conversation, item, CF_TEXT, XTYP_REQUEST, default_timeout, &res); ret = DdeGetLastError(client_pid); - ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\n", res); + ok(hdata != NULL, "Expected non-NULL hdata, got %p\n", hdata); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); todo_wine { - ok(hdata == NULL, "Expected NULL hdata, got %p\n", hdata); - ok(ret == DMLERR_DATAACKTIMEOUT, "Expected DMLERR_DATAACKTIMEOUT, got %d\n", ret); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", res); } + str = (LPSTR)DdeAccessData(hdata, &size); + ok(!lstrcmpA(str, "requested data\r\n"), "Expected 'requested data\\r\\n', got %s\n", str); + ok(size == 19, "Expected 19, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + /* XTYP_REQUEST, fAckReq = TRUE */ res = 0xdeadbeef; DdeGetLastError(client_pid);
participants (1)
-
Alexandre Julliard