April 2013 - Wine-commits - list.winehq.org

Stefan Dösinger : d3d9/tests: Test special fp values in local constants.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 6d06b7f5b8e83a3e6aea9d4b4d62397d4603d642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d06b7f5b8e83a3e6aea9d4b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 2 14:54:03 2013 +0200 d3d9/tests: Test special fp values in local constants. The HLSL compiler refuses to use NaN and +/-Inf values in pre-SM4 shaders, claiming that those are unsupported in this shader model. However, vsa.exe happilly generates them, the required strings in the shader code are 1.#QNAN and 1.#INF. Native d3d9 happily loads such a shader. --- dlls/d3d9/tests/visual.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8ad249d..88c776a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1,6 +1,6 @@ /* * Copyright 2005, 2007-2008 Henri Verbeet - * Copyright (C) 2007-2008 Stefan Dösinger(for CodeWeavers) + * Copyright (C) 2007-2013 Stefan Dösinger(for CodeWeavers) * Copyright (C) 2008 Jason Green(for TransGaming) * * This library is free software; you can redistribute it and/or @@ -12336,10 +12336,12 @@ static void clip_planes_test(IDirect3DDevice9 *device) static void fp_special_test(IDirect3DDevice9 *device) { + /* Microsoft's assembler generates nan and inf with "1.#QNAN" and "1.#INF." respectively */ static const DWORD vs_header[] = { 0xfffe0200, /* vs_2_0 */ 0x05000051, 0xa00f0000, 0x00000000, 0x3f000000, 0x3f800000, 0x40000000, /* def c0, 0.0, 0.5, 1.0, 2.0 */ + 0x05000051, 0xa00f0001, 0x7fc00000, 0xff800000, 0x7f800000, 0x00000000, /* def c1, nan, -inf, inf, 0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000005, 0x900f0001, /* dcl_texcoord0 v1 */ }; @@ -12354,6 +12356,9 @@ static void fp_special_test(IDirect3DDevice9 *device) static const DWORD vs_rsq2[] = {0x02000007, 0x80010000, 0x91000001}; /* rsq r0.x, -v1.x */ static const DWORD vs_lit[] = {0x02000010, 0x800f0000, 0x90000001, /* lit r0, v1.xxxx */ 0x02000001, 0x80010000, 0x80aa0000}; /* mov r0.x, v0.z */ + static const DWORD vs_def1[] = {0x02000001, 0x80010000, 0xa0000001}; /* mov r0.x, c1.x */ + static const DWORD vs_def2[] = {0x02000001, 0x80010000, 0xa0550001}; /* mov r0.x, c1.y */ + static const DWORD vs_def3[] = {0x02000001, 0x80010000, 0xa0aa0001}; /* mov r0.x, c1.z */ static const DWORD vs_footer[] = { @@ -12406,6 +12411,9 @@ static void fp_special_test(IDirect3DDevice9 *device) {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, + {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x00007f00, 0x00007f00}, + {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, + {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, }; static const DWORD ps_code[] =

1 0

Alexandre Julliard : cabarc: Avoid some redefinition warnings.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 24fe3127835e6f91820c19e0f167fb74971e2a43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fe3127835e6f91820c19e0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 14:41:24 2013 +0200 cabarc: Avoid some redefinition warnings. --- programs/cabarc/cabarc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index bef4bfc..02213f6 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); /* from msvcrt */ +#ifndef _O_RDONLY #define _O_RDONLY 0 #define _O_WRONLY 1 #define _O_RDWR 2 @@ -50,17 +51,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _O_SHORT_LIVED 0x1000 #define _O_TEXT 0x4000 #define _O_BINARY 0x8000 +#endif +#ifndef _SH_COMPAT #define _SH_COMPAT 0x00 #define _SH_DENYRW 0x10 #define _SH_DENYWR 0x20 #define _SH_DENYRD 0x30 #define _SH_DENYNO 0x40 +#endif +#ifndef _A_RDONLY #define _A_RDONLY 0x01 #define _A_HIDDEN 0x02 #define _A_SYSTEM 0x04 #define _A_ARCH 0x20 +#endif /* command-line options */ static int opt_cabinet_size = CB_MAX_DISK;

1 0

Alexandre Julliard : wineconsole: Fix a pointer cast warning.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3221338ca36df71065df5411cf6d1c8716e25ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3221338ca36df71065df5411c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 14:41:33 2013 +0200 wineconsole: Fix a pointer cast warning. --- programs/wineconsole/wineconsole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bda69a4..d298705 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -760,7 +760,7 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) if (strncmp(wci->ptr, "--use-event=", 12) == 0) { char* end; - wci->event = (HANDLE)strtol(wci->ptr + 12, &end, 10); + wci->event = ULongToHandle( strtoul(wci->ptr + 12, &end, 10) ); if (end == wci->ptr + 12) return IDS_CMD_INVALID_EVENT_ID; wci->mode = from_event; wci->ptr = end;

1 0

Piotr Caban : oleaut32: Fixed setting oVft value in ITypeInfo2::GetFuncDesc .
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: cd9bbd64e8030e1ec8a87f5105f52cfdbcdc1108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9bbd64e8030e1ec8a87f510… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 12:12:20 2013 +0200 oleaut32: Fixed setting oVft value in ITypeInfo2::GetFuncDesc. --- dlls/oleaut32/tests/typelib.c | 50 ++++++++++++++++++++++++++-------------- dlls/oleaut32/typelib2.c | 4 +-- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 077c59c..ca414867 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1722,8 +1722,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 12 || - broken(pfuncdesc->oVft == 24) /* xp64 */, + ok(pfuncdesc->oVft == 12 || broken(pfuncdesc->oVft == 24) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_BSTR, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1783,8 +1782,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 16 || - broken(pfuncdesc->oVft == 28) /* xp64 */, + ok(pfuncdesc->oVft == 16 || broken(pfuncdesc->oVft == 28) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1825,8 +1823,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 16 || - broken(pfuncdesc->oVft == 28), /* xp64 */ + ok(pfuncdesc->oVft == 16 || broken(pfuncdesc->oVft == 28), /* xp64 */ "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1857,8 +1854,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 28 || - broken(pfuncdesc->oVft == 40) /* xp64 */, + ok(pfuncdesc->oVft == 28 || broken(pfuncdesc->oVft == 40) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1890,8 +1886,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 28 || - broken(pfuncdesc->oVft == 40) /* xp64 */, + ok(pfuncdesc->oVft == 28 || broken(pfuncdesc->oVft == 40) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1927,8 +1922,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 24 || - broken(pfuncdesc->oVft == 36) /* xp64 */, + ok(pfuncdesc->oVft == 24 || broken(pfuncdesc->oVft == 36) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -1969,8 +1963,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 24 || - broken(pfuncdesc->oVft == 36) /* xp64 */, + ok(pfuncdesc->oVft == 24 || broken(pfuncdesc->oVft == 36) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -2021,8 +2014,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 24 || - broken(pfuncdesc->oVft == 36) /* xp64 */, + ok(pfuncdesc->oVft == 24 || broken(pfuncdesc->oVft == 36) /* xp64 */, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -2078,8 +2070,7 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine ok(pfuncdesc->oVft == 32 || - broken(pfuncdesc->oVft == 44), /* xp64 */ + ok(pfuncdesc->oVft == 32 || broken(pfuncdesc->oVft == 44), /* xp64 */ "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); @@ -2179,6 +2170,29 @@ static void test_CreateTypeLib(void) { funcdesc.oVft = 0xaaa8; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&ti2); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo2_GetFuncDesc(ti2, 0, &pfuncdesc); + ok(hres == S_OK, "got %08x\n", hres); + + ok(pfuncdesc->memid == 0x60020000, "got %x\n", pfuncdesc->memid); + ok(pfuncdesc->lprgscode == NULL, "got %p\n", pfuncdesc->lprgscode); + ok(pfuncdesc->lprgelemdescParam != NULL, "got %p\n", pfuncdesc->lprgelemdescParam); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got 0x%x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); + ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); + ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); + ok(pfuncdesc->oVft == (short)0xaaa8, "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); + ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); + ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); + + ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + ITypeInfo2_Release(ti2); + funcdesc.oVft = 0; ICreateTypeInfo_Release(createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 354ec8a..f3d742d 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3295,9 +3295,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncDesc( (*ppFuncDesc)->callconv = (typedata[4] >> 8) & 0xF; (*ppFuncDesc)->cParams = typedata[5]; (*ppFuncDesc)->cParamsOpt = 0; /* FIXME: Unimplemented*/ - (*ppFuncDesc)->oVft = typedata[3] & 0xFFFF; - if ((*ppFuncDesc)->oVft) - --(*ppFuncDesc)->oVft; + (*ppFuncDesc)->oVft = typedata[3] & 0xFFFC; (*ppFuncDesc)->cScodes = 0; /* FIXME: Unimplemented*/ hres = ctl2_decode_typedesc(This->typelib, typedata[1], &(*ppFuncDesc)->elemdescFunc.tdesc);

1 0

Piotr Caban : oleaut32: Add support for VARIANT arguments with default value in AddFuncDesc.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: fc456a3fea0f2d907490755e32b2c65d29908bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc456a3fea0f2d907490755e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 12:12:51 2013 +0200 oleaut32: Add support for VARIANT arguments with default value in AddFuncDesc. --- dlls/oleaut32/tests/typelib.c | 48 +++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib2.c | 12 +++++++++- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ca414867..33d1139 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2084,6 +2084,49 @@ static void test_CreateTypeLib(void) { ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + elemdesc[0].tdesc.vt = VT_VARIANT; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + V_VT(&paramdescex.varDefaultValue) = VT_INT; + V_INT(&paramdescex.varDefaultValue) = 3; + + funcdesc.lprgelemdescParam = elemdesc; + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 1; + funcdesc.elemdescFunc.tdesc.vt = VT_VARIANT; + + hres = ICreateTypeInfo_AddFuncDesc(createti, 6, &funcdesc); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo2_GetFuncDesc(ti2, 6, &pfuncdesc); + ok(hres == S_OK, "got %08x\n", hres); + + ok(pfuncdesc->memid == 0x60010006, "got %x\n", pfuncdesc->memid); + ok(pfuncdesc->lprgscode == NULL, "got %p\n", pfuncdesc->lprgscode); + ok(pfuncdesc->lprgelemdescParam != NULL, "got %p\n", pfuncdesc->lprgelemdescParam); + ok(pfuncdesc->funckind == FUNC_PUREVIRTUAL, "got 0x%x\n", pfuncdesc->funckind); + ok(pfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", pfuncdesc->invkind); + ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); + ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); + ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); + ok(pfuncdesc->oVft == 36 || broken(pfuncdesc->oVft == 48), /* xp64 */ + "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); + ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VARIANT, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); + ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); + + edesc = pfuncdesc->lprgelemdescParam; + ok(U(*edesc).paramdesc.pparamdescex != NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex); + ok(U(*edesc).paramdesc.wParamFlags == PARAMFLAG_FHASDEFAULT, + "got: 0x%x\n", U(*edesc).paramdesc.wParamFlags); + ok(edesc->tdesc.vt == VT_VARIANT, "got: %d\n", edesc->tdesc.vt); + ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_INT, "got: %d\n", + V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); + ok(V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == 3, "got: %d\n", + V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); + + ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); + hres = ITypeInfo_GetDocumentation(interface1, 0, &name, &docstring, &helpcontext, &helpfile); ok(hres == S_OK, "got %08x\n", hres); ok(name == NULL, "name != NULL\n"); @@ -2164,6 +2207,7 @@ static void test_CreateTypeLib(void) { hres = ITypeInfo_GetImplTypeFlags(interface2, 1, &impltypeflags); ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + funcdesc.elemdescFunc.tdesc.vt = VT_VOID; funcdesc.oVft = 0xaaac; hres = ICreateTypeInfo_AddFuncDesc(createti, 0, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); @@ -2416,10 +2460,10 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); - ok(typeattr->cFuncs == 12, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cFuncs == 13, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); - ok(typeattr->cbSizeVft == 60 || broken(typeattr->cbSizeVft == 3 * sizeof(void *) + 48), /* xp64 */ + ok(typeattr->cbSizeVft == 64 || broken(typeattr->cbSizeVft == 3 * sizeof(void *) + 52), /* xp64 */ "cbSizeVft = %d\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); ok(typeattr->wTypeFlags == 0, "wTypeFlags = %d\n", typeattr->wTypeFlags); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index f3d742d..7d5b1c8 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -886,7 +886,9 @@ static HRESULT ctl2_encode_variant( arg_type = VT_UI4; v = *value; - if(V_VT(value) != arg_type) { + if(arg_type == VT_VARIANT) { + arg_type = V_VT(value); + }else if(V_VT(value) != arg_type) { hres = VariantChangeType(&v, value, 0, arg_type); if(FAILED(hres)) return hres; @@ -894,6 +896,8 @@ static HRESULT ctl2_encode_variant( /* Check if default value can be stored in encoded_value */ switch(arg_type) { + case VT_INT: + case VT_UINT: case VT_I4: case VT_UI4: mask = 0x3ffffff; @@ -1223,6 +1227,12 @@ static int ctl2_encode_typedesc( *alignment = 4; /* guess? */ break; + case VT_VARIANT: + *encoded_tdesc = default_tdesc; + *width = sizeof(VT_VARIANT); + *alignment = 4; + break; + case VT_VOID: *encoded_tdesc = 0x80000000 | (VT_EMPTY << 16) | tdesc->vt; *width = 0;

1 0

Piotr Caban : oleaut32: Add support of VT_USERDEFINED arguments with default value in AddFuncDesc.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3f7c07f5608f54cc043a04a8a9b3ff813dfe2ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7c07f5608f54cc043a04a8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 12:13:13 2013 +0200 oleaut32: Add support of VT_USERDEFINED arguments with default value in AddFuncDesc. --- dlls/oleaut32/tests/typelib.c | 15 +++++++++++---- dlls/oleaut32/typelib2.c | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 33d1139..a20b3bf 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2048,8 +2048,10 @@ static void test_CreateTypeLib(void) { elemdesc[0].tdesc.vt = VT_USERDEFINED; U(elemdesc[0].tdesc).hreftype = hreftype; - U(elemdesc[0]).paramdesc.pparamdescex = NULL; - U(elemdesc[0]).paramdesc.wParamFlags = 0; + U(elemdesc[0]).paramdesc.pparamdescex = &paramdescex; + U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT; + V_VT(&paramdescex.varDefaultValue) = VT_INT; + V_INT(&paramdescex.varDefaultValue) = 0x789; funcdesc.lprgelemdescParam = elemdesc; funcdesc.invkind = INVOKE_FUNC; @@ -2077,10 +2079,15 @@ static void test_CreateTypeLib(void) { ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); edesc = pfuncdesc->lprgelemdescParam; - ok(U(*edesc).paramdesc.pparamdescex == NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex); - ok(U(*edesc).paramdesc.wParamFlags == 0, "got: 0x%x\n", U(*edesc).paramdesc.wParamFlags); + ok(U(*edesc).paramdesc.pparamdescex != NULL, "got: %p\n", U(*edesc).paramdesc.pparamdescex); + ok(U(*edesc).paramdesc.wParamFlags == PARAMFLAG_FHASDEFAULT, + "got: 0x%x\n", U(*edesc).paramdesc.wParamFlags); ok(edesc->tdesc.vt == VT_USERDEFINED, "got: %d\n", edesc->tdesc.vt); ok(U(edesc->tdesc).hreftype == hreftype, "got: 0x%x\n", U(edesc->tdesc).hreftype); + ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_INT, "got: %d\n", + V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); + ok(V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == 0x789, "got: %d\n", + V_INT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); ITypeInfo2_ReleaseFuncDesc(ti2, pfuncdesc); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 7d5b1c8..97f61a4 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -886,7 +886,7 @@ static HRESULT ctl2_encode_variant( arg_type = VT_UI4; v = *value; - if(arg_type == VT_VARIANT) { + if(arg_type==VT_VARIANT || arg_type==VT_USERDEFINED) { arg_type = V_VT(value); }else if(V_VT(value) != arg_type) { hres = VariantChangeType(&v, value, 0, arg_type);

1 0

Stefan Dösinger : wined3d: Put local constants into the shader code again.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 667f4225b5cc25c5e4f2f725d55a7c011e12c388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667f4225b5cc25c5e4f2f725d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 2 14:54:01 2013 +0200 wined3d: Put local constants into the shader code again. This is essentially a revert of cd7825c89374fb9dd4c20aef2dbfd258713efe6a, with proper precision. --- dlls/wined3d/glsl_shader.c | 37 ++++--------------------------------- dlls/wined3d/shader.c | 28 ++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d98487..a840a5d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1253,15 +1253,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); - /* Local constants use a different name so they can be loaded once at shader link time - * They can't be hardcoded into the shader text via LC = {x, y, z, w}; because the - * float -> string conversion can cause precision loss. - */ if (!shader->load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - shader_addline(buffer, "uniform vec4 %s_lc%u;\n", prefix, lconst->idx); + const float *value; + value = (const float *)lconst->value; + shader_addline(buffer, "const vec4 %s_lc%u = vec4(%.8e, %.8e, %.8e, %.8e);\n", + prefix, lconst->idx, value[0], value[1], value[2], value[3]); } } @@ -4457,25 +4456,6 @@ static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, } /* Context activation is done by the caller. */ -static void hardcode_local_constants(const struct wined3d_shader *shader, - const struct wined3d_gl_info *gl_info, GLhandleARB programId, const char *prefix) -{ - const struct wined3d_shader_lconst *lconst; - GLint tmp_loc; - const float *value; - char glsl_name[10]; - - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - value = (const float *)lconst->value; - snprintf(glsl_name, sizeof(glsl_name), "%s_lc%u", prefix, lconst->idx); - tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - GL_EXTCALL(glUniform4fvARB(tmp_loc, 1, value)); - } - checkGLcall("Hardcoding local constants"); -} - -/* Context activation is done by the caller. */ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context, struct wined3d_shader_buffer *buffer, const struct wined3d_shader *shader, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) @@ -5705,15 +5685,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, struc */ shader_glsl_load_vsamplers(gl_info, device->texUnitMap, programId); shader_glsl_load_psamplers(gl_info, device->texUnitMap, programId); - - /* If the local constants do not have to be loaded with the environment constants, - * load them now to have them hardcoded in the GLSL program. This saves some CPU cycles - * later - */ - if (pshader && !pshader->load_local_constsF) - hardcode_local_constants(pshader, gl_info, programId, "ps"); - if (vshader && !vshader->load_local_constsF) - hardcode_local_constants(vshader, gl_info, programId, "vs"); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6444896..692e5b2 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -584,15 +584,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_DEF) { struct wined3d_shader_lconst *lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(*lconst)); + float *value; if (!lconst) return E_OUTOFMEMORY; lconst->idx = ins.dst[0].reg.idx[0].offset; memcpy(lconst->value, ins.src[0].reg.immconst_data, 4 * sizeof(DWORD)); + value = (float *)lconst->value; /* In pixel shader 1.X shaders, the constants are clamped between [-1;1] */ if (shader_version.major == 1 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { - float *value = (float *)lconst->value; if (value[0] < -1.0f) value[0] = -1.0f; else if (value[0] > 1.0f) value[0] = 1.0f; if (value[1] < -1.0f) value[1] = -1.0f; @@ -604,6 +605,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } list_add_head(&shader->constantsF, &lconst->entry); + + if (isinf(value[0]) || isnan(value[0]) || isinf(value[1]) || isnan(value[1]) + || isinf(value[2]) || isnan(value[2]) || isinf(value[3]) || isnan(value[3])) + { + shader->lconst_inf_or_nan = TRUE; + } } else if (ins.handler_idx == WINED3DSIH_DEFI) { @@ -1629,6 +1636,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b list_init(&shader->constantsF); list_init(&shader->constantsB); list_init(&shader->constantsI); + shader->lconst_inf_or_nan = FALSE; /* Second pass: figure out which registers are used, what the semantics are, etc. */ hr = shader_get_registers_used(shader, fe, @@ -1752,12 +1760,20 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh for (i = start_idx; i < end_idx; ++i) { struct wined3d_shader_lconst *lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(*lconst)); + float *value; if (!lconst) return E_OUTOFMEMORY; lconst->idx = i; - memcpy(lconst->value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); + value = (float *)lconst->value; + memcpy(value, src_data + (i - start_idx) * 4 /* 4 components */, 4 * sizeof(float)); list_add_head(&shader->constantsF, &lconst->entry); + + if (isinf(value[0]) || isnan(value[0]) || isinf(value[1]) || isnan(value[1]) + || isinf(value[2]) || isnan(value[2]) || isinf(value[3]) || isnan(value[3])) + { + shader->lconst_inf_or_nan = TRUE; + } } return WINED3D_OK; @@ -1916,8 +1932,8 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d vertexshader_set_limits(shader); - shader->load_local_constsF = reg_maps->usesrelconstF - && !list_empty(&shader->constantsF); + shader->load_local_constsF = (reg_maps->usesrelconstF && !list_empty(&shader->constantsF)) || + shader->lconst_inf_or_nan; return WINED3D_OK; } @@ -1964,7 +1980,7 @@ static HRESULT geometryshader_init(struct wined3d_shader *shader, struct wined3d geometryshader_set_limits(shader); - shader->load_local_constsF = FALSE; + shader->load_local_constsF = shader->lconst_inf_or_nan; return WINED3D_OK; } @@ -2253,7 +2269,7 @@ static HRESULT pixelshader_init(struct wined3d_shader *shader, struct wined3d_de } } - shader->load_local_constsF = FALSE; + shader->load_local_constsF = shader->lconst_inf_or_nan; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2a11286..bdba525 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2618,6 +2618,7 @@ struct wined3d_shader struct list constantsF; struct list constantsI; struct wined3d_shader_reg_maps reg_maps; + BOOL lconst_inf_or_nan; struct wined3d_shader_signature_element input_signature[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT];

1 0

Akihiro Sagawa : fonts: Add Japanese FixedSys font.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: c4408e0b621b99115247386e7095231be7e1045d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4408e0b621b99115247386e7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 8 21:55:08 2013 +0900 fonts: Add Japanese FixedSys font. --- fonts/.gitignore | 1 + fonts/Makefile.in | 4 + fonts/fixedsys_jp.sfd | 2301 +++++++++++++++++++++++++++++++++++++++++++++++++ fonts/fixedsys_jp.ttf | Bin 0 -> 7704 bytes tools/sfnt2fnt.c | 6 +- 5 files changed, 2309 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4408e0b621b991152473…

1 0

Kim Jung Eon : wbemprox: Implement some properties of Win32_ComputerSystem and Win32_DiskPartition.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: a9b2ce2c97411fe5e9d047957d674719333f480e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9b2ce2c97411fe5e9d047957… Author: Kim Jung Eon <admin(a)mog422.net> Date: Mon Apr 8 17:21:29 2013 +0900 wbemprox: Implement some properties of Win32_ComputerSystem and Win32_DiskPartition. --- dlls/wbemprox/builtin.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f48eaff..8b3e3c3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -85,6 +85,8 @@ static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; +static const WCHAR prop_bootpartitionW[] = + {'B','o','o','t','P','a','r','t','i','t','i','o','n',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = @@ -239,6 +241,7 @@ static const struct column col_compsys[] = { prop_domainroleW, CIM_UINT16 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } @@ -246,6 +249,7 @@ static const struct column col_compsys[] = static const struct column col_diskdrive[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, + { prop_indexW, CIM_UINT32, VT_I4 }, { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } @@ -253,6 +257,7 @@ static const struct column col_diskdrive[] = static const struct column col_diskpartition[] = { { prop_bootableW, CIM_BOOLEAN }, + { prop_bootpartitionW, CIM_BOOLEAN }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_diskindexW, CIM_UINT32, VT_I4 }, { prop_indexW, CIM_UINT32, VT_I4 }, @@ -409,6 +414,8 @@ static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; +static const WCHAR diskdrive_serialW[] = + {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', @@ -456,6 +463,7 @@ struct record_computersystem UINT16 domainrole; const WCHAR *manufacturer; const WCHAR *model; + const WCHAR *name; UINT32 num_logical_processors; UINT32 num_processors; UINT64 total_physical_memory; @@ -463,6 +471,7 @@ struct record_computersystem struct record_diskdrive { const WCHAR *device_id; + UINT32 index; const WCHAR *manufacturer; const WCHAR *name; const WCHAR *serialnumber; @@ -470,6 +479,7 @@ struct record_diskdrive struct record_diskpartition { int bootable; + int bootpartition; const WCHAR *device_id; UINT32 diskindex; UINT32 index; @@ -600,7 +610,7 @@ static const struct record_bios data_bios[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_deviceidW, diskdrive_manufacturerW, diskdrive_modelW } + { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW, diskdrive_serialW } }; static const struct record_param data_param[] = { @@ -726,6 +736,16 @@ static UINT64 get_total_physical_memory(void) return status.ullTotalPhys; } +static WCHAR *get_computername(void) +{ + WCHAR *ret; + DWORD size=MAX_COMPUTERNAME_LENGTH; + + if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; + GetComputerNameW( ret, &size ); + return ret; +} + static void fill_compsys( struct table *table ) { struct record_computersystem *rec; @@ -738,6 +758,7 @@ static void fill_compsys( struct table *table ) rec->domainrole = 0; /* standalone workstation */ rec->manufacturer = compsys_manufacturerW; rec->model = compsys_modelW; + rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count(); rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); @@ -807,6 +828,7 @@ static void fill_diskpartition( struct table *table ) } rec = (struct record_diskpartition *)(table->data + offset); rec->bootable = (i == 2) ? -1 : 0; + rec->bootpartition = (i == 2) ? -1 : 0; sprintfW( device_id, fmtW, index ); rec->device_id = heap_strdupW( device_id ); rec->diskindex = index;

1 0

Nozomi Kodama : d3dx9: Floatify fabs into fabsf.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 574d4cfba94513f243d67bff1c48d78814c5ca39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574d4cfba94513f243d67bff1… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Thu Apr 4 09:04:45 2013 -1000 d3dx9: Floatify fabs into fabsf. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2ddd379..af44957 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -27,7 +27,7 @@ #define admitted_error 0.0001f -#define relative_error(exp, out) (fabs(exp) < 0.01f ? fabs(exp - out) : fabs(1.0f - (out) / (exp))) +#define relative_error(exp, out) (fabsf(exp) < 0.01f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) #define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);

1 0