Jeff Latimer : user32: DdeConnect causes 2 XTYP_CONNECT_CONFIRM messages to flow. Delete one.
Alexandre Julliard
julliard at winehq.org
Fri Sep 5 06:57:42 CDT 2008
Module: wine
Branch: master
Commit: 5ad6ef53a2921e373038c46e476050111bd53d1f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad6ef53a2921e373038c46e476050111bd53d1f
Author: Jeff Latimer <lats at yless4u.com.au>
Date: Thu Sep 4 21:08:30 2008 +1000
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 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c
index 00b41c4..99e2d1c 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 37da7f8..e06f72c 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",
More information about the wine-cvs
mailing list