Changeset 7234 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Mar 3, 2008 12:32:52 PM (17 years ago)

Author:

vboxsync

Message:

fTerminate should be volatile.

File:

• trunk/src/VBox/HostServices/SharedClipboard/win32.cpp (modified) (34 diffs)

trunk/src/VBox/HostServices/SharedClipboard/win32.cpp

@@ -36 +36 @@
     HWND    hwnd;
     HWND    hwndNextInChain;
-    
+
     RTTHREAD thread;
-    bool    fTerminate;
+    bool volatile fTerminate;
 
     HANDLE hRenderEvent;
-    
+
     VBOXCLIPBOARDCLIENTDATA *pClient;
 };
@@ -93 +93 @@
 {
     dprintf (("vboxClipboardGetData.\n"));
-    
+
     *pcbActualDst = cbSrc;
-    
+
     LogFlow(("vboxClipboardGetData cbSrc = %d, cbDst = %d\n", cbSrc, cbDst));
-     
+
     if (cbSrc > cbDst)
     {
@@ -103 +103 @@
         return;
     }
-    
+
     memcpy (pvDst, pvSrc, cbSrc);
-    
+
     vboxClipboardDump(pvDst, cbSrc, u32Format);
 
@@ -115 +115 @@
     Assert(pCtx->pClient);
     Assert(pCtx->pClient->data.pv == NULL && pCtx->pClient->data.cb == 0 && pCtx->pClient->data.u32Format == 0);
-    
+
     LogFlow(("vboxClipboardReadDataFromClient u32Format = %02X\n", u32Format));
-    
+
     ResetEvent (pCtx->hRenderEvent);
-    
+
     vboxSvcClipboardReportMsg (pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA, u32Format);
-    
+
     WaitForSingleObject(pCtx->hRenderEvent, INFINITE);
-    
+
     LogFlow(("vboxClipboardReadDataFromClient wait completed\n"));
-    
+
     return VINF_SUCCESS;
 }
@@ -132 +132 @@
 {
     LogFlow(("vboxClipboardChanged\n"));
-    
+
     if (pCtx->pClient == NULL)
     {
         return;
     }
-    
+
     /* Query list of available formats and report to host. */
     if (OpenClipboard (pCtx->hwnd))
@@ -166 +166 @@
 
                         int cActual = GetClipboardFormatName(format, szFormatName, sizeof(szFormatName)/sizeof (TCHAR));
-                        
+
                         if (cActual)
                         {
@@ -180 +180 @@
 
         CloseClipboard ();
-        
+
         LogFlow(("vboxClipboardChanged u32Formats %02X\n", u32Formats));
-        
+
         vboxSvcClipboardReportMsg (pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS, u32Formats);
     }
@@ -190 +190 @@
 {
     LRESULT rc = 0;
-    
+
     VBOXCLIPBOARDCONTEXT *pCtx = &g_ctx;
-    
+
     switch (msg)
     {
@@ -240 +240 @@
             /* Do nothing. Ignore the message. */
         } break;
-        
+
         case WM_RENDERFORMAT:
         {
@@ -249 +249 @@
 
             Log(("WM_RENDERFORMAT %d\n", format));
-            
+
             switch (format)
             {
@@ -266 +266 @@
 
                         int cActual = GetClipboardFormatName(format, szFormatName, sizeof(szFormatName)/sizeof (TCHAR));
-                        
+
                         if (cActual)
                         {
@@ -277 +277 @@
                     break;
             }
-            
+
             if (u32Format == 0 || pCtx->pClient == NULL)
             {
@@ -308 +308 @@
                         {
                             Log(("WM_RENDERFORMAT setting data\n"));
-                            
+
                             if (pCtx->pClient->data.pv)
                             {
                                 memcpy (pMem, pCtx->pClient->data.pv, pCtx->pClient->data.cb);
-                            
+
                                 RTMemFree (pCtx->pClient->data.pv);
                                 pCtx->pClient->data.pv        = NULL;
@@ -340 +340 @@
                     }
                 }
-                
+
                 RTMemFree (pCtx->pClient->data.pv);
                 pCtx->pClient->data.pv        = NULL;
                 pCtx->pClient->data.cb        = 0;
                 pCtx->pClient->data.u32Format = 0;
-                
+
                 /* Something went wrong. */
                 EmptyClipboard ();
@@ -354 +354 @@
         {
             Log(("WM_RENDERALLFORMATS\n"));
-            
+
             /* Do nothing. The clipboard formats will be unavailable now, because the
              * windows is to be destroyed and therefore the guest side becames inactive.
@@ -375 +375 @@
                 break;
             }
-            
+
             /* Announce available formats. Do not insert data, they will be inserted in WM_RENDER*. */
             uint32_t u32Formats = (uint32_t)lParam;
-            
+
             Log(("WM_USER u32Formats = %02X\n", u32Formats));
-            
+
             if (OpenClipboard (hwnd))
             {
                 EmptyClipboard();
-                
+
                 Log(("WM_USER emptied clipboard\n"));
-            
+
                 HANDLE hClip = NULL;
 
@@ -392 +392 @@
                 {
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT\n"));
-                    
+
                     hClip = SetClipboardData (CF_UNICODETEXT, NULL);
                 }
@@ -399 +399 @@
                 {
                     dprintf(("window proc WM_USER: VBOX_SHARED_CLIPBOARD_FMT_BITMAP\n"));
-                    
+
                     hClip = SetClipboardData (CF_DIB, NULL);
                 }
@@ -442 +442 @@
 
     VBOXCLIPBOARDCONTEXT *pCtx = &g_ctx;
-    
+
     HINSTANCE hInstance = (HINSTANCE)GetModuleHandle (NULL);
 
@@ -521 +521 @@
 
     g_ctx.hRenderEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-    
-    rc = RTThreadCreate (&g_ctx.thread, VBoxClipboardThread, NULL, 65536, 
+
+    rc = RTThreadCreate (&g_ctx.thread, VBoxClipboardThread, NULL, 65536,
                          RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "SHCLIP");
 
@@ -538 +538 @@
 
     /* Set the termination flag and ping the window thread. */
-    g_ctx.fTerminate = true;
-    
+    ASMAtomicWriteBool (&g_ctx.fTerminate, true);
+
     if (g_ctx.hwnd)
     {
@@ -546 +546 @@
 
     CloseHandle (g_ctx.hRenderEvent);
-    
+
     /* Wait for the window thread to terminate. */
     RTThreadWait (g_ctx.thread, RT_INDEFINITE_WAIT, NULL);
@@ -556 +556 @@
 {
     Log(("vboxClipboardConnect\n"));
-    
+
     if (g_ctx.pClient != NULL)
     {
@@ -564 +564 @@
 
     pClient->pCtx = &g_ctx;
-    
+
     pClient->pCtx->pClient = pClient;
-    
+
     /* Synch the host clipboard content with the client. */
     vboxClipboardSync (pClient);
-    
+
     return VINF_SUCCESS;
 }
@@ -577 +577 @@
     /* Synch the host clipboard content with the client. */
     vboxClipboardChanged (pClient->pCtx);
-    
+
     return VINF_SUCCESS;
 }
@@ -584 +584 @@
 {
     Log(("vboxClipboardDisconnect\n"));
-    
+
     g_ctx.pClient = NULL;
 }
@@ -599 +599 @@
 {
     LogFlow(("vboxClipboardReadData: u32Format = %02X\n", u32Format));
-    
+
     HANDLE hClip = NULL;
-    
+
     /*
      * The guest wants to read data in the given format.
@@ -608 +608 @@
     {
         dprintf(("Clipboard opened.\n"));
-        
+
         if (u32Format & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
         {
@@ -643 +643 @@
                 {
                     dprintf(("CF_UNICODETEXT\n"));
-                        
+
                     vboxClipboardGetData (VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT, uniString, (lstrlenW (uniString) + 1) * 2,
                                           pv, cb, pcbActual);
@@ -690 +690 @@
         dprintf(("failed to open clipboard\n"));
     }
-    
+
     if (hClip == NULL)
     {
@@ -697 +697 @@
                               pv, cb, pcbActual);
     }
-    
+
     return VINF_SUCCESS;
 }
@@ -704 +704 @@
 {
     LogFlow(("vboxClipboardWriteData\n"));
-    
+
     /*
      * The guest returns data that was requested in the WM_RENDERFORMAT handler.
      */
     Assert(pClient->data.pv == NULL && pClient->data.cb == 0 && pClient->data.u32Format == 0);
-    
+
     vboxClipboardDump(pv, cb, u32Format);
 
@@ -715 +715 @@
     {
         pClient->data.pv = RTMemAlloc (cb);
-        
+
         if (pClient->data.pv)
         {
@@ -723 +723 @@
         }
     }
-    
+
     SetEvent(pClient->pCtx->hRenderEvent);
 }