Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

[reactos] 01/01: [COMCTL32] rebar: Use DrawThemeText when drawing text with themes. CORE-13855

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92732f1bcfaa008774f21… commit 92732f1bcfaa008774f21abcb01f9064ada0ca48 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Jan 10 13:42:53 2018 +0200 [COMCTL32] rebar: Use DrawThemeText when drawing text with themes. CORE-13855 --- dll/win32/comctl32/rebar.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dll/win32/comctl32/rebar.c b/dll/win32/comctl32/rebar.c index 4912b88264..525c4cc524 100644 --- a/dll/win32/comctl32/rebar.c +++ b/dll/win32/comctl32/rebar.c @@ -612,8 +612,16 @@ REBAR_DrawBand (HDC hdc, const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) lpBand->clrFore; oldcolor = SetTextColor (hdc, new); } - DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + if (!theme) + { + DrawTextW (hdc, lpBand->lpText, -1, &lpBand->rcCapText, DT_CENTER | DT_VCENTER | DT_SINGLELINE); + } + else + { + DrawThemeText(theme, hdc, 0, 0, lpBand->lpText, -1, DT_CENTER | DT_VCENTER | DT_SINGLELINE, 0, &lpBand->rcCapText); + } + if (oldBkMode != TRANSPARENT) SetBkMode (hdc, oldBkMode); if (lpBand->clrFore != CLR_NONE)

6 years, 11 months

[reactos] 01/01: [MSAFD] Avoid magic numbers in NtCreateEvent calls.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf5e33201eb75e515d875… commit bf5e33201eb75e515d87594c45cf2c57af768d45 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 6 18:11:18 2018 +0100 [MSAFD] Avoid magic numbers in NtCreateEvent calls. --- dll/win32/msafd/misc/dllmain.c | 24 ++++++++++++------------ dll/win32/msafd/misc/event.c | 4 ++-- dll/win32/msafd/misc/sndrcv.c | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index e456796147..c0de49ba28 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -640,7 +640,7 @@ WSPCloseSocket(IN SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if(!NT_SUCCESS(Status)) @@ -883,7 +883,7 @@ WSPBind(SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) @@ -998,7 +998,7 @@ WSPListen(SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) @@ -1145,7 +1145,7 @@ WSPSelect(IN int nfds, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if(!NT_SUCCESS(Status)) @@ -1477,7 +1477,7 @@ WSPAccept(SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) @@ -1851,7 +1851,7 @@ WSPConnect(SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) @@ -2087,7 +2087,7 @@ WSPShutdown(SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) @@ -2173,7 +2173,7 @@ WSPGetSockName(IN SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) @@ -2280,7 +2280,7 @@ WSPGetPeerName(IN SOCKET s, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) @@ -3176,7 +3176,7 @@ GetSocketInformation(PSOCKET_INFORMATION Socket, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) @@ -3301,7 +3301,7 @@ SetSocketInformation(PSOCKET_INFORMATION Socket, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) @@ -3435,7 +3435,7 @@ int CreateContext(PSOCKET_INFORMATION Socket) Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, NULL, - 1, + SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) diff --git a/dll/win32/msafd/misc/event.c b/dll/win32/msafd/misc/event.c index 467c039cb4..581e4ee195 100644 --- a/dll/win32/msafd/misc/event.c +++ b/dll/win32/msafd/misc/event.c @@ -38,7 +38,7 @@ WSPEventSelect( } Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE); + NULL, SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) return SOCKET_ERROR; @@ -158,7 +158,7 @@ WSPEnumNetworkEvents( } Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE); + NULL, SynchronizationEvent, FALSE); if( !NT_SUCCESS(Status) ) { ERR("Could not make an event %x\n", Status); diff --git a/dll/win32/msafd/misc/sndrcv.c b/dll/win32/msafd/misc/sndrcv.c index 507bd47256..07fe8b1f1c 100644 --- a/dll/win32/msafd/misc/sndrcv.c +++ b/dll/win32/msafd/misc/sndrcv.c @@ -198,7 +198,7 @@ WSPRecv(SOCKET Handle, } Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE ); + NULL, SynchronizationEvent, FALSE ); if( !NT_SUCCESS(Status) ) return -1; @@ -417,7 +417,7 @@ WSPRecvFrom(SOCKET Handle, } Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE ); + NULL, SynchronizationEvent, FALSE ); if( !NT_SUCCESS(Status) ) return -1; @@ -601,7 +601,7 @@ WSPSend(SOCKET Handle, } Status = NtCreateEvent( &SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE ); + NULL, SynchronizationEvent, FALSE ); if( !NT_SUCCESS(Status) ) return -1; @@ -802,7 +802,7 @@ WSPSendTo(SOCKET Handle, Status = NtCreateEvent(&SockEvent, EVENT_ALL_ACCESS, - NULL, 1, FALSE); + NULL, SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) {

6 years, 11 months

[reactos] 02/02: [TCPIP] Fix buffer sizes in ReadIpConfiguration.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f54fb980baf0e35738cf9… commit f54fb980baf0e35738cf97bae8d4e7ff3dc04737 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jan 8 13:58:20 2018 +0100 [TCPIP] Fix buffer sizes in ReadIpConfiguration. --- drivers/network/tcpip/datalink/lan.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index 23ffbbab46..35fe5bef57 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -570,6 +570,7 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) OBJECT_ATTRIBUTES ObjectAttributes; HANDLE ParameterHandle; PKEY_VALUE_PARTIAL_INFORMATION KeyValueInfo; + ULONG KeyValueInfoLength; WCHAR Buffer[150]; UNICODE_STRING IPAddress = RTL_CONSTANT_STRING(L"IPAddress"); UNICODE_STRING Netmask = RTL_CONSTANT_STRING(L"SubnetMask"); @@ -608,31 +609,34 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) } else { - KeyValueInfo = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), KEY_VALUE_TAG); + KeyValueInfoLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + 16 * sizeof(WCHAR); + KeyValueInfo = ExAllocatePoolWithTag(PagedPool, + KeyValueInfoLength, + KEY_VALUE_TAG); if (!KeyValueInfo) { ZwClose(ParameterHandle); return FALSE; } - + /* Read the EnableDHCP entry */ Status = ZwQueryValueKey(ParameterHandle, &EnableDhcp, KeyValuePartialInformation, KeyValueInfo, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG), + KeyValueInfoLength, &Unused); if (NT_SUCCESS(Status) && KeyValueInfo->DataLength == sizeof(ULONG) && (*(PULONG)KeyValueInfo->Data) == 0) { - RegistryDataU.MaximumLength = 16 + sizeof(WCHAR); + RegistryDataU.MaximumLength = KeyValueInfoLength - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); RegistryDataU.Buffer = (PWCHAR)KeyValueInfo->Data; - + /* Read the IP address */ Status = ZwQueryValueKey(ParameterHandle, &IPAddress, KeyValuePartialInformation, KeyValueInfo, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), + KeyValueInfoLength, &Unused); if (NT_SUCCESS(Status)) { @@ -653,7 +657,7 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) &Netmask, KeyValuePartialInformation, KeyValueInfo, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), + KeyValueInfoLength, &Unused); if (NT_SUCCESS(Status)) { @@ -682,7 +686,7 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) &Gateway, KeyValuePartialInformation, KeyValueInfo, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), + KeyValueInfoLength, &Unused); if (NT_SUCCESS(Status)) {

6 years, 11 months

[reactos] 01/02: [TCPIP] Check for allocation failures in ReadIpConfiguration. CID 1411924

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d87786bf6cb718510aeff… commit d87786bf6cb718510aefffc20b10322d60c06ea1 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jan 8 13:51:04 2018 +0100 [TCPIP] Check for allocation failures in ReadIpConfiguration. CID 1411924 --- drivers/network/tcpip/datalink/lan.c | 66 ++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/drivers/network/tcpip/datalink/lan.c b/drivers/network/tcpip/datalink/lan.c index 01b36a08cc..23ffbbab46 100644 --- a/drivers/network/tcpip/datalink/lan.c +++ b/drivers/network/tcpip/datalink/lan.c @@ -637,14 +637,16 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) if (NT_SUCCESS(Status)) { RegistryDataU.Length = KeyValueInfo->DataLength; - - RtlUnicodeStringToAnsiString(&RegistryDataA, - &RegistryDataU, - TRUE); - - AddrInitIPv4(&Interface->Unicast, inet_addr(RegistryDataA.Buffer)); - - RtlFreeAnsiString(&RegistryDataA); + + Status = RtlUnicodeStringToAnsiString(&RegistryDataA, + &RegistryDataU, + TRUE); + if (NT_SUCCESS(Status)) + { + AddrInitIPv4(&Interface->Unicast, + inet_addr(RegistryDataA.Buffer)); + RtlFreeAnsiString(&RegistryDataA); + } } Status = ZwQueryValueKey(ParameterHandle, @@ -656,16 +658,18 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) if (NT_SUCCESS(Status)) { RegistryDataU.Length = KeyValueInfo->DataLength; - - RtlUnicodeStringToAnsiString(&RegistryDataA, - &RegistryDataU, - TRUE); - - AddrInitIPv4(&Interface->Netmask, inet_addr(RegistryDataA.Buffer)); - - RtlFreeAnsiString(&RegistryDataA); + + Status = RtlUnicodeStringToAnsiString(&RegistryDataA, + &RegistryDataU, + TRUE); + if (NT_SUCCESS(Status)) + { + AddrInitIPv4(&Interface->Netmask, + inet_addr(RegistryDataA.Buffer)); + RtlFreeAnsiString(&RegistryDataA); + } } - + /* We have to wait until both IP address and subnet mask * are read to add the interface route, but we must do it * before we add the default gateway */ @@ -683,24 +687,26 @@ BOOLEAN ReadIpConfiguration(PIP_INTERFACE Interface) if (NT_SUCCESS(Status)) { RegistryDataU.Length = KeyValueInfo->DataLength; - - RtlUnicodeStringToAnsiString(&RegistryDataA, - &RegistryDataU, - TRUE); - - AddrInitIPv4(&Router, inet_addr(RegistryDataA.Buffer)); - - if (!AddrIsUnspecified(&Router)) - RouterCreateRoute(&DefaultMask, &DefaultMask, &Router, Interface, 1); - - RtlFreeAnsiString(&RegistryDataA); + + Status = RtlUnicodeStringToAnsiString(&RegistryDataA, + &RegistryDataU, + TRUE); + if (NT_SUCCESS(Status)) + { + AddrInitIPv4(&Router, inet_addr(RegistryDataA.Buffer)); + + if (!AddrIsUnspecified(&Router)) + RouterCreateRoute(&DefaultMask, &DefaultMask, &Router, Interface, 1); + + RtlFreeAnsiString(&RegistryDataA); + } } } - + ExFreePoolWithTag(KeyValueInfo, KEY_VALUE_TAG); ZwClose(ParameterHandle); } - + return TRUE; }

6 years, 11 months

[reactos] 01/01: [KERNEL32] Accept all images for NT 3.1 and higher instead of bailing out at image versions > 5.01 (#273)

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63a3a2cbb8d67c1afe8b2… commit 63a3a2cbb8d67c1afe8b283880e75e0e5b5bed01 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Wed Jan 10 09:24:22 2018 +0100 [KERNEL32] Accept all images for NT 3.1 and higher instead of bailing out at image versions > 5.01 (#273) Print a debug message whenever an application newer than ReactOS' internal NT version is started. This gets a simple "Hello World" compiled by VS' 2017 regular "v141" toolchain to run under ReactOS. Please retry NT6+ applications! --- dll/win32/kernel32/client/proc.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 3caf28e3c3..649dcd4f41 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -123,13 +123,25 @@ WINAPI BasepIsImageVersionOk(IN ULONG ImageMajorVersion, IN ULONG ImageMinorVersion) { - /* Accept images for NT 3.1 or higher, as long as they're not newer than us */ - return ((ImageMajorVersion >= 3) && - ((ImageMajorVersion != 3) || - (ImageMinorVersion >= 10)) && - (ImageMajorVersion <= SharedUserData->NtMajorVersion) && - ((ImageMajorVersion != SharedUserData->NtMajorVersion) || - (ImageMinorVersion <= SharedUserData->NtMinorVersion))); + /* Accept images for NT 3.1 or higher */ + if (ImageMajorVersion > 3 || + (ImageMajorVersion == 3 && ImageMinorVersion >= 10)) + { + /* ReactOS-specific: Accept images even if they are newer than our internal NT version. */ + if (ImageMajorVersion > SharedUserData->NtMajorVersion || + (ImageMajorVersion == SharedUserData->NtMajorVersion && ImageMinorVersion > SharedUserData->NtMinorVersion)) + { + DPRINT1("Accepting image version %lu.%lu, although ReactOS is an NT %hu.%hu OS!\n", + ImageMajorVersion, + ImageMinorVersion, + SharedUserData->NtMajorVersion, + SharedUserData->NtMinorVersion); + } + + return TRUE; + } + + return FALSE; } NTSTATUS

6 years, 11 months

[reactos] 02/02: [SHIMENG] Mark modified dll's as visited, and apply shims to newly loaded dlls

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06c1e134e1665356394c1… commit 06c1e134e1665356394c1947ff061d28a918aa5a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Aug 29 22:21:58 2017 +0200 [SHIMENG] Mark modified dll's as visited, and apply shims to newly loaded dlls --- dll/appcompat/apphelp/shimeng.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index 26e64b051f..0d95d61183 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -833,6 +833,12 @@ VOID SeiHookImports(PLDR_DATA_TABLE_ENTRY LdrEntry) return; } + if (LdrEntry->Flags & LDRP_COMPAT_DATABASE_PROCESSED) + { + SHIMENG_INFO("Skipping module 0x%p \"%wZ\" because it was already processed\n", LdrEntry->DllBase, &LdrEntry->BaseDllName); + return; + } + ImportDescriptor = RtlImageDirectoryEntryToData(DllBase, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &Size); if (!ImportDescriptor) { @@ -902,6 +908,9 @@ VOID SeiHookImports(PLDR_DATA_TABLE_ENTRY LdrEntry) } } } + + /* Mark this module as processed. */ + LdrEntry->Flags |= LDRP_COMPAT_DATABASE_PROCESSED; } @@ -1185,12 +1194,18 @@ VOID NTAPI SE_ProcessDying(VOID) VOID WINAPI SE_DllLoaded(PLDR_DATA_TABLE_ENTRY LdrEntry) { SHIMENG_INFO("%sINIT. loading DLL \"%wZ\"\n", g_bShimDuringInit ? "" : "AFTER ", &LdrEntry->BaseDllName); + + SeiHookImports(LdrEntry); + NotifyShims(SHIM_REASON_DLL_LOAD, LdrEntry); } VOID WINAPI SE_DllUnloaded(PLDR_DATA_TABLE_ENTRY LdrEntry) { SHIMENG_INFO("(%p)\n", LdrEntry); + + /* Should we unhook here? */ + NotifyShims(SHIM_REASON_DLL_UNLOAD, LdrEntry); }

6 years, 11 months

[reactos] 01/02: [APPHELP] Try Dos and Nt path formats in SdbGetFileAttributes.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0123f4745b359983fb6c0… commit 0123f4745b359983fb6c0c47bc5f71d60be87c6f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jan 7 21:52:13 2018 +0100 [APPHELP] Try Dos and Nt path formats in SdbGetFileAttributes. --- dll/appcompat/apphelp/sdbapi.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dll/appcompat/apphelp/sdbapi.c b/dll/appcompat/apphelp/sdbapi.c index f7d01f9935..ba60048ca5 100644 --- a/dll/appcompat/apphelp/sdbapi.c +++ b/dll/appcompat/apphelp/sdbapi.c @@ -177,15 +177,22 @@ BOOL WINAPI SdbpOpenMemMappedFile(LPCWSTR path, PMEMMAPPED mapping) RtlZeroMemory(mapping, sizeof(*mapping)); - if(!RtlDosPathNameToNtPathName_U(path, &FileName, NULL, NULL)) - { - RtlFreeUnicodeString(&FileName); - return FALSE; - } + RtlInitUnicodeString(&FileName, path); InitializeObjectAttributes(&ObjectAttributes, &FileName, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = NtOpenFile(&mapping->file, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); - RtlFreeUnicodeString(&FileName); + + if (Status == STATUS_OBJECT_NAME_INVALID || Status == STATUS_OBJECT_PATH_SYNTAX_BAD) + { + if (!RtlDosPathNameToNtPathName_U(path, &FileName, NULL, NULL)) + { + SHIM_ERR("Failed to convert %S to Nt path: 0x%lx\n", path, Status); + return FALSE; + } + InitializeObjectAttributes(&ObjectAttributes, &FileName, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtOpenFile(&mapping->file, GENERIC_READ | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeUnicodeString(&FileName); + } if (!NT_SUCCESS(Status)) {

6 years, 11 months

[reactos] 01/01: [SETUPAPI]: Fix a FIXME in SetupDiSetDeviceRegistryPropertyA. Rename SetupDiSetDeviceRegistryPropertyW to IntSetupDiSetDeviceRegistryPropertyAW and use it for both (A/W). The FIXME in the A-Version was already implemented in the W-Version.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=387067ad299578c2f657f… commit 387067ad299578c2f657f5adb3a99ad4c5080dcf Author: Andreas Maier <andy1.m(a)gmx.de> AuthorDate: Thu Jan 4 12:15:38 2018 +0100 [SETUPAPI]: Fix a FIXME in SetupDiSetDeviceRegistryPropertyA. Rename SetupDiSetDeviceRegistryPropertyW to IntSetupDiSetDeviceRegistryPropertyAW and use it for both (A/W). The FIXME in the A-Version was already implemented in the W-Version. CORE-14173. --- dll/win32/setupapi/devinst.c | 102 +++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 47 deletions(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index b022faea97..1d83664bf2 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -3447,53 +3447,15 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( } /*********************************************************************** - * SetupDiSetDeviceRegistryPropertyA (SETUPAPI.@) - */ -BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) -{ - BOOL ret = FALSE; - struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; - - TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, - PropertyBuffer, PropertyBufferSize); - - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - FIXME("%p %p 0x%lx %p 0x%lx\n", DeviceInfoSet, DeviceInfoData, - Property, PropertyBuffer, PropertyBufferSize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return ret; -} - -/*********************************************************************** - * SetupDiSetDeviceRegistryPropertyW (SETUPAPI.@) + * Internal for SetupDiSetDeviceRegistryPropertyA/W */ -BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( +BOOL WINAPI IntSetupDiSetDeviceRegistryPropertyAW( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) + DWORD PropertyBufferSize, + BOOL isAnsi) { BOOL ret = FALSE; struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; @@ -3518,7 +3480,8 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( return FALSE; } if (Property < sizeof(PropertyMap) / sizeof(PropertyMap[0]) - && PropertyMap[Property].nameW) + && PropertyMap[Property].nameW + && PropertyMap[Property].nameA) { HKEY hKey; LONG l; @@ -3526,10 +3489,20 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( if (hKey == INVALID_HANDLE_VALUE) return FALSE; /* Write new data */ - l = RegSetValueExW( - hKey, PropertyMap[Property].nameW, 0, - PropertyMap[Property].regType, PropertyBuffer, - PropertyBufferSize); + if (isAnsi) + { + l = RegSetValueExA( + hKey, PropertyMap[Property].nameA, 0, + PropertyMap[Property].regType, PropertyBuffer, + PropertyBufferSize); + } + else + { + l = RegSetValueExW( + hKey, PropertyMap[Property].nameW, 0, + PropertyMap[Property].regType, PropertyBuffer, + PropertyBufferSize); + } if (!l) ret = TRUE; else @@ -3545,6 +3518,41 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( TRACE("Returning %d\n", ret); return ret; } +/*********************************************************************** + * SetupDiSetDeviceRegistryPropertyA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Property, + const BYTE *PropertyBuffer, + DWORD PropertyBufferSize) +{ + return IntSetupDiSetDeviceRegistryPropertyAW(DeviceInfoSet, + DeviceInfoData, + Property, + PropertyBuffer, + PropertyBufferSize, + TRUE); +} + +/*********************************************************************** + * SetupDiSetDeviceRegistryPropertyW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceRegistryPropertyW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Property, + const BYTE *PropertyBuffer, + DWORD PropertyBufferSize) +{ + return IntSetupDiSetDeviceRegistryPropertyAW(DeviceInfoSet, + DeviceInfoData, + Property, + PropertyBuffer, + PropertyBufferSize, + FALSE); +} /*********************************************************************** * SetupDiInstallClassA (SETUPAPI.@)

6 years, 11 months

[reactos] 02/02: [NTOS] Limit the spam from NtNotifyChangeMultipleKeys. CORE-13125

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b398514f1ff921edb647… commit 7b398514f1ff921edb647b8d7e01941670a79034 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 8 21:18:30 2018 +0100 [NTOS] Limit the spam from NtNotifyChangeMultipleKeys. CORE-13125 --- ntoskrnl/config/ntapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c index 03bcc3dc06..05b43bb436 100644 --- a/ntoskrnl/config/ntapi.c +++ b/ntoskrnl/config/ntapi.c @@ -1094,7 +1094,7 @@ NtNotifyChangeMultipleKeys(IN HANDLE MasterKeyHandle, IN ULONG Length, IN BOOLEAN Asynchronous) { - UNIMPLEMENTED; + UNIMPLEMENTED_ONCE; return STATUS_NOT_IMPLEMENTED; }

6 years, 11 months

[reactos] 01/02: [SDK] Add UNIMPLEMENTED_ONCE macro, to be used for functions that spam.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81eb3bbceb518c331f3d8… commit 81eb3bbceb518c331f3d8e4754ad61adc0e94d33 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Jan 8 21:06:23 2018 +0100 [SDK] Add UNIMPLEMENTED_ONCE macro, to be used for functions that spam. --- sdk/include/reactos/debug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/include/reactos/debug.h b/sdk/include/reactos/debug.h index e7a4550edf..70c3cb488e 100644 --- a/sdk/include/reactos/debug.h +++ b/sdk/include/reactos/debug.h @@ -117,6 +117,7 @@ RtlAssert( #endif #define UNIMPLEMENTED __NOTICE(WARNING, "is UNIMPLEMENTED!\n") + #define UNIMPLEMENTED_ONCE do { static int bWarnedOnce = 0; if (!bWarnedOnce) { bWarnedOnce++; UNIMPLEMENTED; } } while (0) #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) @@ -151,6 +152,7 @@ RtlAssert( #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define UNIMPLEMENTED + #define UNIMPLEMENTED_ONCE #define ERR_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)

6 years, 11 months

← Newer
1
...
28
29
30
31
32
33
34
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2018