wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Austin English : configure: Give a warning for missing gnutls.
by Alexandre Julliard 13 Feb '14

13 Feb '14

Module: wine Branch: master Commit: 41f31686791041fe6eafa3173028ffb3d16959ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f31686791041fe6eafa3173… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 12 13:45:16 2014 -0800 configure: Give a warning for missing gnutls. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 937dbdf..bb68c51 100755 --- a/configure +++ b/configure @@ -11203,7 +11203,7 @@ test -z "$GNUTLS_LIBS" || GNUTLS_LIBS=`echo " $GNUTLS_LIBS" | sed 's/ -L$[^/]$ fi if test "x$ac_cv_lib_soname_gnutls" = "x"; then : case "x$with_gnutls" in - x) as_fn_append wine_notices "|libgnutls ${notice_platform}development files not found, no schannel support." ;; + x) as_fn_append wine_warnings "|libgnutls ${notice_platform}development files not found, no schannel support." ;; xno) ;; *) as_fn_error $? "libgnutls ${notice_platform}development files not found, no schannel support. This is an error since --with-gnutls was requested." "$LINENO" 5 ;; diff --git a/configure.ac b/configure.ac index a425490..32730f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1346,7 +1346,7 @@ then [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], [GNUTLS_CFLAGS=""])]) fi -WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], +WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], [libgnutls ${notice_platform}development files not found, no schannel support.]) dnl **** Check which curses lib to use ***

1 0

Andrey Gusev : Assorted typos fixes.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: add85f4687e2249c40090ea33ad07a914ec13721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add85f4687e2249c40090ea33… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 12 19:53:52 2014 +0200 Assorted typos fixes. --- dlls/dinput/tests/joystick.c | 4 ++-- dlls/dinput8/dinput8_main.c | 2 +- dlls/dinput8/tests/device.c | 4 ++-- dlls/dmsynth/synth.c | 2 +- dlls/dmusic/port.c | 2 +- dlls/dplayx/dplaysp.c | 2 +- dlls/dpnaddr/version.rc | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 231d019..e5bb4eb 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -550,7 +550,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); - ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not udated: %i\n", dip_gain_get.dwData); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); hr = IDirectInputDevice_Acquire(pJoystick); ok(hr==DI_OK,"IDirectInputDevice_Acquire() failed: %08x\n", hr); dip_gain_set.dwData = 2; @@ -558,7 +558,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(hr==DI_OK, "IDirectInputDevice_SetProperty() failed: %08x\n", hr); hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_get.diph); ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); - ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not udated: %i\n", dip_gain_get.dwData); + ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); /* Test range and internal clamping. */ dip_gain_set.dwData = -1; hr = IDirectInputDevice_SetProperty(pJoystick, DIPROP_FFGAIN, &dip_gain_set.diph); diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index 679e7fd..9824c76 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -58,7 +58,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, DWORD dwVer IDirectInputA *pDI; HRESULT hr, hrCo; - TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); + TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p)\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); if (!ppDI) return E_POINTER; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 53afdf3..c66c43c 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -401,7 +401,7 @@ static void test_save_settings(void) if (hr == DI_SETTINGSNOTSAVED) { - skip ("Cant test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); + skip ("Can't test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); return; } @@ -455,7 +455,7 @@ static void test_save_settings(void) if (hr == DI_SETTINGSNOTSAVED) { - skip ("Cant test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); + skip ("Can't test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n"); return; } diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 7a966a8..9850628 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -118,7 +118,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSY { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p->(%d): stub\n", This, groups); + FIXME("(%p)->(%d): stub\n", This, groups); return S_OK; } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 2e60828..9d42667 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -686,7 +686,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT hr = E_FAIL; int i; - TRACE("(%p,%p,%p,%p,%p%d)\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%p,%p,%p,%p,%p,%d)\n", guid, object, unkouter, port_params, port_caps, device); *object = NULL; diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 25cb7c4..43938e8 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -151,7 +151,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_EnumMRUEntries( IDirectPlaySP *iface, LP /* Should be able to call the comctl32 undocumented MRU routines. I suspect that the interface works appropriately */ - FIXME( "(%p)->(%p,%p,%p,%p,): stub\n", + FIXME( "(%p)->(%p,%p,%p,%p): stub\n", This, lpSection, lpKey, lpEnumMRUCallback, lpContext ); return DP_OK; diff --git a/dlls/dpnaddr/version.rc b/dlls/dpnaddr/version.rc index b66e785..5d30a48 100644 --- a/dlls/dpnaddr/version.rc +++ b/dlls/dpnaddr/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine DpnAddr dll" -#define WINE_FILENAME_STR "dpnadr.dll" +#define WINE_FILENAME_STR "dpnaddr.dll" #define WINE_FILEVERSION 5,3,2600,2180 #define WINE_FILEVERSION_STR "5.3.2600.2180" #define WINE_PRODUCTVERSION 5,3,2600,2180

1 0

Stefan Dösinger : wined3d: Reject height scaled repacked np2 textures.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 2728e7b8879868e6210ebd78d5fcffe0aaab11e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2728e7b8879868e6210ebd78d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 12 12:24:25 2014 +0100 wined3d: Reject height scaled repacked np2 textures. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a34807..371f3bc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -695,9 +695,9 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (pow2Width > surface->resource.width || pow2Height > surface->resource.height) { /* TODO: Add support for non power two compressed textures. */ - if (surface->resource.format->flags & WINED3DFMT_FLAG_COMPRESSED) + if (surface->resource.format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) { - FIXME("(%p) Compressed non-power-two textures are not supported w(%d) h(%d)\n", + FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n", surface, surface->resource.width, surface->resource.height); return WINED3DERR_NOTAVAILABLE; }

1 0

Stefan Dösinger : wined3d: Don' t use NP2 repacking for RECT textures.
by Alexandre Julliard 12 Feb '14

12 Feb '14

Module: wine Branch: master Commit: 65833790773138531f2eb46b7ed507f510bb4681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65833790773138531f2eb46b7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 12 12:24:24 2014 +0100 wined3d: Don't use NP2 repacking for RECT textures. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 628a4a5..8a34807 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -674,7 +674,8 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) surface->texture_target = GL_TEXTURE_2D; /* Non-power2 support */ - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + || gl_info->supported[ARB_TEXTURE_RECTANGLE]) { pow2Width = surface->resource.width; pow2Height = surface->resource.height;

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

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

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

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

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

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

← Newer
1
...
26
27
28
29
30
31
32
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014