wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

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

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

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 : 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 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 nonexistent identifiers.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 4dbd777de289ee58a11b2c9919e9b2765b81941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbd777de289ee58a11b2c991… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:18 2012 +0100 jscript: Fixed deleting nonexistent identifiers. --- dlls/jscript/engine.c | 16 +++++++++++----- dlls/jscript/tests/lang.js | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fbfa460..489aef6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1631,16 +1631,22 @@ static HRESULT interp_delete_ident(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - if(exprval.type != EXPRVAL_IDREF) { + switch(exprval.type) { + case EXPRVAL_IDREF: + hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); + IDispatch_Release(exprval.u.idref.disp); + if(FAILED(hres)) + return ret; + break; + case EXPRVAL_INVALID: + ret = TRUE; + break; + default: FIXME("Unsupported exprval\n"); exprval_release(&exprval); return E_NOTIMPL; } - hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); - IDispatch_Release(exprval.u.idref.disp); - if(FAILED(hres)) - return ret; return stack_push(ctx, jsval_bool(ret)); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f9c05bd..bac2deb 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1123,6 +1123,7 @@ for(iter in tmp) ok(false, "tmp has prop " + iter); ok((delete tmp.test) === true, "deleting test didn't return true"); ok((delete tmp.nonexistent) === true, "deleting nonexistent didn't return true"); +ok((delete nonexistent) === true, "deleting nonexistent didn't return true"); tmp = new Object(); tmp.test = false;

1 0

Jacek Caban : jscript: Fixed deleting nonexisting properties from member expression.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 7f07bb9a7a1dbb9cab148ce58ec45775764a2f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f07bb9a7a1dbb9cab148ce58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:08 2012 +0100 jscript: Fixed deleting nonexisting properties from member expression. --- dlls/jscript/dispex.c | 8 +++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2cd4ad5..dbb1c63 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1516,10 +1516,12 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL dispex_prop_t *prop; hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); - if(prop) + if(prop) { hres = delete_prop(prop, ret); - else - hres = DISP_E_MEMBERNOTFOUND; + }else { + *ret = TRUE; + hres = S_OK; + } jsdisp_release(jsdisp); return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 23e12cc..f9c05bd 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1121,6 +1121,8 @@ ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); ok(!("test" in tmp), "test is still in tmp after delete?"); for(iter in tmp) ok(false, "tmp has prop " + iter); +ok((delete tmp.test) === true, "deleting test didn't return true"); +ok((delete tmp.nonexistent) === true, "deleting nonexistent didn't return true"); tmp = new Object(); tmp.test = false;

1 0

Jacek Caban : jscript: Fixed Number.toFixed for value 0 with 0 precision.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 9de9c353ac5c09546fba139f3f446e62522e49a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de9c353ac5c09546fba139f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:35:54 2012 +0100 jscript: Fixed Number.toFixed for value 0 with 0 precision. --- dlls/jscript/number.c | 6 ++++-- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index ed773a3..351e915 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -99,15 +99,17 @@ static inline jsstr_t *number_to_fixed(double val, int prec) jsstr_t *ret; WCHAR *str; + TRACE("%lf %d\n", val, prec); + if(val < 0) { neg = TRUE; val = -val; } - if(val<=-1 || val>=1) + if(val >= 1) buf_size = log10(val)+prec+2; else - buf_size = prec+1; + buf_size = prec ? prec+1 : 2; if(buf_size > NUMBER_DTOA_SIZE) buf_size = NUMBER_DTOA_SIZE; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6322eae..5d45777 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1204,6 +1204,14 @@ ok(tmp === "101.1", "num(5.5).toString(2) = " + tmp); tmp = (new Number(3)).toFixed(3); ok(tmp === "3.000", "num(3).toFixed(3) = " + tmp); +tmp = (new Number(3)).toFixed(); +ok(tmp === "3", "Number(3).toFixed() = " + tmp); +tmp = (new Number(0)).toFixed(); +ok(tmp === "0", "Number(0).toFixed() = " + tmp); +tmp = (new Number(0)).toFixed(1); +ok(tmp === "0.0", "Number(0).toFixed(1) = " + tmp); +tmp = (new Number(0)).toFixed(2); +ok(tmp === "0.00", "Number(0).toFixed(2) = " + tmp); tmp = (new Number(1.76)).toFixed(1); ok(tmp === "1.8", "num(1.76).toFixed(1) = " + tmp); tmp = (new Number(7.92)).toFixed(5);

1 0

Ken Thomases : winemac: Implement minimal Create[Compatible]DC() and DeleteDC().
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 59e339faac8b6fdf1672bdbfbce4c1bc1dbd72ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e339faac8b6fdf1672bdbfb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 16 18:07:10 2012 -0600 winemac: Implement minimal Create[Compatible]DC() and DeleteDC(). --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/gdi.c | 254 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 4 +- 3 files changed, 258 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59e339faac8b6fdf1672b…

1 0

Ken Thomases : winequartz.drv: Rename to winemac.drv ("the Mac driver").
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 35033025aa9358961053b9d755ca33f93f218b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35033025aa9358961053b9d75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 16 18:06:52 2012 -0600 winequartz.drv: Rename to winemac.drv ("the Mac driver"). --- configure | 6 +++--- configure.ac | 8 ++++---- dlls/{winequartz.drv => winemac.drv}/Makefile.in | 4 ++-- .../quartzdrv_main.c => winemac.drv/macdrv_main.c} | 4 ++-- .../winemac.drv.spec} | 0 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index e96750d..7b3b31d 100755 --- a/configure +++ b/configure @@ -6673,7 +6673,7 @@ done then CARBONLIB="-framework Carbon" - enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi if test "x$enable_win16" = "xyes" then @@ -7129,7 +7129,7 @@ $as_echo "$ac_cv_c_dll_hpux" >&6; } esac enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no} if test "$LIBEXT" = "a"; then as_fn_error $? "could not find a way to build shared libraries. @@ -15866,13 +15866,13 @@ wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib wine_fn_config_dll winegstreamer enable_winegstreamer wine_fn_config_dll winejoystick.drv enable_winejoystick_drv +wine_fn_config_dll winemac.drv enable_winemac_drv wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder -wine_fn_config_dll winequartz.drv enable_winequartz_drv wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 diff --git a/configure.ac b/configure.ac index 2a4ea4e..3a07cbf 100644 --- a/configure.ac +++ b/configure.ac @@ -796,11 +796,11 @@ case $host_os in else WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi - dnl Enable quartz driver on Mac OS X + dnl Enable Mac driver on Mac OS X if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBONLIB,"-framework Carbon") - enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi dnl Check for Xcode 3.x broken 16-bit support if test "x$enable_win16" = "xyes" @@ -899,7 +899,7 @@ case $host_os in esac enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no} if test "$LIBEXT" = "a"; then AC_MSG_ERROR( @@ -3045,13 +3045,13 @@ WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) WINE_CONFIG_DLL(winejoystick.drv) +WINE_CONFIG_DLL(winemac.drv) WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv,,[install-lib,po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineqtdecoder) -WINE_CONFIG_DLL(winequartz.drv) WINE_CONFIG_DLL(winex11.drv) WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) diff --git a/dlls/winequartz.drv/Makefile.in b/dlls/winemac.drv/Makefile.in similarity index 58% rename from dlls/winequartz.drv/Makefile.in rename to dlls/winemac.drv/Makefile.in index 18801f5..4145dff 100644 --- a/dlls/winequartz.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ -MODULE = winequartz.drv +MODULE = winemac.drv IMPORTS = user32 gdi32 advapi32 C_SRCS = \ - quartzdrv_main.c + macdrv_main.c @MAKE_DLL_RULES@ diff --git a/dlls/winequartz.drv/quartzdrv_main.c b/dlls/winemac.drv/macdrv_main.c similarity index 94% rename from dlls/winequartz.drv/quartzdrv_main.c rename to dlls/winemac.drv/macdrv_main.c index 88bc6ac..17aebf6 100644 --- a/dlls/winequartz.drv/quartzdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -1,5 +1,5 @@ /* - * QUARTZDRV initialization code + * MACDRV initialization code * * Copyright 1998 Patrik Stridvall * Copyright 2000 Alexandre Julliard @@ -27,7 +27,7 @@ #include "winreg.h" /*********************************************************************** - * QUARTZDRV initialisation routine + * MACDRV initialisation routine */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { diff --git a/dlls/winequartz.drv/winequartz.drv.spec b/dlls/winemac.drv/winemac.drv.spec similarity index 100% rename from dlls/winequartz.drv/winequartz.drv.spec rename to dlls/winemac.drv/winemac.drv.spec

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
55
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 December 2012