January 2014 - Wine-commits

Piotr Caban : msvcrt: Don't overwrite unmatched string in scanf.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 638c8e3847212f1d5399643c30fddcf7afc8c6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=638c8e3847212f1d5399643c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 16 11:39:44 2014 +0100 msvcrt: Don't overwrite unmatched string in scanf. --- dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 7f618f4..e85f343 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -478,7 +478,7 @@ _FUNCTION_ { if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; widecharstring: { /* read a word into a wchar_t* */ @@ -508,7 +508,7 @@ _FUNCTION_ { if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; /* 'c' and 'C work analogously to 's' and 'S' as described diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index b09e7df..97b8074 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -131,6 +131,13 @@ static void test_sscanf( void ) ok( ret == 1, "Error with format \"%s\"\n","%*[a-cd-dg-e]%c"); ok( buffer[0] == 'h', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); + buffer1[0] = 'b'; + ret = sscanf("a","%s%s", buffer, buffer1); + ok( ret == 1, "expected 1, got %u\n", ret); + ok( buffer[0] == 'a', "buffer[0] = '%c'\n", buffer[0]); + ok( buffer[1] == '\0', "buffer[1] = '%c'\n", buffer[1]); + ok( buffer1[0] == 'b', "buffer1[0] = '%c'\n", buffer1[0]); + /* check digits */ ret = sprintf(buffer,"%d:%d:%d",hour,min,sec); ok( ret == 8, "expected 8, got %u\n", ret);

1 0

Stefan Dösinger : wined3d: Sysmem can be freed when user memory is used.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: abb620ed2e89e5a9390b7860d604ec3f3e5a1e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb620ed2e89e5a9390b7860d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:14 2014 +0100 wined3d: Sysmem can be freed when user memory is used. --- dlls/wined3d/surface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3a0d327..586358a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -614,8 +614,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) - || surface->user_memory) + if (surface->resource.map_count || surface->flags & SFLAG_DONOTFREE) return; wined3d_resource_free_sysmem(&surface->resource);

1 0

Stefan Dösinger : wined3d: Remove resource-> allocatedMemory.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 10a8b2cd7f6b285abb4730f3f3d45fb50616871d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a8b2cd7f6b285abb4730f3f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:15 2014 +0100 wined3d: Remove resource->allocatedMemory. --- dlls/wined3d/buffer.c | 49 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/resource.c | 2 -- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 25 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10a8b2cd7f6b285abb473…

1 0

Stefan Dösinger : wined3d: Remove surface_init_sysmem.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 09dbba00d0042dfda38143aee7630f0fe2c31c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dbba00d0042dfda38143aee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:16 2014 +0100 wined3d: Remove surface_init_sysmem. --- dlls/wined3d/surface.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 586358a..ec9f586 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1295,24 +1295,6 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win surface_invalidate_location(surface, SFLAG_INBUFFER); } -static BOOL surface_init_sysmem(struct wined3d_surface *surface) -{ - if (surface->user_memory) - return TRUE; - - if (surface->resource.heap_memory) - { - memset(surface->resource.heap_memory, 0, surface->resource.size); - } - else if (!wined3d_resource_allocate_sysmem(&surface->resource)) - { - ERR("Failed to allocate system memory.\n"); - return FALSE; - } - - return TRUE; -} - static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1334,7 +1316,8 @@ static void surface_unload(struct wined3d_resource *resource) * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - surface_init_sysmem(surface); + surface_prepare_system_memory(surface); + memset(surface->resource.heap_memory, 0, surface->resource.size); surface_validate_location(surface, SFLAG_INSYSMEM); surface_invalidate_location(surface, ~SFLAG_INSYSMEM); @@ -2682,6 +2665,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); BOOL create_dib = FALSE; HRESULT hr; + DWORD valid_location = 0; TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); @@ -2734,7 +2718,10 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->user_memory = mem; if (surface->user_memory) + { surface->map_binding = SFLAG_INUSERMEM; + valid_location = SFLAG_INUSERMEM; + } surface->pitch = pitch; surface->resource.format = format; surface->resource.multisample_type = multisample_type; @@ -2758,14 +2745,17 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, ERR("Failed to create dib section, hr %#x.\n", hr); return hr; } + if (!valid_location) + valid_location = SFLAG_INDIB; } - if (!surface_init_sysmem(surface)) - return E_OUTOFMEMORY; - if (surface->map_binding == SFLAG_INBUFFER) - surface_validate_location(surface, SFLAG_INSYSMEM); - else - surface_validate_location(surface, surface->map_binding); + if (!valid_location) + { + surface_prepare_system_memory(surface); + valid_location = SFLAG_INSYSMEM; + } + + surface_validate_location(surface, valid_location); return WINED3D_OK; }

1 0

Ken Thomases : opengl32: Fix Perl compilation errors in make_opengl script.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 46c7acadd76053ab886924a6603c05d68829439b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c7acadd76053ab886924a66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:04 2014 -0600 opengl32: Fix Perl compilation errors in make_opengl script. --- dlls/opengl32/make_opengl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 569c294..fa6d514 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -609,7 +609,7 @@ sub parse_variable($) my $pnamebefore = ''; my $pnameafter = ''; - while (my ($k, $v) = each($p)){ + while (my ($k, $v) = each(%$p)){ if ($k eq 'ptype') { $ptype = ${$v}[0]; } elsif ($k eq 'name') { @@ -643,7 +643,7 @@ sub parse_file($$) my $ret = ''; my $params = []; my @alias = ''; - while (my ($k, $v) = each($command)){ + while (my ($k, $v) = each(%$command)){ if ($k eq 'param') { push(@$params, parse_variable($_)) for (@{$v}); } elsif ($k eq 'proto') { @@ -657,7 +657,7 @@ sub parse_file($$) if ($generate_enums) { for my $enum ( @{$data->{'enums'}} ) { if (ref($enum->{'enum'}) eq "HASH") { - while (my ($k, $v) = each($enum->{'enum'})){ + while (my ($k, $v) = each(%{$enum->{'enum'}})){ $enums{$k} = $v->{'value'}; } } @@ -665,7 +665,7 @@ sub parse_file($$) } # generate norm functions - while (my ($k, $v) = each($data->{feature})) { + while (my ($k, $v) = each(%{$data->{feature}})) { if ($norm_categories{$k}) { for my $req (@{$v->{require}}) { for(keys %{$req->{command}}) { @@ -676,7 +676,7 @@ sub parse_file($$) } # generate extension functions from norm functions, if they are newer than the category - while (my ($k, $v) = each($data->{feature})) { + while (my ($k, $v) = each(%{$data->{feature}})) { if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { @@ -690,7 +690,7 @@ sub parse_file($$) } # generate extension functions - while (my ($k, $v) = each(${$data->{extensions}}[0]->{extension})) { + while (my ($k, $v) = each(%{${$data->{extensions}}[0]->{extension}})) { if ($v->{supported} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { if (!defined $req->{api} || $req->{api} =~ /^gl(\||$)/) {

1 0

Ken Thomases : opengl32: Download OpenGL registry files even if server certificate can' t be verified.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: fbf2e243fe62fa1fb483b85f53a0789071fade37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf2e243fe62fa1fb483b85f5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:46:52 2014 -0600 opengl32: Download OpenGL registry files even if server certificate can't be verified. --- dlls/opengl32/make_opengl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fa6d514..b0b9c00 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -389,8 +389,8 @@ if ($version eq "1.0") { # # Fetch the registry files # --f "gl.xml" || system "wget https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml" || die "cannot download gl.xml"; --f "wgl.xml" || system "wget https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml" || die "cannot download wgl.xml"; +-f "gl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml" || die "cannot download gl.xml"; +-f "wgl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml" || die "cannot download wgl.xml"; #

1 0

Michael Stefaniuc : dmstyle: Use a better error for an unimplemented COM class.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 6dfae45b3a9e7eef68a4bc800816703a2c08017d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfae45b3a9e7eef68a4bc800… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:12:35 2014 +0100 dmstyle: Use a better error for an unimplemented COM class. --- dlls/dmstyle/dmstyle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 996fc9b..b76fa73 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -34,7 +34,7 @@ static HRESULT WINAPI create_direct_music_section(REFIID riid, void **ret_iface) { FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Michael Stefaniuc : dmstyle/tests: COM tests for DirectMusicSection.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 134697b69fb4945cb122077c305c3b6ce78832bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=134697b69fb4945cb122077c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:13:32 2014 +0100 dmstyle/tests: COM tests for DirectMusicSection. --- dlls/dmstyle/tests/dmstyle.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 18f2a6b..a1565c0 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -89,6 +89,53 @@ static void test_COM(void) while (IDirectMusicStyle8_Release(dms8)); } +static void test_COM_section(void) +{ + IDirectMusicObject *dmo = (IDirectMusicObject*)0xdeadbeef; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown*)&dmo, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmo); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmo, "dmo = %p\n", dmo); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dmo); + todo_wine ok(hr == E_NOINTERFACE, + "DirectMusicSection create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicObject interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + todo_wine ok(hr == S_OK, "DirectMusicSection create failed: %08x, expected S_OK\n", hr); + if (hr != S_OK) { + skip("DirectMusicSection not implemented\n"); + return; + } + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicObject_Release(dmo)); +} + static void test_COM_track(void) { IDirectMusicTrack8 *dmt8; @@ -168,6 +215,7 @@ START_TEST(dmstyle) return; } test_COM(); + test_COM_section(); test_COM_track(); CoUninitialize();

1 0

Dmitry Timoshkov : taskschd/tests: Use IP 0.0.0.0 as a bad server name and test that unsuccessful connection attempt shouldn 't trash an existing connection.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 3826fc844a5b5b1bbec1fd9cc3443b0053192c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3826fc844a5b5b1bbec1fd9cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 15 17:17:09 2014 +0900 taskschd/tests: Use IP 0.0.0.0 as a bad server name and test that unsuccessful connection attempt shouldn't trash an existing connection. --- dlls/taskschd/tests/scheduler.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 1953199..f631c52 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -30,13 +30,14 @@ static void test_Connect(void) { - static const WCHAR deadbeefW[] = { 'd','e','a','d','b','e','e','f',0 }; + static const WCHAR deadbeefW[] = { '0','.','0','.','0','.','0',0 }; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; HRESULT hr; BSTR bstr; VARIANT v_null, v_comp; VARIANT_BOOL vbool; + BOOL was_connected; ITaskService *service; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); @@ -73,17 +74,20 @@ static void test_Connect(void) hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); + was_connected = hr == S_OK; SysFreeString(V_BSTR(&v_comp)); V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); - ok(hr == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "expected ERROR_BAD_NETPATH, got %#x\n", hr); +todo_wine + ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR), "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); ok(hr == S_OK, "get_Connected error %#x\n", hr); - ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + ok(vbool == VARIANT_FALSE || (was_connected && vbool == VARIANT_TRUE), + "Connect shouldn't trash an existing connection, got %d (was connected %d)\n", vbool, was_connected); hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); ok(hr == S_OK, "Connect error %#x\n", hr); @@ -95,12 +99,12 @@ static void test_Connect(void) hr = ITaskService_get_TargetServer(service, &bstr); ok(hr == S_OK, "get_TargetServer error %#x\n", hr); - if (hr == S_OK) - { - ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); - SysFreeString(bstr); - } + ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + SysFreeString(V_BSTR(&v_comp)); + + ITaskService_Release(service); } START_TEST(scheduler)

1 0

Dmitry Timoshkov : taskschd/tests: Add some ITaskFolder tests.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 57d5b6fcdd868baa4634fb7d00b9969d07199908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d5b6fcdd868baa4634fb7d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 15 17:17:57 2014 +0900 taskschd/tests: Add some ITaskFolder tests. --- dlls/taskschd/tests/scheduler.c | 170 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f631c52..12c89b6 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -107,11 +107,181 @@ todo_wine ITaskService_Release(service); } +static void test_GetFolder(void) +{ + static WCHAR dot[] = { '.',0 }; + static WCHAR slash[] = { '/',0 }; + static WCHAR bslash[] = { '\\',0 }; + static WCHAR Wine[] = { '\\','W','i','n','e',0 }; + static WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; + static WCHAR Wine_Folder1_[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\',0 }; + static WCHAR Wine_Folder1_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\','F','o','l','d','e','r','2',0 }; + static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; + static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; + HRESULT hr; + BSTR bstr; + VARIANT v_null; + ITaskService *service; + ITaskFolder *folder, *subfolder; + + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_TaskScheduler) error %#x\n", hr); + return; + } + + V_VT(&v_null) = VT_NULL; + + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + + hr = ITaskService_GetFolder(service, slash, &folder); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, dot, &folder); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, bslash, &folder); +todo_wine + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr == S_OK) + ITaskFolder_Release(folder); + + hr = ITaskService_GetFolder(service, NULL, NULL); +todo_wine + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, NULL, &folder); +todo_wine + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr != S_OK) + { + ITaskService_Release(service); + return; + } + + hr = ITaskFolder_get_Name(folder, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskFolder_get_Name(folder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Path(folder, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskFolder_get_Path(folder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + /* Just in case something was left from previous runs */ + ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); + ITaskFolder_DeleteFolder(folder, Wine_Folder1, 0); + ITaskFolder_DeleteFolder(folder, Wine, 0); + + hr = ITaskFolder_CreateFolder(folder, slash, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + if (hr == S_OK) + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_CreateFolder(folder, Wine, v_null, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine+1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1+1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2+1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr != S_OK) + { + ITaskService_Release(service); + return; + } + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2), "expected \\Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2+1, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2+1), "expected Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine_Folder1, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1), "expected Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(folder, Wine+1, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, Wine, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + + ITaskFolder_Release(folder); + ITaskService_Release(service); +} + START_TEST(scheduler) { OleInitialize(NULL); test_Connect(); + test_GetFolder(); OleUninitialize(); }

1 0