From 3f41510ec24fd0d354a66574e91453317dff23d3 Mon Sep 17 00:00:00 2001 From: maojiangping Date: Wed, 12 Jan 2022 22:01:39 +0800 Subject: [PATCH] fix 64-bit compile issues Signed-off-by: maojiangping Change-Id: Iecd94a510057ba833e579700c48f6f8a193a8680 --- dmserver/src/abstract_display_controller.cpp | 7 ++++--- dmserver/src/abstract_screen_controller.cpp | 3 ++- dmserver/src/display_manager_service.cpp | 4 ++-- interfaces/kits/napi/display/native_display_module.cpp | 7 +++++-- wmserver/src/window_node_container.cpp | 7 +++++-- wmserver/src/window_root.cpp | 5 ++++- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dmserver/src/abstract_display_controller.cpp b/dmserver/src/abstract_display_controller.cpp index 9d2762ec9c..40f24ba2a1 100644 --- a/dmserver/src/abstract_display_controller.cpp +++ b/dmserver/src/abstract_display_controller.cpp @@ -15,10 +15,11 @@ #include "abstract_display_controller.h" -#include "window_manager_hilog.h" - +#include #include +#include "window_manager_hilog.h" + namespace OHOS::Rosen { namespace { constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0, "AbstractDisplayController"}; @@ -63,7 +64,7 @@ ScreenId AbstractDisplayController::CreateVirtualScreen(const VirtualDisplayInfo } ScreenId result = rsInterface_->CreateVirtualScreen(virtualDisplayInfo.name_, virtualDisplayInfo.width_, virtualDisplayInfo.height_, surface, virtualDisplayInfo.displayIdToMirror_, virtualDisplayInfo.flags_); - WLOGFI("AbstractDisplayController::CreateVirtualDisplay id: %{public}llu", result); + WLOGFI("AbstractDisplayController::CreateVirtualDisplay id: %{public}" PRIu64"", result); return result; } diff --git a/dmserver/src/abstract_screen_controller.cpp b/dmserver/src/abstract_screen_controller.cpp index 7019239d36..8144c6da97 100644 --- a/dmserver/src/abstract_screen_controller.cpp +++ b/dmserver/src/abstract_screen_controller.cpp @@ -15,6 +15,7 @@ #include "abstract_screen_controller.h" +#include #include #include @@ -105,7 +106,7 @@ void AbstractScreenController::AddToGroup(sptr newScreen) std::lock_guard lock(mutex_); auto iter = dmsScreenMap_.find(defaultScreenId_); if (iter == dmsScreenMap_.end()) { - WLOGE("did not find default screen screenId:%{public}llu", defaultScreenId_); + WLOGE("did not find default screen screenId:%{public}" PRIu64"", defaultScreenId_); AddAsFirstScreenLocked(newScreen); } else { sptr defaultScreen = iter->second; diff --git a/dmserver/src/display_manager_service.cpp b/dmserver/src/display_manager_service.cpp index a6ff2b589d..3825b07401 100644 --- a/dmserver/src/display_manager_service.cpp +++ b/dmserver/src/display_manager_service.cpp @@ -68,7 +68,7 @@ ScreenId DisplayManagerService::GetScreenIdFromDisplayId(DisplayId displayId) DisplayId DisplayManagerService::GetDefaultDisplayId() { ScreenId screenId = AbstractDisplayController::GetInstance().GetDefaultScreenId(); - WLOGFI("GetDefaultDisplayId %{public}llu", screenId); + WLOGFI("GetDefaultDisplayId %{public}" PRIu64"", screenId); return GetDisplayIdFromScreenId(screenId); } @@ -87,7 +87,7 @@ DisplayInfo DisplayManagerService::GetDisplayInfoById(DisplayId displayId) DisplayId DisplayManagerService::CreateVirtualDisplay(const VirtualDisplayInfo &virtualDisplayInfo, sptr surface) { - WLOGFI("name %{public}s, width %{public}u, height %{public}u, mirrotId %{public}llu, flags %{public}d", + WLOGFI("name %{public}s, width %{public}u, height %{public}u, mirrotId %{public}" PRIu64", flags %{public}d", virtualDisplayInfo.name_.c_str(), virtualDisplayInfo.width_, virtualDisplayInfo.height_, virtualDisplayInfo.displayIdToMirror_, virtualDisplayInfo.flags_); ScreenId screenId = AbstractDisplayController::GetInstance().CreateVirtualScreen(virtualDisplayInfo, surface); diff --git a/interfaces/kits/napi/display/native_display_module.cpp b/interfaces/kits/napi/display/native_display_module.cpp index e319bb9471..3f6db47342 100644 --- a/interfaces/kits/napi/display/native_display_module.cpp +++ b/interfaces/kits/napi/display/native_display_module.cpp @@ -14,6 +14,9 @@ */ #include "display_manager.h" + +#include + #include "native_display_module.h" #include "wm_common.h" #include "wm_napi_common.h" @@ -34,7 +37,7 @@ void Async(napi_env env, std::unique_ptr ¶m) param->wret = WMError::WM_ERROR_NULLPTR; return; } - GNAPI_LOG("GetDefaultDisplay: id %{public}llu, w %{public}d, h %{public}d", + GNAPI_LOG("GetDefaultDisplay: id %{public}" PRIu64", w %{public}d, h %{public}d", param->display->GetId(), param->display->GetWidth(), param->display->GetHeight()); param->wret = WMError::WM_OK; } @@ -50,7 +53,7 @@ napi_value Resolve(napi_env env, std::unique_ptr ¶m) DisplayId id = param->display->GetId(); int32_t width = param->display->GetWidth(); int32_t height = param->display->GetHeight(); - GNAPI_LOG("id : %{public}llu", id); + GNAPI_LOG("id : %{public}" PRIu64"", id); GNAPI_LOG("width : %{public}d", width); GNAPI_LOG("height : %{public}d", height); diff --git a/wmserver/src/window_node_container.cpp b/wmserver/src/window_node_container.cpp index 38dc36447e..ec268097bf 100644 --- a/wmserver/src/window_node_container.cpp +++ b/wmserver/src/window_node_container.cpp @@ -14,8 +14,11 @@ */ #include "window_node_container.h" + #include #include +#include + #include "window_helper.h" #include "window_manager_hilog.h" #include "wm_trace.h" @@ -428,7 +431,7 @@ void WindowNodeContainer::TraverseWindowNode(sptr& node, std::vector void WindowNodeContainer::DumpScreenWindowTree() { - WLOGFI("-------- Screen %{public}llu dump window info begin---------", screenId_); + WLOGFI("-------- Screen %{public}" PRIu64" dump window info begin---------", screenId_); WLOGFI("WinId Type Mode Flag ZOrd [ x y w h]"); std::vector> windowNodes; TraverseContainer(windowNodes); @@ -439,7 +442,7 @@ void WindowNodeContainer::DumpScreenWindowTree() "%{public}4d %{public}4d]", node->GetWindowId(), node->GetWindowType(), node->GetWindowMode(), node->GetWindowFlags(), --zOrder, rect.posX_, rect.posY_, rect.width_, rect.height_); } - WLOGFI("-------- Screen %{public}llu dump window info end ---------", screenId_); + WLOGFI("-------- Screen %{public}" PRIu64" dump window info end ---------", screenId_); } uint64_t WindowNodeContainer::GetScreenId() const diff --git a/wmserver/src/window_root.cpp b/wmserver/src/window_root.cpp index ce2ccbe20c..739e1527b9 100644 --- a/wmserver/src/window_root.cpp +++ b/wmserver/src/window_root.cpp @@ -14,6 +14,9 @@ */ #include "window_root.h" + +#include + #include "display_manager_service_inner.h" #include "window_manager_hilog.h" @@ -33,7 +36,7 @@ sptr WindowRoot::GetOrCreateWindowNodeContainer(int32_t dis WLOGFE("get display failed displayId:%{public}d", displayId); return nullptr; } - WLOGFI("create new window node container display width:%{public}d, height:%{public}d, screenId:%{public}llu", + WLOGFI("create new window node container display width:%{public}d, height:%{public}d, screenId:%{public}" PRIu64"", abstractDisplay->GetWidth(), abstractDisplay->GetHeight(), abstractDisplay->GetId()); UpdateFocusStatusFunc focusStatusFunc = std::bind(&WindowRoot::UpdateFocusStatus, this, std::placeholders::_1, -- Gitee