Skip to content

Commit ab35d32

Browse files
author
Colin Robertson
committed
Fix merge issues
2 parents 9c42574 + d589bfe commit ab35d32

File tree

274 files changed

+818
-761
lines changed

Some content is hidden

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

274 files changed

+818
-761
lines changed

‎docs/windows/activatableclass-macros.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ ActivatableClassWithFactoryEx(
3737

3838
### Parameters
3939

40-
*className*
40+
*className*<br/>
4141
Name of the class to create.
4242

43-
*factory*
43+
*factory*<br/>
4444
Factory that will create an instance of the specified class.
4545

46-
*serverName*
46+
*serverName*<br/>
4747
A name that specifies a subset of factories in the module.
4848

4949
## Remarks

‎docs/windows/activateinstance-function.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ inline HRESULT ActivateInstance(
2828

2929
### Parameters
3030

31-
*T*
31+
*T*<br/>
3232
A type to activate.
3333

34-
*activatableClassId*
34+
*activatableClassId*<br/>
3535
The name of the class ID that defines parameter *T*.
3636

37-
*instance*
37+
*instance*<br/>
3838
When this operation completes, a reference to an instance of *T*.
3939

4040
## Return Value

‎docs/windows/activationfactory-class.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ class ActivationFactory : public Details::RuntimeClass<typename Details::Interfa
2929
3030
### Parameters
3131
32-
*I0*
32+
*I0*<br/>
3333
The zeroth interface.
3434
35-
*I1*
35+
*I1*<br/>
3636
The first interface.
3737
38-
*I2*
38+
*I2*<br/>
3939
The second interface.
4040
4141
## Remarks

‎docs/windows/activationfactory-getiids-method.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ STDMETHOD(
2626
2727
### Parameters
2828
29-
*iidCount*
29+
*iidCount*<br/>
3030
When this operation completes, the number of interace IDs in the *iids* array.
3131
32-
*iids*
32+
*iids*<br/>
3333
When this operation completes, an array of implemented interface IDs.
3434
3535
## Return Value

‎docs/windows/activationfactory-getruntimeclassname-method.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ STDMETHOD(
2626
2727
### Parameters
2828
29-
*runtimeName*
29+
*runtimeName*<br/>
3030
When this operation completes, a handle to a string that contains the runtime class name of the object that the current **ActivationFactory** instantiates.
3131
3232
## Return Value

‎docs/windows/activationfactory-gettrustlevel-method.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ STDMETHOD(
2626
2727
### Parameters
2828
29-
*trustLvl*
29+
*trustLvl*<br/>
3030
When this operation completes, the trust level of the runtime class that the **ActivationFactory** instantiates.
3131
3232
## Return Value

‎docs/windows/activationfactory-queryinterface-method.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ STDMETHOD(
2626
2727
### Parameters
2828
29-
*riid*
29+
*riid*<br/>
3030
An interface ID.
3131
32-
*ppvObject*
32+
*ppvObject*<br/>
3333
When this operation is complete, a pointer to the interface specified by parameter *riid*.
3434
3535
## Return Value

‎docs/windows/activationfactorycallback-function.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ inline HRESULT STDAPICALLTYPE ActivationFactoryCallback(
2727

2828
### Parameters
2929

30-
*activationId*
30+
*activationId*<br/>
3131
Handle to a string that specifies a runtime class name.
3232

33-
*ppFactory*
33+
*ppFactory*<br/>
3434
When this operation completes, an activation factory that corresponds to parameter *activationId*.
3535

3636
## Return Value

‎docs/windows/aggregatable.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Indicates that the class supports aggregation.
2626

2727
### Parameters
2828

29-
*value*
29+
*value*<br/>
3030
(Optional) A parameter to indicate when the COM object can be aggregated:
3131

3232
- `never` The COM object cannot be aggregated.

‎docs/windows/aggregates.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Indicates that the object aggregates the object specified by the CLSID.
2727

2828
### Parameters
2929

30-
*clsid*
30+
*clsid*<br/>
3131
Specifies the CLSID of the aggregatable object.
3232

33-
*variable_name*
33+
*variable_name*<br/>
3434
The name of the variable that is to be inserted. This variable contains the `IUnknown` of the object being aggregated.
3535

3636
## Remarks

0 commit comments

Comments
 (0)