February 2009 - Wine-commits

Igor Tarasov : comctl32: Implement LVN_ODFINDITEM.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: e02d80b7752b83a828b0a2e52d422725997cd7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02d80b7752b83a828b0a2e52… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Thu Feb 19 07:26:10 2009 +0400 comctl32: Implement LVN_ODFINDITEM. --- dlls/comctl32/listview.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6b89766..af84938 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -106,7 +106,6 @@ * -- LVN_GETINFOTIP * -- LVN_HOTTRACK * -- LVN_MARQUEEBEGIN - * -- LVN_ODFINDITEM * -- LVN_SETDISPINFO * -- NM_HOVER * -- LVN_BEGINRDRAG @@ -1574,6 +1573,28 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L endidx=infoPtr->nItemCount; idx=0; } + + /* Let application handle this for virtual listview */ + if (infoPtr->dwStyle & LVS_OWNERDATA) + { + NMLVFINDITEMW nmlv; + LVFINDINFOW lvfi; + + ZeroMemory(&lvfi, sizeof(lvfi)); + lvfi.flags = (LVFI_WRAP | LVFI_PARTIAL); + infoPtr->szSearchParam[infoPtr->nSearchParamLength] = '\0'; + lvfi.psz = infoPtr->szSearchParam; + nmlv.iStart = idx; + nmlv.lvfi = lvfi; + + nItem = notify_hdr(infoPtr, LVN_ODFINDITEMW, (LPNMHDR)&nmlv.hdr); + + if (nItem != -1) + LISTVIEW_KeySelection(infoPtr, nItem); + + return 0; + } + do { if (idx == infoPtr->nItemCount) { if (endidx == infoPtr->nItemCount || endidx == 0) @@ -5075,6 +5096,17 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, POINT Position, Destination; LVITEMW lvItem; + /* Search in virtual listviews should be done by application, not by + listview control, so we just send LVN_ODFINDITEMW and return the result */ + if (infoPtr->dwStyle & LVS_OWNERDATA) + { + NMLVFINDITEMW nmlv; + + nmlv.iStart = nStart; + nmlv.lvfi = *lpFindInfo; + return notify_hdr(infoPtr, LVN_ODFINDITEMW, (LPNMHDR)&nmlv.hdr); + } + if (!lpFindInfo || nItem < 0) return -1; lvItem.mask = 0;

1 0

Igor Tarasov : comctl32: Do not send LVN_DELETEITEM on LVM_DELETEALLITEMS for virtual listviews.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: d86a5a611de6df1c5dfcfa476ec752b0648a4e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86a5a611de6df1c5dfcfa476… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Thu Feb 19 07:41:25 2009 +0400 comctl32: Do not send LVN_DELETEITEM on LVM_DELETEALLITEMS for virtual listviews. --- dlls/comctl32/listview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index af84938..6724139 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4532,10 +4532,11 @@ static BOOL LISTVIEW_DeleteAllItems(LISTVIEW_INFO *infoPtr, BOOL destroy) for (i = infoPtr->nItemCount - 1; i >= 0; i--) { - /* send LVN_DELETEITEM notification, if not suppressed */ - if (!bSuppress) notify_deleteitem(infoPtr, i); if (!(infoPtr->dwStyle & LVS_OWNERDATA)) { + /* send LVN_DELETEITEM notification, if not suppressed + and if it is not a virtual listview */ + if (!bSuppress) notify_deleteitem(infoPtr, i); hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, i); for (j = 0; j < DPA_GetPtrCount(hdpaSubItems); j++) {

1 0

Igor Tarasov : comctl32: Make listview forward HDN_ITEMCLICK.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: b3b7ecb390d807ab80d07a3a4f859ec936106ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b7ecb390d807ab80d07a3a4… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Tue Feb 17 15:20:52 2009 +0400 comctl32: Make listview forward HDN_ITEMCLICK. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6724139..66b45b4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8986,6 +8986,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE nmlv.iItem = -1; nmlv.iSubItem = lpnmh->iItem; notify_listview(infoPtr, LVN_COLUMNCLICK, &nmlv); + notify_forward_header(infoPtr, lpnmh); } break;

1 0

Hans Leidekker : msi: Don' t release view object twice in check_assembly_installed.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 18cd216e801280daff352feb0fd04b7fc2327414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18cd216e801280daff352feb0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:06:16 2009 +0100 msi: Don't release view object twice in check_assembly_installed. --- dlls/msi/action.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1be7aa6..70545eb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5974,7 +5974,6 @@ static BOOL check_assembly_installed(MSIDATABASE *db, IAssemblyCache *cache, found = (asminfo.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); done: - msiobj_release(&view->hdr); msi_free(disp); msi_free(name.name); msi_free(name.version);

1 0

Hans Leidekker : fusion: Sort the list of assemblies built during enumeration.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 5b41620853e2b59aab8c7b70427f5fb1731f07ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b41620853e2b59aab8c7b704… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:06:43 2009 +0100 fusion: Sort the list of assemblies built during enumeration. --- dlls/fusion/asmenum.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 44a0cb2..3706f07 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -221,6 +221,66 @@ static void parse_name(IAssemblyName *name, int depth, LPWSTR path, LPWSTR buf) } } +static int compare_assembly_names(ASMNAME *asmname1, ASMNAME *asmname2) +{ + int ret; + WORD version1, version2; + WCHAR name1[MAX_PATH], name2[MAX_PATH]; + WCHAR token_str1[TOKEN_LENGTH + 1], token_str2[TOKEN_LENGTH + 1]; + BYTE token1[BYTES_PER_TOKEN], token2[BYTES_PER_TOKEN]; + DWORD size, i; + + size = sizeof(name1); + IAssemblyName_GetProperty(asmname1->name, ASM_NAME_NAME, &name1, &size); + size = sizeof(name2); + IAssemblyName_GetProperty(asmname2->name, ASM_NAME_NAME, &name2, &size); + + if ((ret = strcmpiW(name1, name2))) return ret; + + for (i = ASM_NAME_MAJOR_VERSION; i < ASM_NAME_CULTURE; i++) + { + size = sizeof(version1); + IAssemblyName_GetProperty(asmname1->name, i, &version1, &size); + size = sizeof(version2); + IAssemblyName_GetProperty(asmname2->name, i, &version2, &size); + + if (version1 < version2) return -1; + if (version1 > version2) return 1; + } + + /* FIXME: compare cultures */ + + size = sizeof(token1); + IAssemblyName_GetProperty(asmname1->name, ASM_NAME_PUBLIC_KEY_TOKEN, token1, &size); + size = sizeof(token2); + IAssemblyName_GetProperty(asmname2->name, ASM_NAME_PUBLIC_KEY_TOKEN, token2, &size); + + token_to_str(token1, token_str1); + token_to_str(token2, token_str2); + + if ((ret = strcmpiW(token_str1, token_str2))) return ret; + + return 0; +} + +/* insert assembly in list preserving sort order */ +static void insert_assembly(struct list *assemblies, ASMNAME *to_insert) +{ + struct list *item; + + LIST_FOR_EACH(item, assemblies) + { + ASMNAME *name = LIST_ENTRY(item, ASMNAME, entry); + + if (compare_assembly_names(name, to_insert) > 0) + { + list_add_before(&name->entry, &to_insert->entry); + return; + } + } + list_add_tail(assemblies, &to_insert->entry); +} + static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, int depth, LPWSTR path) { @@ -292,7 +352,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, break; } - list_add_tail(assemblies, &asmname->entry); + insert_assembly(assemblies, asmname); continue; }

1 0

James Hawkins : fusion: Add tests for the IAssemblyEnum interface.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 03cce43a92521fc7c0a539cacef572d7b094d78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cce43a92521fc7c0a539cac… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Feb 19 12:31:47 2009 +0100 fusion: Add tests for the IAssemblyEnum interface. --- dlls/fusion/tests/Makefile.in | 1 + dlls/fusion/tests/asmenum.c | 640 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 641 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03cce43a92521fc7c0a53…

1 0

Hans Leidekker : fusion: Use parsed properties for assembly enumeration instead of trying to parse the display name again .
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 0aa3c187d863e51896df90f5fdd139d4a1a03d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa3c187d863e51896df90f5f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:05:54 2009 +0100 fusion: Use parsed properties for assembly enumeration instead of trying to parse the display name again. The display name passed in may not be normalized, e.g. if the version number is passed as "1.0.0.00000" instead of "1.0.0.0". This patch should also cut down on case insensitive file searches. --- dlls/fusion/asmenum.c | 55 ++++++++++++++++++++--------------------- dlls/fusion/tests/asmcache.c | 26 +++++++++++++++++++ 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 929fff2..44a0cb2 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -162,17 +162,19 @@ static const IAssemblyEnumVtbl AssemblyEnumVtbl = { static void parse_name(IAssemblyName *name, int depth, LPWSTR path, LPWSTR buf) { WCHAR disp[MAX_PATH]; - LPWSTR ptr, end; LPCWSTR verptr, pubkeyptr; HRESULT hr; - DWORD size; + DWORD size, major_size, minor_size, build_size, revision_size; + WORD major, minor, build, revision; static const WCHAR star[] = {'*',0}; static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; static const WCHAR verpubkey[] = {'%','s','\\','%','s','_','_','%','s',0}; - static const WCHAR version[] = {'V','e','r','s','i','o','n','=',0}; - static const WCHAR pubkeytok[] = { - 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=',0}; + static const WCHAR ver_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + + WCHAR version[24]; /* strlen("65535") * 4 + 3 + 1 */ + WCHAR token_str[TOKEN_LENGTH + 1]; + BYTE token[BYTES_PER_TOKEN]; if (depth == 0) { @@ -186,36 +188,33 @@ static void parse_name(IAssemblyName *name, int depth, LPWSTR path, LPWSTR buf) } else if (depth == 1) { - size = MAX_PATH; - hr = IAssemblyName_GetDisplayName(name, disp, &size, 0); - if (FAILED(hr)) - { - sprintfW(buf, verpubkey, path, star, star); - return; - } + major_size = sizeof(major); + IAssemblyName_GetProperty(name, ASM_NAME_MAJOR_VERSION, &major, &major_size); - ptr = disp; - verptr = strstrW(ptr, version); - if (!verptr) - verptr = star; + minor_size = sizeof(minor); + IAssemblyName_GetProperty(name, ASM_NAME_MINOR_VERSION, &minor, &minor_size); + + build_size = sizeof(build); + IAssemblyName_GetProperty(name, ASM_NAME_BUILD_NUMBER, &build, &build_size); + + revision_size = sizeof(revision); + IAssemblyName_GetProperty(name, ASM_NAME_REVISION_NUMBER, &revision, &revision_size); + + if (!major_size || !minor_size || !build_size || !revision_size) verptr = star; else { - verptr = strchrW(verptr, '=') + 1; - if ((end = strchrW(verptr, ','))) - { - *end = '\0'; - ptr = end + 1; - } + sprintfW(version, ver_fmt, major, minor, build, revision); + verptr = version; } - pubkeyptr = strstrW(ptr, pubkeytok); - if (!pubkeyptr) - pubkeyptr = star; + size = sizeof(token); + IAssemblyName_GetProperty(name, ASM_NAME_PUBLIC_KEY_TOKEN, token, &size); + + if (!size) pubkeyptr = star; else { - pubkeyptr = strchrW(pubkeyptr, '=') + 1; - if ((end = strchrW(pubkeyptr, ','))) - *end = '\0'; + token_to_str(token, token_str); + pubkeyptr = token_str; } sprintfW(buf, verpubkey, path, verptr, pubkeyptr); diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 295a2c4..c5e4acd 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -989,6 +989,8 @@ static void test_QueryAssemblyInfo(void) static const WCHAR wine[] = {'w','i','n','e',0}; static const WCHAR ver[] = { 'V','e','r','s','i','o','n','=','1','.','0','.','0','.','0',0}; + static const WCHAR otherver[] = { + 'V','e','r','s','i','o','n','=','1','.','0','.','0','.','0','0','0','0','0',0}; static const WCHAR badver[] = { 'V','e','r','s','i','o','n','=','1','.','0','.','0','.','1',0}; static const WCHAR culture[] = { @@ -1303,6 +1305,30 @@ static void test_QueryAssemblyInfo(void) "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); } + /* display name is "wine, Version=1.0.0.00000" */ + INIT_ASM_INFO(); + lstrcpyW(name, wine); + lstrcatW(name, commasep); + lstrcatW(name, otherver); + hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, + name, &info); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, + "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); + ok(info.uliAssemblySizeInKB.u.HighPart == 0, + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); + todo_wine + { + ok(info.uliAssemblySizeInKB.u.LowPart == 4, + "Expected 4, got %d\n", info.uliAssemblySizeInKB.u.LowPart); + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, asmpath), + "Wrong assembly path returned\n"); + ok(info.cchBuf == lstrlenW(asmpath) + 1, + "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); + } + /* display name is "wine, Version=1.0.0.1", versions don't match */ INIT_ASM_INFO(); lstrcpyW(name, wine);

1 0

Hans Leidekker : msi: Make comparison of assembly field names case insensistive.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: 43094e4a3ee05b95deb220e586085e4147946a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43094e4a3ee05b95deb220e58… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:05:25 2009 +0100 msi: Make comparison of assembly field names case insensistive. --- dlls/msi/action.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index fd38f7a..1be7aa6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5876,13 +5876,13 @@ static UINT parse_assembly_name(MSIRECORD *rec, LPVOID param) static const WCHAR PublicKeyToken[] = { 'P','u','b','l','i','c','K','e','y','T','o','k','e','n',0}; - if (!lstrcmpW(name, Name)) + if (!strcmpiW(name, Name)) asmname->name = val; - else if (!lstrcmpW(name, Version)) + else if (!strcmpiW(name, Version)) asmname->version = val; - else if (!lstrcmpW(name, Culture)) + else if (!strcmpiW(name, Culture)) asmname->culture = val; - else if (!lstrcmpW(name, PublicKeyToken)) + else if (!strcmpiW(name, PublicKeyToken)) asmname->pubkeytoken = val; else msi_free(val);

1 0

Hans Leidekker : fusion: Convert to Unicode.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: da1f834e094984b7564374f1e26656894c467482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1f834e094984b7564374f1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:04:00 2009 +0100 fusion: Convert to Unicode. --- dlls/fusion/asmcache.c | 58 ++++++++++++++++++++------------- dlls/fusion/assembly.c | 79 ++++++++++++++------------------------------- dlls/fusion/fusionpriv.h | 28 ++++++++++++++-- 3 files changed, 84 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da1f834e094984b756437…

1 0

Hans Leidekker : fusion: Assembly version numbers are WORDs.
by Alexandre Julliard 19 Feb '09

19 Feb '09

Module: wine Branch: master Commit: a01b18fab19312fada5f6363d70e444a3b55716f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01b18fab19312fada5f6363d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 19 14:04:22 2009 +0100 fusion: Assembly version numbers are WORDs. --- dlls/fusion/asmname.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 490de21..e90dff1 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -44,7 +44,7 @@ typedef struct { LPWSTR name; LPWSTR culture; - BYTE version[4]; + WORD version[4]; DWORD versize; BYTE pubkey[8]; @@ -144,28 +144,28 @@ static HRESULT WINAPI IAssemblyNameImpl_GetProperty(IAssemblyName *iface, case ASM_NAME_MAJOR_VERSION: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[0]; + *((WORD *)pvProperty) = name->version[0]; if (name->versize >= 1) *pcbProperty = sizeof(WORD); break; case ASM_NAME_MINOR_VERSION: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[1]; + *((WORD *)pvProperty) = name->version[1]; if (name->versize >= 2) *pcbProperty = sizeof(WORD); break; case ASM_NAME_BUILD_NUMBER: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[2]; + *((WORD *)pvProperty) = name->version[2]; if (name->versize >= 3) *pcbProperty = sizeof(WORD); break; case ASM_NAME_REVISION_NUMBER: *pcbProperty = 0; - *((LPDWORD)pvProperty) = name->version[3]; + *((WORD *)pvProperty) = name->version[3]; if (name->versize >= 4) *pcbProperty = sizeof(WORD); break;

1 0