January 2014 - Wine-Commits

Henri Verbeet : d3d10/tests: Don't reuse the device.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 127e9bc46b502258f51f39e111d542c74c7f479b URL: http://source.winehq.org/git/wine.git/?a=commit;h=127e9bc46b502258f51f39e11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:23 2014 +0100 d3d10/tests: Don't reuse the device. --- dlls/d3d10/tests/effect.c | 163 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 130 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=127e9bc46b502258f51f3…

1 0

Henri Verbeet : d3d10/tests: Also try a WARP device in create_device().
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: ce49a4ae63c6a3f6f9ec790ca19037e54695de49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce49a4ae63c6a3f6f9ec790ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 28 10:09:22 2014 +0100 d3d10/tests: Also try a WARP device in create_device(). --- dlls/d3d10/tests/device.c | 5 ++--- dlls/d3d10/tests/effect.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 0d5e0b3..8df4150 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -27,12 +27,11 @@ static ID3D10Device *create_device(void) if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - - trace("Failed to create a HW device, trying REF\n"); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - trace("Failed to create a device, returning NULL\n"); return NULL; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a07bc6c..c75e59f 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -29,12 +29,11 @@ static ID3D10Device *create_device(void) if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - - trace("Failed to create a HW device, trying REF\n"); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) return device; - trace("Failed to create a device, returning NULL\n"); return NULL; }

1 0

Piotr Caban : msvcrt: Don' t close handles returned by GetStdHandle function.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 5e3cadf8342e2f008ca084188be94b4ab1f1f394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3cadf8342e2f008ca084188… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:47 2014 +0100 msvcrt: Don't close handles returned by GetStdHandle function. --- dlls/msvcrt/file.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a78076c..80482e1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1066,14 +1066,8 @@ void msvcrt_free_io(void) unsigned int i; int j; + MSVCRT__flushall(); MSVCRT__fcloseall(); - /* The Win32 _fcloseall() function explicitly doesn't close stdin, - * stdout, and stderr (unlike GNU), so we need to fclose() them here - * or they won't get flushed. - */ - MSVCRT_fclose(&MSVCRT__iob[0]); - MSVCRT_fclose(&MSVCRT__iob[1]); - MSVCRT_fclose(&MSVCRT__iob[2]); for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) MSVCRT_free(MSVCRT___pioinfo[i]);

1 0

Dmitry Timoshkov : taskschd: Implement IEnumVARIANT:: Clone for a folder collection.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: b5ed10c5ca1532c4bd4786e6973e9ddfc3330bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ed10c5ca1532c4bd4786e69… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:54:52 2014 +0900 taskschd: Implement IEnumVARIANT::Clone for a folder collection. --- dlls/taskschd/folder_collection.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index c8cc89b..1b8c39d 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -438,8 +438,11 @@ static HRESULT WINAPI enumvar_Reset(IEnumVARIANT *iface) static HRESULT WINAPI enumvar_Clone(IEnumVARIANT *iface, IEnumVARIANT **penum) { - FIXME("%p,%p: stub\n", iface, penum); - return E_NOTIMPL; + EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); + + TRACE("%p,%p\n", iface, penum); + + return NewEnum_create(enumvar->folders, (IUnknown **)penum); } static const struct IEnumVARIANTVtbl EnumVARIANT_vtbl =

1 0

Nikolay Sivov : dlls: Print HRESULT as 32bit value.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: acea0eea5d96bdf9f119fdea65b1a1295f1ac71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acea0eea5d96bdf9f119fdea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:46:35 2014 +0400 dlls: Print HRESULT as 32bit value. --- dlls/dispex/tests/marshal.c | 2 +- dlls/dplayx/dplayx_global.c | 2 +- dlls/oleaut32/tests/tmarshal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index 1b2ef61..0211cd7 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -31,7 +31,7 @@ #include "wine/test.h" -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define RELEASEMARSHALDATA WM_USER diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index d7f3cca..64c4bc3 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -1200,7 +1200,7 @@ LPCSTR DPLAYX_HresultToString(HRESULT hr) /* For errors not in the list, return HRESULT as a string This part is not thread safe */ WARN( "Unknown error 0x%08x\n", hr ); - wsprintfA( szTempStr, "0x%08lx", hr ); + wsprintfA( szTempStr, "0x%08x", hr ); return szTempStr; } } diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 1a3effe..5753871 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -32,7 +32,7 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); -#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", (unsigned long int)hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2)

1 0

Nikolay Sivov : oleaut32/tests: Use local IDispatch test impl instead of global variable.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: dd89dd1932172e0f22c0470169f0122ab75798e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd89dd1932172e0f22c047016… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:49:52 2014 +0400 oleaut32/tests: Use local IDispatch test impl instead of global variable. --- dlls/oleaut32/tests/vartype.c | 64 ++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index bc74e2e..035502a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -537,8 +537,6 @@ typedef struct BOOL bFailInvoke; } DummyDispatch; -static DummyDispatch dispatch; - static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) { return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); @@ -599,6 +597,8 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, EXCEPINFO *ei, UINT *arg_err) { + DummyDispatch *This = impl_from_IDispatch(iface); + CHECK_EXPECT(dispatch_invoke); ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); @@ -614,11 +614,11 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, ok(ei == NULL, "got %p\n", ei); ok(arg_err == NULL, "got %p\n", arg_err); - if (dispatch.bFailInvoke) + if (This->bFailInvoke) return E_OUTOFMEMORY; - V_VT(res) = dispatch.vt; - if (dispatch.vt == VT_UI1) + V_VT(res) = This->vt; + if (This->vt == VT_UI1) V_UI1(res) = 1; else memset(res, 0, sizeof(*res)); @@ -637,7 +637,13 @@ static const IDispatchVtbl DummyDispatch_VTable = DummyDispatch_Invoke }; -static DummyDispatch dispatch = { { &DummyDispatch_VTable }, 1, 0, 0 }; +static void init_test_dispatch(LONG ref, VARTYPE vt, DummyDispatch *dispatch) +{ + dispatch->IDispatch_iface.lpVtbl = &DummyDispatch_VTable; + dispatch->ref = ref; + dispatch->vt = vt; + dispatch->bFailInvoke = FALSE; +} /* * VT_I1/VT_UI1 @@ -1111,6 +1117,7 @@ static void test_VarUI1FromStr(void) static void test_VarUI1FromDisp(void) { + DummyDispatch dispatch; CONVVARS(LCID); VARIANTARG vSrc, vDst; @@ -1133,10 +1140,9 @@ static void test_VarUI1FromDisp(void) VariantInit(&vSrc); VariantInit(&vDst); + init_test_dispatch(1, VT_UI1, &dispatch); V_VT(&vSrc) = VT_DISPATCH; V_DISPATCH(&vSrc) = &dispatch.IDispatch_iface; - dispatch.vt = VT_UI1; - dispatch.bFailInvoke = FALSE; SET_EXPECT(dispatch_invoke); out = 10; @@ -5693,8 +5699,11 @@ static void test_IUnknownClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; /* Test that IUnknown_Release is called on by-value */ V_VT(&v) = VT_UNKNOWN; @@ -5718,8 +5727,11 @@ static void test_IUnknownCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; /* AddRef is called on by-value copy */ VariantInit(&vDst); @@ -5766,8 +5778,11 @@ static void test_IUnknownChangeTypeEx(void) VARIANTARG vSrc, vDst; LCID lcid; VARTYPE vt; - DummyDispatch u = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IUnknown* pu = (IUnknown*)&u.IDispatch_iface; + DummyDispatch u; + IUnknown* pu; + + init_test_dispatch(1, VT_UI1, &u); + pu = (IUnknown*)&u.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); @@ -5831,8 +5846,11 @@ static void test_IDispatchClear(void) { HRESULT hres; VARIANTARG v; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5856,8 +5874,11 @@ static void test_IDispatchCopy(void) { HRESULT hres; VARIANTARG vSrc, vDst; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; /* As per IUnknown */ @@ -5901,8 +5922,11 @@ static void test_IDispatchChangeTypeEx(void) HRESULT hres; VARIANTARG vSrc, vDst; LCID lcid; - DummyDispatch d = { { &DummyDispatch_VTable }, 1, VT_UI1, FALSE }; - IDispatch* pd = &d.IDispatch_iface; + DummyDispatch d; + IDispatch* pd; + + init_test_dispatch(1, VT_UI1, &d); + pd = &d.IDispatch_iface; lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT);

1 0

Nikolay Sivov : widl: Uuid attribute is allowed for 'struct'.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: cbf55d82519e8e69c2cf4581e4029204c6425e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf55d82519e8e69c2cf4581e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 09:49:25 2014 +0400 widl: Uuid attribute is allowed for 'struct'. --- dlls/oleaut32/tests/test_tlb.idl | 6 +++ dlls/oleaut32/tests/typelib.c | 84 +++++++++++++++++++++++++------------- include/objbase.h | 3 +- tools/widl/parser.y | 2 +- 4 files changed, 65 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbf55d82519e8e69c2cf4…

1 0

Piotr Caban : msvcrt: Support _IOSTRG flag in _filbuf function.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: e16059113cf717a0422c4ff6e0d0d64e5a60355b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16059113cf717a0422c4ff6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 10:08:17 2014 +0100 msvcrt: Support _IOSTRG flag in _filbuf function. --- dlls/msvcrt/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 04651fb..908ba26 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3280,6 +3280,11 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) unsigned char c; MSVCRT__lock_file(file); + if(file->_flag & MSVCRT__IOSTRG) { + MSVCRT__unlock_file(file); + return MSVCRT_EOF; + } + /* Allocate buffer if needed */ if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) msvcrt_alloc_buffer(file);

1 0

刘涛 : website: Simplified Chinese translation for wine 1.7.11 release
by Jeremy Newman Jan. 27, 2014

Jan. 27, 2014

Module: website Branch: master Commit: 190e3a9e4f8f0f237e15ec3e509f83626d07ae72 URL: http://source.winehq.org/git/website.git/?a=commit;h=190e3a9e4f8f0f237e15ec… Author: 刘涛 <wendaotao(a)163.com> Date: Mon Jan 27 15:49:09 2014 +0800 website: Simplified Chinese translation for wine 1.7.11 release --- news/zh-cn/2014011701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/zh-cn/2014011701.xml b/news/zh-cn/2014011701.xml new file mode 100644 index 0000000..7cf5912 --- /dev/null +++ b/news/zh-cn/2014011701.xml @@ -0,0 +1,17 @@ +<news> +<date>一月 17, 2014</date> +<title>Wine 1.7.11 发布</title> +<body> + Wine 开发版 1.7.11 现在可以使用了。 + 本次<a href="{$root}/announce/1.7.11">更新</a> : +<ul> + <li>在 RichEdit 控件中加入对 Uniscribe 的支持。</li> + <li>支持条件变量和 Slim 读写锁。</li> + <li>更多 Direct3D 指令流的准备工作。</li> + <li>在桌面模式中增加可选的开始菜单。</li> + <li>改进对竖排字体规格的支持。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

André Hentschel : shell32/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 9d1fdf1165e81116d7401a8dc4a65d78a053efd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d1fdf1165e81116d7401a8dc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 22 22:32:31 2014 +0100 shell32/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shell32/tests/string.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 1d55ecf..81f4754 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -87,13 +87,14 @@ static void test_StrRetToStringNW(void) "STRRET_OFFSET: dup failed, ret=%d\n", ret); /* The next test crashes on W2K, WinXP and W2K3, so we don't test. */ -#if 0 +if (0) +{ /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ strret.uType = STRRET_WSTR; U(strret).pOleStr = CoDupStrW("Test"); pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL); trace("NULL dest: ret=%d\n", ret); -#endif +} } START_TEST(string)

1 0