X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/119f7bb745b1a6cbdcddf1a95577bbee2f3150bf..6f02a879ed7efc5fcf6328ff47a1352ec82812b7:/src/msw/utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 672db64220..45f268a510 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -31,6 +31,7 @@
     #include "wx/log.h"
 #endif  //WX_PRECOMP
 
+#include "wx/msw/registry.h"
 #include "wx/apptrait.h"
 #include "wx/dynlib.h"
 #include "wx/dynload.h"
@@ -288,13 +289,15 @@ bool wxGetUserName(wxChar *buf, int maxSize)
     wxCHECK_MSG( buf && ( maxSize > 0 ), false,
                     _T("empty buffer in wxGetUserName") );
 #if defined(__WXWINCE__)
-    wxRegKey key(wxRegKey::HKCU, wxT("Control Panel\\Owner\\Owner"));
+    wxLogNull noLog;
+    wxRegKey key(wxRegKey::HKCU, wxT("ControlPanel\\Owner"));
     if(!key.Open(wxRegKey::Read))
         return false;
     wxString name;
-    if(!key.QueryValue(wxEmptyString, name))
+    if(!key.QueryValue(wxT("Owner"),name))
         return false;
-    wxStrncpy(buf, name.c_str(), maxSize);
+    wxStrncpy(buf, name.c_str(), maxSize-1);
+    buf[maxSize-1] = _T('\0');
     return true;
 #elif defined(USE_NET_API)
     CHAR szUserName[256];