July 2014 - Wine-Commits - list.winehq.org

Vincent Povirk : winex11: Leave fullscreen state alone when minimizing.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: 5e5a9d6f937c69b1546a922205ba8daa40ebb1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5a9d6f937c69b1546a92220… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 10 15:29:29 2014 -0500 winex11: Leave fullscreen state alone when minimizing. --- dlls/winex11.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 77cf304..06e2294 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -974,6 +974,8 @@ void update_net_wm_states( struct x11drv_win_data *data ) if (data->whole_window == root_window) return; style = GetWindowLongW( data->hwnd, GWL_STYLE ); + if (style & WS_MINIMIZE) + new_state |= data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN); if (is_window_rect_fullscreen( &data->whole_rect )) { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION)

1 0

Shuai Meng : vbscript: Implemented Sgn.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: 0b13d721c27c2ede6a0e15d7822b37f6ef57f84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b13d721c27c2ede6a0e15d78… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jul 11 11:47:45 2014 +0800 vbscript: Implemented Sgn. --- dlls/vbscript/global.c | 53 ++++++++++++++++++++------------------------- dlls/vbscript/tests/api.vbs | 31 ++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 56 insertions(+), 29 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa53757..fa06353 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -182,35 +182,15 @@ HRESULT to_int(VARIANT *v, int *ret) static HRESULT to_double(VARIANT *v, double *ret) { - switch(V_VT(v)) { - case VT_I2: - *ret = V_I2(v); - break; - case VT_I4: - *ret = V_I4(v); - break; - case VT_R4: - *ret = V_R4(v); - break; - case VT_R8: - *ret = V_R8(v); - break; - case VT_BSTR: { - VARIANT dst; - HRESULT hres; + VARIANT dst; + HRESULT hres; - V_VT(&dst) = VT_EMPTY; - hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_R8); - if(FAILED(hres)) - return hres; - *ret = V_R8(&dst); - break; - } - default: - FIXME("arg %s not supported\n", debugstr_variant(v)); - return E_NOTIMPL; - } + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, 0, VT_R8); + if(FAILED(hres)) + return hres; + *ret = V_R8(&dst); return S_OK; } @@ -1284,8 +1264,23 @@ static HRESULT Global_Int(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + double v; + short val; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_double(arg, &v); + if (FAILED(hres)) + return hres; + + val = v == 0 ? 0 : (v > 0 ? 1 : -1); + return return_short(res, val); } static HRESULT Global_Now(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index abdb6c7..33596d3 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -878,4 +878,35 @@ Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) +Call ok(Sgn(Empty) = 0, "Sgn(MyEmpty) = " & Sgn(Empty)) +Call ok(getVT(Sgn(Empty)) = "VT_I2", "getVT(Sgn(MyEmpty)) = " & getVT(Sgn(Empty))) +Call ok(Sgn(0) = 0, "Sgn(0) = " & Sgn(0)) +Call ok(getVT(Sgn(0)) = "VT_I2", "getVT(Sgn(0)) = " & getVT(Sgn(0))) +Call ok(Sgn(-32769) = -1, "Sgn(-32769) = " & Sgn(-32769)) +Call ok(getVT(Sgn(-32769)) = "VT_I2", "getVT(Sgn(-32769)) = " & getVT(Sgn(-32769))) +Call ok(Sgn(CSng(-0.5)) = -1, "Sgn(CSng(-0.5)) = " & Sgn(CSng(-0.5))) +Call ok(getVT(Sgn(CSng(-0.5))) = "VT_I2", "getVT(Sgn(CSng(-0.5))) = " & getVT(Sgn(CSng(-0.5)))) +Call ok(Sgn(0.5) = 1, "Sgn(0.5) = " & Sgn(0.5)) +Call ok(getVT(Sgn(0.5)) = "VT_I2", "getVT(Sgn(0.5)) = " & getVT(Sgn(0.5))) +Call ok(Sgn(CCur(-1)) = -1, "Sgn(CCur(-1)) = " & Sgn(CCur(-1))) +Call ok(getVT(Sgn(CCur(-1))) = "VT_I2", "getVT(Sgn(CCur(-1))) = " & getVT(Sgn(CCur(-1)))) +Call ok(Sgn(CStr(-1)) = -1, "Sgn(CStr(-1)) = " & Sgn(CStr(-1))) +Call ok(getVT(Sgn(CStr(-1))) = "VT_I2", "getVT(Sgn(CStr(-1))) = " & getVT(Sgn(CStr(-1)))) +Call ok(Sgn(False) = 0, "Sgn(False) = " & Sgn(False)) +Call ok(getVT(Sgn(False)) = "VT_I2", "getVT(Sgn(False)) = " & getVT(Sgn(False))) +Call ok(Sgn(True) = -1, "Sgn(True) = " & Sgn(True)) +Call ok(getVT(Sgn(True)) = "VT_I2", "getVT(Sgn(True)) = " & getVT(Sgn(True))) +Call ok(Sgn(CByte(1)) = 1, "Sgn(CByte(1)) = " & Sgn(CByte(1))) +Call ok(getVT(Sgn(CByte(1))) ="VT_I2", "getVT(Sgn(CByte(1))) = " & getVT(Sgn(CByte(1)))) + +Sub testSgnError(strings, error_num) + on error resume next + + Call Err.clear() + Call Sgn(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call testSgnError(Null, 94) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c2fedd6..ed9491c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -406,6 +406,7 @@ HRESULT map_hres(HRESULT) DECLSPEC_HIDDEN; #define VBSE_PERMISSION_DENIED 70 #define VBSE_PATH_FILE_ACCESS 75 #define VBSE_PATH_NOT_FOUND 76 +#define VBSE_ILLEGAL_NULL_USE 94 #define VBSE_OLE_NOT_SUPPORTED 430 #define VBSE_OLE_NO_PROP_OR_METHOD 438 #define VBSE_ACTION_NOT_SUPPORTED 445

1 0

Shuai Meng : vbscript: Implemented VarType.
by Alexandre Julliard July 11, 2014

July 11, 2014

Module: wine Branch: master Commit: 393f4bc5475f87150187d3c0f19db99db169feac URL: http://source.winehq.org/git/wine.git/?a=commit;h=393f4bc5475f87150187d3c0f… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Fri Jul 11 11:43:28 2014 +0800 vbscript: Implemented VarType. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5a12729..fa53757 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -602,8 +602,16 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(V_VT(arg) & ~VT_TYPEMASK) { + FIXME("not supported %s\n", debugstr_variant(arg)); + return E_NOTIMPL; + } + + return return_short(res, V_VT(arg)); } static HRESULT Global_IsDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index ded9b8b..abdb6c7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -857,4 +857,25 @@ Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) +Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) +Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty))) +Call ok(VarType(Null) = vbNull, "VarType(Null) = " & VarType(Null)) +Call ok(getVT(VarType(Null)) = "VT_I2", "getVT(VarType(Null)) = " & getVT(VarType(Null))) +Call ok(VarType(255) = vbInteger, "VarType(255) = " & VarType(255)) +Call ok(getVT(VarType(255)) = "VT_I2", "getVT(VarType(255)) = " & getVT(VarType(255))) +Call ok(VarType(32768) = vbLong, "VarType(32768) = " & VarType(32768)) +Call ok(getVT(VarType(32768)) = "VT_I2", "getVT(VarType(32768)) = " & getVT(VarType(32768))) +Call ok(VarType(CSng(0.5)) = vbSingle, "VarType(CSng(0.5)) = " & VarType(CSng(0.5))) +Call ok(getVT(VarType(CSng(0.5))) = "VT_I2", "getVT(VarType(CSng(0.5))) = " & getVT(VarType(CSng(0.5)))) +Call ok(VarType(-0.5) = vbDouble, "VarType(-0.5) = " & VarType(-0.5)) +Call ok(getVT(VarType(-0.5)) = "VT_I2", "getVT(VarType(-0.5)) = " & getVT(VarType(-0.5))) +Call ok(VarType(CCur(0.5)) = vbCurrency, "VarType(CCur(0.5)) = " & VarType(CCur(0.5))) +Call ok(getVT(VarType(CCur(0.5))) = "VT_I2", "getVT(VarType(CCur(0.5))) = " & getVT(VarType(CCur(0.5)))) +Call ok(VarType(CStr(0.5)) = vbString, "VarType(CStr(0.5)) = " & VarType(CStr(0.5))) +Call ok(getVT(VarType(CStr(0.5))) = "VT_I2", "getVT(VarType(CStr(0.5))) = " & getVT(VarType(CStr(0.5)))) +Call ok(VarType(CBool(0.5)) = vbBoolean, "VarType(CBool(0.5)) = " & VarType(CBool(0.5))) +Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & getVT(VarType(CBool(0.5)))) +Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) +Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) + Call reportSuccess()

1 0

Qian Hong : gdi32/tests: Improve font name localization tests by not requiring a strict language match.
by Alexandre Julliard July 10, 2014

July 10, 2014

Module: wine Branch: master Commit: 887a6832bb6e70c5813da7dd65cb89a7eb17ce64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=887a6832bb6e70c5813da7dd6… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Jul 10 12:59:13 2014 +0800 gdi32/tests: Improve font name localization tests by not requiring a strict language match. --- dlls/gdi32/tests/font.c | 251 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 218 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=887a6832bb6e70c5813da…

1 0

Gediminas Jakutis : d3dx9: Implement D3DXCreateTorus() + tests.
by Alexandre Julliard July 10, 2014

July 10, 2014

Module: wine Branch: master Commit: fe802d92bbe40d68e3ce61e1f30de1f0db531224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe802d92bbe40d68e3ce61e1f… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Jul 10 04:26:11 2014 +0300 d3dx9: Implement D3DXCreateTorus() + tests. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 107 +++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/mesh.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ include/d3dx9shape.h | 2 + 4 files changed, 270 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe802d92bbe40d68e3ce6…

1 0

Piotr Caban : msvcrt: Always set fd to -1 in _sopen_s on failure.
by Alexandre Julliard July 10, 2014

July 10, 2014

Module: wine Branch: master Commit: a5665693053b15a148407481c603a848fa183726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5665693053b15a148407481c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 10 15:12:12 2014 +0200 msvcrt: Always set fd to -1 in _sopen_s on failure. --- dlls/msvcrt/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8b12ae9..0e5deba 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2185,6 +2185,9 @@ int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, i MSVCRT_wchar_t *pathW; int ret; + if (!MSVCRT_CHECK_PMT(fd != NULL)) + return MSVCRT_EINVAL; + *fd = -1; if(!MSVCRT_CHECK_PMT(path && (pathW = msvcrt_wstrdupa(path)))) return MSVCRT_EINVAL;

1 0

Austin English : advapi32: Fix a memory leak in test_process_security.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 718f1bf1b9c63a5e42a9cf6217a76f130e2c5611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718f1bf1b9c63a5e42a9cf621… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 9 11:41:34 2014 -0700 advapi32: Fix a memory leak in test_process_security. --- dlls/advapi32/tests/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index b1dc3fe..b44496a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2665,6 +2665,7 @@ static void test_process_security(void) STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); winetest_wait_child_process( info.hProcess ); + FreeSid(EveryoneSid); CloseHandle( info.hProcess ); CloseHandle( info.hThread ); CloseHandle( event );

1 0

Stefan Dösinger : d3d9/tests: Fix some ok() call style issues.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 9329e996b4726187c3b3a5477ee58985e3c7b931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9329e996b4726187c3b3a5477… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:46 2014 +0200 d3d9/tests: Fix some ok() call style issues. --- dlls/d3d9/tests/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 14b68b3..f3771d9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7279,7 +7279,7 @@ static void test_volume_locking(void) } else { - ok (locked_box.pBits == NULL, "Failed lock set pBits = %p, expected NULL.\n", locked_box.pBits); + ok(locked_box.pBits == NULL, "Failed lock set pBits = %p, expected NULL.\n", locked_box.pBits); } IDirect3DVolumeTexture9_Release(texture); } @@ -8885,13 +8885,13 @@ static void test_writeonly_resource(void) hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, 0); ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); - ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + ok(!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, D3DLOCK_READONLY); ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); - ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + ok(!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); hr = IDirect3DVertexBuffer9_Unlock(buffer); ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr);

1 0

Stefan Dösinger : d3d9: Ignore SetPriority and GetPriority calls on surfaces.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: eb0daf08c69b8b3e0eeb74cb76e2521a53cf90dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0daf08c69b8b3e0eeb74cb7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 8 15:58:42 2014 +0200 d3d9: Ignore SetPriority and GetPriority calls on surfaces. --- dlls/d3d9/surface.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index bf8b41a..ef5f648 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -169,30 +169,14 @@ static HRESULT WINAPI d3d9_surface_FreePrivateData(IDirect3DSurface9 *iface, REF static DWORD WINAPI d3d9_surface_SetPriority(IDirect3DSurface9 *iface, DWORD priority) { - struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - DWORD ret; - - TRACE("iface %p, priority %u.\n", iface, priority); - - wined3d_mutex_lock(); - ret = wined3d_surface_set_priority(surface->wined3d_surface, priority); - wined3d_mutex_unlock(); - - return ret; + TRACE("iface %p, priority %u. Ignored on surfaces.\n", iface, priority); + return 0; } static DWORD WINAPI d3d9_surface_GetPriority(IDirect3DSurface9 *iface) { - struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - DWORD ret; - - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - ret = wined3d_surface_get_priority(surface->wined3d_surface); - wined3d_mutex_unlock(); - - return ret; + TRACE("iface %p. Ignored on surfaces.\n", iface); + return 0; } static void WINAPI d3d9_surface_PreLoad(IDirect3DSurface9 *iface)

1 0

Huw Davies : comctl32: Propagate the return value of WM_ERASEBKGND.
by Alexandre Julliard July 9, 2014

July 9, 2014

Module: wine Branch: master Commit: 552ad2d93e9a457855d6281c97bba213c885e66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=552ad2d93e9a457855d6281c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 9 08:46:57 2014 +0100 comctl32: Propagate the return value of WM_ERASEBKGND. --- dlls/comctl32/pager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 3b2c11c..74bca5e 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -985,16 +985,17 @@ PAGER_EraseBackground (const PAGER_INFO* infoPtr, HDC hdc) { POINT pt, ptorig; HWND parent; + LRESULT ret; pt.x = 0; pt.y = 0; parent = GetParent(infoPtr->hwndSelf); MapWindowPoints(infoPtr->hwndSelf, parent, &pt, 1); OffsetWindowOrgEx (hdc, pt.x, pt.y, &ptorig); - SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); + ret = SendMessageW (parent, WM_ERASEBKGND, (WPARAM)hdc, 0); SetWindowOrgEx (hdc, ptorig.x, ptorig.y, 0); - return 0; + return ret; }

1 0