From 113dc9fc51386a303f90ab75c5fb4817052c33be Mon Sep 17 00:00:00 2001
From: SimplestStudio <Oleg.Kozhukharenko@onlyoffice.com>
Date: Thu, 20 Jun 2024 17:55:29 +0300
Subject: [PATCH] [win] updatesvc: refactoring capplication

---
 .../src/classes/platform_win/capplication.cpp   | 17 ++++-------------
 .../src/classes/platform_win/capplication.h     |  3 ---
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/win-linux/extras/update-daemon/src/classes/platform_win/capplication.cpp b/win-linux/extras/update-daemon/src/classes/platform_win/capplication.cpp
index d653c574b..5522e4e50 100644
--- a/win-linux/extras/update-daemon/src/classes/platform_win/capplication.cpp
+++ b/win-linux/extras/update-daemon/src/classes/platform_win/capplication.cpp
@@ -46,8 +46,10 @@ CApplication::~CApplication()
 int CApplication::exec()
 {
     MSG msg = {};
-    while (GetMessage(&msg, NULL, 0, 0) > 0)
-    {
+    BOOL ret;
+    while ((ret = GetMessage(&msg, NULL, 0, 0)) != 0) {
+        if (ret == -1)
+            break;
         TranslateMessage(&msg);
         DispatchMessage(&msg);
     }
@@ -58,14 +60,3 @@ void CApplication::exit(int code)
 {
     PostThreadMessage(mainThreadId, WM_QUIT, code, 0);
 }
-
-LRESULT CALLBACK CApplication::WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-//    CObject *object = reinterpret_cast<CObject*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
-//    if (object) {
-//        int result = object->processEvents(hWnd, msg, wParam, lParam);
-//        if (result != -1)
-//            return result;
-//    }
-    return DefWindowProc(hWnd, msg, wParam, lParam);
-}
diff --git a/win-linux/extras/update-daemon/src/classes/platform_win/capplication.h b/win-linux/extras/update-daemon/src/classes/platform_win/capplication.h
index ce4da841c..7b65abe09 100644
--- a/win-linux/extras/update-daemon/src/classes/platform_win/capplication.h
+++ b/win-linux/extras/update-daemon/src/classes/platform_win/capplication.h
@@ -45,9 +45,6 @@ public:
     int exec();
     void exit(int);
 
-    /* callback */
-    static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-
 private:
     DWORD  mainThreadId = 0;
 };