[windows] use PostMessage to replace SendMessage (cocos2d#19569)

huangwei1024 · Jun 20, 2019 · aa62874 · aa62874
1 parent 6f0301a
commit aa62874
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp
@@ -114,7 +114,7 @@ namespace {
         if (Director::getInstance()->getOpenGLView())
         {
             HWND hwnd = Director::getInstance()->getOpenGLView()->getWin32Window();
-            SendMessage(hwnd,
+            PostMessage(hwnd,
                         WM_COPYDATA,
                         (WPARAM)(HWND)hwnd,
                         (LPARAM)(LPVOID)&myCDS);

diff --git a/cocos/platform/win32/CCDevice-win32.cpp b/cocos/platform/win32/CCDevice-win32.cpp
@@ -31,6 +31,8 @@ THE SOFTWARE.
 #include "platform/CCFileUtils.h"
 #include "platform/CCStdC.h"
 
+#include <thread>
+
 NS_CC_BEGIN
 
 int Device::getDPI()
@@ -171,16 +173,18 @@ class BitmapDC
             if (fontPath.size() > 0)
             {
                 _curFontPath = fontPath;
-                wchar_t * pwszBuffer = utf8ToUtf16(_curFontPath);
-                if (pwszBuffer)
-                {
-                    if (AddFontResource(pwszBuffer))
+                std::thread([fontPath, wnd = _wnd, this]() {
+                    wchar_t * pwszBuffer = utf8ToUtf16(fontPath);
+                    if (pwszBuffer)
                     {
-                        SendMessage(_wnd, WM_FONTCHANGE, 0, 0);
+                        if (AddFontResource(pwszBuffer))
+                        {
+                            PostMessage(wnd, WM_FONTCHANGE, 0, 0);
+                        }
+                        delete[] pwszBuffer;
+                        pwszBuffer = nullptr;
                     }
-                    delete[] pwszBuffer;
-                    pwszBuffer = nullptr;
-                }
+                }).detach();
             }
 
             _font = nullptr;
@@ -428,14 +432,16 @@ class BitmapDC
         // release temp font resource
         if (_curFontPath.size() > 0)
         {
-            wchar_t * pwszBuffer = utf8ToUtf16(_curFontPath);
-            if (pwszBuffer)
-            {
-                RemoveFontResource(pwszBuffer);
-                SendMessage(_wnd, WM_FONTCHANGE, 0, 0);
-                delete[] pwszBuffer;
-                pwszBuffer = nullptr;
-            }
+            std::thread([curFontPath = _curFontPath, wnd = _wnd, this]() {
+                wchar_t * pwszBuffer = utf8ToUtf16(curFontPath);
+                if (pwszBuffer)
+                {
+                    RemoveFontResource(pwszBuffer);
+                    PostMessage(wnd, WM_FONTCHANGE, 0, 0);
+                    delete[] pwszBuffer;
+                    pwszBuffer = nullptr;
+                }
+            }).detach();
             _curFontPath.clear();
         }
     }