February 2014 - Wine-commits

Alexandre Julliard : wrc: Ignore unknown -m target options.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: da066aeafc07ba0849a3048148c864592d0947b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da066aeafc07ba0849a304814… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:56:51 2014 +0100 wrc: Ignore unknown -m target options. --- tools/wrc/wrc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 8c376e0..577a6f4 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -457,7 +457,6 @@ int main(int argc,char *argv[]) if (!strcmp( optarg, "16" )) win32 = 0; else if (!strcmp( optarg, "32" )) { win32 = 1; pointer_size = 4; } else if (!strcmp( optarg, "64" )) { win32 = 1; pointer_size = 8; } - else error( "Invalid option: -m%s\n", optarg ); break; case 'f': if (*optarg != 'o') error("Unknown option: -f%s\n", optarg);

1 0

Alexandre Julliard : winebuild: Add support for -marm and -mthumb target flags.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 6c807b74721831c06ae6ce76f833c42cf15ab64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c807b74721831c06ae6ce76f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:57:27 2014 +0100 winebuild: Add support for -marm and -mthumb target flags. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 10 +++++++++- tools/winebuild/winebuild.man.in | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index fa92764..41cec91 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -362,5 +362,6 @@ extern struct strarray *cc_command; extern struct strarray *ld_command; extern struct strarray *nm_command; extern char *cpu_option; +extern int thumb_mode; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index a848a0c..807cf61 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -90,6 +90,12 @@ struct strarray *ld_command = NULL; struct strarray *nm_command = NULL; char *cpu_option = NULL; +#ifdef __thumb__ +int thumb_mode = 1; +#else +int thumb_mode = 0; +#endif + static int nb_res_files; static char **res_files; @@ -396,8 +402,10 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) if (!strcmp( optarg, "16" )) spec->type = SPEC_WIN16; else if (!strcmp( optarg, "32" )) force_pointer_size = 4; else if (!strcmp( optarg, "64" )) force_pointer_size = 8; + else if (!strcmp( optarg, "arm" )) thumb_mode = 0; + else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); - else fatal_error( "Invalid -m option '%s', expected -m16, -m32, -m64 or -mcpu\n", optarg ); + else fatal_error( "Unknown -m option '%s'\n", optarg ); break; case 'M': spec->main_module = xstrdup( optarg ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index b0b2784..df91cb8 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -156,6 +156,9 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP +.BI \-marm,\ \-mthumb,\ \-mcpu= option +Set code generation options for the assembler. +.TP .BI \-M,\ --main-module= module When building a 16-bit dll, set the name of its 32-bit counterpart to \fImodule\fR. This is used to enforce that the load order for the

1 0

Alexandre Julliard : winegcc: Forward -marm and -mthumb options to winebuild.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 4a4006d4f08ccf61f994fce66813d06713c6b879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4006d4f08ccf61f994fce66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:57:48 2014 +0100 winegcc: Forward -marm and -mthumb options to winebuild. --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fe0f033..8afe5af 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1503,6 +1503,11 @@ int main(int argc, char **argv) opts.force_pointer_size = 8; raw_linker_arg = 1; } + else if (!strcmp("-marm", argv[i] ) || !strcmp("-mthumb", argv[i] )) + { + strarray_add(opts.winebuild_args, argv[i]); + raw_linker_arg = 1; + } else if (strncmp("-mcpu=", argv[i], 6) == 0) strarray_add(opts.winebuild_args, argv[i]); break;

1 0

Alexandre Julliard : configure: Add the -marm option to the target flags.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 9ede7abdd40475bef9de09654d270b12c6263aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ede7abdd40475bef9de09654… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 12:58:54 2014 +0100 configure: Add the -marm option to the target flags. --- configure | 2 ++ configure.ac | 1 + 2 files changed, 3 insertions(+) diff --git a/configure b/configure index 2028569..937dbdf 100755 --- a/configure +++ b/configure @@ -4796,6 +4796,8 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$CFLAGS -marm" + TARGETFLAGS="-marm" + ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} diff --git a/configure.ac b/configure.ac index 8ff388c..a425490 100644 --- a/configure.ac +++ b/configure.ac @@ -172,6 +172,7 @@ case $host in [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])]) CFLAGS="$CFLAGS -marm" + AC_SUBST(TARGETFLAGS,"-marm") ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no}

1 0

Francois Gouget : shell32/tests: Skip any test that needs the .shlexec association if we could not create it.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 3e033bb130cfe18595895113a67b593839735fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e033bb130cfe18595895113a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 12:34:32 2014 +0100 shell32/tests: Skip any test that needs the .shlexec association if we could not create it. --- dlls/shell32/tests/shlexec.c | 69 ++++++++++++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 706ad34..10c341f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -57,6 +57,7 @@ static char** myARGV; static char tmpdir[MAX_PATH]; static char child_file[MAX_PATH]; static DLLVERSIONINFO dllver; +static BOOL skip_shlexec_tests = FALSE; static BOOL skip_noassoc_tests = FALSE; static HANDLE dde_ready_event; @@ -912,6 +913,12 @@ static void test_lpFile_parsed(void) char fileA[MAX_PATH]; INT_PTR rc; + if (skip_shlexec_tests) + { + skip("No filename parsing tests due to lack of .shlexec association\n"); + return; + } + /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); @@ -1392,6 +1399,12 @@ static void test_argify(void) const char* cmd; unsigned i, count; + if (skip_shlexec_tests) + { + skip("No argify tests due to lack of .shlexec association\n"); + return; + } + create_test_verb(".shlexec", "Params232S", 0, "Params232S %2 %3 \"%2\" \"%*\""); create_test_verb(".shlexec", "Params23456", 0, "Params23456 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\""); create_test_verb(".shlexec", "Params23456789", 0, "Params23456789 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" \"%7\" \"%8\" \"%9\""); @@ -1471,6 +1484,12 @@ static void test_filename(void) char* c; INT_PTR rc; + if (skip_shlexec_tests) + { + skip("No ShellExecute/filename tests due to lack of .shlexec association\n"); + return; + } + test=filename_tests; while (test->basename) { @@ -1692,6 +1711,12 @@ static void test_fileurls(void) char *s; INT_PTR rc; + if (skip_shlexec_tests) + { + skip("No file URL tests due to lack of .shlexec association\n"); + return; + } + rc = (INT_PTR)ShellExecuteA(NULL, NULL, "file:///nosuchfile.shlexec", NULL, NULL, SW_SHOWNORMAL); if (rc > 32) { @@ -1862,6 +1887,12 @@ static void test_find_executable(void) return; } + if (skip_shlexec_tests) + { + skip("No FindExecutable/filename tests due to lack of .shlexec association\n"); + return; + } + test=filename_tests; while (test->basename) { @@ -1935,23 +1966,28 @@ static void test_lnks(void) const filename_tests_t* test; INT_PTR rc; - /* Should open through our association */ - sprintf(filename, "%s\\test_shortcut_shlexec.lnk", tmpdir); - rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); - ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); - okChildInt("argcA", 5); - okChildString("argvA3", "Open"); - sprintf(params, "%s\\test file.shlexec", tmpdir); - get_long_path_name(params, filename, sizeof(filename)); - okChildPath("argvA4", filename); + if (skip_shlexec_tests) + skip("No FindExecutable/filename tests due to lack of .shlexec association\n"); + else + { + /* Should open through our association */ + sprintf(filename, "%s\\test_shortcut_shlexec.lnk", tmpdir); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 5); + okChildString("argvA3", "Open"); + sprintf(params, "%s\\test file.shlexec", tmpdir); + get_long_path_name(params, filename, sizeof(filename)); + okChildPath("argvA4", filename); - todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); - ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); - okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); - sprintf(params, "%s\\test file.shlexec", tmpdir); - get_long_path_name(params, filename, sizeof(filename)); - todo_wine okChildPath("argvA4", filename); + todo_wait rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_DOENVSUBST, NULL, "%TMPDIR%\\test_shortcut_shlexec.lnk", NULL, NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu err=%u\n", shell_call, rc, GetLastError()); + okChildInt("argcA", 5); + todo_wine okChildString("argvA3", "Open"); + sprintf(params, "%s\\test file.shlexec", tmpdir); + get_long_path_name(params, filename, sizeof(filename)); + todo_wine okChildPath("argvA4", filename); + } /* Should just run our executable */ sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); @@ -2564,6 +2600,7 @@ static void init_test(void) /* Create a basic association suitable for most tests */ if (!create_test_association(".shlexec")) { + skip_shlexec_tests = TRUE; skip("Unable to create association for '.shlexec'\n"); return; }

1 0

Jacek Caban : msxml3: Read stream data until Read fails or returns 0 bytes.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 76ce1f1679adc024c8e21f5dd4c137bf7fcc33ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ce1f1679adc024c8e21f5dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 12 13:30:56 2014 +0100 msxml3: Read stream data until Read fails or returns 0 bytes. --- dlls/msxml3/saxreader.c | 33 +++----- dlls/msxml3/tests/saxreader.c | 186 ++++++++++++++++++++++++++++++----------- 2 files changed, 149 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76ce1f1679adc024c8e21…

1 0

Piotr Caban : msvcrt: Return error on invalid handle in _open_osfhandle.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 6ad441cd6bac9015bb7d70b5b2f1192e4e86e735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad441cd6bac9015bb7d70b5b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 12 13:33:51 2014 +0100 msvcrt: Return error on invalid handle in _open_osfhandle. --- dlls/msvcrt/file.c | 20 +++++++++++++++++-- dlls/msvcrt/tests/file.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 80482e1..44629e2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2240,6 +2240,7 @@ int CDECL MSVCRT__wcreat(const MSVCRT_wchar_t *path, int flags) */ int CDECL MSVCRT__open_osfhandle(MSVCRT_intptr_t handle, int oflags) { + DWORD flags; int fd; /* MSVCRT__O_RDONLY (0) always matches, so set the read flag @@ -2251,8 +2252,23 @@ int CDECL MSVCRT__open_osfhandle(MSVCRT_intptr_t handle, int oflags) if (!(oflags & (MSVCRT__O_BINARY | MSVCRT__O_TEXT))) oflags |= MSVCRT__O_BINARY; - fd = msvcrt_alloc_fd((HANDLE)handle, split_oflags(oflags)); - TRACE(":handle (%ld) fd (%d) flags 0x%08x\n", handle, fd, oflags); + flags = GetFileType((HANDLE)handle); + if (flags==FILE_TYPE_UNKNOWN && GetLastError()!=NO_ERROR) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + + if (flags == FILE_TYPE_CHAR) + flags = WX_NOSEEK; + else if (flags == FILE_TYPE_PIPE) + flags = WX_PIPE; + else + flags = 0; + flags |= split_oflags(oflags); + + fd = msvcrt_alloc_fd((HANDLE)handle, flags); + TRACE(":handle (%ld) fd (%d) flags 0x%08x\n", handle, fd, flags); return fd; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 470ef60..f6a1624 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -35,6 +35,16 @@ #include <errno.h> #include <locale.h> +#define MSVCRT_FD_BLOCK_SIZE 32 +typedef struct { + HANDLE handle; + unsigned char wxflag; + char lookahead[3]; + int exflag; + CRITICAL_SECTION crit; +} ioinfo; +static ioinfo **__pioinfo; + static HANDLE proc_handles[2]; static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); @@ -60,6 +70,7 @@ static void init(void) p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); + __pioinfo = (void*)GetProcAddress(hmod, "__pioinfo"); } static void test_filbuf( void ) @@ -2171,6 +2182,43 @@ static void test_mktemp(void) ok(_mktemp(buf) != NULL, "_mktemp(\"**XXXXXX\") == NULL\n"); } +static void test__open_osfhandle(void) +{ + ioinfo *info; + HANDLE h, tmp; + int fd; + + errno = 0xdeadbeef; + fd = _open_osfhandle((intptr_t)INVALID_HANDLE_VALUE, 0); + ok(fd == -1, "_open_osfhandle returned %d\n", fd); + ok(errno == EBADF, "errno = %d\n", errno); + + h = CreateFileA("open_osfhandle.tst", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + fd = _open_osfhandle((intptr_t)h, 0); + ok(fd > 0, "_open_osfhandle returned %d (%d)\n", fd, errno); + info = &__pioinfo[fd/MSVCRT_FD_BLOCK_SIZE][fd%MSVCRT_FD_BLOCK_SIZE]; + ok(info->handle == h, "info->handle = %p, expected %p\n", info->handle, h); + ok(info->wxflag == 1, "info->wxflag = %x, expected 1\n", info->wxflag); + close(fd); + ok(info->handle == INVALID_HANDLE_VALUE, "info->handle = %p, expected INVALID_HANDLE_VALUE\n", info->handle); + ok(info->wxflag == 0, "info->wxflag = %x, expected 0\n", info->wxflag); + DeleteFileA("open_osfhandle.tst"); + + errno = 0xdeadbeef; + fd = _open_osfhandle((intptr_t)h, 0); + ok(fd == -1, "_open_osfhandle returned %d\n", fd); + ok(errno == EBADF, "errno = %d\n", errno); + + ok(CreatePipe(&h, &tmp, NULL, 0), "CreatePipe failed\n"); + fd = _open_osfhandle((intptr_t)h, 0); + ok(fd > 0, "_open_osfhandle returned %d (%d)\n", fd, errno); + info = &__pioinfo[fd/MSVCRT_FD_BLOCK_SIZE][fd%MSVCRT_FD_BLOCK_SIZE]; + ok(info->handle == h, "info->handle = %p, expected %p\n", info->handle, h); + ok(info->wxflag == 9, "info->wxflag = %x, expected 9\n", info->wxflag); + close(fd); + CloseHandle(tmp); +} + START_TEST(file) { int arg_c; @@ -2235,6 +2283,7 @@ START_TEST(file) test_pipes(arg_v[0]); test_stdin(); test_mktemp(); + test__open_osfhandle(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Francois Gouget : ddraw/tests: Skip the primary palette tests if the 640x480x8 mode is not supported.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 5e7724808c57a38c56b8bcb2c156035de3db0d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7724808c57a38c56b8bcb2c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 10:28:59 2014 +0100 ddraw/tests: Skip the primary palette tests if the 640x480x8 mode is not supported. --- dlls/ddraw/tests/ddraw1.c | 6 ++++++ dlls/ddraw/tests/ddraw2.c | 6 ++++++ dlls/ddraw/tests/ddraw4.c | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 8926a9c..7d97ec6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4078,6 +4078,12 @@ static void test_primary_palette(void) window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); hr = IDirectDraw_SetDisplayMode(ddraw, 640, 480, 8); + if (hr == E_NOTIMPL) + { + win_skip("8bpp display mode is not supported\n"); + DestroyWindow(window); + return; + } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bf409f2..ea9fc5c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5175,6 +5175,12 @@ static void test_primary_palette(void) window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); hr = IDirectDraw2_SetDisplayMode(ddraw, 640, 480, 8, 0, 0); + if (hr == E_NOTIMPL) + { + win_skip("8bpp display mode is not supported\n"); + DestroyWindow(window); + return; + } ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 04d5049..a189dcb 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5772,6 +5772,12 @@ static void test_primary_palette(void) 0, 0, 640, 480, 0, 0, 0, 0); hr = IDirectDraw4_SetDisplayMode(ddraw, 640, 480, 8, 0, 0); ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); + if (hr == E_NOTIMPL) + { + win_skip("8bpp display mode is not supported\n"); + DestroyWindow(window); + return; + } hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr);

1 0

Martin Storsjo : wined3d: Fix the YV12 illustration.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: fd2135194749b06ae5f684c95bd121274fbf7f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2135194749b06ae5f684c95… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Feb 11 12:14:57 2014 +0100 wined3d: Fix the YV12 illustration. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa0f609..797e349 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6932,11 +6932,11 @@ static BOOL gen_yv12_read(struct wined3d_shader_buffer *buffer, GLenum textype, * | | * +----------------+-----------------+---- * | | | - * | U even rows | U odd rows | + * | V even rows | V odd rows | * | | | 1 * +----------------+------------------ - * | | | 3 - * | V even rows | V odd rows | + * | U even rows | U odd rows | * | | | * +----------------+-----------------+---- * | | |

1 0

Michael Stefaniuc : qedit/tests: Expand the SampleGrabber COM tests.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: bb08b9f463e4436150a17aa532e7d277100a988e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb08b9f463e4436150a17aa53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 12 01:05:05 2014 +0100 qedit/tests: Expand the SampleGrabber COM tests. --- dlls/qedit/tests/mediadet.c | 56 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index c488b37..cc16b6b 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -27,6 +27,7 @@ #include "uuids.h" #include "wine/test.h" #include "qedit.h" +#include "control.h" #include "rc.h" /* Outer IUnknown for COM aggregation tests */ @@ -358,6 +359,10 @@ static void test_samplegrabber(void) { struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; ISampleGrabber *sg; + IBaseFilter *bf; + IMediaFilter *mf; + IPersist *persist; + IUnknown *unk; ULONG refcount; HRESULT hr; @@ -374,8 +379,57 @@ static void test_samplegrabber(void) ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); refcount = ISampleGrabber_Release(sg); ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); - IUnknown_Release(unk_obj.inner_unk); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&sg); + ok(hr == E_NOINTERFACE, "SampleGrabber create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all SampleGrabber interfaces */ + hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_ISampleGrabber, + (void**)&sg); + ok(hr == S_OK, "SampleGrabber create failed: %08x, expected S_OK\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IBaseFilter, (void**)&bf); + ok(hr == S_OK, "QueryInterface for IID_IBaseFilter failed: %08x\n", hr); + refcount = IBaseFilter_AddRef(bf); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IBaseFilter_Release(bf); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaFilter, (void**)&mf); + ok(hr == S_OK, "QueryInterface for IID_IMediaFilter failed: %08x\n", hr); + refcount = IMediaFilter_AddRef(mf); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IMediaFilter_Release(mf); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IPersist, (void**)&persist); + ok(hr == S_OK, "QueryInterface for IID_IPersist failed: %08x\n", hr); + refcount = IPersist_AddRef(persist); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IPersist_Release(persist); + + hr = ISampleGrabber_QueryInterface(sg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 7, "refcount == %u, expected 7\n", refcount); + refcount = IUnknown_Release(unk); + + /* Interfaces that native does not support */ + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaPosition, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaPosition failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaSeeking, (void**)&unk); + todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaSeeking failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IMemInputPin, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMemInputPin failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_IQualityControl, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IQualityControl failed: %08x\n", hr); + hr = ISampleGrabber_QueryInterface(sg, &IID_ISeekingPassThru, (void**)&unk); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_ISeekingPassThru failed: %08x\n", hr); + + while (ISampleGrabber_Release(sg)); } START_TEST(mediadet)

1 0