diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp
index eb71efeef75cac0ba0a54bbdbcff67200fc473e0..221aae69596157c5140b09be16406f8aa4daed5f 100644
--- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp
+++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp
@@ -4919,7 +4919,7 @@ napi_value JsWindow::OnSetResizeByDragEnabled(napi_env env, napi_callback_info i
         if (ret == WmErrorCode::WM_OK) {
             task->Resolve(env, NapiGetUndefined(env));
         } else {
-            task->Reject(env, JsErrUtils::CreateJsError(env, ret));
+            task->Reject(env, JsErrUtils::CreateJsError(env, ret,"[window][setResizeByDragEnabled]: Failed"));
         }
         TLOGNE(WmsLogTag::WMS_LAYOUT, "%{public}s: Window [%{public}u, %{public}s] set dragEnabled end",
                where, window->GetWindowId(), window->GetWindowName().c_str());
@@ -6776,7 +6776,7 @@ napi_value JsWindow::OnSetAspectRatio(napi_env env, napi_callback_info info)
 
     if (errCode == WMError::WM_ERROR_INVALID_PARAM || aspectRatio <= 0.0) {
         return NapiThrowError(env, WmErrorCode::WM_ERROR_INVALID_PARAM,
-            "[window][setAspectRatio]msg: Falied");
+            "[window][setAspectRatio]msg: failed");
     }
 
     napi_value lastParam = (argc == 1) ? nullptr : (GetType(env, argv[1]) == napi_function ? argv[1] : nullptr);
@@ -6787,7 +6787,7 @@ napi_value JsWindow::OnSetAspectRatio(napi_env env, napi_callback_info info)
             auto window = weakToken.promote();
             if (window == nullptr) {
                 task->Reject(env, JsErrUtils::CreateJsError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY,
-                    "[window][setAspectRatio]msg: Falied"));
+                    "[window][setAspectRatio]msg: failed"));
                 return;
             }
             WMError ret = window->SetAspectRatio(aspectRatio);
@@ -6795,7 +6795,7 @@ napi_value JsWindow::OnSetAspectRatio(napi_env env, napi_callback_info info)
                 task->Resolve(env, NapiGetUndefined(env));
             } else {
                 task->Reject(env, JsErrUtils::CreateJsError(env, WM_JS_TO_ERROR_CODE_MAP.at(ret),
-                    "[window][setAspectRatio]msg: Falied"));
+                    "[window][setAspectRatio]msg: failed"));
             }
             TLOGNI(WmsLogTag::WMS_LAYOUT, "%{public}s: end, window [%{public}u, %{public}s] ret=%{public}d",
                 where, window->GetWindowId(), window->GetWindowName().c_str(), ret);
@@ -6803,7 +6803,7 @@ napi_value JsWindow::OnSetAspectRatio(napi_env env, napi_callback_info info)
     if (napi_send_event(env, asyncTask, napi_eprio_high, "OnSetAspectRatio") != napi_status::napi_ok) {
         napiAsyncTask->Reject(env,
             JsErrUtils::CreateJsError(env, WmErrorCode::WM_ERROR_STATE_ABNORMALLY,
-                "[window][setAspectRatio]msg: Falied"));
+                "[window][setAspectRatio]msg: failed"));
     }
     return result;
 }
@@ -7225,7 +7225,7 @@ napi_value JsWindow::OnGetWindowLimits(napi_env env, napi_callback_info info)
     WindowLimits windowLimits;
     WmErrorCode ret = WM_JS_TO_ERROR_CODE_MAP.at(windowToken_->GetWindowLimits(windowLimits));
     if (ret != WmErrorCode::WM_OK) {
-        return NapiThrowError(env, ret, "[window][getWindowLimits]msg: Falied");
+        return NapiThrowError(env, ret, "[window][getWindowLimits]msg: failed");
     }
     auto objValue = GetWindowLimitsAndConvertToJsValue(env, windowLimits);
     TLOGI(WmsLogTag::WMS_LAYOUT, "Window [%{public}u, %{public}s] get window limits end",
@@ -8137,7 +8137,7 @@ napi_value JsWindow::OnGetWindowStatus(napi_env env, napi_callback_info info)
     if (ret != WmErrorCode::WM_OK) {
         TLOGE(WmsLogTag::WMS_PC, "failed, ret=%{public}d", ret);
         return NapiThrowError(env, ret,
-            "[window][getWindowStatus]msg: Falied");
+            "[window][getWindowStatus]msg: failed");
     }
     auto objValue = CreateJsValue(env, windowStatus);
     if (objValue != nullptr) {
@@ -8969,7 +8969,7 @@ napi_value JsWindow::OnSetFollowParentWindowLayoutEnabled(napi_env env, napi_cal
     if (!ConvertFromJsValue(env, argv[INDEX_ZERO], isFollow)) {
         TLOGE(WmsLogTag::WMS_SUB, "Failed to convert parameter to enable");
         return NapiThrowError(env, WmErrorCode::WM_ERROR_INVALID_PARAM,
-            "[window][setFollowParentWindowLayoutEnabled]msg: Falied to convert parameter to enable");
+            "[window][setFollowParentWindowLayoutEnabled]msg: failed to convert parameter to enable");
     }
     std::shared_ptr<WmErrorCode> errCodePtr = std::make_shared<WmErrorCode>(WmErrorCode::WM_OK);
     const char* const where = __func__;
diff --git a/window_scene/session/host/src/move_drag_controller.cpp b/window_scene/session/host/src/move_drag_controller.cpp
index c49e516defb9c041c5accec6eac028594e1a7102..758f8502d9cb6a37ed0486fb1ca49628e857a3b8 100644
--- a/window_scene/session/host/src/move_drag_controller.cpp
+++ b/window_scene/session/host/src/move_drag_controller.cpp
@@ -1022,7 +1022,7 @@ bool MoveDragController::EventDownInit(const std::shared_ptr<MMI::PointerEvent>&
         moveDragProperty_.originalRect_);
     dragAreaType_ = SessionHelper::GetAreaTypeForScaleResize(pointerItem.GetWindowX(), pointerItem.GetWindowY(),
         outside, moveDragProperty_.originalRect_);
-    TLOGI(WmsLogTag::WMS_LAYOUT, "pointWinX:%{public}d, pointWinY:%{public}d, outside:%{public}d, vpr:%{public}f, "
+    TLOGI(WmsLogTag::WMS_LAYOUT, "pointWinX:%{private}d, pointWinY:%{private}d, outside:%{public}d, vpr:%{public}f, "
         "rect:%{public}s, type:%{public}d", pointerItem.GetWindowX(), pointerItem.GetWindowY(), outside, vpr_,
         moveDragProperty_.originalRect_.ToString().c_str(), type_);
     if (type_ == AreaType::UNDEFINED) {
diff --git a/wmserver/src/zidl/window_manager_stub.cpp b/wmserver/src/zidl/window_manager_stub.cpp
index 7219ddd877e7f6ef4f5d4d0e7b39f5df80b1a44d..001ba1758d12a689e14cbcf6fa2d7d76c2ed1d0d 100644
--- a/wmserver/src/zidl/window_manager_stub.cpp
+++ b/wmserver/src/zidl/window_manager_stub.cpp
@@ -216,7 +216,7 @@ int32_t WindowManagerStub::OnRemoteRequest(uint32_t code, MessageParcel& data, M
         }
         case WindowManagerMessage::TRANS_ID_UPDATE_LAYOUT_MODE: {
             uint32_t layoutMode = 0;
-            if (!data.ReadUint32(layoutMode)) {
+            if (!data.ReadUint32(layoutMode) || layoutMode >= static_cast<uint32_t>(WindowLayoutMode::END)) {
                 TLOGE(WmsLogTag::WMS_LAYOUT, "read layoutMode failed");
                 return ERR_INVALID_DATA;
             }