March 2014 - Wine-commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Don't use "@pwd@\" when expecting a full path.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: e9eb86edfb50d83aa27453ef655f70a073306535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9eb86edfb50d83aa27453ef6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 11 00:16:28 2014 +0100 cmd/tests: Don't use "@pwd@\" when expecting a full path. --- programs/cmd/tests/test_builtins.cmd.exp | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 1575984..828a651 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -263,8 +263,8 @@ foo @path@ @path@ ~dp0 should be directory containing batch file -(a)pwd@\ -(a)pwd@\ +(a)drive@@path@ +(a)drive@@path@ CD value @pwd@@or_broken(a)CD value(a)space@ % P @@ -299,8 +299,8 @@ C C 'A B'@or_broken@'' 'C'@or_broken@'' -(a)pwd@\C D(a)or_broken@%~ff -(a)pwd@\E(a)or_broken@%~ff +(a)drive@@path(a)C D(a)or_broken@%~ff +(a)drive@@path(a)E@or_broken@%~ff @drive@ @drive@ @path@@or_broken@%~pd @@ -335,8 +335,8 @@ N C 'A B'@or_broken@'' 'C'@or_broken@'' -(a)pwd@\C D -(a)pwd@\E +(a)drive@@path(a)C D +(a)drive@@path(a)E @drive@ @drive@ @path@ @@ -392,22 +392,22 @@ foo5 foo6(a)space@ @todo_wine(a)------------ Testing cd ------------ singleFile -Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ -(a)pwd@\foobar +Current dir: @drive@@path(a)foobar@or_broken(a)Current dir:@space@ +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ @pwd@ @pwd@ -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak -(a)pwd@\foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak +(a)drive@@path(a)foobar\bar bak @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar ------------ Testing type ------------ @pwd@>type foobaz(a)space@ @@ -1090,31 +1090,31 @@ bar\baz removed --- pushing non-existing dir @pwd@ --- basic behaviour -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar\baz -(a)pwd@\foobar -(a)pwd@\foobar +(a)drive@@path(a)foobar\baz +(a)drive@@path(a)foobar +(a)drive@@path(a)foobar @pwd@ -(a)pwd@\foobar +(a)drive@@path(a)foobar @pwd@ ------------ Testing attrib ------------ -A @pwd@\foobar\foo(a)or_broken@A @pwd@\foobar\foo(a)or_broken@A I @pwd@\foobar\foo +A @drive@@path(a)foobar\foo(a)or_broken@A @drive@@path(a)foobar\foo(a)or_broken@A I @drive@@path(a)foobar\foo --- read-only attribute -A R @pwd@\foobar\foo(a)or_broken@A R @pwd@\foobar\foo(a)or_broken@A R I @pwd@\foobar\foo +A R @drive@@path(a)foobar\foo(a)or_broken@A R @drive@@path(a)foobar\foo(a)or_broken@A R I @drive@@path(a)foobar\foo foo foo original contents Read-only file not deleted Read-only file forcibly deleted --- recursive behaviour -A @pwd@\foobar\baz\level2(a)or_broken@A @pwd@\foobar\baz\level2(a)or_broken@A I @pwd@\foobar\baz\level2 -A R @pwd@\foobar\level1(a)or_broken@A R @pwd@\foobar\level1(a)or_broken@A R I @pwd@\foobar\level1 -A R @pwd@\foobar\baz\level2(a)or_broken@A R @pwd@\foobar\baz\level2(a)or_broken@A R I @pwd@\foobar\baz\level2 -A @pwd@\foobar\bar(a)or_broken@A @pwd@\foobar\bar(a)or_broken@A I @pwd@\foobar\bar +A @drive@@path(a)foobar\baz\level2(a)or_broken@A @drive@@path(a)foobar\baz\level2(a)or_broken@A I @drive@@path(a)foobar\baz\level2 +A R @drive@@path(a)foobar\level1(a)or_broken@A R @drive@@path(a)foobar\level1(a)or_broken@A R I @drive@@path(a)foobar\level1 +A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R @drive@@path(a)foobar\baz\level2(a)or_broken@A R I @drive@@path(a)foobar\baz\level2 +A @drive@@path(a)foobar\bar(a)or_broken@A @drive@@path(a)foobar\bar(a)or_broken@A I @drive@@path(a)foobar\bar --- folders processing - @pwd@\foobar(a)or_broken@ @pwd@\foobar(a)or_broken@ I @pwd@\foobar -(a)todo_wine@ R @pwd@\foobar\baz(a)or_broken@ R @pwd@\foobar\baz(a)or_broken@ @pwd@\foobar\baz(a)or_broken@ R I @pwd@\foobar\baz -A @pwd@\foobar\baz\toto(a)or_broken@A @pwd@\foobar\baz\toto(a)or_broken@A I @pwd@\foobar\baz\toto + @drive@@path(a)foobar@or_broken@ @drive@@path(a)foobar@or_broken@ I @drive@@path(a)foobar +(a)todo_wine@ R @drive@@path(a)foobar\baz(a)or_broken@ R @drive@@path(a)foobar\baz(a)or_broken@ @drive@@path(a)foobar\baz(a)or_broken@ R I @drive@@path(a)foobar\baz +A @drive@@path(a)foobar\baz\toto(a)or_broken@A @drive@@path(a)foobar\baz\toto(a)or_broken@A I @drive@@path(a)foobar\baz\toto toto lulu file created in read-only dir @@ -1251,17 +1251,17 @@ ErrLev: 0 --- setlocal with corresponding endlocal globalval localval -(a)pwd@\foobar\foobar2 +(a)drive@@path(a)foobar\foobar2 globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar --- setlocal with no corresponding endlocal globalval localval -(a)pwd@\foobar\foobar2 +(a)drive@@path(a)foobar\foobar2 globalval -(a)pwd@\foobar +(a)drive@@path(a)foobar --- setlocal within same batch program Var1 ok 1 Var2 ok 2 @@ -1279,23 +1279,23 @@ Directory is ok 3 --- Extra setlocal in called batch value2 2set1endvalue1 -(a)pwd@\foobar\foodir3 +(a)drive@@path(a)foobar\foodir3 Finished: value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value1 -(a)pwd@\foobar +(a)drive@@path(a)foobar --- Extra endlocal in called batch value2 value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 Finished: value2 -(a)pwd@\foobar\foodir2 +(a)drive@@path(a)foobar\foodir2 value1 -(a)pwd@\foobar +(a)drive@@path(a)foobar --- endlocal in called function rather than batch pgm is ineffective 2 2

1 0

Ken Thomases : winex11: Don' t leak client window and colormap when pixel format is changed.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: eef81f5ecc27cac8bc2bf4eacdc0934cb7e30c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef81f5ecc27cac8bc2bf4eac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 10 18:23:13 2014 -0500 winex11: Don't leak client window and colormap when pixel format is changed. --- dlls/winex11.drv/window.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4da361a..2ca5ec2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1378,6 +1378,13 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi int cx = min( max( 1, data->client_rect.right - data->client_rect.left ), 65535 ); int cy = min( max( 1, data->client_rect.bottom - data->client_rect.top ), 65535 ); + if (data->client_window) + { + XDeleteContext( data->display, data->client_window, winContext ); + XDestroyWindow( data->display, data->client_window ); + } + + if (data->colormap) XFreeColormap( data->display, data->colormap ); data->colormap = XCreateColormap( data->display, root_window, visual->visual, (visual->class == PseudoColor || visual->class == GrayScale ||

1 0

Ken Thomases : winemac: Make the window' s contentView its firstResponder again after changing its style.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 06f80d6542222df7c894695b703c2d74c125608d URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f80d6542222df7c894695b7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 10 18:23:17 2014 -0500 winemac: Make the window's contentView its firstResponder again after changing its style. --- dlls/winemac.drv/cocoa_window.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 54cb8db..7ead126 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -713,6 +713,12 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self setStyleMask:newStyle ^ NSClosableWindowMask]; } [self setStyleMask:newStyle]; + + // -setStyleMask: resets the firstResponder to the window. Set it + // back to the content view. + if ([[self contentView] acceptsFirstResponder]) + [self makeFirstResponder:[self contentView]]; + [self adjustFullScreenBehavior:[self collectionBehavior]]; if ([[self title] length] == 0 && [title length] > 0)

1 0

Nikolay Sivov : scrrun: Initialize find handle for file collection.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 1e46f605c5f4d40f6eeb3839a75be7c40c75016a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e46f605c5f4d40f6eeb3839a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 08:13:53 2014 +0400 scrrun: Initialize find handle for file collection. --- dlls/scrrun/filesystem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5daa5ce..a48b630 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1062,6 +1062,7 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; + This->data.u.filecoll.find = NULL; This->data.u.filecoll.coll = collection; IFileCollection_AddRef(&collection->IFileCollection_iface);

1 0

Alexandre Julliard : configure: Always run makedep on the top-level makefile.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 25084233d4d23d3bd66ac9f6f130a50ae8fb03e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25084233d4d23d3bd66ac9f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 11:23:35 2014 +0100 configure: Always run makedep on the top-level makefile. --- configure | 7 +++++-- configure.ac | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b82130e..b802bc2 100755 --- a/configure +++ b/configure @@ -4846,13 +4846,16 @@ else fi fi if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep wine_cv_toolsdir="\$(top_builddir)" elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep case "$wine_cv_toolsdir" in /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 else as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 fi @@ -16578,7 +16581,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c .MAKEFILEDEPS: all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status Make.tmp Makefile && \$(MAKEDEP) ." + @./config.status Make.tmp Makefile" test "$srcdir" = . && wine_fn_append_rule "all: .gitignore .gitignore: config.status @@ -18236,7 +18239,7 @@ wine_fn_output_makedep () } wine_fn_output_makefile () { - cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && "$wine_makedep" . && return `cat $wine_rules_file` _WINE_EOF as_fn_error $? "could not create Makefile" "$LINENO" 5 diff --git a/configure.ac b/configure.ac index ee8cd1a..a7b90ac 100644 --- a/configure.ac +++ b/configure.ac @@ -215,13 +215,16 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, fi fi if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep wine_cv_toolsdir="\$(top_builddir)" elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep case "$wine_cv_toolsdir" in /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) else AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi]) @@ -2593,7 +2596,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c .MAKEFILEDEPS: all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status Make.tmp Makefile && \$(MAKEDEP) .]) + @./config.status Make.tmp Makefile]) test "$srcdir" = . && WINE_APPEND_RULE( [all: .gitignore @@ -3461,7 +3464,7 @@ fi AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () { - cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && return + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && "$wine_makedep" . && return `cat $wine_rules_file` _WINE_EOF AS_ERROR([could not create Makefile])

1 0

Rico Schüller : d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 9809a3670c50723e9b5a63fbd05b1cf06408eb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9809a3670c50723e9b5a63fbd… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Mar 10 19:47:36 2014 +0100 d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported. --- dlls/d3dx9_36/tests/texture.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 631a658..aea09d5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -304,14 +304,14 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_R3G3B2))) expected = D3DFMT_R3G3B2; + else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4))) + expected = D3DFMT_X4R4G4B4; + else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X1R5G5B5))) + expected = D3DFMT_X1R5G5B5; else - { - if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, - mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4))) - expected = D3DFMT_X4R4G4B4; - else - expected = D3DFMT_X1R5G5B5; - } + expected = D3DFMT_R5G6B5; format = D3DFMT_R3G3B2; hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT);

1 0

Nikolay Sivov : wbemdisp: Specify default value for method arguments.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: a8a753b49a65fd3938cf1582066cfe15f1803d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a753b49a65fd3938cf15820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 16:07:29 2014 +0400 wbemdisp: Specify default value for method arguments. --- include/wbemdisp.idl | 430 +++++++++++++++++++++++++++++--------------------- 1 file changed, 254 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8a753b49a65fd3938cf1…

1 0

Hans Leidekker : shlwapi/tests: Fix test failures on Windows 8.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 3a72922e7f5427ea7ae2647fa32545aab9f6b32b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a72922e7f5427ea7ae2647fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 11 13:24:42 2014 +0100 shlwapi/tests: Fix test failures on Windows 8. --- dlls/shlwapi/tests/assoc.c | 50 +++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 389a9f5..cbc40ce 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -39,6 +39,8 @@ static const WCHAR invalid[] = { 'i','n','v','a','l','i','d',0 }; static void test_getstring_bad(void) { + static const WCHAR openwith[] = {'O','p','e','n','W','i','t','h','.','e','x','e',0}; + WCHAR buf[MAX_PATH]; HRESULT hr; DWORD len; @@ -48,47 +50,71 @@ static void test_getstring_bad(void) return; } + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, NULL, &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = sizeof(buf)/sizeof(buf[0]); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotBad, open, buf, &len); ok(hr == E_FAIL || - hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ + hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || + hr == S_OK /* Win8 */, "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, - &len); + if (hr == S_OK) + { + ok(len < sizeof(buf)/sizeof(buf[0]), "got %u\n", len); + ok(!lstrcmpiW(buf + len - sizeof(openwith)/sizeof(openwith[0]), openwith), "wrong data\n"); + } + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); + ok(len == 0xdeadbeef, "got %u\n", len); + hr = pAssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); + len = 0xdeadbeef; hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, NULL, open, NULL, &len); expect_hr(E_INVALIDARG, hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, badBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION), /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len); ok(hr == E_FAIL || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ || hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, - &len); + ok(len == 0xdeadbeef, "got %u\n", len); + + len = 0xdeadbeef; + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL, &len); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) || /* W2K/Vista/W2K8 */ hr == E_FAIL, /* Win9x/WinMe/NT4 */ "Unexpected result : %08x\n", hr); - hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, - NULL); + ok(len == 0xdeadbeef, "got %u\n", len); + + hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, open, NULL, NULL); ok(hr == E_UNEXPECTED || hr == E_INVALIDARG, /* Win9x/WinMe/NT4/W2K/Vista/W2K8 */ "Unexpected result : %08x\n", hr);

1 0

Nikolay Sivov : scrrun: Implement Skip() for drive collection.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: a30a2abbc40ce984c28d95b30b53a47c81c440a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30a2abbc40ce984c28d95b30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 00:20:48 2014 +0400 scrrun: Implement Skip() for drive collection. --- dlls/scrrun/filesystem.c | 18 ++++++++++------- dlls/scrrun/tests/filesystem.c | 42 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ccdb9ee..c052906 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1103,16 +1103,18 @@ static HRESULT WINAPI drivecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt { struct enumvariant *This = impl_from_IEnumVARIANT(iface); ULONG count = 0; - HRESULT hr; TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); if (fetched) *fetched = 0; + if (!celt) return S_OK; + while (find_next_drive(This) == S_OK) { IDrive *drive; + HRESULT hr; hr = create_drive('A' + This->data.u.drivecoll.cur, &drive); if (FAILED(hr)) return hr; @@ -1123,22 +1125,24 @@ static HRESULT WINAPI drivecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt if (++count >= celt) break; } - if (count < celt) - return S_FALSE; - if (fetched) *fetched = count; - return S_OK; + return (count < celt) ? S_FALSE : S_OK; } static HRESULT WINAPI drivecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); + TRACE("(%p)->(%d)\n", This, celt); - return E_NOTIMPL; + if (!celt) return S_OK; + + while (celt && find_next_drive(This) == S_OK) + celt--; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI drivecoll_enumvariant_Reset(IEnumVARIANT *iface) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index a09d54b..c14e846 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1142,6 +1142,47 @@ todo_wine IFileCollection_Release(files); } +static void test_DriveCollection(void) +{ + IDriveCollection *drives; + IEnumVARIANT *enumvar; + ULONG fetched; + VARIANT var; + HRESULT hr; + LONG count; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&enumvar); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDriveCollection_get_Count(drives, &count); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count > 0, "got %d\n", count); +} + V_VT(&var) = VT_EMPTY; + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 0, "got %d\n", fetched); + + hr = IEnumVARIANT_Skip(enumvar, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Skip(enumvar, count); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Skip(enumvar, 1); +todo_wine + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + IEnumVARIANT_Release(enumvar); + IDriveCollection_Release(drives); +} + START_TEST(filesystem) { HRESULT hr; @@ -1169,6 +1210,7 @@ START_TEST(filesystem) test_GetFolder(); test_FolderCollection(); test_FileCollection(); + test_DriveCollection(); IFileSystem3_Release(fs3);

1 0

Nikolay Sivov : scrrun: Implement Count() property for drive collection.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 863a761426fdf1e0f642c2a0f4256bd2c1aaa44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=863a761426fdf1e0f642c2a0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 11 00:21:03 2014 +0400 scrrun: Implement Count() property for drive collection. --- dlls/scrrun/filesystem.c | 16 +++++++++++++--- dlls/scrrun/tests/filesystem.c | 7 ++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c052906..5daa5ce 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -54,6 +54,7 @@ struct drivecollection { IDriveCollection IDriveCollection_iface; LONG ref; DWORD drives; + LONG count; }; struct enumdata { @@ -1675,8 +1676,13 @@ static HRESULT WINAPI drivecoll_get__NewEnum(IDriveCollection *iface, IUnknown * static HRESULT WINAPI drivecoll_get_Count(IDriveCollection *iface, LONG *count) { struct drivecollection *This = impl_from_IDriveCollection(iface); - FIXME("(%p)->(%p): stub\n", This, count); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_POINTER; + + *count = This->count; + return S_OK; } static const IDriveCollectionVtbl drivecollectionvtbl = { @@ -1695,6 +1701,7 @@ static const IDriveCollectionVtbl drivecollectionvtbl = { static HRESULT create_drivecoll(IDriveCollection **drives) { struct drivecollection *This; + DWORD mask; *drives = NULL; @@ -1703,7 +1710,10 @@ static HRESULT create_drivecoll(IDriveCollection **drives) This->IDriveCollection_iface.lpVtbl = &drivecollectionvtbl; This->ref = 1; - This->drives = GetLogicalDrives(); + This->drives = mask = GetLogicalDrives(); + /* count set bits */ + for (This->count = 0; mask; This->count++) + mask &= mask - 1; *drives = &This->IDriveCollection_iface; return S_OK; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c14e846..8502934 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1157,12 +1157,14 @@ static void test_DriveCollection(void) hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDriveCollection_get_Count(drives, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + count = 0; hr = IDriveCollection_get_Count(drives, &count); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(count > 0, "got %d\n", count); -} + V_VT(&var) = VT_EMPTY; fetched = -1; hr = IEnumVARIANT_Next(enumvar, 0, &var, &fetched); @@ -1176,7 +1178,6 @@ todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 1); -todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); IEnumVARIANT_Release(enumvar);

1 0