Skip to content

Commit 7bd48c0

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#866 from MicrosoftDocs/master636887002455838099
Fix git push error for protected CLA branch
2 parents 33e22fa + 90817d9 commit 7bd48c0

17 files changed

+272
-277
lines changed

docs/build/cmake-projects-in-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Not everything in the cache is imported. Properties such as the generator and t
7373

7474
To build a CMake project, you have these choices:
7575

76-
1. Select the target in the **Debug** dropdown and press **F5**, or click the **Run** (green triangle) button. The project automatically builds first, just like a Visual Studio solution.
76+
1. In the General toolbar, find the **Configurations** dropdown; it is probably showing "Linux-Debug" or "x64-Debug" by default. Select the desired configuration and press **F5**, or click the **Run** (green triangle) button on the toolbar. The project automatically builds first, just like a Visual Studio solution.
7777

7878
1. Right click on the CMakeLists.txt and select **Build** from the context menu. If you have multiple targets in your folder structure, you can choose to build all or only one specific target.
7979

docs/build/media/cmake-build-menu.png

2.37 KB
Loading

docs/build/reference/fi-name-forced-include-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This option has the same effect as specifying the file with double quotation mar
2727

2828
1. Click the **Advanced** property page.
2929

30-
1. Modify the **Force Includes** property.
30+
1. Modify the **Forced Include File** property.
3131

3232
### To set this compiler option programmatically
3333

docs/dotnet/double-thunking-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ One resolution is to tell the compiler not to generate a native entry point for
1616

1717
Similarly, if you export ([dllexport, dllimport](../cpp/dllexport-dllimport.md)) a managed function, a native entry point is generated and any function that imports and calls that function will call through the native entry point. To avoid double thunking in this situation, do not use native export/import semantics; simply reference the metadata via `#using` (see [#using Directive](../preprocessor/hash-using-directive-cpp.md)).
1818

19-
The compiler has been updated to reduce unnecessary double thunking. For example, any function with a managed type in the signature (including return type) will implicitly be marked as `__clrcall`. For more information on double thunk elimination, see [https://msdn.microsoft.com/msdnmag/issues/05/01/COptimizations/default.aspx](https://msdn.microsoft.com/msdnmag/issues/05/01/COptimizations/default.aspx).
19+
The compiler has been updated to reduce unnecessary double thunking. For example, any function with a managed type in the signature (including return type) will implicitly be marked as `__clrcall`.
2020

2121
## Example
2222

docs/error-messages/compiler-warnings/compiler-warning-level-4-c4701.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ void main()
6565
## See Also
6666
6767
[Compiler Warning (level 4) C4703](../../error-messages/compiler-warnings/compiler-warning-level-4-c4703.md)<br/>
68-
[Warnings, /sdl, and improving uninitialized variable detection](http://blogs.msdn.com/b/sdl/archive/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection.aspx)
68+
[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)

docs/error-messages/compiler-warnings/compiler-warning-level-4-c4703.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ void main()
6565
## See Also
6666
6767
[Compiler Warning (level 4) C4701](../../error-messages/compiler-warnings/compiler-warning-level-4-c4701.md)<br/>
68-
[Warnings, /sdl, and improving uninitialized variable detection](http://blogs.msdn.com/b/sdl/archive/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection.aspx)
68+
[Warnings, /sdl, and improving uninitialized variable detection](https://www.microsoft.com/security/blog/2012/06/06/warnings-sdl-and-improving-uninitialized-variable-detection/)

docs/error-messages/compiler-warnings/compiler-warnings-c4000-through-c4199.md

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

docs/mfc/html-basics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Life is good.
100100

101101
For a complete description of tags, attributes, and extensions, see the Hypertext Markup Language (HTML) specification:
102102

103-
[http://www.w3.org/pub/WWW/MarkUp/](http://www.w3.org/pub/www/markup/)
103+
[Latest published version of HTML](https://www.w3.org/TR/html/) at W3C.org.
104104

105105
## See also
106106

docs/mfc/reference/cdrawingmanager-class.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ The RGB representation of the HLS color provided.
559559

560560
### Remarks
561561

562-
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](http://go.microsoft.com/fwlink/p/?linkid=119126).
562+
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](/windows/desktop/uxguide/vis-color).
563563

564564
This method and the `CDrawingManager::HLStoRGB_TWO` method perform the same operation, but require different values for the *H* parameter. In this method, *H* is a percentage of the circle. In the `CDrawingManager::HLStoRGB_TWO` method, *H* is a degree value between 0 and 360, which both represent red. For example, with `HLStoRGB_ONE`, a value of 0.25 for *H* is equivalent to a value of 90 with `HLStoRGB_TWO`.
565565

@@ -591,7 +591,7 @@ The RGB representation of the HLS color provided.
591591

592592
### Remarks
593593

594-
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](http://go.microsoft.com/fwlink/p/?linkid=119126).
594+
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](/windows/desktop/uxguide/vis-color).
595595

596596
This method and the [CDrawingManager::HLStoRGB_ONE](#hlstorgb_one) method perform the same operation, but require different values for the *H* parameter. In this method, *H* is a degree value between 0 and 360, which both represent red. In the [CDrawingManager::HLStoRGB_ONE](#hlstorgb_one) method, *H* is a percentage of the circle. For example, with `HLStoRGB_ONE`, a value of 0.25 for *H* is equivalent to a value of 90 with `HLStoRGB_TWO`.
597597

@@ -621,7 +621,7 @@ The RGB representation of the HSV color provided.
621621

622622
### Remarks
623623

624-
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](http://go.microsoft.com/fwlink/p/?linkid=119126).
624+
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](/windows/desktop/uxguide/vis-color).
625625

626626
## <a name="huetorgb"></a> CDrawingManager::HuetoRGB
627627

@@ -806,7 +806,7 @@ static void __stdcall RGBtoHSL(
806806

807807
### Remarks
808808

809-
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](http://go.microsoft.com/fwlink/p/?linkid=119126).
809+
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](/windows/desktop/uxguide/vis-color).
810810

811811
The returned value for *H* is represented as a fraction between 0 and 1 where both 0 and 1 represent red. The returned values for *S* and *L* are numbers between 0 and 1.
812812

@@ -838,7 +838,7 @@ static void __stdcall RGBtoHSV(
838838

839839
### Remarks
840840

841-
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](http://go.microsoft.com/fwlink/p/?linkid=119126).
841+
A color can be represented as HSV (hue, saturation, and value), HSL (hue, saturation, and luminosity), or RGB (red, green, and blue). For more information about the different representations of color, see [Color](/windows/desktop/uxguide/vis-color).
842842

843843
The returned value for *H* is a number between 0 and 360 where both 0 and 360 indicate red. The return values for *S* and *V* are numbers between 0 and 1.
844844

docs/parallel/concrt/concurrency-runtime.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ For reference documentation, see [Reference](../../parallel/concrt/reference/ref
9090
|||
9191
|-|-|
9292
|[Async programming patterns and tips in Hilo (Windows Store apps using C++ and XAML)](https://msdn.microsoft.com/library/windows/apps/jj160321.aspx)|Learn how we used the Concurrency Runtime to implement asynchronous operations in Hilo, a Windows Runtime app using C++ and XAML.|
93-
|[Code samples for the Concurrency Runtime and Parallel Pattern Library in Visual Studio 2010](http://go.microsoft.com/fwlink/p/?linkid=183875)|Provides sample applications and utilities that demonstrate the Concurrency Runtime.|
9493
|[Parallel Programming in Native Code blog](http://go.microsoft.com/fwlink/p/?linkid=183873)|Provides additional in-depth blog articles about parallel programming in the Concurrency Runtime.|
9594
|[Parallel Computing in C++ and Native Code forum](http://go.microsoft.com/fwlink/p/?linkid=183874)|Enables you to participate in community discussions about the Concurrency Runtime.|
9695
|[Parallel Programming](/dotnet/standard/parallel-programming/index)|Teaches you about the parallel programming model that is available in the .NET Framework.|

docs/parallel/concrt/reference/task-class.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The result of the task.
9696
If the task is canceled, a call to `get` will throw a [task_canceled](task-canceled-class.md) exception. If the task encountered an different exception or an exception was propagated to it from an antecedent task, a call to `get` will throw that exception.
9797

9898
> [!IMPORTANT]
99-
> In a Universal Windows Platform (UWP) app, do not call [concurrency::task::wait](#wait) or `get` ( `wait` calls `get`) in code that runs on the STA. Otherwise, the runtime throws [concurrency::invalid_operation](invalid-operation-class.md) because these methods block the current thread and can cause the app to become unresponsive. However, you can call the `get` method to receive the result of the antecedent task in a task-based continuation because the result is immediately available.
99+
> In a Universal Windows Platform (UWP) app, do not call [concurrency::task::wait](#wait) or `get` ( `wait` calls `get`) in code that runs on the user-interface thread. Otherwise, the runtime throws [concurrency::invalid_operation](invalid-operation-class.md) because these methods block the current thread and can cause the app to become unresponsive. However, you can call the `get` method to receive the result of the antecedent task in a task-based continuation because the result is immediately available.
100100
101101
## <a name="is_apartment_aware"></a> is_apartment_aware
102102

@@ -328,7 +328,7 @@ A `task_status` value which could be either `completed` or `canceled`. If the ta
328328
### Remarks
329329

330330
> [!IMPORTANT]
331-
> In a Universal Windows Platform (UWP) app, do not call `wait` in code that runs on the STA. Otherwise, the runtime throws [concurrency::invalid_operation](invalid-operation-class.md) because this method blocks the current thread and can cause the app to become unresponsive. However, you can call the [concurrency::task::get](#get) method to receive the result of the antecedent task in a task-based continuation.
331+
> In a Universal Windows Platform (UWP) app, do not call `wait` in code that runs on the user-interface thread. Otherwise, the runtime throws [concurrency::invalid_operation](invalid-operation-class.md) because this method blocks the current thread and can cause the app to become unresponsive. However, you can call the [concurrency::task::get](#get) method to receive the result of the antecedent task in a task-based continuation.
332332
333333
## See also
334334

docs/porting/porting-from-unix-to-win32.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ The [UNIX Custom Application Migration Guide](https://technet.microsoft.com/libr
2626

2727
The [Unix Migration Project Guide](https://technet.microsoft.com/library/bb656287.aspx) supplements the UNIX Custom Application Migration Guide by providing high-level help on migrating substantial projects from UNIX to Win32. The Guide provides advice on issues to consider at each stage of project migration.
2828

29-
### Microsoft Windows Services for UNIX (SFU)
30-
31-
Microsoft Windows Services for UNIX (SFU) provides a full range of cross-platform services for integrating Windows into existing UNIX-based environments. Services for UNIX provides file sharing, remote access and administration, password synchronization, common directory management, a common set of utilities, and a shell.
32-
33-
[Windows Services for UNIX](http://www.microsoft.com/downloads/details.aspx?FamilyID=896c9688-601b-44f1-81a4-02878ff11778&displaylang=en)
34-
3529
### InteropSystems.com
3630

3731
[http://www.interopsystems.com/](http://www.interopsystems.com/)

docs/porting/porting-to-the-universal-windows-platform-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ If you have a DLL or a Windows Runtime Component that already works with Windows
6868

6969
### To port a Windows 8.1 Runtime Component to the UWP
7070

71-
1. In the **New Project** dialog in Visual Studio 2017, locate the **Windows Universal** node. If you don't see this node, install the [Tools for Windows 10](http://go.microsoft.com/fwlink/p/?LinkID=617903) first. Choose the **Windows Runtime Component** template, give a name for your component, and choose the **OK** button. The component name will be used as the namespace name, so you might want to use the same name as your old projects' namespace. This requires that you create the project in a different folder from the old one. If you choose a different name, you can update the namespace name in the generated code files.
71+
1. In the **New Project** dialog in Visual Studio 2017, locate the **Windows Universal** node. If you don't see this node, install the [Windows 10 SDK](https://developer.microsoft.com/windows/downloads/windows-10-sdk) first. Choose the **Windows Runtime Component** template, give a name for your component, and choose the **OK** button. The component name will be used as the namespace name, so you might want to use the same name as your old projects' namespace. This requires that you create the project in a different folder from the old one. If you choose a different name, you can update the namespace name in the generated code files.
7272

7373
1. Close the project.
7474

0 commit comments

Comments
 (0)