October 2022 - Wine-commits

Gabriel Ivăncescu : shell32/tests: Test drive letters parsing for My Computer.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2b2c09a01c480aa07bee9cb0184929bbdb8239e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b2c09a01c480aa07bee9cb0184929… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 21:52:23 2022 +0300 shell32/tests: Test drive letters parsing for My Computer. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/tests/shfldr_special.c | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index cc0bb20ff33..99d6e8c62a4 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -39,6 +39,76 @@ static inline BOOL SHELL_OsIsUnicode(void) return !(GetVersion() & 0x80000000); } +/* Tests for My Computer */ +static void test_parse_for_my_computer(void) +{ + WCHAR path[] = { '\\','\\','?','\\','C',':','\\',0 }; + IShellFolder *mycomp, *sf; + WCHAR *drive = path + 4; + ITEMIDLIST *pidl; + DWORD eaten; + HRESULT hr; + + hr = SHGetDesktopFolder(&sf); + ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%lx\n", hr); + if (hr != S_OK) return; + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidl); + ok(hr == S_OK, "SHGetSpecialFolderLocation failed with error 0x%lx\n", hr); + if (hr != S_OK) + { + IShellFolder_Release(sf); + return; + } + hr = IShellFolder_BindToObject(sf, pidl, NULL, &IID_IShellFolder, (void**)&mycomp); + ok(hr == S_OK, "IShellFolder::BindToObject failed with error 0x%lx\n", hr); + IShellFolder_Release(sf); + ILFree(pidl); + if (hr != S_OK) return; + + while (drive[0] <= 'Z' && GetDriveTypeW(drive) == DRIVE_NO_ROOT_DIR) drive[0]++; + if (drive[0] > 'Z') + { + skip("No drive found, skipping My Computer tests...\n"); + goto done; + } + + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK, "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl != NULL, "pidl is NULL\n"); + ILFree(pidl); + + /* \\?\ prefix is not valid */ + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl == NULL, "pidl is not NULL\n"); + ILFree(pidl); + + /* Try without backslash */ + drive[2] = '\0'; + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* WinXP */, + "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + todo_wine + ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); + ILFree(pidl); + +done: + IShellFolder_Release(mycomp); +} + /* Tests for My Network Places */ static void test_parse_for_entire_network(void) { @@ -294,6 +364,7 @@ static void test_desktop_displaynameof(void) START_TEST(shfldr_special) { + test_parse_for_my_computer(); test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder();

1 0

Gabriel Ivăncescu : shell32: Handle drive letters properly when parsing MyComputer.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 075f80653b2db8c03dc89a023a5d60912c6e622e URL: https://gitlab.winehq.org/wine/wine/-/commit/075f80653b2db8c03dc89a023a5d60… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 21:52:23 2022 +0300 shell32: Handle drive letters properly when parsing MyComputer. Besides PathGetDriveNumber being dangerous and having a completely messed up result with \\?\ prefix, a backslash is not required anymore on newer Windows versions. So e.g. C: should succeed to be parsed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/shfldr_desktop.c | 5 +++-- dlls/shell32/shfldr_mycomp.c | 20 ++++++++++++-------- dlls/shell32/tests/shfldr_special.c | 2 -- dlls/shell32/tests/shlfolder.c | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 7bf54c4e7d0..f4df3ed0190 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -151,7 +151,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; PARSEDURLW urldata; @@ -179,7 +179,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - else if (PathGetDriveNumberW (lpszDisplayName) >= 0) + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && lpszDisplayName[1] == ':') { /* it's a filesystem path with a drive. Let MyComputer/UnixDosFolder parse it */ pidlTemp = _ILCreateMyComputer (); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 5b90458e145..2f4ebd580c1 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -189,7 +189,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPITEMIDLIST pidlTemp = NULL; CLSID clsid; @@ -209,13 +209,17 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - /* do we have an absolute path name ? */ - else if (PathGetDriveNumberW (lpszDisplayName) >= 0 && - lpszDisplayName[2] == (WCHAR) '\\') + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && + lpszDisplayName[1] == ':' && + (lpszDisplayName[2] == '\\' || lpszDisplayName[2] == '\0')) { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - /* make drive letter uppercase to enable PIDL comparison */ - szElement[0] = toupper(szElement[0]); + /* drive letter has to be uppercase to enable PIDL comparison */ + szElement[0] = c; + szElement[1] = ':'; + szElement[2] = '\\'; + szElement[3] = '\0'; + szNext = &lpszDisplayName[2] + (lpszDisplayName[2] == '\\'); pidlTemp = _ILCreateDrive (szElement); } @@ -224,7 +228,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); } - else + else if (pidlTemp) { if (pdwAttributes && *pdwAttributes) SHELL32_GetItemAttributes (&This->IShellFolder2_iface, pidlTemp, pdwAttributes); diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 99d6e8c62a4..22749c231f3 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -85,7 +85,6 @@ static void test_parse_for_my_computer(void) pidl = NULL; eaten = 0xdeadbeef; hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); - todo_wine ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); @@ -101,7 +100,6 @@ static void test_parse_for_my_computer(void) "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); - todo_wine ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); ILFree(pidl); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 02a5c0dfb2d..248fbd1df62 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -199,8 +199,8 @@ static struct {{'c',':','\\',0}, S_OK}, {{'c',':','\\','\\',0}, E_INVALIDARG, 1}, {{'c',':','\\','f','a','k','e',0}, 0x80070002}, /* ERROR_FILE_NOT_FOUND */ - {{'c',':','f','a','k','e',0}, E_INVALIDARG, 1}, - {{'c',':','/',0}, E_INVALIDARG, 1}, + {{'c',':','f','a','k','e',0}, E_INVALIDARG}, + {{'c',':','/',0}, E_INVALIDARG}, {{'c',':','\\','w','i','n','d','o','w','s',0}, S_OK}, {{'c',':','\\','w','i','n','d','o','w','s','\\',0}, S_OK}, {{'c',':','\\','w','i','n','d','o','w','s','\\','.',0}, E_INVALIDARG, 1},

1 0

Alistair Leslie-Hughes : include: Add missing SP defines.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 64c930ab3e8a322f4f1c437ba6ba47c9742d657f URL: https://gitlab.winehq.org/wine/wine/-/commit/64c930ab3e8a322f4f1c437ba6ba47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 11 16:05:02 2022 +1100 include: Add missing SP defines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49775 --- include/sperror.h | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 4 deletions(-) diff --git a/include/sperror.h b/include/sperror.h index 4b247994ba0..cd8ed9b948d 100644 --- a/include/sperror.h +++ b/include/sperror.h @@ -23,9 +23,139 @@ #include <winerror.h> -#define SPERR_UNINITIALIZED 0x80045001 -#define SPERR_ALREADY_INITIALIZED 0x80045002 -#define SPERR_NOT_FOUND 0x8004503a -#define SPERR_INVALID_REGISTRY_KEY 0x80045040 +#define SP_END_OF_STREAM 0x00045005 +#define SP_INSUFFICIENT_DATA 0x0004500b +#define SP_AUDIO_PAUSED 0x00045010 +#define SP_AUDIO_CONVERSION_ENABLED 0x00045015 +#define SP_NO_HYPOTHESIS_AVAILABLE 0x00045016 +#define SP_ALREADY_IN_LEX 0x00045018 +#define SP_LEX_NOTHING_TO_SYNC 0x0004501a +#define SP_REQUEST_PENDING 0x00045026 +#define SP_NO_PARSE_FOUND 0x0004502c +#define SP_UNSUPPORTED_ON_STREAM_INPUT 0x00045034 +#define SP_WORD_EXISTS_WITHOUT_PRONUNCIATION 0x00045037 +#define SP_RECOGNIZER_INACTIVE 0x0004504e +#define SP_PARTIAL_PARSE_FOUND 0x00045053 +#define SP_NO_RULE_ACTIVE 0x00045055 +#define SP_STREAM_UNINITIALIZED 0x00045057 +#define SP_AUDIO_STOPPED 0x00045065 +#define SP_COMPLETE_BUT_EXTENDABLE 0x00045074 +#define SP_NO_RULES_TO_ACTIVATE 0x0004507b +#define SP_NO_WORDENTRY_NOTIFICATION 0x0004507c +#define S_LIMIT_REACHED 0x0004507f +#define S_NOTSUPPORTED 0x00045080 + +#define SPERR_UNINITIALIZED 0x80045001 +#define SPERR_ALREADY_INITIALIZED 0x80045002 +#define SPERR_INVALID_FLAGS 0x80045004 +#define SPERR_DEVICE_BUSY 0x80045006 +#define SPERR_DEVICE_NOT_SUPPORTED 0x80045007 +#define SPERR_DEVICE_NOT_ENABLED 0x80045008 +#define SPERR_NO_DRIVER 0x80045009 +#define SPERR_FILE_MUST_BE_UNICODE 0x8004500a +#define SPERR_INVALID_PHRASE_ID 0x8004500c +#define SPERR_BUFFER_TOO_SMALL 0x8004500d +#define SPERR_FORMAT_NOT_SPECIFIED 0x8004500e +#define SPERR_AUDIO_STOPPED 0x8004500f +#define SPERR_RULE_NOT_FOUND 0x80045011 +#define SPERR_TTS_ENGINE_EXCEPTION 0x80045012 +#define SPERR_TTS_NLP_EXCEPTION 0x80045013 +#define SPERR_ENGINE_BUSY 0x80045014 +#define SPERR_CANT_CREATE 0x80045017 +#define SPERR_NOT_IN_LEX 0x80045019 +#define SPERR_LEX_VERY_OUT_OF_SYNC 0x8004501b +#define SPERR_UNDEFINED_FORWARD_RULE_REF 0x8004501c +#define SPERR_EMPTY_RULE 0x8004501d +#define SPERR_GRAMMAR_COMPILER_INTERNAL_ERROR 0x8004501e +#define SPERR_RULE_NOT_DYNAMIC 0x8004501f +#define SPERR_DUPLICATE_RULE_NAME 0x80045020 +#define SPERR_DUPLICATE_RESOURCE_NAME 0x80045021 +#define SPERR_TOO_MANY_GRAMMARS 0x80045022 +#define SPERR_CIRCULAR_REFERENCE 0x80045023 +#define SPERR_INVALID_IMPORT 0x80045024 +#define SPERR_INVALID_WAV_FILE 0x80045025 +#define SPERR_ALL_WORDS_OPTIONAL 0x80045027 +#define SPERR_INSTANCE_CHANGE_INVALID 0x80045028 +#define SPERR_RULE_NAME_ID_CONFLICT 0x80045029 +#define SPERR_NO_RULES 0x8004502a +#define SPERR_CIRCULAR_RULE_REF 0x8004502b +#define SPERR_INVALID_HANDLE 0x8004502d +#define SPERR_REMOTE_CALL_TIMED_OUT 0x8004502e +#define SPERR_AUDIO_BUFFER_OVERFLOW 0x8004502f +#define SPERR_NO_AUDIO_DATA 0x80045030 +#define SPERR_DEAD_ALTERNATE 0x80045031 +#define SPERR_HIGH_LOW_CONFIDENCE 0x80045032 +#define SPERR_INVALID_FORMAT_STRING 0x80045033 +#define SPERR_APPLEX_READ_ONLY 0x80045035 +#define SPERR_NO_TERMINATING_RULE_PATH 0x80045036 +#define SPERR_STREAM_CLOSED 0x80045038 +#define SPERR_NO_MORE_ITEMS 0x80045039 +#define SPERR_NOT_FOUND 0x8004503a +#define SPERR_INVALID_AUDIO_STATE 0x8004503b +#define SPERR_GENERIC_MMSYS_ERROR 0x8004503c +#define SPERR_MARSHALER_EXCEPTION 0x8004503d +#define SPERR_NOT_DYNAMIC_GRAMMAR 0x8004503e +#define SPERR_AMBIGUOUS_PROPERTY 0x8004503f +#define SPERR_INVALID_REGISTRY_KEY 0x80045040 +#define SPERR_INVALID_TOKEN_ID 0x80045041 +#define SPERR_XML_BAD_SYNTAX 0x80045042 +#define SPERR_XML_RESOURCE_NOT_FOUND 0x80045043 +#define SPERR_TOKEN_IN_USE 0x80045044 +#define SPERR_TOKEN_DELETED 0x80045045 +#define SPERR_MULTI_LINGUAL_NOT_SUPPORTED 0x80045046 +#define SPERR_EXPORT_DYNAMIC_RULE 0x80045047 +#define SPERR_STGF_ERROR 0x80045048 +#define SPERR_WORDFORMAT_ERROR 0x80045049 +#define SPERR_STREAM_NOT_ACTIVE 0x8004504a +#define SPERR_ENGINE_RESPONSE_INVALID 0x8004504b +#define SPERR_SR_ENGINE_EXCEPTION 0x8004504c +#define SPERR_STREAM_POS_INVALID 0x8004504d +#define SPERR_REMOTE_CALL_ON_WRONG_THREAD 0x8004504f +#define SPERR_REMOTE_PROCESS_TERMINATED 0x80045050 +#define SPERR_REMOTE_PROCESS_ALREADY_RUNNING 0x80045051 +#define SPERR_LANGID_MISMATCH 0x80045052 +#define SPERR_NOT_TOPLEVEL_RULE 0x80045054 +#define SPERR_LEX_REQUIRES_COOKIE 0x80045056 +#define SPERR_UNSUPPORTED_LANG 0x80045059 +#define SPERR_VOICE_PAUSED 0x8004505a +#define SPERR_AUDIO_BUFFER_UNDERFLOW 0x8004505b +#define SPERR_AUDIO_STOPPED_UNEXPECTEDLY 0x8004505c +#define SPERR_NO_WORD_PRONUNCIATION 0x8004505d +#define SPERR_ALTERNATES_WOULD_BE_INCONSISTENT 0x8004505e +#define SPERR_NOT_SUPPORTED_FOR_SHARED_RECOGNIZER 0x8004505f +#define SPERR_TIMEOUT 0x80045060 +#define SPERR_REENTER_SYNCHRONIZE 0x80045061 +#define SPERR_STATE_WITH_NO_ARCS 0x80045062 +#define SPERR_NOT_ACTIVE_SESSION 0x80045063 +#define SPERR_ALREADY_DELETED 0x80045064 +#define SPERR_RECOXML_GENERATION_FAIL 0x80045066 +#define SPERR_SML_GENERATION_FAIL 0x80045067 +#define SPERR_NOT_PROMPT_VOICE 0x80045068 +#define SPERR_ROOTRULE_ALREADY_DEFINED 0x80045069 +#define SPERR_SCRIPT_DISALLOWED 0x80045070 +#define SPERR_REMOTE_CALL_TIMED_OUT_START 0x80045071 +#define SPERR_REMOTE_CALL_TIMED_OUT_CONNECT 0x80045072 +#define SPERR_SECMGR_CHANGE_NOT_ALLOWED 0x80045073 +#define SPERR_FAILED_TO_DELETE_FILE 0x80045075 +#define SPERR_SHARED_ENGINE_DISABLED 0x80045076 +#define SPERR_RECOGNIZER_NOT_FOUND 0x80045077 +#define SPERR_AUDIO_NOT_FOUND 0x80045078 +#define SPERR_NO_VOWEL 0x80045079 +#define SPERR_UNSUPPORTED_PHONEME 0x8004507a +#define SPERR_WORD_NEEDS_NORMALIZATION 0x8004507d +#define SPERR_CANNOT_NORMALIZE 0x8004507e +#define SPERR_TOPIC_NOT_ADAPTABLE 0x80045081 +#define SPERR_PHONEME_CONVERSION 0x80045082 +#define SPERR_NOT_SUPPORTED_FOR_INPROC_RECOGNIZER 0x80045083 +#define SPERR_OVERLOAD 0x80045084 +#define SPERR_LEX_INVALID_DATA 0x80045085 +#define SPERR_CFG_INVALID_DATA 0x80045086 +#define SPERR_LEX_UNEXPECTED_FORMAT 0x80045087 +#define SPERR_STRING_TOO_LONG 0x80045088 +#define SPERR_STRING_EMPTY 0x80045089 +#define SPERR_NON_WORD_TRANSITION 0x80045090 +#define SPERR_SISR_ATTRIBUTES_NOT_ALLOWED 0x80045091 +#define SPERR_SISR_MIXED_NOT_ALLOWED 0x80045092 +#define SPERR_VOICE_NOT_FOUND 0x80045093 #endif /* SPError_h */

1 0

Etaash Mathamsetty : ntoskrnl.exe: KeInsertQueueDpc stub.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 92d74369c89aaedd2fa13bfaa036c62bbb079884 URL: https://gitlab.winehq.org/wine/wine/-/commit/92d74369c89aaedd2fa13bfaa036c6… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Mon Oct 10 21:09:24 2022 -0400 ntoskrnl.exe: KeInsertQueueDpc stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fd18ea706c2..6f5564042a6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2569,6 +2569,15 @@ LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) return 0; } +/*********************************************************************** + * KeInsertQueueDpc (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI KeInsertQueueDpc(PRKDPC Dpc, PVOID SystemArgument1, PVOID SystemArgument2) +{ + FIXME( "stub: (%p %p %p)\n", Dpc, SystemArgument1, SystemArgument2 ); + return TRUE; +} + /********************************************************************** * KeQueryActiveProcessors (NTOSKRNL.EXE.@) * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a1a42d52fd1..8f8edcac7a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -587,7 +587,7 @@ @ stub KeInsertHeadQueue @ stdcall KeInsertQueue(ptr ptr) @ stub KeInsertQueueApc -@ stub KeInsertQueueDpc +@ stdcall KeInsertQueueDpc(ptr ptr ptr) @ stub KeIsAttachedProcess @ stub KeIsExecutingDpc @ stdcall KeLeaveCriticalRegion()

1 0

Paul Gofman : wintrust: Initialize CRYPT_PROVIDER_SIGSTATE structure in Softpub provider.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2f5ad179e53d8e5d5147f53a2a4578c8d7ab619f URL: https://gitlab.winehq.org/wine/wine/-/commit/2f5ad179e53d8e5d5147f53a2a4578… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 19:44:29 2022 -0500 wintrust: Initialize CRYPT_PROVIDER_SIGSTATE structure in Softpub provider. --- dlls/wintrust/softpub.c | 32 ++++++++++++++++++++++++++++---- dlls/wintrust/tests/softpub.c | 2 +- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 53df5e7fe60..1165f03c075 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -832,14 +832,32 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { - DWORD err; + DWORD err = ERROR_SUCCESS; TRACE("(%p)\n", data); if (!data->padwTrustStepErrors) return S_FALSE; - if (data->hMsg) + if (data->pSigState) + { + /* We did not initialize this, probably an unsupported usage. */ + FIXME("pSigState %p already initialized.\n", data->pSigState); + } + if (!(data->pSigState = data->psPfns->pfnAlloc(sizeof(*data->pSigState)))) + { + err = ERROR_OUTOFMEMORY; + } + else + { + data->pSigState->cbStruct = sizeof(*data->pSigState); + data->pSigState->fSupportMultiSig = TRUE; + data->pSigState->dwCryptoPolicySupport = WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT; + if (data->hMsg) + data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); + } + + if (!err && data->hMsg) { DWORD signerCount, size; @@ -859,8 +877,7 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) else err = TRUST_E_NOSIGNATURE; } - else - err = ERROR_SUCCESS; + if (err) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = err; return !err ? S_OK : S_FALSE; @@ -1375,6 +1392,13 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) data->psPfns->pfnFree(data->u.pPDSip->psIndirectData); } + if (WVT_ISINSTRUCT(CRYPT_PROVIDER_DATA, data->cbStruct, pSigState) && data->pSigState) + { + CryptMsgClose(data->pSigState->hPrimarySig); + for (i = 0; i < data->pSigState->cSecondarySigs; ++i) + CryptMsgClose(data->pSigState->rhSecondarySigs[i]); + data->psPfns->pfnFree(data->pSigState); + } CryptMsgClose(data->hMsg); if (data->fOpenedFile && diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index ab9655ef7e8..070e7c52034 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1831,7 +1831,7 @@ static void test_multiple_signatures(void) ok(prov->cbStruct == sizeof(*prov), "Got size %lu.\n", prov->cbStruct); ok(prov->csSigners == 1, "Got %lu.\n", prov->csSigners); todo_wine ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); - todo_wine ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); + ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); if (prov->cbStruct == sizeof(*prov) && prov->pSigState) { ok(prov->pSigState->cbStruct == sizeof(*prov->pSigState)

1 0

Paul Gofman : wintrust: Load secondary signatures in SoftpubLoadSignature().
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 71f58158c1960a42ab89384ee5640064826fa6a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/71f58158c1960a42ab89384ee56400… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 21:25:18 2022 -0500 wintrust: Load secondary signatures in SoftpubLoadSignature(). --- dlls/wintrust/softpub.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 2 +- include/wintrust.h | 2 ++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1165f03c075..d4f0088f620 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -830,6 +830,57 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) return err; } +static void load_secondary_signatures(CRYPT_PROVIDER_DATA *data, HCRYPTMSG msg) +{ + CRYPT_PROVIDER_SIGSTATE *s = data->pSigState; + CRYPT_ATTRIBUTES *attrs; + unsigned int i, j; + DWORD size; + + if (!CryptMsgGetParam(msg, CMSG_SIGNER_UNAUTH_ATTR_PARAM, 0, NULL, &size)) + return; + + if (!(attrs = data->psPfns->pfnAlloc(size))) + { + ERR("No memory.\n"); + return; + } + if (!CryptMsgGetParam(msg, CMSG_SIGNER_UNAUTH_ATTR_PARAM, 0, attrs, &size)) + goto done; + + for (i = 0; i < attrs->cAttr; ++i) + { + if (strcmp(attrs->rgAttr[i].pszObjId, szOID_NESTED_SIGNATURE)) + continue; + + if (!(s->rhSecondarySigs = data->psPfns->pfnAlloc(attrs->rgAttr[i].cValue * sizeof(*s->rhSecondarySigs)))) + { + ERR("No memory"); + goto done; + } + s->cSecondarySigs = 0; + for (j = 0; j < attrs->rgAttr[i].cValue; ++j) + { + if (!(msg = CryptMsgOpenToDecode(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL))) + { + ERR("Could not create crypt message.\n"); + goto done; + } + if (!CryptMsgUpdate(msg, attrs->rgAttr[i].rgValue[j].pbData, attrs->rgAttr[i].rgValue[j].cbData, TRUE)) + { + ERR("Could not update crypt message, err %lu.\n", GetLastError()); + CryptMsgClose(msg); + goto done; + } + s->rhSecondarySigs[j] = msg; + ++s->cSecondarySigs; + } + break; + } +done: + data->psPfns->pfnFree(attrs); +} + HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { DWORD err = ERROR_SUCCESS; @@ -854,7 +905,10 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) data->pSigState->fSupportMultiSig = TRUE; data->pSigState->dwCryptoPolicySupport = WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT; if (data->hMsg) + { data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); + load_secondary_signatures(data, data->pSigState->hPrimarySig); + } } if (!err && data->hMsg) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 070e7c52034..eb411bc7daf 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1840,7 +1840,7 @@ static void test_multiple_signatures(void) ok(prov->pSigState->fSupportMultiSig, "Got %d.\n", prov->pSigState->fSupportMultiSig); ok(prov->pSigState->dwCryptoPolicySupport == (WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT), "Got %#lx.\n", prov->pSigState->dwCryptoPolicySupport); - todo_wine ok(prov->pSigState->cSecondarySigs == 2, "Got %lu.\n", prov->pSigState->cSecondarySigs); + ok(prov->pSigState->cSecondarySigs == 2, "Got %lu.\n", prov->pSigState->cSecondarySigs); size = sizeof(buf); bret = CryptMsgGetParam(prov->pSigState->hPrimarySig, CMSG_SIGNER_CERT_INFO_PARAM, 0, buf, &size); diff --git a/include/wintrust.h b/include/wintrust.h index dd85369e322..eeb149822b4 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -475,6 +475,8 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); CRYPT_PROVIDER_PRIVDATA * WINAPI WTHelperGetProvPrivateDataFromChain(CRYPT_PROVIDER_DATA *,GUID *); +#define szOID_NESTED_SIGNATURE "1.3.6.1.4.1.311.2.4.1" + #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4" #define SPC_SP_AGENCY_INFO_OBJID "1.3.6.1.4.1.311.2.1.10" #define SPC_STATEMENT_TYPE_OBJID "1.3.6.1.4.1.311.2.1.11"

1 0

Paul Gofman : wintrust: Support WSS_GET_SECONDARY_SIG_COUNT in Softpub provider.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2c9ab24366907a95f5741c20beaaee7eabc765ff URL: https://gitlab.winehq.org/wine/wine/-/commit/2c9ab24366907a95f5741c20beaaee… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 21:37:51 2022 -0500 wintrust: Support WSS_GET_SECONDARY_SIG_COUNT in Softpub provider. --- dlls/wintrust/softpub.c | 5 +++++ dlls/wintrust/tests/softpub.c | 6 +++--- dlls/wintrust/wintrust_main.c | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d4f0088f620..06b178a98b9 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -909,6 +909,11 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); load_secondary_signatures(data, data->pSigState->hPrimarySig); } + if (data->pSigSettings) + { + if (data->pSigSettings->dwFlags & WSS_GET_SECONDARY_SIG_COUNT) + data->pSigSettings->cSecondarySigs = data->pSigState->cSecondarySigs; + } } if (!err && data->hMsg) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index eb411bc7daf..77e15b2feb4 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1830,7 +1830,7 @@ static void test_multiple_signatures(void) prov = (CRYPT_PROVIDER_DATA *)data.hWVTStateData; ok(prov->cbStruct == sizeof(*prov), "Got size %lu.\n", prov->cbStruct); ok(prov->csSigners == 1, "Got %lu.\n", prov->csSigners); - todo_wine ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); + ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); if (prov->cbStruct == sizeof(*prov) && prov->pSigState) { @@ -1867,7 +1867,7 @@ static void test_multiple_signatures(void) settings.dwVerifiedSigIndex = 0xcccccccc; status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data); todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status); - todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); + ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); todo_wine ok(settings.dwVerifiedSigIndex == 2, "Got %lu.\n", settings.dwVerifiedSigIndex); data.dwStateAction = WTD_STATEACTION_CLOSE; @@ -1881,7 +1881,7 @@ static void test_multiple_signatures(void) settings.dwIndex = 1; status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data); todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status); - todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); + ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); todo_wine ok(settings.dwVerifiedSigIndex == 1, "Got %lu.\n", settings.dwVerifiedSigIndex); settings.dwIndex = 0; diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 33695008b24..925ae7ca85a 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -294,6 +294,10 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, data->hWVTStateData = provData; provData->pWintrustData = data; + + if (WVT_ISINSTRUCT(WINTRUST_DATA, data->cbStruct, pSignatureSettings)) + provData->pSigSettings = data->pSignatureSettings; + if (hwnd == INVALID_HANDLE_VALUE) provData->hWndParent = GetDesktopWindow(); else

1 0

Paul Gofman : wintrust/tests: Add tests for multiple PE signatures.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 6071205974f7767d5b967fb2d0e46433498c5b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/6071205974f7767d5b967fb2d0e464… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 16:11:33 2022 -0500 wintrust/tests: Add tests for multiple PE signatures. --- dlls/wintrust/tests/softpub.c | 581 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 581 insertions(+)

1 0

Gabriel Ivăncescu : jscript: Fill the builtin props for enumeration on prototypes as well.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 2a228918ef88eec4b776927026a96498afb7eb7d URL: https://gitlab.winehq.org/wine/wine/-/commit/2a228918ef88eec4b776927026a964… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:21 2022 +0300 jscript: Fill the builtin props for enumeration on prototypes as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e25378e866b..746c5246ed1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -610,15 +610,41 @@ HRESULT builtin_set_const(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) return S_OK; } +static HRESULT fill_props(jsdisp_t *obj) +{ + dispex_prop_t *prop; + HRESULT hres; + + if(obj->builtin_info->idx_length) { + unsigned i = 0, len = obj->builtin_info->idx_length(obj); + WCHAR name[12]; + + for(i = 0; i < len; i++) { + swprintf(name, ARRAY_SIZE(name), L"%u", i); + hres = find_prop_name(obj, string_hash(name), name, FALSE, &prop); + if(FAILED(hres)) + return hres; + } + } + + return S_OK; +} + static HRESULT fill_protrefs(jsdisp_t *This) { dispex_prop_t *iter, *prop; HRESULT hres; + hres = fill_props(This); + if(FAILED(hres)) + return hres; + if(!This->prototype) return S_OK; - fill_protrefs(This->prototype); + hres = fill_protrefs(This->prototype); + if(FAILED(hres)) + return hres; for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { hres = find_prop_name(This, iter->hash, iter->name, FALSE, &prop); @@ -2467,23 +2493,9 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty HRESULT hres; if(id == DISPID_STARTENUM) { - if(obj->builtin_info->idx_length) { - unsigned i = 0, len = obj->builtin_info->idx_length(obj); - WCHAR name[12]; - - for(i = 0; i < len; i++) { - swprintf(name, ARRAY_SIZE(name), L"%d", i); - hres = find_prop_name(obj, string_hash(name), name, FALSE, &iter); - if(FAILED(hres)) - return hres; - } - } - - if (enum_type == JSDISP_ENUM_ALL) { - hres = fill_protrefs(obj); - if(FAILED(hres)) - return hres; - } + hres = (enum_type == JSDISP_ENUM_ALL) ? fill_protrefs(obj) : fill_props(obj); + if(FAILED(hres)) + return hres; idx = 0; }

1 0

Gabriel Ivăncescu : jscript: Refill the props at end of enumeration in html mode and retry.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 605819dcd94b1b1b4843fa869ed15402bdc8a18b URL: https://gitlab.winehq.org/wine/wine/-/commit/605819dcd94b1b1b4843fa869ed154… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 jscript: Refill the props at end of enumeration in html mode and retry. If properties were added during enumeration, for example on the prototype, they are actually visited in mshtml scripts in any mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 13 ++++++++----- dlls/jscript/tests/lang.js | 2 ++ dlls/mshtml/tests/documentmode.js | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 746c5246ed1..42f41771ef2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2492,16 +2492,16 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty DWORD idx = id; HRESULT hres; - if(id == DISPID_STARTENUM) { + if(id == DISPID_STARTENUM || idx >= obj->prop_cnt) { hres = (enum_type == JSDISP_ENUM_ALL) ? fill_protrefs(obj) : fill_props(obj); if(FAILED(hres)) return hres; - idx = 0; + if(id == DISPID_STARTENUM) + idx = 0; + if(idx >= obj->prop_cnt) + return S_FALSE; } - if(idx >= obj->prop_cnt) - return S_FALSE; - for(iter = &obj->props[idx]; iter < obj->props + obj->prop_cnt; iter++) { if(iter->type == PROP_DELETED) continue; @@ -2513,6 +2513,9 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty return S_OK; } + if(obj->ctx->html_mode) + return jsdisp_next_prop(obj, prop_to_id(obj, iter - 1), enum_type, ret); + return S_FALSE; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 67e4576813b..5c201d5bf26 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1559,6 +1559,7 @@ inobj.test2 = true; tmp = 0; for(iter in inobj) { + forinTestObj.prototype.test4 = true; arr[iter] = true; tmp++; } @@ -1567,6 +1568,7 @@ ok(tmp === 3, "for..in tmp = " + tmp); ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); +ok(arr["test4"] !== true, "arr[test4] === true"); ok((delete inobj.test1) === true, "delete inobj.test1 returned false"); ok(!("test1" in inobj), "test1 is still in inobj after delete"); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 90223d53f83..cb6d2d01ec2 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -634,6 +634,26 @@ sync_test("JS objs", function() { test_parses("if(false) { o.if; }", v >= 9); }); +sync_test("for..in", function() { + function ctor() {} + ctor.prototype.test2 = true; + + var arr = new Array(), obj = new ctor(), i, r; + obj.test1 = true; + + i = 0; + for(var r in obj) { + ctor.prototype.test3 = true; + arr[r] = true; + i++; + } + + ok(i === 3, "enum did " + i + " iterations"); + ok(arr["test1"] === true, "arr[test1] !== true"); + ok(arr["test2"] === true, "arr[test2] !== true"); + ok(arr["test3"] === true, "arr[test3] !== true"); +}); + sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>';

1 0