Changeset 93395 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 21, 2022 12:17:48 PM (3 years ago)

Author:

vboxsync

Message:

VBoxTray/Clipboard: Don't split log messages over multiple lines, except on newline. s/pMem/pvMem/g; The type alignment by means of leading spaces for 'cb' and 'cbPrealloc' drives me crazy, don't do that! bugref:10160

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -345 +345 @@
             else
             {
-                const uint32_t cbPrealloc = _4K;
-                      uint32_t cb         = 0;
+                uint32_t const cbPrealloc = _4K;
+                uint32_t       cb         = 0;
 
                 /* Preallocate a buffer, most of small text transfers will fit into it. */
@@ -352 +352 @@
                 if (hMem)
                 {
-                    void *pMem = GlobalLock(hMem);
-                    if (pMem)
+                    void *pvMem = GlobalLock(hMem);
+                    if (pvMem)
                     {
                         /* Read the host data to the preallocated buffer. */
-                        int rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pMem, cbPrealloc, &cb);
+                        int rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pvMem, cbPrealloc, &cb);
                         if (RT_SUCCESS(rc))
                         {
@@ -378 +378 @@
                                 if (hMem)
                                 {
-                                    pMem = GlobalLock(hMem);
-                                    if (pMem)
+                                    pvMem = GlobalLock(hMem);
+                                    if (pvMem)
                                     {
                                         /* Read the host data to the preallocated buffer. */
                                         uint32_t cbNew = 0;
-                                        rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pMem, cb, &cbNew);
+                                        rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pvMem, cb, &cbNew);
                                         if (   RT_SUCCESS(rc)
                                             && cbNew <= cb)
@@ -412 +412 @@
                             if (hMem)
                             {
-                                /* pMem is the address of the data. cb is the size of returned data. */
+                                /* pvMem is the address of the data. cb is the size of returned data. */
                                 /* Verify the size of returned text, the memory block for clipboard
                                  * must have the exact string size.
@@ -419 +419 @@
                                 {
                                     size_t cbActual = 0;
-                                    HRESULT hrc = StringCbLengthW((LPWSTR)pMem, cb, &cbActual);
+                                    HRESULT hrc = StringCbLengthW((LPWSTR)pvMem, cb, &cbActual);
                                     if (FAILED(hrc))
                                     {
@@ -441 +441 @@
                                 {
                                     /* Wrap content into CF_HTML clipboard format if needed. */
-                                    if (!SharedClipboardWinIsCFHTML((const char *)pMem))
+                                    if (!SharedClipboardWinIsCFHTML((const char *)pvMem))
                                     {
                                         char *pszWrapped = NULL;
                                         uint32_t cbWrapped = 0;
-                                        rc =  SharedClipboardWinConvertMIMEToCFHTML((const char *)pMem, cb, &pszWrapped, &cbWrapped);
+                                        rc = SharedClipboardWinConvertMIMEToCFHTML((const char *)pvMem, cb,
+                                                                                   &pszWrapped, &cbWrapped);
                                         if (RT_SUCCESS(rc))
                                         {
@@ -453 +454 @@
                                                 if (hMem)
                                                 {
-                                                    pMem = GlobalLock(hMem);
-                                                    if (pMem)
+                                                    pvMem = GlobalLock(hMem);
+                                                    if (pvMem)
                                                     {
                                                         /* Copy wrapped content back to memory passed to system clipboard. */
-                                                        memcpy(pMem, pszWrapped, cbWrapped);
+                                                        memcpy(pvMem, pszWrapped, cbWrapped);
                                                         cb = cbWrapped;
                                                     }
                                                     else
                                                     {
-                                                        LogRel(("Shared Clipboard: Cannot lock memory, "
-                                                                "HTML clipboard data won't be converted into CF_HTML clipboard format\n"));
+                                                        LogRel(("Shared Clipboard: Failed to lock memory (%u), HTML clipboard data won't be converted into CF_HTML clipboard format\n", GetLastError()));
                                                         GlobalFree(hMem);
                                                         hMem = NULL;
@@ -469 +469 @@
                                                 }
                                                 else
-                                                    LogRel(("Shared Clipboard: Cannot re-allocate memory, "
-                                                            "HTML clipboard data won't be converted into CF_HTML clipboard format\n"));
+                                                    LogRel(("Shared Clipboard: Failed to re-allocate memory (%u), HTML clipboard data won't be converted into CF_HTML clipboard format\n", GetLastError()));
                                             }
                                             else
-                                                LogRel(("Shared Clipboard: Cannot unlock memory, "
-                                                        "HTML clipboard data won't be converted into CF_HTML clipboard format\n"));
+                                                LogRel(("Shared Clipboard: Failed to unlock memory (%u), HTML clipboard data won't be converted into CF_HTML clipboard format\n", GetLastError()));
 
                                             RTMemFree(pszWrapped);