X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b1350d49d4366b1e1a59ff5bafadcf3336d00a7..8cbc59fe84f046685b873cf58f6c56debe59de1c:/src/msw/dde.cpp?ds=inline

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 7604068ac6..20bbe4bb23 100644
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -418,7 +418,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
 
     if ( !hszServer )
     {
-        return (wxConnectionBase*) NULL;
+        return NULL;
     }
 
 
@@ -427,7 +427,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
     if ( !hszTopic )
     {
         DDEFreeString(hszServer);
-        return (wxConnectionBase*) NULL;
+        return NULL;
     }
 
 
@@ -457,7 +457,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
         }
     }
 
-    return (wxConnectionBase*) NULL;
+    return NULL;
 }
 
 wxConnectionBase *wxDDEClient::OnMakeConnection()
@@ -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 )
     {