February 2007 - Wine-commits

Rob Shearman : oleaut32: Ignore the first named argument when invoking property-put methods
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: e88d033044f1b93cf9dcec8b997bc37080384bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e88d033044f1b93cf9dcec8b9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 6 19:26:04 2007 +0000 oleaut32: Ignore the first named argument when invoking property-put methods as it is mandatory and doesn't indicate that the arguments will be passed in as named ones. --- dlls/oleaut32/typelib.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 508bb89..63ec327 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5471,8 +5471,24 @@ static HRESULT WINAPI ITypeInfo_fnInvoke VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams); VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams); VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams); + UINT cNamedArgs = pDispParams->cNamedArgs; + DISPID *rgdispidNamedArgs = pDispParams->rgdispidNamedArgs; hres = S_OK; + + if (func_desc->invkind & (INVOKE_PROPERTYPUT|INVOKE_PROPERTYPUTREF)) + { + if (!cNamedArgs || (rgdispidNamedArgs[0] != DISPID_PROPERTYPUT)) + { + ERR("first named arg for property put invocation must be DISPID_PROPERTYPUT\n"); + hres = DISP_E_PARAMNOTOPTIONAL; + goto func_fail; + } + /* ignore the DISPID_PROPERTYPUT named argument from now on */ + cNamedArgs--; + rgdispidNamedArgs++; + } + for (i = 0; i < func_desc->cParams; i++) { TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; @@ -5487,24 +5503,16 @@ static HRESULT WINAPI ITypeInfo_fnInvoke USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; VARIANTARG *src_arg; - if (pDispParams->cNamedArgs) + if (cNamedArgs) { USHORT j; src_arg = NULL; - for (j = 0; j < pDispParams->cNamedArgs; j++) - { - if ((func_desc->invkind & INVOKE_PROPERTYPUT) && - (pDispParams->rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) - { - src_arg = &pDispParams->rgvarg[0]; - break; - } - if (pDispParams->rgdispidNamedArgs[j] == i) + for (j = 0; j < cNamedArgs; j++) + if (rgdispidNamedArgs[j] == i) { src_arg = &pDispParams->rgvarg[j]; break; } - } } else src_arg = i < pDispParams->cArgs ? &pDispParams->rgvarg[pDispParams->cArgs - 1 - i] : NULL;

1 0

Rob Shearman : oleaut32: If an error info object was created when the invoked method failed then fill in exception info from the error info object .
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: e2108feec4c94641c9866b377c29c2727338d70b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2108feec4c94641c9866b377… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 6 19:23:33 2007 +0000 oleaut32: If an error info object was created when the invoked method failed then fill in exception info from the error info object. --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4970f23..47f721b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5665,7 +5665,20 @@ static HRESULT WINAPI ITypeInfo_fnInvoke { WARN("invoked function failed with error 0x%08x\n", V_ERROR(&varresult)); hres = DISP_E_EXCEPTION; - if (pExcepInfo) pExcepInfo->scode = V_ERROR(&varresult); + if (pExcepInfo) + { + IErrorInfo *pErrorInfo; + pExcepInfo->scode = V_ERROR(&varresult); + if (GetErrorInfo(0, &pErrorInfo) == S_OK) + { + IErrorInfo_GetDescription(pErrorInfo, &pExcepInfo->bstrDescription); + IErrorInfo_GetHelpFile(pErrorInfo, &pExcepInfo->bstrHelpFile); + IErrorInfo_GetSource(pErrorInfo, &pExcepInfo->bstrSource); + IErrorInfo_GetHelpContext(pErrorInfo, &pExcepInfo->dwHelpContext); + + IErrorInfo_Release(pErrorInfo); + } + } } func_fail:

1 0

Rob Shearman : ole32: Add the external references that the server gave to us to any existing ifproxy ,
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: cb9c40a8cfc4c2cd5973d8dc72f48d1935fe33c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9c40a8cfc4c2cd5973d8dc7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 6 19:22:39 2007 +0000 ole32: Add the external references that the server gave to us to any existing ifproxy, so that the right external reference count is released when the proxy is destroyed. Protect all changes to refs in the ifproxy using interlocked functions and update the thread-safety documentation. --- dlls/ole32/compobj_private.h | 2 +- dlls/ole32/marshal.c | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index cfee6e3..b77e05f 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -112,7 +112,7 @@ struct ifproxy STDOBJREF stdobjref; /* marshal data that represents this object (RO) */ IID iid; /* interface ID (RO) */ LPRPCPROXYBUFFER proxy; /* interface proxy (RO) */ - DWORD refs; /* imported (public) references (MUTEX parent->remoting_mutex) */ + ULONG refs; /* imported (public) references (LOCK) */ IRpcChannelBuffer *chan; /* channel to object (CS parent->cs) */ }; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index fc63450..e79e93d 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -498,7 +498,7 @@ static HRESULT ifproxy_get_public_ref(st rif.cPrivateRefs = 0; hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); if (hr == S_OK && hrref == S_OK) - This->refs += NORMALEXTREFS; + InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS); else ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); } @@ -511,6 +511,7 @@ static HRESULT ifproxy_get_public_ref(st static HRESULT ifproxy_release_public_refs(struct ifproxy * This) { HRESULT hr = S_OK; + LONG public_refs; if (WAIT_OBJECT_0 != WaitForSingleObject(This->parent->remoting_mutex, INFINITE)) { @@ -518,22 +519,23 @@ static HRESULT ifproxy_release_public_re return E_UNEXPECTED; } - if (This->refs > 0) + public_refs = This->refs; + if (public_refs > 0) { IRemUnknown *remunk = NULL; - TRACE("releasing %d refs\n", This->refs); + TRACE("releasing %d refs\n", public_refs); hr = proxy_manager_get_remunknown(This->parent, &remunk); if (hr == S_OK) { REMINTERFACEREF rif; rif.ipid = This->stdobjref.ipid; - rif.cPublicRefs = This->refs; + rif.cPublicRefs = public_refs; rif.cPrivateRefs = 0; hr = IRemUnknown_RemRelease(remunk, 1, &rif); if (hr == S_OK) - This->refs = 0; + InterlockedExchangeAdd((LONG *)&This->refs, -public_refs); else if (hr == RPC_E_DISCONNECTED) WARN("couldn't release references because object was " "disconnected: oxid = %s, oid = %s\n", @@ -751,7 +753,7 @@ static HRESULT proxy_manager_create_ifpr ifproxy->parent = This; ifproxy->stdobjref = *stdobjref; ifproxy->iid = *riid; - ifproxy->refs = stdobjref->cPublicRefs; + ifproxy->refs = 0; ifproxy->proxy = NULL; assert(channel); @@ -789,10 +791,6 @@ static HRESULT proxy_manager_create_ifpr hr = IRpcProxyBuffer_Connect(ifproxy->proxy, ifproxy->chan); } - /* get at least one external reference to the object to keep it alive */ - if (hr == S_OK) - hr = ifproxy_get_public_ref(ifproxy); - if (hr == S_OK) { EnterCriticalSection(&This->cs); @@ -1136,6 +1134,15 @@ static HRESULT unmarshal_object(const ST IUnknown_AddRef((IUnknown *)ifproxy->iface); if (hr == S_OK) + { + InterlockedExchangeAdd((LONG *)&ifproxy->refs, stdobjref->cPublicRefs); + /* get at least one external reference to the object to keep it alive */ + hr = ifproxy_get_public_ref(ifproxy); + if (FAILED(hr)) + ifproxy_destroy(ifproxy); + } + + if (hr == S_OK) *object = ifproxy->iface; }

1 0

Rob Shearman : ole32: Release iobject and the IRpcStubBuffer object no matter which code path we take .
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 723592cf5a8c72f1ad0ecbc8b2ded58385fb4558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723592cf5a8c72f1ad0ecbc8b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 6 19:21:40 2007 +0000 ole32: Release iobject and the IRpcStubBuffer object no matter which code path we take. Otherwise we would leak a reference for both of these if the ifstub was already created. Fix the FIXME in the code by releasing the stub manager if necessary. --- dlls/ole32/marshal.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 5b2d5b2..fc63450 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -155,17 +155,18 @@ HRESULT marshal_object(APARTMENT *apt, S /* make sure ifstub that we are creating is unique */ ifstub = stub_manager_find_ifstub(manager, riid, mshlflags); if (!ifstub) - { ifstub = stub_manager_new_ifstub(manager, stub, iobject, riid, mshlflags); - IUnknown_Release(iobject); - if (stub) IRpcStubBuffer_Release(stub); - if (!ifstub) - { - stub_manager_int_release(manager); - /* FIXME: should we do another release to completely destroy the - * stub manager? */ - return E_OUTOFMEMORY; - } + + if (stub) IRpcStubBuffer_Release(stub); + IUnknown_Release(iobject); + + if (!ifstub) + { + stub_manager_int_release(manager); + /* destroy the stub manager if it has no ifstubs by releasing + * zero external references */ + stub_manager_ext_release(manager, 0, TRUE); + return E_OUTOFMEMORY; } if (!tablemarshal)

1 0

Rob Shearman : oleaut32: Add a wrapper around the channel supplied to the IDispatch proxy
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 30f2b444c6fcf54f2a6baae0153354ac905f4008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f2b444c6fcf54f2a6baae01… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 6 19:19:56 2007 +0000 oleaut32: Add a wrapper around the channel supplied to the IDispatch proxy to fixup the IID used to connect to the server and fix somewhat common "err:rpc:RPCRT4_OpenBinding" messages. --- dlls/oleaut32/tmarshal.c | 122 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 121 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 1740476..6326212 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -56,6 +56,10 @@ WINE_DECLARE_DEBUG_CHANNEL(olerelay); #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) +static HRESULT TMarshalDispatchChannel_Create( + IRpcChannelBuffer *pDelegateChannel, REFIID tmarshal_riid, + IRpcChannelBuffer **ppChannel); + typedef struct _marshal_state { LPBYTE base; int size; @@ -462,7 +466,13 @@ TMProxyImpl_Connect( LeaveCriticalSection(&This->crit); if (This->dispatch_proxy) - IRpcProxyBuffer_Connect(This->dispatch_proxy, pRpcChannelBuffer); + { + IRpcChannelBuffer *pDelegateChannel; + HRESULT hr = TMarshalDispatchChannel_Create(pRpcChannelBuffer, &This->iid, &pDelegateChannel); + if (FAILED(hr)) + return hr; + return IRpcProxyBuffer_Connect(This->dispatch_proxy, pDelegateChannel); + } return S_OK; } @@ -1496,6 +1506,116 @@ static HRESULT WINAPI ProxyIDispatch_Inv puArgErr); } +typedef struct +{ + const IRpcChannelBufferVtbl *lpVtbl; + LONG refs; + /* the IDispatch-derived interface we are handling */ + IID tmarshal_iid; + IRpcChannelBuffer *pDelegateChannel; +} TMarshalDispatchChannel; + +static HRESULT WINAPI TMarshalDispatchChannel_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid,&IID_IRpcChannelBuffer) || IsEqualIID(riid,&IID_IUnknown)) + { + *ppv = (LPVOID)iface; + IUnknown_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI TMarshalDispatchChannel_AddRef(LPRPCCHANNELBUFFER iface) +{ + TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI TMarshalDispatchChannel_Release(LPRPCCHANNELBUFFER iface) +{ + TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + ULONG ref; + + ref = InterlockedDecrement(&This->refs); + if (ref) + return ref; + + IRpcChannelBuffer_Release(This->pDelegateChannel); + HeapFree(GetProcessHeap(), 0, This); + return 0; +} + +static HRESULT WINAPI TMarshalDispatchChannel_GetBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg, REFIID riid) +{ + TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TRACE("(%p, %s)\n", olemsg, debugstr_guid(riid)); + /* Note: we are pretending to invoke a method on the interface identified + * by tmarshal_iid so that we can re-use the IDispatch proxy/stub code + * without the RPC runtime getting confused by not exporting an IDispatch interface */ + return IRpcChannelBuffer_GetBuffer(This->pDelegateChannel, olemsg, &This->tmarshal_iid); +} + +static HRESULT WINAPI TMarshalDispatchChannel_SendReceive(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE *olemsg, ULONG *pstatus) +{ + TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TRACE("(%p, %p)\n", olemsg, pstatus); + return IRpcChannelBuffer_SendReceive(This->pDelegateChannel, olemsg, pstatus); +} + +static HRESULT WINAPI TMarshalDispatchChannel_FreeBuffer(LPRPCCHANNELBUFFER iface, RPCOLEMESSAGE* olemsg) +{ + TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TRACE("(%p)\n", olemsg); + return IRpcChannelBuffer_FreeBuffer(This->pDelegateChannel, olemsg); +} + +static HRESULT WINAPI TMarshalDispatchChannel_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) +{ + TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext); + return IRpcChannelBuffer_GetDestCtx(This->pDelegateChannel, pdwDestContext, ppvDestContext); +} + +static HRESULT WINAPI TMarshalDispatchChannel_IsConnected(LPRPCCHANNELBUFFER iface) +{ + TMarshalDispatchChannel *This = (TMarshalDispatchChannel *)iface; + TRACE("()\n"); + return IRpcChannelBuffer_IsConnected(This->pDelegateChannel); +} + +static const IRpcChannelBufferVtbl TMarshalDispatchChannelVtbl = +{ + TMarshalDispatchChannel_QueryInterface, + TMarshalDispatchChannel_AddRef, + TMarshalDispatchChannel_Release, + TMarshalDispatchChannel_GetBuffer, + TMarshalDispatchChannel_SendReceive, + TMarshalDispatchChannel_FreeBuffer, + TMarshalDispatchChannel_GetDestCtx, + TMarshalDispatchChannel_IsConnected +}; + +static HRESULT TMarshalDispatchChannel_Create( + IRpcChannelBuffer *pDelegateChannel, REFIID tmarshal_riid, + IRpcChannelBuffer **ppChannel) +{ + TMarshalDispatchChannel *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->lpVtbl = &TMarshalDispatchChannelVtbl; + This->refs = 1; + IRpcChannelBuffer_AddRef(pDelegateChannel); + This->pDelegateChannel = pDelegateChannel; + This->tmarshal_iid = *tmarshal_riid; + + *ppChannel = (IRpcChannelBuffer *)&This->lpVtbl; + return S_OK; +} + + static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) { HRESULT hr;

1 0

Rob Shearman : comctl32: Fix the computation of the select bounds item rect
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 65f1d6a38e479c9cdad425bb1efabf1e18b9a88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65f1d6a38e479c9cdad425bb1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 6 19:20:43 2007 +0000 comctl32: Fix the computation of the select bounds item rect and fixup the places that depended on the old behaviour. --- dlls/comctl32/listview.c | 159 +++++++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65f1d6a38e479c9cdad42…

1 0

Peter Oberndorfer : msi: Store value of the property with each listbox element.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 9afb0f39a84832d39faeca46bc81994ffd266849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afb0f39a84832d39faeca46b… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Feb 6 20:01:08 2007 +0100 msi: Store value of the property with each listbox element. This makes sure the property is set to the right value even when order in listbox is changed. --- dlls/msi/dialog.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f144427..1c05d75 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2100,13 +2100,15 @@ static UINT msi_listbox_add_item( MSIREC struct msi_listbox_info *info = param; LPCWSTR value, text; static int index = 0; + int pos; value = MSI_RecordGetString( rec, 3 ); text = MSI_RecordGetString( rec, 4 ); info->items[index] = strdupW( value ); - SendMessageW( info->hwnd, LB_ADDSTRING, 0, (LPARAM)text ); + pos = SendMessageW( info->hwnd, LB_ADDSTRING, 0, (LPARAM)text ); + SendMessageW( info->hwnd, LB_SETITEMDATA, pos, (LPARAM)info->items[index] ); index++; return ERROR_SUCCESS; } @@ -2146,15 +2148,17 @@ static UINT msi_dialog_listbox_handler( { struct msi_listbox_info *info; int index; + LPCWSTR value; if( HIWORD(param) != LBN_SELCHANGE ) return ERROR_SUCCESS; info = GetPropW( control->hwnd, szButtonData ); index = SendMessageW( control->hwnd, LB_GETCURSEL, 0, 0 ); + value = (LPCWSTR) SendMessageW( control->hwnd, LB_GETITEMDATA, index, 0 ); MSI_SetPropertyW( info->dialog->package, - control->property, info->items[index] ); + control->property, value ); msi_dialog_evaluate_control_conditions( info->dialog ); return ERROR_SUCCESS;

1 0

Peter Oberndorfer : msi: Do not use a static variable to save the insertion position for the listview .
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 91bf34f610331ed15f53053f81bde894933ef228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bf34f610331ed15f53053f8… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Feb 6 20:01:10 2007 +0100 msi: Do not use a static variable to save the insertion position for the listview. --- dlls/msi/dialog.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1c05d75..86f9e00 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2064,6 +2064,7 @@ struct msi_listbox_info HWND hwnd; WNDPROC oldproc; DWORD num_items; + DWORD addpos_items; LPWSTR *items; }; @@ -2099,17 +2100,16 @@ static UINT msi_listbox_add_item( MSIREC { struct msi_listbox_info *info = param; LPCWSTR value, text; - static int index = 0; int pos; value = MSI_RecordGetString( rec, 3 ); text = MSI_RecordGetString( rec, 4 ); - info->items[index] = strdupW( value ); + info->items[info->addpos_items] = strdupW( value ); pos = SendMessageW( info->hwnd, LB_ADDSTRING, 0, (LPARAM)text ); - SendMessageW( info->hwnd, LB_SETITEMDATA, pos, (LPARAM)info->items[index] ); - index++; + SendMessageW( info->hwnd, LB_SETITEMDATA, pos, (LPARAM)info->items[info->addpos_items] ); + info->addpos_items++; return ERROR_SUCCESS; } @@ -2189,6 +2189,7 @@ static UINT msi_dialog_list_box( msi_dia info->dialog = dialog; info->hwnd = control->hwnd; info->items = NULL; + info->addpos_items = 0; info->oldproc = (WNDPROC)SetWindowLongPtrW( control->hwnd, GWLP_WNDPROC, (LONG_PTR)MSIListBox_WndProc ); SetPropW( control->hwnd, szButtonData, info );

1 0

Peter Oberndorfer : msi: Only insert entries into listbox if property value matches.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 79d2f76b8efa57602cf10c819e49c96d3c2073ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d2f76b8efa57602cf10c819… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Feb 6 20:01:03 2007 +0100 msi: Only insert entries into listbox if property value matches. --- dlls/msi/dialog.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 739fcd5..98777ac 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2124,7 +2124,7 @@ static UINT msi_listbox_add_item( MSIREC return ERROR_SUCCESS; } -static UINT msi_listbox_add_items( struct msi_listbox_info *info ) +static UINT msi_listbox_add_items( struct msi_listbox_info *info, LPCWSTR property ) { UINT r; MSIQUERY *view = NULL; @@ -2133,10 +2133,12 @@ static UINT msi_listbox_add_items( struc static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ','`','L','i','s','t','B','o','x','`',' ', + 'W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ', 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0 }; - r = MSI_OpenQuery( info->dialog->package->db, &view, query ); + r = MSI_OpenQuery( info->dialog->package->db, &view, query, property ); if ( r != ERROR_SUCCESS ) return r; @@ -2176,6 +2178,7 @@ static UINT msi_dialog_list_box( msi_dia struct msi_listbox_info *info; msi_control *control; DWORD style; + LPCWSTR prop; info = msi_alloc( sizeof *info ); if (!info) @@ -2188,6 +2191,9 @@ static UINT msi_dialog_list_box( msi_dia control->handler = msi_dialog_listbox_handler; + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + /* subclass */ info->dialog = dialog; info->hwnd = control->hwnd; @@ -2196,7 +2202,8 @@ static UINT msi_dialog_list_box( msi_dia (LONG_PTR)MSIListBox_WndProc ); SetPropW( control->hwnd, szButtonData, info ); - msi_listbox_add_items( info ); + if ( control->property ) + msi_listbox_add_items( info, control->property ); return ERROR_SUCCESS; }

1 0

Peter Oberndorfer : msi: Do not store property for each listbox element, as it is the same one for the whole listbox.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 69448afdc7e6551de6b0965a15cbe66f8210c957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69448afdc7e6551de6b0965a1… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Tue Feb 6 20:01:05 2007 +0100 msi: Do not store property for each listbox element, as it is the same one for the whole listbox. Remove struct msi_listbox_item as it only contains 1 element now. --- dlls/msi/dialog.c | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 98777ac..f144427 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2058,19 +2058,13 @@ static UINT msi_dialog_group_box( msi_di /******************** List Box ***************************************/ -struct msi_listbox_item -{ - LPWSTR property; - LPWSTR value; -}; - struct msi_listbox_info { msi_dialog *dialog; HWND hwnd; WNDPROC oldproc; DWORD num_items; - struct msi_listbox_item *items; + LPWSTR *items; }; static LRESULT WINAPI MSIListBox_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -2091,10 +2085,7 @@ static LRESULT WINAPI MSIListBox_WndProc { case WM_NCDESTROY: for (j = 0; j < info->num_items; j++) - { - msi_free( info->items[j].property ); - msi_free( info->items[j].value ); - } + msi_free( info->items[j] ); msi_free( info->items ); msi_free( info ); RemovePropW( hWnd, szButtonData ); @@ -2107,20 +2098,16 @@ static LRESULT WINAPI MSIListBox_WndProc static UINT msi_listbox_add_item( MSIRECORD *rec, LPVOID param ) { struct msi_listbox_info *info = param; - struct msi_listbox_item *item; - LPCWSTR property, value, text; + LPCWSTR value, text; static int index = 0; - item = &info->items[index++]; - property = MSI_RecordGetString( rec, 1 ); value = MSI_RecordGetString( rec, 3 ); text = MSI_RecordGetString( rec, 4 ); - item->property = strdupW( property ); - item->value = strdupW( value ); + info->items[index] = strdupW( value ); SendMessageW( info->hwnd, LB_ADDSTRING, 0, (LPARAM)text ); - + index++; return ERROR_SUCCESS; } @@ -2167,7 +2154,7 @@ static UINT msi_dialog_listbox_handler( index = SendMessageW( control->hwnd, LB_GETCURSEL, 0, 0 ); MSI_SetPropertyW( info->dialog->package, - info->items[index].property, info->items[index].value ); + control->property, info->items[index] ); msi_dialog_evaluate_control_conditions( info->dialog ); return ERROR_SUCCESS;

1 0