fix crash which happened if you called SetAttr(NULL) followed by SetAttr(attr) (...

[wxWidgets.git] / src / msw / dde.cpp

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 7604068ac6c1513ec4dd1f17f2a0c13b466bdbc0..550a8fc1cdd316045c2922d9b0ad6188d0f21498 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -557,8 +557,8 @@ wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
                  _T("wxDDEServer::Execute() supports only text data") );
 
     wxMemoryBuffer buffer;
-    LPBYTE realData wxDUMMY_INITIALIZE(NULL);
-    size_t realSize wxDUMMY_INITIALIZE(0);
+    LPBYTE realData = NULL;
+    size_t realSize = 0;
     wxMBConv *conv = NULL;
 
     // Windows only supports either ANSI or UTF-16 format depending on the
@@ -636,16 +636,16 @@ wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format)
 
     DWORD result;
     bool ok = DdeClientTransaction(realData,
-                                    realSize,
-                                    GetHConv(),
-                                    NULL,
-                                    // MSDN: if the transaction specified by
-                                    // the wType parameter does not pass data
-                                    // or is XTYP_EXECUTE, wFmt should be zero.
-                                    0,
-                                    XTYP_EXECUTE,
-                                    DDE_TIMEOUT,
-                                    &result) != 0;
+                                   realSize*sizeof(wxChar),
+                                   GetHConv(),
+                                   NULL,
+                                   // MSDN: if the transaction specified by
+                                   // the wType parameter does not pass data
+                                   // or is XTYP_EXECUTE, wFmt should be zero.
+                                   0,
+                                   XTYP_EXECUTE,
+                                   DDE_TIMEOUT,
+                                   &result) != 0;
 
     if ( !ok )
     {