Ros-diffs June 2021

ros-diffs@reactos.org

19 participants
228 discussions

[reactos] 06/26: [NET] Properly check return value of EnumServicesStatusW on first call

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bf64780e4b798f6f864c… commit 6bf64780e4b798f6f864c57a60ebc0e916d1f55e Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 17 15:59:48 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 28 10:20:57 2021 +0200 [NET] Properly check return value of EnumServicesStatusW on first call --- base/applications/network/net/cmdStart.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/base/applications/network/net/cmdStart.c b/base/applications/network/net/cmdStart.c index 50029b129d9..1ae2d09b8c2 100644 --- a/base/applications/network/net/cmdStart.c +++ b/base/applications/network/net/cmdStart.c @@ -23,6 +23,7 @@ EnumerateRunningServices(VOID) INT i; INT nError = 0; DWORD dwError = ERROR_SUCCESS; + BOOL ret; hManager = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASE, @@ -34,14 +35,22 @@ EnumerateRunningServices(VOID) goto done; } - EnumServicesStatusW(hManager, - SERVICE_WIN32, - SERVICE_ACTIVE, - NULL, - 0, - &dwBufferSize, - &dwServiceCount, - &dwResumeHandle); + ret = EnumServicesStatusW(hManager, + SERVICE_WIN32, + SERVICE_ACTIVE, + NULL, + 0, + &dwBufferSize, + &dwServiceCount, + &dwResumeHandle); + if (ret) + { + /* Nothing to enumerate ?! */ + goto done; + } + dwError = GetLastError(); + if (dwError != ERROR_INSUFFICIENT_BUFFER) + goto done; if (dwBufferSize != 0) {

3 years, 6 months

[reactos] 05/26: [FLTMC] Do not ignore failures of some functions

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5aafeb473f6adeded7ad8… commit 5aafeb473f6adeded7ad86f43d8aa72882ed0f58 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 17 15:50:54 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 28 10:20:57 2021 +0200 [FLTMC] Do not ignore failures of some functions Also reduce use of magic values. CORE-17637 --- base/applications/fltmc/fltmc.cpp | 70 ++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/base/applications/fltmc/fltmc.cpp b/base/applications/fltmc/fltmc.cpp index 689efa3cdc8..36d81cb034d 100644 --- a/base/applications/fltmc/fltmc.cpp +++ b/base/applications/fltmc/fltmc.cpp @@ -61,7 +61,7 @@ SetDriverLoadPrivilege() LUID luid; BOOL bSuccess; DWORD dwError = ERROR_SUCCESS; - + bSuccess = OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken); @@ -220,7 +220,8 @@ PrintVolumeInfo(_In_ PVOID Buffer) VolName[FilterVolInfo->FilterVolumeNameLength] = UNICODE_NULL; } - (void)FilterGetDosName(VolName, DosName, 16); + if (!SUCCEEDED(FilterGetDosName(VolName, DosName, _countof(DosName)))) + DosName[0] = L'\0'; switch (FilterVolInfo->FileSystemType) { @@ -271,7 +272,7 @@ ListFilters() hr = FilterFindFirst(FilterAggregateStandardInformation, Buffer, - 1024, + sizeof(Buffer), &BytesReturned, &FindHandle); if (!SUCCEEDED(hr)) @@ -279,44 +280,51 @@ ListFilters() IsNewStyle = FALSE; hr = FilterFindFirst(FilterFullInformation, Buffer, - 1024, + sizeof(Buffer), &BytesReturned, &FindHandle); } - if (SUCCEEDED(hr)) + if (!SUCCEEDED(hr)) + { + LoadAndPrintString(IDS_ERROR_FILTERS, hr); + PrintErrorText(hr); + return; + } + + if (IsNewStyle) + { + LoadAndPrintString(IDS_DISPLAY_FILTERS1); + wprintf(L"------------------------------ ------------- ------------ -----\n"); + } + else { - if (IsNewStyle) + LoadAndPrintString(IDS_DISPLAY_FILTERS2); + wprintf(L"------------------------------ ------------- -----\n"); + } + + PrintFilterInfo(Buffer, IsNewStyle); + + do + { + hr = FilterFindNext(FindHandle, + IsNewStyle ? FilterAggregateStandardInformation : FilterFullInformation, + Buffer, + sizeof(Buffer), + &BytesReturned); + if (SUCCEEDED(hr)) { - LoadAndPrintString(IDS_DISPLAY_FILTERS1); - wprintf(L"------------------------------ ------------- ------------ -----\n"); + PrintFilterInfo(Buffer, IsNewStyle); } - else + else if (hr != HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS)) { - LoadAndPrintString(IDS_DISPLAY_FILTERS2); - wprintf(L"------------------------------ ------------- -----\n"); + LoadAndPrintString(IDS_ERROR_FILTERS, hr); + PrintErrorText(hr); } + } while (SUCCEEDED(hr)); - PrintFilterInfo(Buffer, IsNewStyle); - - do - { - hr = FilterFindNext(FindHandle, - IsNewStyle ? FilterAggregateStandardInformation : FilterFullInformation, - Buffer, - 1024, - &BytesReturned); - if (SUCCEEDED(hr)) - { - PrintFilterInfo(Buffer, IsNewStyle); - } - - } while (SUCCEEDED(hr)); - - FilterFindClose(FindHandle); - } - - if (!SUCCEEDED(hr) && hr != HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS)) + hr = FilterFindClose(FindHandle); + if (!SUCCEEDED(hr)) { LoadAndPrintString(IDS_ERROR_FILTERS, hr); PrintErrorText(hr);

3 years, 6 months

[reactos] 04/26: [RTL] In RtlReleasePrivilege, raise exception if restoring old privileges fails

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46394ab80db2aee79ef78… commit 46394ab80db2aee79ef78735cf3634056a1babd3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 17 15:42:07 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 28 10:20:57 2021 +0200 [RTL] In RtlReleasePrivilege, raise exception if restoring old privileges fails CORE-17637 --- sdk/lib/rtl/priv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk/lib/rtl/priv.c b/sdk/lib/rtl/priv.c index 34b860f1975..164bd80f75f 100644 --- a/sdk/lib/rtl/priv.c +++ b/sdk/lib/rtl/priv.c @@ -387,9 +387,12 @@ RtlReleasePrivilege(IN PVOID ReturnedState) else { /* Otherwise, restore old state */ - ZwAdjustPrivilegesToken(State->Token, FALSE, - State->OldPrivileges, 0, NULL, NULL); - + Status = ZwAdjustPrivilegesToken(State->Token, FALSE, + State->OldPrivileges, 0, NULL, NULL); + if (!NT_SUCCESS(Status)) + { + RtlRaiseStatus(Status); + } } /* If we used a different buffer for old privileges, just free it */

3 years, 6 months

[reactos] 03/26: [RTL] When taking system volume ownership, assert that we succeeded to restore privileges

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb9ebe17bf7b422fbfc0d… commit fb9ebe17bf7b422fbfc0dd63ff14d9d0dea82884 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 17 15:39:40 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 28 10:20:57 2021 +0200 [RTL] When taking system volume ownership, assert that we succeeded to restore privileges CORE-17637 --- sdk/lib/rtl/sysvol.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sdk/lib/rtl/sysvol.c b/sdk/lib/rtl/sysvol.c index 67c79df0651..6bc7b63f34b 100644 --- a/sdk/lib/rtl/sysvol.c +++ b/sdk/lib/rtl/sysvol.c @@ -412,7 +412,9 @@ Cleanup: return Status; } -static NTSTATUS +_Must_inspect_result_ +static +NTSTATUS RtlpSysVolTakeOwnership(IN PUNICODE_STRING DirectoryPath, IN PSECURITY_DESCRIPTOR SecurityDescriptor) { @@ -511,12 +513,16 @@ RtlpSysVolTakeOwnership(IN PUNICODE_STRING DirectoryPath, Cleanup: if (TokenEnabled) { - ZwAdjustPrivilegesToken(hToken, - FALSE, - &TokenPrivileges, - 0, - NULL, - NULL); + /* Disable privileges that we had to enable, whetever the result was. */ + NTSTATUS Status2 = ZwAdjustPrivilegesToken(hToken, + FALSE, + &TokenPrivileges, + 0, + NULL, + NULL); + /* This must succeed */ + ASSERT(NT_SUCCESS(Status2)); + (void)Status2; } if (AdminSid != NULL)

3 years, 6 months

[reactos] 02/26: [RTL] Check and cascade down RtlGUIDFromString value

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c5b39e25af1d2024a0e2… commit 9c5b39e25af1d2024a0e2e6d0b8bfd61bcb01221 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 17 15:31:11 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 28 10:20:57 2021 +0200 [RTL] Check and cascade down RtlGUIDFromString value CORE-17637 --- sdk/lib/rtl/actctx.c | 154 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 128 insertions(+), 26 deletions(-) diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 0850095b2b6..a8b44da6892 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -3840,7 +3840,10 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI return STATUS_SUCCESS; } -static NTSTATUS build_tlib_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) +_Must_inspect_result_ +static +NTSTATUS +build_tlib_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) { unsigned int i, j, k, total_len = 0, tlib_count = 0, names_len = 0; struct guidsection_header *header; @@ -3905,6 +3908,7 @@ static NTSTATUS build_tlib_section(ACTIVATION_CONTEXT* actctx, struct guidsectio ULONG module_len, help_len; UNICODE_STRING str; WCHAR *ptrW; + NTSTATUS Status; if (*entity->u.typelib.helpdir) help_len = strlenW(entity->u.typelib.helpdir)*sizeof(WCHAR); @@ -3915,7 +3919,12 @@ static NTSTATUS build_tlib_section(ACTIVATION_CONTEXT* actctx, struct guidsectio /* setup new index entry */ RtlInitUnicodeString(&str, entity->u.typelib.tlbid); - RtlGUIDFromString(&str, &index->guid); + Status = RtlGUIDFromString(&str, &index->guid); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } index->data_offset = data_offset; index->data_len = sizeof(*data) + aligned_string_len(help_len); index->rosterindex = i + 1; @@ -4071,11 +4080,15 @@ static void get_comserver_datalen(const struct entity_array *entities, const str } } -static void add_comserver_record(const struct guidsection_header *section, const struct entity_array *entities, +_Must_inspect_result_ +static +NTSTATUS +add_comserver_record(const struct guidsection_header *section, const struct entity_array *entities, const struct dll_redirect *dll, struct guid_index **index, ULONG *data_offset, ULONG *module_offset, ULONG *seed, ULONG rosterindex) { unsigned int i; + NTSTATUS Status; for (i = 0; i < entities->num; i++) { @@ -4098,7 +4111,9 @@ static void add_comserver_record(const struct guidsection_header *section, const /* setup new index entry */ RtlInitUnicodeString(&str, entity->u.comclass.clsid); - RtlGUIDFromString(&str, &(*index)->guid); + Status = RtlGUIDFromString(&str, &(*index)->guid); + if (!NT_SUCCESS(Status)) + return Status; (*index)->data_offset = *data_offset; (*index)->data_len = sizeof(*data); /* additional length added later */ @@ -4126,7 +4141,9 @@ static void add_comserver_record(const struct guidsection_header *section, const if (entity->u.comclass.tlbid) { RtlInitUnicodeString(&str, entity->u.comclass.tlbid); - RtlGUIDFromString(&str, &data->tlbid); + Status = RtlGUIDFromString(&str, &data->tlbid); + if (!NT_SUCCESS(Status)) + return Status; } else memset(&data->tlbid, 0, sizeof(data->tlbid)); @@ -4245,15 +4262,21 @@ static void add_comserver_record(const struct guidsection_header *section, const (*index) += 1; } } + + return STATUS_SUCCESS; } -static NTSTATUS build_comserver_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) +_Must_inspect_result_ +static +NTSTATUS +build_comserver_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) { unsigned int i, j, total_len = 0, class_count = 0, names_len = 0; struct guidsection_header *header; ULONG module_offset, data_offset; struct guid_index *index; ULONG seed; + NTSTATUS Status; /* compute section length */ for (i = 0; i < actctx->num_assemblies; i++) @@ -4286,11 +4309,21 @@ static NTSTATUS build_comserver_section(ACTIVATION_CONTEXT* actctx, struct guids for (i = 0; i < actctx->num_assemblies; i++) { struct assembly *assembly = &actctx->assemblies[i]; - add_comserver_record(header, &assembly->entities, NULL, &index, &data_offset, &module_offset, &seed, i+1); + Status = add_comserver_record(header, &assembly->entities, NULL, &index, &data_offset, &module_offset, &seed, i+1); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } for (j = 0; j < assembly->num_dlls; j++) { struct dll_redirect *dll = &assembly->dlls[j]; - add_comserver_record(header, &dll->entities, dll, &index, &data_offset, &module_offset, &seed, i+1); + Status = add_comserver_record(header, &dll->entities, dll, &index, &data_offset, &module_offset, &seed, i+1); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } } } @@ -4304,7 +4337,10 @@ static inline struct comclassredirect_data *get_comclass_data(ACTIVATION_CONTEXT return (struct comclassredirect_data*)((BYTE*)actctx->comserver_section + index->data_offset); } -static NTSTATUS find_comserver_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data) +_Must_inspect_result_ +static +NTSTATUS +find_comserver_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data) { struct comclassredirect_data *comclass; struct guid_index *index = NULL; @@ -4361,7 +4397,10 @@ static void get_ifaceps_datalen(const struct entity_array *entities, unsigned in } } -static void add_ifaceps_record(struct guidsection_header *section, struct entity_array *entities, +_Must_inspect_result_ +static +NTSTATUS +add_ifaceps_record(struct guidsection_header *section, struct entity_array *entities, struct guid_index **index, ULONG *data_offset, ULONG rosterindex) { unsigned int i; @@ -4374,6 +4413,7 @@ static void add_ifaceps_record(struct guidsection_header *section, struct entity struct ifacepsredirect_data *data = (struct ifacepsredirect_data*)((BYTE*)section + *data_offset); UNICODE_STRING str; ULONG name_len; + NTSTATUS Status; if (entity->u.ifaceps.name) name_len = strlenW(entity->u.ifaceps.name)*sizeof(WCHAR); @@ -4382,7 +4422,9 @@ static void add_ifaceps_record(struct guidsection_header *section, struct entity /* setup index */ RtlInitUnicodeString(&str, entity->u.ifaceps.iid); - RtlGUIDFromString(&str, &(*index)->guid); + Status = RtlGUIDFromString(&str, &(*index)->guid); + if (!NT_SUCCESS(Status)) + return Status; (*index)->data_offset = *data_offset; (*index)->data_len = sizeof(*data) + name_len ? aligned_string_len(name_len + sizeof(WCHAR)) : 0; (*index)->rosterindex = rosterindex; @@ -4396,7 +4438,9 @@ static void add_ifaceps_record(struct guidsection_header *section, struct entity if (entity->u.ifaceps.ps32) { RtlInitUnicodeString(&str, entity->u.ifaceps.ps32); - RtlGUIDFromString(&str, &data->iid); + Status = RtlGUIDFromString(&str, &data->iid); + if (!NT_SUCCESS(Status)) + return Status; } else data->iid = (*index)->guid; @@ -4406,7 +4450,9 @@ static void add_ifaceps_record(struct guidsection_header *section, struct entity if (entity->u.ifaceps.tlib) { RtlInitUnicodeString(&str, entity->u.ifaceps.tlib); - RtlGUIDFromString(&str, &data->tlbid); + Status = RtlGUIDFromString(&str, &data->tlbid); + if (!NT_SUCCESS(Status)) + return Status; } else memset(&data->tlbid, 0, sizeof(data->tlbid)); @@ -4414,7 +4460,9 @@ static void add_ifaceps_record(struct guidsection_header *section, struct entity if (entity->u.ifaceps.base) { RtlInitUnicodeString(&str, entity->u.ifaceps.base); - RtlGUIDFromString(&str, &data->base); + Status = RtlGUIDFromString(&str, &data->base); + if (!NT_SUCCESS(Status)) + return Status; } else memset(&data->base, 0, sizeof(data->base)); @@ -4437,9 +4485,14 @@ static void add_ifaceps_record(struct guidsection_header *section, struct entity *data_offset += aligned_string_len(data->name_len + sizeof(WCHAR)); } } + + return STATUS_SUCCESS; } -static NTSTATUS build_ifaceps_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) +_Must_inspect_result_ +static +NTSTATUS +build_ifaceps_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) { unsigned int i, j, total_len = 0, count = 0; struct guidsection_header *header; @@ -4475,12 +4528,24 @@ static NTSTATUS build_ifaceps_section(ACTIVATION_CONTEXT* actctx, struct guidsec for (i = 0; i < actctx->num_assemblies; i++) { struct assembly *assembly = &actctx->assemblies[i]; + NTSTATUS Status; + + Status = add_ifaceps_record(header, &assembly->entities, &index, &data_offset, i + 1); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } - add_ifaceps_record(header, &assembly->entities, &index, &data_offset, i + 1); for (j = 0; j < assembly->num_dlls; j++) { struct dll_redirect *dll = &assembly->dlls[j]; - add_ifaceps_record(header, &dll->entities, &index, &data_offset, i + 1); + Status = add_ifaceps_record(header, &dll->entities, &index, &data_offset, i + 1); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } } } @@ -4494,7 +4559,10 @@ static inline struct ifacepsredirect_data *get_ifaceps_data(ACTIVATION_CONTEXT * return (struct ifacepsredirect_data*)((BYTE*)actctx->ifaceps_section + index->data_offset); } -static NTSTATUS find_cominterface_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data) +_Must_inspect_result_ +static +NTSTATUS +find_cominterface_redirection(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data) { struct ifacepsredirect_data *iface; struct guid_index *index = NULL; @@ -4532,7 +4600,10 @@ static NTSTATUS find_cominterface_redirection(ACTIVATION_CONTEXT* actctx, const return STATUS_SUCCESS; } -static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) +_Must_inspect_result_ +static +NTSTATUS +build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct guidsection_header **section) { unsigned int i, j, total_len = 0, count = 0; struct guidsection_header *header; @@ -4586,6 +4657,7 @@ static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct g ULONG version_len, name_len; UNICODE_STRING str; WCHAR *ptrW; + NTSTATUS Status; if (entity->u.clrsurrogate.version) version_len = strlenW(entity->u.clrsurrogate.version)*sizeof(WCHAR); @@ -4595,7 +4667,12 @@ static NTSTATUS build_clr_surrogate_section(ACTIVATION_CONTEXT* actctx, struct g /* setup new index entry */ RtlInitUnicodeString(&str, entity->u.clrsurrogate.clsid); - RtlGUIDFromString(&str, &index->guid); + Status = RtlGUIDFromString(&str, &index->guid); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } index->data_offset = data_offset; index->data_len = sizeof(*data) + aligned_string_len(name_len + sizeof(WCHAR) + (version_len ? version_len + sizeof(WCHAR) : 0)); @@ -4642,7 +4719,10 @@ static inline struct clrsurrogate_data *get_surrogate_data(ACTIVATION_CONTEXT *a return (struct clrsurrogate_data*)((BYTE*)actctx->clrsurrogate_section + index->data_offset); } -static NTSTATUS find_clr_surrogate(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data) +_Must_inspect_result_ +static +NTSTATUS +find_clr_surrogate(ACTIVATION_CONTEXT* actctx, const GUID *guid, ACTCTX_SECTION_KEYED_DATA* data) { struct clrsurrogate_data *surrogate; struct guid_index *index = NULL; @@ -4752,10 +4832,14 @@ static void write_progid_record(struct strsection_header *section, const WCHAR * (*index) += 1; } -static void add_progid_record(ACTIVATION_CONTEXT* actctx, struct strsection_header *section, const struct entity_array *entities, +_Must_inspect_result_ +static +NTSTATUS +add_progid_record(ACTIVATION_CONTEXT* actctx, struct strsection_header *section, const struct entity_array *entities, struct string_index **index, ULONG *data_offset, ULONG *global_offset, ULONG rosterindex) { unsigned int i, j; + NTSTATUS Status; for (i = 0; i < entities->num; i++) { @@ -4769,7 +4853,9 @@ static void add_progid_record(ACTIVATION_CONTEXT* actctx, struct strsection_head GUID clsid; RtlInitUnicodeString(&str, entity->u.comclass.clsid); - RtlGUIDFromString(&str, &clsid); + Status = RtlGUIDFromString(&str, &clsid); + if (!NT_SUCCESS(Status)) + return Status; guid_index = find_guid_index(actctx->comserver_section, &clsid); comclass = get_comclass_data(actctx, guid_index); @@ -4783,14 +4869,19 @@ static void add_progid_record(ACTIVATION_CONTEXT* actctx, struct strsection_head index, data_offset, global_offset, rosterindex); } } + return Status; } -static NTSTATUS build_progid_section(ACTIVATION_CONTEXT* actctx, struct strsection_header **section) +_Must_inspect_result_ +static +NTSTATUS +build_progid_section(ACTIVATION_CONTEXT* actctx, struct strsection_header **section) { unsigned int i, j, total_len = 0, count = 0; struct strsection_header *header; ULONG data_offset, global_offset; struct string_index *index; + NTSTATUS Status; /* compute section length */ for (i = 0; i < actctx->num_assemblies; i++) @@ -4826,11 +4917,22 @@ static NTSTATUS build_progid_section(ACTIVATION_CONTEXT* actctx, struct strsecti { struct assembly *assembly = &actctx->assemblies[i]; - add_progid_record(actctx, header, &assembly->entities, &index, &data_offset, &global_offset, i + 1); + Status = add_progid_record(actctx, header, &assembly->entities, &index, &data_offset, &global_offset, i + 1); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } + for (j = 0; j < assembly->num_dlls; j++) { struct dll_redirect *dll = &assembly->dlls[j]; - add_progid_record(actctx, header, &dll->entities, &index, &data_offset, &global_offset, i + 1); + Status = add_progid_record(actctx, header, &dll->entities, &index, &data_offset, &global_offset, i + 1); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, header); + return Status; + } } }

3 years, 6 months

[reactos] 01/26: [FREELDR] Check HwInterrupt return value

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=900b6a5d56bf7b1106216… commit 900b6a5d56bf7b1106216ec45f8a6b036530fbd2 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jun 17 15:07:39 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Jun 28 10:20:57 2021 +0200 [FREELDR] Check HwInterrupt return value _Must_inspect_result_ is there for a reason CORE-17637 --- boot/freeldr/freeldr/disk/scsiport.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index c9cff4bfd60..d23fe58a76e 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -139,7 +139,11 @@ SpiSendSynchronousSrb( while (!(DeviceExtension->InterruptFlags & SCSI_PORT_NEXT_REQUEST_READY)) { KeStallExecutionProcessor(100 * 1000); - DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension); + if (!DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension)) + { + ExFreePool(Srb); + return FALSE; + } } DeviceExtension->InterruptFlags &= ~SCSI_PORT_NEXT_REQUEST_READY; @@ -157,7 +161,11 @@ SpiSendSynchronousSrb( while (Srb->SrbFlags & SRB_FLAGS_IS_ACTIVE) { KeStallExecutionProcessor(100 * 1000); - DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension); + if (!DeviceExtension->HwInterrupt(DeviceExtension->MiniPortDeviceExtension)) + { + ExFreePool(Srb); + return FALSE; + } } ret = SRB_STATUS(Srb->SrbStatus) == SRB_STATUS_SUCCESS;

3 years, 6 months

[reactos] 01/01: [SDK] Add missing sal annotations in driverspecs.h and kernelspec.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a68820429810dd187f64… commit 8a68820429810dd187f64d37e47ab12f7432f410 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 27 11:18:49 2021 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Jun 28 08:48:59 2021 +0200 [SDK] Add missing sal annotations in driverspecs.h and kernelspec.h CORE-6706 --- sdk/include/ddk/kernelspecs.h | 4 ++ sdk/include/psdk/driverspecs.h | 157 +++++++++++++++++++++++------------------ 2 files changed, 91 insertions(+), 70 deletions(-) diff --git a/sdk/include/ddk/kernelspecs.h b/sdk/include/ddk/kernelspecs.h index 0e3d2be3d37..46fccffc895 100644 --- a/sdk/include/ddk/kernelspecs.h +++ b/sdk/include/ddk/kernelspecs.h @@ -39,10 +39,13 @@ #define HIGH_LEVEL 15 #elif defined(_IA64_) #define HIGH_LEVEL 15 +#elif defined(_ARM64_) +#define HIGH_LEVEL 15 #endif #undef _IRQL_always_function_max_ #undef _IRQL_always_function_min_ +#undef _IRQL_inout_ #undef _IRQL_raises_ #undef _IRQL_requires_ #undef _IRQL_requires_max_ @@ -71,6 +74,7 @@ #define _IRQL_always_function_max_(irql) _Pre_ _SA_annotes1(SAL_maxFunctionIrql,irql) #define _IRQL_always_function_min_(irql) _Pre_ _SA_annotes1(SAL_minFunctionIrql,irql) +#define _IRQL_inout_ _IRQL_saves_ _IRQL_restores_ #define _IRQL_raises_(irql) _Post_ _SA_annotes1(SAL_raiseIRQL,irql) #define _IRQL_requires_(irql) _Pre_ _SA_annotes1(SAL_IRQL,irql) #define _IRQL_requires_max_(irql) _Pre_ _SA_annotes1(SAL_maxIRQL,irql) diff --git a/sdk/include/psdk/driverspecs.h b/sdk/include/psdk/driverspecs.h index a15fb26e1e4..b440566d460 100644 --- a/sdk/include/psdk/driverspecs.h +++ b/sdk/include/psdk/driverspecs.h @@ -25,7 +25,6 @@ #define _IRQL_raises_(irql) #define _IRQL_requires_(irql) #define _IRQL_requires_max_(irql) -#define _IRQL_requires_max_defined #define _IRQL_requires_min_(irql) #define _IRQL_requires_same_ #define _IRQL_restores_ @@ -35,6 +34,13 @@ #define _IRQL_uses_cancel_ #define __drv_setsIRQL(irql) +#undef _IRQL_inout_ +#define _IRQL_inout_ _IRQL_saves_ _IRQL_restores_ +#define _IRQL_limited_to_(level) ASSERT(KeGetCurrentIrql() <= level); \ + _Analysis_assume_(KeGetCurrentIrql() <= level); + +#define _Analysis_assume_section_locked_(name) __AnalysisAssumeLockedSection(name) +#define _Analysis_assume_section_unlocked_(name) __AnalysisAssumeUnlockedSection(name) #define _Dispatch_type_(x) _Function_class_(x) #define _Kernel_clear_do_init_(yesNo) _Post_ _SA_annotes1(SAL_clearDoInit,yesNo) #define _Kernel_float_restored_ _Post_ _SA_annotes0(SAL_floatRestored) @@ -45,7 +51,7 @@ #define _Kernel_requires_resource_held_(kind) _Pre_ _SA_annotes1(SAL_mustHold, #kind) #define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) #define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) -#define _Landmark_(name) +#define _Landmark_(name) _SA_annotes1(SAL_landmark, #name) #define __drv_acquiresCancelSpinLock _Acquires_nonreentrant_lock_(_Global_cancel_spin_lock_) #define __drv_acquiresCriticalRegion _Acquires_lock_(_Global_critical_region_) #define __drv_acquiresExclusiveResource(kind) _Acquires_nonreentrant_lock_(_Curr_) @@ -78,63 +84,67 @@ #define __drv_in_deref(annotes) _Pre_ __deref _Group_(annotes) #define __drv_in(annotes) _Pre_ _Group_(annotes) #define __drv_innerAcquiresGlobal(kind,param) _Post_ _SA_annotes2(SAL_acquireGlobal, #kind, param\t) -#define __drv_innerMustHoldGlobal(kind,param) -#define __drv_innerNeverHoldGlobal(kind,param) -#define __drv_innerReleasesGlobal(kind,param) -#define __drv_interlocked -#define __drv_inTry -#define __drv_IoGetDmaAdapter +#define __drv_innerMustHoldGlobal(kind,param) _Pre_ _SA_annotes2(SAL_mustHoldGlobal, #kind, param\t) +#define __drv_innerNeverHoldGlobal(kind,param) _Pre_ _SA_annotes2(SAL_neverHoldGlobal, #kind, param\t) +#define __drv_innerReleasesGlobal(kind,param) _Post_ _SA_annotes2(SAL_releaseGlobal,#kind, param\t) +#define __drv_interlocked _Interlocked_operand_ +#define __drv_inTry _Pre_ _SA_annotes1(SAL_inTry,__yes) +#define __drv_IoGetDmaAdapter _Kernel_IoGetDmaAdapter_ #define __drv_isCancelIRQL _IRQL_is_cancel_ -#define __drv_isObjectPointer -#define __drv_KMDF -#define __drv_maxFunctionIRQL(irql) -#define __drv_maxIRQL(irql) -#define __drv_minFunctionIRQL(irql) -#define __drv_minIRQL(irql) -#define __drv_Mode_impl(x) -#define __drv_mustHold(kind) -#define __drv_mustHoldCancelSpinLock -#define __drv_mustHoldCriticalRegion -#define __drv_mustHoldGlobal(kind,param) -#define __drv_mustHoldPriorityRegion -#define __drv_NDIS -#define __drv_neverHold(kind) -#define __drv_neverHoldCancelSpinLock -#define __drv_neverHoldCriticalRegion -#define __drv_neverHoldGlobal(kind,param) -#define __drv_neverHoldPriorityRegion -#define __drv_nonConstant -#define __drv_notInTry -#define __drv_notPointer -#define __drv_out_deref(annotes) -#define __drv_out(annotes) -#define __drv_preferredFunction(func,why) -#define __drv_raisesIRQL(irql) -#define __drv_releasesCancelSpinLock -#define __drv_releasesCriticalRegion -#define __drv_releasesExclusiveResource(kind) -#define __drv_releasesExclusiveResourceGlobal(kind,param) -#define __drv_releasesPriorityRegion -#define __drv_releasesResource(kind) -#define __drv_releasesResourceGlobal(kind,param) -#define __drv_reportError(why) -#define __drv_requiresIRQL(irql) -#define __drv_restoresIRQL -#define __drv_restoresIRQLGlobal(kind,param) -#define __drv_ret(annotes) -#define __drv_sameIRQL -#define __drv_savesIRQL -#define __drv_savesIRQLGlobal(kind,param) -#define __drv_strictType(typename,mode) -#define __drv_strictTypeMatch(mode) -#define __drv_unit(p) -#define __drv_useCancelIRQL -#define __drv_valueIs(arglist) -#define __drv_WDM -#define __drv_when(cond,annotes) -#define __internal_kernel_driver -#define __kernel_code -#define __kernel_driver +#define __drv_isObjectPointer _Points_to_data_ +#define __drv_KMDF __drv_Mode_impl(KMDF) +#define __drv_maxFunctionIRQL(irql) _IRQL_always_function_max_(irql) +#define __drv_maxIRQL(irql) _IRQL_requires_max_(irql) +#define __drv_minFunctionIRQL(irql) _IRQL_always_function_min_(irql) +#define __drv_minIRQL(irql) _IRQL_requires_min_(irql) +#define __drv_Mode_impl(x) _Landmark_(x) __inline void __GENSYM(__SAL_dummy_)(void){} +#define __drv_mustHold(kind) _When_(!_Arg_comp_(#kind,"Memory"), _Requires_lock_held_(_Curr_)) \ + _When_(_Arg_comp_(#kind,"Memory"), _Kernel_requires_resource_held_(kind)) +#define __drv_mustHoldCancelSpinLock _Requires_lock_held_(_Global_cancel_spin_lock_) +#define __drv_mustHoldCriticalRegion _Requires_lock_held_(_Global_critical_region_) +#define __drv_mustHoldGlobal(kind,param) _Requires_lock_held_(param) +#define __drv_mustHoldPriorityRegion _Requires_lock_held_(_Global_priority_region_) +#define __drv_NDIS __drv_Mode_impl(NDIS) +#define __drv_neverHold(kind) _Requires_lock_not_held_(_Curr_) +#define __drv_neverHoldCancelSpinLock _Requires_lock_not_held_(_Global_cancel_spin_lock_) +#define __drv_neverHoldCriticalRegion _Requires_lock_not_held_(_Global_critical_region_) +#define __drv_neverHoldGlobal(kind,param) _Requires_lock_not_held_(param) +#define __drv_neverHoldPriorityRegion _Requires_lock_not_held_(_Global_priority_region_) +#define __drv_nonConstant _Notliteral_ +#define __drv_notInTry _Pre_ _SA_annotes1(SAL_inTry,__no) +#define __drv_notPointer _Pre_ _SA_annotes1(SAL_mayBePointer,__no) +#define __drv_out_deref(annotes) _Post_ __deref _Group_(annotes) +#define __drv_out(annotes) _Post_ _Group_(annotes) +#define __drv_preferredFunction(func,why) _Pre_ _SA_annotes2(SAL_preferredFunction, func, why) +#define __drv_raisesIRQL _IRQL_raises_ +#define __drv_releasesCancelSpinLock _Releases_nonreentrant_lock_(_Global_cancel_spin_lock_) +#define __drv_releasesCriticalRegion _Releases_lock_(_Global_critical_region_) +#define __drv_releasesExclusiveResource(kind) _Releases_nonreentrant_lock_(_Curr_) +#define __drv_releasesExclusiveResourceGlobal(kind, param) _Releases_nonreentrant_lock_(param) +#define __drv_releasesPriorityRegion _Releases_lock_(_Global_priority_region_) +#define __drv_releasesResource(kind) _Releases_lock_(_Curr_) +#define __drv_releasesResourceGlobal(kind, param) _Releases_lock_(param) +#define __drv_reportError(why) _Pre_ _SA_annotes1(SAL_error,why) +#define __drv_requiresIRQL(irql) _IRQL_requires_(irql) +#define __drv_restoresIRQL _IRQL_restores_ +#define __drv_restoresIRQLGlobal(kind,param) _IRQL_restores_global_(kind,param) +#define __drv_ret(annotes) _At_(return,annotes) +#define __drv_sameIRQL _IRQL_requires_same_ +#define __drv_savesIRQL _IRQL_saves_ +#define __drv_savesIRQLGlobal(kind,param) _IRQL_saves_global_(kind,param) +#define __drv_strictType(typename,mode) _Pre_ _SA_annotes2(SAL_strictType, typename, mode) +#define __drv_strictTypeMatch(mode) _Pre_ _SA_annotes1(SAL_strictTypeMatch,mode) +#define __drv_unit(p) typedef int ___drv_unit_##p __GENSYM(__prefast_flag_kernel_driver_mode); +#define __drv_useCancelIRQL _IRQL_uses_cancel_ +#define __drv_valueIs(arglist) _Post_ _SA_annotes1(SAL_return,arglist) +#define __drv_WDM __drv_Mode_impl(WDM) +#define __drv_when(cond, annotes) _When_(cond, annotes) +#define __internal_kernel_driver _Analysis_mode_(_Analysis_internal_kernel_driver_) \ + _Analysis_mode_(_Analysis_local_leak_checks_) +#define __kernel_code _Analysis_mode_(_Analysis_code_type_kernel_code_) \ + _Analysis_mode_(_Analysis_local_leak_checks_) +#define __kernel_driver _Analysis_mode_(_Analysis_code_type_kernel_driver_) \ + _Analysis_mode_(_Analysis_local_leak_checks_) #define __prefast_operator_new_null \ void* __cdecl operator new(size_t size) throw(); \ void* __cdecl operator new[](size_t size) throw(); \ @@ -143,13 +153,15 @@ void* __cdecl operator new(size_t size) throw(std::bad_alloc); \ void* __cdecl operator new[](size_t size) throw(std::bad_alloc); \ _Analysis_mode_(_Analysis_operator_new_throw_) -#define __user_code -#define __user_driver -#define ___drv_unit_internal_kernel_driver -#define ___drv_unit_kernel_code -#define ___drv_unit_kernel_driver -#define ___drv_unit_user_code -#define ___drv_unit_user_driver +#define __user_code _Analysis_mode_(_Analysis_code_type_user_code_) \ + _Analysis_mode_(_Analysis_local_leak_checks_) +#define __user_driver _Analysis_mode_(_Analysis_code_type_user_driver_) \ + _Analysis_mode_(_Analysis_local_leak_checks_) +#define ___drv_unit_internal_kernel_driver _SA_annotes0(SAL_internal_kernel_driver) +#define ___drv_unit_kernel_code _SA_annotes0(SAL_kernel) _SA_annotes0(SAL_nodriver) +#define ___drv_unit_kernel_driver _SA_annotes0(SAL_kernel) _SA_annotes0(SAL_driver) +#define ___drv_unit_user_code _SA_annotes0(SAL_nokernel) _SA_annotes0(SAL_nodriver) +#define ___drv_unit_user_driver _SA_annotes0(SAL_nokernel) _SA_annotes0(SAL_driver) #define __drv_typeConst 0 #define __drv_typeCond 1 @@ -160,6 +172,10 @@ extern "C" { #endif +extern int _Global_priority_region_; +__inline __nothrow void __AnalysisAssumeLockedSection(__In_impl_ char *p); +__inline __nothrow void __AnalysisAssumeUnlockedSection(__In_impl_ char *p); + __ANNOTATION(SAL_neverHold(_In_ char *);) __ANNOTATION(SAL_neverHoldGlobal(__In_impl_ char *, ...);) __ANNOTATION(SAL_acquire(_In_ char *);) @@ -168,7 +184,6 @@ __ANNOTATION(SAL_floatUsed(void);) __ANNOTATION(SAL_floatSaved(void);) __ANNOTATION(SAL_floatRestored(void);) __ANNOTATION(SAL_clearDoInit(enum __SAL_YesNo);) -__ANNOTATION(SAL_maxIRQL(__int64);) __ANNOTATION(SAL_IsAliased(void);) __ANNOTATION(SAL_NeedsRelease(enum __SAL_YesNo);) __ANNOTATION(SAL_mustHold(_In_ char *);) @@ -192,10 +207,10 @@ __ANNOTATION(SAL_error2(__In_impl_ __AuToQuOtE char *, __In_impl_ __int64);) __ANNOTATION(SAL_IsFormatString(__In_impl_ char *);) __ANNOTATION(SAL_completionType(__In_impl_ __AuToQuOtE char *);) __ANNOTATION(SAL_callbackType(__In_impl_ __AuToQuOtE char *);) -//__PRIMOP(int, _Holds_resource_(__In_impl_ __deferTypecheck char *,__In_impl_ char *);) -//__PRIMOP(int, _Holds_resource_global_(__In_impl_ char *, ...);) -//__PRIMOP(int, _Is_kernel_(void);) -//__PRIMOP(int, _Is_driver_(void);) +__PRIMOP(int, _Holds_resource_(__In_impl_ __deferTypecheck char *,__In_impl_ char *);) +__PRIMOP(int, _Holds_resource_global_(__In_impl_ char *, ...);) +__PRIMOP(int, _Is_kernel_(void);) +__PRIMOP(int, _Is_driver_(void);) #ifdef __cplusplus } @@ -204,6 +219,8 @@ __ANNOTATION(SAL_callbackType(__In_impl_ __AuToQuOtE char *);) #else /* Dummys */ +#define _Analysis_assume_section_locked_(name) +#define _Analysis_assume_section_unlocked_(name) #define _Dispatch_type_(type) #define _IRQL_always_function_max_(irql) #define _IRQL_always_function_min_(irql)

3 years, 6 months

[reactos] 01/01: Revert "[SHELL32] Don't check for link files being targets for other link files. Addendum to 3a822e4f."

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7a5850d65bf0b6b6bb4c… commit e7a5850d65bf0b6b6bb4c5081bb1ef4a6ca5f3ab Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 28 04:11:00 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 28 04:11:00 2021 +0200 Revert "[SHELL32] Don't check for link files being targets for other link files. Addendum to 3a822e4f." This reverts commit 3249a003648aff04bbef46a0ff74a76fe0c6614b. --- dll/win32/shell32/CShellLink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index cef374175aa..cd5d74e2c3f 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -2207,7 +2207,7 @@ HRESULT CShellLink::SetTargetFromPIDLOrPath(LPCITEMIDLIST pidl, LPCWSTR pszFile) /* This failed, try to resolve the path, then create a simple PIDL */ StringCchCopyW(szPath, _countof(szPath), pszFile); - PathResolveW(szPath, NULL, PRF_DONTFINDLNK | PRF_TRYPROGRAMEXTENSIONS); + PathResolveW(szPath, NULL, PRF_TRYPROGRAMEXTENSIONS); if (PathIsFileSpecW(szPath)) {

3 years, 6 months

[reactos] 03/03: [SHLWAPI] Fix a trivial bug in PathFileExistsDefExtW() that seems to exist since 16+ years in Wine.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3199fdbd4430542384d49… commit 3199fdbd4430542384d49b32cf2dede02ff6bab4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 28 02:06:15 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 28 02:19:31 2021 +0200 [SHLWAPI] Fix a trivial bug in PathFileExistsDefExtW() that seems to exist since 16+ years in Wine. Suppose dwFlags == 1 | 4 (i.e. skipping the flag 2). Then the while-loop would only run once, because at the second iteration (after dwWhich >>= 1; has been executed once), dwWhich value == 2, but dwWhich & 0x1 == 0, which makes the while-loop condition false. Instead the loop should run, but the handling of the extension should be skipped. --- dll/win32/shlwapi/path.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index f3149f35e58..fc698251cf2 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -40,7 +40,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #ifdef __REACTOS__ + +#include <shlobj.h> +#include <shlwapi_undoc.h> + int WINAPI IsNetDrive(int drive); + #else /* Get a function pointer from a DLL handle */ @@ -1127,17 +1132,32 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich) if (dwWhich) { LPCWSTR szExt = PathFindExtensionW(lpszPath); +#ifndef __REACTOS__ if (!*szExt || dwWhich & 0x40) +#else + if (!*szExt || dwWhich & WHICH_OPTIONAL) +#endif { size_t iChoose = 0; int iLen = lstrlenW(lpszPath); if (iLen > (MAX_PATH - 5)) return FALSE; +#ifndef __REACTOS__ while ( (dwWhich & 0x1) && pszExts[iChoose][0] ) +#else + while (pszExts[iChoose][0]) +#endif { +#ifdef __REACTOS__ + if (dwWhich & 0x1) + { +#endif lstrcpyW(lpszPath + iLen, pszExts[iChoose]); if (PathFileExistsW(lpszPath)) return TRUE; +#ifdef __REACTOS__ + } +#endif iChoose++; dwWhich >>= 1; }

3 years, 6 months

[reactos] 02/03: [SHELL32] Add the handy WHICH_DEFAULT value to the list of flags in shlwapi_undoc.h.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ec358012399211af607c… commit 8ec358012399211af607c71f15f914da005601fa Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 28 02:02:17 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 28 02:19:30 2021 +0200 [SHELL32] Add the handy WHICH_DEFAULT value to the list of flags in shlwapi_undoc.h. - Add as well the undocumented 0x40 dwFlags value from shlwapi!PathFileExistsDefExtW() to the list. - Fix a bug (also present in Win2k3) in PathResolveW() where, specifying the PRF_DONTFINDLNK flag, would also erroneously exclude checking for the .cmd extension as well (which was obviously NOT the original intention, from the name of the flag and the documentation as well: https://docs.microsoft.com/en-us/windows/win32/api/shlobj_core/nf-shlobj_co… ). Addendum to 3a822e4f. --- dll/win32/shell32/wine/shellpath.c | 7 ++----- sdk/include/reactos/shlwapi_undoc.h | 15 +++++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/wine/shellpath.c b/dll/win32/shell32/wine/shellpath.c index e4234efffcd..b0978280008 100644 --- a/dll/win32/shell32/wine/shellpath.c +++ b/dll/win32/shell32/wine/shellpath.c @@ -635,14 +635,11 @@ BOOL WINAPI PathResolveA(LPSTR path, LPCSTR *dirs, DWORD flags) return FALSE; } -#define WHICH_DONTFINDLNK (WHICH_PIF | WHICH_COM | WHICH_EXE | WHICH_BAT) -#define WHICH_DEFAULT (WHICH_DONTFINDLNK | WHICH_LNK | WHICH_CMD) - BOOL WINAPI PathResolveW(LPWSTR path, LPCWSTR *dirs, DWORD flags) { - DWORD dwWhich; + DWORD dwWhich = ((flags & PRF_DONTFINDLNK) ? (WHICH_DEFAULT & ~WHICH_LNK) : WHICH_DEFAULT); + TRACE("PathResolveW(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); - dwWhich = ((flags & PRF_DONTFINDLNK) ? WHICH_DONTFINDLNK : WHICH_DEFAULT); if (flags & PRF_VERIFYEXISTS) SetLastError(ERROR_FILE_NOT_FOUND); diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index ed54a70c686..b94577f8638 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -151,12 +151,15 @@ ShellMessageBoxWrapW( ...); /* dwWhich flags for PathFileExistsDefExtW and PathFindOnPathExW */ -#define WHICH_PIF (1 << 0) -#define WHICH_COM (1 << 1) -#define WHICH_EXE (1 << 2) -#define WHICH_BAT (1 << 3) -#define WHICH_LNK (1 << 4) -#define WHICH_CMD (1 << 5) +#define WHICH_PIF (1 << 0) +#define WHICH_COM (1 << 1) +#define WHICH_EXE (1 << 2) +#define WHICH_BAT (1 << 3) +#define WHICH_LNK (1 << 4) +#define WHICH_CMD (1 << 5) +#define WHICH_OPTIONAL (1 << 6) + +#define WHICH_DEFAULT (WHICH_PIF | WHICH_COM | WHICH_EXE | WHICH_BAT | WHICH_LNK | WHICH_CMD) BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath, DWORD dwWhich); BOOL WINAPI PathFindOnPathExW(LPWSTR lpszFile, LPCWSTR *lppszOtherDirs, DWORD dwWhich);

3 years, 6 months

← Newer
1
2
3
4
5
6
7
8
...
23
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 June 2021