Skip to content

Commit 22bbec2

Browse files
oldnewthingoldnewthing
committed
Windows 10 RTM Release - October 2015 Update 3
1 parent 1f2633e commit 22bbec2

File tree

286 files changed

+4791
-4685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

286 files changed

+4791
-4685
lines changed

‎Samples/Accelerometer/js/Package.appxmanifest‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
IgnorableNamespaces="uap mp">
77

88
<Identity
9-
Name="d2f9bcca-1673-49cf-a80b-0b5db8a03bf0"
9+
Name="Microsoft.SDKSamples.Accelerometer.JS"
1010
Version="1.0.0.0"
1111
Publisher="CN=Microsoft" />
1212

1313
<mp:PhoneIdentity PhoneProductId="d2f9bcca-1673-49cf-a80b-0b5db8a03bf0" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1414

1515
<Properties>
16-
<DisplayName>Accelerometer JS SDK Sample</DisplayName>
16+
<DisplayName>Accelerometer JS Sample</DisplayName>
1717
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
1818
<Logo>images\storelogo-sdk.png</Logo>
1919
</Properties>
@@ -32,8 +32,8 @@
3232
StartPage="default.html">
3333

3434
<uap:VisualElements
35-
DisplayName="Accelerometer JS SDK Sample"
36-
Description="Accelerometer JS SDK Sample"
35+
DisplayName="Accelerometer JS Sample"
36+
Description="Accelerometer JS Sample"
3737
BackgroundColor="#00b2f0"
3838
Square150x150Logo="images\storelogo-sdk.png"
3939
Square44x44Logo="images\smalltile-sdk.png">

‎Samples/Accelerometer/vb/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Version="1.0.0.0" />
1313

1414

15-
<mp:PhoneIdentity PhoneProductId="3df6c60c-2c0b-4061-9e7b-3108ff8067e6" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
15+
<mp:PhoneIdentity PhoneProductId="fc09ed7d-5ae7-47a5-81ff-471b9a7d48f8" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1616

1717
<Properties>
1818
<DisplayName>Accelerometer VB Sample</DisplayName>

‎Samples/ActivitySensor/vb/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
1212
Version="1.0.0.0" />
1313

14-
<mp:PhoneIdentity PhoneProductId="0840d61f-acb9-47b8-be10-90be343fbe4e" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
14+
<mp:PhoneIdentity PhoneProductId="43876b43-cefb-47f0-8afe-5c7b994b843f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1515

1616
<Properties>
1717
<DisplayName>Activity Sensor VB Sample</DisplayName>

‎Samples/AdaptiveStreaming/js/package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
IgnorableNamespaces="uap mp">
77

88
<Identity
9-
Name="Microsoft.SDKSamples.AdaptiveStreaing.JS"
9+
Name="Microsoft.SDKSamples.AdaptiveStreaming.JS"
1010
Version="1.0.0.0"
1111
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
1212

‎Samples/AdaptiveStreaming/vb/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
33
<Identity Name="Microsoft.SDKSamples.AdaptiveStreaming.VB" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.0.0.2" />
4-
<mp:PhoneIdentity PhoneProductId="f14b66c8-a6f2-4870-87c7-5208b2679716" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
4+
<mp:PhoneIdentity PhoneProductId="e0f0107d-a13b-4b7c-9273-7e639f45aa9e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
55
<Properties>
66
<DisplayName>AdaptiveStreaming</DisplayName>
77
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>

‎Samples/AdvancedCasting/vb/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
33
<Identity Name="Microsoft.SDKSamples.ScreenCasting.VB" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.0.24.0" />
4-
<mp:PhoneIdentity PhoneProductId="637456CC-56A1-4C4D-97D5-87AC05C3DFCD" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
4+
<mp:PhoneIdentity PhoneProductId="150b7cee-2ed1-4b77-9745-f18d22cf84ad" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
55
<Properties>
66
<DisplayName>ScreenCasting VB Sample</DisplayName>
77
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>

‎Samples/AllJoyn/Common/Scenario1WinRTComponent/ISecureInterfaceService.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public interface class ISecureInterfaceService
3737
{
3838
public:
3939
// Implement this function to handle calls to the Concatenate method.
40-
Windows::Foundation::IAsyncOperation<SecureInterfaceConcatenateResult^>^ ConcatenateAsync(Windows::Devices::AllJoyn::AllJoynMessageInfo^ info , _In_ Platform::String^ interfaceMemberInStr1, _In_ Platform::String^ interfaceMemberInStr2);
40+
Windows::Foundation::IAsyncOperation<SecureInterfaceConcatenateResult^>^ ConcatenateAsync(_In_ Windows::Devices::AllJoyn::AllJoynMessageInfo^ info , _In_ Platform::String^ interfaceMemberInStr1, _In_ Platform::String^ interfaceMemberInStr2);
4141

4242
// Implement this function to handle requests for the value of the IsUpperCaseEnabled property.
4343
//

‎Samples/AllJoyn/Common/Scenario1WinRTComponent/SecureInterfaceConsumer.cpp‎

Lines changed: 82 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,8 @@ IAsyncOperation<SecureInterfaceJoinSessionResult^>^ SecureInterfaceConsumer::Joi
111111
return create_async([serviceInfo, watcher]() -> SecureInterfaceJoinSessionResult^
112112
{
113113
auto result = ref new SecureInterfaceJoinSessionResult();
114-
result->Status = AllJoynStatus::Ok;
115-
result->Consumer = nullptr;
116-
117114
result->Consumer = ref new SecureInterfaceConsumer(watcher->BusAttachment);
118115
result->Status = result->Consumer->JoinSession(serviceInfo);
119-
120116
return result;
121117
});
122118
}
@@ -131,18 +127,26 @@ IAsyncOperation<SecureInterfaceConcatenateResult^>^ SecureInterfaceConsumer::Con
131127
size_t argCount = 2;
132128
alljoyn_msgarg inputs = alljoyn_msgarg_array_create(argCount);
133129

134-
TypeConversionHelpers::SetAllJoynMessageArg(alljoyn_msgarg_array_element(inputs, 0), "s", interfaceMemberInStr1);
135-
TypeConversionHelpers::SetAllJoynMessageArg(alljoyn_msgarg_array_element(inputs, 1), "s", interfaceMemberInStr2);
136-
137-
QStatus status = alljoyn_proxybusobject_methodcall(
138-
ProxyBusObject,
139-
"com.microsoft.Samples.SecureInterface",
140-
"Concatenate",
141-
inputs,
142-
argCount,
143-
message,
144-
c_MessageTimeoutInMilliseconds,
145-
0);
130+
QStatus status = ER_OK;
131+
status = static_cast<QStatus>(TypeConversionHelpers::SetAllJoynMessageArg(alljoyn_msgarg_array_element(inputs, 0), "s", interfaceMemberInStr1));
132+
133+
if (ER_OK == status)
134+
{
135+
status = static_cast<QStatus>(TypeConversionHelpers::SetAllJoynMessageArg(alljoyn_msgarg_array_element(inputs, 1), "s", interfaceMemberInStr2));
136+
}
137+
138+
if (ER_OK == status)
139+
{
140+
status = alljoyn_proxybusobject_methodcall(
141+
ProxyBusObject,
142+
"com.microsoft.Samples.SecureInterface",
143+
"Concatenate",
144+
inputs,
145+
argCount,
146+
message,
147+
c_MessageTimeoutInMilliseconds,
148+
0);
149+
}
146150
result->Status = static_cast<int>(status);
147151
if (ER_OK == status)
148152
{
@@ -151,7 +155,7 @@ IAsyncOperation<SecureInterfaceConcatenateResult^>^ SecureInterfaceConsumer::Con
151155
status = static_cast<QStatus>(TypeConversionHelpers::GetAllJoynMessageArg(alljoyn_message_getarg(message, 0), "s", &argument0));
152156
result->OutStr = argument0;
153157

154-
if (status != ER_OK)
158+
if (ER_OK != status)
155159
{
156160
result->Status = static_cast<int>(status);
157161
}
@@ -185,30 +189,33 @@ IAsyncOperation<SecureInterfaceSetIsUpperCaseEnabledResult^>^ SecureInterfaceCon
185189
PropertySetContext setContext;
186190

187191
alljoyn_msgarg inputArgument = alljoyn_msgarg_create();
188-
TypeConversionHelpers::SetAllJoynMessageArg(inputArgument, "b", value);
189-
190-
alljoyn_proxybusobject_setpropertyasync(
191-
ProxyBusObject,
192-
"com.microsoft.Samples.SecureInterface",
193-
"IsUpperCaseEnabled",
194-
inputArgument,
195-
[](QStatus status, alljoyn_proxybusobject obj, void* context)
196-
{
197-
UNREFERENCED_PARAMETER(obj);
198-
auto propertyContext = static_cast<PropertySetContext*>(context);
199-
propertyContext->SetStatus(status);
200-
propertyContext->SetEvent();
201-
},
202-
c_MessageTimeoutInMilliseconds,
203-
&setContext);
204-
205-
alljoyn_msgarg_destroy(inputArgument);
192+
QStatus status = static_cast<QStatus>(TypeConversionHelpers::SetAllJoynMessageArg(inputArgument, "b", value));
193+
if (ER_OK == status)
194+
{
195+
status = alljoyn_proxybusobject_setpropertyasync(
196+
ProxyBusObject,
197+
"com.microsoft.Samples.SecureInterface",
198+
"IsUpperCaseEnabled",
199+
inputArgument,
200+
[](QStatus status, alljoyn_proxybusobject obj, void* context)
201+
{
202+
UNREFERENCED_PARAMETER(obj);
203+
auto propertyContext = static_cast<PropertySetContext*>(context);
204+
propertyContext->SetStatus(status);
205+
propertyContext->SetEvent();
206+
},
207+
c_MessageTimeoutInMilliseconds,
208+
&setContext);
206209

207-
setContext.Wait();
210+
alljoyn_msgarg_destroy(inputArgument);
208211

209-
auto result = ref new SecureInterfaceSetIsUpperCaseEnabledResult();
210-
result->Status = setContext.GetStatus();
211-
return result;
212+
setContext.Wait();
213+
}
214+
if (ER_OK == status)
215+
{
216+
return SecureInterfaceSetIsUpperCaseEnabledResult::CreateSuccessResult();
217+
}
218+
return SecureInterfaceSetIsUpperCaseEnabledResult::CreateFailureResult(static_cast<int>(status));
212219
});
213220
}
214221

@@ -230,7 +237,7 @@ IAsyncOperation<SecureInterfaceGetIsUpperCaseEnabledResult^>^ SecureInterfaceCon
230237
if (ER_OK == status)
231238
{
232239
bool argument;
233-
TypeConversionHelpers::GetAllJoynMessageArg(value, "b", &argument);
240+
status = static_cast<QStatus>(TypeConversionHelpers::GetAllJoynMessageArg(value, "b", &argument));
234241

235242
propertyContext->SetValue(argument);
236243
}
@@ -271,9 +278,12 @@ void SecureInterfaceConsumer::OnPropertyChanged(_In_ alljoyn_proxybusobject obj,
271278
return;
272279
}
273280

281+
274282
if (strcmp("IsUpperCaseEnabled", propertyName) == 0)
275283
{
276-
IsUpperCaseEnabledChanged(this, nullptr);
284+
bool argument;
285+
(void)TypeConversionHelpers::GetAllJoynMessageArg(propertyValue, "b", &argument);
286+
IsUpperCaseEnabledChanged(this, (Platform::Object^)argument);
277287
}
278288
}
279289
}
@@ -294,7 +304,7 @@ void SecureInterfaceConsumer::CallTextSentSignalHandler(_In_ const alljoyn_inter
294304
eventArgs->MessageInfo = callInfo;
295305

296306
Platform::String^ argument0;
297-
TypeConversionHelpers::GetAllJoynMessageArg(alljoyn_message_getarg(message, 0), "s", &argument0);
307+
(void)TypeConversionHelpers::GetAllJoynMessageArg(alljoyn_message_getarg(message, 0), "s", &argument0);
298308

299309
eventArgs->Message = argument0;
300310

@@ -357,6 +367,25 @@ int32 SecureInterfaceConsumer::JoinSession(_In_ AllJoynServiceInfo^ serviceInfo)
357367
return AllJoynStatus::Fail;
358368
}
359369

370+
RETURN_IF_QSTATUS_ERROR(AllJoynBusObjectManager::GetBusObject(m_nativeBusAttachment, AllJoynHelpers::PlatformToMultibyteString(ServiceObjectPath).data(), &m_busObject));
371+
372+
if (!AllJoynBusObjectManager::BusObjectIsRegistered(m_nativeBusAttachment, m_busObject))
373+
{
374+
RETURN_IF_QSTATUS_ERROR(alljoyn_busobject_addinterface(BusObject, description));
375+
}
376+
377+
QStatus result = AddSignalHandler(
378+
m_nativeBusAttachment,
379+
description,
380+
"TextSent",
381+
[](const alljoyn_interfacedescription_member* member, PCSTR srcPath, alljoyn_message message) { UNREFERENCED_PARAMETER(srcPath); CallTextSentSignalHandler(member, message); });
382+
if (ER_OK != result)
383+
{
384+
return static_cast<int32>(result);
385+
}
386+
387+
SourceInterfaces[description] = m_weak;
388+
360389
unsigned int noneMechanismIndex = 0;
361390
bool authenticationMechanismsContainsNone = m_busAttachment->AuthenticationMechanisms->IndexOf(AllJoynAuthenticationMechanism::None, &noneMechanismIndex);
362391
QCC_BOOL interfaceIsSecure = alljoyn_interfacedescription_issecure(description);
@@ -369,7 +398,12 @@ int32 SecureInterfaceConsumer::JoinSession(_In_ AllJoynServiceInfo^ serviceInfo)
369398
// is specified, or if None is not present in AuthenticationMechanisms.
370399
if (!authenticationMechanismsContainsNone || interfaceIsSecure)
371400
{
372-
alljoyn_proxybusobject_secureconnection(ProxyBusObject, QCC_FALSE);
401+
RETURN_IF_QSTATUS_ERROR(alljoyn_proxybusobject_secureconnection(ProxyBusObject, QCC_FALSE));
402+
RETURN_IF_QSTATUS_ERROR(AllJoynBusObjectManager::TryRegisterBusObject(m_nativeBusAttachment, BusObject, true));
403+
}
404+
else
405+
{
406+
RETURN_IF_QSTATUS_ERROR(AllJoynBusObjectManager::TryRegisterBusObject(m_nativeBusAttachment, BusObject, false));
373407
}
374408
}
375409
else
@@ -380,28 +414,14 @@ int32 SecureInterfaceConsumer::JoinSession(_In_ AllJoynServiceInfo^ serviceInfo)
380414
{
381415
return static_cast<int32>(ER_BUS_NO_AUTHENTICATION_MECHANISM);
382416
}
417+
else
418+
{
419+
RETURN_IF_QSTATUS_ERROR(AllJoynBusObjectManager::TryRegisterBusObject(m_nativeBusAttachment, BusObject, false));
420+
}
383421
}
384422

385-
RETURN_IF_QSTATUS_ERROR(AllJoynBusObjectManager::GetBusObject(m_nativeBusAttachment, AllJoynHelpers::PlatformToMultibyteString(ServiceObjectPath).data(), &m_busObject));
386423
RETURN_IF_QSTATUS_ERROR(alljoyn_proxybusobject_addinterface(ProxyBusObject, description));
387-
388-
if (!AllJoynBusObjectManager::BusObjectIsRegistered(m_nativeBusAttachment, m_busObject))
389-
{
390-
RETURN_IF_QSTATUS_ERROR(alljoyn_busobject_addinterface(BusObject, description));
391-
}
392-
393-
QStatus result = AddSignalHandler(
394-
m_nativeBusAttachment,
395-
description,
396-
"TextSent",
397-
[](const alljoyn_interfacedescription_member* member, PCSTR srcPath, alljoyn_message message) { UNREFERENCED_PARAMETER(srcPath); CallTextSentSignalHandler(member, message); });
398-
if (result != ER_OK)
399-
{
400-
return static_cast<int32>(result);
401-
}
402-
403-
SourceInterfaces[description] = m_weak;
404-
RETURN_IF_QSTATUS_ERROR(AllJoynBusObjectManager::TryRegisterBusObject(m_nativeBusAttachment, BusObject, true));
424+
405425
m_signals->Initialize(BusObject, m_sessionId);
406426

407427
return AllJoynStatus::Ok;

0 commit comments

Comments
 (0)