From 5ad6ef53a2921e373038c46e476050111bd53d1f Mon Sep 17 00:00:00 2001 From: Jeff Latimer Date: Thu, 4 Sep 2008 21:08:30 +1000 Subject: [PATCH] user32: DdeConnect causes 2 XTYP_CONNECT_CONFIRM messages to flow. Delete one. --- dlls/user32/dde_client.c | 2 -- dlls/user32/tests/dde.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 00b41c41d45..99e2d1ce279 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1331,8 +1331,6 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA pConv->wStatus |= ST_ISLOCAL; } - WDML_BroadcastDDEWindows(WDML_szEventClass, WM_WDML_CONNECT_CONFIRM, (WPARAM)hwnd, wParam); - GlobalDeleteAtom(uiLo); GlobalDeleteAtom(uiHi); diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 37da7f8d860..e06f72c78cb 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2170,7 +2170,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } case XTYP_CONNECT_CONFIRM: { - ok(msg_index == 3 || msg_index == 4 || msg_index == 8, "Expected 3 or 8, got %d\n", msg_index); + ok(msg_index == 3 || msg_index == 8, "Expected 3 or 8, got %d\n", msg_index); conversation = hconv; return (HDDEDATA) TRUE; } @@ -2178,7 +2178,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV { BYTE *buffer = NULL; - todo_wine ok(msg_index == 4 || msg_index == 9, "Expected 4 or 9, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d\n", uFmt); ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n", -- 2.11.4.GIT