wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Michael Stefaniuc : hnetcfg: Use an iface instead of an vtbl pointer in fw_manager.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 1b7cc1f25985623fc399068858cfbea7d3630d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7cc1f25985623fc39906885… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:08 2010 +0100 hnetcfg: Use an iface instead of an vtbl pointer in fw_manager. --- dlls/hnetcfg/manager.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 7d6a7a5..6192c2d 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -37,13 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_manager { - const INetFwMgrVtbl *vtbl; + INetFwMgr INetFwMgr_iface; LONG refs; } fw_manager; static inline fw_manager *impl_from_INetFwMgr( INetFwMgr *iface ) { - return (fw_manager *)((char *)iface - FIELD_OFFSET( fw_manager, vtbl )); + return CONTAINING_RECORD(iface, fw_manager, INetFwMgr_iface); } static ULONG WINAPI fw_manager_AddRef( @@ -230,10 +230,10 @@ HRESULT NetFwMgr_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); if (!fm) return E_OUTOFMEMORY; - fm->vtbl = &fw_manager_vtbl; + fm->INetFwMgr_iface.lpVtbl = &fw_manager_vtbl; fm->refs = 1; - *ppObj = &fm->vtbl; + *ppObj = &fm->INetFwMgr_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : hnetcfg: Standardize the COM usage in apps.c.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 97c5c33203d1649dce56c38f4deb14ead417042d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c5c33203d1649dce56c38f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 20 11:34:01 2010 +0100 hnetcfg: Standardize the COM usage in apps.c. --- dlls/hnetcfg/apps.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index fbd603c..81bfe36 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); typedef struct fw_app { - const INetFwAuthorizedApplicationVtbl *vtbl; + INetFwAuthorizedApplication INetFwAuthorizedApplication_iface; LONG refs; } fw_app; static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) { - return (fw_app *)((char *)iface - FIELD_OFFSET( fw_app, vtbl )); + return CONTAINING_RECORD(iface, fw_app, INetFwAuthorizedApplication_iface); } static ULONG WINAPI fw_app_AddRef( @@ -297,23 +297,23 @@ HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; - fa->vtbl = &fw_app_vtbl; + fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; fa->refs = 1; - *ppObj = &fa->vtbl; + *ppObj = &fa->INetFwAuthorizedApplication_iface; TRACE("returning iface %p\n", *ppObj); return S_OK; } typedef struct fw_apps { - const INetFwAuthorizedApplicationsVtbl *vtbl; + INetFwAuthorizedApplications INetFwAuthorizedApplications_iface; LONG refs; } fw_apps; static inline fw_apps *impl_from_INetFwAuthorizedApplications( INetFwAuthorizedApplications *iface ) { - return (fw_apps *)((char *)iface - FIELD_OFFSET( fw_apps, vtbl )); + return CONTAINING_RECORD(iface, fw_apps, INetFwAuthorizedApplications_iface); } static ULONG WINAPI fw_apps_AddRef( @@ -490,10 +490,10 @@ HRESULT NetFwAuthorizedApplications_create( IUnknown *pUnkOuter, LPVOID *ppObj ) fa = HeapAlloc( GetProcessHeap(), 0, sizeof(*fa) ); if (!fa) return E_OUTOFMEMORY; - fa->vtbl = &fw_apps_vtbl; + fa->INetFwAuthorizedApplications_iface.lpVtbl = &fw_apps_vtbl; fa->refs = 1; - *ppObj = &fa->vtbl; + *ppObj = &fa->INetFwAuthorizedApplications_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Jacek Caban : jscript: Added Date.setYear implementation.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: f2319fcd85a18f22f49914c2059843bfda1199b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2319fcd85a18f22f49914c20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 20 12:21:42 2010 +0100 jscript: Added Date.setYear implementation. --- dlls/jscript/date.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 28 ++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 3be8a36..e9542f8 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2028,8 +2028,42 @@ static HRESULT Date_getYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + DateInstance *date; + DOUBLE t, year; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!(date = date_this(jsthis))) + return throw_type_error(ctx, ei, IDS_NOT_DATE, NULL); + + if(!arg_cnt(dp)) + return throw_type_error(ctx, ei, IDS_ARG_NOT_OPT, NULL); + + t = local_time(date->time, date); + + hres = to_number(ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + year = num_val(&v); + if(isnan(year)) { + date->time = year; + if(retv) + num_set_nan(retv); + return S_OK; + } + + year = year >= 0.0 ? floor(year) : -floor(-year); + if(-1.0 < year && year < 100.0) + year += 1900.0; + + date->time = time_clip(utc(make_date(make_day(year, month_from_time(t), date_from_time(t)), time_within_day(t)), date)); + + if(retv) + num_set_val(retv, date->time); + return S_OK; } static HRESULT Date_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f35d11a..081582e 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1597,6 +1597,7 @@ ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); ok(date.getUTCMinutes() === 0, "date.getUTCMinutes() = " + date.getUTCMinutes()); ok(date.getUTCSeconds() === 0, "date.getUTCSeconds() = " + date.getUTCSeconds()); ok(date.getUTCMilliseconds() === 0, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); + date.setTime(60*24*60*60*1000); ok(date.getUTCFullYear() === 1970, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 2, "date.getUTCMonth() = " + date.getUTCMonth()); @@ -1606,6 +1607,7 @@ ok(date.getUTCHours() === 0, "date.getUTCHours() = " + date.getUTCHours()); ok(date.getUTCMinutes() === 0, "date.getUTCMinutes() = " + date.getUTCMinutes()); ok(date.getUTCSeconds() === 0, "date.getUTCSeconds() = " + date.getUTCSeconds()); ok(date.getUTCMilliseconds() === 0, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); + date.setTime(59*24*60*60*1000 + 4*365*24*60*60*1000 + 60*60*1000 + 2*60*1000 + 2*1000 + 640); ok(date.getUTCFullYear() === 1974, "date.getUTCFullYear() = " + date.getUTCFullYear()); ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); @@ -1616,6 +1618,22 @@ ok(date.getUTCHours() === 1, "date.getUTCHours() = " + date.getUTCHours()); ok(date.getUTCMinutes() === 2, "date.getUTCMinutes() = " + date.getUTCMinutes()); ok(date.getUTCSeconds() === 2, "date.getUTCSeconds() = " + date.getUTCSeconds()); ok(date.getUTCMilliseconds() === 640, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); + +tmp = date.setYear(96); +ok(date.getYear() === 96, "date.getYear() = " + date.getYear()); +ok(date.getFullYear() === 1996, "date.getFullYear() = " + date.getYear()); +ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCMilliseconds() === 640, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); + +tmp = date.setYear(2010); +ok(tmp === date.getTime(), "date.setYear(2010) = " + tmp); +ok(date.getYear() === 2010, "date.getYear() = " + date.getYear()); +ok(date.getFullYear() === 2010, "date.getFullYear() = " + date.getYear()); +ok(date.getUTCMonth() === 1, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCMonth(123) === 1, "date.getUTCMonth() = " + date.getUTCMonth()); +ok(date.getUTCMilliseconds() === 640, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); + date.setTime(Infinity); ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN"); @@ -1628,6 +1646,12 @@ ok(isNaN(date.getUTCMilliseconds()), "date.getUTCMilliseconds() is not NaN"); ok(isNaN(date.setMilliseconds(0)), "date.setMilliseconds() is not NaN"); date.setTime(0); +tmp = date.setYear(NaN); +ok(isNaN(tmp), "date.setYear(NaN) = " + tmp); +ok(isNaN(date.getUTCFullYear()), "date.getUTCFullYear() is not NaN"); +ok(isNaN(date.getUTCMonth()), "date.getUTCMonth() is not NaN"); + +date.setTime(0); date.setUTCMilliseconds(-10, 2); ok(date.getUTCMilliseconds() === 990, "date.getUTCMilliseconds() = " + date.getUTCMilliseconds()); date.setUTCMilliseconds(10); @@ -1863,6 +1887,7 @@ exception_test(function() {arr.toString = Date.prototype.toString; arr.toString( exception_test(function() {Array(-3);}, "RangeError", -2146823259); exception_test(function() {arr.toString = Boolean.prototype.toString; arr.toString();}, "TypeError", -2146823278); exception_test(function() {date.setTime();}, "TypeError", -2146827839); +exception_test(function() {date.setYear();}, "TypeError", -2146827839); exception_test(function() {arr.test();}, "TypeError", -2146827850); exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError", -2146823287); exception_test(function() {(new Number(3)).toString(1);}, "TypeError", -2146828283); @@ -1939,6 +1964,7 @@ testDateThis("getUTCMilliseconds"); testDateThis("getUTCMinutes"); testDateThis("getUTCMonth"); testDateThis("getUTCSeconds"); +testDateThis("getYear"); testDateThis("setDate"); testDateThis("setFullYear"); testDateThis("setHours"); @@ -1954,6 +1980,7 @@ testDateThis("setUTCMilliseconds"); testDateThis("setUTCMinutes"); testDateThis("setUTCMonth"); testDateThis("setUTCSeconds"); +testDateThis("setYear"); testDateThis("toDateString"); testDateThis("toLocaleDateString"); testDateThis("toLocaleString"); @@ -2121,6 +2148,7 @@ testFunctions(Date.prototype, [ ["getUTCMinutes", 0], ["getUTCMonth", 0], ["getUTCSeconds", 0], + ["getYear", 0], ["setDate", 1], ["setFullYear", 3], ["setHours", 4],

1 0

Huw Davies : ole32: Standardize the COM usage.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 3a2aae49d395fb4d90a018af5811b8e35119bd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2aae49d395fb4d90a018af5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 14:58:32 2010 +0000 ole32: Standardize the COM usage. --- dlls/ole32/oleobj.c | 186 +++++++++++++++++++++++--------------------------- 1 files changed, 86 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a2aae49d395fb4d90a01…

1 0

Huw Davies : ole32: Implement IDataAdviseHolder_EnumAdvise.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 06f2ef4fb5da8de263e74ce50e27f24ddef8ba6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f2ef4fb5da8de263e74ce50… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 14:13:03 2010 +0000 ole32: Implement IDataAdviseHolder_EnumAdvise. --- dlls/ole32/oleobj.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 2b0179c..a395557 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -792,14 +792,22 @@ static HRESULT WINAPI DataAdviseHolder_Unadvise( return S_OK; } -static HRESULT WINAPI DataAdviseHolder_EnumAdvise( - IDataAdviseHolder* iface, - IEnumSTATDATA** ppenumAdvise) +/****************************************************************************** + * DataAdviseHolder_EnumAdvise + */ +static HRESULT WINAPI DataAdviseHolder_EnumAdvise(IDataAdviseHolder *iface, + IEnumSTATDATA **enum_advise) { - DataAdviseHolder *This = (DataAdviseHolder *)iface; + DataAdviseHolder *This = (DataAdviseHolder *)iface; + IUnknown *unk; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, enum_advise); - FIXME("(%p)->(%p)\n", This, ppenumAdvise); - return E_NOTIMPL; + IDataAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); + hr = EnumSTATDATA_Construct(unk, 0, This->maxCons, This->connections, enum_advise); + IUnknown_Release(unk); + return hr; } /******************************************************************************

1 0

Huw Davies : ole32: Allow the EnumSTATDATA constructor to take a sparse array.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 4151b49fad459663734d358161c2fc10dfd0e0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4151b49fad459663734d35816… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 14:07:19 2010 +0000 ole32: Allow the EnumSTATDATA constructor to take a sparse array. --- dlls/ole32/oleobj.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 2441121..2b0179c 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -80,7 +80,7 @@ typedef struct OleAdviseHolderImpl } OleAdviseHolderImpl; -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, STATDATA *data, IEnumSTATDATA **ppenum); +static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, IEnumSTATDATA **ppenum); typedef struct { @@ -207,11 +207,11 @@ static const IEnumSTATDATAVtbl EnumSTATDATA_VTable = EnumSTATDATA_Clone }; -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, STATDATA *data, +static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, IEnumSTATDATA **ppenum) { EnumSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - DWORD i; + DWORD i, count; if (!This) return E_OUTOFMEMORY; @@ -219,17 +219,23 @@ static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD num, This->ref = 1; This->index = index; - This->statdata = HeapAlloc(GetProcessHeap(), 0, num * sizeof(*This->statdata)); + This->statdata = HeapAlloc(GetProcessHeap(), 0, array_len * sizeof(*This->statdata)); if(!This->statdata) { HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; } - for(i = 0; i < num; i++) - copy_statdata(This->statdata + i, data + i); + for(i = 0, count = 0; i < array_len; i++) + { + if(data[i].pAdvSink) + { + copy_statdata(This->statdata + count, data + i); + count++; + } + } - This->num_of_elems = num; + This->num_of_elems = count; This->holder = holder; IUnknown_AddRef(holder); *ppenum = &This->IEnumSTATDATA_iface;

1 0

Huw Davies : ole32: Use a STATDATA array to hold the connection data.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 892796a9a64c363844500d9e7ca0d39de9169166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892796a9a64c363844500d9e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 13:13:17 2010 +0000 ole32: Use a STATDATA array to hold the connection data. --- dlls/ole32/oleobj.c | 161 +++++++++++++++++++++----------------------------- 1 files changed, 68 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=892796a9a64c363844500…

1 0

Huw Davies : ole32: Remove some useless comments.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 861bb8ee1355ba0d6649b01fbeaf87818ab4f98a URL: http://source.winehq.org/git/wine.git/?a=commit;h=861bb8ee1355ba0d6649b01fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 17 11:51:47 2010 +0000 ole32: Remove some useless comments. --- dlls/ole32/oleobj.c | 72 +++------------------------------------------------ 1 files changed, 4 insertions(+), 68 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 6b4106a..ff77f5b 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -274,9 +274,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface( { OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObj); - /* - * Sanity check - */ + if (ppvObj==NULL) return E_POINTER; @@ -284,21 +282,16 @@ static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface( if (IsEqualIID(riid, &IID_IUnknown)) { - /* IUnknown */ *ppvObj = This; } else if(IsEqualIID(riid, &IID_IOleAdviseHolder)) { - /* IOleAdviseHolder */ *ppvObj = This; } if(*ppvObj == NULL) return E_NOINTERFACE; - /* - * A successful QI always increments the reference count. - */ IUnknown_AddRef((IUnknown*)*ppvObj); return S_OK; @@ -348,26 +341,17 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise( TRACE("(%p)->(%p, %p)\n", This, pAdvise, pdwConnection); - /* - * Sanity check - */ if (pdwConnection==NULL) return E_POINTER; *pdwConnection = 0; - /* - * Find a free spot in the array. - */ for (index = 0; index < This->maxSinks; index++) { if (This->arrayOfSinks[index]==NULL) break; } - /* - * If the array is full, we need to grow it. - */ if (index == This->maxSinks) { DWORD i; @@ -383,9 +367,6 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise( This->arrayOfSinks[i]=0; } - /* - * Store the new sink - */ This->arrayOfSinks[index] = pAdvise; if (This->arrayOfSinks[index]!=NULL) @@ -651,8 +632,6 @@ static void DataAdviseHolder_Destructor(DataAdviseHolder* ptrToDestroy) /************************************************************************ * DataAdviseHolder_QueryInterface (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. */ static HRESULT WINAPI DataAdviseHolder_QueryInterface( IDataAdviseHolder* iface, @@ -661,47 +640,29 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface( { DataAdviseHolder *This = (DataAdviseHolder *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); - /* - * Perform a sanity check on the parameters. - */ + if ( (This==0) || (ppvObject==0) ) return E_INVALIDARG; - /* - * Initialize the return parameter. - */ *ppvObject = 0; - /* - * Compare the riid with the interface IDs implemented by this object. - */ if ( IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IDataAdviseHolder, riid) ) { *ppvObject = iface; } - /* - * Check that we obtained an interface. - */ if ((*ppvObject)==0) { return E_NOINTERFACE; } - /* - * Query Interface always increases the reference count by one when it is - * successful. - */ IUnknown_AddRef((IUnknown*)*ppvObject); - return S_OK; } /************************************************************************ * DataAdviseHolder_AddRef (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. */ static ULONG WINAPI DataAdviseHolder_AddRef( IDataAdviseHolder* iface) @@ -713,8 +674,6 @@ static ULONG WINAPI DataAdviseHolder_AddRef( /************************************************************************ * DataAdviseHolder_Release (IUnknown) - * - * See Windows documentation for more details on IUnknown methods. */ static ULONG WINAPI DataAdviseHolder_Release( IDataAdviseHolder* iface) @@ -723,14 +682,7 @@ static ULONG WINAPI DataAdviseHolder_Release( ULONG ref; TRACE("(%p) (ref=%d)\n", This, This->ref); - /* - * Decrease the reference count on this object. - */ ref = InterlockedDecrement(&This->ref); - - /* - * If the reference count goes down to 0, perform suicide. - */ if (ref==0) DataAdviseHolder_Destructor(This); return ref; @@ -754,26 +706,18 @@ static HRESULT WINAPI DataAdviseHolder_Advise( TRACE("(%p)->(%p, %p, %08x, %p, %p)\n", This, pDataObject, pFetc, advf, pAdvise, pdwConnection); - /* - * Sanity check - */ + if (pdwConnection==NULL) return E_POINTER; *pdwConnection = 0; - /* - * Find a free spot in the array. - */ for (index = 0; index < This->maxCons; index++) { if (This->Connections[index].sink == NULL) break; } - /* - * If the array is full, we need to grow it. - */ if (index == This->maxCons) { This->maxCons+=INITIAL_SINKS; @@ -781,9 +725,7 @@ static HRESULT WINAPI DataAdviseHolder_Advise( This->Connections, This->maxCons*sizeof(DataAdviseConnection)); } - /* - * Store the new sink - */ + This->Connections[index].sink = pAdvise; This->Connections[index].advf = advf & ~WINE_ADVF_REMOTE; This->Connections[index].fmat = *pFetc; @@ -1010,9 +952,6 @@ HRESULT WINAPI CreateOleAdviseHolder( { TRACE("(%p)\n", ppOAHolder); - /* - * Sanity check, - */ if (ppOAHolder==NULL) return E_POINTER; @@ -1032,9 +971,6 @@ HRESULT WINAPI CreateDataAdviseHolder( { TRACE("(%p)\n", ppDAHolder); - /* - * Sanity check, - */ if (ppDAHolder==NULL) return E_POINTER;

1 0

Detlef Riekenberg : cmd: Do not reset errorlevel during SET.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: f29674e86fa6f80d15ede6ad1abdf6168187096f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f29674e86fa6f80d15ede6ad1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 19 23:13:34 2010 +0100 cmd: Do not reset errorlevel during SET. --- programs/cmd/builtins.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7c35e6a..944a997 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2265,7 +2265,6 @@ void WCMD_setshow_env (WCHAR *s) { int status; static const WCHAR parmP[] = {'/','P','\0'}; - errorlevel = 0; if (param1[0] == 0x00 && quals[0] == 0x00) { env = GetEnvironmentStringsW(); WCMD_setshow_sortenv( env, NULL );

1 0

Detlef Riekenberg : cmd: Add german translation for CHOICE.
by Alexandre Julliard 20 Dec '10

20 Dec '10

Module: wine Branch: master Commit: 7506d41e75c283b42fa421d88067ccffb744d571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7506d41e75c283b42fa421d88… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 19 23:13:33 2010 +0100 cmd: Add german translation for CHOICE. --- programs/cmd/De.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 157bc4f..8b4bfb3 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -228,6 +228,10 @@ mit PUSHD gespeicherten.\n" WCMD_MORE, "MORE gibt Dateien und Pipes seitenweise aus.\n" + WCMD_CHOICE, "CHOICE zeigt einen Text auf dem Bildschirm an und wartet,\n\ +bis der Benutzer eine erlaubte Taste aus einer wählbaren Liste drückt.\n\ +CHOICE wird hauptsächlich als Menüauswahl in einer Batchdatei genutzt.\n" + WCMD_EXIT, "EXIT beendet die aktuelle Befehlssitzung und kehrt zum\n\ Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" @@ -237,6 +241,7 @@ Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" ATTRIB\t\tZeigt oder ändert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ CD (CHDIR)\tWechselt in ein Verzeichnis\n\ +CHOICE\t\tWartet auf einen Tastendruck aus einer wählbaren Liste\n\ CLS\t\tLöscht den Inhalt der Konsole\n\ COPY\t\tKopiert eine Datei\n\ CTTY\t\tÄndert das Eingabe/Ausgabe - Gerät\n\

1 0

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 2010