Changeset 26587 in vbox for trunk/src/VBox/Main/win

Timestamp:

Feb 16, 2010 4:57:09 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57775

Message:

Main: Bstr makeover (second attempt) -- make Bstr(NULL) and Bstr() behave the same; resulting cleanup; make some more internal methods use Utf8Str instead of Bstr; fix a lot of CheckComArgNotNull?() usage

Location:

trunk/src/VBox/Main/win

Files:

• NetIf-win.cpp (modified) (1 diff)
• svcmain.cpp (modified) (1 diff)

trunk/src/VBox/Main/win/NetIf-win.cpp

@@ -908 +908 @@
     if(hr == S_OK)
     {
-        size_t cUnicodeName = wcslen(lpszName) + 1;
-        size_t uniLen = (cUnicodeName * 2 + sizeof (OLECHAR) - 1) / sizeof (OLECHAR);
-        Bstr name (uniLen + 1 /* extra zero */);
-        wcscpy((wchar_t *) name.mutableRaw(), lpszName);
+        Bstr name(lpszName);
 
         hr = pncc->GetInstanceGuid(&IfGuid);

trunk/src/VBox/Main/win/svcmain.cpp

@@ -231 +231 @@
 
                 if (*lpszToken != NULL)
-                {
-                    Bstr str (lpszToken);
-                    LPCTSTR lpszToken2 = FindOneOf(lpszToken, szTokens);
-                    if (lpszToken2)
-                        str.mutableRaw()[lpszToken2 - lpszToken] = '\0';
                     pipeName = Utf8Str(lpszToken);
-                }
             }