December 2017 - Wine-Commits

Zebediah Figura : shell32: Implement the ReplaceItem() command for Progman DDE.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 57a94970f532cf457787895268b5b59628885314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a94970f532cf45778789526… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 20:52:49 2017 -0600 shell32: Implement the ReplaceItem() command for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 3 ++- dlls/shell32/tests/progman_dde.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 7505c2c..8ac6f9c 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -127,6 +127,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',0}; static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; static const WCHAR delete_itemW[] = {'D','e','l','e','t','e','I','t','e','m',0}; + static const WCHAR replace_itemW[] = {'R','e','p','l','a','c','e','I','t','e','m',0}; static const WCHAR dotexeW[] = {'.','e','x','e',0}; static const WCHAR dotlnkW[] = {'.','l','n','k',0}; @@ -255,7 +256,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (FAILED(hres)) return DDE_FNOTPROCESSED; } - else if (!strcmpiW(command, delete_itemW)) + else if (!strcmpiW(command, delete_itemW) || !strcmpiW(command, replace_itemW)) { WCHAR *name; BOOL ret; diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 478b3e6..dd9b777 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -325,6 +325,18 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/test1.lnk"), "link should not exist\n"); + error = dde_execute(instance, hConv, "[AddItem(notepad,test1)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/test1.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[ReplaceItem(test1)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1/test1.lnk"), "link should not exist\n"); + + error = dde_execute(instance, hConv, "[AddItem(regedit)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/regedit.lnk"), "link not created\n"); + /* test ShowGroup() and test which group an item gets added to */ error = dde_execute(instance, hConv, "[ShowGroup(Group1)]"); ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error);

1 0

Józef Kucia : d3d8/tests: Add test for clip planes limits.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 45ded87cf49d1438cb1b7ea591f457b79c07c01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ded87cf49d1438cb1b7ea59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:36 2017 +0100 d3d8/tests: Add test for clip planes limits. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 94b3e2e..915ab8b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -28,6 +28,8 @@ #include <d3d8.h> #include "wine/test.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + struct vec3 { float x, y, z; @@ -8401,6 +8403,91 @@ static void test_destroyed_window(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_clip_planes_limits(void) +{ + static const DWORD device_flags[] = {0, CREATE_DEVICE_SWVP_ONLY}; + IDirect3DDevice8 *device; + struct device_desc desc; + unsigned int i, j; + IDirect3D8 *d3d; + ULONG refcount; + float plane[4]; + D3DCAPS8 caps; + DWORD state; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + for (i = 0; i < ARRAY_SIZE(device_flags); ++i) + { + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = device_flags[i]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create D3D device, flags %#x.\n", desc.flags); + continue; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get caps, hr %#x.\n", hr); + + trace("Max user clip planes: %u.\n", caps.MaxUserClipPlanes); + + for (j = 0; j < caps.MaxUserClipPlanes; ++j) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice8_GetClipPlane(device, j, plane); + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + + plane[0] = 2.0f; + plane[1] = 8.0f; + plane[2] = 5.0f; + for (j = 0; j < caps.MaxUserClipPlanes; ++j) + { + plane[3] = j; + hr = IDirect3DDevice8_SetClipPlane(device, j, plane); + ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", j, hr); + } + for (j = 0; j < caps.MaxUserClipPlanes; ++j) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice8_GetClipPlane(device, j, plane); + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == j, + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0xffffffff, "Got unexpected state %#x.\n", state); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0x80000000); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0x80000000, "Got unexpected state %#x.\n", state); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8508,6 +8595,7 @@ START_TEST(device) test_render_target_device_mismatch(); test_format_unknown(); test_destroyed_window(); + test_clip_planes_limits(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : ddraw/tests: Add test for clip planes limits.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 462bbf4d20b7c80e5595e15e426f90b6e4cac4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=462bbf4d20b7c80e5595e15e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:37 2017 +0100 ddraw/tests: Add test for clip planes limits. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 00c7919..17abdf4 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13297,6 +13297,82 @@ static void test_compute_sphere_visibility(void) DestroyWindow(window); } +static void test_clip_planes_limits(void) +{ + IDirect3DDevice7 *device; + D3DDEVICEDESC7 caps; + unsigned int i; + ULONG refcount; + float plane[4]; + HWND window; + DWORD state; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice7_GetCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + trace("Max user clip planes: %u.\n", caps.wMaxUserClipPlanes); + + for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice7_GetClipPlane(device, i, plane); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + { + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", i, hr); + ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + i, plane[0], plane[1], plane[2], plane[3]); + } + } + + plane[0] = 2.0f; + plane[1] = 8.0f; + plane[2] = 5.0f; + for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + { + plane[3] = i; + hr = IDirect3DDevice7_SetClipPlane(device, i, plane); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", i, hr); + } + for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice7_GetClipPlane(device, i, plane); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", i, hr); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == i, + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + i, plane[0], plane[1], plane[2], plane[3]); + } + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0xffffffff, "Got unexpected state %#x.\n", state); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, 0x80000000); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0x80000000, "Got unexpected state %#x.\n", state); + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -13414,4 +13490,5 @@ START_TEST(ddraw7) test_ck_operation(); test_vb_refcount(); test_compute_sphere_visibility(); + test_clip_planes_limits(); }

1 0

Józef Kucia : d3d9/tests: Add test for clip planes limits.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: wine Branch: master Commit: 3e61833807f96b9fb1a8e9fc775af3bbabd93f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e61833807f96b9fb1a8e9fc7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:35 2017 +0100 d3d9/tests: Add test for clip planes limits. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 388cda1..bcdfd0e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11985,6 +11985,98 @@ todo_wine DestroyWindow(window); } +static void test_clip_planes_limits(void) +{ + static const DWORD device_flags[] = {0, CREATE_DEVICE_SWVP_ONLY}; + IDirect3DDevice9 *device; + struct device_desc desc; + unsigned int i, j; + IDirect3D9 *d3d; + ULONG refcount; + float plane[4]; + D3DCAPS9 caps; + DWORD state; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + for (i = 0; i < ARRAY_SIZE(device_flags); ++i) + { + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = device_flags[i]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create D3D device, flags %#x.\n", desc.flags); + continue; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get caps, hr %#x.\n", hr); + + trace("Max user clip planes: %u.\n", caps.MaxUserClipPlanes); + + for (j = 0; j < 2 * D3DMAXUSERCLIPPLANES; ++j) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice9_GetClipPlane(device, j, plane); + todo_wine_if(j >= caps.MaxUserClipPlanes) + { + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + } + + plane[0] = 2.0f; + plane[1] = 8.0f; + plane[2] = 5.0f; + for (j = 0; j < 2 * D3DMAXUSERCLIPPLANES; ++j) + { + plane[3] = j; + hr = IDirect3DDevice9_SetClipPlane(device, j, plane); + todo_wine_if(j >= caps.MaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", j, hr); + } + for (j = 0; j < 2 * D3DMAXUSERCLIPPLANES; ++j) + { + float expected_d = j >= caps.MaxUserClipPlanes - 1 ? 2 * D3DMAXUSERCLIPPLANES - 1 : j; + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice9_GetClipPlane(device, j, plane); + todo_wine_if(j >= caps.MaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + todo_wine_if(j >= caps.MaxUserClipPlanes - 1) + ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == expected_d, + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0xffffffff, "Got unexpected state %#x.\n", state); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0x80000000); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0x80000000, "Got unexpected state %#x.\n", state); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -12105,6 +12197,7 @@ START_TEST(device) test_format_unknown(); test_destroyed_window(); test_lockable_backbuffer(); + test_clip_planes_limits(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Francois Gouget : testbot: Don' t try to use the Message-Id if the email had none.
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: tools Branch: master Commit: e9c3cacc6b62b1290e4b94c0a4e8a40c22264177 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9c3cacc6b62b1290e4b94c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 4 18:27:30 2017 +0100 testbot: Don't try to use the Message-Id if the email had none. This can happen if one directly feeds the output of git format-patch to the TestBot through formail, which can be useful for testing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b5320dc..42118e6 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -101,9 +101,12 @@ sub FromSubmission($$) $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength())); my $MessageId = $Head->get("Message-Id"); - $MessageId =~ s/\s*\n\s*/ /gs; - $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); - $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + if ($MessageId) + { + $MessageId =~ s/\s*\n\s*/ /gs; + $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); + $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + } $self->Disposition("Processing"); }

1 0

Francois Gouget : testbot/Janitor: Import File::Path. It' s needed for rmtree().
by Alexandre Julliard Dec. 4, 2017

Dec. 4, 2017

Module: tools Branch: master Commit: 6fcc282a60ecdbef12b54c0d983178cdddb898eb URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fcc282a60ecdbef12b54c0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 4 18:27:42 2017 +0100 testbot/Janitor: Import File::Path. It's needed for rmtree(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index fd1b256..c07c21b 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN } } +use File::Path; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log;

1 0

Zebediah Figura : shell32: Implement the AddItem() command for Progman DDE.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: 6e5efd001c1f9a828122812184a1b979f5d9e657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5efd001c1f9a82812281218… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 10:08:12 2017 -0600 shell32: Implement the AddItem() command for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 81 +++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/progman_dde.c | 15 ++------ 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 36b5dfa..412c047 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -20,11 +20,14 @@ #include <stdarg.h> +#define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" #include "ddeml.h" #include "shellapi.h" +#include "shobjidl.h" +#include "shlwapi.h" #include "shell32_main.h" @@ -122,6 +125,13 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) static const WCHAR create_groupW[] = {'C','r','e','a','t','e','G','r','o','u','p',0}; static const WCHAR delete_groupW[] = {'D','e','l','e','t','e','G','r','o','u','p',0}; static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',0}; + static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; + + static const WCHAR dotexeW[] = {'.','e','x','e',0}; + static const WCHAR dotlnkW[] = {'.','l','n','k',0}; + static const WCHAR slashW[] = {'/',0}; + + static WCHAR *last_group; if (!strcmpiW(command, create_groupW)) { @@ -134,7 +144,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - HeapFree(GetProcessHeap(), 0, path); + if (last_group) HeapFree(GetProcessHeap(), 0, last_group); + last_group = path; } else if (!strcmpiW(command, delete_groupW)) { @@ -173,7 +184,75 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); + if (last_group) HeapFree(GetProcessHeap(), 0, last_group); + last_group = path; + } + else if (!strcmpiW(command, add_itemW)) + { + WCHAR *path, *name; + DWORD len; + IShellLinkW *link; + IPersistFile *file; + HRESULT hres; + + if (argc < 1) return DDE_FNOTPROCESSED; + + hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (void **)&link); + if (FAILED(hres)) return DDE_FNOTPROCESSED; + + len = SearchPathW(NULL, argv[0], dotexeW, 0, NULL, NULL); + if (len == 0) + { + IShellLinkW_Release(link); + return DDE_FNOTPROCESSED; + } + path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + SearchPathW(NULL, argv[0], dotexeW, len, path, NULL); + IShellLinkW_SetPath(link, path); HeapFree(GetProcessHeap(), 0, path); + + if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); + if (argc >= 4) IShellLinkW_SetIconLocation(link, argv[2], atoiW(argv[3])); + if (argc >= 7) IShellLinkW_SetWorkingDirectory(link, argv[6]); + if (argc >= 8) IShellLinkW_SetHotkey(link, atoiW(argv[7])); + if (argc >= 9) + { + if (atoiW(argv[8]) == 0) IShellLinkW_SetShowCmd(link, SW_SHOWMINNOACTIVE); + else if (atoiW(argv[8]) == 1) IShellLinkW_SetShowCmd(link, SW_SHOWNORMAL); + } + + hres = IShellLinkW_QueryInterface(link, &IID_IPersistFile, (void **)&file); + if (FAILED(hres)) + { + IShellLinkW_Release(link); + return DDE_FNOTPROCESSED; + } + if (argc >= 2) + { + name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + strlenW(argv[1]) + 5) * sizeof(*name)); + lstrcpyW(name, last_group); + lstrcatW(name, slashW); + lstrcatW(name, argv[1]); + lstrcatW(name, dotlnkW); + } + else + { + const WCHAR *filename = PathFindFileNameW(argv[0]); + int len = PathFindExtensionW(filename) - filename; + name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + len + 5) * sizeof(*name)); + lstrcpyW(name, last_group); + lstrcatW(name, slashW); + lstrcpynW(name+strlenW(name), filename, len + 1); + lstrcatW(name, dotlnkW); + } + hres = IPersistFile_Save(file, name, TRUE); + + HeapFree(GetProcessHeap(), 0, name); + IPersistFile_Release(file); + IShellLinkW_Release(link); + + if (FAILED(hres)) return DDE_FNOTPROCESSED; } else { diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index b54a72a..544df97 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -287,29 +287,24 @@ static void test_progman_dde(DWORD instance, HCONV hConv) sprintf(itemtext, "[AddItem(%s,f1g1Name)]", f1g1); error = dde_execute(instance, hConv, itemtext); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group1/f1g1Name.lnk"), "link not created\n"); - } sprintf(itemtext, "[AddItem(%s,f2g1Name)]", f2g1); error = dde_execute(instance, hConv, itemtext); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group1/f2g1Name.lnk"), "link not created\n"); - } error = dde_execute(instance, hConv, "[DeleteItem(f2g1Name)]"); - todo_wine + todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/f2g1Name.lnk"), "link should not exist\n"); + } sprintf(itemtext, "[AddItem(%s,f3g1Name)]", f3g1); error = dde_execute(instance, hConv, itemtext); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group1/f3g1Name.lnk"), "link not created\n"); - } error = dde_execute(instance, hConv, "[CreateGroup(Group2)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); @@ -327,9 +322,10 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); error = dde_execute(instance, hConv, "[DeleteItem(f3g1Name)]"); - todo_wine + todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/f3g1Name.lnk"), "link should not exist\n"); + } error = dde_execute(instance, hConv, "[ShowGroup(Startup, 0)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); @@ -347,14 +343,11 @@ static void test_progman_dde(DWORD instance, HCONV hConv) /* Compound Execute String Command */ sprintf(comptext, "[CreateGroup(Group3)][AddItem(%s,f1g3Name)][AddItem(%s,f2g3Name)]", f1g3, f2g3); error = dde_execute(instance, hConv, comptext); - todo_wine ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group3"), "directory not created\n"); ok(check_window_exists(Group3Title), "window not created\n"); - todo_wine { ok(check_exists("Group3/f1g3Name.lnk"), "link not created\n"); ok(check_exists("Group3/f2g3Name.lnk"), "link not created\n"); - } error = dde_execute(instance, hConv, "[DeleteGroup(Group3)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error);

1 0

Jacek Caban : mshtml: Fixed event target leak in dispatch_event.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: e150f96a3e2134d99e17417adae8982c4398d9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e150f96a3e2134d99e17417ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:48 2017 +0100 mshtml: Fixed event target leak in dispatch_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 01d9753..85f8fe7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1581,6 +1581,8 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) if(target_vtbl && target_vtbl->set_current_event) prev_event = target_vtbl->set_current_event(&event_target->dispex, event->event_obj); + if(event->target) + IDispatchEx_Release(&event->target->dispex.IDispatchEx_iface); event->target = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface);

1 0

Alexandre Julliard : ntdll: Move suspending a thread on startup into attach_dlls().
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: f64d2688d20952fb0085deeba98c952fd8bf1497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64d2688d20952fb0085deeba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 20:31:21 2017 +0100 ntdll: Move suspending a thread on startup into attach_dlls(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 8 +++++--- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 3 +-- dlls/ntdll/signal_arm64.c | 3 +-- dlls/ntdll/signal_i386.c | 3 +-- dlls/ntdll/signal_powerpc.c | 3 +-- dlls/ntdll/signal_x86_64.c | 3 +-- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c8c7f6a..170eefe 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2990,12 +2990,14 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -NTSTATUS attach_dlls( void *reserved ) +NTSTATUS attach_dlls( CONTEXT *context, BOOL suspend ) { NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; + if (suspend) wait_suspend( context ); + pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); if (process_detaching) return STATUS_SUCCESS; @@ -3029,7 +3031,7 @@ NTSTATUS attach_dlls( void *reserved ) debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); NtTerminateProcess( GetCurrentProcess(), status ); } - if ((status = process_attach( wm, reserved )) != STATUS_SUCCESS) + if ((status = process_attach( wm, context )) != STATUS_SUCCESS) { if (last_failed_modref) ERR( "%s failed to initialize, aborting\n", @@ -3038,7 +3040,7 @@ NTSTATUS attach_dlls( void *reserved ) debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer), status ); NtTerminateProcess( GetCurrentProcess(), status ); } - attach_implicitly_loaded_dlls( reserved ); + attach_implicitly_loaded_dlls( context ); virtual_release_address_space(); } else diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1393bbf..149462d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -105,7 +105,7 @@ extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS attach_dlls( void *unused ) DECLSPEC_HIDDEN; +extern NTSTATUS attach_dlls( CONTEXT *context, BOOL suspend ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e1aa94f..59ae765 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1230,8 +1230,7 @@ static void thread_startup( void *param ) context.Sp = (DWORD)NtCurrentTeb()->Tib.StackBase; context.Pc = (DWORD)call_thread_entry_point; - if (info->suspend) wait_suspend( &context ); - attach_dlls( &context ); + attach_dlls( &context, info->suspend ); set_cpu_context( &context ); } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 3dc92ad..36c7f2f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -973,8 +973,7 @@ static void thread_startup( void *param ) context.Sp = (DWORD_PTR)NtCurrentTeb()->Tib.StackBase; context.Pc = (DWORD_PTR)call_thread_entry_point; - if (info->suspend) wait_suspend( &context ); - attach_dlls( &context ); + attach_dlls( &context, info->suspend ); call_thread_entry_point( (LPTHREAD_START_ROUTINE)context.X0, (void *)context.X1 ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index f894816..1c04c82 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2984,8 +2984,7 @@ void DECLSPEC_HIDDEN call_process_func( LPTHREAD_START_ROUTINE entry, void *arg */ void DECLSPEC_HIDDEN thread_startup( CONTEXT *context, BOOL suspend ) { - if (suspend) wait_suspend( context ); - attach_dlls( context ); + attach_dlls( context, suspend ); virtual_clear_thread_stack(); set_cpu_context( context ); } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index b012497..5122c54 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1175,8 +1175,7 @@ static void thread_startup( void *param ) context.Gpr4 = (DWORD)info->arg; context.Iar = (DWORD)call_thread_entry_point; - if (info->suspend) wait_suspend( &context ); - attach_dlls( &context ); + attach_dlls( &context, info->suspend ); call_thread_entry_point( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3994569..af2682e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4145,8 +4145,7 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, */ void DECLSPEC_HIDDEN thread_startup( CONTEXT *context, BOOL suspend ) { - if (suspend) wait_suspend( context ); - attach_dlls( context ); + attach_dlls( context, suspend ); virtual_clear_thread_stack(); set_cpu_context( context ); }

1 0

Alexandre Julliard : ntdll: Run the entire thread initialization code on the thread stack on remaining platforms.
by Alexandre Julliard Dec. 1, 2017

Dec. 1, 2017

Module: wine Branch: master Commit: c3dd077d34232611c8b2ee38789114da45e71ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dd077d34232611c8b2ee387… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 19:24:21 2017 +0100 ntdll: Run the entire thread initialization code on the thread stack on remaining platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 117 ++++++++++++++++++++-------------------- dlls/ntdll/signal_arm64.c | 126 +++++++++++++++++++++----------------------- dlls/ntdll/signal_powerpc.c | 126 +++++++++++++++++++++----------------------- 4 files changed, 177 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3dd077d34232611c8b2e…

1 0