From 3b104cf8583fe5b2f002fa98608ded0b70647a93 Mon Sep 17 00:00:00 2001 From: youbing Date: Mon, 17 Oct 2022 16:04:50 +0800 Subject: [PATCH] Description: Code alarm processing#4 IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5W2LG Feature or Bugfix: Bugfix Binary Source:No Signed-off-by: youbing54 --- frameworks/wms/lite_proxy_surface.h | 4 ++-- frameworks/wms/lite_wm_requestor.h | 2 +- services/wms/lite_win.cpp | 2 +- services/wms/lite_wm.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frameworks/wms/lite_proxy_surface.h b/frameworks/wms/lite_proxy_surface.h index 8016d38..a3f3c3e 100644 --- a/frameworks/wms/lite_proxy_surface.h +++ b/frameworks/wms/lite_proxy_surface.h @@ -26,8 +26,8 @@ public: explicit LiteProxySurface(Surface* surface); virtual ~LiteProxySurface(); - virtual void Lock(void** buf, void** phyMem, uint32_t* strideLen) override; - virtual void Unlock() override; + void Lock(void** buf, void** phyMem, uint32_t* strideLen) override; + void Unlock() override; private: SurfaceBuffer* buffer_; diff --git a/frameworks/wms/lite_wm_requestor.h b/frameworks/wms/lite_wm_requestor.h index a1ff3b6..b4f0f43 100644 --- a/frameworks/wms/lite_wm_requestor.h +++ b/frameworks/wms/lite_wm_requestor.h @@ -31,7 +31,7 @@ public: static int32_t WmsMsgHandler(uint32_t code, IpcIo* data, IpcIo* reply, MessageOption option); static int32_t SurfaceRequestHandler(uint32_t code, IpcIo* data, IpcIo* reply, MessageOption option); - virtual void OnBufferAvailable() override; + void OnBufferAvailable() override; void ClientRegister(); void GetLayerInfo(); diff --git a/services/wms/lite_win.cpp b/services/wms/lite_win.cpp index 9dc547d..2362bf8 100644 --- a/services/wms/lite_win.cpp +++ b/services/wms/lite_win.cpp @@ -50,7 +50,7 @@ LiteWindow::LiteWindow(const LiteWinConfig& config) : id_(INVALID_WINDOW_ID), pid_(INVALID_PID), isShow_(false), config_(config), surface_(nullptr), backBuf_(nullptr), sid_({}), needUnregister_(false) { - pthread_mutex_init(&backBufMutex_, NULL); + pthread_mutex_init(&backBufMutex_, nullptr); id_ = LiteWM::GetInstance()->GetUniqueWinId(); } diff --git a/services/wms/lite_wm.cpp b/services/wms/lite_wm.cpp index b054c04..42948a1 100644 --- a/services/wms/lite_wm.cpp +++ b/services/wms/lite_wm.cpp @@ -101,9 +101,9 @@ LiteWM::LiteWM() needScreenshot_(false), screenshotSurface_(nullptr), winIdStorage(0) { InitMutex(stackLock_, PTHREAD_MUTEX_RECURSIVE); - pthread_mutex_init(&mouseLock_, NULL); - pthread_mutex_init(&eventLock_, NULL); - pthread_mutex_init(&screenshotMutex_, NULL); + pthread_mutex_init(&mouseLock_, nullptr); + pthread_mutex_init(&eventLock_, nullptr); + pthread_mutex_init(&screenshotMutex_, nullptr); InputManagerService::GetInstance()->GetDistributer()->AddRawEventListener(this); InitMouseCursor(); -- Gitee