December 2012 - Wine-commits

Jacek Caban : jscript: Fixed deleting properties of pure dispatch interface .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 7202f1a32f884838586c1b019b02401f22cafd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7202f1a32f884838586c1b019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:31 2012 +0100 jscript: Fixed deleting properties of pure dispatch interface. --- dlls/jscript/dispex.c | 14 ++++++++++++-- dlls/jscript/tests/run.c | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dbb1c63..78809ee 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1542,8 +1542,18 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL IDispatchEx_Release(dispex); }else { - hres = S_OK; - ret = FALSE; + WCHAR *name_str = name->str; + DISPID id; + + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name_str, 1, 0, &id); + if(SUCCEEDED(hres)) { + /* Property exists and we can't delete it from pure IDispatch interface, so return false. */ + *ret = FALSE; + }else if(hres == DISP_E_UNKNOWNNAME) { + /* Property doesn't exist, so nothing to delete */ + *ret = TRUE; + hres = S_OK; + } } return hres; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 55b1398..46f519a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1846,6 +1846,14 @@ static BOOL run_tests(void) CHECK_CALLED(global_propdelete_d); CHECK_CALLED(DeleteMemberByDispID); + SET_EXPECT(puredisp_prop_d); + parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');"); + CHECK_CALLED(puredisp_prop_d); + + SET_EXPECT(puredisp_noprop_d); + parse_script_a("ok((delete pureDisp.noprop) === true, 'delete pureDisp.noprop did not return false');"); + CHECK_CALLED(puredisp_noprop_d); + parse_script_a("(function reportSuccess() {})()"); parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");");

1 0

Jacek Caban : jscript: Fixed deleting properties by name from IDispatchEx interface.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 2d7a3bb4827533ee102497de12c61b850be59c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7a3bb4827533ee102497de1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:44 2012 +0100 jscript: Fixed deleting properties by name from IDispatchEx interface. --- dlls/jscript/dispex.c | 3 ++- dlls/jscript/tests/run.c | 29 +++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 78809ee..0ecd20a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1535,7 +1535,8 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL if(bstr) { hres = IDispatchEx_DeleteMemberByName(dispex, bstr, make_grfdex(ctx, fdexNameCaseSensitive)); SysFreeString(bstr); - *ret = TRUE; + if(SUCCEEDED(hres)) + *ret = hres == S_OK; }else { hres = E_OUTOFMEMORY; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 46f519a..52fee57 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -89,7 +89,8 @@ DEFINE_EXPECT(global_propargput_i); DEFINE_EXPECT(global_testargtypes_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); -DEFINE_EXPECT(testobj_delete); +DEFINE_EXPECT(testobj_delete_test); +DEFINE_EXPECT(testobj_delete_nodelete); DEFINE_EXPECT(testobj_value); DEFINE_EXPECT(testobj_prop_d); DEFINE_EXPECT(testobj_withprop_d); @@ -402,11 +403,19 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, static HRESULT WINAPI testObj_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - CHECK_EXPECT(testobj_delete); + if(!strcmp_wa(bstrName, "deleteTest")) { + CHECK_EXPECT(testobj_delete_test); + test_grfdex(grfdex, fdexNameCaseSensitive); + return S_OK; + } + if(!strcmp_wa(bstrName, "noDeleteTest")) { + CHECK_EXPECT(testobj_delete_nodelete); + test_grfdex(grfdex, fdexNameCaseSensitive); + return S_FALSE; + } - ok(!strcmp_wa(bstrName, "deleteTest"), "unexpected name %s\n", wine_dbgstr_w(bstrName)); - test_grfdex(grfdex, fdexNameCaseSensitive); - return S_OK; + ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); + return E_FAIL; } static IDispatchExVtbl testObjVtbl = { @@ -1836,9 +1845,13 @@ static BOOL run_tests(void) CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); - SET_EXPECT(testobj_delete); - parse_script_a("delete testObj.deleteTest;"); - CHECK_CALLED(testobj_delete); + SET_EXPECT(testobj_delete_test); + parse_script_a("ok((delete testObj.deleteTest) === true, 'delete testObj.deleteTest did not return true');"); + CHECK_CALLED(testobj_delete_test); + + SET_EXPECT(testobj_delete_nodelete); + parse_script_a("ok((delete testObj.noDeleteTest) === false, 'delete testObj.noDeleteTest did not return false');"); + CHECK_CALLED(testobj_delete_nodelete); SET_EXPECT(global_propdelete_d); SET_EXPECT(DeleteMemberByDispID);

1 0

Jacek Caban : jscript: Fixed deleting property by ID from IDispatchEx interface.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: f780ae0f86cb925e6fa149b901960536f50202d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f780ae0f86cb925e6fa149b90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:55 2012 +0100 jscript: Fixed deleting property by ID from IDispatchEx interface. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/run.c | 34 +++++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0ecd20a..9e2ba5b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1501,7 +1501,7 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) if(FAILED(hres)) return hres; - *ret = TRUE; + *ret = hres == S_OK; return S_OK; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 52fee57..0b0215c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -81,6 +81,7 @@ DEFINE_EXPECT(global_propget_i); DEFINE_EXPECT(global_propput_d); DEFINE_EXPECT(global_propput_i); DEFINE_EXPECT(global_propdelete_d); +DEFINE_EXPECT(global_nopropdelete_d); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); @@ -102,6 +103,7 @@ DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(DeleteMemberByDispID); +DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_GLOBAL_TESTPROPGET 0x1000 #define DISPID_GLOBAL_TESTPROPPUT 0x1001 @@ -130,7 +132,8 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_TESTRES 0x1018 #define DISPID_GLOBAL_TESTNORES 0x1019 -#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 +#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 +#define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -497,6 +500,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTPROPDELETE; return S_OK; } + if(!strcmp_wa(bstrName, "testNoPropDelete")) { + CHECK_EXPECT(global_nopropdelete_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_TESTNOPROPDELETE; + return S_OK; + } if(!strcmp_wa(bstrName, "getVT")) { test_grfdex(grfdex, fdexNameCaseSensitive); *pid = DISPID_GLOBAL_GETVT; @@ -1082,9 +1091,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, static HRESULT WINAPI Global_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { - CHECK_EXPECT(DeleteMemberByDispID); - ok(id == DISPID_GLOBAL_TESTPROPDELETE, "id = %d\n", id); - return S_OK; + switch(id) { + case DISPID_GLOBAL_TESTPROPDELETE: + CHECK_EXPECT(DeleteMemberByDispID); + return S_OK; + case DISPID_GLOBAL_TESTNOPROPDELETE: + CHECK_EXPECT(DeleteMemberByDispID_false); + return S_FALSE; + default: + ok(0, "id = %d\n", id); + } + + return E_FAIL; } static IDispatchExVtbl GlobalVtbl = { @@ -1855,10 +1873,16 @@ static BOOL run_tests(void) SET_EXPECT(global_propdelete_d); SET_EXPECT(DeleteMemberByDispID); - parse_script_a("delete testPropDelete;"); + parse_script_a("ok((delete testPropDelete) === true, 'delete testPropDelete did not return true');"); CHECK_CALLED(global_propdelete_d); CHECK_CALLED(DeleteMemberByDispID); + SET_EXPECT(global_nopropdelete_d); + SET_EXPECT(DeleteMemberByDispID_false); + parse_script_a("ok((delete testNoPropDelete) === false, 'delete testPropDelete did not return false');"); + CHECK_CALLED(global_nopropdelete_d); + CHECK_CALLED(DeleteMemberByDispID_false); + SET_EXPECT(puredisp_prop_d); parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');"); CHECK_CALLED(puredisp_prop_d);

1 0

Jacek Caban : urlmon: Added IWinInetInfo and IWinInetHttpInfo proxy/ stub implementation.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: cc75a52c6a59c4f13d0f02f6b9d5083ae805e06d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc75a52c6a59c4f13d0f02f6b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 14:53:24 2012 +0100 urlmon: Added IWinInetInfo and IWinInetHttpInfo proxy/stub implementation. --- dlls/urlmon/usrmarshal.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index e6b468a..d669918 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -26,30 +26,30 @@ HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); + return IWinInetHttpInfo_RemoteQueryInfo_Proxy(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); } HRESULT __RPC_STUB IWinInetHttpInfo_QueryInfo_Stub(IWinInetHttpInfo* This, DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); + return IWinInetHttpInfo_QueryInfo(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); } HRESULT CALLBACK IWinInetInfo_QueryOption_Proxy(IWinInetInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf); + return IWinInetInfo_RemoteQueryOption_Proxy(This, dwOption, pBuffer, pcbBuf); } HRESULT __RPC_STUB IWinInetInfo_QueryOption_Stub(IWinInetInfo* This, DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf) { - FIXME("stub\n"); - return E_NOTIMPL; + TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf); + return IWinInetInfo_QueryOption(This, dwOption, pBuffer, pcbBuf); } HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy(IBindHost* This,

1 0

Dmitry Timoshkov : wineps.drv: Add a trace to PSDRV_GetDeviceCaps.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: fd193bc78116f3021d486d6fc327fa9ccfd64cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd193bc78116f3021d486d6fc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:40:04 2012 +0800 wineps.drv: Add a trace to PSDRV_GetDeviceCaps. --- dlls/wineps.drv/init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3f31f45..01d7f13 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -355,6 +355,8 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p,%d\n", dev->hdc, cap); + switch(cap) { case DRIVERVERSION:

1 0

Dmitry Timoshkov : winspool.drv: Add more traces.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: bdf14227ab1c6b55c11f466c9650116c9e260c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf14227ab1c6b55c11f466c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:40:38 2012 +0800 winspool.drv: Add more traces. --- dlls/winspool.drv/info.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 45b49f3..60b621e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2248,6 +2248,8 @@ INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort, WORD cap, { INT ret; + TRACE("%s,%s,%u,%p,%p\n", debugstr_a(pDevice), debugstr_a(pPort), cap, pOutput, lpdm); + if (!GDI_CallDeviceCapabilities16) { GDI_CallDeviceCapabilities16 = (void*)GetProcAddress( GetModuleHandleA("gdi32"), @@ -2288,6 +2290,8 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, LPSTR pPortA = strdupWtoA(pPort); INT ret; + TRACE("%s,%s,%u,%p,%p\n", debugstr_w(pDevice), debugstr_w(pPort), fwCapability, pOutput, pDevMode); + if(pOutput && (fwCapability == DC_BINNAMES || fwCapability == DC_FILEDEPENDENCIES || fwCapability == DC_PAPERNAMES)) { @@ -2454,6 +2458,8 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, PWSTR pwstrPrinterNameW; BOOL ret; + TRACE("%s,%p,%p\n", debugstr_a(lpPrinterName), phPrinter, pDefault); + pwstrPrinterNameW = asciitounicode(&lpPrinterNameW,lpPrinterName); if(pDefault) {

1 0

Dmitry Timoshkov : wineps.drv: Update default DEVMODE to better indicate initialized fields.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 1cd551cd6a31474c2bd028d0f6e181d8af75e975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd551cd6a31474c2bd028d0f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:41:18 2012 +0800 wineps.drv: Update default DEVMODE to better indicate initialized fields. --- dlls/wineps.drv/init.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 01d7f13..c63a6be 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -48,28 +48,29 @@ static const PSDRV_DEVMODE DefaultDevmode = /* dmDriverVersion */ 0x001, /* dmSize */ sizeof(DEVMODEW), /* dmDriverExtra */ sizeof(PSDRV_DEVMODE)-sizeof(DEVMODEW), -/* dmFields */ DM_ORIENTATION | DM_PAPERSIZE | DM_SCALE | - DM_COPIES | DM_DEFAULTSOURCE | DM_COLOR | - DM_YRESOLUTION | DM_TTOPTION, +/* dmFields */ DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH | + DM_SCALE | DM_COPIES | DM_DEFAULTSOURCE | DM_PRINTQUALITY | + DM_COLOR | DM_DUPLEX | DM_YRESOLUTION | DM_TTOPTION | + DM_COLLATE | DM_FORMNAME, { /* u1 */ { /* s1 */ /* dmOrientation */ DMORIENT_PORTRAIT, /* dmPaperSize */ DMPAPER_LETTER, /* dmPaperLength */ 2794, /* dmPaperWidth */ 2159, -/* dmScale */ 100, /* ?? */ +/* dmScale */ 100, /* dmCopies */ 1, /* dmDefaultSource */ DMBIN_AUTO, -/* dmPrintQuality */ 0 +/* dmPrintQuality */ 300 } }, /* dmColor */ DMCOLOR_COLOR, /* dmDuplex */ DMDUP_SIMPLEX, -/* dmYResolution */ 0, +/* dmYResolution */ 300, /* dmTTOption */ DMTT_SUBDEV, -/* dmCollate */ 0, -/* dmFormName */ {}, -/* dmUnusedPadding */ 0, +/* dmCollate */ DMCOLLATE_FALSE, +/* dmFormName */ {'L','e','t','t','e','r',0}, +/* dmLogPixels */ 0, /* dmBitsPerPel */ 0, /* dmPelsWidth */ 0, /* dmPelsHeight */ 0,

1 0

Christian Costa : d3drm: Check params in IDirect3DRMMeshBuilder2Impl_GetVertices + tests.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 871aa9d14daafb869a546a738498716ad58d54dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=871aa9d14daafb869a546a738… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 17 10:11:44 2012 +0100 d3drm: Check params in IDirect3DRMMeshBuilder2Impl_GetVertices + tests. --- dlls/d3drm/meshbuilder.c | 8 ++++++++ dlls/d3drm/tests/d3drm.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index ffbdec7..bf9a162 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -801,14 +801,22 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetVertices(IDirect3DRMMeshBui TRACE("(%p)->(%p,%p,%p,%p,%p,%p)\n", This, vcount, vertices, ncount, normals, face_data_size, face_data); + if (vertices && (!vcount || (*vcount < This->nb_vertices))) + return D3DRMERR_BADVALUE; if (vcount) *vcount = This->nb_vertices; if (vertices && This->nb_vertices) memcpy(vertices, This->pVertices, This->nb_vertices * sizeof(D3DVECTOR)); + + if (normals && (!ncount || (*ncount < This->nb_normals))) + return D3DRMERR_BADVALUE; if (ncount) *ncount = This->nb_normals; if (normals && This->nb_normals) memcpy(normals, This->pNormals, This->nb_normals * sizeof(D3DVECTOR)); + + if (face_data && (!face_data_size || (*face_data_size < This->face_data_size))) + return D3DRMERR_BADVALUE; if (face_data_size) *face_data_size = This->face_data_size; if (face_data && This->face_data_size) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 97e047a..6eb7bd0 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -393,6 +393,24 @@ static void test_MeshBuilder(void) val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder); ok(val == 1, "Wrong number of faces %d (must be 1)\n", val); + /* Check no buffer size and too small buffer size errors */ + val1 = 1; val2 = 3; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 1; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 3; val3 = 1; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + + val1 = 3; val2 = 3; val3 = 8; hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);

1 0

Christian Costa : d3drm: Fix return error code.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: f0dd3100189488f80ac9b2129d0d09ae7866b9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dd3100189488f80ac9b2129… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 17 10:11:51 2012 +0100 d3drm: Fix return error code. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7f246ce..709a2f8 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1541,7 +1541,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc } else if (hr != DXFILE_OK) { - ret = D3DRMERR_NOTFOUND; + ret = D3DRMERR_BADFILE; goto end; }

1 0

Piotr Caban : msvcrt: Added _atodbl_l implementation.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 3b5ab1b48facb8f30032948e326ce9eb3521502d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5ab1b48facb8f30032948e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:19:07 2012 +0100 msvcrt: Added _atodbl_l implementation. --- dlls/msvcrt/msvcrt.h | 6 ++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ea31b3c..bdd5933 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -986,6 +986,7 @@ int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; #define MSVCRT_FLT_MIN 1.175494351e-38F +#define MSVCRT_DBL_MIN 2.2250738585072014e-308 #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4 @@ -994,4 +995,9 @@ typedef struct float f; } MSVCRT__CRT_FLOAT; +typedef struct +{ + double x; +} MSVCRT__CRT_DOUBLE; + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 274554b..79f6511 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -300,8 +300,8 @@ # stub _aligned_realloc_dbg(ptr long long str long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) MSVCRT__assert -@ stub _atodbl(ptr str) -# stub _atodbl_l(ptr str ptr) +@ cdecl _atodbl(ptr str) MSVCRT__atodbl +@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 90518bc..f166865 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -455,6 +455,29 @@ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, MSVCRT__locale_ } /********************************************************************* + * _atodbl_l (MSVCRT.@) + */ +int CDECL MSVCRT__atodbl_l(MSVCRT__CRT_DOUBLE *value, char *str, MSVCRT__locale_t locale) +{ + int err; + + value->x = strtod_helper(str, NULL, locale, &err); + if(isinf(value->x)) + return MSVCRT__OVERFLOW; + if((value->x!=0 || err) && value->x>-MSVCRT_DBL_MIN && value->x<MSVCRT_DBL_MIN) + return MSVCRT__UNDERFLOW; + return 0; +} + +/********************************************************************* + * _atodbl (MSVCRT.@) + */ +int CDECL MSVCRT__atodbl(MSVCRT__CRT_DOUBLE *value, char *str) +{ + return MSVCRT__atodbl_l(value, str, NULL); +} + +/********************************************************************* * _strcoll_l (MSVCRT.@) */ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t locale )

1 0