June 2009 - Wine-Commits - list.winehq.org

Gerald Pfeifer : wined3d: Fix logical condition in find_clip_texcoord().
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 569b448e134e3b65e2ef4fc765e629e2c938be82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569b448e134e3b65e2ef4fc76… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jun 20 17:17:53 2009 +0200 wined3d: Fix logical condition in find_clip_texcoord(). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index affc2ae..44b4fce 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3856,7 +3856,7 @@ static void find_clip_texcoord(IWineD3DPixelShaderImpl *ps, const WineD3D_GL_Inf { for(i = GL_LIMITS(texture_stages); i > 0; i--) { - if(!ps->baseShader.reg_maps.input_registers & (1 << (i - 1))) + if(!(ps->baseShader.reg_maps.input_registers & (1 << (i - 1)))) { shader_priv->clipplane_emulation = i; break;

1 0

Aric Stewart : msctf: Define ITfCompartment.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: e842f250ee475047138894aafe66977d8911e485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e842f250ee475047138894aaf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:02:08 2009 +0900 msctf: Define ITfCompartment. --- dlls/msctf/compartmentmgr.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 5342568..7e23b86 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -67,7 +67,17 @@ typedef struct tagCompartmentEnumGuid { struct list *cursor; } CompartmentEnumGuid; +typedef struct tagCompartment { + const ITfCompartmentVtbl *Vtbl; + LONG refCount; + + /* Only VT_I4, VT_UNKNOWN and VT_BSTR data types are allowed */ + VARIANT variant; + CompartmentValue *valueData; +} Compartment; + static HRESULT CompartmentEnumGuid_Constructor(struct list* values, IEnumGUID **ppOut); +static HRESULT Compartment_Constructor(CompartmentValue *value, ITfCompartment **ppOut); HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *iface) { @@ -367,3 +377,94 @@ static HRESULT CompartmentEnumGuid_Constructor(struct list *values, IEnumGUID ** *ppOut = (IEnumGUID*)This; return S_OK; } + +/************************************************** + * ITfCompartment + **************************************************/ +static void Compartment_Destructor(Compartment *This) +{ + TRACE("destroying %p\n", This); + VariantClear(&This->variant); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI Compartment_QueryInterface(ITfCompartment *iface, REFIID iid, LPVOID *ppvOut) +{ + Compartment *This = (Compartment *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfCompartment)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Compartment_AddRef(ITfCompartment *iface) +{ + Compartment *This = (Compartment*)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI Compartment_Release(ITfCompartment *iface) +{ + Compartment *This = (Compartment *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + Compartment_Destructor(This); + return ret; +} + +static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, + TfClientId tid, const VARIANT *pvarValue) +{ + Compartment *This = (Compartment *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface, + VARIANT *pvarValue) +{ + Compartment *This = (Compartment *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfCompartmentVtbl ITfCompartment_Vtbl ={ + Compartment_QueryInterface, + Compartment_AddRef, + Compartment_Release, + + Compartment_SetValue, + Compartment_GetValue +}; + +static HRESULT Compartment_Constructor(CompartmentValue *valueData, ITfCompartment **ppOut) +{ + Compartment *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(Compartment)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->Vtbl= &ITfCompartment_Vtbl; + This->refCount = 1; + + This->valueData = valueData; + VariantInit(&This->variant); + + TRACE("returning %p\n", This); + *ppOut = (ITfCompartment*)This; + return S_OK; +}

1 0

Aric Stewart : msctf: Implement ITfCompartment::GetValue.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 21c4671e0114d8beafbcea14a47976a3992e9d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c4671e0114d8beafbcea14a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:02:24 2009 +0900 msctf: Implement ITfCompartment::GetValue. --- dlls/msctf/compartmentmgr.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 7e23b86..253bec7 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -436,9 +436,17 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface, VARIANT *pvarValue) { + HRESULT hr = S_OK; Compartment *This = (Compartment *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This, pvarValue); + + if (!pvarValue) + return E_INVALIDARG; + + pvarValue->n1.n2.vt = VT_EMPTY; + if (!This->variant.n1.n2.vt == VT_EMPTY) + hr = VariantCopy(pvarValue,&This->variant); + return hr; } static const ITfCompartmentVtbl ITfCompartment_Vtbl ={

1 0

Aric Stewart : msctf: Implement ITfCompartment::SetValue.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 3a18408dd590ccbb8d28bc66615b4a8801c9af12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a18408dd590ccbb8d28bc666… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 22 12:03:35 2009 +0900 msctf: Implement ITfCompartment::SetValue. --- dlls/msctf/compartmentmgr.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/compartmentmgr.c b/dlls/msctf/compartmentmgr.c index 253bec7..09b71b1 100644 --- a/dlls/msctf/compartmentmgr.c +++ b/dlls/msctf/compartmentmgr.c @@ -429,8 +429,31 @@ static HRESULT WINAPI Compartment_SetValue(ITfCompartment *iface, TfClientId tid, const VARIANT *pvarValue) { Compartment *This = (Compartment *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %i %p\n",This,tid,pvarValue); + + if (!pvarValue) + return E_INVALIDARG; + + if (!(V_VT(pvarValue) == VT_BSTR || V_VT(pvarValue) == VT_I4 || + V_VT(pvarValue) == VT_UNKNOWN)) + return E_INVALIDARG; + + if (!This->valueData->owner) + This->valueData->owner = tid; + + VariantClear(&This->variant); + + /* Shallow copy of value and type */ + This->variant = *pvarValue; + + if (V_VT(pvarValue) == VT_BSTR) + V_BSTR(&This->variant) = SysAllocStringByteLen((char*)V_BSTR(pvarValue), + SysStringByteLen(V_BSTR(pvarValue))); + else if (V_VT(pvarValue) == VT_UNKNOWN) + IUnknown_AddRef(V_UNKNOWN(&This->variant)); + + return S_OK; } static HRESULT WINAPI Compartment_GetValue(ITfCompartment *iface,

1 0

Nikolay Sivov : comctl32/listview: Implement LVM_ISITEMVISIBLE.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 76cb9c0d77d1652be1f306f5cc6d15a1cd78320e URL: http://source.winehq.org/git/wine.git/?a=commit;h=76cb9c0d77d1652be1f306f5c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 20 02:28:20 2009 +0400 comctl32/listview: Implement LVM_ISITEMVISIBLE. --- dlls/comctl32/listview.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 1 + 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f9608c6..53298be 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6946,6 +6946,44 @@ fail: /*** * DESCRIPTION: + * Checks item visibility. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] nFirst : item index to check for + * + * RETURN: + * Item visible : TRUE + * Item invisible or failure : FALSE + */ +static BOOL LISTVIEW_IsItemVisible(const LISTVIEW_INFO *infoPtr, INT nItem) +{ + POINT Origin, Position; + RECT rcItem; + HDC hdc; + BOOL ret; + + TRACE("nItem=%d\n", nItem); + + if (nItem < 0 || nItem >= DPA_GetPtrCount(infoPtr->hdpaItems)) return FALSE; + + LISTVIEW_GetOrigin(infoPtr, &Origin); + LISTVIEW_GetItemOrigin(infoPtr, nItem, &Position); + rcItem.left = Position.x + Origin.x; + rcItem.top = Position.y + Origin.y; + rcItem.right = rcItem.left + infoPtr->nItemWidth; + rcItem.bottom = rcItem.top + infoPtr->nItemHeight; + + hdc = GetDC(infoPtr->hwndSelf); + if (!hdc) return FALSE; + ret = RectVisible(hdc, &rcItem); + ReleaseDC(infoPtr->hwndSelf, hdc); + + return ret; +} + +/*** + * DESCRIPTION: * Redraws a range of items. * * PARAMETER(S): @@ -10340,6 +10378,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_ISGROUPVIEWENABLED: */ + case LVM_ISITEMVISIBLE: + return LISTVIEW_IsItemVisible(infoPtr, (INT)wParam); + /* case LVM_MAPIDTOINDEX: */ /* case LVM_MAPINDEXTOID: */ diff --git a/include/commctrl.h b/include/commctrl.h index b064c01..6eb5f32 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3252,6 +3252,7 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_CANCELEDITLABEL (LVM_FIRST + 179) #define LVM_MAPINDEXTOID (LVM_FIRST + 180) #define LVM_MAPIDTOINDEX (LVM_FIRST + 181) +#define LVM_ISITEMVISIBLE (LVM_FIRST + 182) #define LVN_FIRST (0U-100U) #define LVN_LAST (0U-199U)

1 0

Detlef Riekenberg : urlmon: Implement ZoneManager_GetZoneAttributes.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 7e1372387411bcaacf1cd11868a78a60c3011c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1372387411bcaacf1cd1186… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 22 00:39:11 2009 +0200 urlmon: Implement ZoneManager_GetZoneAttributes. --- dlls/urlmon/sec_mgr.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 943b6dd..19286b1 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -29,7 +29,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +static const WCHAR currentlevelW[] = {'C','u','r','r','e','n','t','L','e','v','e','l',0}; +static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR displaynameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR fileW[] = {'f','i','l','e',0}; +static const WCHAR flagsW[] = {'F','l','a','g','s',0}; +static const WCHAR iconW[] = {'I','c','o','n',0}; +static const WCHAR minlevelW[] = {'M','i','n','L','e','v','e','l',0}; +static const WCHAR recommendedlevelW[] = {'R','e','c','o','m','m','e','n','d','e','d', + 'L','e','v','e','l',0}; + +/******************************************************************** + * get_string_from_reg [internal] + * + * helper to get a string from the reg. + * + */ +static void get_string_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPWSTR out, DWORD maxlen) +{ + DWORD type = REG_SZ; + DWORD len = maxlen * sizeof(WCHAR); + DWORD res; + + res = RegQueryValueExW(hcu, name, NULL, &type, (LPBYTE) out, &len); + + if (res && hklm) { + len = maxlen * sizeof(WCHAR); + type = REG_SZ; + res = RegQueryValueExW(hklm, name, NULL, &type, (LPBYTE) out, &len); + } + + if (res) { + TRACE("%s failed: %d\n", debugstr_w(name), res); + *out = '\0'; + } +} + +/******************************************************************** + * get_dword_from_reg [internal] + * + * helper to get a dword from the reg. + * + */ +static void get_dword_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPDWORD out) +{ + DWORD type = REG_DWORD; + DWORD len = sizeof(DWORD); + DWORD res; + + res = RegQueryValueExW(hcu, name, NULL, &type, (LPBYTE) out, &len); + + if (res && hklm) { + len = sizeof(DWORD); + type = REG_DWORD; + res = RegQueryValueExW(hklm, name, NULL, &type, (LPBYTE) out, &len); + } + + if (res) { + TRACE("%s failed: %d\n", debugstr_w(name), res); + *out = 0; + } +} static HRESULT get_zone_from_reg(LPCWSTR schema, DWORD *zone) { @@ -677,8 +737,35 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManager* iface, DWORD dwZone, ZONEATTRIBUTES* pZoneAttributes) { - FIXME("(%p)->(%d %p) stub\n", iface, dwZone, pZoneAttributes); - return E_NOTIMPL; + ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + HRESULT hr; + HKEY hcu; + HKEY hklm = NULL; + + TRACE("(%p)->(%d %p)\n", This, dwZone, pZoneAttributes); + + if (!pZoneAttributes) + return E_INVALIDARG; + + hr = open_zone_key(HKEY_CURRENT_USER, dwZone, &hcu); + if (FAILED(hr)) + return S_OK; /* IE6 and older returned E_FAIL here */ + + hr = open_zone_key(HKEY_LOCAL_MACHINE, dwZone, &hklm); + if (FAILED(hr)) + TRACE("Zone %d not in HKLM\n", dwZone); + + get_string_from_reg(hcu, hklm, displaynameW, pZoneAttributes->szDisplayName, MAX_ZONE_PATH); + get_string_from_reg(hcu, hklm, descriptionW, pZoneAttributes->szDescription, MAX_ZONE_DESCRIPTION); + get_string_from_reg(hcu, hklm, iconW, pZoneAttributes->szIconPath, MAX_ZONE_PATH); + get_dword_from_reg(hcu, hklm, minlevelW, &pZoneAttributes->dwTemplateMinLevel); + get_dword_from_reg(hcu, hklm, currentlevelW, &pZoneAttributes->dwTemplateCurrentLevel); + get_dword_from_reg(hcu, hklm, recommendedlevelW, &pZoneAttributes->dwTemplateRecommended); + get_dword_from_reg(hcu, hklm, flagsW, &pZoneAttributes->dwFlags); + + RegCloseKey(hklm); + RegCloseKey(hcu); + return S_OK; } /********************************************************************

1 0

Hib Eris : msi: Release more msi_custom_action_info when no longer needed.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 5392014e29d0d93184b58dbd25ddda08a10271ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5392014e29d0d93184b58dbd2… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:48:21 2009 +0200 msi: Release more msi_custom_action_info when no longer needed. --- dlls/msi/custom.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 66751ca..3476f0d 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -851,6 +851,7 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, msi_custom_action_info *info; WCHAR package_path[MAX_PATH]; DWORD size; + UINT r; static const WCHAR backslash[] = {'\\',0}; @@ -863,7 +864,9 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); - return wait_thread_handle(info); + r = wait_thread_handle(info); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, @@ -953,6 +956,7 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; MSIFILE *file; + UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -965,7 +969,9 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, @@ -1345,6 +1351,7 @@ static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); + release_custom_action_data( info ); done: msi_free(bufferw); @@ -1357,6 +1364,7 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; WCHAR *prop; + UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -1366,7 +1374,9 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, prop, NULL, action ); msi_free(prop); - return wait_thread_handle( info ); + r = wait_thread_handle( info ); + release_custom_action_data( info ); + return r; } void ACTION_FinishCustomActions(const MSIPACKAGE* package)

1 0

Hib Eris : msi: Insert new tables in correct _Tables location.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 65ac2061946398934951dd201582f879cd70af9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ac2061946398934951dd201… Author: Hib Eris <hib(a)hiberis.nl> Date: Sun Jun 21 19:28:57 2009 +0200 msi: Insert new tables in correct _Tables location. --- dlls/msi/table.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/msi/tests/db.c | 14 +++++++------- 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 0b5b991..dc21b3b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -121,6 +121,7 @@ static void table_calc_column_offsets( MSIDATABASE *db, MSICOLUMNINFO *colinfo, static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); +static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx); static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col ) { @@ -620,6 +621,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, column_info *col; MSITABLE *table; UINT i; + INT idx; /* only add tables that don't exist already */ if( TABLE_Exists(db, name ) ) @@ -685,7 +687,11 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( r ) goto err; - r = tv->ops->insert_row( tv, rec, -1, persistent == MSICONDITION_FALSE ); + r = table_find_insert_idx (tv, name, &idx); + if (r != ERROR_SUCCESS) + idx = -1; + + r = tv->ops->insert_row( tv, rec, idx, persistent == MSICONDITION_FALSE ); TRACE("insert_row returned %x\n", r); if( r ) goto err; @@ -735,7 +741,11 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( r ) goto err; - r = tv->ops->insert_row( tv, rec, -1, FALSE ); + r = table_find_insert_idx (tv, name, &idx); + if (r != ERROR_SUCCESS) + idx = -1; + + r = tv->ops->insert_row( tv, rec, idx, FALSE ); if( r ) goto err; @@ -2923,3 +2933,29 @@ void msi_free_transforms( MSIDATABASE *db ) msi_free( t ); } } + +static UINT table_find_insert_idx (MSIVIEW *view, LPCWSTR name, INT *pidx) +{ + UINT r, name_id, row_id; + INT idx; + MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + + TRACE ("%p %s\n", view, debugstr_w(name)); + + r = msi_string2idW(tv->db->strings, name, &name_id); + if (r != ERROR_SUCCESS) + { + *pidx = -1; + return r; + } + + for( idx = 0; idx < tv->table->row_count; idx++ ) + { + r = TABLE_fetch_int( &tv->view, idx, 1, &row_id ); + if (row_id > name_id) + break; + } + + *pidx = idx; + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 75a0ebe..43b5648 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4346,7 +4346,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4355,7 +4355,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4391,11 +4391,11 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4408,7 +4408,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); + ok(!lstrcmp(buffer, "baz"), "Expected baz, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4421,7 +4421,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); + ok(!lstrcmp(buffer, "foo"), "Expected foo, got %s\n", buffer); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4430,7 +4430,7 @@ static void test_tables_order(void) sz = sizeof(buffer); r = MsiRecordGetString(hrec, 1, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); + ok(!lstrcmp(buffer, "bar"), "Expected bar, got %s\n", buffer); sz = sizeof(buffer); r = MsiRecordGetString(hrec, 3, buffer, &sz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Nikolay Sivov : comctl32/listview: Implement LVM_MAPIDTOINDEX/ LVM_MAPINDEXTOID.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 85224d7f17755e366a1bfb54928f621c80ded4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85224d7f17755e366a1bfb549… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 21 00:48:07 2009 +0400 comctl32/listview: Implement LVM_MAPIDTOINDEX/LVM_MAPINDEXTOID. --- dlls/comctl32/listview.c | 120 +++++++++++++++++++++++++++++++++++++++- dlls/comctl32/tests/listview.c | 33 ++++++++++- 2 files changed, 147 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 53298be..f0a294e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -124,7 +124,6 @@ * -- LVM_INSERTGROUPSORTED * -- LVM_INSERTMARKHITTEST * -- LVM_ISGROUPVIEWENABLED - * -- LVM_MAPIDTOINDEX, LVM_MAPINDEXTOID * -- LVM_MOVEGROUP * -- LVM_MOVEITEMTOGROUP * -- LVM_SETINFOTIP @@ -194,14 +193,23 @@ typedef struct tagSUBITEM_INFO INT iSubItem; } SUBITEM_INFO; +typedef struct tagITEM_ID ITEM_ID; + typedef struct tagITEM_INFO { ITEMHDR hdr; UINT state; LPARAM lParam; INT iIndent; + ITEM_ID *id; } ITEM_INFO; +struct tagITEM_ID +{ + UINT id; /* item id */ + HDPA item; /* link to item data */ +}; + typedef struct tagRANGE { INT lower; @@ -278,6 +286,7 @@ typedef struct tagLISTVIEW_INFO DWORD uView; /* current view available through LVM_[G,S]ETVIEW */ INT nItemCount; /* the number of items in the list */ HDPA hdpaItems; /* array ITEM_INFO pointers */ + HDPA hdpaItemIds; /* array of ITEM_ID pointers */ HDPA hdpaPosX; /* maintains the (X, Y) coordinates of the */ HDPA hdpaPosY; /* items in LVS_ICON, and LVS_SMALLICON modes */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ @@ -1430,6 +1439,19 @@ static inline void map_style_view(LISTVIEW_INFO *infoPtr) } } +/* computes next item id value */ +static DWORD get_next_itemid(const LISTVIEW_INFO *infoPtr) +{ + INT count = DPA_GetPtrCount(infoPtr->hdpaItemIds); + + if (count > 0) + { + ITEM_ID *lpID = DPA_GetPtr(infoPtr->hdpaItemIds, count - 1); + return lpID->id + 1; + } + return 0; +} + /******** Internal API functions ************************************/ static inline COLUMN_INFO * LISTVIEW_GetColumnInfo(const LISTVIEW_INFO *infoPtr, INT nSubItem) @@ -2310,6 +2332,76 @@ static void LISTVIEW_GetItemBox(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT OffsetRect(lprcBox, Position.x + Origin.x, Position.y + Origin.y); } +/* LISTVIEW_MapIdToIndex helper */ +INT CALLBACK MapIdSearchCompare(LPVOID p1, LPVOID p2, LPARAM lParam) +{ + ITEM_ID *id1 = (ITEM_ID*)p1; + ITEM_ID *id2 = (ITEM_ID*)p2; + + if (id1->id == id2->id) return 0; + + return (id1->id < id2->id) ? -1 : 1; +} + +/*** + * DESCRIPTION: + * Returns the item index for id specified. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] iID : item id to get index for + * + * RETURN: + * Item index, or -1 on failure. + */ +static INT LISTVIEW_MapIdToIndex(const LISTVIEW_INFO *infoPtr, UINT iID) +{ + ITEM_ID ID; + INT index; + + TRACE("iID=%d\n", iID); + + if (infoPtr->dwStyle & LVS_OWNERDATA) return -1; + if (infoPtr->nItemCount == 0) return -1; + + ID.id = iID; + index = DPA_Search(infoPtr->hdpaItemIds, &ID, -1, &MapIdSearchCompare, 0, DPAS_SORTED); + + if (index != -1) + { + ITEM_ID *lpID = DPA_GetPtr(infoPtr->hdpaItemIds, index); + return DPA_GetPtrIndex(infoPtr->hdpaItems, lpID->item); + } + + return -1; +} + +/*** + * DESCRIPTION: + * Returns the item id for index given. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] iItem : item index to get id for + * + * RETURN: + * Item id. + */ +static DWORD LISTVIEW_MapIndexToId(const LISTVIEW_INFO *infoPtr, INT iItem) +{ + ITEM_INFO *lpItem; + HDPA hdpaSubItems; + + TRACE("iItem=%d\n", iItem); + + if (infoPtr->dwStyle & LVS_OWNERDATA) return -1; + if (iItem < 0 || iItem >= infoPtr->nItemCount) return -1; + + hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, iItem); + lpItem = DPA_GetPtr(hdpaSubItems, 0); + + return lpItem->id->id; +} /*** * DESCRIPTION: @@ -4988,9 +5080,18 @@ static BOOL LISTVIEW_DeleteItem(LISTVIEW_INFO *infoPtr, INT nItem) { HDPA hdpaSubItems; ITEMHDR *hdrItem; + ITEM_INFO *lpItem; + ITEM_ID *lpID; INT i; hdpaSubItems = DPA_DeletePtr(infoPtr->hdpaItems, nItem); + lpItem = DPA_GetPtr(hdpaSubItems, 0); + + /* free id struct */ + i = DPA_GetPtrIndex(infoPtr->hdpaItemIds, lpItem->id); + lpID = DPA_GetPtr(infoPtr->hdpaItemIds, i); + DPA_DeletePtr(infoPtr->hdpaItemIds, i); + Free(lpID); for (i = 0; i < DPA_GetPtrCount(hdpaSubItems); i++) { hdrItem = DPA_GetPtr(hdpaSubItems, i); @@ -6815,6 +6916,7 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, HDPA hdpaSubItems; NMLISTVIEW nmlv; ITEM_INFO *lpItem; + ITEM_ID *lpID; BOOL is_sorted, has_changed; LVITEMW item; HWND hwndSelf = infoPtr->hwndSelf; @@ -6834,6 +6936,13 @@ static INT LISTVIEW_InsertItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, if ( !(hdpaSubItems = DPA_Create(8)) ) goto fail; if ( !DPA_SetPtr(hdpaSubItems, 0, lpItem) ) assert (FALSE); + /* link with id struct */ + if (!(lpID = Alloc(sizeof(ITEM_ID)))) goto fail; + lpItem->id = lpID; + lpID->item = hdpaSubItems; + lpID->id = get_next_itemid(infoPtr); + if ( DPA_InsertPtr(infoPtr->hdpaItemIds, infoPtr->nItemCount, lpID) == -1) goto fail; + is_sorted = (infoPtr->dwStyle & (LVS_SORTASCENDING | LVS_SORTDESCENDING)) && !(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (LPSTR_TEXTCALLBACKW != lpLVItem->pszText); @@ -8483,6 +8592,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) /* allocate memory for the data structure */ if (!(infoPtr->selectionRanges = ranges_create(10))) goto fail; if (!(infoPtr->hdpaItems = DPA_Create(10))) goto fail; + if (!(infoPtr->hdpaItemIds = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaPosX = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaPosY = DPA_Create(10))) goto fail; if (!(infoPtr->hdpaColumns = DPA_Create(10))) goto fail; @@ -8492,6 +8602,7 @@ fail: DestroyWindow(infoPtr->hwndHeader); ranges_destroy(infoPtr->selectionRanges); DPA_Destroy(infoPtr->hdpaItems); + DPA_Destroy(infoPtr->hdpaItemIds); DPA_Destroy(infoPtr->hdpaPosX); DPA_Destroy(infoPtr->hdpaPosY); DPA_Destroy(infoPtr->hdpaColumns); @@ -9264,6 +9375,7 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) /* destroy data structure */ DPA_Destroy(infoPtr->hdpaItems); + DPA_Destroy(infoPtr->hdpaItemIds); DPA_Destroy(infoPtr->hdpaPosX); DPA_Destroy(infoPtr->hdpaPosY); DPA_Destroy(infoPtr->hdpaColumns); @@ -10381,9 +10493,11 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_ISITEMVISIBLE: return LISTVIEW_IsItemVisible(infoPtr, (INT)wParam); - /* case LVM_MAPIDTOINDEX: */ + case LVM_MAPIDTOINDEX: + return LISTVIEW_MapIdToIndex(infoPtr, (UINT)wParam); - /* case LVM_MAPINDEXTOID: */ + case LVM_MAPINDEXTOID: + return LISTVIEW_MapIndexToId(infoPtr, (INT)wParam); /* case LVM_MOVEGROUP: */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index de899f5..6f6fdf7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3588,24 +3588,51 @@ static void test_mapidindex(void) HWND hwnd; DWORD ret; + /* LVM_MAPINDEXTOID unsupported with LVS_OWNERDATA */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + insert_item(hwnd, 0); + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 0, 0); + expect(-1, ret); + DestroyWindow(hwnd); + hwnd = create_listview_control(0); ok(hwnd != NULL, "failed to create a listview window\n"); + /* LVM_MAPINDEXTOID with invalid index */ + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 0, 0); + expect(-1, ret); + insert_item(hwnd, 0); insert_item(hwnd, 1); + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, -1, 0); + expect(-1, ret); + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 2, 0); + expect(-1, ret); + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 0, 0); expect(0, ret); ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 1, 0); - todo_wine expect(1, ret); + expect(1, ret); /* remove 0 indexed item, id retained */ SendMessage(hwnd, LVM_DELETEITEM, 0, 0); ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 0, 0); - todo_wine expect(1, ret); + expect(1, ret); /* new id starts from previous value */ insert_item(hwnd, 1); ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 1, 0); - todo_wine expect(2, ret); + expect(2, ret); + + /* get index by id */ + ret = SendMessage(hwnd, LVM_MAPIDTOINDEX, -1, 0); + expect(-1, ret); + ret = SendMessage(hwnd, LVM_MAPIDTOINDEX, 0, 0); + expect(-1, ret); + ret = SendMessage(hwnd, LVM_MAPIDTOINDEX, 1, 0); + expect(0, ret); + ret = SendMessage(hwnd, LVM_MAPIDTOINDEX, 2, 0); + expect(1, ret); DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Basic LVM_MAPINDEXTOID tests.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 2286a321c24ba88dcf2574b281fc7b2c80dbc409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2286a321c24ba88dcf2574b28… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 20 14:56:55 2009 +0400 comctl32/listview: Basic LVM_MAPINDEXTOID tests. --- dlls/comctl32/tests/listview.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 7d14294..de899f5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3583,6 +3583,33 @@ static void test_canceleditlabel(void) DestroyWindow(hwnd); } +static void test_mapidindex(void) +{ + HWND hwnd; + DWORD ret; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_item(hwnd, 0); + insert_item(hwnd, 1); + + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 0, 0); + expect(0, ret); + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 1, 0); + todo_wine expect(1, ret); + /* remove 0 indexed item, id retained */ + SendMessage(hwnd, LVM_DELETEITEM, 0, 0); + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 0, 0); + todo_wine expect(1, ret); + /* new id starts from previous value */ + insert_item(hwnd, 1); + ret = SendMessage(hwnd, LVM_MAPINDEXTOID, 1, 0); + todo_wine expect(2, ret); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3648,6 +3675,7 @@ START_TEST(listview) /* comctl32 version 6 tests start here */ test_get_set_view(); test_canceleditlabel(); + test_mapidindex(); unload_v6_module(ctx_cookie);

1 0