Commit 5ad6ef53 authored by Jeff Latimer's avatar Jeff Latimer Committed by Alexandre Julliard

user32: DdeConnect causes 2 XTYP_CONNECT_CONFIRM messages to flow. Delete one.

parent 4c3e55dd
...@@ -1331,8 +1331,6 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA ...@@ -1331,8 +1331,6 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA
pConv->wStatus |= ST_ISLOCAL; pConv->wStatus |= ST_ISLOCAL;
} }
WDML_BroadcastDDEWindows(WDML_szEventClass, WM_WDML_CONNECT_CONFIRM, (WPARAM)hwnd, wParam);
GlobalDeleteAtom(uiLo); GlobalDeleteAtom(uiLo);
GlobalDeleteAtom(uiHi); GlobalDeleteAtom(uiHi);
......
...@@ -2170,7 +2170,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ...@@ -2170,7 +2170,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV
} }
case XTYP_CONNECT_CONFIRM: 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; conversation = hconv;
return (HDDEDATA) TRUE; return (HDDEDATA) TRUE;
} }
...@@ -2178,7 +2178,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ...@@ -2178,7 +2178,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV
{ {
BYTE *buffer = NULL; BYTE *buffer = NULL;
todo_wine
ok(msg_index == 4 || msg_index == 9, "Expected 4 or 9, got %d\n", msg_index); 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(uFmt == 0, "Expected 0, got %d\n", uFmt);
ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n", ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n",
......
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