wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Jacek Caban : vbscript: Added Err.Number implementation.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 7baaea03213438de8bc089781f031c071eca34cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baaea03213438de8bc089781… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 14:38:11 2014 +0100 vbscript: Added Err.Number implementation. --- dlls/vbscript/global.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 7846bc0..c2b16e2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1886,8 +1886,17 @@ static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!This->desc) + return E_UNEXPECTED; + + if(args_cnt) { + FIXME("setter not implemented\n"); + return E_NOTIMPL; + } + + return return_int(res, This->desc->ctx->err_number); } static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)

1 0

Jacek Caban : vbscript: Added support for exception unwinding.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: fc0ef22a44dee4f78b8784ada501bb8f0fcb3dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0ef22a44dee4f78b8784ada… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 14:37:39 2014 +0100 vbscript: Added support for exception unwinding. --- dlls/vbscript/compile.c | 104 ++++++++++++++++++++++++++++++++++++++++++---- dlls/vbscript/interp.c | 65 +++++++++++++++++++++++++---- dlls/vbscript/vbscript.h | 3 ++ 3 files changed, 155 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc0ef22a44dee4f78b878…

1 0

Jacek Caban : vbscript: Moved Error object implementation to global.c.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: ce75124a741b709f7cf533b11600f5b03c1ca8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce75124a741b709f7cf533b11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 21 14:36:45 2014 +0100 vbscript: Moved Error object implementation to global.c. --- dlls/vbscript/Makefile.in | 1 - dlls/vbscript/error.c | 91 --------------------------------------------- dlls/vbscript/global.c | 62 +++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 93 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index dd0c6d7..5ad0600 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -3,7 +3,6 @@ IMPORTS = oleaut32 ole32 user32 C_SRCS = \ compile.c \ - error.c \ global.c \ interp.c \ lex.c \ diff --git a/dlls/vbscript/error.c b/dlls/vbscript/error.c deleted file mode 100644 index 9739ba7..0000000 --- a/dlls/vbscript/error.c +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2011 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "vbscript.h" -#include "vbscript_defs.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); - -static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static const builtin_prop_t err_props[] = { - {DISPID_ERR_DESCRIPTION, Err_Description, BP_GETPUT}, - {DISPID_ERR_HELPCONTEXT, Err_HelpContext, BP_GETPUT}, - {DISPID_ERR_HELPFILE, Err_HelpFile, BP_GETPUT}, - {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, - {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, - {DISPID_ERR_CLEAR, Err_Clear}, - {DISPID_ERR_RAISE, Err_Raise, 0, 5}, -}; - -HRESULT init_err(script_ctx_t *ctx) -{ - HRESULT hres; - - ctx->err_desc.ctx = ctx; - ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); - ctx->err_desc.builtin_props = err_props; - - hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); - if(FAILED(hres)) - return hres; - - return create_vbdisp(&ctx->err_desc, &ctx->err_obj); -} diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9d8f021..7846bc0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1866,6 +1866,58 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBMSGBOXRTLREADING, NULL, BP_GET, VT_I4, MB_RTLREADING} }; +static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpContext(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_HelpFile(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Source(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT Err_Raise(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t err_props[] = { + {DISPID_ERR_DESCRIPTION, Err_Description, BP_GETPUT}, + {DISPID_ERR_HELPCONTEXT, Err_HelpContext, BP_GETPUT}, + {DISPID_ERR_HELPFILE, Err_HelpFile, BP_GETPUT}, + {DISPID_ERR_NUMBER, Err_Number, BP_GETPUT}, + {DISPID_ERR_SOURCE, Err_Source, BP_GETPUT}, + {DISPID_ERR_CLEAR, Err_Clear}, + {DISPID_ERR_RAISE, Err_Raise, 0, 5}, +}; + HRESULT init_global(script_ctx_t *ctx) { HRESULT hres; @@ -1886,5 +1938,13 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; - return init_err(ctx); + ctx->err_desc.ctx = ctx; + ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); + ctx->err_desc.builtin_props = err_props; + + hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); + if(FAILED(hres)) + return hres; + + return create_vbdisp(&ctx->err_desc, &ctx->err_obj); }

1 0

Piotr Caban : msvcp110: Add _Xtime_get_ticks implementation.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 9183e5847d53994e78067e01fbf3d26d1e71033c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183e5847d53994e78067e01f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 21 14:27:47 2014 +0100 msvcp110: Add _Xtime_get_ticks implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp90/misc.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index b9d520d..3bdff79 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3891,7 +3891,7 @@ @ stub _Xp_subx @ stub _Xtime_diff_to_millis @ stub _Xtime_diff_to_millis2 -@ stub _Xtime_get_ticks +@ cdecl _Xtime_get_ticks() @ stub __Wcrtomb_lk # extern _Zero @ cdecl towctrans(long long) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 185d452..f2ae32f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -28,6 +28,12 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp); +#define SECSPERDAY 86400 +/* 1601 to 1970 is 369 years plus 89 leap days */ +#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +#define TICKSPERSEC 10000000 +#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) + struct __Container_proxy; typedef struct { @@ -343,3 +349,14 @@ void __thiscall _Container_base12__Swap_all( if(that->proxy) that->proxy->cont = that; } + +/* _Xtime_get_ticks */ +LONGLONG __cdecl _Xtime_get_ticks(void) +{ + FILETIME ft; + + TRACE("\n"); + + GetSystemTimeAsFileTime(&ft); + return ((LONGLONG)ft.dwHighDateTime<<32) + ft.dwLowDateTime - TICKS_1601_TO_1970; +}

1 0

Dmitry Timoshkov : ntdll/tests: Always wait until the operation completes if returned status is STATUS_PENDING.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: d5fd04f2f0e4224a0e23b78d9ae1773dab70a385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fd04f2f0e4224a0e23b78d9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 21 22:12:10 2014 +0900 ntdll/tests: Always wait until the operation completes if returned status is STATUS_PENDING. --- dlls/ntdll/tests/file.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 695f034..6406930 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2363,12 +2363,14 @@ static void test_read_write(void) offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + } ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); - ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); - off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); @@ -2501,6 +2503,8 @@ todo_wine status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); if (status == STATUS_PENDING) { + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(U(iob).Status == STATUS_END_OF_FILE, "expected STATUS_END_OF_FILE, got %#x\n", U(iob).Status); ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); } @@ -2520,6 +2524,8 @@ todo_wine status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, 0, &offset, NULL); if (status == STATUS_PENDING) { + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == 0, "expected 0, got %lu\n", iob.Information); } @@ -2574,31 +2580,33 @@ todo_wine offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + } ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); - ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); - - off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); - ok(off == 0, "expected 0, got %u\n", off); - U(iob).Status = -1; iob.Information = -1; offset.QuadPart = 0; status = pNtReadFile(hfile, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_PENDING || status == STATUS_SUCCESS, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); + } ok(U(iob).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", U(iob).Status); ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT); ok(off == 0, "expected 0, got %u\n", off); - ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n");

1 0

Zhenbo Li : mshtml: Added IHTMLTable::align property implementation.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 911adfbb2346831368b6f36d2e5e0d0f9ab3208d URL: http://source.winehq.org/git/wine.git/?a=commit;h=911adfbb2346831368b6f36d2… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Fri Mar 21 20:29:00 2014 +0800 mshtml: Added IHTMLTable::align property implementation. --- dlls/mshtml/htmltable.c | 27 +++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 13 +++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 64157e7..e3a1264 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -302,15 +302,34 @@ static HRESULT WINAPI HTMLTable_get_borderColorDark(IHTMLTable *iface, VARIANT * static HRESULT WINAPI HTMLTable_put_align(IHTMLTable *iface, BSTR v) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&val, v); + + nsres = nsIDOMHTMLTableElement_SetAlign(This->nstable, &val); + nsAString_Finish(&val); + if (NS_FAILED(nsres)){ + ERR("Set Align(%s) failed!\n", debugstr_w(v)); + return E_FAIL; + } + return S_OK; } static HRESULT WINAPI HTMLTable_get_align(IHTMLTable *iface, BSTR *p) { HTMLTable *This = impl_from_IHTMLTable(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString val; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&val, NULL); + nsres = nsIDOMHTMLTableElement_GetAlign(This->nstable, &val); + + return return_nsstr(nsres, &val, p); } static HRESULT WINAPI HTMLTable_refresh(IHTMLTable *iface) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2a96ad8..2cb0087 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5693,6 +5693,7 @@ static void test_table_elem(IHTMLElement *elem) IHTMLDOMNode *node; VARIANT v; HRESULT hres; + BSTR bstr; static const elem_type_t row_types[] = {ET_TR,ET_TR}; static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; @@ -5746,6 +5747,18 @@ static void test_table_elem(IHTMLElement *elem) test_table_cell_spacing(table, "11"); VariantClear(&v); + bstr = a2bstr("left"); + hres = IHTMLTable_put_align(table, bstr); + ok(hres == S_OK, "set_align failed: %08x\n", hres); + SysFreeString(bstr); + + bstr = NULL; + hres = IHTMLTable_get_align(table, &bstr); + ok(hres == S_OK, "get_align failed: %08x\n", hres); + ok(bstr != NULL, "get_align returned NULL\n"); + ok(!strcmp_wa(bstr, "left"), "get_align returned %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IHTMLTable_Release(table); }

1 0

Qian Hong : netapi32: Add stub for NetScheduleJobDel.
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 8c60161148aabab9655ff43f7739a54c1f3f88d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c60161148aabab9655ff43f7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Mar 21 18:06:42 2014 +0800 netapi32: Add stub for NetScheduleJobDel. --- dlls/netapi32/netapi32.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- include/lmat.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 6be912c..d2a61fa 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -1098,6 +1098,12 @@ NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD j return NERR_Success; } +NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD maxjobid) +{ + FIXME("stub (%s, %d, %d)\n", debugstr_w(server), minjobid, maxjobid); + return NERR_Success; +} + NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 8e0f3ea..9d5ac28 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -167,7 +167,7 @@ @ stub NetRplWkstaGetInfo @ stub NetRplWkstaSetInfo @ stdcall NetScheduleJobAdd(wstr ptr ptr) -@ stub NetScheduleJobDel +@ stdcall NetScheduleJobDel(wstr long long) @ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) @ stub NetScheduleJobGetInfo @ stub NetServerComputerNameAdd diff --git a/include/lmat.h b/include/lmat.h index fe8a9c0..da9691a 100644 --- a/include/lmat.h +++ b/include/lmat.h @@ -26,6 +26,7 @@ extern "C" { #endif NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR,LPBYTE,LPDWORD); +NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR,DWORD,DWORD); NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); #ifdef __cplusplus

1 0

Henri Verbeet : d3d9/tests: Use a separate device for texkill_test().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: b1758911829baf54865f5615c836ac426e10b0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1758911829baf54865f5615c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:18 2014 +0100 d3d9/tests: Use a separate device for texkill_test(). --- dlls/d3d9/tests/visual.c | 63 +++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3fff799..9d3d201 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4908,20 +4908,25 @@ static void texdepth_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); } -static void texkill_test(IDirect3DDevice9 *device) +static void texkill_test(void) { IDirect3DPixelShader9 *shader; - HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; - const float vertex[] = { - /* bottom top right left */ - -1.0, -1.0, 1.0, -0.1, 0.9, 0.9, -0.1, - 1.0, -1.0, 0.0, 0.9, -0.1, 0.9, -0.1, - -1.0, 1.0, 1.0, -0.1, 0.9, -0.1, 0.9, - 1.0, 1.0, 0.0, 0.9, -0.1, -0.1, 0.9, + static const float vertex[] = + { + /* bottom top right left */ + -1.0f, -1.0f, 1.0f, -0.1f, 0.9f, 0.9f, -0.1f, + -1.0f, 1.0f, 1.0f, -0.1f, 0.9f, -0.1f, 0.9f, + 1.0f, -1.0f, 0.0f, 0.9f, -0.1f, 0.9f, -0.1f, + 1.0f, 1.0f, 0.0f, 0.9f, -0.1f, -0.1f, 0.9f, }; - static const DWORD shader_code_11[] = { 0xffff0101, /* ps_1_1 */ @@ -4940,7 +4945,26 @@ static void texkill_test(IDirect3DDevice9 *device) 0x0000ffff /* end */ }; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_11, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); @@ -5003,10 +5027,11 @@ static void texkill_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffff00, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); - hr = IDirect3DDevice9_CreatePixelShader(device, shader_code_20, &shader); - if(FAILED(hr)) { - skip("Failed to create 2.0 test shader, most likely not supported\n"); - return; + if (FAILED(IDirect3DDevice9_CreatePixelShader(device, shader_code_20, &shader))) + { + skip("Failed to create 2.0 test shader, most likely not supported.\n"); + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetPixelShader(device, shader); @@ -5060,10 +5085,12 @@ static void texkill_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - /* Cleanup */ - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); IDirect3DPixelShader9_Release(shader); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void x8l8v8u8_test(void) @@ -16017,13 +16044,13 @@ START_TEST(visual) { texbem_test(device_ptr); texdepth_test(device_ptr); - texkill_test(device_ptr); } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + texkill_test(); x8l8v8u8_test(); volume_v16u16_test(); constant_clamp_ps_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for x8l8v8u8_test().
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: 3cc2d639bbc582b1710ef0beaae90153230d7b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc2d639bbc582b1710ef0bea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:17 2014 +0100 d3d9/tests: Use a separate device for x8l8v8u8_test(). --- dlls/d3d9/tests/visual.c | 75 ++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index da9b20d..3fff799 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5066,15 +5066,20 @@ static void texkill_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader); } -static void x8l8v8u8_test(IDirect3DDevice9 *device) +static void x8l8v8u8_test(void) { - IDirect3D9 *d3d9; - HRESULT hr; - IDirect3DTexture9 *texture; - IDirect3DPixelShader9 *shader; IDirect3DPixelShader9 *shader2; + IDirect3DPixelShader9 *shader; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; D3DLOCKED_RECT lr; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code[] = { 0xffff0101, /* ps_1_1 */ @@ -5089,29 +5094,46 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) 0x00000001, 0x800f0000, 0xb0ff0000, /* mov r0, t0.w */ 0x0000ffff /* end */ }; - - float quad[] = { - -1.0, -1.0, 0.1, 0.5, 0.5, - 1.0, -1.0, 0.1, 0.5, 0.5, - -1.0, 1.0, 0.1, 0.5, 0.5, - 1.0, 1.0, 0.1, 0.5, 0.5, + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, 0.5f, 0.5f, + -1.0f, 1.0f, 0.1f, 0.5f, 0.5f, + 1.0f, -1.0f, 0.1f, 0.5f, 0.5f, + 1.0f, 1.0f, 0.1f, 0.5f, 0.5f, }; - memset(&lr, 0, sizeof(lr)); - IDirect3DDevice9_GetDirect3D(device, &d3d9); - hr = IDirect3D9_CheckDeviceFormat(d3d9, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_TEXTURE, D3DFMT_X8L8V8U8); - IDirect3D9_Release(d3d9); - if(FAILED(hr)) { - skip("No D3DFMT_X8L8V8U8 support\n"); - return; - }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_X8L8V8U8))) + { + skip("No D3DFMT_X8L8V8U8 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 1, 1, 1, 0, D3DFMT_X8L8V8U8, D3DPOOL_MANAGED, &texture, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed (%08x)\n", hr); + memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture9_LockRect failed (%08x)\n", hr); *((DWORD *) lr.pBits) = 0x11ca3141; @@ -5163,13 +5185,14 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed (%08x)\n", hr); IDirect3DPixelShader9_Release(shader); IDirect3DPixelShader9_Release(shader2); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void autogen_mipmap_test(IDirect3DDevice9 *device) @@ -15995,13 +16018,13 @@ START_TEST(visual) texbem_test(device_ptr); texdepth_test(device_ptr); texkill_test(device_ptr); - x8l8v8u8_test(device_ptr); } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + x8l8v8u8_test(); volume_v16u16_test(); constant_clamp_ps_test(); cnd_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for volume_v16u16_test() .
by Alexandre Julliard 21 Mar '14

21 Mar '14

Module: wine Branch: master Commit: d1d40bfa555c3c7d355006929a0d335ec13d22d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d40bfa555c3c7d355006929… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 21 10:31:16 2014 +0100 d3d9/tests: Use a separate device for volume_v16u16_test(). --- dlls/d3d9/tests/visual.c | 59 +++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 9208981..da9b20d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15358,16 +15358,21 @@ done: DestroyWindow(window); } -static void volume_v16u16_test(IDirect3DDevice9 *device) +static void volume_v16u16_test(void) { - HRESULT hr; - IDirect3D9 *d3d9; IDirect3DVolumeTexture9 *texture; IDirect3DPixelShader9 *shader; + IDirect3DDevice9 *device; D3DLOCKED_BOX box; + IDirect3D9 *d3d; unsigned int i; - DWORD color; + ULONG refcount; + D3DCAPS9 caps; SHORT *texel; + DWORD color; + HWND window; + HRESULT hr; + static const struct { struct vec3 position; @@ -15376,13 +15381,13 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD shader_code[] = @@ -15395,15 +15400,30 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) 0x0000ffff /* end */ }; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); - IDirect3D9_Release(d3d9); - if (FAILED(hr)) + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No ps_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16))) { skip("Volume V16U16 textures are not supported, skipping test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); @@ -15466,7 +15486,7 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -15496,11 +15516,12 @@ static void volume_v16u16_test(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(texture); } - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); IDirect3DPixelShader9_Release(shader); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) @@ -15975,13 +15996,13 @@ START_TEST(visual) texdepth_test(device_ptr); texkill_test(device_ptr); x8l8v8u8_test(device_ptr); - volume_v16u16_test(device_ptr); } else skip("No ps_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + volume_v16u16_test(); constant_clamp_ps_test(); cnd_test(); dp2add_ps_test();

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
53
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 March 2014