From 8568289b22e27668080de0f43a69ce38f117f521 Mon Sep 17 00:00:00 2001 From: yangli Date: Thu, 27 Jul 2023 17:15:40 +0800 Subject: [PATCH] 0727 Signed-off-by: yangli --- .../screen_sink/src/dscreen_sink_handler.cpp | 2 +- .../screen_source/src/dscreen_source_handler.cpp | 2 +- .../callbackonnotifyregresult_fuzzer.cpp | 2 +- .../callbackonnotifyunregresult_fuzzer.cpp | 2 +- .../callbackonremoterequest_fuzzer.cpp | 2 +- .../proxyinitsource_fuzzer/initsource_fuzzer.cpp | 2 +- .../screensinktest/src/dscreen_sink_handler_test.cpp | 2 +- .../src/dscreen_source_handler_test.cpp | 4 ++-- .../src/screen_client_window_adapter.cpp | 2 +- .../dscreenservice/src/dscreen_sink_stub_test.cpp | 10 +++++----- .../dscreenmgr/2.0/src/dscreen_manager_test.cpp | 2 +- .../callback/dscreen_source_callback_stub_test.cpp | 4 ++-- .../dscreenservice/src/dscreen_source_stub_test.cpp | 12 ++++++------ 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp index 725bd304..91fbe8d3 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp @@ -67,7 +67,7 @@ int32_t DScreenSinkHandler::InitSink(const std::string ¶ms) "dscreen sink get samgr failed."); return ERR_DH_SCREEN_SA_GET_SAMGR_FAIL; } - sptr loadCallback = new DScreenSinkLoadCallback(params); + sptr loadCallback(new DScreenSinkLoadCallback(params)); if (loadCallback == nullptr) { DHLOGE("loadCallback is nullptr."); ReportSaFail(DSCREEN_INIT_FAIL, ERR_DH_SCREEN_SA_GET_SAMGR_FAIL, DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index 7f2da12d..4e6cfc6c 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -68,7 +68,7 @@ int32_t DScreenSourceHandler::InitSource(const std::string ¶ms) "dscreen source get samgr failed."); return ERR_DH_SCREEN_SA_GET_SAMGR_FAIL; } - sptr loadCallback = new DScreenSourceLoadCallback(params); + sptr loadCallback(new DScreenSourceLoadCallback(params)); StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, loadCallback); if (ret != ERR_OK) { diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/callbackonnotifyregresult_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/callbackonnotifyregresult_fuzzer.cpp index 540a86c1..03e3bb3b 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/callbackonnotifyregresult_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyregresult_fuzzer/callbackonnotifyregresult_fuzzer.cpp @@ -39,7 +39,7 @@ void OnNotifyRegResultFuzzTest(const uint8_t* data, size_t size) std::string dataStr(reinterpret_cast(data), size); std::shared_ptr callback = std::make_shared(); - sptr dScreenSourceCallback = new (std::nothrow) DScreenSourceCallback(); + sptr dScreenSourceCallback(new (std::nothrow) DScreenSourceCallback()); dScreenSourceCallback->PushRegRegisterCallback(reqId, callback); dScreenSourceCallback->OnNotifyRegResult(devId, dhId, reqId, status, dataStr); } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/callbackonnotifyunregresult_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/callbackonnotifyunregresult_fuzzer.cpp index 1f1bea6f..7fe04bcd 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/callbackonnotifyunregresult_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonnotifyunregresult_fuzzer/callbackonnotifyunregresult_fuzzer.cpp @@ -39,7 +39,7 @@ void OnNotifyUnregResultFuzzTest(const uint8_t* data, size_t size) std::string dataStr(reinterpret_cast(data), size); std::shared_ptr uncallback = std::make_shared(); - sptr dScreenSourceCallback = new (std::nothrow) DScreenSourceCallback(); + sptr dScreenSourceCallback(new (std::nothrow) DScreenSourceCallback()); dScreenSourceCallback->PushUnregisterCallback(reqId, uncallback); dScreenSourceCallback->OnNotifyUnregResult(devId, dhId, reqId, status, dataStr); diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/callbackonremoterequest_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/callbackonremoterequest_fuzzer.cpp index 7d84b784..396cb445 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/callbackonremoterequest_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_callback/callbackonremoterequest_fuzzer/callbackonremoterequest_fuzzer.cpp @@ -50,7 +50,7 @@ void CallbackOnRemoteRequestFuzzTest(const uint8_t* data, size_t size) pdata.WriteString(reqId); pdata.WriteString(dataStr); - sptr dScreenSourceCallback = new (std::nothrow) DScreenSourceCallback(); + sptr dScreenSourceCallback(new (std::nothrow) DScreenSourceCallback()); dScreenSourceCallback->OnRemoteRequest(code, pdata, reply, option); } } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp index aaa4ae91..ab58c463 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp @@ -34,7 +34,7 @@ void InitSourceFuzzTest(const uint8_t* data, size_t size) std::string params(reinterpret_cast(data), size); - sptr callback = new DScreenSourceCallback(); + sptr callback(new DScreenSourceCallback()); if (callback == nullptr) { return; } diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp index decfb5ab..7bae4e82 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp @@ -78,7 +78,7 @@ HWTEST_F(DScreenSinkHandlerTest, LocalHardware_001, TestSize.Level1) const std::string param = "DScreenSinkHandlerTest"; int32_t ret = DScreenSinkHandler::GetInstance().InitSink(param); EXPECT_EQ(DH_SUCCESS, ret); - sptr loadCallback = new DScreenSinkLoadCallback(param); + sptr loadCallback(new DScreenSinkLoadCallback(param)); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, nullptr); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, nullptr); ret = DScreenSinkHandler::GetInstance().SubscribeLocalHardware(dhId, param); diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp index 1c134b85..98d62ce9 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp @@ -84,7 +84,7 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_001, TestSize.Lev param.version = "2.0"; param.attrs = "attrs"; std::string callbackParam = "callbackParam"; - sptr loadCallback = new DScreenSourceLoadCallback(callbackParam); + sptr loadCallback(new DScreenSourceLoadCallback(callbackParam)); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, nullptr); std::shared_ptr callback = std::make_shared(); int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); @@ -105,7 +105,7 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_002, TestSize.Lev param.version = "1"; param.attrs = "attrs"; std::string callbackParam = "callbackParam"; - sptr loadCallback = new DScreenSourceLoadCallback(callbackParam); + sptr loadCallback(new DScreenSourceLoadCallback(callbackParam)); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, nullptr); std::shared_ptr callback = std::make_shared(); DScreenSourceHandler::GetInstance().dScreenSourceProxy_ = nullptr; diff --git a/services/screenclient/src/screen_client_window_adapter.cpp b/services/screenclient/src/screen_client_window_adapter.cpp index 9759abec..623c98f2 100644 --- a/services/screenclient/src/screen_client_window_adapter.cpp +++ b/services/screenclient/src/screen_client_window_adapter.cpp @@ -34,7 +34,7 @@ sptr ScreenClientWindowAdapter::CreateWindow(std::shared_ptr option = new Rosen::WindowOption(); + sptr option(new Rosen::WindowOption()); if (option == nullptr) { DHLOGE("option is nullptr."); return nullptr; diff --git a/services/screenservice/test/unittest/sinkservice/dscreenservice/src/dscreen_sink_stub_test.cpp b/services/screenservice/test/unittest/sinkservice/dscreenservice/src/dscreen_sink_stub_test.cpp index cff3b17a..baab2b08 100644 --- a/services/screenservice/test/unittest/sinkservice/dscreenservice/src/dscreen_sink_stub_test.cpp +++ b/services/screenservice/test/unittest/sinkservice/dscreenservice/src/dscreen_sink_stub_test.cpp @@ -79,7 +79,7 @@ void DScreenSinkStubTest::TestDScreenSinkStub::DScreenNotify(const std::string & */ HWTEST_F(DScreenSinkStubTest, InitSink_001, TestSize.Level1) { - sptr sinkStubPtr = new TestDScreenSinkStub(); + sptr sinkStubPtr(new TestDScreenSinkStub()); DScreenSinkProxy sinkProxy(sinkStubPtr); int32_t ret = sinkProxy.InitSink("params000"); @@ -97,7 +97,7 @@ HWTEST_F(DScreenSinkStubTest, InitSink_001, TestSize.Level1) */ HWTEST_F(DScreenSinkStubTest, ReleaseSink_001, TestSize.Level1) { - sptr sinkStubPtr = new TestDScreenSinkStub(); + sptr sinkStubPtr(new TestDScreenSinkStub()); DScreenSinkProxy sinkProxy(sinkStubPtr); int32_t ret = sinkProxy.ReleaseSink(); @@ -112,7 +112,7 @@ HWTEST_F(DScreenSinkStubTest, ReleaseSink_001, TestSize.Level1) */ HWTEST_F(DScreenSinkStubTest, SubscribeLocalHardware_001, TestSize.Level1) { - sptr sinkStubPtr = new TestDScreenSinkStub(); + sptr sinkStubPtr(new TestDScreenSinkStub()); DScreenSinkProxy sinkProxy(sinkStubPtr); int32_t ret = sinkProxy.SubscribeLocalHardware("dhId000", "param000"); @@ -139,7 +139,7 @@ HWTEST_F(DScreenSinkStubTest, SubscribeLocalHardware_001, TestSize.Level1) */ HWTEST_F(DScreenSinkStubTest, UnsubscribeLocalHardware_001, TestSize.Level1) { - sptr sinkStubPtr = new TestDScreenSinkStub(); + sptr sinkStubPtr(new TestDScreenSinkStub()); DScreenSinkProxy sinkProxy(sinkStubPtr); int32_t ret = sinkProxy.UnsubscribeLocalHardware("dhId000"); @@ -163,7 +163,7 @@ HWTEST_F(DScreenSinkStubTest, UnsubscribeLocalHardware_001, TestSize.Level1) */ HWTEST_F(DScreenSinkStubTest, DScreenNotify_001, TestSize.Level1) { - sptr sinkStubPtr = new TestDScreenSinkStub(); + sptr sinkStubPtr(new TestDScreenSinkStub()); DScreenSinkProxy sinkProxy(sinkStubPtr); sinkProxy.DScreenNotify("", 0, "eventContent000"); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp index 780f30bc..95f5924d 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/2.0/src/dscreen_manager_test.cpp @@ -37,7 +37,7 @@ void DScreenManagerTestV2::TearDown() {} */ HWTEST_F(DScreenManagerTestV2, Initialize_001, TestSize.Level1) { - sptr dScreenGroupListener_ = new (std::nothrow) DScreenGroupListener(); + sptr dScreenGroupListener_(new (std::nothrow) DScreenGroupListener()); int32_t ret = DScreenManager::GetInstance().Initialize(); EXPECT_EQ(DH_SUCCESS, ret); } diff --git a/services/screenservice/test/unittest/sourceservice/dscreenservice/src/callback/dscreen_source_callback_stub_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenservice/src/callback/dscreen_source_callback_stub_test.cpp index e5c3c1df..49231574 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenservice/src/callback/dscreen_source_callback_stub_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenservice/src/callback/dscreen_source_callback_stub_test.cpp @@ -68,7 +68,7 @@ int32_t DScreenSourceCallbackStubTest::TestDScreenSourceCallbackStub::OnNotifyUn */ HWTEST_F(DScreenSourceCallbackStubTest, OnNotifyRegResult_001, TestSize.Level1) { - sptr sourceCbkStubPtr = new TestDScreenSourceCallbackStub(); + sptr sourceCbkStubPtr(new TestDScreenSourceCallbackStub()); DScreenSourceCallbackProxy sourceCbkProxy(sourceCbkStubPtr); int32_t ret = sourceCbkProxy.OnNotifyRegResult("", "dhId000", "reqId000", 0, "data000"); @@ -107,7 +107,7 @@ HWTEST_F(DScreenSourceCallbackStubTest, OnNotifyRegResult_001, TestSize.Level1) */ HWTEST_F(DScreenSourceCallbackStubTest, OnNotifyUnregResult_001, TestSize.Level1) { - sptr sourceCbkStubPtr = new TestDScreenSourceCallbackStub(); + sptr sourceCbkStubPtr(new TestDScreenSourceCallbackStub()); DScreenSourceCallbackProxy sourceCbkProxy(sourceCbkStubPtr); int32_t ret = sourceCbkProxy.OnNotifyUnregResult("", "dhId000", "reqId000", 0, "data000"); diff --git a/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp b/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp index 8828cf0b..b763d132 100644 --- a/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp +++ b/services/screenservice/test/unittest/sourceservice/dscreenservice/src/dscreen_source_stub_test.cpp @@ -96,7 +96,7 @@ void DScreenSourceStubTest::TestDScreenSourceStub::DScreenNotify(const std::stri */ HWTEST_F(DScreenSourceStubTest, InitSource_001, TestSize.Level1) { - sptr sourceStubPtr = new TestDScreenSourceStub(); + sptr sourceStubPtr(new TestDScreenSourceStub()); DScreenSourceProxy sourceProxy(sourceStubPtr); sptr callback; @@ -119,7 +119,7 @@ HWTEST_F(DScreenSourceStubTest, InitSource_001, TestSize.Level1) */ HWTEST_F(DScreenSourceStubTest, ReleaseSource_001, TestSize.Level1) { - sptr sourceStubPtr = new TestDScreenSourceStub(); + sptr sourceStubPtr(new TestDScreenSourceStub()); DScreenSourceProxy sourceProxy(sourceStubPtr); int32_t ret = sourceProxy.ReleaseSource(); EXPECT_EQ(DH_SUCCESS, ret); @@ -133,7 +133,7 @@ HWTEST_F(DScreenSourceStubTest, ReleaseSource_001, TestSize.Level1) */ HWTEST_F(DScreenSourceStubTest, RegisterDistributedHardware_001, TestSize.Level1) { - sptr sourceStubPtr = new TestDScreenSourceStub(); + sptr sourceStubPtr(new TestDScreenSourceStub()); DScreenSourceProxy sourceProxy(sourceStubPtr); EnableParam param; @@ -180,7 +180,7 @@ HWTEST_F(DScreenSourceStubTest, RegisterDistributedHardware_001, TestSize.Level1 */ HWTEST_F(DScreenSourceStubTest, UnregisterDistributedHardware_001, TestSize.Level1) { - sptr sourceStubPtr = new TestDScreenSourceStub(); + sptr sourceStubPtr(new TestDScreenSourceStub()); DScreenSourceProxy sourceProxy(sourceStubPtr); int32_t ret = sourceProxy.UnregisterDistributedHardware("", "dhId000", "reqId000"); @@ -216,7 +216,7 @@ HWTEST_F(DScreenSourceStubTest, UnregisterDistributedHardware_001, TestSize.Leve */ HWTEST_F(DScreenSourceStubTest, ConfigDistributedHardware_001, TestSize.Level1) { - sptr sourceStubPtr = new TestDScreenSourceStub(); + sptr sourceStubPtr(new TestDScreenSourceStub()); DScreenSourceProxy sourceProxy(sourceStubPtr); int32_t ret = sourceProxy.ConfigDistributedHardware("", "dhId000", "key000", "value000"); @@ -252,7 +252,7 @@ HWTEST_F(DScreenSourceStubTest, ConfigDistributedHardware_001, TestSize.Level1) */ HWTEST_F(DScreenSourceStubTest, DScreenNotify_001, TestSize.Level1) { - sptr sourceStubPtr = new TestDScreenSourceStub(); + sptr sourceStubPtr(new TestDScreenSourceStub()); DScreenSourceProxy sourceProxy(sourceStubPtr); sourceProxy.DScreenNotify("", 0, "eventContent000"); -- Gitee