Ros-diffs

ros-diffs@reactos.org

16 participants
81077 discussions

[reactos] 01/01: [CMICONTROL] Fix MSVC 14.2 dbg x64 warning C4267 (#5696)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e69d2e8b89f34ddb99442… commit e69d2e8b89f34ddb99442f36a75c5e3d61f34629 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Wed Sep 27 19:34:32 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 27 17:34:32 2023 +0000 [CMICONTROL] Fix MSVC 14.2 dbg x64 warning C4267 (#5696) Can be observed on the buildbots: 2023-09-17T14:19:34.2051345Z [10663/14808] Building CXX object drivers\wdm\audio\drivers\CMIDriver\cmicontrol\CMakeFiles\cmicontrol.dir\main.cpp.obj 2023-09-17T14:19:34.2052611Z D:\a\reactos\reactos\src\drivers\wdm\audio\drivers\CMIDriver\cmicontrol\main.cpp(818): warning C4267: '=': conversion from 'size_t' to 'unsigned int', possible loss of data --- drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp index e5711703966..7317b363456 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp @@ -799,7 +799,7 @@ void printUsage() void deleteDriverFiles() { TCHAR SysDir[MAX_PATH]; - unsigned int len; + size_t len; if (GetSystemDirectory(SysDir, sizeof(SysDir))==0) { PrintLastError("GetSystemDirectory()"); return;

1 year, 3 months

[reactos] 01/01: [NTOS:MM] Fix 'eanbled' typo in a comment (#5728)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ca88bef80e7f732a289e… commit 9ca88bef80e7f732a289ee266da20dac2c7391d2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Sep 27 19:31:42 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Sep 27 17:31:42 2023 +0000 [NTOS:MM] Fix 'eanbled' typo in a comment (#5728) --- ntoskrnl/mm/ARM3/pagfault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index 14460552b1c..62451086dda 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2742,7 +2742,7 @@ MmSetExecuteOptions(IN ULONG ExecuteOptions) CurrentProcess->Flags.ImageDispatchEnable = TRUE; } - /* These are turned on by default if no-execution is also eanbled */ + /* These are turned on by default if no-execution is also enabled */ if (CurrentProcess->Flags.ExecuteEnable) { CurrentProcess->Flags.ExecuteDispatchEnable = TRUE;

1 year, 3 months

[reactos] 01/01: [NTOS] Implement support for opting out of NX policy

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8227c5d380fa1fbee6649… commit 8227c5d380fa1fbee6649e4dbb686447ab8e7ff1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 1 18:11:26 2023 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:04:19 2023 +0300 [NTOS] Implement support for opting out of NX policy Fixes crash in ntdll_winetest info on x64. --- ntoskrnl/mm/ARM3/pagfault.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ntoskrnl/mm/ARM3/pagfault.c b/ntoskrnl/mm/ARM3/pagfault.c index b9a855662d9..14460552b1c 100644 --- a/ntoskrnl/mm/ARM3/pagfault.c +++ b/ntoskrnl/mm/ARM3/pagfault.c @@ -2333,14 +2333,26 @@ UserFault: } } +#if _MI_HAS_NO_EXECUTE /* Check for execution of non-executable memory */ if (MI_IS_INSTRUCTION_FETCH(FaultCode) && !MI_IS_PAGE_EXECUTABLE(&TempPte)) { + /* Check if execute enable was set */ + if (CurrentProcess->Pcb.Flags.ExecuteEnable) + { + /* Fix up the PTE to be executable */ + TempPte.u.Hard.NoExecute = 0; + MI_UPDATE_VALID_PTE(PointerPte, TempPte); + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_SUCCESS; + } + /* Return the status */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); return STATUS_ACCESS_VIOLATION; } +#endif /* The fault has already been resolved by a different thread */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread);

1 year, 3 months

[reactos] 01/01: [CRT/x64] Fix a bug in __C_specific_handler

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6133cc016df7eee387c57… commit 6133cc016df7eee387c57dd47607c575cd9083a7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Mar 14 23:28:47 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:02:21 2023 +0300 [CRT/x64] Fix a bug in __C_specific_handler Fixes crash of compiler_apitest pseh --- sdk/lib/crt/except/amd64/ehandler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/crt/except/amd64/ehandler.c b/sdk/lib/crt/except/amd64/ehandler.c index b32b821d6c9..9a1e1e759be 100644 --- a/sdk/lib/crt/except/amd64/ehandler.c +++ b/sdk/lib/crt/except/amd64/ehandler.c @@ -107,12 +107,12 @@ __C_specific_handler( FilterResult = ExceptionFilter(&ExceptionPointers, EstablisherFrame); } - if (FilterResult == EXCEPTION_CONTINUE_EXECUTION) + if (FilterResult < 0 /* EXCEPTION_CONTINUE_EXECUTION */) { return ExceptionContinueExecution; } - if (FilterResult == EXCEPTION_EXECUTE_HANDLER) + if (FilterResult > 0 /* EXCEPTION_EXECUTE_HANDLER */) { JumpTarget = (ImageBase + ScopeTable->ScopeRecord[i].JumpTarget);

1 year, 3 months

[reactos] 03/03: [LSASRV] Fix usage of self-relative security descriptor in LsarQuerySecurityObject

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf4aa7ea9da0b0008b378… commit cf4aa7ea9da0b0008b378032ba229da6a7ee22f0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 23 17:43:14 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:01:45 2023 +0300 [LSASRV] Fix usage of self-relative security descriptor in LsarQuerySecurityObject --- dll/win32/lsasrv/lsarpc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/lsasrv/lsarpc.c b/dll/win32/lsasrv/lsarpc.c index 62d245b9d42..de22cf47097 100644 --- a/dll/win32/lsasrv/lsarpc.c +++ b/dll/win32/lsasrv/lsarpc.c @@ -201,7 +201,7 @@ LsarQuerySecurityObject( PLSAPR_SR_SECURITY_DESCRIPTOR *SecurityDescriptor) { PLSA_DB_OBJECT DbObject = NULL; - PSECURITY_DESCRIPTOR RelativeSd = NULL; + PISECURITY_DESCRIPTOR_RELATIVE RelativeSd = NULL; PSECURITY_DESCRIPTOR ResultSd = NULL; PLSAPR_SR_SECURITY_DESCRIPTOR SdData = NULL; ACCESS_MASK DesiredAccess = 0; @@ -256,16 +256,16 @@ LsarQuerySecurityObject( /* Invalidate the SD information that was not requested */ if (!(SecurityInformation & OWNER_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Owner = NULL; + RelativeSd->Owner = 0; if (!(SecurityInformation & GROUP_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Group = NULL; + RelativeSd->Group = 0; if (!(SecurityInformation & DACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_DACL_PRESENT; + RelativeSd->Control &= ~SE_DACL_PRESENT; if (!(SecurityInformation & SACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_SACL_PRESENT; + RelativeSd->Control &= ~SE_SACL_PRESENT; /* Calculate the required SD size */ Status = RtlMakeSelfRelativeSD(RelativeSd, @@ -298,7 +298,7 @@ LsarQuerySecurityObject( } /* Fill the SD data buffer and return it to the caller */ - SdData->Length = RelativeSdSize; + SdData->Length = ResultSdSize; SdData->SecurityDescriptor = (PBYTE)ResultSd; *SecurityDescriptor = SdData;

1 year, 3 months

[reactos] 02/03: [SAMSRV] Fix usage of self-relative security descriptor in SamrQuerySecurityObject

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5127433416c39779a3393… commit 5127433416c39779a3393f429d7eda1fd51b6e58 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Sep 20 11:48:49 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:01:45 2023 +0300 [SAMSRV] Fix usage of self-relative security descriptor in SamrQuerySecurityObject Fixes crash of netapi32_winetest access --- dll/win32/samsrv/samrpc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index 5c8bdff6f78..68b22684b6f 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -332,7 +332,7 @@ SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, { PSAM_DB_OBJECT SamObject; PSAMPR_SR_SECURITY_DESCRIPTOR SdData = NULL; - PSECURITY_DESCRIPTOR RelativeSd = NULL; + PISECURITY_DESCRIPTOR_RELATIVE RelativeSd = NULL; PSECURITY_DESCRIPTOR ResultSd = NULL; ACCESS_MASK DesiredAccess = 0; ULONG RelativeSdSize = 0; @@ -397,16 +397,16 @@ SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, /* Invalidate the SD information that was not requested */ if (!(SecurityInformation & OWNER_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Owner = NULL; + RelativeSd->Owner = 0; if (!(SecurityInformation & GROUP_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Group = NULL; + RelativeSd->Group = 0; if (!(SecurityInformation & DACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_DACL_PRESENT; + RelativeSd->Control &= ~SE_DACL_PRESENT; if (!(SecurityInformation & SACL_SECURITY_INFORMATION)) - ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_SACL_PRESENT; + RelativeSd->Control &= ~SE_SACL_PRESENT; /* Calculate the required SD size */ Status = RtlMakeSelfRelativeSD(RelativeSd, @@ -439,7 +439,7 @@ SamrQuerySecurityObject(IN SAMPR_HANDLE ObjectHandle, } /* Fill the SD data buffer and return it to the caller */ - SdData->Length = RelativeSdSize; + SdData->Length = ResultSdSize; SdData->SecurityDescriptor = (PBYTE)ResultSd; *SecurityDescriptor = SdData;

1 year, 3 months

[reactos] 01/03: [RTL] Improve usage of absolte vs self-relative security descriptors

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df053d4e4339b5bb1151e… commit df053d4e4339b5bb1151ea3d3986c22e42ac7e8f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 23 17:49:27 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Sep 26 18:01:45 2023 +0300 [RTL] Improve usage of absolte vs self-relative security descriptors - RtlpQuerySecurityDescriptor: Change argument type of first parameter from PISECURITY_DESCRIPTOR to PSECURITY_DESCRIPTOR, since it handles both absolute and self-relative SDs. - RtlMakeSelfRelativeSD: rename first parameter from AbsoluteSD to SecurityDescriptor, since it handles both absolute and self-relative SDs. - SepGetGroupFromDescriptor/SepGetOwnerFromDescriptor/SepGetDaclFromDescriptor/SepGetSaclFromDescriptor: Change parameter type from PVOID to PSECURITY_DESCRIPTOR for clarity. --- ntoskrnl/include/internal/se.h | 8 ++++---- sdk/lib/rtl/sd.c | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/include/internal/se.h b/ntoskrnl/include/internal/se.h index 1679d2fe86a..c7cbdda046a 100644 --- a/ntoskrnl/include/internal/se.h +++ b/ntoskrnl/include/internal/se.h @@ -87,7 +87,7 @@ typedef struct _TOKEN_AUDIT_POLICY_INFORMATION FORCEINLINE PSID SepGetGroupFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; @@ -107,7 +107,7 @@ SepGetGroupFromDescriptor( FORCEINLINE PSID SepGetOwnerFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; @@ -127,7 +127,7 @@ SepGetOwnerFromDescriptor( FORCEINLINE PACL SepGetDaclFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; @@ -149,7 +149,7 @@ SepGetDaclFromDescriptor( FORCEINLINE PACL SepGetSaclFromDescriptor( - _Inout_ PVOID _Descriptor) + _Inout_ PSECURITY_DESCRIPTOR _Descriptor) { PISECURITY_DESCRIPTOR Descriptor = (PISECURITY_DESCRIPTOR)_Descriptor; PISECURITY_DESCRIPTOR_RELATIVE SdRel; diff --git a/sdk/lib/rtl/sd.c b/sdk/lib/rtl/sd.c index ea7e3bb44f5..d4ff245c3d8 100644 --- a/sdk/lib/rtl/sd.c +++ b/sdk/lib/rtl/sd.c @@ -42,7 +42,7 @@ RtlpValidateSDOffsetAndSize(IN ULONG Offset, VOID NTAPI -RtlpQuerySecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptor, +RtlpQuerySecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, OUT PSID *Owner, OUT PULONG OwnerSize, OUT PSID *PrimaryGroup, @@ -644,7 +644,7 @@ RtlAbsoluteToSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSecurityDescriptor, */ NTSTATUS NTAPI -RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, +RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR SecurityDescriptor, OUT PSECURITY_DESCRIPTOR SelfRelativeSD, IN OUT PULONG BufferLength) { @@ -652,12 +652,11 @@ RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, PACL Sacl, Dacl; ULONG OwnerLength, GroupLength, SaclLength, DaclLength, TotalLength; ULONG_PTR Current; - PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)AbsoluteSD; PISECURITY_DESCRIPTOR_RELATIVE RelSd = (PISECURITY_DESCRIPTOR_RELATIVE)SelfRelativeSD; PAGED_CODE_RTL(); /* Query all components */ - RtlpQuerySecurityDescriptor(Sd, + RtlpQuerySecurityDescriptor(SecurityDescriptor, &Owner, &OwnerLength, &Group, @@ -687,7 +686,7 @@ RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, /* Copy the header fields */ RtlCopyMemory(RelSd, - Sd, + SecurityDescriptor, FIELD_OFFSET(SECURITY_DESCRIPTOR_RELATIVE, Owner)); /* Set the current copy pointer */

1 year, 3 months

[reactos] 01/01: [MSPAINT] Restrict drawing direction on Shift key (#5726)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=389d04650f1dd19cac8e5… commit 389d04650f1dd19cac8e5587030cb8922500d318 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 26 22:47:23 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 26 22:47:23 2023 +0900 [MSPAINT] Restrict drawing direction on Shift key (#5726) - While holding down the Shift key, drawing lines with the pen/brush is limited to either of 8 directions (horizontal/vertical/diagonal). - s/abs/labs/ CORE-19094 --- base/applications/mspaint/common.h | 5 +- base/applications/mspaint/dib.cpp | 5 - base/applications/mspaint/drawing.cpp | 6 +- base/applications/mspaint/mouse.cpp | 215 ++++++++++++++++++++++++------- base/applications/mspaint/precomp.h | 2 + base/applications/mspaint/toolsmodel.cpp | 17 ++- base/applications/mspaint/toolsmodel.h | 4 +- 7 files changed, 189 insertions(+), 65 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index ee103d74911..d2e862b0114 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -45,6 +45,7 @@ enum HITTEST // hit BOOL zoomTo(int newZoom, int mouseX, int mouseY); BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1); -void updateStartAndLast(LONG x, LONG y); -void updateLast(LONG x, LONG y); BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName); + +#define DEG2RAD(degree) (((degree) * M_PI) / 180) +#define RAD2DEG(radian) ((LONG)(((radian) * 180) / M_PI)) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ee899c74e98..cd069c9ef6f 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -6,7 +6,6 @@ */ #include "precomp.h" -#include <math.h> INT g_fileSize = 0; float g_xDpi = 96; @@ -339,10 +338,6 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) return hbm2; } -#ifndef M_PI - #define M_PI 3.14159265 -#endif - HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { CWaitCursor waitCursor; diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index dc5e8c433c0..638e78396e2 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -115,7 +115,7 @@ Fill(HDC hdc, LONG x, LONG y, COLORREF color) void Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); HBRUSH hbr = ::CreateSolidBrush(color); for (LONG a = 0; a <= b; a++) @@ -132,7 +132,7 @@ Erase(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG radius) void Replace(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LONG radius) { - LONG b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + LONG b = max(1, max(labs(x2 - x1), labs(y2 - y1))); for (LONG a = 0; a <= b; a++) { @@ -169,7 +169,7 @@ Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG style) HPEN oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, color)); HBRUSH oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(color)); LONG a, b; - b = max(1, max(abs(x2 - x1), abs(y2 - y1))); + b = max(1, max(labs(x2 - x1), labs(y2 - y1))); switch (style) { case 0: diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index f896ccd84f3..d8e3585c252 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -18,28 +18,28 @@ POINT ToolBase::s_pointStack[256] = { { 0 } }; void regularize(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + if (labs(x1 - x0) >= labs(y1 - y0)) + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } void roundTo8Directions(LONG x0, LONG y0, LONG& x1, LONG& y1) { - if (abs(x1 - x0) >= abs(y1 - y0)) + if (labs(x1 - x0) >= labs(y1 - y0)) { - if (abs(y1 - y0) * 5 < abs(x1 - x0) * 2) + if (labs(y1 - y0) * 5 < labs(x1 - x0) * 2) y1 = y0; else - y1 = y0 + (y1 > y0 ? abs(x1 - x0) : -abs(x1 - x0)); + y1 = y0 + (y1 > y0 ? labs(x1 - x0) : -labs(x1 - x0)); } else { - if (abs(x1 - x0) * 5 < abs(y1 - y0) * 2) + if (labs(x1 - x0) * 5 < labs(y1 - y0) * 2) x1 = x0; else - x1 = x0 + (x1 > x0 ? abs(y1 - y0) : -abs(y1 - y0)); + x1 = x0 + (x1 > x0 ? labs(y1 - y0) : -labs(y1 - y0)); } } @@ -50,18 +50,6 @@ BOOL nearlyEqualPoints(INT x0, INT y0, INT x1, INT y1) return (abs(x1 - x0) <= cxThreshold) && (abs(y1 - y0) <= cyThreshold); } -void updateStartAndLast(LONG x, LONG y) -{ - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; -} - -void updateLast(LONG x, LONG y) -{ - g_ptEnd.x = x; - g_ptEnd.y = y; -} - void ToolBase::reset() { s_pointSP = 0; @@ -153,7 +141,7 @@ struct FreeSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -162,9 +150,10 @@ struct FreeSelTool : ToolBase selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -186,6 +175,7 @@ struct FreeSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -246,7 +236,7 @@ struct RectSelTool : ToolBase m_bLeftButton = bLeftButton; } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if (bLeftButton) { @@ -255,9 +245,10 @@ struct RectSelTool : ToolBase selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; if (bLeftButton) @@ -272,6 +263,7 @@ struct RectSelTool : ToolBase canvasWindow.ClientToScreen(&pt); mainWindow.TrackPopupMenu(pt, 0); } + return TRUE; } void OnFinishDraw() override @@ -305,26 +297,22 @@ struct TwoPointDrawTool : ToolBase { m_bLeftButton = bLeftButton; m_bDrawing = TRUE; - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { - g_ptEnd.x = x; - g_ptEnd.y = y; imageModel.PushImageForUndo(); OnDrawOverlayOnImage(m_hdc); m_bDrawing = FALSE; imageModel.NotifyImageChanged(); + return TRUE; } void OnFinishDraw() override @@ -340,8 +328,101 @@ struct TwoPointDrawTool : ToolBase } }; +typedef enum DIRECTION +{ + NO_DIRECTION = -1, + DIRECTION_HORIZONTAL, + DIRECTION_VERTICAL, + DIRECTION_DIAGONAL_RIGHT_DOWN, + DIRECTION_DIAGONAL_RIGHT_UP, +} DIRECTION; + +#define THRESHOULD_DEG 15 + +static DIRECTION +GetDirection(LONG x0, LONG y0, LONG x1, LONG y1) +{ + LONG dx = x1 - x0, dy = y1 - y0; + + if (labs(dx) <= 8 && labs(dy) <= 8) + return NO_DIRECTION; + + double radian = atan2((double)dy, (double)dx); + if (radian < DEG2RAD(-180 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(-90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(-90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(-THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + if (radian < DEG2RAD(+THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; + } + if (radian < DEG2RAD(+90 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_DOWN: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_DOWN; + } + if (radian < DEG2RAD(+90 + THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_VERTICAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_VERTICAL; + } + if (radian < DEG2RAD(+180 - THRESHOULD_DEG)) + { + ATLTRACE("DIRECTION_DIAGONAL_RIGHT_UP: %ld\n", RAD2DEG(radian)); + return DIRECTION_DIAGONAL_RIGHT_UP; + } + ATLTRACE("DIRECTION_HORIZONTAL: %ld\n", RAD2DEG(radian)); + return DIRECTION_HORIZONTAL; +} + +static void +RestrictDrawDirection(DIRECTION dir, LONG x0, LONG y0, LONG& x1, LONG& y1) +{ + switch (dir) + { + case NO_DIRECTION: + default: + return; + + case DIRECTION_HORIZONTAL: + y1 = y0; + break; + + case DIRECTION_VERTICAL: + x1 = x0; + break; + + case DIRECTION_DIAGONAL_RIGHT_DOWN: + y1 = y0 + (x1 - x0); + break; + + case DIRECTION_DIAGONAL_RIGHT_UP: + x1 = x0 - (y1 - y0); + break; + } +} + struct SmoothDrawTool : ToolBase { + DIRECTION m_direction = NO_DIRECTION; + SmoothDrawTool(TOOLTYPE type) : ToolBase(type) { } @@ -350,22 +431,51 @@ struct SmoothDrawTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override { + m_direction = NO_DIRECTION; imageModel.PushImageForUndo(); - g_ptStart.x = g_ptEnd.x = x; - g_ptStart.y = g_ptEnd.y = y; imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { + if (::GetKeyState(VK_SHIFT) < 0) // Shift key is pressed + { + if (m_direction == NO_DIRECTION) + { + m_direction = GetDirection(g_ptStart.x, g_ptStart.y, x, y); + if (m_direction == NO_DIRECTION) + return FALSE; + } + + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + else + { + if (m_direction != NO_DIRECTION) + { + m_direction = NO_DIRECTION; + draw(bLeftButton, x, y); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; + return TRUE; + } + } + draw(bLeftButton, x, y); imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { + if (m_direction != NO_DIRECTION) + { + RestrictDrawDirection(m_direction, g_ptStart.x, g_ptStart.y, x, y); + } + draw(bLeftButton, x, y); OnFinishDraw(); + return TRUE; } void OnFinishDraw() override @@ -375,7 +485,8 @@ struct SmoothDrawTool : ToolBase void OnCancelDraw() override { - OnButtonUp(FALSE, 0, 0); + LONG x = 0, y = 0; + OnButtonUp(FALSE, x, y); imageModel.Undo(TRUE); ToolBase::OnCancelDraw(); } @@ -435,15 +546,17 @@ struct ColorTool : ToolBase paletteModel.SetBgColor(rgbColor); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { fetchColor(bLeftButton, x, y); toolsModel.SetActiveTool(toolsModel.GetOldActiveTool()); + return TRUE; } }; @@ -550,9 +663,10 @@ struct TextTool : ToolBase UpdatePoint(x, y); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { UpdatePoint(x, y); + return TRUE; } void draw(HDC hdc) @@ -578,7 +692,7 @@ struct TextTool : ToolBase selectionModel.HideSelection(); } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { POINT pt = { x, y }; imageModel.Clamp(pt); @@ -595,7 +709,7 @@ struct TextTool : ToolBase if (::IsRectEmpty(&selectionModel.m_rc)) { quit(); - return; + return TRUE; } } @@ -630,6 +744,7 @@ struct TextTool : ToolBase textEditWindow.ValidateEditRect(&rc); textEditWindow.ShowWindow(SW_SHOWNOACTIVATE); textEditWindow.SetFocus(); + return TRUE; } void OnFinishDraw() override @@ -720,23 +835,25 @@ struct BezierTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { s_pointStack[s_pointSP].x = x; s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { OnFinishDraw(); - return; + return TRUE; } imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override @@ -822,7 +939,7 @@ struct ShapeTool : ToolBase imageModel.NotifyImageChanged(); } - void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -831,9 +948,10 @@ struct ShapeTool : ToolBase s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); + return TRUE; } - void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override + BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) override { if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); @@ -842,7 +960,7 @@ struct ShapeTool : ToolBase if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); - return; + return TRUE; } else { @@ -855,6 +973,7 @@ struct ShapeTool : ToolBase s_pointSP--; imageModel.NotifyImageChanged(); + return TRUE; } void OnCancelDraw() override diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 51413a4ed6c..09775b0cb72 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,6 +21,8 @@ #include <commdlg.h> #include <commctrl.h> #include <stdlib.h> +#define _USE_MATH_DEFINES /* for M_PI */ +#include <math.h> #include <shellapi.h> #include <htmlhelp.h> #include "atlimagedx.h" diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index b9a5ac2e4b6..b787e6d591e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -189,24 +189,31 @@ void ToolsModel::NotifyZoomChanged() void ToolsModel::OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { m_pToolObject->beginEvent(); - updateStartAndLast(x, y); m_pToolObject->OnButtonDown(bLeftButton, x, y, bDoubleClick); + g_ptStart.x = g_ptEnd.x = x; + g_ptStart.y = g_ptEnd.y = y; m_pToolObject->endEvent(); } void ToolsModel::OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnMouseMove(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnMouseMove(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { m_pToolObject->beginEvent(); - m_pToolObject->OnButtonUp(bLeftButton, x, y); - updateLast(x, y); + if (m_pToolObject->OnButtonUp(bLeftButton, x, y)) + { + g_ptEnd.x = x; + g_ptEnd.y = y; + } m_pToolObject->endEvent(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 33335c07ffd..09f48672a01 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -42,8 +42,8 @@ struct ToolBase virtual ~ToolBase() { } virtual void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { } - virtual void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) { } - virtual void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) { } + virtual BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } + virtual BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } virtual void OnCancelDraw(); virtual void OnFinishDraw();

1 year, 3 months

[reactos] 01/01: [SHELL32][SDK] Implement SHTestTokenPrivilegeW (#5725)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d1e9fe13de06e9c6d17e8… commit d1e9fe13de06e9c6d17e80f2b3dd4804235b9650 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 26 07:36:07 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 26 07:36:07 2023 +0900 [SHELL32][SDK] Implement SHTestTokenPrivilegeW (#5725) and modify shell32.spec. --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/stubs.cpp | 11 -------- dll/win32/shell32/utils.cpp | 61 ++++++++++++++++++++++++++++++++++++++++ sdk/include/reactos/undocshell.h | 3 ++ 4 files changed, 65 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index a89d475a913..9cc8bfd8cdc 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -232,7 +232,7 @@ 233 stdcall -noname SHGetUserPicturePathW(wstr long ptr) 234 stdcall -noname SHSetUserPicturePathW(wstr long ptr) 235 stdcall -noname SHOpenEffectiveToken(ptr) -236 stdcall -noname SHTestTokenPrivilegeW(ptr ptr) +236 stdcall -noname SHTestTokenPrivilegeW(ptr wstr) 237 stdcall -noname SHShouldShowWizards(ptr) 238 stdcall InternalExtractIconListW(ptr wstr ptr) 239 stdcall PathIsSlowW(wstr long) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index ae4ce677e66..f8518336906 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -1099,17 +1099,6 @@ SHSetUserPicturePathW(LPCWSTR lpPath, int csidl, LPVOID lpUnknown) return E_FAIL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHTestTokenPrivilegeW(HANDLE hToken, LPDWORD ReturnLength) -{ - FIXME("SHTestTokenPrivilegeW() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index 5f3e38175ec..57ade40713e 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -103,6 +103,67 @@ SHInvokePrivilegedFunctionW( return hr; } +/************************************************************************* + * SHTestTokenPrivilegeW (SHELL32.236) + * + * @see http://undoc.airesoft.co.uk/shell32.dll/SHTestTokenPrivilegeW.php + */ +EXTERN_C +BOOL WINAPI +SHTestTokenPrivilegeW(_In_opt_ HANDLE hToken, _In_z_ LPCWSTR lpName) +{ + LUID Luid; + DWORD dwLength; + PTOKEN_PRIVILEGES pTokenPriv; + HANDLE hNewToken = NULL; + BOOL ret = FALSE; + + TRACE("(%p, %s)\n", hToken, debugstr_w(lpName)); + + if (!lpName) + return FALSE; + + if (!hToken) + { + if (!SHOpenEffectiveToken(&hNewToken)) + goto Quit; + + if (!hNewToken) + return FALSE; + + hToken = hNewToken; + } + + if (!LookupPrivilegeValueW(NULL, lpName, &Luid)) + return FALSE; + + dwLength = 0; + if (!GetTokenInformation(hToken, TokenPrivileges, NULL, 0, &dwLength)) + goto Quit; + + pTokenPriv = (PTOKEN_PRIVILEGES)LocalAlloc(LPTR, dwLength); + if (!pTokenPriv) + goto Quit; + + if (GetTokenInformation(hToken, TokenPrivileges, pTokenPriv, dwLength, &dwLength)) + { + UINT iPriv, cPrivs; + cPrivs = pTokenPriv->PrivilegeCount; + for (iPriv = 0; !ret && iPriv < cPrivs; ++iPriv) + { + ret = RtlEqualLuid(&Luid, &pTokenPriv->Privileges[iPriv].Luid); + } + } + + LocalFree(pTokenPriv); + +Quit: + if (hToken == hNewToken) + CloseHandle(hNewToken); + + return ret; +} + /************************************************************************* * SHGetShellStyleHInstance (SHELL32.749) */ diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 312804e7d73..1577466ab9f 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -695,6 +695,9 @@ SHInvokePrivilegedFunctionW( _In_ PRIVILEGED_FUNCTION fn, _In_opt_ LPARAM lParam); +BOOL WINAPI +SHTestTokenPrivilegeW(_In_opt_ HANDLE hToken, _In_z_ LPCWSTR lpName); + /***************************************************************************** * Shell32 resources */

1 year, 3 months

[reactos] 01/01: [SHELL32] Fix for shlexec.cpp regressions (#5282)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b3eed58cac4cd7f8ebfe… commit 1b3eed58cac4cd7f8ebfeecbe1f244076c83a8b8 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Sep 24 15:35:28 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 24 20:35:28 2023 +0000 [SHELL32] Fix for shlexec.cpp regressions (#5282) fixes CORE-18967 'Taskbar toolbar - Right click > Open folder fails' by restoring the code-path we removed with the guilty 0.4.15-dev-3847-g /9b716539182864bc077e362febcda74da50287ed and add test_sei_lpIDList to shell32:ShellExecuteEx apitest test to protect that functionality on future attempts to simplify. --- dll/win32/shell32/shlexec.cpp | 33 ++++++++++++++++ .../rostests/apitests/shell32/ShellExecuteEx.cpp | 45 ++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 292c8db8292..ce8113aefa9 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2124,6 +2124,39 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) *end = L'\0'; lpFile = wfileName; } + /* We have to test sei instead of sei_tmp because sei_tmp had its + * input fMask modified above in SHELL_translate_idlist. + * This code is needed to handle the case where we only have an + * lpIDList with multiple CLSID/PIDL's (not 'My Computer' only) */ + else if ((sei->fMask & SEE_MASK_IDLIST) == SEE_MASK_IDLIST) + { + WCHAR buffer[MAX_PATH], xlpFile[MAX_PATH]; + LPWSTR space, s; + + LPWSTR beg = wszApplicationName; + for(s = beg; (space = const_cast<LPWSTR>(strchrW(s, L' '))); s = space + 1) + { + int idx = space - sei_tmp.lpFile; + memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR)); + buffer[idx] = '\0'; + + if (SearchPathW(*sei_tmp.lpDirectory ? sei_tmp.lpDirectory : NULL, + buffer, L".exe", _countof(xlpFile), xlpFile, NULL)) + { + /* separate out command from parameter string */ + LPCWSTR p = space + 1; + + while(isspaceW(*p)) + ++p; + + strcpyW(wszParameters, p); + *space = L'\0'; + + break; + } + } + lpFile = sei_tmp.lpFile; + } else { lpFile = sei_tmp.lpFile; diff --git a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp index d239467d859..29f03be94b8 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp @@ -467,6 +467,48 @@ static void test_properties() ok_ptr(info.hInstApp, (HINSTANCE)2); } +static void test_sei_lpIDList() +{ + /* This tests ShellExecuteEx with lpIDList for explorer C:\ */ + + /* ITEMIDLIST for CLSID of 'My Computer' followed by PIDL for 'C:\' */ + BYTE lpitemidlist[30] = { 0x14, 0, 0x1f, 0, 0xe0, 0x4f, 0xd0, 0x20, 0xea, + 0x3a, 0x69, 0x10, 0xa2, 0xd8, 0x08, 0, 0x2b, 0x30, 0x30, 0x9d, // My Computer + 0x8, 0, 0x23, 0x43, 0x3a, 0x5c, 0x5c, 0, 0, 0,}; // C:\\ + NUL-NUL ending + BYTE *lpBytes; + lpBytes = lpitemidlist; + + SHELLEXECUTEINFOW ShellExecInfo; + BOOL Result; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + HWND hWnd; + + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + + ZeroMemory(&ShellExecInfo, sizeof(ShellExecInfo)); + ShellExecInfo.cbSize = sizeof(ShellExecInfo); + ShellExecInfo.fMask = SEE_MASK_IDLIST; + ShellExecInfo.hwnd = NULL; + ShellExecInfo.nShow = SW_SHOWNORMAL; + ShellExecInfo.lpFile = NULL; + ShellExecInfo.lpDirectory = NULL; + ShellExecInfo.lpIDList = lpBytes; + + Result = ShellExecuteExW(&ShellExecInfo); + ok(Result == TRUE, "ShellExecuteEx lpIDList 'C:\\' failed\n"); + trace("sei_lpIDList returned: %s\n", Result ? "SUCCESS" : "FAILURE"); + if (Result) + { + Sleep(700); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", L"Local Disk (C:)"); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } +} + START_TEST(ShellExecuteEx) { DoAppPathTest(); @@ -475,4 +517,7 @@ START_TEST(ShellExecuteEx) DoWaitForWindow(CLASSNAME, CLASSNAME, TRUE, TRUE); Sleep(100); + + test_sei_lpIDList(); + }

1 year, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs