May 2018 - Wine-devel - list.winehq.org

[PATCH] jscript: Added String.trim implementation.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/string.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 2 ++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 3 files changed, 56 insertions(+)

2 1

[PATCH 2/7] shell32: Set return value correctly in DoPaste.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 905dde9..42770c7 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1149,7 +1149,8 @@ static BOOL DoPaste(ContextMenu *This) /* do the copy/move */ if (psfhlpdst && psfhlpsrc) { - ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl); + if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl))) + bSuccess = TRUE; /* FIXME handle move ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl); */ -- 1.9.1

2 1

[PATCH 1/7] shell32: Fix copying of files when using a context menu.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e1..905dde9 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1124,6 +1124,13 @@ static BOOL DoPaste(ContextMenu *This) apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + /* + * Incase source is a file, we need to remove the last component + * to obtain a IShellFolder of the parent. + */ + if (_ILIsValue(pidl)) + ILRemoveLastID(pidl); + /* bind to the source shellfolder */ SHGetDesktopFolder(&psfDesktop); if(psfDesktop) -- 1.9.1

2 1

[PATCH 4/4] ole32: Use queried interface destination context for marshaling RemQueryInterface result.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/stubmanager.c | 12 +++++++++--- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-)

2 1

[PATCH 3/4] ole32: Introduce new ipid_to_ifstub helper and use it in ipid_get_dispatch_params.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/stubmanager.c | 49 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 26 deletions(-)

2 1

[PATCH 2/4 v2] ole32/tests: Add IRpcChannelBuffer and IRpcStubBuffer tests.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed tests failures on win64. dlls/ole32/tests/marshal.c | 358 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+)

2 1

[PATCH 1/4] ole32/tests: Pass host_object_data struct as an argument to start_host_object2.
by Jacek Caban 25 May '18

25 May '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/tests/marshal.c | 52 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-)

2 1

[PATCH v2 1/5] msi/tests: Test deferral of MsiPublishAssemblies and MsiUnpublishAssemblies.
by Zebediah Figura 25 May '18

25 May '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: fix GCC warnings dlls/msi/tests/action.c | 14 ++++++++++++ dlls/msi/tests/custom.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 71 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 1600fe3..bd1e2c0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1733,12 +1733,25 @@ static const char pa_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "MsiPublishAssemblies\t\t3000\n" + "pa_immediate\tNOT REMOVE AND NOT ALLUSERS\t3001\n" + "pa_deferred\tNOT REMOVE AND NOT ALLUSERS\t3002\n" "MsiUnpublishAssemblies\t\t4000\n" + "ua_immediate\tREMOVE AND NOT ALLUSERS\t4001\n" + "ua_deferred\tREMOVE AND NOT ALLUSERS\t4002\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char pa_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "pa_immediate\t1\tcustom.dll\tpa_absent\n" + "pa_deferred\t1025\tcustom.dll\tpa_present\n" + "ua_immediate\t1\tcustom.dll\tpa_present\n" + "ua_deferred\t1025\tcustom.dll\tpa_absent\n"; + static const char rep_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2191,6 +2204,7 @@ static const msi_table pa_tables[] = ADD_TABLE(pa_msi_assembly), ADD_TABLE(pa_msi_assembly_name), ADD_TABLE(pa_install_exec_seq), + ADD_TABLE(pa_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0bf62d9..ee067db 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1379,3 +1379,58 @@ todo_wine { } return ERROR_SUCCESS; } + +static void check_reg_str(MSIHANDLE hinst, HKEY key, const char *name, const char *expect) +{ + char value[300]; + DWORD sz; + LONG res; + + sz = sizeof(value); + res = RegQueryValueExA(key, name, NULL, NULL, (BYTE *)value, &sz); + if (expect) + { + ok(hinst, !res, "failed to get value \"%s\": %d\n", name, res); + ok(hinst, !strcmp(value, expect), "\"%s\": expected \"%s\", got \"%s\"\n", + name, expect, value); + } + else + ok(hinst, res == ERROR_FILE_NOT_FOUND, "\"%s\": expected missing, got %u\n", + name, res); +} + +static const char path_dotnet[] = "Software\\Microsoft\\Installer\\Assemblies\\Global"; +static const char name_dotnet[] = "Wine.Dotnet.Assembly,processorArchitecture=\"MSIL\"," + "publicKeyToken=\"abcdef0123456789\",version=\"1.0.0.0\",culture=\"neutral\""; + +UINT WINAPI pa_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); + ok(hinst, !res, "got %d\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI pa_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); + ok(hinst, !res || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + if (!res) + { +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, name_dotnet, NULL); +} + RegCloseKey(key); + } + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 4b46dc3..e5caa76 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -13,6 +13,8 @@ @ stdcall mov_absent(long) @ stdcall odbc_present(long) @ stdcall odbc_absent(long) +@ stdcall pa_present(long) +@ stdcall pa_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long) -- 2.7.4

3 14

[PATCH] ntoskrnl: Add SeSinglePrivilegeCheck stub.
by Alex Henrie 25 May '18

25 May '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=11908#c31 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 99f5f928c2..55027c5022 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3525,3 +3525,12 @@ NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, P FIXME("stub: %p %p\n", object, callbacks); return STATUS_NOT_IMPLEMENTED; } + +/********************************************************************* + * SeSinglePrivilegeCheck (NTOSKRNL.@) + */ +BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) +{ + FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 137f518929..4129542cdc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1259,7 +1259,7 @@ @ stub SeSetAccessStateGenericMapping @ stub SeSetSecurityDescriptorInfo @ stub SeSetSecurityDescriptorInfoEx -@ stub SeSinglePrivilegeCheck +@ stdcall SeSinglePrivilegeCheck(int64 long) @ stub SeSystemDefaultDacl @ stub SeTokenImpersonationLevel @ stub SeTokenIsAdmin -- 2.17.0

1 0

[PATCH 7/7] shell32: Recognize cut/copy/paste string verbs in item menu context menu.
by Alistair Leslie-Hughes 25 May '18

25 May '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/shell32/shlview_cmenu.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 9fdddee..be6de49 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -887,6 +887,12 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( DoDelete(This); else if (strcmp(lpcmi->lpVerb,"properties")==0) DoOpenProperties(This, lpcmi->hwnd); + else if (strcmp(lpcmi->lpVerb,"cut")==0) + DoCopyOrCut(This, lpcmi->hwnd, TRUE); + else if (strcmp(lpcmi->lpVerb,"copy")==0) + DoCopyOrCut(This, lpcmi->hwnd, FALSE); + else if (strcmp(lpcmi->lpVerb,"paste")==0) + DoPaste(This); else { FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); return E_FAIL; -- 1.9.1

1 0