January 2014 - Wine-Commits

Dmitry Timoshkov : taskschd/tests: Add more task folder tests.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 7341996f5d6ce20b8914dba79e2901aef900ac57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7341996f5d6ce20b8914dba79… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 16 18:02:25 2014 +0900 taskschd/tests: Add more task folder tests. --- dlls/taskschd/tests/scheduler.c | 83 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 152dd69..63b5730 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -118,19 +118,21 @@ todo_wine static void test_GetFolder(void) { static WCHAR dot[] = { '.',0 }; + static WCHAR empty[] = { 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 WCHAR Folder1_Folder2[] = { '\\','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; + ITaskFolder *folder, *subfolder, *subfolder2; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -162,6 +164,12 @@ todo_wine todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskService_GetFolder(service, empty, &folder); +todo_wine + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr == S_OK) + ITaskFolder_Release(folder); + hr = ITaskService_GetFolder(service, NULL, &folder); todo_wine ok(hr == S_OK, "GetFolder error %#x\n", hr); @@ -198,6 +206,9 @@ todo_wine 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 = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); @@ -266,8 +277,76 @@ todo_wine 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)); + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine, &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, Wine+1), "expected Wine, 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), "expected \\Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine+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, Wine+1), "expected Wine, 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+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolder_GetFolder(subfolder, empty, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder2, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder2); + + hr = ITaskFolder_GetFolder(subfolder, Folder1_Folder2, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder2, &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(subfolder2, &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(subfolder2); + + hr = ITaskFolder_GetFolder(subfolder, Folder1_Folder2+1, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + hr = ITaskFolder_get_Name(subfolder2, &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(subfolder2, &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(subfolder2); + ITaskFolder_Release(subfolder); hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0);

1 0

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

Jan. 16, 2014

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

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

Jan. 16, 2014

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

Michael Stefaniuc : dmcompos/tests: Add COM tests for IDirectMusicChordMap.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: ad52929b178981427ff56103fc6dc1a268102d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad52929b178981427ff56103f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:49:19 2014 +0100 dmcompos/tests: Add COM tests for IDirectMusicChordMap. --- dlls/dmcompos/tests/dmcompos.c | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 329d65e..6ff663a 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -75,6 +75,56 @@ static void test_COM(void) while (IDirectMusicComposer_Release(dmc)); } +static void test_COM_chordmap(void) +{ + IDirectMusicChordMap *dmcm = (IDirectMusicChordMap*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown*)&dmcm, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmcm); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicChordMap create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmcm, "dmcm = %p\n", dmcm); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmcm); + ok(hr == E_NOINTERFACE, + "DirectMusicChordMap create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicChordMap interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void**)&dmcm); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicChordMap_AddRef(dmcm); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicChordMap_Release(dmcm)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -86,6 +136,7 @@ START_TEST(dmcompos) return; } test_COM(); + test_COM_chordmap(); CoUninitialize(); }

1 0

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

Jan. 16, 2014

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

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

Jan. 16, 2014

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

Stefan Dösinger : wined3d: Add INDIB and INUSERMEM to resource_access_from_location.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 42927d0e9d60db7139eb55dde1ffa47092623637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42927d0e9d60db7139eb55dde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:08 2014 +0100 wined3d: Add INDIB and INUSERMEM to resource_access_from_location. --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d70f605..92750cb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4885,6 +4885,8 @@ static DWORD resource_access_from_location(DWORD location) switch (location) { case SFLAG_INSYSMEM: + case SFLAG_INUSERMEM: + case SFLAG_INDIB: return WINED3D_RESOURCE_ACCESS_CPU; case SFLAG_INDRAWABLE:

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 Jan. 15, 2014

Jan. 15, 2014

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

Michael Stefaniuc : dmstyle/tests: COM tests for DirectMusicSection.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

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

Stefan Dösinger : wined3d: Decide about PBO use at surface creation time.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 321cd8e825c4382cdb4b0c4b4371c7362b237eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=321cd8e825c4382cdb4b0c4b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:11 2014 +0100 wined3d: Decide about PBO use at surface creation time. --- dlls/wined3d/surface.c | 41 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d8de0f..ab7bbd6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -538,20 +538,6 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; } -static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - if (surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) - return FALSE; - if (!(surface->flags & SFLAG_DYNLOCK)) - return FALSE; - if (surface->flags & (SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) - return FALSE; - if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) - return FALSE; - - return TRUE; -} - static void surface_create_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_context *context; @@ -591,7 +577,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (!surface->pbo && surface_need_pbo(surface, gl_info)) + if (!surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); else if (!(surface->resource.heap_memory || surface->pbo)) { @@ -666,6 +652,17 @@ static void surface_release_client_storage(struct wined3d_surface *surface) surface_force_reload(surface); } +static BOOL surface_use_pbo(const struct wined3d_surface *surface) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + + return surface->resource.pool == WINED3D_POOL_DEFAULT + && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !surface->resource.format->convert + && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); +} + static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ @@ -753,6 +750,9 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->flags |= SFLAG_DISCARDED; + if (surface_use_pbo(surface)) + surface->flags |= SFLAG_PBO; + return WINED3D_OK; } @@ -2791,6 +2791,13 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->resource.size = resource_size; + /* The format might be changed to a format that needs conversion. + * If the surface didn't use PBOs previously but could now, don't + * change it - whatever made us not use PBOs might come back, e.g. + * color keys. */ + if (!surface_use_pbo(surface)) + surface->flags &= ~SFLAG_PBO; + if (create_dib) { if (FAILED(hr = surface_create_dib_section(surface))) @@ -5109,6 +5116,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { TRACE("Removing the pbo attached to surface %p.\n", surface); surface_remove_pbo(surface, gl_info); + surface->flags &= ~SFLAG_PBO; } surface_get_memory(surface, &data, surface->flags); @@ -5209,8 +5217,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { TRACE("Location already up to date.\n"); - if (location == SFLAG_INSYSMEM && !surface->pbo - && surface_need_pbo(surface, gl_info)) + if (location == SFLAG_INSYSMEM && !surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8bdc9c..9d4c39c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2305,6 +2305,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ #define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_PBO 0x00400000 /* Use a PBO for mapping. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0