diff options
| author | Rajib Dutta <[email protected]> | 2018-09-28 14:57:15 -0700 |
|---|---|---|
| committer | Rajib Dutta <[email protected]> | 2018-09-28 14:57:15 -0700 |
| commit | 38985ba91feb685095754775e101389ad90c2aa6 (patch) | |
| tree | 490db3bd23c284de1c12298c7b1dcc68f4d77929 | |
| parent | b884a4852f34b8a61ae7245253f9de1fecbca54c (diff) | |
| parent | f93de41f1d36d6a1481049b1906d1a7d84081d1c (diff) | |
Merge branch 'master' of https://github.com/Microsoft/Windows-driver-samples
4 files changed, 10 insertions, 3 deletions
diff --git a/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj b/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj index 6319ca83..45e5970c 100644 --- a/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj +++ b/bluetooth/serialhcibus/WDK/SerialBusWdk.vcxproj @@ -79,13 +79,11 @@ <ClCompile Include="..\fdo.c; device.c; ..\io.c; ..\pdo.c; ..\driver.c"> <WppEnabled>true</WppEnabled> <WppKernelMode>true</WppKernelMode> - <WppScanConfigurationData>debugdef.h</WppScanConfigurationData> <WppTraceFunction>DoTrace(LEVEL,FLAG,(MSG,...))</WppTraceFunction> </ClCompile> <OtherWpp Include="driver.rc"> <WppEnabled>true</WppEnabled> <WppKernelMode>true</WppKernelMode> - <WppScanConfigurationData>debugdef.h</WppScanConfigurationData> <WppTraceFunction>DoTrace(LEVEL,FLAG,(MSG,...))</WppTraceFunction> </OtherWpp> </ItemGroup> diff --git a/general/registry/regfltr/exe/common.h b/general/registry/regfltr/exe/common.h index 7ed20690..6a7d105b 100644 --- a/general/registry/regfltr/exe/common.h +++ b/general/registry/regfltr/exe/common.h @@ -60,7 +60,7 @@ Environment: #define NOT_MODIFIED_KEY_NAME L"_RegFltrNotModifiedKey" #define VALUE_NAME L"_RegFltrValue" #define MODIFIED_VALUE_NAME L"_RegFltrModifiedValue" -#define NOT_MODIFIED_VALUE_NAME L"_RegFltrNotModifiedValue
" +#define NOT_MODIFIED_VALUE_NAME L"_RegFltrNotModifiedValue" #define CALLBACK_LOW_ALTITUDE L"380000" #define CALLBACK_ALTITUDE L"380010" diff --git a/print/autoconfig/AutoCnfg.inf b/print/autoconfig/AutoCnfg.inf index 4c9208d0..70cd5a53 100644 --- a/print/autoconfig/AutoCnfg.inf +++ b/print/autoconfig/AutoCnfg.inf @@ -68,6 +68,12 @@ DataSection=PSCRIPT_DATA Include=NTPRINT.INF Needs=PSCRIPT.OEM,PSCRIPT_DATA +[INSTALL_AUTO_CONFIG.UNI.Services] +AddService=,2 + +[INSTALL_AUTO_CONFIG.PS.Services] +AddService=,2 + ; Copy Sections ; ; Lists of files that are actually copied. These sections are referenced diff --git a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf index 92bf72b2..b4326484 100644 --- a/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf +++ b/print/v4PrintDriverSamples/v4PrintDriver-HostBasedSampleDriver/usb_host_based_sample.inf @@ -53,6 +53,9 @@ ClassVer=4.0 [USB_HOST_BASED_SAMPLE] CopyFiles=USB_HOST_BASED_SAMPLE_FILES +[USB_HOST_BASED_SAMPLE.Services] +AddService=,2 + ; ; Copy Sections ; |