January 2013 - Wine-Commits

Michael Stefaniuc : d3dx9_36/tests: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 18b2a38ba228109f8a18d5b51d358ab2d5d441b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b2a38ba228109f8a18d5b51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:06:44 2013 +0100 d3dx9_36/tests: Use assignment instead of memcpy to copy a struct. --- dlls/d3dx9_36/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index bad9d43..bb1104b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -324,7 +324,7 @@ static void test_dds_header_handling(void) dds.header.width = tests[i].width; dds.header.height = tests[i].height; dds.header.pitch_or_linear_size = tests[i].pitch; - memcpy(&dds.header.pixel_format, &tests[i].pixel_format, sizeof(struct dds_pixel_format)); + dds.header.pixel_format = tests[i].pixel_format; hr = D3DXGetImageInfoFromFileInMemory(&dds, file_size, &info); ok(hr == tests[i].expected_result, "%d: D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", i, hr, tests[i].expected_result);

1 0

Piotr Caban : msvcp90: Added complex::real and complex::imag implementation .
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: e4525224b056feed6086293f5d9cae26ce94831c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4525224b056feed6086293f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:27:43 2013 +0100 msvcp90: Added complex::real and complex::imag implementation. --- dlls/msvcp90/math.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 72 +++++++++++++++--------------- 2 files changed, 140 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4525224b056feed60862…

1 0

Jacek Caban : vbscript: Added GetObject implementation.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 3a87b4c1c5c642ad3ee7093afafac5f46d294070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a87b4c1c5c642ad3ee7093af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 12:26:54 2013 +0100 vbscript: Added GetObject implementation. --- dlls/vbscript/global.c | 97 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 79 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6886ff7..39b75ab 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define VB_E_CANNOT_CREATE_OBJ 0x800a01ad +#define VB_E_MK_PARSE_ERROR 0x800a01b0 /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = @@ -216,10 +217,29 @@ static HRESULT to_string(VARIANT *v, BSTR *ret) return S_OK; } +static HRESULT set_object_site(script_ctx_t *ctx, IUnknown *obj) +{ + IObjectWithSite *obj_site; + IUnknown *ax_site; + HRESULT hres; + + hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); + if(FAILED(hres)) + return S_OK; + + ax_site = create_ax_site(ctx); + if(ax_site) + hres = IObjectWithSite_SetSite(obj_site, ax_site); + else + hres = E_OUTOFMEMORY; + IUnknown_Release(ax_site); + IObjectWithSite_Release(obj_site); + return hres; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; - IObjectWithSite *obj_site; struct CONFIRMSAFETY cs; IClassFactoryEx *cfex; IClassFactory *cf; @@ -279,20 +299,10 @@ static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) } } - hres = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (void**)&obj_site); - if(SUCCEEDED(hres)) { - IUnknown *ax_site; - - ax_site = create_ax_site(ctx); - if(ax_site) { - hres = IObjectWithSite_SetSite(obj_site, ax_site); - IUnknown_Release(ax_site); - } - IObjectWithSite_Release(obj_site); - if(!ax_site || FAILED(hres)) { - IUnknown_Release(obj); - return NULL; - } + hres = set_object_site(ctx, obj); + if(FAILED(hres)) { + IUnknown_Release(obj); + return NULL; } return obj; @@ -1275,10 +1285,61 @@ static HRESULT Global_CreateObject(vbdisp_t *This, VARIANT *arg, unsigned args_c return S_OK; } -static HRESULT Global_GetObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_GetObject(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + IBindCtx *bind_ctx; + IUnknown *obj_unk; + IDispatch *disp; + ULONG eaten = 0; + IMoniker *mon; + HRESULT hres; + + TRACE("%s %s\n", args_cnt ? debugstr_variant(args) : "", args_cnt > 1 ? debugstr_variant(args+1) : ""); + + if(args_cnt != 1 || V_VT(args) != VT_BSTR) { + FIXME("unsupported args\n"); + return E_NOTIMPL; + } + + if(This->desc->ctx->safeopt & (INTERFACE_USES_SECURITY_MANAGER|INTERFACESAFE_FOR_UNTRUSTED_DATA)) { + WARN("blocked in current safety mode\n"); + return VB_E_CANNOT_CREATE_OBJ; + } + + hres = CreateBindCtx(0, &bind_ctx); + if(FAILED(hres)) + return hres; + + hres = MkParseDisplayName(bind_ctx, V_BSTR(args), &eaten, &mon); + if(SUCCEEDED(hres)) { + hres = IMoniker_BindToObject(mon, bind_ctx, NULL, &IID_IUnknown, (void**)&obj_unk); + IMoniker_Release(mon); + }else { + hres = MK_E_SYNTAX; + } + IBindCtx_Release(bind_ctx); + if(FAILED(hres)) + return hres; + + hres = set_object_site(This->desc->ctx, obj_unk); + if(FAILED(hres)) { + IUnknown_Release(obj_unk); + return hres; + } + + hres = IUnknown_QueryInterface(obj_unk, &IID_IDispatch, (void**)&disp); + if(SUCCEEDED(hres)) { + if(res) { + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = disp; + }else { + IDispatch_Release(disp); + } + }else { + FIXME("object does not support IDispatch\n"); + } + + return hres; } static HRESULT Global_DateAdd(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

1 0

Jacek Caban : vbscript: Added GetObject tests.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: c751389df48b874a6ece45db98d733e8b215449d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c751389df48b874a6ece45db9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 12:27:25 2013 +0100 vbscript: Added GetObject tests. --- dlls/vbscript/tests/createobj.c | 96 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 9dafe1c..4ae4208 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -36,6 +36,7 @@ #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release #else @@ -43,6 +44,7 @@ #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release #endif @@ -72,6 +74,9 @@ extern const CLSID CLSID_VBScript; expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(ProcessUrlAction); DEFINE_EXPECT(QueryCustomPolicy); @@ -91,12 +96,16 @@ static HRESULT QueryCustomPolicy_hres; static DWORD QueryCustomPolicy_psize; static DWORD QueryCustomPolicy_policy; static HRESULT QI_IDispatch_hres; +static HRESULT QI_IObjectWithSite_hres; static HRESULT SetSite_hres; -#define TESTOBJ_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" +#define TESTOBJ_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80646}" +#define TESTOBJINST_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80647}" static const GUID CLSID_TestObj = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; +static const GUID CLSID_TestObjInst = + {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x47}}; /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = @@ -201,6 +210,8 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, *ppv = iface; }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { CHECK_EXPECT(QI_IObjectWithSite); + if(FAILED(QI_IObjectWithSite_hres)) + return QI_IObjectWithSite_hres; *ppv = object_with_site; }else if(IsEqualGUID(&IID_IObjectSafety, riid)) { ok(0, "Unexpected IID_IObjectSafety query\n"); @@ -740,6 +751,7 @@ static IActiveScriptParse *create_script(BOOL use_sec_mgr) QueryCustomPolicy_psize = sizeof(DWORD); QueryCustomPolicy_policy = URLPOLICY_ALLOW; QI_IDispatch_hres = S_OK; + QI_IObjectWithSite_hres = S_OK; SetSite_hres = S_OK; hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -971,6 +983,59 @@ static void test_CreateObject(void) IActiveScriptParse_Release(parser); } +static void test_GetObject(void) +{ + IActiveScriptParse *parser; + HRESULT hres; + + /* Never allowed with security manager */ + parser = create_script(TRUE); + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + ok(hres == VB_E_CANNOT_CREATE_OBJ, "hres = %08x\n", hres); + IActiveScriptParse_Release(parser); + + parser = create_script(FALSE); + + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(SetSite); + SET_EXPECT(reportSuccess); + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + if(hres == 0x8007007e) { /* Workaround for broken win2k */ + win_skip("got unexpected error %08x\n", hres); + CLEAR_CALLED(QI_IObjectWithSite); + CLEAR_CALLED(SetSite); + CLEAR_CALLED(reportSuccess); + IActiveScriptParse_Release(parser); + return; + } + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(SetSite); + CHECK_CALLED(reportSuccess); + + SetSite_hres = E_FAIL; + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(SetSite); + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + ok(hres == E_FAIL, "hres = %08x\n", hres); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(SetSite); + + QI_IObjectWithSite_hres = E_NOINTERFACE; + SET_EXPECT(QI_IObjectWithSite); + SET_EXPECT(reportSuccess); + parse_script_a(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + CHECK_CALLED(QI_IObjectWithSite); + CHECK_CALLED(reportSuccess); + + IActiveScriptParse_Release(parser); + + /* Invalid moniker */ + parser = create_script(FALSE); + hres = parse_script_ae(parser, "Call GetObject(\"nonexistent:test\").reportSuccess()"); + ok(hres == MK_E_SYNTAX, "hres = %08x\n", hres); + IActiveScriptParse_Release(parser); +} + static BOOL init_key(const char *key_name, const char *def_value, BOOL init) { HKEY hkey; @@ -1012,18 +1077,41 @@ static BOOL register_activex(void) CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + hres = CoRegisterClassObject(&CLSID_TestObjInst, (IUnknown *)&testObj, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &regid); + ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + return TRUE; } +static BOOL check_vbscript(void) +{ + IActiveScriptParseProcedure2 *vbscript; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScriptParseProcedure2, (void**)&vbscript); + if(SUCCEEDED(hres)) + IActiveScriptParseProcedure2_Release(vbscript); + + return hres == S_OK; +} + + START_TEST(createobj) { CoInitialize(NULL); - register_activex(); + if(check_vbscript()) { + register_activex(); - test_CreateObject(); + test_CreateObject(); + test_GetObject(); - init_registry(FALSE); + init_registry(FALSE); + }else { + win_skip("Broken engine, probably too old\n"); + } CoUninitialize(); }

1 0

Piotr Caban : msvcp90: Added complex trigonometric functions implementation .
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: ed0e16ae3dfaa0e68f00a345f41661ca3267b40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0e16ae3dfaa0e68f00a345f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:28:47 2013 +0100 msvcp90: Added complex trigonometric functions implementation. --- dlls/msvcp90/math.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 +++++++++++++------------- 2 files changed, 80 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 9f75cd4..c13fd3c 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1312,6 +1312,34 @@ complex_float* __cdecl complex_float_conj(complex_float *ret, const complex_floa return ret; } +/* ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_cos(complex_float *ret, const complex_float *c) +{ + ret->real = cos(c->real)*cosh(c->imag); + ret->imag = -sin(c->real)*sinh(c->imag); + return ret; +} + +/* ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_sin(complex_float *ret, const complex_float *c) +{ + ret->real = sin(c->real)*cosh(c->imag); + ret->imag = cos(c->real)*sinh(c->imag); + return ret; +} + +/* ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z */ +/* ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z */ +complex_float* __cdecl complex_float_tan(complex_float *ret, const complex_float *c) +{ + double denom = cos(2*c->real) + cosh(2*c->imag); + ret->real = sin(2*c->real) / denom; + ret->imag = sinh(2*c->imag) / denom; + return ret; +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1820,3 +1848,37 @@ complex_double* __cdecl complex_double_conj(complex_double *ret, const complex_d ret->imag = -c->imag; return ret; } + +/* ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_cos(complex_double *ret, const complex_double *c) +{ + ret->real = cos(c->real)*cosh(c->imag); + ret->imag = -sin(c->real)*sinh(c->imag); + return ret; +} + +/* ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_sin(complex_double *ret, const complex_double *c) +{ + ret->real = sin(c->real)*cosh(c->imag); + ret->imag = cos(c->real)*sinh(c->imag); + return ret; +} + +/* ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z */ +/* ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z */ +/* ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z */ +/* ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z */ +complex_double* __cdecl complex_double_tan(complex_double *ret, const complex_double *c) +{ + double denom = cos(2*c->real) + cosh(2*c->imag); + ret->real = sin(2*c->real) / denom; + ret->imag = sinh(2*c->imag) / denom; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5e53c6d..3022505 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -368,12 +368,12 @@ @ cdecl -arch=win64 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_conj @ cdecl -arch=win32 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_conj @ cdecl -arch=win64 ??$conj(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_conj -@ stub -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_cos +@ cdecl -arch=win64 ??$cos(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_cos +@ cdecl -arch=win32 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win64 ??$cos(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win32 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_cos +@ cdecl -arch=win64 ??$cos(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_cos @ stub -arch=win32 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$cosh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$cosh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -464,12 +464,12 @@ @ cdecl -arch=win64 ??$real(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_real @ cdecl -arch=win32 ??$real(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_real @ cdecl -arch=win64 ??$real(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_real -@ stub -arch=win32 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_sin +@ cdecl -arch=win64 ??$sin(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_sin +@ cdecl -arch=win32 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win64 ??$sin(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win32 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_sin +@ cdecl -arch=win64 ??$sin(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_sin @ stub -arch=win32 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$sinh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$sinh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z @@ -482,12 +482,12 @@ @ stub -arch=win64 ??$sqrt(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z @ stub -arch=win32 ??$sqrt(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z @ stub -arch=win64 ??$sqrt(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z -@ stub -arch=win64 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z -@ stub -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z -@ stub -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z -@ stub -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z +@ cdecl -arch=win32 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z(ptr ptr) complex_float_tan +@ cdecl -arch=win64 ??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z(ptr ptr) complex_float_tan +@ cdecl -arch=win32 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win64 ??$tan(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win32 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z(ptr ptr) complex_double_tan +@ cdecl -arch=win64 ??$tan(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z(ptr ptr) complex_double_tan @ stub -arch=win32 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$tanh(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z

1 0

Alexandre Julliard : rpcrt4: Fix wrap-around bug in tick count comparison.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: af734f9623d2b03730356a33829b5ebefe59f5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af734f9623d2b03730356a338… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:15:16 2013 +0100 rpcrt4: Fix wrap-around bug in tick count comparison. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index aebb05e..54f0faa 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1990,7 +1990,7 @@ static DWORD CALLBACK rpcrt4_http_timer_thread(PVOID param) timeout = rpcrt4_http_timer_calc_timeout(data.last_sent_time)) { /* are we too soon after last send? */ - if (GetTickCount() - HTTP_IDLE_TIME < *data.last_sent_time) + if (GetTickCount() - *data.last_sent_time < HTTP_IDLE_TIME) continue; rpcrt4_http_keep_connection_active_timer_proc(data.timer_param, TRUE); }

1 0

Michael Stefaniuc : dinput: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: ab542a92d5e4f5eb60e18d4a62e7559bc454ec29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab542a92d5e4f5eb60e18d4a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:07:42 2013 +0100 dinput: Use assignment instead of memcpy to copy a struct. --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 466b6bf..0a044a5 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -314,7 +314,7 @@ static void find_joydevs(void) continue; } joydevs = new_joydevs; - memcpy(joydevs + have_joydevs, &joydev, sizeof(joydev)); + joydevs[have_joydevs] = joydev; have_joydevs++; close(fd);

1 0

Piotr Caban : msvcp90: Added std::tanh(complex) tests.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: ec5e51d8935c28aeaee348a3c9226a997473759a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5e51d8935c28aeaee348a3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 24 12:39:28 2013 +0100 msvcp90: Added std::tanh(complex) tests. --- dlls/msvcp90/tests/misc.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 0f1b27e..9f0b14b 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -113,6 +113,7 @@ static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const compl static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); static complex_float* (__cdecl *p_complex_float_tan)(complex_float*, const complex_float*); +static complex_float* (__cdecl *p_complex_float_tanh)(complex_float*, const complex_float*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -255,6 +256,8 @@ static BOOL init(void) "??$_Fabs(a)M@std@@YAMAEBV?$complex(a)M@0(a)PEAH@Z"); SET(p_complex_float_tan, "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); + SET(p_complex_float_tanh, + "??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -303,6 +306,8 @@ static BOOL init(void) "??$_Fabs(a)M@std@@YAMABV?$complex(a)M@0(a)PAH@Z"); SET(p_complex_float_tan, "??$tan(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); + SET(p_complex_float_tanh, + "??$tanh(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z"); } init_thiscall_thunk(); @@ -716,18 +721,36 @@ static void test_complex(void) p_complex_float_tan(&c2, &c1); ok(c2.real == 0, "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(c2.real == 0, "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); c1.real = 3.14159/2; c1.imag = 0; p_complex_float_tan(&c2, &c1); ok(almost_eq(c2.real, 788906.062500), "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(almost_eq(c2.real, 0.917152), "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); c1.real = 7.12; c1.imag = 0.17; p_complex_float_tan(&c2, &c1); ok(almost_eq(c2.real, 1.040818), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 0.362651), "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(almost_eq(c2.real, 0.999999), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 4.3627e-7), "c2.imag = %g\n", c2.imag); + + c1.real = 0.14; + c1.imag = 0.19; + p_complex_float_tan(&c2, &c1); + ok(almost_eq(c2.real, 0.135859), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.191341), "c2.imag = %f\n", c2.imag); + p_complex_float_tanh(&c2, &c1); + ok(almost_eq(c2.real, 0.144134), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.188464), "c2.imag = %f\n", c2.imag); } START_TEST(misc)

1 0

Henri Verbeet : d3drm: Avoid LPD3DRMRAY.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 5114cbd23cf95146cc6999fac61cb30b5f636cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5114cbd23cf95146cc6999fac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 24 11:37:38 2013 +0100 d3drm: Avoid LPD3DRMRAY. --- dlls/d3drm/frame.c | 6 ++---- include/d3drmobj.h | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 3f814bf..09dfea4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2452,10 +2452,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetQuaternion(IDirect3DRMFrame3* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_RayPick(IDirect3DRMFrame3* iface, - LPDIRECT3DRMFRAME3 reference, LPD3DRMRAY ray, - DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMFrame3Impl_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, + D3DRMRAY *ray, DWORD flags, IDirect3DRMPicked2Array **return_visuals) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 9569046..71bc005 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1401,8 +1401,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE; STDMETHOD(SetQuaternion)(THIS_ LPDIRECT3DRMFRAME reference, D3DRMQUATERNION *q) PURE; - STDMETHOD(RayPick)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DRMRAY ray, DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) PURE; + STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame *reference, D3DRMRAY *ray, DWORD flags, + struct IDirect3DRMPicked2Array **return_visuals) PURE; STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); }; #undef INTERFACE @@ -1680,8 +1680,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL2) PURE; STDMETHOD(SetQuaternion)(THIS_ LPDIRECT3DRMFRAME3 reference, D3DRMQUATERNION *q) PURE; - STDMETHOD(RayPick)(THIS_ LPDIRECT3DRMFRAME3 reference, LPD3DRMRAY ray, DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) PURE; + STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame3 *reference, D3DRMRAY *ray, DWORD flags, + struct IDirect3DRMPicked2Array **return_visuals) PURE; STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); STDMETHOD(TransformVectors)(THIS_ IDirect3DRMFrame3 *reference, DWORD vector_count, D3DVECTOR *dst_vectors, D3DVECTOR *src_vectors) PURE;

1 0

Andrew Talbot : gdiplus: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 32d070afb0d6bcec3a19f509066028fcdfcb043f URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d070afb0d6bcec3a19f5090… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 23 21:42:47 2013 +0000 gdiplus: Avoid signed-unsigned integer comparisons. --- dlls/gdiplus/graphics.c | 6 ++++-- dlls/gdiplus/image.c | 5 +++-- dlls/gdiplus/region.c | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e287683..659c46b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -429,7 +429,8 @@ static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst if (graphics->image && graphics->image->type == ImageTypeBitmap) { - int i, size; + DWORD i; + int size; RGNDATA *rgndata; RECT *rects; HRGN hrgn, visible_rgn; @@ -642,7 +643,8 @@ static int color_is_gray(ARGB color) static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type) { - UINT x, y, i; + UINT x, y; + INT i; if (attributes->colorkeys[type].enabled || attributes->colorkeys[ColorAdjustTypeDefault].enabled) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bb555a8..6aa8d32 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -370,7 +370,7 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, ColorPalett BYTE index = 0; int best_distance = 0x7fff; int distance; - int i; + UINT i; if (!palette) return 0; /* This algorithm scans entire palette, @@ -3793,7 +3793,8 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res LARGE_INTEGER seek; HRESULT hr; UINT bytesread; - int i, j, sig; + int i; + DWORD j, sig; /* seek to the start of the stream */ seek.QuadPart = 0; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f62b599..f7bad57 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -588,7 +588,7 @@ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) GpStatus stat; GpPath* path; GpRegion* local; - int i; + DWORD i; TRACE("(%p, %p)\n", hrgn, region); @@ -1467,7 +1467,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *region, UINT *count, GpMat GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects; @@ -1501,7 +1501,7 @@ GpStatus WINGDIPAPI GdipGetRegionScansI(GpRegion *region, GpRect *scans, INT *co GpStatus WINGDIPAPI GdipGetRegionScans(GpRegion *region, GpRectF *scans, INT *count, GpMatrix *matrix) { GpStatus stat; - INT i; + DWORD i; LPRGNDATA data; RECT *rects;

1 0