儲存庫 vbox 的更動 63159

時間撮記:

2016-8-8 下午12:43:42 (8 年 以前)

作者:

vboxsync

訊息:

Main: More uninitialized variable warnings.

位置:

trunk/src/VBox/Main/src-client

檔案:

• GuestDnDSourceImpl.cpp (修改) (2 筆差異)
• GuestDnDTargetImpl.cpp (修改) (2 筆差異)

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -358 +358 @@
 
     RecvDataTask *pTask = NULL;
-    RTTHREAD threadRcv;
+    RTTHREAD hThreadRcv;
     int rc = S_OK;
 
@@ -381 +381 @@
         /* This function delete pTask in case of exceptions,
          * so there is no need in the call of delete operator. */
-        hr = pTask->createThread(&threadRcv);
-
-    }
-    catch(std::bad_alloc &)
+        hr = pTask->createThread(&hThreadRcv);
+
+    }
+    catch (std::bad_alloc &)
     {
         hr = setError(E_OUTOFMEMORY);
-    }
-    catch(...)
+        hThreadRcv = NIL_RTTHREAD;
+    }
+    catch (...)
     {
         LogRel2(("DnD: Could not create thread for RecvDataTask \n"));
         hr = E_FAIL;
+        hThreadRcv = NIL_RTTHREAD;
     }
 
     if (SUCCEEDED(hr))
     {
-        rc = RTThreadUserWait(threadRcv, 30 * 1000 /* 30s timeout */);
+        rc = RTThreadUserWait(hThreadRcv, 30 * 1000 /* 30s timeout */);
         if (RT_SUCCESS(rc))
         {

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -627 +627 @@
     SendDataTask *pTask = NULL;
     PSENDDATACTX pSendCtx = NULL;
-    RTTHREAD threadSnd;
+    RTTHREAD rcThreadSend;
     int rc = S_OK;
 
@@ -653 +653 @@
         //this function delete pTask in case of exceptions, so there is no need in the call of delete operator
         //pSendCtx is deleted in the pTask destructor
-        hr = pTask->createThread(&threadSnd);
-
-    }
-    catch(std::bad_alloc &)
+        hr = pTask->createThread(&rcThreadSend);
+
+    }
+    catch (std::bad_alloc &)
     {
         hr = setError(E_OUTOFMEMORY);
-    }
-    catch(...)
+        rcThreadSend = NIL_RTTHREAD;
+    }
+    catch (...)
     {
         LogRel2(("DnD: Could not create thread for SendDataTask \n"));
         hr = E_FAIL;
+        rcThreadSend = NIL_RTTHREAD;
     }
 
     if (SUCCEEDED(hr))
     {
-        rc = RTThreadUserWait(threadSnd, 30 * 1000 /* 30s timeout */);
+        rc = RTThreadUserWait(rcThreadSend, 30 * 1000 /* 30s timeout */);
         if (RT_SUCCESS(rc))
         {