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

Michael Stefaniuc : include: Make ARRAY_SIZE() available in wine/test.h.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 7b5668a6e7bccdaefb69e099345fc7c3855a5cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5668a6e7bccdaefb69e099… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 24 23:46:27 2018 +0200 include: Make ARRAY_SIZE() available in wine/test.h. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/cred.c | 2 -- dlls/advapi32/tests/eventlog.c | 2 -- dlls/advapi32/tests/registry.c | 1 - dlls/advapi32/tests/security.c | 2 -- dlls/comctl32/tests/button.c | 1 - dlls/comdlg32/tests/filedlg.c | 2 -- dlls/d2d1/tests/d2d1.c | 4 ---- dlls/d3d10core/tests/device.c | 4 ---- dlls/d3d11/tests/d3d11.c | 4 ---- dlls/d3d8/tests/device.c | 2 -- dlls/d3d9/tests/d3d9ex.c | 2 -- dlls/d3d9/tests/device.c | 2 -- dlls/d3d9/tests/stateblock.c | 2 -- dlls/d3d9/tests/visual.c | 2 -- dlls/d3dx9_36/tests/effect.c | 2 -- dlls/d3dx9_36/tests/math.c | 2 -- dlls/d3dx9_36/tests/mesh.c | 2 -- dlls/ddraw/tests/ddraw1.c | 4 ---- dlls/ddraw/tests/ddraw2.c | 4 ---- dlls/ddraw/tests/ddraw4.c | 4 ---- dlls/ddraw/tests/ddraw7.c | 4 ---- dlls/dmcompos/tests/dmcompos.c | 2 -- dlls/dmime/tests/dmime.c | 2 -- dlls/dmloader/tests/loader.c | 2 -- dlls/dmstyle/tests/dmstyle.c | 2 -- dlls/dwrite/tests/analyzer.c | 2 -- dlls/dwrite/tests/font.c | 2 -- dlls/dwrite/tests/layout.c | 2 -- dlls/dxgi/tests/device.c | 4 ---- dlls/shell32/tests/shellpath.c | 4 ---- dlls/shell32/tests/shlfolder.c | 2 -- dlls/user32/tests/cursoricon.c | 2 -- dlls/usp10/tests/usp10.c | 4 ---- dlls/xmllite/tests/reader.c | 2 -- include/wine/test.h | 2 ++ 35 files changed, 2 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b5668a6e7bccdaefb69…

1 0

Zebediah Figura : msi/tests: Test deferral of MsiPublishAssemblies and MsiUnpublishAssemblies.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 6eb74409147751a69cbf7dff34d79bd7e3a5dc7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb74409147751a69cbf7dff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 24 19:14:10 2018 -0500 msi/tests: Test deferral of MsiPublishAssemblies and MsiUnpublishAssemblies. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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)

1 0

Zebediah Figura : msi/tests: Test deferral of ProcessComponents.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 5e0e25d4b4eb2ebd0a97bbbe02bf9a5d1ece7ff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e0e25d4b4eb2ebd0a97bbbe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 24 19:14:11 2018 -0500 msi/tests: Test deferral of ProcessComponents. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 10 ++++++++++ dlls/msi/tests/custom.c | 32 ++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 44 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index bd1e2c0..17bbddc 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -396,6 +396,8 @@ static const char pp_install_exec_seq_dat[] = "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" "ProcessComponents\tPROCESS_COMPONENTS=1 Or FULL=1\t1600\n" + "ppc_immediate\tPROCESS_COMPONENTS AND ALLUSERS\t1601\n" + "ppc_deferred\tPROCESS_COMPONENTS AND ALLUSERS\t1602\n" "UnpublishFeatures\tUNPUBLISH_FEATURES=1 Or FULL=1\t1800\n" "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" @@ -405,6 +407,13 @@ static const char pp_install_exec_seq_dat[] = "PublishProduct\tPUBLISH_PRODUCT=1 Or FULL=1\t6400\n" "InstallFinalize\t\t6600"; +static const char pp_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "ppc_immediate\t1\tcustom.dll\tppc_absent\n" + "ppc_deferred\t1025\tcustom.dll\tppc_present\n"; + static const char pp_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -1855,6 +1864,7 @@ static const msi_table ppc_tables[] = ADD_TABLE(ppc_feature_comp), ADD_TABLE(ppc_file), ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(pp_custom_action), ADD_TABLE(ppc_media), ADD_TABLE(property), }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index ee067db..5925fc9 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1434,3 +1434,35 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { } return ERROR_SUCCESS; } + +static const char ppc_key[] = "Software\\Microsoft\\Windows\\CurrentVersion\\" + "Installer\\UserData\\S-1-5-18\\Components\\CBABC2FDCCB35E749A8944D8C1C098B5"; + +UINT WINAPI ppc_present(MSIHANDLE hinst) +{ + char expect[MAX_PATH]; + HKEY key; + UINT r; + + r = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ppc_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); + ok(hinst, !r, "got %u\n", r); + + if (FAILED(SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILESX86, NULL, 0, expect))) + SHGetFolderPathA(NULL, CSIDL_PROGRAM_FILES, NULL, 0, expect); + strcat(expect, "\\msitest\\maximus"); + check_reg_str(hinst, key, "84A88FD7F6998CE40A22FB59F6B9C2BB", expect); + + RegCloseKey(key); + return ERROR_SUCCESS; +} + +UINT WINAPI ppc_absent(MSIHANDLE hinst) +{ + HKEY key; + UINT r; + + r = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ppc_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); +todo_wine + ok(hinst, r == ERROR_FILE_NOT_FOUND, "got %u\n", r); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index e5caa76..3b73765 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -15,6 +15,8 @@ @ stdcall odbc_absent(long) @ stdcall pa_present(long) @ stdcall pa_absent(long) +@ stdcall ppc_present(long) +@ stdcall ppc_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of PublishComponents and UnpublishComponents.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 625ef14967984ef2f35638e0012ceb7c816f346c URL: https://source.winehq.org/git/wine.git/?a=commit;h=625ef14967984ef2f35638e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 24 19:14:12 2018 -0500 msi/tests: Test deferral of PublishComponents and UnpublishComponents. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 28 ++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 44 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 17bbddc..48a1c88 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1086,12 +1086,25 @@ static const char pub_install_exec_seq_dat[] = "RemoveFiles\t\t1700\n" "InstallFiles\t\t2000\n" "PublishComponents\t\t3000\n" + "pub_immediate\tNOT REMOVE\t3001\n" + "pub_deferred\tNOT REMOVE\t3002\n" "UnpublishComponents\t\t3100\n" + "unp_immediate\tREMOVE\t3101\n" + "unp_deferred\tREMOVE\t3102\n" "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char pub_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "pub_immediate\t1\tcustom.dll\tpub_absent\n" + "pub_deferred\t1025\tcustom.dll\tpub_present\n" + "unp_immediate\t1\tcustom.dll\tpub_present\n" + "unp_deferred\t1025\tcustom.dll\tpub_absent\n"; + static const char rd_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -2070,6 +2083,7 @@ static const msi_table pub_tables[] = ADD_TABLE(pub_file), ADD_TABLE(pub_publish_component), ADD_TABLE(pub_install_exec_seq), + ADD_TABLE(pub_custom_action), ADD_TABLE(media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 5925fc9..4d5cec7 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1466,3 +1466,31 @@ todo_wine ok(hinst, r == ERROR_FILE_NOT_FOUND, "got %u\n", r); return ERROR_SUCCESS; } + +static const char pub_key[] = "Software\\Microsoft\\Installer\\Components\\0CBCFA296AC907244845745CEEB2F8AA"; + +UINT WINAPI pub_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); + ok(hinst, !res, "got %u\n", res); + res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); + ok(hinst, !res, "got %u\n", res); +} + RegCloseKey(key); + return ERROR_SUCCESS; +} + +UINT WINAPI pub_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 3b73765..2dc09e0 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -17,6 +17,8 @@ @ stdcall pa_absent(long) @ stdcall ppc_present(long) @ stdcall ppc_absent(long) +@ stdcall pub_present(long) +@ stdcall pub_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of PublishFeatures and UnpublishFeatures.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 920dde0b1e1d137720a277ee05b65c6bf2387ad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=920dde0b1e1d137720a277ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 24 19:14:13 2018 -0500 msi/tests: Test deferral of PublishFeatures and UnpublishFeatures. test_publish_assemblies() was leaving behind feature data that caused this test to fail when run multiple times. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 10 ++++++++++ dlls/msi/tests/custom.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 54 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 48a1c88..82ec376 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -399,11 +399,15 @@ static const char pp_install_exec_seq_dat[] = "ppc_immediate\tPROCESS_COMPONENTS AND ALLUSERS\t1601\n" "ppc_deferred\tPROCESS_COMPONENTS AND ALLUSERS\t1602\n" "UnpublishFeatures\tUNPUBLISH_FEATURES=1 Or FULL=1\t1800\n" + "uf_immediate\tUNPUBLISH_FEATURES AND ALLUSERS\t1801\n" + "uf_deferred\tUNPUBLISH_FEATURES AND ALLUSERS\t1802\n" "RemoveFiles\t\t3500\n" "InstallFiles\t\t4000\n" "RegisterUser\tREGISTER_USER=1 Or FULL=1\t6000\n" "RegisterProduct\tREGISTER_PRODUCT=1 Or FULL=1\t6100\n" "PublishFeatures\tPUBLISH_FEATURES=1 Or FULL=1\t6300\n" + "pf_immediate\tPUBLISH_FEATURES AND ALLUSERS\t6301\n" + "pf_deferred\tPUBLISH_FEATURES AND ALLUSERS\t6302\n" "PublishProduct\tPUBLISH_PRODUCT=1 Or FULL=1\t6400\n" "InstallFinalize\t\t6600"; @@ -411,6 +415,10 @@ static const char pp_custom_action_dat[] = "Action\tType\tSource\tTarget\n" "s72\ti2\tS64\tS0\n" "CustomAction\tAction\n" + "pf_immediate\t1\tcustom.dll\tpf_absent\n" + "pf_deferred\t1025\tcustom.dll\tpf_present\n" + "uf_immediate\t1\tcustom.dll\tpf_present\n" + "uf_deferred\t1025\tcustom.dll\tpf_absent\n" "ppc_immediate\t1\tcustom.dll\tppc_absent\n" "ppc_deferred\t1025\tcustom.dll\tppc_present\n"; @@ -1763,6 +1771,7 @@ static const char pa_install_exec_seq_dat[] = "RegisterProduct\t\t5000\n" "PublishFeatures\t\t5100\n" "PublishProduct\t\t5200\n" + "UnpublishFeatures\t\t5300\n" "InstallFinalize\t\t6000\n"; static const char pa_custom_action_dat[] = @@ -1865,6 +1874,7 @@ static const msi_table pp_tables[] = ADD_TABLE(rof_feature_comp), ADD_TABLE(rof_file), ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(pp_custom_action), ADD_TABLE(rof_media), ADD_TABLE(property), }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4d5cec7..bac2653 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1494,3 +1494,45 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; } + +static const char pf_classkey[] = "Installer\\Features\\84A88FD7F6998CE40A22FB59F6B9C2BB"; +static const char pf_userkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\" + "Installer\\UserData\\S-1-5-18\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB\\Features"; + +UINT WINAPI pf_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "feature", ""); + check_reg_str(hinst, key, "montecristo", ""); + RegCloseKey(key); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, pf_userkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "feature", "VGtfp^p+,?82(a)JU1j_KE"); + check_reg_str(hinst, key, "montecristo", "VGtfp^p+,?82(a)JU1j_KE"); + RegCloseKey(key); +} + + return ERROR_SUCCESS; +} + +UINT WINAPI pf_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, pf_userkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 2dc09e0..2092570 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -15,6 +15,8 @@ @ stdcall odbc_absent(long) @ stdcall pa_present(long) @ stdcall pa_absent(long) +@ stdcall pf_present(long) +@ stdcall pf_absent(long) @ stdcall ppc_present(long) @ stdcall ppc_absent(long) @ stdcall pub_present(long)

1 0

Zebediah Figura : msi/tests: Test deferral of PublishProduct.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 4f2bb46fd1b7e190946b288312b2be30a68c02c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f2bb46fd1b7e190946b2883… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 24 19:14:14 2018 -0500 msi/tests: Test deferral of PublishProduct. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 4 ++++ dlls/msi/tests/custom.c | 29 +++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 35 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 82ec376..3d74704 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -409,6 +409,8 @@ static const char pp_install_exec_seq_dat[] = "pf_immediate\tPUBLISH_FEATURES AND ALLUSERS\t6301\n" "pf_deferred\tPUBLISH_FEATURES AND ALLUSERS\t6302\n" "PublishProduct\tPUBLISH_PRODUCT=1 Or FULL=1\t6400\n" + "pp_immediate\tPUBLISH_PRODUCT AND ALLUSERS\t6401\n" + "pp_deferred\tPUBLISH_PRODUCT AND ALLUSERS\t6402\n" "InstallFinalize\t\t6600"; static const char pp_custom_action_dat[] = @@ -419,6 +421,8 @@ static const char pp_custom_action_dat[] = "pf_deferred\t1025\tcustom.dll\tpf_present\n" "uf_immediate\t1\tcustom.dll\tpf_present\n" "uf_deferred\t1025\tcustom.dll\tpf_absent\n" + "pp_immediate\t1\tcustom.dll\tpp_absent\n" + "pp_deferred\t1025\tcustom.dll\tpp_present\n" "ppc_immediate\t1\tcustom.dll\tppc_absent\n" "ppc_deferred\t1025\tcustom.dll\tppc_present\n"; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index bac2653..cfb368f 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1536,3 +1536,32 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +static const char pp_prodkey[] = "Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; + +UINT WINAPI pp_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pp_prodkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); + ok(hinst, !res, "got %u\n", res); + check_reg_str(hinst, key, "ProductName", "MSITEST"); + check_reg_str(hinst, key, "PackageCode", "AC75740029052C94DA02821EECD05F2F"); + check_reg_str(hinst, key, "Clients", ":"); + + RegCloseKey(key); + return ERROR_SUCCESS; +} + +UINT WINAPI pp_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pp_prodkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); +todo_wine + ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 2092570..d8b5f08 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -17,6 +17,8 @@ @ stdcall pa_absent(long) @ stdcall pf_present(long) @ stdcall pf_absent(long) +@ stdcall pp_present(long) +@ stdcall pp_absent(long) @ stdcall ppc_present(long) @ stdcall ppc_absent(long) @ stdcall pub_present(long)

1 0

Marcos Gutierrez : include: Fixed casts in some HANDLE_MSG_WM_* macros.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 62f253b592b51f4f3515267f956e00d8e7b00937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62f253b592b51f4f3515267f… Author: Marcos Gutierrez <sacrom(a)gmail.com> Date: Thu May 24 10:19:04 2018 +0200 include: Fixed casts in some HANDLE_MSG_WM_* macros. Signed-off-by: Marcos Gutierrez <sacrom(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windowsx.h | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index fa27b49..7a87314 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -412,7 +412,7 @@ extern "C" { ((BOOL)SendMessage((hwndCtl), EM_SCROLLCARET, 0, 0L)) #define Edit_SetHandle(hwndCtl, h) \ - ((void)SendMessage((hwndCtl), EM_SETHANDLE, (WPARAM)(UINT)(HLOCAL)(h), 0L)) + ((void)SendMessage((hwndCtl), EM_SETHANDLE, (WPARAM)(HLOCAL)(h), 0L)) #define Edit_SetModify(hwndCtl, fModified) \ ((void)SendMessage((hwndCtl), EM_SETMODIFY, (WPARAM)(UINT)(fModified), 0L)) @@ -1081,9 +1081,9 @@ extern "C" { /* HANDLE Cls_OnRenderFormat(HWND hwnd, UINT fmt) */ #define HANDLE_WM_RENDERFORMAT(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HANDLE)(fn)((hwnd), (UINT)(wParam)) + (LRESULT)(UINT_PTR)(HANDLE)(fn)((hwnd), (UINT)(wParam)) #define FORWARD_WM_RENDERFORMAT(hwnd, fmt, fn) \ - (HANDLE)(UINT)(DWORD)(fn)((hwnd), WM_RENDERFORMAT, (WPARAM)(UINT)(fmt), 0L) + (HANDLE)(UINT_PTR)(fn)((hwnd), WM_RENDERFORMAT, (WPARAM)(UINT)(fmt), 0L) /* void Cls_OnRenderAllFormats(HWND hwnd) */ #define HANDLE_WM_RENDERALLFORMATS(hwnd, wParam, lParam, fn) ((fn)(hwnd), 0L) @@ -1174,7 +1174,7 @@ extern "C" { #define HANDLE_WM_MDINEXT(hwnd, wParam, lParam, fn) \ (LRESULT)(HWND)(fn)((hwnd), (HWND)(wParam), (BOOL)lParam) #define FORWARD_WM_MDINEXT(hwnd, hwndCur, fPrev, fn) \ - (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDINEXT, (WPARAM)(hwndCur), (LPARAM)(fPrev)) + (HWND)(UINT_PTR)(fn)((hwnd), WM_MDINEXT, (WPARAM)(hwndCur), (LPARAM)(fPrev)) /* void Cls_MDIMaximize(HWND hwnd, HWND hwndMaximize) */ #define HANDLE_WM_MDIMAXIMIZE(hwnd, wParam, lParam, fn) \ @@ -1202,15 +1202,15 @@ extern "C" { /* HWND Cls_MDIGetActive(HWND hwnd) */ #define HANDLE_WM_MDIGETACTIVE(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(fn)(hwnd) + (LRESULT)(UINT_PTR)(fn)(hwnd) #define FORWARD_WM_MDIGETACTIVE(hwnd, fn) \ - (HWND)(UINT)(DWORD)(fn)((hwnd), WM_MDIGETACTIVE, 0L, 0L) + (HWND)(UINT_PTR)(fn)((hwnd), WM_MDIGETACTIVE, 0L, 0L) /* HMENU Cls_MDISetMenu(HWND hwnd, BOOL fRefresh, HMENU hmenuFrame, HMENU hmenuWindow) */ #define HANDLE_WM_MDISETMENU(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(fn)((hwnd), (BOOL)(wParam), (HMENU)(wParam), (HMENU)(lParam)) + (LRESULT)(UINT_PTR)(fn)((hwnd), (BOOL)(wParam), (HMENU)(wParam), (HMENU)(lParam)) #define FORWARD_WM_MDISETMENU(hwnd, fRefresh, hmenuFrame, hmenuWindow, fn) \ - (HMENU)(UINT)(DWORD)(fn)((hwnd), WM_MDISETMENU, (WPARAM)((fRefresh) ? (hmenuFrame) : 0), (LPARAM)(hmenuWindow)) + (HMENU)(UINT_PTR)(fn)((hwnd), WM_MDISETMENU, (WPARAM)((fRefresh) ? (hmenuFrame) : 0), (LPARAM)(hmenuWindow)) /* void Cls_OnChildActivate(HWND hwnd) */ #define HANDLE_WM_CHILDACTIVATE(hwnd, wParam, lParam, fn) \ @@ -1226,9 +1226,9 @@ extern "C" { /* HWND Cls_OnNextDlgCtl(HWND hwnd, HWND hwndSetFocus, BOOL fNext) */ #define HANDLE_WM_NEXTDLGCTL(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HWND)(fn)((hwnd), (HWND)(wParam), (BOOL)(lParam)) + (LRESULT)(UINT_PTR)(HWND)(fn)((hwnd), (HWND)(wParam), (BOOL)(lParam)) #define FORWARD_WM_NEXTDLGCTL(hwnd, hwndSetFocus, fNext, fn) \ - (HWND)(UINT)(DWORD)(fn)((hwnd), WM_NEXTDLGCTL, (WPARAM)(HWND)(hwndSetFocus), (LPARAM)(fNext)) + (HWND)(UINT_PTR)(fn)((hwnd), WM_NEXTDLGCTL, (WPARAM)(HWND)(hwndSetFocus), (LPARAM)(fNext)) /* void Cls_OnParentNotify(HWND hwnd, UINT msg, HWND hwndChild, int idChild) */ #define HANDLE_WM_PARENTNOTIFY(hwnd, wParam, lParam, fn) \ @@ -1250,39 +1250,39 @@ extern "C" { /* HBRUSH Cls_OnCtlColor(HWND hwnd, HDC hdc, HWND hwndChild, int type) */ #define HANDLE_WM_CTLCOLORMSGBOX(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_MSGBOX) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_MSGBOX) #define FORWARD_WM_CTLCOLORMSGBOX(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORMSGBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORMSGBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLOREDIT(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_EDIT) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_EDIT) #define FORWARD_WM_CTLCOLOREDIT(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLOREDIT, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLOREDIT, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORLISTBOX(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_LISTBOX) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_LISTBOX) #define FORWARD_WM_CTLCOLORLISTBOX(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORLISTBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORLISTBOX, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORBTN(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_BTN) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_BTN) #define FORWARD_WM_CTLCOLORBTN(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORBTN, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORBTN, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORDLG(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_DLG) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_DLG) #define FORWARD_WM_CTLCOLORDLG(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORDLG, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORDLG, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORSCROLLBAR(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_SCROLLBAR) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_SCROLLBAR) #define FORWARD_WM_CTLCOLORSCROLLBAR(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORSCROLLBAR, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORSCROLLBAR, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) #define HANDLE_WM_CTLCOLORSTATIC(hwnd, wParam, lParam, fn) \ - (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_STATIC) + (LRESULT)(UINT_PTR)(HBRUSH)(fn)((hwnd), (HDC)(wParam), (HWND)(lParam), CTLCOLOR_STATIC) #define FORWARD_WM_CTLCOLORSTATIC(hwnd, hdc, hwndChild, fn) \ - (HBRUSH)(UINT)(DWORD)(fn)((hwnd), WM_CTLCOLORSTATIC, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) + (HBRUSH)(UINT_PTR)(fn)((hwnd), WM_CTLCOLORSTATIC, (WPARAM)(HDC)(hdc), (LPARAM)(HWND)(hwndChild)) /* void Cls_OnDeleteItem(HWND hwnd, const DELETEITEMSTRUCT * lpDeleteItem) */ #define HANDLE_WM_DELETEITEM(hwnd, wParam, lParam, fn) \ @@ -1366,8 +1366,8 @@ extern "C" { (UINT)(DWORD)(fn)((hwnd), WM_NCHITTEST, 0L, MAKELPARAM((x), (y))) /* HFONT Cls_OnGetFont(HWND hwnd) */ -#define HANDLE_WM_GETFONT(hwnd, wParam, lParam, fn) (LRESULT)(DWORD)(UINT)(HFONT)(fn)(hwnd) -#define FORWARD_WM_GETFONT(hwnd, fn) (HFONT)(UINT)(DWORD)(fn)((hwnd), WM_GETFONT, 0L, 0L) +#define HANDLE_WM_GETFONT(hwnd, wParam, lParam, fn) (LRESULT)(UINT_PTR)(HFONT)(fn)(hwnd) +#define FORWARD_WM_GETFONT(hwnd, fn) (HFONT)(UINT_PTR)(fn)((hwnd), WM_GETFONT, 0L, 0L) /* void Cls_OnSetFont(HWND hwndCtl, HFONT hfont, BOOL fRedraw) */ #define HANDLE_WM_SETFONT(hwnd, wParam, lParam, fn) \

1 0

Alex Henrie : ntoskrnl: Add SeSinglePrivilegeCheck stub.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: bc4624c740256e266c0a25cb747794041b23e63c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc4624c740256e266c0a25cb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 24 23:50:14 2018 -0600 ntoskrnl: Add SeSinglePrivilegeCheck stub. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 99f5f92..55027c5 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 137f518..4129542 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

1 0

Francois Gouget : makedep: Avoid building test resources if winetest is disabled.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 776618fe8028ac53cb1e2de1c4f13fa0b5e9e532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=776618fe8028ac53cb1e2de1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 25 00:02:02 2018 +0200 makedep: Avoid building test resources if winetest is disabled. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 207c41e..f8a82b0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3283,7 +3283,7 @@ static void output_test_module( struct makefile *make ) output_filename( tools_path( make, "winegcc" )); output( "\n" ); - if (!make->disabled) + if (!make->disabled && !strarray_exists( &disabled_dirs, "programs/winetest" )) output( "all: %s/%s\n", top_obj_dir_path( make, "programs/winetest" ), testres ); output( "%s/%s: %s%s\n", top_obj_dir_path( make, "programs/winetest" ), testres, obj_dir_path( make, stripped ), dll_ext );

1 0

Jacek Caban : jscript: Added String.trim implementation.
by Alexandre Julliard 25 May '18

25 May '18

Module: wine Branch: master Commit: 16ba7f444437d7d11600764a12ae143817e6f23c URL: https://source.winehq.org/git/wine.git/?a=commit;h=16ba7f444437d7d11600764a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 25 15:31:44 2018 +0200 jscript: Added String.trim implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/string.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/documentmode.js | 2 ++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 737c878..e6e4997 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -63,6 +63,7 @@ static const WCHAR toLowerCaseW[] = {'t','o','L','o','w','e','r','C','a','s','e' static const WCHAR toUpperCaseW[] = {'t','o','U','p','p','e','r','C','a','s','e',0}; static const WCHAR toLocaleLowerCaseW[] = {'t','o','L','o','c','a','l','e','L','o','w','e','r','C','a','s','e',0}; static const WCHAR toLocaleUpperCaseW[] = {'t','o','L','o','c','a','l','e','U','p','p','e','r','C','a','s','e',0}; +static const WCHAR trimW[] = {'t','r','i','m',0}; static const WCHAR localeCompareW[] = {'l','o','c','a','l','e','C','o','m','p','a','r','e',0}; static const WCHAR fromCharCodeW[] = {'f','r','o','m','C','h','a','r','C','o','d','e',0}; @@ -1465,6 +1466,41 @@ static HRESULT String_toLocaleUpperCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD return E_NOTIMPL; } +static HRESULT String_trim(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, + jsval_t *argv, jsval_t *r) +{ + const WCHAR *str, *begin, *end; + jsstr_t *jsstr; + unsigned len; + HRESULT hres; + + hres = to_flat_string(ctx, jsval_disp(jsthis->u.disp), &jsstr, &str); + if(FAILED(hres)) { + WARN("to_flat_string failed: %08x\n", hres); + return hres; + } + len = jsstr_length(jsstr); + TRACE("%s\n", debugstr_wn(str, len)); + + for(begin = str, end = str + len; begin < end && isspaceW(*begin); begin++); + while(end > begin + 1 && isspaceW(*(end-1))) end--; + + if(r) { + jsstr_t *ret; + + if(begin == str && end == str + len) + ret = jsstr_addref(jsstr); + else + ret = jsstr_alloc_len(begin, end - begin); + if(ret) + *r = jsval_string(ret); + else + hres = E_OUTOFMEMORY; + } + jsstr_release(jsstr); + return hres; +} + static HRESULT String_localeCompare(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1552,6 +1588,7 @@ static const builtin_prop_t String_props[] = { {toLowerCaseW, String_toLowerCase, PROPF_METHOD}, {toStringW, String_toString, PROPF_METHOD}, {toUpperCaseW, String_toUpperCase, PROPF_METHOD}, + {trimW, String_trim, PROPF_ES5|PROPF_METHOD}, {valueOfW, String_valueOf, PROPF_METHOD} }; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 12edb4b..663cce7 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -142,6 +142,8 @@ function test_javascript() { test_exposed("toISOString", Date.prototype, v >= 9); test_exposed("isArray", Array, v >= 9); test_exposed("indexOf", Array.prototype, v >= 9); + test_exposed("trim", String.prototype, v >= 9); + /* FIXME: IE8 implements weird semi-functional property descriptors. */ if(v != 8) { test_exposed("getOwnPropertyDescriptor", Object, v >= 8); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 62cf12a..e4b9557 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -427,6 +427,22 @@ function test_defineProperty() { next_test(); } +function test_string_trim() { + function test_trim(value, expected) { + var r = String.prototype.trim.call(value); + ok(r === expected, "trim(" + value + ") = " + r); + } + + test_trim("test", "test"); + test_trim(false, "false"); + test_trim("\n \t\rte st\t\t\n", "te st"); + test_trim({ toString: function() { return " test "; } }, "test"); + test_trim("", ""); + test_trim(" \t\n", ""); + + next_test(); +} + function test_global_properties() { var o; @@ -452,5 +468,6 @@ var tests = [ test_identifier_keywords, test_getOwnPropertyDescriptor, test_defineProperty, + test_string_trim, test_global_properties ];

1 0